From 1bef5738f44ba2ee5a28a2d906046cafefba9cf0 Mon Sep 17 00:00:00 2001 From: sausin Date: Sun, 3 Feb 2019 21:23:50 +0530 Subject: [PATCH] Update Items.php --- app/Http/Controllers/Common/Items.php | 33 ++++----------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php index 6e7f8a4e3..076f22aeb 100644 --- a/app/Http/Controllers/Common/Items.php +++ b/app/Http/Controllers/Common/Items.php @@ -358,37 +358,12 @@ class Items extends Controller } if ($inclusives) { - if ($discount) { - $item_tax_total = 0; + $item_sub_and_tax_total = $item_discount_total + $item_tax_total; - if ($taxes) { - foreach ($taxes as $tax) { - $item_tax_amount = ($item_sub_total / 100) * $tax->rate; + $item_base_rate = $item_sub_and_tax_total / (1 + collect($inclusives)->sum('rate')/100); + $item_tax_total = $item_sub_and_tax_total - $item_base_rate; - $item_tax_total += $item_tax_amount; - } - } - - foreach ($inclusives as $inclusive) { - $item_sub_and_tax_total = $item_sub_total + $item_tax_total; - - $item_tax_total = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($inclusive->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 ($inclusives as $inclusive) { - $item_sub_and_tax_total = $item_discount_total + $item_tax_total; - - $item_tax_total = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($inclusive->rate / 100))); - - $item_sub_total = $item_sub_and_tax_total - $item_tax_total; - - $item_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100)); - } - } + $item_sub_total = $item_base_rate + $discount; } if ($compounds) {