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

refs #1408 invoice and bill update vue file..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-04-20 04:20:38 +03:00
parent ef5b95ac90
commit 550be2ef53
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
resources/assets/js/views/purchases/bills.js vendored
View File

@ -121,18 +121,18 @@ const app = new Vue({
onCalculateTotal() { onCalculateTotal() {
let sub_total = 0; let sub_total = 0;
let discount_total = 0; let discount_total = 0;
let item_discount_total = 0; let line_item_discount_total = 0;
let tax_total = 0; let tax_total = 0;
let grand_total = 0; let grand_total = 0;
let items = this.form.items; let items = this.form.items;
let discount_in_totals = this.form.discount; let discount_in_totals = this.form.discount;
let discount = '';
if (items.length) { if (items.length) {
let index = 0; let index = 0;
// get all items. // get all items.
for (index = 0; index < items.length; index++) { for (index = 0; index < items.length; index++) {
let discount = 0;
// get row item and set item variable. // get row item and set item variable.
let item = items[index]; let item = items[index];
@ -140,6 +140,15 @@ const app = new Vue({
let item_total = item.price * item.quantity; let item_total = item.price * item.quantity;
// item discount calculate. // 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; let item_discounted_total = item_total;
if (discount_in_totals) { if (discount_in_totals) {
@ -147,14 +156,6 @@ const app = new Vue({
discount = discount_in_totals; 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. // item tax calculate.
let item_tax_total = 0; let item_tax_total = 0;
@ -222,7 +223,7 @@ const app = new Vue({
} }
// calculate sub, tax, discount all items. // calculate sub, tax, discount all items.
item_discount_total += discount_amount; line_item_discount_total += line_discount_amount;
sub_total += item_total; sub_total += item_total;
tax_total += item_tax_total; tax_total += item_tax_total;
} }
@ -231,9 +232,7 @@ const app = new Vue({
// set global total variable. // set global total variable.
this.totals.sub = sub_total; this.totals.sub = sub_total;
this.totals.tax = tax_total; this.totals.tax = tax_total;
this.totals.item_discount = item_discount_total; this.totals.item_discount = line_item_discount_total;
sub_total -= item_discount_total;
// Apply discount to total // Apply discount to total
if (discount_in_totals) { if (discount_in_totals) {

27
resources/assets/js/views/sales/invoices.js vendored
View File

@ -121,18 +121,18 @@ const app = new Vue({
onCalculateTotal() { onCalculateTotal() {
let sub_total = 0; let sub_total = 0;
let discount_total = 0; let discount_total = 0;
let item_discount_total = 0; let line_item_discount_total = 0;
let tax_total = 0; let tax_total = 0;
let grand_total = 0; let grand_total = 0;
let items = this.form.items; let items = this.form.items;
let discount_in_totals = this.form.discount; let discount_in_totals = this.form.discount;
let discount = '';
if (items.length) { if (items.length) {
let index = 0; let index = 0;
// get all items. // get all items.
for (index = 0; index < items.length; index++) { for (index = 0; index < items.length; index++) {
let discount = 0;
// get row item and set item variable. // get row item and set item variable.
let item = items[index]; let item = items[index];
@ -140,6 +140,15 @@ const app = new Vue({
let item_total = item.price * item.quantity; let item_total = item.price * item.quantity;
// item discount calculate. // 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; let item_discounted_total = item_total;
if (discount_in_totals) { if (discount_in_totals) {
@ -147,14 +156,6 @@ const app = new Vue({
discount = discount_in_totals; 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. // item tax calculate.
let item_tax_total = 0; let item_tax_total = 0;
@ -222,7 +223,7 @@ const app = new Vue({
} }
// calculate sub, tax, discount all items. // calculate sub, tax, discount all items.
item_discount_total += discount_amount; line_item_discount_total += line_discount_amount;
sub_total += item_total; sub_total += item_total;
tax_total += item_tax_total; tax_total += item_tax_total;
} }
@ -231,9 +232,7 @@ const app = new Vue({
// set global total variable. // set global total variable.
this.totals.sub = sub_total; this.totals.sub = sub_total;
this.totals.tax = tax_total; this.totals.tax = tax_total;
this.totals.item_discount = item_discount_total; this.totals.item_discount = line_item_discount_total;
sub_total -= item_discount_total;
// Apply discount to total // Apply discount to total
if (discount_in_totals) { if (discount_in_totals) {