QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-07 13:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding Flat Tax support with fixed amount (#253)

Browse Source 
* Possibility to set a fixed amount on tax types settings

* Pint and manage flat taxes on items

* Fix display errors and handle global taxes

* Tests

* Pint with PHP 8.2 cause with PHP 8.3 version it cause workflow error

* Merging percent and fixed amount into one column

* Now display the currency on SelectTaxPopup on fixed taxes
This commit is contained in:
mchev
2025-05-04 02:24:56 +02:00
committed by GitHub
parent 546f75d3a6
commit bf5b544ca3
22 changed files with 306 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/scripts/admin/views/items/Create.vue
View File

@@ -184,7 +184,12 @@ const taxes = computed({
return {
...tax,
tax_type_id: tax.id,
tax_name: tax.name + ' (' + tax.percent + '%)',
tax_name: `${tax.name} (${tax.calculation_type === 'fixed'
? new Intl.NumberFormat(undefined, {
style: 'currency',
currency: companyStore.selectedCompanyCurrency.code
}).format(tax.fixed_amount / 100)
: `${tax.percent}%`})`,
}
}
}),
@@ -204,7 +209,12 @@ const getTaxTypes = computed(() => {
return {
...tax,
tax_type_id: tax.id,
tax_name: tax.name + ' (' + tax.percent + '%)',
tax_name: `${tax.name} (${tax.calculation_type === 'fixed'
? new Intl.NumberFormat(undefined, {
style: 'currency',
currency: companyStore.selectedCompanyCurrency.code
}).format(tax.fixed_amount / 100)
: `${tax.percent}%`})`,
}
})
})
@@ -280,7 +290,9 @@ async function submitItem() {
data.taxes = itemStore.currentItem.taxes.map((tax) => {
return {
tax_type_id: tax.tax_type_id,
amount: price.value * tax.percent,
calculation_type: tax.calculation_type,
fixed_amount: tax.fixed_amount,
amount: tax.calculation_type === 'fixed' ? tax.fixed_amount : price.value * tax.percent,
percent: tax.percent,
name: tax.name,
collective_tax: 0,

27
resources/scripts/admin/views/settings/TaxTypesSetting.vue
View File

@@ -20,7 +20,20 @@
:data="fetchData"
:columns="taxTypeColumns"
>
<template #cell-percent="{ row }"> {{ row.data.percent }} % </template>
<template #cell-calculation_type="{ row }">
{{ $t(`settings.tax_types.${row.data.calculation_type}`) }}
</template>
<template #cell-amount="{ row }">
<template v-if="row.data.calculation_type === 'percentage'">
{{ row.data.percent }} %
</template>
<template v-else-if="row.data.calculation_type === 'fixed'">
<BaseFormatMoney :amount="row.data.fixed_amount" :currency="defaultCurrency" />
</template>
<template v-else>
-
</template>
</template>
<template v-if="hasAtleastOneAbility()" #cell-actions="{ row }">
<TaxTypeDropdown
@@ -64,9 +77,9 @@ const taxTypeStore = useTaxTypeStore()
const modalStore = useModalStore()
const userStore = useUserStore()
const moduleStore = useModuleStore()
const table = ref(null)
const taxPerItemSetting = ref(companyStore.selectedCompanySettings.tax_per_item)
const defaultCurrency = computed(() => companyStore.selectedCompanyCurrency)
const taxTypeColumns = computed(() => {
return [
@@ -77,8 +90,14 @@ const taxTypeColumns = computed(() => {
tdClass: 'font-medium text-gray-900',
},
{
key: 'percent',
label: t('settings.tax_types.percent'),
key: 'calculation_type',
label: t('settings.tax_types.calculation_type'),
thClass: 'extra',
tdClass: 'font-medium text-gray-900',
},
{
key: 'amount',
label: t('settings.tax_types.amount'),
thClass: 'extra',
tdClass: 'font-medium text-gray-900',
},