Adding Flat Tax support with fixed amount (#253)

* 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

resources/scripts/admin/components/modal-components/ItemModal.vue

@@ -169,7 +169,7 @@ const taxes = computed({
         return {
           ...tax,
           tax_type_id: tax.id,
-          tax_name: tax.name + ' (' + tax.percent + '%)',
+          tax_name: tax.name + ' (' + (tax.calculation_type === 'fixed' ? tax.fixed_amount : tax.percent) + (tax.calculation_type === 'fixed' ? companyStore.selectedCompanyCurrency.symbol : '%') + ')',
         }
       }
     }),
@@ -208,7 +208,17 @@ const v$ = useVuelidate(
 
 const getTaxTypes = computed(() => {
   return taxTypeStore.taxTypes.map((tax) => {
-    return { ...tax, tax_name: tax.name + ' (' + tax.percent + '%)' }
+    const amount = tax.calculation_type === 'fixed' 
+      ? new Intl.NumberFormat(undefined, {
+          style: 'currency',
+          currency: companyStore.selectedCompanyCurrency.code
+        }).format(tax.fixed_amount / 100)
+      : `${tax.percent}%`
+    
+    return { 
+      ...tax, 
+      tax_name: `${tax.name} (${amount})`
+    }
   })
 })
 
@@ -229,8 +239,10 @@ async function submitItemData() {
     taxes: itemStore.currentItem.taxes.map((tax) => {
       return {
         tax_type_id: tax.id,
-        amount: (price.value * tax.percent) / 100,
+        amount: tax.calculation_type === 'fixed' ? tax.fixed_amount : (price.value * tax.percent) / 100,
         percent: tax.percent,
+        fixed_amount: tax.fixed_amount,
+        calculation_type: tax.calculation_type,
         name: tax.name,
         collective_tax: 0,
       }

resources/scripts/admin/components/modal-components/TaxTypeModal.vue

@@ -34,12 +34,28 @@
           </BaseInputGroup>
 
           <BaseInputGroup
+            :label="$t('tax_types.tax_type')"
+            variant="horizontal"
+            required
+          >
+            <BaseSelectInput
+              v-model="taxTypeStore.currentTaxType.calculation_type"
+              :options="[
+                { id: 'percentage', label: $t('tax_types.percentage') }, 
+                { id: 'fixed', label: $t('tax_types.fixed_amount') }
+              ]"
+              :allow-empty="false"
+              value-prop="id"
+              label-prop="label"
+              track-by="label"
+              :searchable="false"
+            />
+          </BaseInputGroup>
+
+          <BaseInputGroup
+            v-if="taxTypeStore.currentTaxType.calculation_type === 'percentage'"
             :label="$t('tax_types.percent')"
             variant="horizontal"
-            :error="
-              v$.currentTaxType.percent.$error &&
-              v$.currentTaxType.percent.$errors[0].$message
-            "
             required
           >
             <BaseMoney
@@ -51,13 +67,18 @@
                 precision: 2,
                 masked: false,
               }"
-              :invalid="v$.currentTaxType.percent.$error"
-              class="
-                relative
-                w-full
-                focus:border focus:border-solid focus:border-primary
-              "
-              @input="v$.currentTaxType.percent.$touch()"
+            />
+          </BaseInputGroup>
+
+          <BaseInputGroup
+            v-else
+            :label="$t('tax_types.fixed_amount')"
+            variant="horizontal"
+            required
+          >
+            <BaseMoney
+              v-model="fixedAmount"
+              :currency="defaultCurrency"
             />
           </BaseInputGroup>
 
@@ -127,6 +148,8 @@ import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import Guid from 'guid'
 import TaxStub from '@/scripts/admin/stub/abilities'
+import { useCompanyStore } from '@/scripts/admin/stores/company'
+
 import {
   required,
   minLength,
@@ -140,6 +163,8 @@ const taxTypeStore = useTaxTypeStore()
 const modalStore = useModalStore()
 const notificationStore = useNotificationStore()
 const estimateStore = useEstimateStore()
+const companyStore = useCompanyStore()
+const defaultCurrency = computed(() => companyStore.selectedCompanyCurrency)
 
 const { t, tm } = useI18n()
 let isSaving = ref(false)
@@ -154,6 +179,9 @@ const rules = computed(() => {
           minLength(3)
         ),
       },
+      calculation_type: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
       percent: {
         required: helpers.withMessage(t('validation.required'), required),
         between: helpers.withMessage(
@@ -161,6 +189,9 @@ const rules = computed(() => {
           between(-100, 100)
         ),
       },
+      fixed_amount: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
       description: {
         maxLength: helpers.withMessage(
           t('validation.description_maxlength', { count: 255 }),
@@ -198,16 +229,22 @@ async function submitTaxTypeData() {
 
 function SelectTax(taxData) {
   let amount = 0
- if (estimateStore.getSubtotalWithDiscount && taxData.percent) {
-    amount = Math.round(
-      (estimateStore.getSubtotalWithDiscount * taxData.percent) / 100
-    )
+  if (estimateStore.getSubtotalWithDiscount) {
+    if (taxData.calculation_type === 'percentage') {
+      amount = Math.round(
+        (estimateStore.getSubtotalWithDiscount * taxData.percent) / 100
+      )
+    } else {
+      amount = taxData.fixed_amount
+    }
   }
   let data = {
     ...TaxStub,
     id: Guid.raw(),
     name: taxData.name,
+    calculation_type: taxData.calculation_type,
     percent: taxData.percent,
+    fixed_amount: taxData.fixed_amount,
     tax_type_id: taxData.id,
     amount,
   }
@@ -222,7 +259,9 @@ function selectItemTax(taxData) {
       ...TaxStub,
       id: Guid.raw(),
       name: taxData.name,
+      calculation_type: taxData.calculation_type,
       percent: taxData.percent,
+      fixed_amount: taxData.fixed_amount,
       tax_type_id: taxData.id,
     }
     modalStore.refreshData(data)
@@ -236,4 +275,11 @@ function closeTaxTypeModal() {
     v$.value.$reset()
   }, 300)
 }
+
+const fixedAmount = computed({
+  get: () => taxTypeStore.currentTaxType.fixed_amount / 100,
+  set: (value) => {
+    taxTypeStore.currentTaxType.fixed_amount = Math.round(value * 100)
+  },
+})
 </script>