Merge branch 'master' into master

resources/scripts/admin/views/customers/Create.vue

@@ -157,6 +157,24 @@
                 @input="v$.currentCustomer.prefix.$touch()"
               />
             </BaseInputGroup>
+
+            <BaseInputGroup
+              :label="$t('customers.tax_id')"
+              :error="
+                v$.currentCustomer.tax_id.$error &&
+                v$.currentCustomer.tax_id.$errors[0].$message
+              "
+              :content-loading="isFetchingInitialData"
+            >
+              <BaseInput
+                v-model="customerStore.currentCustomer.tax_id"
+                :content-loading="isFetchingInitialData"
+                type="text"
+                name="tax_id"
+                :invalid="v$.currentCustomer.tax_id.$error"
+                @input="v$.currentCustomer.tax_id.$touch()"
+              />
+            </BaseInputGroup>
           </BaseInputGrid>
         </div>
 
@@ -645,6 +663,9 @@ const rules = computed(() => {
           minLength(3)
         ),
       },
+      tax_id: {
+        required: helpers.withMessage(t('validation.required'), required),
+      },
       currency_id: {
         required: helpers.withMessage(t('validation.required'), required),
       },

resources/scripts/admin/views/estimates/Index.vue

@@ -174,6 +174,7 @@
         :data="fetchData"
         :columns="estimateColumns"
         :placeholder-count="estimateStore.totalEstimateCount >= 20 ? 10 : 5"
+        :key="tableKey"
         class="mt-10"
       >
         <template #header>
@@ -256,6 +257,7 @@ const dialogStore = useDialogStore()
 const userStore = useUserStore()
 
 const tableComponent = ref(null)
+const tableKey = ref(0)
 const { t } = useI18n()
 const showFilters = ref(false)
 const status = ref([
@@ -408,6 +410,8 @@ function setFilters() {
     state.selectAllField = false
   })
 
+  tableKey.value += 1
+
   refreshTable()
 }
 

resources/scripts/admin/views/invoices/Index.vue

@@ -172,6 +172,7 @@
         :data="fetchData"
         :columns="invoiceColumns"
         :placeholder-count="invoiceStore.invoiceTotalCount >= 20 ? 10 : 5"
+        :key="tableKey"
         class="mt-10"
       >
         <!-- Select All Checkbox -->
@@ -288,6 +289,7 @@ const { t } = useI18n()
 // Local State
 const utils = inject('$utils')
 const table = ref(null)
+const tableKey = ref(0)
 const showFilters = ref(false)
 
 const status = ref([
@@ -416,9 +418,12 @@ async function fetchData({ page, filter, sort }) {
     page,
   }
 
+  console.log(data)
+
   isRequestOngoing.value = true
 
   let response = await invoiceStore.fetchInvoices(data)
+  console.log('API response:', response.data.data)
 
   isRequestOngoing.value = false
 
@@ -464,6 +469,8 @@ function setFilters() {
     state.selectAllField = false
   })
 
+  tableKey.value += 1
+
   refreshTable()
 }