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

refs #602 change calculate to included

Browse Source
This commit is contained in:
cuneytsenturk
2018-11-07 11:45:29 +03:00
parent 4131237c47
commit 9fdcf7dbbe
5 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Common/Items.php
View File

@ -334,14 +334,14 @@ class Items extends Controller
}
if (!empty($item['tax_id'])) {
$calculates = $compounds = $taxes = [];
$includes = $compounds = $taxes = [];
foreach ($item['tax_id'] as $tax_id) {
$tax = Tax::find($tax_id);
switch ($tax->type) {
case 'calculate':
$calculates[] = $tax;
case 'included':
$includes[] = $tax;
break;
case 'compound':
$compounds[] = $tax;
@ -357,7 +357,7 @@ class Items extends Controller
}
}
if ($calculates) {
if ($includes) {
if ($discount) {
$item_tax_total = 0;
@ -369,20 +369,20 @@ class Items extends Controller
}
}
foreach ($calculates as $calculate) {
foreach ($includes as $include) {
$item_sub_and_tax_total = $item_sub_total + $item_tax_total;
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $calculate->rate)) / 100);
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $include->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total;
$item_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100));
}
} else {
foreach ($calculates as $calculate) {
foreach ($includes as $include) {
$item_sub_and_tax_total = $item_discount_total + $item_tax_total;
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $calculate->rate)) / 100);
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $include->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total;