From bf5b544ca33f9fbc057429fb2573abac6d9403c0 Mon Sep 17 00:00:00 2001
From: mchev <martin.chevignard@gmail.com>
Date: Sun, 4 May 2025 02:24:56 +0200
Subject: [PATCH] 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
---
 app/Http/Requests/TaxTypeRequest.php          | 11 ++-
 app/Http/Resources/TaxResource.php            |  2 +
 app/Http/Resources/TaxTypeResource.php        |  2 +
 app/Models/Invoice.php                        |  1 +
 app/Models/Tax.php                            |  1 +
 app/Models/TaxType.php                        |  1 +
 database/factories/TaxTypeFactory.php         |  2 +
 ...55_update_taxes_to_handle_fixed_amount.php | 36 +++++++++
 lang/en.json                                  | 10 ++-
 .../CreateItemRowTax.vue                      | 33 +++++++-
 .../estimate-invoice-common/CreateTotal.vue   | 15 +++-
 .../CreateTotalTaxes.vue                      |  9 ++-
 .../SelectTaxPopup.vue                        | 14 +++-
 .../components/modal-components/ItemModal.vue | 18 ++++-
 .../modal-components/TaxTypeModal.vue         | 76 +++++++++++++++----
 resources/scripts/admin/stores/tax-type.js    |  4 +
 .../scripts/admin/views/items/Create.vue      | 18 ++++-
 .../admin/views/settings/TaxTypesSetting.vue  | 27 ++++++-
 .../app/pdf/estimate/partials/table.blade.php | 12 ++-
 .../app/pdf/invoice/partials/table.blade.php  | 12 ++-
 tests/Feature/Admin/ItemTest.php              | 28 +++++++
 tests/Feature/Admin/TaxTypeTest.php           | 13 ++++
 22 files changed, 306 insertions(+), 39 deletions(-)
 create mode 100644 database/migrations/2024_12_11_102055_update_taxes_to_handle_fixed_amount.php

diff --git a/app/Http/Requests/TaxTypeRequest.php b/app/Http/Requests/TaxTypeRequest.php
index 63605c4c..c16be432 100644
--- a/app/Http/Requests/TaxTypeRequest.php
+++ b/app/Http/Requests/TaxTypeRequest.php
@@ -28,8 +28,17 @@ class TaxTypeRequest extends FormRequest
                     ->where('type', TaxType::TYPE_GENERAL)
                     ->where('company_id', $this->header('company')),
             ],
-            'percent' => [
+            'calculation_type' => [
                 'required',
+                Rule::in(['percentage', 'fixed']),
+            ],
+            'percent' => [
+                'nullable',
+                'numeric',
+            ],
+            'fixed_amount' => [
+                'nullable',
+                'numeric',
             ],
             'description' => [
                 'nullable',
diff --git a/app/Http/Resources/TaxResource.php b/app/Http/Resources/TaxResource.php
index fe330850..d6e5ca61 100644
--- a/app/Http/Resources/TaxResource.php
+++ b/app/Http/Resources/TaxResource.php
@@ -25,6 +25,8 @@ class TaxResource extends JsonResource
             'name' => $this->name,
             'amount' => $this->amount,
             'percent' => $this->percent,
+            'calculation_type' => $this->calculation_type,
+            'fixed_amount' => $this->fixed_amount,
             'compound_tax' => $this->compound_tax,
             'base_amount' => $this->base_amount,
             'currency_id' => $this->currency_id,
diff --git a/app/Http/Resources/TaxTypeResource.php b/app/Http/Resources/TaxTypeResource.php
index 4a735205..a553c647 100644
--- a/app/Http/Resources/TaxTypeResource.php
+++ b/app/Http/Resources/TaxTypeResource.php
@@ -17,6 +17,8 @@ class TaxTypeResource extends JsonResource
             'id' => $this->id,
             'name' => $this->name,
             'percent' => $this->percent,
+            'fixed_amount' => $this->fixed_amount,
+            'calculation_type' => $this->calculation_type,
             'type' => $this->type,
             'compound_tax' => $this->compound_tax,
             'collective_tax' => $this->collective_tax,
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 5f2956b7..ae24c30a 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -521,6 +521,7 @@ class Invoice extends Model implements HasMedia
 
     public static function createTaxes($invoice, $taxes)
     {
+
         $exchange_rate = $invoice->exchange_rate;
 
         foreach ($taxes as $tax) {
diff --git a/app/Models/Tax.php b/app/Models/Tax.php
index c4711123..ae5682c6 100644
--- a/app/Models/Tax.php
+++ b/app/Models/Tax.php
@@ -21,6 +21,7 @@ class Tax extends Model
         return [
             'amount' => 'integer',
             'percent' => 'float',
+            'fixed_amount' => 'integer',
         ];
     }
 
diff --git a/app/Models/TaxType.php b/app/Models/TaxType.php
index 30dc7392..85480f0e 100644
--- a/app/Models/TaxType.php
+++ b/app/Models/TaxType.php
@@ -19,6 +19,7 @@ class TaxType extends Model
     {
         return [
             'percent' => 'float',
+            'fixed_amount' => 'integer',
             'compound_tax' => 'boolean',
         ];
     }
diff --git a/database/factories/TaxTypeFactory.php b/database/factories/TaxTypeFactory.php
index 7af2321b..895e0fdb 100644
--- a/database/factories/TaxTypeFactory.php
+++ b/database/factories/TaxTypeFactory.php
@@ -22,8 +22,10 @@ class TaxTypeFactory extends Factory
     {
         return [
             'name' => $this->faker->word(),
+            'calculation_type' => 'percentage',
             'company_id' => User::find(1)->companies()->first()->id,
             'percent' => $this->faker->numberBetween($min = 0, $max = 100),
+            'fixed_amount' => null,
             'description' => $this->faker->text(),
             'compound_tax' => 0,
             'collective_tax' => 0,
diff --git a/database/migrations/2024_12_11_102055_update_taxes_to_handle_fixed_amount.php b/database/migrations/2024_12_11_102055_update_taxes_to_handle_fixed_amount.php
new file mode 100644
index 00000000..961b46b4
--- /dev/null
+++ b/database/migrations/2024_12_11_102055_update_taxes_to_handle_fixed_amount.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::table('tax_types', function (Blueprint $table) {
+            $table->enum('calculation_type', ['percentage', 'fixed'])->default('percentage')->after('name');
+            $table->integer('fixed_amount')->nullable()->after('percent');
+            $table->decimal('percent', 5, 2)->nullable()->change();
+        });
+
+        Schema::table('taxes', function (Blueprint $table) {
+            $table->enum('calculation_type', ['percentage', 'fixed'])->default('percentage')->after('name');
+            $table->integer('fixed_amount')->nullable()->after('percent');
+            $table->decimal('percent', 5, 2)->nullable()->change();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('tax_types', function (Blueprint $table) {
+            $table->dropColumn(['calculation_type', 'fixed_amount']);
+            $table->decimal('percent', 5, 2)->change();
+        });
+
+        Schema::table('taxes', function (Blueprint $table) {
+            $table->dropColumn(['calculation_type', 'fixed_amount']);
+            $table->decimal('percent', 5, 2)->change();
+        });
+    }
+};
diff --git a/lang/en.json b/lang/en.json
index 92445c8d..84650b9d 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -161,7 +161,10 @@
     "name": "Name",
     "description": "Description",
     "percent": "Percent",
-    "compound_tax": "Compound Tax"
+    "compound_tax": "Compound Tax",
+    "percentage": "Percentage",
+    "fixed_amount": "Fixed Amount",
+    "tax_type": "Tax Type"
   },
   "global_search": {
     "search": "Search...",
@@ -1205,7 +1208,12 @@
       "tax_per_item": "Tax Per Item",
       "tax_name": "Tax Name",
       "compound_tax": "Compound Tax",
+      "amount": "Amount",
       "percent": "Percent",
+      "fixed_amount": "Fixed Amount",
+      "calculation_type": "Calculation Type",
+      "percentage": "Percentage",
+      "fixed": "Fixed",
       "action": "Action",
       "tax_setting_description": "Enable this if you want to add taxes to individual invoice items. By default, taxes are added directly to the invoice.",
       "created_message": "Tax type created successfully",
diff --git a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
index eecd3e5f..e212d955 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
+++ b/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>
+
diff --git a/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue b/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
index 2a2935e9..82affa8c 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
+++ b/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 })
diff --git a/resources/scripts/admin/components/estimate-invoice-common/CreateTotalTaxes.vue b/resources/scripts/admin/components/estimate-invoice-common/CreateTotalTaxes.vue
index fcb5e1a7..3f6d5c58 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateTotalTaxes.vue
+++ b/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) *
diff --git a/resources/scripts/admin/components/estimate-invoice-common/SelectTaxPopup.vue b/resources/scripts/admin/components/estimate-invoice-common/SelectTaxPopup.vue
index af054a3d..fdc4d48b 100644
--- a/resources/scripts/admin/components/estimate-invoice-common/SelectTaxPopup.vue
+++ b/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) {
diff --git a/resources/scripts/admin/components/modal-components/ItemModal.vue b/resources/scripts/admin/components/modal-components/ItemModal.vue
index b2dc66c6..e9d847d4 100644
--- a/resources/scripts/admin/components/modal-components/ItemModal.vue
+++ b/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,
       }
diff --git a/resources/scripts/admin/components/modal-components/TaxTypeModal.vue b/resources/scripts/admin/components/modal-components/TaxTypeModal.vue
index 0e0c438d..4925c1b3 100644
--- a/resources/scripts/admin/components/modal-components/TaxTypeModal.vue
+++ b/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>
diff --git a/resources/scripts/admin/stores/tax-type.js b/resources/scripts/admin/stores/tax-type.js
index 945e586a..d5feb91b 100644
--- a/resources/scripts/admin/stores/tax-type.js
+++ b/resources/scripts/admin/stores/tax-type.js
@@ -15,7 +15,9 @@ export const useTaxTypeStore = (useWindow = false) => {
       currentTaxType: {
         id: null,
         name: '',
+        calculation_type: 'percentage',
         percent: 0,
+        fixed_amount: 0,
         description: '',
         compound_tax: false,
         collective_tax: 0,
@@ -31,7 +33,9 @@ export const useTaxTypeStore = (useWindow = false) => {
         this.currentTaxType = {
           id: null,
           name: '',
+          calculation_type: 'percentage',
           percent: 0,
+          fixed_amount: 0,
           description: '',
           compound_tax: false,
           collective_tax: 0,
diff --git a/resources/scripts/admin/views/items/Create.vue b/resources/scripts/admin/views/items/Create.vue
index d4b57232..1e97f727 100644
--- a/resources/scripts/admin/views/items/Create.vue
+++ b/resources/scripts/admin/views/items/Create.vue
@@ -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,
diff --git a/resources/scripts/admin/views/settings/TaxTypesSetting.vue b/resources/scripts/admin/views/settings/TaxTypesSetting.vue
index 5bcec246..c4a9015d 100644
--- a/resources/scripts/admin/views/settings/TaxTypesSetting.vue
+++ b/resources/scripts/admin/views/settings/TaxTypesSetting.vue
@@ -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',
     },
diff --git a/resources/views/app/pdf/estimate/partials/table.blade.php b/resources/views/app/pdf/estimate/partials/table.blade.php
index b4875126..a060e0eb 100644
--- a/resources/views/app/pdf/estimate/partials/table.blade.php
+++ b/resources/views/app/pdf/estimate/partials/table.blade.php
@@ -106,7 +106,11 @@
             @foreach ($taxes as $tax)
                 <tr>
                     <td class="border-0 total-table-attribute-label">
-                        {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @if($tax->calculation_type === 'fixed')
+                            {{$tax->name }} ({!! format_money_pdf($tax->fixed_amount, $estimate->customer->currency) !!})
+                        @else
+                            {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @endif
                     </td>
                     <td class="py-2 border-0 item-cell total-table-attribute-value">
                         {!! format_money_pdf($tax->amount, $estimate->customer->currency) !!}
@@ -117,7 +121,11 @@
             @foreach ($estimate->taxes as $tax)
                 <tr>
                     <td class="border-0 total-table-attribute-label">
-                        {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @if($tax->calculation_type === 'fixed')
+                            {{$tax->name }} ({!! format_money_pdf($tax->fixed_amount, $estimate->customer->currency) !!})
+                        @else
+                            {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @endif
                     </td>
                     <td class="border-0 item-cell total-table-attribute-value" >
                         {!! format_money_pdf($tax->amount, $estimate->customer->currency) !!}
diff --git a/resources/views/app/pdf/invoice/partials/table.blade.php b/resources/views/app/pdf/invoice/partials/table.blade.php
index 84055b16..5db0a0eb 100644
--- a/resources/views/app/pdf/invoice/partials/table.blade.php
+++ b/resources/views/app/pdf/invoice/partials/table.blade.php
@@ -125,7 +125,11 @@
             @foreach ($taxes as $tax)
                 <tr>
                     <td class="border-0 total-table-attribute-label">
-                        {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @if($tax->calculation_type === 'fixed')
+                            {{$tax->name }} ({!! format_money_pdf($tax->fixed_amount, $invoice->customer->currency) !!})
+                        @else
+                            {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @endif
                     </td>
                     <td class="py-2 border-0 item-cell total-table-attribute-value">
                         {!! format_money_pdf($tax->amount, $invoice->customer->currency) !!}
@@ -136,7 +140,11 @@
             @foreach ($invoice->taxes as $tax)
                 <tr>
                     <td class="border-0 total-table-attribute-label">
-                        {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @if($tax->calculation_type === 'fixed')
+                            {{$tax->name }} ({!! format_money_pdf($tax->fixed_amount, $invoice->customer->currency) !!})
+                        @else
+                            {{$tax->name.' ('.$tax->percent.'%)'}}
+                        @endif
                     </td>
                     <td class="py-2 border-0 item-cell total-table-attribute-value">
                         {!! format_money_pdf($tax->amount, $invoice->customer->currency) !!}
diff --git a/tests/Feature/Admin/ItemTest.php b/tests/Feature/Admin/ItemTest.php
index bfb6657a..b6ab0cab 100644
--- a/tests/Feature/Admin/ItemTest.php
+++ b/tests/Feature/Admin/ItemTest.php
@@ -141,3 +141,31 @@ test('search items', function () {
 
     $response->assertOk();
 });
+
+test('create item with fixed amount tax', function () {
+    $item = Item::factory()->raw([
+        'taxes' => [
+            Tax::factory()->raw([
+                'calculation_type' => 'fixed',
+                'fixed_amount' => 5000,
+            ]),
+        ],
+    ]);
+
+    $response = postJson('api/v1/items', $item);
+
+    $response->assertOk();
+
+    $this->assertDatabaseHas('items', [
+        'name' => $item['name'],
+        'description' => $item['description'],
+        'price' => $item['price'],
+        'company_id' => $item['company_id'],
+    ]);
+
+    $this->assertDatabaseHas('taxes', [
+        'item_id' => $response->getData()->data->id,
+        'calculation_type' => 'fixed',
+        'fixed_amount' => 5000,
+    ]);
+});
diff --git a/tests/Feature/Admin/TaxTypeTest.php b/tests/Feature/Admin/TaxTypeTest.php
index 4b8ed153..1c0c6413 100644
--- a/tests/Feature/Admin/TaxTypeTest.php
+++ b/tests/Feature/Admin/TaxTypeTest.php
@@ -97,3 +97,16 @@ test('create negative tax type', function () {
 
     $this->assertDatabaseHas('tax_types', $taxType);
 });
+
+test('create fixed amount tax type', function () {
+    $taxType = TaxType::factory()->raw([
+        'calculation_type' => 'fixed',
+        'percent' => null,
+        'fixed_amount' => 5000,
+    ]);
+
+    postJson('api/v1/tax-types', $taxType)
+        ->assertStatus(201);
+
+    $this->assertDatabaseHas('tax_types', $taxType);
+});