Skip to content

Commit

Permalink
remove unnecessary function and line discount
Browse files Browse the repository at this point in the history
  • Loading branch information
@cuneytsenturk
cuneytsenturk committed Jan 1, 2021
1 parent 504bc5d commit 4612f6b
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 274 deletions.
283 changes: 18 additions & 265 deletions resources/assets/js/views/common/documents.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const app = new Vue({

// items calculate
this.items.forEach(function(item, index) {
let discount = 0;
let item_discount = 0;

item.total = item.price * item.quantity;
item.grand_total = item.price * item.quantity;
Expand All @@ -87,15 +87,15 @@ const app = new Vue({
line_discount_amount = item.total * (item.discount / 100);

item_discounted_total = item.total -= line_discount_amount;
discount = item.discount;
item_discount = item.discount;
}

let item_discounted_total = item.total;

if (global_discount) {
item_discounted_total = item.total - (item.total * (global_discount / 100));

discount = global_discount;
item_discount = global_discount;
}

// item tax calculate.
Expand Down Expand Up @@ -169,7 +169,7 @@ const app = new Vue({

item.grand_total = item.grand_total - item_base_rate;

item.total = item_base_rate + discount;
item.total = item_base_rate + item_discount;
}

if (compounds.length) {
Expand All @@ -187,9 +187,17 @@ const app = new Vue({
}
}


// calculate sub, tax, discount all items.
line_item_discount_total += line_discount_amount;
sub_total += item.total;
grand_total += item.grand_total;

// set item total
if (item.discount) {
item.total = item_discounted_total;
}

this.form.items[index].name = item.name;
this.form.items[index].description = item.description;
this.form.items[index].quantity = item.quantity;
Expand All @@ -198,209 +206,23 @@ const app = new Vue({
this.form.items[index].total = item.total;
}, this);

this.totals.sub = sub_total;
this.totals.taxes = totals_taxes;
this.totals.total = grand_total;
},

onCalculateTotal2() {
let sub_total = 0;
let discount_total = 0;
let line_item_discount_total = 0;
let tax_total = 0;
let grand_total = 0;
let items = this.items;
let discount_in_totals = this.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];

// item sub total calcute.
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) {
item_discounted_total = item_total - (item_total * (discount_in_totals / 100));
discount = discount_in_totals;
}

// item tax calculate.
let item_tax_total = 0;

if (item.tax_ids) {
let inclusives = [];
let compounds = [];
let index_taxes = 0;
let taxes = document_taxes;

item.tax_ids.forEach(function(item_tax, item_tax_index) {
for (index_taxes = 0; index_taxes < taxes.length; index_taxes++) {
let tax = taxes[index_taxes];

if (item_tax.id != tax.id) {
continue;
}

switch (tax.type) {
case 'inclusive':
inclusives.push(tax);
break;
case 'compound':
compounds.push(tax);
break;
case 'fixed':
item_tax_total = tax.rate * item.quantity;
break;
case 'withholding':
item_tax_total = 0 - item.price * item.quantity * (tax.rate / 100);
break;
default:
item_tax_total = item.price * item.quantity * (tax.rate / 100);
break;
}

this.items[index].tax_ids[item_tax_index].price = item_tax_total;
}
}, this);

if (inclusives.length) {
let item_sub_and_tax_total = item_discounted_total + item_tax_total;

let inclusive_total = 0;

inclusives.forEach(function(inclusive) {
inclusive_total += inclusive.rate;
});

let item_base_rate = item_sub_and_tax_total / (1 + inclusive_total / 100);

item_tax_total = item_sub_and_tax_total - item_base_rate;

item_total = item_base_rate + discount;
}

if (compounds.length) {
compounds.forEach(function(compound) {
item_tax_total += ((item_discounted_total + item_tax_total) / 100) * compound.rate;
});
}
}

// set item total
if (item.discount) {
items[index].total = item_discounted_total;
} else {
items[index].total = item_total;
}

// calculate sub, tax, discount all items.
line_item_discount_total += line_discount_amount;
sub_total += item_total;
tax_total += item_tax_total;
}
}

// set global total variable.
this.totals.sub = sub_total;
//this.totals.taxes = Math.abs(tax_total);
this.totals.item_discount = line_item_discount_total;

// Apply discount to total
/*
if (discount_in_totals) {
discount_total = sub_total * (discount_in_totals / 100);
this.totals.discount = discount_total;
sub_total = sub_total - (sub_total * (discount_in_totals / 100));
}
*/

// set all item grand total.
grand_total = sub_total + tax_total;

this.totals.item_discount = line_item_discount_total;
this.totals.sub = sub_total;
this.totals.taxes = totals_taxes;
this.totals.total = grand_total;
},

onCalculateTaxes() {
let taxes = document_taxes;

this.items.forEach(function (item, index) {
let inclusives = [];
let compounds = [];
let index_taxes = 0;

item.tax_ids.forEach(function(item_tax, item_tax_index) {
item_tax_total = 0;

for (index_taxes = 0; index_taxes < taxes.length; index_taxes++) {
let tax = taxes[index_taxes];

if (item_tax.id != tax.id) {
continue;
}

switch (tax.type) {
case 'inclusive':
inclusives.push(tax);
break;
case 'compound':
compounds.push(tax);
break;
case 'fixed':
item_tax_total += tax.rate * item.quantity;
break;
case 'withholding':
item_tax_total += 0 - item.price * (tax.rate / 100);
break;
default:
item_tax_total += item.price * (tax.rate / 100);
break;
}
}

this.items[index].tax_ids[item_tax_index].price = item_tax_total;
}, this);

if (inclusives.length) {
let item_sub_and_tax_total = item_discounted_total + item_tax_total;

let inclusive_total = 0;

inclusives.forEach(function(inclusive) {
inclusive_total += inclusive.rate;
}, this);

let item_base_rate = item_sub_and_tax_total / (1 + inclusive_total / 100);

item_tax_total = item_sub_and_tax_total - item_base_rate;

item_total = item_base_rate + discount;
}

if (compounds.length) {
compounds.forEach(function(compound) {
item_tax_total += ((item_discounted_total + item_tax_total) / 100) * compound.rate;
}, this);
}
}, this);
},

calculateTotalsTax(totals_taxes, id, name, price) {
let total_tax_index = totals_taxes.findIndex(total_tax => {
if (total_tax.id === id) {
Expand All @@ -421,75 +243,6 @@ const app = new Vue({
return totals_taxes;
},

getItemByTaxes(item) {
let item_tax_ids = [];
let taxes = document_taxes;

let inclusives = [];
let compounds = [];
let index_taxes = 0;
let item_tax_total = 0;

item.tax_ids.forEach(function(item_tax, item_tax_index) {
item_tax_total = 0;

for (index_taxes = 0; index_taxes < taxes.length; index_taxes++) {
let tax = taxes[index_taxes];

if (item_tax.id != tax.id) {
continue;
}

switch (tax.type) {
case 'inclusive':
inclusives.push(tax);
break;
case 'compound':
compounds.push(tax);
break;
case 'fixed':
item_tax_total += tax.rate * item.quantity;
break;
case 'withholding':
item_tax_total += 0 - item.price * (tax.rate / 100);
break;
default:
item_tax_total += item.price * (tax.rate / 100);
break;
}
}

item_tax_ids.push({
id: item_tax.id,
price: item_tax_total
});
}, this);

if (inclusives.length) {
let item_sub_and_tax_total = item_discounted_total + item_tax_total;

let inclusive_total = 0;

inclusives.forEach(function(inclusive) {
inclusive_total += inclusive.rate;
}, this);

let item_base_rate = item_sub_and_tax_total / (1 + inclusive_total / 100);

item_tax_total = item_sub_and_tax_total - item_base_rate;

item_total = item_base_rate + discount;
}

if (compounds.length) {
compounds.forEach(function(compound) {
item_tax_total += ((item_discounted_total + item_tax_total) / 100) * compound.rate;
}, this);
}

return item_tax_ids;
},

// Select Item added form
onSelectedItem(item) {
let total = 1 * item.price;
Expand Down Expand Up @@ -529,7 +282,7 @@ const app = new Vue({
description: item.description,
quantity: 1,
price: item.price,
add_tax: true,
add_tax: (document.getElementById('line-discount') != null) ? false : true,
tax_ids: item_taxes,
add_discount: false,
discount: 0,
Expand Down
9 changes: 7 additions & 2 deletions resources/views/components/documents/form/items.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
<col style="width: 30%;">
<col style="width: 100px;">
<col style="width: 100px;">
@if (!$hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
<col style="width: 100px;">
@endif
@endif
<col style="width: 250px;">
<col style="width: 40px;">
</colgroup>
Expand Down Expand Up @@ -55,7 +60,7 @@
@if (!$hideDiscount)
@if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
@stack('discount_th_start')
<th class="text-right border-top-0 border-right-0 border-bottom-0">
<th id="line-discount" class="text-right border-top-0 border-right-0 border-bottom-0">
{{ trans('invoices.discount') }}
</th>
@stack('discount_th_end')
Expand Down Expand Up @@ -83,7 +88,7 @@

@stack('add_item_td_start')
<tr id="addItem">
<td class="text-right border-bottom-0 p-0" colspan="{{ '7' }}">
<td class="text-right border-bottom-0 p-0" colspan="{{ (!$hideDiscount && in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) ? 8 : 7 }}" :colspan="colspan">
<x-select-item-button
type="{{ $type }}"
is-sale="{{ $isSalePrice }}"
Expand Down

0 comments on commit 4612f6b

Please sign in to comment.