fix PDF URL issue

app/Http/Requests/EstimatesRequest.php

@@ -45,21 +45,15 @@ class EstimatesRequest extends FormRequest
                 'nullable'
             ],
             'discount' => [
-                'numeric',
                 'required',
             ],
             'discount_val' => [
-                'integer',
                 'required',
             ],
             'sub_total' => [
-                'integer',
                 'required',
             ],
             'total' => [
-                'integer',
-                'numeric',
-                'max:99999999',
                 'required',
             ],
             'tax' => [
@@ -83,11 +77,9 @@ class EstimatesRequest extends FormRequest
                 'required',
             ],
             'items.*.quantity' => [
-                'integer',
                 'required',
             ],
             'items.*.price' => [
-                'integer',
                 'required',
             ],
         ];

app/Http/Requests/InvoicesRequest.php

@@ -45,21 +45,15 @@ class InvoicesRequest extends FormRequest
                 'nullable'
             ],
             'discount' => [
-                'numeric',
                 'required',
             ],
             'discount_val' => [
-                'integer',
                 'required',
             ],
             'sub_total' => [
-                'integer',
                 'required',
             ],
             'total' => [
-                'integer',
-                'numeric',
-                'max:99999999',
                 'required',
             ],
             'tax' => [
@@ -83,11 +77,9 @@ class InvoicesRequest extends FormRequest
                 'required',
             ],
             'items.*.quantity' => [
-                'integer',
                 'required',
             ],
             'items.*.price' => [
-                'integer',
                 'required',
             ],
         ];

app/Http/Requests/RecurringInvoiceRequest.php

@@ -43,21 +43,15 @@ class RecurringInvoiceRequest extends FormRequest
                 'nullable'
             ],
             'discount' => [
-                'numeric',
                 'required',
             ],
             'discount_val' => [
-                'integer',
                 'required',
             ],
             'sub_total' => [
-                'integer',
                 'required',
             ],
             'total' => [
-                'integer',
-                'numeric',
-                'max:99999999',
                 'required',
             ],
             'tax' => [

config/hashids.php

@@ -46,32 +46,32 @@ return [
         Invoice::class => [
             'salt' => Invoice::class.config('app.key'),
             'length' => '20',
-            'alphabet' => 'XKyIAR7mgt8jD2vbqPrOSVenNGpiYLx4M61T',
+            'alphabet' => 'XKAR7m8jD2bqP9OSVeNGiYL465T10zhfWuc3',
         ],
         Estimate::class => [
             'salt' => Estimate::class.config('app.key'),
             'length' => '20',
-            'alphabet' => 'yLJWP79M8rYVqbn1NXjulO6IUDdvekRQGo40',
+            'alphabet' => 'yJW2P79M8rCHsVq5zbn1fXl6IUt3dAekGo40',
         ],
         Payment::class => [
             'salt' => Payment::class.config('app.key'),
             'length' => '20',
-            'alphabet' => 'asqtW3eDRIxB65GYl7UVLS1dybn9XrKTZ4zO',
+            'alphabet' => 'aqW3eR2Icf0jp65Gl7UVS1dhyb8Mn9XKTZ4O',
         ],
         Company::class => [
             'salt' => Company::class.config('app.key'),
             'length' => '20',
-            'alphabet' => 's0DxOFtEYEnuKPmP08Ch6A1iHlLmBTBVWms5',
+            'alphabet' => 's0D7xOFYEqn2uKJm3Pr9g8Cz46A1iHLBTVW5',
         ],
         EmailLog::class => [
             'salt' => EmailLog::class.config('app.key'),
             'length' => '20',
-            'alphabet' => 'BRAMEz5str5UVe9oCqzoYY2oKgUi8wQQSmrR',
+            'alphabet' => 'BA5tJUVNPe93fCq6DHlY2x4ZO1Kg7i8wSm0R',
         ],
         Transaction::class => [
             'salt' => Transaction::class.config('app.key'),
             'length' => '20',
-            'alphabet' => 'ADyQWE8mgt7jF2vbnPrKLJenHVpiUIq4M12T',
+            'alphabet' => 'ADyWE86Cg7jF23vS0bonXrZ5KLH9puIQ4M1T',
         ],
     ],
 ];

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

@@ -271,19 +271,23 @@ const price = computed({
     } else {
       updateItemAttribute('price', newValue)
     }
-    setDiscount()
   },
 })
 
-const subtotal = computed(() => Math.round(props.itemData.price * props.itemData.quantity))
+const subtotal = computed(() => props.itemData.price * props.itemData.quantity)
 
 const discount = computed({
   get: () => {
     return props.itemData.discount
   },
   set: (newValue) => {
+    if (props.itemData.discount_type === 'percentage') {
+      updateItemAttribute('discount_val', (subtotal.value * newValue) / 100)
+    } else {
+      updateItemAttribute('discount_val', Math.round(newValue * 100))
+    }
+
     updateItemAttribute('discount', newValue)
-    setDiscount()
   },
 })
 
@@ -309,7 +313,7 @@ const showRemoveButton = computed(() => {
 const totalSimpleTax = computed(() => {
   return Math.round(
     sumBy(props.itemData.taxes, function (tax) {
-      if (tax.amount) {
+      if (!tax.compound_tax) {
         return tax.amount
       }
       return 0
@@ -317,7 +321,18 @@ const totalSimpleTax = computed(() => {
   )
 })
 
-const totalTax = computed(() => totalSimpleTax.value)
+const totalCompoundTax = computed(() => {
+  return Math.round(
+    sumBy(props.itemData.taxes, function (tax) {
+      if (tax.compound_tax) {
+        return tax.amount
+      }
+      return 0
+    })
+  )
+})
+
+const totalTax = computed(() => totalSimpleTax.value + totalCompoundTax.value)
 
 const rules = {
   name: {
@@ -384,7 +399,7 @@ const v$ = useVuelidate(
 
 function updateTax(data) {
   props.store.$patch((state) => {
-     state[props.storeProp].items[props.index]['taxes'][data.index] = data.item
+    state[props.storeProp].items[props.index]['taxes'][data.index] = data.item
   })
 
   let lastTax = props.itemData.taxes[props.itemData.taxes.length - 1]
@@ -401,16 +416,6 @@ function updateTax(data) {
   syncItemToStore()
 }
 
-function setDiscount() {
-  const newValue = props.store[props.storeProp].items[props.index].discount
-
-  if (props.itemData.discount_type === 'percentage'){
-    updateItemAttribute('discount_val', Math.round((subtotal.value * newValue) / 100))
-  }else{
-    updateItemAttribute('discount_val', Math.round(newValue * 100))
-  }
-}
-
 function searchVal(val) {
   updateItemAttribute('name', val)
 }
@@ -480,12 +485,10 @@ function syncItemToStore() {
     total: total.value,
     sub_total: subtotal.value,
     totalSimpleTax: totalSimpleTax.value,
+    totalCompoundTax: totalCompoundTax.value,
     totalTax: totalTax.value,
     tax: totalTax.value,
     taxes: [...itemTaxes],
-    tax_type_ids: itemTaxes.flatMap(_t =>
-      _t.tax_type_id ? _t.tax_type_id : [],
-    ),
   }
 
   props.store.updateItem(data)

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

@@ -146,14 +146,14 @@ const filteredTypes = computed(() => {
 })
 
 const taxAmount = computed(() => {
+  if (localTax.compound_tax && props.discountedTotal) {
+    return ((props.discountedTotal + props.totalTax) * localTax.percent) / 100
+  }
+
   if (props.discountedTotal && localTax.percent) {
-    const taxPerItemEnabled = props.store[props.storeProp].tax_per_item === 'YES'
-    const discountPerItemEnabled = props.store[props.storeProp].discount_per_item === 'YES'
-    if (taxPerItemEnabled && !discountPerItemEnabled){
-      return getTaxAmount()
-    }
     return (props.discountedTotal * localTax.percent) / 100
   }
+
   return 0
 })
 
@@ -171,13 +171,6 @@ watch(
   }
 )
 
-watch(
-  () => taxAmount.value,
-  () => {
-    updateRowTax()
-  },
-)
-
 // Set SelectedTax
 if (props.taxData.tax_type_id > 0) {
   selectedTax.value = taxTypeStore.taxTypes.find(
@@ -190,6 +183,7 @@ updateRowTax()
 function onSelectTax(val) {
   localTax.percent = val.percent
   localTax.tax_type_id = val.id
+  localTax.compound_tax = val.compound_tax
   localTax.name = val.name
 
   updateRowTax()
@@ -226,27 +220,6 @@ function openTaxModal() {
 function removeTax(index) {
   props.store.$patch((state) => {
     state[props.storeProp].items[props.itemIndex].taxes.splice(index, 1)
-    state[props.storeProp].items[props.itemIndex].tax = 0
-    state[props.storeProp].items[props.itemIndex].totalTax = 0
   })
 }
-
-function getTaxAmount() {
-  let total = 0
-  let discount = 0
-  const itemTotal = props.discountedTotal
-  const modelDiscount = props.store[props.storeProp].discount ? props.store[props.storeProp].discount : 0
-  const type = props.store[props.storeProp].discount_type
-  if (modelDiscount > 0) {
-    props.store[props.storeProp].items.forEach((_i) => {
-      total += _i.total
-    })
-    const proportion = (itemTotal / total).toFixed(2)
-    discount = type === 'fixed' ? modelDiscount * 100 : (total * modelDiscount) / 100
-    const itemDiscount = Math.round(discount * proportion)
-    const discounted = itemTotal - itemDiscount
-    return Math.round((discounted * localTax.percent) / 100)
-  }
-  return Math.round((props.discountedTotal * localTax.percent) / 100)
-}
 </script>

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

@@ -191,7 +191,7 @@
 </template>
 
 <script setup>
-import { computed, inject, ref, watch } from 'vue'
+import { computed, inject, ref } from 'vue'
 import Guid from 'guid'
 import Tax from './CreateTotalTaxes.vue'
 import TaxStub from '@/scripts/admin/stub/abilities'
@@ -227,20 +227,19 @@ const utils = inject('$utils')
 
 const companyStore = useCompanyStore()
 
-watch(
-  () => props.store[props.storeProp].items,
-  (val) => {
-    setDiscount()
-  }, { deep: true },
-)
-
 const totalDiscount = computed({
   get: () => {
     return props.store[props.storeProp].discount
   },
   set: (newValue) => {
+    if (props.store[props.storeProp].discount_type === 'percentage') {
+      props.store[props.storeProp].discount_val = Math.round(
+        (props.store.getSubTotal * newValue) / 100
+      )
+    } else {
+      props.store[props.storeProp].discount_val = Math.round(newValue * 100)
+    }
     props.store[props.storeProp].discount = newValue
-    setDiscount()
   },
 })
 
@@ -266,7 +265,7 @@ const itemWiseTaxes = computed(() => {
         } else if (tax.tax_type_id) {
           taxes.push({
             tax_type_id: tax.tax_type_id,
-            amount: Math.round(tax.amount),
+            amount: tax.amount,
             percent: tax.percent,
             name: tax.name,
           })
@@ -285,19 +284,6 @@ const defaultCurrency = computed(() => {
   }
 })
 
-function setDiscount() {
-  const newValue = props.store[props.storeProp].discount
-
-  if (props.store[props.storeProp].discount_type === 'percentage') {
-    props.store[props.storeProp].discount_val
-      = Math.round((props.store.getSubTotal * newValue) / 100)
-
-    return
-  }
-
-  props.store[props.storeProp].discount_val = Math.round(newValue * 100)
-}
-
 function selectFixed() {
   if (props.store[props.storeProp].discount_type === 'fixed') {
     return
@@ -309,21 +295,24 @@ function selectFixed() {
 }
 
 function selectPercentage() {
-  if (props.store[props.storeProp].discount_type === 'percentage'){
+  if (props.store[props.storeProp].discount_type === 'percentage') {
     return
   }
-
+  props.store[props.storeProp].discount_val =
-  const val = Math.round(props.store[props.storeProp].discount * 100) / 100
+    (props.store.getSubTotal * props.store[props.storeProp].discount) / 100
-
-  props.store[props.storeProp].discount_val
-    = Math.round((props.store.getSubTotal * val) / 100)
-
   props.store[props.storeProp].discount_type = 'percentage'
 }
 
 function onSelectTax(selectedTax) {
   let amount = 0
-  if (props.store.getSubtotalWithDiscount && selectedTax.percent) {
+
+  if (selectedTax.compound_tax && props.store.getSubtotalWithDiscount) {
+    amount = Math.round(
+      ((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) *
+        selectedTax.percent) /
+        100
+    )
+  } else if (props.store.getSubtotalWithDiscount && selectedTax.percent) {
     amount = Math.round(
       (props.store.getSubtotalWithDiscount * selectedTax.percent) / 100
     )
@@ -334,6 +323,7 @@ function onSelectTax(selectedTax) {
     id: Guid.raw(),
     name: selectedTax.name,
     percent: selectedTax.percent,
+    compound_tax: selectedTax.compound_tax,
     tax_type_id: selectedTax.id,
     amount,
   }

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

@@ -77,6 +77,17 @@
               @input="v$.currentTaxType.description.$touch()"
             />
           </BaseInputGroup>
+
+          <BaseInputGroup
+            :label="$t('tax_types.compound_tax')"
+            variant="horizontal"
+            class="flex flex-row-reverse"
+          >
+            <BaseSwitch
+              v-model="taxTypeStore.currentTaxType.compound_tax"
+              class="flex items-center"
+            />
+          </BaseInputGroup>
         </BaseInputGrid>
       </div>
       <div
@@ -198,7 +209,14 @@ async function submitTaxTypeData() {
 
 function SelectTax(taxData) {
   let amount = 0
- if (estimateStore.getSubtotalWithDiscount && taxData.percent) {
+  if (taxData.compound_tax && estimateStore.getSubtotalWithDiscount) {
+    amount = Math.round(
+      ((estimateStore.getSubtotalWithDiscount +
+        estimateStore.getTotalSimpleTax) *
+        taxData.percent) /
+        100
+    )
+  } else if (estimateStore.getSubtotalWithDiscount && taxData.percent) {
     amount = Math.round(
       (estimateStore.getSubtotalWithDiscount * taxData.percent) / 100
     )
@@ -208,6 +226,7 @@ function SelectTax(taxData) {
     id: Guid.raw(),
     name: taxData.name,
     percent: taxData.percent,
+    compound_tax: taxData.compound_tax,
     tax_type_id: taxData.id,
     amount,
   }
@@ -223,6 +242,7 @@ function selectItemTax(taxData) {
       id: Guid.raw(),
       name: taxData.name,
       percent: taxData.percent,
+      compound_tax: taxData.compound_tax,
       tax_type_id: taxData.id,
     }
     modalStore.refreshData(data)

resources/scripts/admin/stores/estimate.js

@@ -143,8 +143,7 @@ export const useEstimateStore = (useWindow = false) => {
           axios
             .get(`/api/v1/estimates/${id}`)
             .then((response) => {
-              this.setEstimateData(response.data.data)
+              Object.assign(this.newEstimate, response.data.data)
-              this.setCustomerAddresses(this.newEstimate.customer)
               resolve(response)
             })
             .catch((err) => {
@@ -155,41 +154,6 @@ export const useEstimateStore = (useWindow = false) => {
         })
       },
 
-      setEstimateData(estimate) {
-        Object.assign(this.newEstimate, estimate)
-        if (this.newEstimate.tax_per_item === 'YES') {
-          this.newEstimate.items.forEach((_i) => {
-            if (_i.taxes && !_i.taxes.length){
-              _i.taxes.push({ ...taxStub, id: Guid.raw() })
-            }
-          })
-        }
-        if (this.newEstimate.discount_per_item === 'YES') {
-          this.newEstimate.items.forEach((_i, index) => {
-            if (_i.discount_type === 'fixed'){
-              this.newEstimate.items[index].discount = _i.discount / 100
-            }
-          })
-        }
-        else {
-          if (this.newEstimate.discount_type === 'fixed'){
-            this.newEstimate.discount = this.newEstimate.discount / 100
-          }
-        }
-      },
-
-      setCustomerAddresses(customer) {
-        const customer_business = customer.customer_business
-
-        if (customer_business?.billing_address){
-          this.newEstimate.customer.billing_address = customer_business.billing_address
-        }
-
-        if (customer_business?.shipping_address){
-          this.newEstimate.customer.shipping_address = customer_business.shipping_address
-        }
-      },
-
       addSalesTaxUs() {
         const taxTypeStore = useTaxTypeStore()
         let salesTax = { ...taxStub }

resources/scripts/admin/stores/invoice.js

@@ -133,8 +133,8 @@ export const useInvoiceStore = (useWindow = false) => {
           axios
             .get(`/api/v1/invoices/${id}`)
             .then((response) => {
-              this.setInvoiceData(response.data.data)
+              Object.assign(this.newInvoice, response.data.data)
-              this.setCustomerAddresses(this.newInvoice.customer)
+              this.newInvoice.customer = response.data.data.customer
               resolve(response)
             })
             .catch((err) => {
@@ -144,38 +144,6 @@ export const useInvoiceStore = (useWindow = false) => {
         })
       },
 
-      setInvoiceData(invoice) {
-        Object.assign(this.newInvoice, invoice)
-
-        if (this.newInvoice.tax_per_item === 'YES') {
-          this.newInvoice.items.forEach((_i) => {
-            if (_i.taxes && !_i.taxes.length)
-              _i.taxes.push({ ...taxStub, id: Guid.raw() })
-          })
-        }
-
-        if (this.newInvoice.discount_per_item === 'YES') {
-          this.newInvoice.items.forEach((_i, index) => {
-            if (_i.discount_type === 'fixed')
-              this.newInvoice.items[index].discount = _i.discount / 100
-          })
-        }
-        else {
-          if (this.newInvoice.discount_type === 'fixed')
-            this.newInvoice.discount = this.newInvoice.discount / 100
-        }
-      },
-
-      setCustomerAddresses(customer) {
-        const customer_business = customer.customer_business
-
-        if (customer_business?.billing_address)
-          this.newInvoice.customer.billing_address = customer_business.billing_address
-
-        if (customer_business?.shipping_address)
-          this.newInvoice.customer.shipping_address = customer_business.shipping_address
-      },
-
       addSalesTaxUs() {
         const taxTypeStore = useTaxTypeStore()
         let salesTax = { ...taxStub }

resources/scripts/admin/views/estimates/create/EstimateCreate.vue

@@ -138,7 +138,6 @@
 
 <script setup>
 import { computed, ref, watch, onMounted } from 'vue'
-import { cloneDeep } from 'lodash'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import {
@@ -258,30 +257,11 @@ async function submitForm() {
 
   isSaving.value = true
 
-  let data = cloneDeep({
+  let data = {
     ...estimateStore.newEstimate,
     sub_total: estimateStore.getSubTotal,
     total: estimateStore.getTotal,
     tax: estimateStore.getTotalTax,
-  })
-  if (data.discount_per_item === 'YES') {
-    data.items.forEach((item, index) => {
-      if (item.discount_type === 'fixed'){
-        data.items[index].discount = Math.round(item.discount * 100)
-      }
-    })
-  }
-  else {
-    if (data.discount_type === 'fixed'){
-      data.discount = Math.round(data.discount * 100)
-    }
-  }
-
-  if (
-    !estimateStore.newEstimate.tax_per_item === 'YES'
-    && data.taxes.length
-  ){
-    data.tax_type_ids = data.taxes.map(_t => _t.tax_type_id)
   }
 
   const action = isEdit.value

resources/scripts/admin/views/invoices/create/InvoiceCreate.vue

@@ -147,7 +147,6 @@ import {
   decimal,
 } from '@vuelidate/validators'
 import useVuelidate from '@vuelidate/core'
-import { cloneDeep } from 'lodash'
 
 import { useInvoiceStore } from '@/scripts/admin/stores/invoice'
 import { useModuleStore } from '@/scripts/admin/stores/module'
@@ -259,29 +258,11 @@ async function submitForm() {
 
   isSaving.value = true
 
-  let data = cloneDeep({
+  let data = {
     ...invoiceStore.newInvoice,
     sub_total: invoiceStore.getSubTotal,
     total: invoiceStore.getTotal,
     tax: invoiceStore.getTotalTax,
-  })
-  if (data.discount_per_item === 'YES') {
-    data.items.forEach((item, index) => {
-      if (item.discount_type === 'fixed'){
-        data.items[index].discount = item.discount * 100
-      }
-    })
-  }
-  else {
-    if (data.discount_type === 'fixed'){
-      data.discount = data.discount * 100
-    }
-  }
-    if (
-    !invoiceStore.newInvoice.tax_per_item === 'YES'
-    && data.taxes.length
-  ){
-    data.tax_type_ids = data.taxes.map(_t => _t.tax_type_id)
   }
 
   try {

resources/scripts/admin/views/settings/TaxTypesSetting.vue

@@ -20,6 +20,21 @@
       :data="fetchData"
       :columns="taxTypeColumns"
     >
+      <template #cell-compound_tax="{ row }">
+        <BaseBadge
+          :bg-color="
+            utils.getBadgeStatusColor(row.data.compound_tax ? 'YES' : 'NO')
+              .bgColor
+          "
+          :color="
+            utils.getBadgeStatusColor(row.data.compound_tax ? 'YES' : 'NO')
+              .color
+          "
+        >
+          {{ row.data.compound_tax ? 'Yes' : 'No'.replace('_', ' ') }}
+        </BaseBadge>
+      </template>
+
       <template #cell-percent="{ row }"> {{ row.data.percent }} % </template>
 
       <template v-if="hasAtleastOneAbility()" #cell-actions="{ row }">
@@ -76,6 +91,11 @@ const taxTypeColumns = computed(() => {
       thClass: 'extra',
       tdClass: 'font-medium text-gray-900',
     },
+    {
+      key: 'compound_tax',
+      label: t('settings.tax_types.compound_tax'),
+      tdClass: 'font-medium text-gray-900',
+    },
     {
       key: 'percent',
       label: t('settings.tax_types.percent'),

resources/scripts/components/base/base-table/BaseTable.vue

@@ -309,8 +309,6 @@ function changeSorting(column) {
   }
 
   if (!usesLocalData.value) {
-    if (pagination.value)
-      pagination.value.currentPage = 1
     mapDataToRows()
   }
 }
@@ -328,10 +326,7 @@ async function pageChange(page) {
   await mapDataToRows()
 }
 
-async function refresh(isPreservePage = false) {
+async function refresh() {
-  if (pagination.value && !isPreservePage)
-    pagination.value.currentPage = 1
-
   await mapDataToRows()
 }