shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed tax to tax_id

Browse Source
This commit is contained in:
denisdulici
2017-10-07 19:37:58 +03:00
parent 5f7cdc24b6
commit 495ba7eb70
9 changed files with 93 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Controllers/Api/Expenses/Bills.php
View File

@ -62,19 +62,21 @@ class Bills extends ApiController
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
} elseif (!empty($item['tax'])) {
$tax = $item['tax'];
}
$bill_item['item_id'] = $item['item_id'];
@ -82,7 +84,7 @@ class Bills extends ApiController
$bill_item['sku'] = $item_sku;
$bill_item['quantity'] = $item['quantity'];
$bill_item['price'] = $item['price'];
$bill_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
$bill_item['tax'] = $tax;
$bill_item['tax_id'] = $tax_id;
$bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];
@ -127,19 +129,21 @@ class Bills extends ApiController
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
} elseif (!empty($item['tax'])) {
$tax = $item['tax'];
}
$bill_item['item_id'] = $item['item_id'];
@ -147,7 +151,7 @@ class Bills extends ApiController
$bill_item['sku'] = $item_sku;
$bill_item['quantity'] = $item['quantity'];
$bill_item['price'] = $item['price'];
$bill_item['tax'] = (($item['price'] * $item['quantity']) / 100 * $tax_rate);
$bill_item['tax'] = $tax;
$bill_item['tax_id'] = $tax_id;
$bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];

40
app/Http/Controllers/Api/Incomes/Invoices.php
View File

@ -62,19 +62,21 @@ class Invoices extends ApiController
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
} elseif (!empty($item['tax'])) {
$tax = $item['tax'];
}
$invoice_item['item_id'] = $item['item_id'];
@ -82,7 +84,7 @@ class Invoices extends ApiController
$invoice_item['sku'] = $item_sku;
$invoice_item['quantity'] = $item['quantity'];
$invoice_item['price'] = $item['price'];
$invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
$invoice_item['tax'] = $tax;
$invoice_item['tax_id'] = $tax_id;
$invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];
@ -127,19 +129,21 @@ class Invoices extends ApiController
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
} elseif (!empty($item['tax'])) {
$tax = $item['tax'];
}
$invoice_item['item_id'] = $item['item_id'];
@ -147,7 +151,7 @@ class Invoices extends ApiController
$invoice_item['sku'] = $item_sku;
$invoice_item['quantity'] = $item['quantity'];
$invoice_item['price'] = $item['price'];
$invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100 * $tax_rate);
$invoice_item['tax'] = $tax;
$invoice_item['tax_id'] = $tax_id;
$invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];

36
app/Http/Controllers/Expenses/Bills.php
View File

@ -301,19 +301,19 @@ class Bills extends Controller
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
}
$bill_item['item_id'] = $item['item_id'];
@ -321,7 +321,7 @@ class Bills extends Controller
$bill_item['sku'] = $item_sku;
$bill_item['quantity'] = $item['quantity'];
$bill_item['price'] = $item['price'];
$bill_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
$bill_item['tax'] = $tax;
$bill_item['tax_id'] = $tax_id;
$bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];
@ -416,19 +416,19 @@ class Bills extends Controller
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
}
$bill_item['item_id'] = $item['item_id'];
@ -436,7 +436,7 @@ class Bills extends Controller
$bill_item['sku'] = $item_sku;
$bill_item['quantity'] = $item['quantity'];
$bill_item['price'] = $item['price'];
$bill_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
$bill_item['tax'] = $tax;
$bill_item['tax_id'] = $tax_id;
$bill_item['total'] = ($item['price'] + $bill_item['tax']) * $item['quantity'];

36
app/Http/Controllers/Incomes/Invoices.php
View File

@ -311,19 +311,19 @@ class Invoices extends Controller
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
}
$invoice_item['item_id'] = $item['item_id'];
@ -331,7 +331,7 @@ class Invoices extends Controller
$invoice_item['sku'] = $item_sku;
$invoice_item['quantity'] = $item['quantity'];
$invoice_item['price'] = $item['price'];
$invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100) * $tax_rate;
$invoice_item['tax'] = $tax;
$invoice_item['tax_id'] = $tax_id;
$invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];
@ -426,19 +426,19 @@ class Invoices extends Controller
$item_sku = '';
if (!empty($item['item_id'])) {
$data = Item::where('id', $item['item_id'])->first();
$item_object = Item::find($item['item_id']);
$item_sku = $data['sku'];
$item_sku = $item_object->sku;
}
$tax_id = 0;
$tax_rate = 0;
$tax = $tax_id = 0;
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
$tax_rate = $tax->rate;
$tax_id = $item['tax'];
$tax_id = $item['tax_id'];
$tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate;
}
$invoice_item['item_id'] = $item['item_id'];
@ -446,7 +446,7 @@ class Invoices extends Controller
$invoice_item['sku'] = $item_sku;
$invoice_item['quantity'] = $item['quantity'];
$invoice_item['price'] = $item['price'];
$invoice_item['tax'] = (($item['price'] * $item['quantity']) / 100 * $tax_rate);
$invoice_item['tax'] = $tax;
$invoice_item['tax_id'] = $tax_id;
$invoice_item['total'] = ($item['price'] + $invoice_item['tax']) * $item['quantity'];

6
app/Http/Controllers/Items/Items.php
View File

@ -164,7 +164,7 @@ class Items extends Controller
if ($items) {
foreach ($items as $item) {
$tax = Tax::where('id', $item->tax_id)->first();
$tax = Tax::find($item->tax_id);
$item_tax_price = 0;
@ -213,8 +213,8 @@ class Items extends Controller
$item_tax_total= 0;
$item_sub_total = ($item['price'] * $item['quantity']);
if (!empty($item['tax'])) {
$tax = Tax::where('id', $item['tax'])->first();
if (!empty($item['tax_id'])) {
$tax = Tax::find($item['tax_id']);
$item_tax_total = (($item['price'] * $item['quantity']) / 100) * $tax->rate;
}