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 errors and styling issues

Browse Source
This commit is contained in:
Mohit Panjwani
2021-01-22 13:44:59 +05:30
parent 678ace744a
commit 83de1c47ee
6 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/js/components/theme/SwButton.js
View File

@ -13,4 +13,10 @@ export default {
'inline-flex items-center justify-center text-black transition px-2 duration-150 ease-in-out border border-gray-300 border-solid focus:outline-none bg-white',
},
},
sizes: {
discount: {
button: 'py-2 px-2 text-sm leading-5 rounded',
loadingIcon: 'w-4 h-4 -ml-2',
},
},
}

4
resources/assets/js/helpers/directives.js
View File

@ -19,7 +19,9 @@ Vue.directive('click-outside', {
Vue.directive('autoresize', {
inserted: function (el) {
el.style.height = el.scrollHeight + 'px'
el.style.overflow.y = 'hidden'
if (el.style.overflow && el.style.overflow.y) {
el.style.overflow.y = 'hidden'
}
el.style.resize = 'none'
function OnInput() {
this.style.height = 'auto'

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

@ -322,8 +322,8 @@
<sw-button
slot="activator"
type="button"
class="flex items-center justify-center w-12 border border-gray-300 border-solid rounded-tl-none rounded-bl-none font-base"
data-toggle="dropdown"
size="discount"
aria-haspopup="true"
aria-expanded="false"
style="height: 43px"

31
resources/assets/js/views/estimates/Item.vue
View File

@ -85,9 +85,10 @@
slot="activator"
type="button"
data-toggle="dropdown"
size="discount"
aria-haspopup="true"
aria-expanded="false"
style="height: 43px; padding: 6px"
style="height: 43px"
variant="white"
>
<span class="flex">
@ -266,22 +267,26 @@ export default {
return this.subtotal - this.item.discount_val
},
totalSimpleTax() {
return window._.sumBy(this.item.taxes, function (tax) {
if (!tax.compound_tax) {
return tax.amount
}
return Math.round(
window._.sumBy(this.item.taxes, function (tax) {
if (!tax.compound_tax) {
return tax.amount
}
return 0
})
return 0
})
)
},
totalCompoundTax() {
return window._.sumBy(this.item.taxes, function (tax) {
if (tax.compound_tax) {
return tax.amount
}
return Math.round(
window._.sumBy(this.item.taxes, function (tax) {
if (tax.compound_tax) {
return tax.amount
}
return 0
})
return 0
})
)
},
totalTax() {
return this.totalSimpleTax + this.totalCompoundTax

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

@ -315,8 +315,8 @@
<sw-button
slot="activator"
type="button"
class="flex items-center justify-center w-12 border border-gray-300 border-solid rounded-tl-none rounded-bl-none font-base"
data-toggle="dropdown"
size="discount"
aria-haspopup="true"
aria-expanded="false"
style="height: 43px"
@ -565,23 +565,27 @@ export default {
},
totalSimpleTax() {
return window._.sumBy(this.newInvoice.taxes, function (tax) {
if (!tax.compound_tax) {
return tax.amount
}
return Math.round(
window._.sumBy(this.newInvoice.taxes, function (tax) {
if (!tax.compound_tax) {
return tax.amount
}
return 0
})
return 0
})
)
},
totalCompoundTax() {
return window._.sumBy(this.newInvoice.taxes, function (tax) {
if (tax.compound_tax) {
return tax.amount
}
return Math.round(
window._.sumBy(this.newInvoice.taxes, function (tax) {
if (tax.compound_tax) {
return tax.amount
}
return 0
})
return 0
})
)
},
totalTax() {
@ -589,9 +593,11 @@ export default {
return this.totalSimpleTax + this.totalCompoundTax
}
return window._.sumBy(this.newInvoice.items, function (tax) {
return tax.tax
})
return Math.round(
window._.sumBy(this.newInvoice.items, function (tax) {
return tax.tax
})
)
},
allTaxes() {

30
resources/assets/js/views/invoices/Item.vue
View File

@ -83,8 +83,8 @@
<sw-button
slot="activator"
type="button"
class="flex items-center px-5 py-1 text-sm font-medium leading-none text-center text-gray-500 whitespace-nowrap border border-gray-300 border-solid rounded rounded-tl-none rounded-bl-none dropdown-toggle"
data-toggle="dropdown"
size="discount"
aria-haspopup="true"
aria-expanded="false"
style="height: 43px"
@ -266,22 +266,26 @@ export default {
return this.subtotal - this.item.discount_val
},
totalSimpleTax() {
return window._.sumBy(this.item.taxes, function (tax) {
if (!tax.compound_tax) {
return tax.amount
}
return Math.round(
window._.sumBy(this.item.taxes, function (tax) {
if (!tax.compound_tax) {
return tax.amount
}
return 0
})
return 0
})
)
},
totalCompoundTax() {
return window._.sumBy(this.item.taxes, function (tax) {
if (tax.compound_tax) {
return tax.amount
}
return Math.round(
window._.sumBy(this.item.taxes, function (tax) {
if (tax.compound_tax) {
return tax.amount
}
return 0
})
return 0
})
)
},
totalTax() {
return this.totalSimpleTax + this.totalCompoundTax