From 21b4913e197d6ec89a73c4bf9904ffe9cd887aa8 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 13 Dec 2024 08:33:05 +0100
Subject: [PATCH 1/3] feat: refs #7235 update invoice out global form to fetch
 config based on serial type

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue |  3 +++
 src/stores/invoiceOutGlobal.js                | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 3fd3104bf..e6c689523 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -115,6 +115,9 @@ onMounted(async () => {
             <VnSelect
                 :label="t('invoiceOutSerialType')"
                 v-model="formData.serialType"
+                @update:model-value="
+                    invoiceOutGlobalStore.fetchInvoiceOutConfig(formData)
+                "
                 :options="serialTypesOptions"
                 option-value="type"
                 option-label="type"
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 332494aa8..cc8d86ea8 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -19,7 +19,7 @@ export const useInvoiceOutGlobalStore = defineStore({
             maxShipped: null,
             clientId: null,
             printer: null,
-            serialType: null,
+            serialType: 'global',
         },
         addresses: [],
         minInvoicingDate: null,
@@ -41,7 +41,6 @@ export const useInvoiceOutGlobalStore = defineStore({
 
         async fetchAllData() {
             try {
-                const userInfo = await useUserConfig().fetch();
                 const date = Date.vnNew();
                 this.formInitialData.maxShipped = new Date(
                     date.getFullYear(),
@@ -53,7 +52,7 @@ export const useInvoiceOutGlobalStore = defineStore({
 
                 await Promise.all([
                     this.fetchParallelism(),
-                    this.fetchInvoiceOutConfig(userInfo.companyFk),
+                    this.fetchInvoiceOutConfig(),
                 ]);
 
                 this.initialDataLoading = false;
@@ -62,21 +61,23 @@ export const useInvoiceOutGlobalStore = defineStore({
             }
         },
 
-        async fetchInvoiceOutConfig(companyFk) {
+        async fetchInvoiceOutConfig(formData = this.formInitialData) {
             try {
-                this.formInitialData.companyFk = companyFk;
-                const params = { companyFk: companyFk };
+                const userInfo = await useUserConfig().fetch();
+                const params = {
+                    companyFk: userInfo.companyFk,
+                    serialType: formData.serialType,
+                };
 
                 const { data } = await axios.get('InvoiceOuts/getInvoiceDate', {
                     params,
                 });
 
-                const stringDate = data.issued.substring(0, 10);
-                this.minInvoicingDate = stringDate;
-                this.formInitialData.invoiceDate = stringDate;
-
-                this.minInvoicingDate = new Date(data.issued);
+                this.minInvoicingDate = data?.issued
+                    ? new Date(data.issued)
+                    : Date.vnNew();
                 this.formInitialData.invoiceDate = this.minInvoicingDate;
+                formData.invoiceDate = this.minInvoicingDate;
             } catch (err) {
                 console.error('Error fetching invoice out global initial data');
                 throw new Error();

From 2d9d58f79c500294e90797ee1dc58be0277ef9a4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Dec 2024 12:45:02 +0100
Subject: [PATCH 2/3] fix: monitorPayMethodFilter

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 25 ++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 05aee1607..225038e76 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -26,6 +26,7 @@ const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const DepartmentOpts = ref([]);
+const PayMethodOpts = ref([]);
 const ItemPackingTypeOpts = ref([]);
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
@@ -223,7 +224,16 @@ const columns = computed(() => [
         label: t('salesTicketsTable.payMethod'),
         name: 'payMethod',
         align: 'left',
-        columnFilter: false,
+        columnFilter: {
+            component: 'select',
+            url: 'PayMethods',
+            attrs: {
+                options: PayMethodOpts.value,
+                optionValue: 'id',
+                optionLabel: 'name',
+                dense: true,
+            },
+        },
     },
     {
         label: t('salesTicketsTable.total'),
@@ -247,7 +257,7 @@ const columns = computed(() => [
             url: 'Departments',
             attrs: {
                 options: DepartmentOpts.value,
-                optionValue: 'name',
+                optionValue: 'id',
                 optionLabel: 'name',
                 dense: true,
             },
@@ -364,6 +374,15 @@ const openTab = (id) =>
         auto-load
         @on-fetch="(data) => (DepartmentOpts = data)"
     />
+    <FetchData
+        url="PayMethods"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (PayMethodOpts = data)"
+    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>
@@ -383,7 +402,7 @@ const openTab = (id) =>
         auto-load
         :row-click="({ id }) => openTab(id)"
         :disable-option="{ card: true }"
-        :user-params="{ from, to, scopeDays: 0, packing }"
+        :user-params="{ from, to, scopeDays: 0 }"
     >
         <template #top-left>
             <QBtn

From 3da7425f6f90ed751d994ec6cefe67b0cf02e9d2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Dec 2024 12:59:27 +0100
Subject: [PATCH 3/3] fix: remove url

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 225038e76..ef03ec20d 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -254,11 +254,8 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
-            url: 'Departments',
             attrs: {
                 options: DepartmentOpts.value,
-                optionValue: 'id',
-                optionLabel: 'name',
                 dense: true,
             },
         },