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/estimate-invoice-common/CreateItemRowTax.vue

@@ -19,12 +19,24 @@
       >
         <template #singlelabel="{ value }">
           <div class="absolute left-3.5">
-            {{ value.name }} - {{ value.percent }} %
+            {{ value.name }} - 
+            <template v-if="value.calculation_type === 'fixed'">
+              <BaseFormatMoney :amount="value.fixed_amount" :currency="currency" />
+            </template>
+            <template v-else>
+              {{ value.percent }} %
+            </template>
           </div>
         </template>
 
         <template #option="{ option }">
-          {{ option.name }} - {{ option.percent }} %
+          {{ option.name }} - 
+          <template v-if="option.calculation_type === 'fixed'">
+            <BaseFormatMoney :amount="option.fixed_amount" :currency="currency" />
+          </template>
+          <template v-else>
+            {{ option.percent }} %
+          </template>
         </template>
 
         <template v-if="userStore.hasAbilities(ability)" #action>
@@ -146,7 +158,12 @@ const filteredTypes = computed(() => {
 })
 
 const taxAmount = computed(() => {
-  if (props.discountedTotal && localTax.percent) {
+
+  if(localTax.calculation_type === 'fixed') {
+    return localTax.fixed_amount
+  }
+  
+  if (props.discountedTotal) {
     const taxPerItemEnabled = props.store[props.storeProp].tax_per_item === 'YES'
     const discountPerItemEnabled = props.store[props.storeProp].discount_per_item === 'YES'
     if (taxPerItemEnabled && !discountPerItemEnabled){
@@ -188,7 +205,9 @@ if (props.taxData.tax_type_id > 0) {
 updateRowTax()
 
 function onSelectTax(val) {
-  localTax.percent = val.percent
+  localTax.calculation_type = val.calculation_type
+  localTax.percent = val.calculation_type === 'percentage' ? val.percent : null
+  localTax.fixed_amount = val.calculation_type === 'fixed' ? val.fixed_amount : null
   localTax.tax_type_id = val.id
   localTax.name = val.name
 
@@ -232,6 +251,11 @@ function removeTax(index) {
 }
 
 function getTaxAmount() {
+
+  if (localTax.calculation_type === 'fixed') {
+    return localTax.fixed_amount
+  }
+
   let total = 0
   let discount = 0
   const itemTotal = props.discountedTotal
@@ -250,3 +274,4 @@ function getTaxAmount() {
   return Math.round((props.discountedTotal * localTax.percent) / 100)
 }
 </script>
+

resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue

@@ -50,7 +50,12 @@
         v-else-if="store[storeProp].tax_per_item === 'YES'"
         class="m-0 text-sm font-semibold leading-5 text-gray-500 uppercase"
       >
-        {{ tax.name }} - {{ tax.percent }}%
+        <template v-if="tax.calculation_type === 'percentage'">
+          {{ tax.name }} - {{ tax.percent }}%
+        </template>
+        <template v-else>
+          {{ tax.name }} - <BaseFormatMoney :amount="tax.fixed_amount" :currency="defaultCurrency" />
+        </template>
       </label>
 
       <BaseContentPlaceholders v-if="isLoading">
@@ -269,6 +274,8 @@ const itemWiseTaxes = computed(() => {
             amount: Math.round(tax.amount),
             percent: tax.percent,
             name: tax.name,
+            calculation_type: tax.calculation_type,
+            fixed_amount: tax.fixed_amount
           })
         }
       })
@@ -323,10 +330,12 @@ function selectPercentage() {
 
 function onSelectTax(selectedTax) {
   let amount = 0
-  if (props.store.getSubtotalWithDiscount && selectedTax.percent) {
+  if (selectedTax.calculation_type === 'percentage' && props.store.getSubtotalWithDiscount && selectedTax.percent) {
     amount = Math.round(
       (props.store.getSubtotalWithDiscount * selectedTax.percent) / 100
     )
+  } else if (selectedTax.calculation_type === 'fixed') {
+    amount = selectedTax.fixed_amount
   }
 
   let data = {
@@ -336,6 +345,8 @@ function onSelectTax(selectedTax) {
     percent: selectedTax.percent,
     tax_type_id: selectedTax.id,
     amount,
+    calculation_type: selectedTax.calculation_type,
+    fixed_amount: selectedTax.fixed_amount
   }
   props.store.$patch((state) => {
     state[props.storeProp].taxes.push({ ...data })

resources/scripts/admin/components/estimate-invoice-common/CreateTotalTaxes.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="flex items-center justify-between w-full mt-2 text-sm">
-    <label class="font-semibold leading-5 text-gray-500 uppercase">
+    <label v-if="tax.calculation_type === 'percentage'" class="font-semibold leading-5 text-gray-500 uppercase">
       {{ tax.name }} ({{ tax.percent }} %)
     </label>
+    <label v-else class="font-semibold leading-5 text-gray-500 uppercase">
+      {{ tax.name }} (<BaseFormatMoney :amount="tax.fixed_amount" :currency="currency" />)
+    </label>
     <label class="flex items-center justify-center text-lg text-black">
       <BaseFormatMoney :amount="tax.amount" :currency="currency" />
 
@@ -50,6 +53,10 @@ const emit = defineEmits(['update', 'remove'])
 const utils = inject('$utils')
 
 const taxAmount = computed(() => {
+  if (props.tax.calculation_type === 'fixed') {
+    return props.tax.fixed_amount;
+  }
+  
   if (props.tax.compound_tax && props.store.getSubtotalWithDiscount) {
     return Math.round(
       ((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) *

resources/scripts/admin/components/estimate-invoice-common/SelectTaxPopup.vue

@@ -110,7 +110,12 @@
                           cursor-pointer
                         "
                       >
-                        {{ taxType.percent }} %
+                        <template v-if="taxType.calculation_type === 'fixed'">
+                          <BaseFormatMoney :amount="taxType.fixed_amount" :currency="companyStore.selectedCompanyCurrency" />
+                        </template>
+                        <template v-else>
+                          {{ taxType.percent }} %
+                        </template>
                       </label>
                     </div>
                   </div>
@@ -173,7 +178,9 @@ import { useInvoiceStore } from '@/scripts/admin/stores/invoice'
 import { useModalStore } from '@/scripts/stores/modal'
 import { useTaxTypeStore } from '@/scripts/admin/stores/tax-type'
 import { useUserStore } from '@/scripts/admin/stores/user'
+import { useCompanyStore } from '@/scripts/admin/stores/company'
 import abilities from '@/scripts/admin/stub/abilities'
+import BaseFormatMoney from '@/scripts/components/base/BaseFormatMoney.vue'
 
 const props = defineProps({
   type: {
@@ -195,10 +202,15 @@ const emit = defineEmits(['select:taxType'])
 const modalStore = useModalStore()
 const taxTypeStore = useTaxTypeStore()
 const userStore = useUserStore()
+const companyStore = useCompanyStore()
 
 const { t } = useI18n()
 const textSearch = ref(null)
 
+const formatMoney = (amount) => {
+  return companyStore.formatMoney(amount)
+}
+
 const filteredTaxType = computed(() => {
   if (textSearch.value) {
     return taxTypeStore.taxTypes.filter(function (el) {