From 550be2ef53343fe5f2a21ed2750ae6d5bae81a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 20 Apr 2020 04:20:38 +0300
Subject: [PATCH] refs #1408 invoice and bill update vue file..

---
 resources/assets/js/views/purchases/bills.js | 27 ++++++++++----------
 resources/assets/js/views/sales/invoices.js  | 27 ++++++++++----------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js
index 8035a9261..074161131 100644
--- a/resources/assets/js/views/purchases/bills.js
+++ b/resources/assets/js/views/purchases/bills.js
@@ -121,18 +121,18 @@ const app = new Vue({
         onCalculateTotal() {
             let sub_total = 0;
             let discount_total = 0;
-            let item_discount_total = 0;
+            let line_item_discount_total = 0;
             let tax_total = 0;
             let grand_total = 0;
             let items = this.form.items;
             let discount_in_totals = this.form.discount;
-            let discount = '';
 
             if (items.length) {
                 let index = 0;
 
                 // get all items.
                 for (index = 0; index < items.length; index++) {
+                    let discount = 0;
                     // get row item and set item variable.
                     let item = items[index];
 
@@ -140,6 +140,15 @@ const app = new Vue({
                     let item_total = item.price * item.quantity;
 
                     // item discount calculate.
+                    let line_discount_amount = 0;
+
+                    if (item.discount) {
+                        line_discount_amount = item_total * (item.discount / 100);
+
+                        item_discounted_total = item_total -= line_discount_amount;
+                        discount = item.discount;
+                    }
+
                     let item_discounted_total = item_total;
 
                     if (discount_in_totals) {
@@ -147,14 +156,6 @@ const app = new Vue({
                         discount = discount_in_totals;
                     }
 
-                    let discount_amount = 0;
-
-                    if (item.discount) {
-                        discount_amount = item_total * (item.discount / 100);
-                        item_discounted_total = item_total - discount_amount;
-                        discount = item.discount;
-                    }
-
                     // item tax calculate.
                     let item_tax_total = 0;
 
@@ -222,7 +223,7 @@ const app = new Vue({
                     }
 
                     // calculate sub, tax, discount all items.
-                    item_discount_total += discount_amount;
+                    line_item_discount_total += line_discount_amount;
                     sub_total += item_total;
                     tax_total += item_tax_total;
                 }
@@ -231,9 +232,7 @@ const app = new Vue({
             // set global total variable.
             this.totals.sub = sub_total;
             this.totals.tax = tax_total;
-            this.totals.item_discount = item_discount_total;
-
-            sub_total -= item_discount_total;
+            this.totals.item_discount = line_item_discount_total;
 
             // Apply discount to total
             if (discount_in_totals) {
diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js
index 84c4790ad..5d98d9e13 100644
--- a/resources/assets/js/views/sales/invoices.js
+++ b/resources/assets/js/views/sales/invoices.js
@@ -121,18 +121,18 @@ const app = new Vue({
         onCalculateTotal() {
             let sub_total = 0;
             let discount_total = 0;
-            let item_discount_total = 0;
+            let line_item_discount_total = 0;
             let tax_total = 0;
             let grand_total = 0;
             let items = this.form.items;
             let discount_in_totals = this.form.discount;
-            let discount = '';
 
             if (items.length) {
                 let index = 0;
 
                 // get all items.
                 for (index = 0; index < items.length; index++) {
+                    let discount = 0;
                     // get row item and set item variable.
                     let item = items[index];
 
@@ -140,6 +140,15 @@ const app = new Vue({
                     let item_total = item.price * item.quantity;
 
                     // item discount calculate.
+                    let line_discount_amount = 0;
+
+                    if (item.discount) {
+                        line_discount_amount = item_total * (item.discount / 100);
+
+                        item_discounted_total = item_total -= line_discount_amount;
+                        discount = item.discount;
+                    }
+
                     let item_discounted_total = item_total;
 
                     if (discount_in_totals) {
@@ -147,14 +156,6 @@ const app = new Vue({
                         discount = discount_in_totals;
                     }
 
-                    let discount_amount = 0;
-
-                    if (item.discount) {
-                        discount_amount = item_total * (item.discount / 100);
-                        item_discounted_total = item_total - discount_amount;
-                        discount = item.discount;
-                    }
-
                     // item tax calculate.
                     let item_tax_total = 0;
 
@@ -222,7 +223,7 @@ const app = new Vue({
                     }
 
                     // calculate sub, tax, discount all items.
-                    item_discount_total += discount_amount;
+                    line_item_discount_total += line_discount_amount;
                     sub_total += item_total;
                     tax_total += item_tax_total;
                 }
@@ -231,9 +232,7 @@ const app = new Vue({
             // set global total variable.
             this.totals.sub = sub_total;
             this.totals.tax = tax_total;
-            this.totals.item_discount = item_discount_total;
-
-            sub_total -= item_discount_total;
+            this.totals.item_discount = line_item_discount_total;
 
             // Apply discount to total
             if (discount_in_totals) {