TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix tax rounding issues

Browse Source
This commit is contained in:
Mohit Panjwani
2021-01-22 14:15:44 +05:30
parent 83de1c47ee
commit a4d556f41e
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/assets/js/views/estimates/Create.vue
View File

@ -954,12 +954,15 @@ export default {
let amount = 0
if (selectedTax.compound_tax && this.subtotalWithDiscount) {
amount =
amount = Math.round(
((this.subtotalWithDiscount + this.totalSimpleTax) *
selectedTax.percent) /
100
100
)
} else if (this.subtotalWithDiscount && selectedTax.percent) {
amount = (this.subtotalWithDiscount * selectedTax.percent) / 100
amount = Math.round(
(this.subtotalWithDiscount * selectedTax.percent) / 100
)
}
this.newEstimate.taxes.push({
@ -972,7 +975,7 @@ export default {
amount,
})
if (this.$$refs) {
if (this.$refs) {
this.$refs.taxModal.close()
}
},

6
resources/assets/js/views/estimates/EstimateTax.vue
View File

@ -45,11 +45,13 @@ export default {
computed: {
taxAmount() {
if (this.tax.compound_tax && this.total) {
return ((this.total + this.totalTax) * this.tax.percent) / 100
return Math.round(
((this.total + this.totalTax) * this.tax.percent) / 100
)
}
if (this.total && this.tax.percent) {
return (this.total * this.tax.percent) / 100
return Math.round((this.total * this.tax.percent) / 100)
}
return 0

9
resources/assets/js/views/invoices/Create.vue
View File

@ -957,12 +957,15 @@ export default {
let amount = 0
if (selectedTax.compound_tax && this.subtotalWithDiscount) {
amount =
amount = Math.round(
((this.subtotalWithDiscount + this.totalSimpleTax) *
selectedTax.percent) /
100
100
)
} else if (this.subtotalWithDiscount && selectedTax.percent) {
amount = (this.subtotalWithDiscount * selectedTax.percent) / 100
amount = Math.round(
(this.subtotalWithDiscount * selectedTax.percent) / 100
)
}
this.newInvoice.taxes.push({

6
resources/assets/js/views/invoices/InvoiceTax.vue
View File

@ -45,11 +45,13 @@ export default {
computed: {
taxAmount() {
if (this.tax.compound_tax && this.total) {
return ((this.total + this.totalTax) * this.tax.percent) / 100
return Math.round(
((this.total + this.totalTax) * this.tax.percent) / 100
)
}
if (this.total && this.tax.percent) {
return (this.total * this.tax.percent) / 100
return Math.round((this.total * this.tax.percent) / 100)
}
return 0

6
resources/assets/js/views/invoices/Tax.vue
View File

@ -105,11 +105,13 @@ export default {
},
taxAmount() {
if (this.tax.compound_tax && this.total) {
return ((this.total + this.totalTax) * this.tax.percent) / 100
return Math.round(
((this.total + this.totalTax) * this.tax.percent) / 100
)
}
if (this.total && this.tax.percent) {
return (this.total * this.tax.percent) / 100
return Math.round((this.total * this.tax.percent) / 100)
}
return 0