From 485b79b3f7ff867f53f329069217890f0ca25c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= Date: Mon, 20 Apr 2020 04:44:55 +0300 Subject: [PATCH] refs #1408 --- app/Jobs/Purchase/CreateBillItem.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Jobs/Purchase/CreateBillItem.php b/app/Jobs/Purchase/CreateBillItem.php index e2a1b47a6..896cad11a 100644 --- a/app/Jobs/Purchase/CreateBillItem.php +++ b/app/Jobs/Purchase/CreateBillItem.php @@ -36,15 +36,21 @@ class CreateBillItem extends Job $item_id = !empty($this->request['item_id']) ? $this->request['item_id'] : 0; $item_amount = (double) $this->request['price'] * (double) $this->request['quantity']; + $discount = 0; + $item_discounted_amount = $item_amount; // Apply line discount to amount if (!empty($this->request['discount'])) { + $discount += $this->request['discount']; + $item_discounted_amount = $item_amount -= ($item_amount * ($this->request['discount'] / 100)); } // Apply global discount to amount if (!empty($this->request['global_discount'])) { + $discount += $this->request['global_discount']; + $item_discounted_amount = $item_amount - ($item_amount * ($this->request['global_discount'] / 100)); } @@ -115,7 +121,7 @@ class CreateBillItem extends Job ]; } - $item_amount = ($item_amount - $item_tax_total) / (1 - $this->request['discount'] / 100); + $item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100); } if ($compounds) {