From ac8e9cbfd25e2391627943e0ab50990438886b87 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 29 Jan 2025 12:43:02 +0100
Subject: [PATCH 01/75] refactor: refs #7414 update VnLog component to change
 display order value changes on update action

---
 src/components/common/VnLog.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index fdf2e52ee..d1d8d8360 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -641,16 +641,7 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
-                                                        #{{ prop.val.id }}
-                                                    </span>
-                                                    <span v-if="log.action == 'update'">
-                                                        ←
-                                                        <VnJsonValue
+                                                    <VnJsonValue
                                                             :value="prop.old.val"
                                                         />
                                                         <span
@@ -659,6 +650,15 @@ watch(
                                                         >
                                                             #{{ prop.old.id }}
                                                         </span>
+                                                    <span v-if="log.action == 'update'">
+                                                        →
+                                                        <VnJsonValue :value="prop.val.val" />
+                                                            <span
+                                                                v-if="prop.val.id"
+                                                                class="id-value"
+                                                            >
+                                                        #{{ prop.val.id }}
+                                                    </span>
                                                     </span>
                                                 </div>
                                             </span>

From 3172ce8cecad5659239f2c7f66e4f86f43dff21b Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 10 Feb 2025 09:40:43 +0100
Subject: [PATCH 02/75] fix: refs #7414 updated default value rendering for
 non-update scenarios

---
 src/components/common/VnLog.vue | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index a90766c84..5a70edf6c 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -641,24 +641,20 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue
-                                                            :value="prop.old.val"
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                        >
-                                                            #{{ prop.old.id }}
-                                                        </span>
                                                     <span v-if="log.action == 'update'">
+                                                        <VnJsonValue :value="prop.old.val" />
+                                                        <span v-if="prop.old.id" class="id-value">
+                                                                #{{ prop.old.id }}
+                                                        </span>
                                                         →
                                                         <VnJsonValue :value="prop.val.val" />
-                                                            <span
-                                                                v-if="prop.val.id"
-                                                                class="id-value"
-                                                            >
-                                                        #{{ prop.val.id }}
+                                                        <span v-if="prop.val.id" class="id-value">
+                                                            #{{ prop.val.id }}
+                                                        </span>
                                                     </span>
+                                                    <span v-else="prop.old.val">
+                                                        <VnJsonValue :value="prop.val.val" />
+                                                        <span v-if="prop.old.id" class="id-value">#{{ prop.old.id }}</span>
                                                     </span>
                                                 </div>
                                             </span>

From 12aeb63f27ad9e10e844a55a8bee4b5396db249e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 12 Feb 2025 12:27:57 +0100
Subject: [PATCH 03/75] fix: refs #7414 update VnLog.vue to correctly display
 log actions and values

---
 src/components/common/VnLog.vue | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index a90766c84..8f106a9f1 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -641,7 +641,8 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue
+                                                    <span v-if="log.action == 'update'">
+                                                        <VnJsonValue
                                                             :value="prop.old.val"
                                                         />
                                                         <span
@@ -650,15 +651,26 @@ watch(
                                                         >
                                                             #{{ prop.old.id }}
                                                         </span>
-                                                    <span v-if="log.action == 'update'">
                                                         →
-                                                        <VnJsonValue :value="prop.val.val" />
-                                                            <span
-                                                                v-if="prop.val.id"
-                                                                class="id-value"
-                                                            >
-                                                        #{{ prop.val.id }}
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.val.id"
+                                                            class="id-value"
+                                                        >
+                                                            #{{ prop.val.id }}
+                                                        </span>
                                                     </span>
+                                                    <span v-else="prop.old.val">
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                            >#{{ prop.old.id }}</span
+                                                        >
                                                     </span>
                                                 </div>
                                             </span>

From cad6b077f066ee15018d2f904698feeb8ef4666d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 15 Feb 2025 17:45:06 +0100
Subject: [PATCH 04/75] fix: ticketfilter from and to

---
 src/components/ui/VnSearchbar.vue | 10 ++++++++++
 src/composables/useArrayData.js   | 15 +++++++++++----
 src/pages/Ticket/TicketList.vue   |  3 +++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 30e4135e2..98be77d09 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -69,6 +69,10 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
+    excludeParams: {
+        type: Object,
+        default: null,
+    },
 });
 
 const searchText = ref();
@@ -135,6 +139,12 @@ async function search() {
         };
         delete filter.params.search;
     }
+    if (props.excludeParams) {
+        filter.params = {
+            ...filter.params,
+            exclude: props.excludeParams,
+        };
+    }
     await arrayData.applyFilter(filter);
     searchText.value = undefined;
 }
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index bd3cecf08..250756c59 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -74,12 +74,13 @@ export function useArrayData(key, userOptions) {
         }
     }
 
-    async function fetch({ append = false, updateRouter = true }) {
+    async function fetch(fetchOptions) {
+        let { append = false, updateRouter = true } = fetchOptions;
         if (!store.url) return;
 
         cancelRequest();
         canceller = new AbortController();
-        const { params, limit } = setCurrentFilter();
+        let { params, limit } = setCurrentFilter();
 
         let exprFilter;
         if (store?.exprBuilder) {
@@ -97,7 +98,10 @@ export function useArrayData(key, userOptions) {
         if (!params?.filter?.order?.length) delete params?.filter?.order;
 
         params.filter = JSON.stringify(params.filter);
-
+        if (fetchOptions?.exclude) {
+            params = { ...params, ...fetchOptions.exclude };
+            delete params.exclude;
+        }
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
@@ -145,8 +149,11 @@ export function useArrayData(key, userOptions) {
     async function applyFilter({ filter, params }, fetchOptions = {}) {
         if (filter) store.userFilter = filter;
         store.filter = {};
+        if (params?.exclude) {
+            fetchOptions = { ...fetchOptions, exclude: params.exclude };
+            delete params.exclude;
+        }
         if (params) store.userParams = { ...params };
-
         const response = await fetch(fetchOptions);
         return response;
     }
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 8df19c0d9..b16472764 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -445,6 +445,9 @@ function setReference(data) {
         :array-data-props="{
             url: 'Tickets/filter',
             order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
+            label: t('Search items'),
+            excludeParams: { ...userParams },
+            searchRemoveParams: true,
             exprBuilder,
         }"
     >

From 3b3332f15cd6ec6431f01f31fc2f4655353e5676 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 15 Feb 2025 23:59:22 +0100
Subject: [PATCH 05/75] feat: use clientFK in dialog

---
 .../Customer/composables/getAddresses.js      |  8 +++----
 src/pages/Ticket/TicketList.vue               | 22 ++++++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/pages/Customer/composables/getAddresses.js b/src/pages/Customer/composables/getAddresses.js
index e65e64455..5f18530e7 100644
--- a/src/pages/Customer/composables/getAddresses.js
+++ b/src/pages/Customer/composables/getAddresses.js
@@ -1,15 +1,15 @@
 import axios from 'axios';
 
-export async function getAddresses(clientId, _filter = {}) {   
+export async function getAddresses(clientId, _filter = {}) {
     if (!clientId) return;
     const filter = {
         ..._filter,
-        fields: ['nickname', 'street', 'city', 'id'],
+        fields: ['nickname', 'street', 'city', 'id', 'isActive'],
         where: { isActive: true },
-        order: 'nickname ASC',
+        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     };
     const params = { filter: JSON.stringify(filter) };
     return await axios.get(`Clients/${clientId}/addresses`, {
         params,
     });
-};
\ No newline at end of file
+}
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index b16472764..6490f3b8e 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onBeforeMount } from 'vue';
+import { computed, ref, onBeforeMount, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -425,6 +425,23 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
+
+const formInitialData = ref({});
+watch(
+    () => route.query.table,
+    (newValue) => {
+        if (newValue) {
+            const clientId = +JSON.parse(newValue)?.clientFk;
+            if (!clientFk) return;
+            formInitialData.value = {
+                clientId,
+            };
+            if (tableRef.value) tableRef.value.create.formInitialData = { clientId };
+            onClientSelected({ clientId });
+        }
+    },
+    { immediate: true },
+);
 </script>
 
 <template>
@@ -462,11 +479,10 @@ function setReference(data) {
                     urlCreate: 'Tickets/new',
                     title: t('ticketList.createTicket'),
                     onDataSaved: ({ id }) => tableRef.redirect(id),
-                    formInitialData: { clientId: null },
+                    formInitialData,
                 }"
                 default-mode="table"
                 :columns="columns"
-                :user-params="userParams"
                 :right-search="false"
                 redirect="ticket"
                 v-model:selected="selectedRows"

From 70fe95661abb3b275f90c227a684c19aa92cdb10 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 00:00:24 +0100
Subject: [PATCH 06/75] style: remove optionId and optionLabel

---
 src/pages/Ticket/TicketList.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 6490f3b8e..d8eb91fc9 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -560,11 +560,9 @@ watch(
                             :label="t('ticketList.client')"
                             v-model="data.clientId"
                             :options="clientsOptions"
-                            option-value="id"
-                            option-label="name"
                             hide-selected
                             required
-                            @update:model-value="(client) => onClientSelected(data)"
+                            @update:model-value="() => onClientSelected(data)"
                             :sort-by="'id ASC'"
                         >
                             <template #option="scope">
@@ -586,7 +584,6 @@ watch(
                             :label="t('basicData.address')"
                             v-model="data.addressId"
                             :options="addressesOptions"
-                            option-value="id"
                             option-label="nickname"
                             hide-selected
                             map-options
@@ -655,8 +652,6 @@ watch(
                                 :label="t('globals.warehouse')"
                                 v-model="data.warehouseId"
                                 :options="warehousesOptions"
-                                option-value="id"
-                                option-label="name"
                                 hide-selected
                                 required
                                 @update:model-value="() => fetchAvailableAgencies(data)"
@@ -716,7 +711,6 @@ watch(
                         :label="t('ticketList.company')"
                         v-model="dialogData.companyFk"
                         :options="companiesOptions"
-                        option-value="id"
                         option-label="code"
                         hide-selected
                     >
@@ -727,7 +721,6 @@ watch(
                         :label="t('ticketList.bank')"
                         v-model="dialogData.bankFk"
                         :options="accountingOptions"
-                        option-value="id"
                         option-label="bank"
                         hide-selected
                         @update:model-value="setReference"

From b998aab6dd02b13996bd576c2864960cbe6b9e47 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 00:46:20 +0100
Subject: [PATCH 07/75] test: add test

---
 src/pages/Ticket/TicketList.vue               |  2 +-
 .../integration/ticket/ticketList.spec.js     | 38 +++++++++++++++++--
 test/cypress/support/commands.js              |  3 ++
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index d8eb91fc9..ed2aad37c 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -432,7 +432,7 @@ watch(
     (newValue) => {
         if (newValue) {
             const clientId = +JSON.parse(newValue)?.clientFk;
-            if (!clientFk) return;
+            if (!clientId) return;
             formInitialData.value = {
                 clientId,
             };
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 2984a4ee4..8c03462da 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,16 +1,16 @@
 /// <reference types="cypress" />
 describe('TicketList', () => {
-    const firstRow = 'tbody > :nth-child(1)';
+    const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
 
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
         cy.visit('/#/ticket/list');
+        cy.domContentLoad();
     });
 
     const searchResults = (search) => {
-        cy.dataCy('vn-searchbar').find('input').focus();
-        if (search) cy.dataCy('vn-searchbar').find('input').type(search);
+        if (search) cy.typeSearchbar().type(search);
         cy.dataCy('vn-searchbar').find('input').type('{enter}');
         cy.dataCy('ticketListTable').should('exist');
         cy.get(firstRow).should('exist');
@@ -27,7 +27,7 @@ describe('TicketList', () => {
         cy.window().then((win) => {
             cy.stub(win, 'open').as('windowOpen');
         });
-        cy.get(firstRow).find('.q-btn:first').click();
+        cy.get(firstRow).should('be.visible').find('.q-btn:first').click();
         cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
     });
 
@@ -38,6 +38,36 @@ describe('TicketList', () => {
         cy.get('.summaryBody').should('exist');
     });
 
+    it.only('Filter client and create ticket', () => {
+        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
+        searchResults();
+        cy.wait('@ticketSearchbar').then((interception) => {
+            const { query } = interception.request;
+            cy.log('Request query:', query);
+            expect(query).to.have.property('from');
+            expect(query).to.have.property('to');
+            expect(query).to.not.have.property('clientFk');
+        });
+        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
+        cy.get('[data-cy="Customer ID_input"]').clear('1');
+        cy.get('[data-cy="Customer ID_input"]').type('1101{enter}');
+        cy.wait('@ticketFilter').then((interception) => {
+            const { query } = interception.request;
+            cy.log('Request query:', query);
+            expect(query).to.not.have.property('from');
+            expect(query).to.not.have.property('to');
+            expect(query).to.have.property('clientFk');
+        });
+        cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
+        cy.get('[data-cy="Customer_select"]').should('have.value', 'Bruce Wayne');
+        cy.get('[data-cy="Address_select"]').click();
+
+        cy.selectOptionBeta().click();
+        cy.get('[data-cy="Address_select"]').should('have.value', 'Bruce Wayne');
+        // cy.get('[role="listbox"] .q-item:nth-child(1)>.q-item__section--avatar > i')
+        //     .should('have.text', 'star')
+        //     .click();
+    });
     it('Client list create new client', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');
         cy.dataCy('vnTableCreateBtn').click();
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 2c93fbf84..c4e2c29ca 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -365,3 +365,6 @@ Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
 Cypress.Commands.add('clickButtonWithText', (buttonText) => {
     cy.get('.q-btn').contains(buttonText).click();
 });
+Cypress.Commands.add('selectOptionBeta', (index = 1) => {
+    cy.get(`[role="listbox"] .q-item:nth-child(${index})`).click();
+});

From ab3ac4fdebdc063ec6e80ff95b1a069ba0ba9490 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 00:50:39 +0100
Subject: [PATCH 08/75] fix: remove bad code

---
 src/pages/Ticket/TicketList.vue                    | 1 -
 test/cypress/integration/ticket/ticketList.spec.js | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ed2aad37c..fa03b3f6d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -462,7 +462,6 @@ watch(
         :array-data-props="{
             url: 'Tickets/filter',
             order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
-            label: t('Search items'),
             excludeParams: { ...userParams },
             searchRemoveParams: true,
             exprBuilder,
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 8c03462da..4164d373e 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -38,12 +38,11 @@ describe('TicketList', () => {
         cy.get('.summaryBody').should('exist');
     });
 
-    it.only('Filter client and create ticket', () => {
+    it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
         cy.wait('@ticketSearchbar').then((interception) => {
             const { query } = interception.request;
-            cy.log('Request query:', query);
             expect(query).to.have.property('from');
             expect(query).to.have.property('to');
             expect(query).to.not.have.property('clientFk');
@@ -53,7 +52,6 @@ describe('TicketList', () => {
         cy.get('[data-cy="Customer ID_input"]').type('1101{enter}');
         cy.wait('@ticketFilter').then((interception) => {
             const { query } = interception.request;
-            cy.log('Request query:', query);
             expect(query).to.not.have.property('from');
             expect(query).to.not.have.property('to');
             expect(query).to.have.property('clientFk');
@@ -64,9 +62,6 @@ describe('TicketList', () => {
 
         cy.selectOptionBeta().click();
         cy.get('[data-cy="Address_select"]').should('have.value', 'Bruce Wayne');
-        // cy.get('[role="listbox"] .q-item:nth-child(1)>.q-item__section--avatar > i')
-        //     .should('have.text', 'star')
-        //     .click();
     });
     it('Client list create new client', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');

From 1972e921df1d96db346e1487efc6ff396a337f19 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 00:52:37 +0100
Subject: [PATCH 09/75] test: fix getAddresses

---
 .../Customer/composables/__tests__/getAddresses.spec.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/composables/__tests__/getAddresses.spec.js b/src/pages/Customer/composables/__tests__/getAddresses.spec.js
index 9e04a83cc..8c90bf281 100644
--- a/src/pages/Customer/composables/__tests__/getAddresses.spec.js
+++ b/src/pages/Customer/composables/__tests__/getAddresses.spec.js
@@ -17,9 +17,9 @@ describe('getAddresses', () => {
         expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, {
             params: {
                 filter: JSON.stringify({
-                    fields: ['nickname', 'street', 'city', 'id'],
+                    fields: ['nickname', 'street', 'city', 'id', 'isActive'],
                     where: { isActive: true },
-                    order: 'nickname ASC',
+                    order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
                 }),
             },
         });
@@ -30,4 +30,4 @@ describe('getAddresses', () => {
 
         expect(axios.get).not.toHaveBeenCalled();
     });
-});
\ No newline at end of file
+});

From 2ec5c2b49fe4ab6ae0da7dcbad82b2e0ff6bcfe5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 03:18:10 +0100
Subject: [PATCH 10/75] fix: ticketList columnfilter

---
 src/pages/Ticket/TicketList.vue | 68 ++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index fa03b3f6d..cdc122004 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -121,12 +121,16 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
+        component: 'time',
+        columnFilter: false,
         label: t('ticketList.hour'),
         format: (row) => toTimeFormat(row.shipped),
     },
     {
         align: 'left',
         name: 'zoneLanding',
+        component: 'time',
+        columnFilter: false,
         label: t('ticketList.closure'),
         format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
     },
@@ -146,9 +150,16 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'province',
+        name: 'provinceFk',
         label: t('ticketList.province'),
-        columnClass: 'expand',
+        component: 'select',
+        attrs: {
+            url: 'Provinces',
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.province),
     },
     {
         align: 'left',
@@ -182,9 +193,21 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'warehouse',
-        label: t('ticketList.warehouse'),
-        columnClass: 'expand',
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        component: 'select',
+        attrs: {
+            url: 'warehouses',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
+        format: (row) => row.warehouse,
+        columnField: {
+            component: null,
+        },
+        cardVisible: false,
+        create: false,
     },
     {
         align: 'left',
@@ -216,6 +239,7 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row, evt) => {
                     if (evt && evt.ctrlKey) {
                         const url = router.resolve({
@@ -232,7 +256,7 @@ const columns = computed(() => [
 
 function resetAgenciesSelector(formData) {
     agenciesOptions.value = [];
-    if(formData) formData.agencyModeId = null;
+    if (formData) formData.agencyModeId = null;
 }
 
 function redirectToLines(id) {
@@ -240,7 +264,7 @@ function redirectToLines(id) {
     window.open(url, '_blank');
 }
 
-const onClientSelected = async (formData) => {    
+const onClientSelected = async (formData) => {
     resetAgenciesSelector(formData);
     await fetchClient(formData);
     await fetchAddresses(formData);
@@ -248,14 +272,12 @@ const onClientSelected = async (formData) => {
 
 const fetchAvailableAgencies = async (formData) => {
     resetAgenciesSelector(formData);
-    const response= await getAgencies(formData, selectedClient.value);
+    const response = await getAgencies(formData, selectedClient.value);
     if (!response) return;
-    
-    const { options, agency } =  response
-    if(options)
-        agenciesOptions.value = options;
-    if(agency)
-        formData.agencyModeId = agency;
+
+    const { options, agency } = response;
+    if (options) agenciesOptions.value = options;
+    if (agency) formData.agencyModeId = agency;
 };
 
 const fetchClient = async (formData) => {
@@ -330,7 +352,7 @@ function openBalanceDialog(ticket) {
     const description = ref([]);
     const firstTicketClientId = checkedTickets[0].clientFk;
     const isSameClient = checkedTickets.every(
-        (ticket) => ticket.clientFk === firstTicketClientId
+        (ticket) => ticket.clientFk === firstTicketClientId,
     );
 
     if (!isSameClient) {
@@ -369,7 +391,7 @@ async function onSubmit() {
             description: dialogData.value.value.description,
             clientFk: dialogData.value.value.clientFk,
             email: email[0].email,
-        }
+        },
     );
 
     if (data) notify('globals.dataSaved', 'positive');
@@ -388,32 +410,32 @@ function setReference(data) {
     switch (data) {
         case 1:
             newDescription = `${t(
-                'ticketList.creditCard'
+                'ticketList.creditCard',
             )}, ${dialogData.value.value.description.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 2:
             newDescription = `${t(
-                'ticketList.cash'
+                'ticketList.cash',
             )}, ${dialogData.value.value.description.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 3:
             newDescription = `${newDescription.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 4:
             newDescription = `${t(
-                'ticketList.transfers'
+                'ticketList.transfers',
             )}, ${dialogData.value.value.description.replace(
                 /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
             )}`;
             break;
         case 3317:

From 33d6662f97a6afb148e2ab799809a962ab1b2e0e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 23:35:56 +0100
Subject: [PATCH 11/75] feat: same searchbar logic filter in VnFilterPanel

---
 src/components/common/VnSection.vue           |  5 +-
 src/components/ui/VnFilterPanel.vue           | 46 ++++++++++++---
 src/components/ui/VnSearchbar.vue             |  3 +-
 src/pages/Ticket/TicketFilter.vue             | 56 +++++++++++++++++--
 src/pages/Ticket/TicketList.vue               |  6 +-
 .../integration/ticket/tickeFilter.spec.js    | 44 +++++++++++++++
 .../integration/ticket/ticketList.spec.js     |  8 +--
 test/cypress/support/commands.js              |  5 ++
 8 files changed, 154 insertions(+), 19 deletions(-)
 create mode 100644 test/cypress/integration/ticket/tickeFilter.spec.js

diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index ef65b841f..03871c3b1 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -2,7 +2,7 @@
 import RightAdvancedMenu from './RightAdvancedMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, computed, ref, provide } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute, useRouter } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
@@ -52,10 +52,12 @@ const router = useRouter();
 let arrayData;
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
 const isMainSection = ref(false);
+const searchbarRef = ref(null);
 
 const searchbarId = 'section-searchbar';
 const advancedMenuSlot = 'advanced-menu';
 const hasContent = useHasContent(`#${searchbarId}`);
+provide('searchbar', () => searchbarRef.value?.search());
 
 onBeforeMount(() => {
     if ($props.dataKey)
@@ -90,6 +92,7 @@ function checkIsMain() {
 <template>
     <slot name="searchbar">
         <VnSearchbar
+            ref="searchbarRef"
             v-if="searchBar && !hasContent"
             v-bind="arrayDataProps"
             :data-key="dataKey"
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 93f069cc6..da01d7174 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, provide, inject, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';
@@ -14,6 +14,10 @@ const $props = defineProps({
         type: Object,
         default: () => {},
     },
+    searchBarRef: {
+        type: Object,
+        default: () => {},
+    },
     dataKey: {
         type: String,
         required: true,
@@ -61,6 +65,14 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    requiredParams: {
+        type: [Array, Object],
+        default: () => [],
+    },
+    useSearchbar: {
+        type: [Boolean, Function],
+        default: false,
+    },
 });
 
 const emit = defineEmits([
@@ -84,13 +96,29 @@ const arrayData =
 const store = arrayData.store;
 const userParams = ref(useFilterParams($props.dataKey).params);
 const userOrders = ref(useFilterParams($props.dataKey).orders);
-
+const searchbar = ref(null);
 defineExpose({ search, params: userParams, remove });
-
+onMounted(() => {
+    searchbar.value = inject('searchbar');
+});
 const isLoading = ref(false);
 async function search(evt) {
     try {
-        if (evt && $props.disableSubmitEvent) return;
+        if ($props.useSearchbar) {
+            if (!searchbar.value) {
+                console.error('Searchbar not found');
+                return;
+            }
+            if (typeof $props.useSearchbar === 'function') {
+                $props.useSearchbar(userParams.value);
+
+                if (Object.keys(userParams.value).length == 0) {
+                    searchbar.value();
+                    return;
+                }
+            }
+        }
+        if (evt && $props.disableSubmitEvent) debugger;
 
         store.filter.where = {};
         isLoading.value = true;
@@ -114,7 +142,7 @@ async function clearFilters() {
         arrayData.resetPagination();
         // Filtrar los params no removibles
         const removableFilters = Object.keys(userParams.value).filter((param) =>
-            $props.unremovableParams.includes(param)
+            $props.unremovableParams.includes(param),
         );
         const newParams = {};
         // Conservar solo los params que no son removibles
@@ -162,13 +190,13 @@ const formatTags = (tags) => {
 
 const tags = computed(() => {
     const filteredTags = tagsList.value.filter(
-        (tag) => !($props.customTags || []).includes(tag.label)
+        (tag) => !($props.customTags || []).includes(tag.label),
     );
     return formatTags(filteredTags);
 });
 
 const customTags = computed(() =>
-    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
+    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label)),
 );
 
 async function remove(key) {
@@ -191,7 +219,9 @@ const getLocale = (label) => {
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
     else {
-        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
+        const camelCaseModuleName =
+            route.meta.moduleName.charAt(0).toLowerCase() +
+            route.meta.moduleName.slice(1);
         return t(`${camelCaseModuleName}.params.${param}`);
     }
 };
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 98be77d09..c33f80da8 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, computed, watch, provide } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -148,6 +148,7 @@ async function search() {
     await arrayData.applyFilter(filter);
     searchText.value = undefined;
 }
+defineExpose({ search });
 </script>
 <template>
     <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 4b50892b0..d4d56d20f 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -8,6 +8,8 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import { Notify } from 'quasar';
+import useNotify from 'src/composables/useNotify';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -15,6 +17,10 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    searchBarRef: {
+        type: Object,
+        default: () => ({}),
+    },
 });
 
 const provinces = ref([]);
@@ -22,6 +28,7 @@ const states = ref([]);
 const agencies = ref([]);
 const warehouses = ref([]);
 const groupedStates = ref([]);
+const { notify } = useNotify();
 
 const getGroupedStates = (data) => {
     for (const state of data) {
@@ -32,6 +39,29 @@ const getGroupedStates = (data) => {
         });
     }
 };
+const from = Date.vnNew();
+from.setHours(0, 0, 0, 0);
+from.setDate(from.getDate() - 7);
+const to = Date.vnNew();
+to.setHours(23, 59, 0, 0);
+to.setDate(to.getDate() + 1);
+const userParams = computed(() => {
+    from.value = from.toISOString();
+    to.value = to.toISOString();
+    return { from, to };
+});
+function validateDateRange(params) {
+    const hasFrom = 'from' in params;
+    const hasTo = 'to' in params;
+
+    if (hasFrom !== hasTo) {
+        notify(t(`dateRangeMustHaveBothFrom`), 'negative');
+
+        throw new Error(t(`dateRangeMustHaveBothFrom`));
+    }
+
+    return hasFrom && hasTo;
+}
 </script>
 
 <template>
@@ -48,7 +78,13 @@ const getGroupedStates = (data) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :searchBarRef="$props.searchBarRef"
+        :data-key="props.dataKey"
+        :search-button="true"
+        :use-searchbar="validateDateRange"
+        :requiredParams="{ ...userParams }"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -74,10 +110,20 @@ const getGroupedStates = (data) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('From')"
+                        is-outlined
+                        data-cy="From_date"
+                    />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('To')"
+                        is-outlined
+                        data-cy="To_date"
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -288,6 +334,7 @@ const getGroupedStates = (data) => {
 
 <i18n>
 en:
+    dateRangeMustHaveBothFrom: The date range must have both 'from' and 'to'
     params:
         search: Contains
         clientFk: Customer
@@ -315,6 +362,7 @@ en:
     DELIVERED: Delivered
     ON_PREVIOUS: ON_PREVIOUS
 es:
+    dateRangeMustHaveBothFrom: El rango de fechas debe tener 'desde' y 'hasta'
     params:
         search: Contiene
         clientFk: Cliente
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index cdc122004..03db94732 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -478,6 +478,7 @@ watch(
         auto-load
     />
     <VnSection
+        ref="sectionRef"
         :data-key="dataKey"
         :columns="columns"
         prefix="card"
@@ -490,7 +491,10 @@ watch(
         }"
     >
         <template #advanced-menu>
-            <TicketFilter data-key="TicketList" />
+            <TicketFilter
+                data-key="TicketList"
+                :searchbarRef="$refs.sectionRef?.$refs.searchbarRef"
+            />
         </template>
         <template #body>
             <VnTable
diff --git a/test/cypress/integration/ticket/tickeFilter.spec.js b/test/cypress/integration/ticket/tickeFilter.spec.js
new file mode 100644
index 000000000..b2bf78743
--- /dev/null
+++ b/test/cypress/integration/ticket/tickeFilter.spec.js
@@ -0,0 +1,44 @@
+/// <reference types="cypress" />
+describe('TicketFilter', () => {
+    const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
+
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/list');
+        cy.domContentLoad();
+    });
+
+    it.only('use search button', function () {
+        cy.waitForElement('.q-page');
+        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
+        cy.searchBtnFilterPanel();
+        cy.wait('@ticketFilter').then(({ request }) => {
+            const { query } = request;
+            expect(query).to.have.property('from');
+            expect(query).to.have.property('to');
+        });
+        cy.on('uncaught:exception', () => {
+            return false;
+        });
+        cy.get('.q-field__control-container > [data-cy="From_date"]').type(
+            '14-02-2025{enter}',
+        );
+        cy.get('.q-notification').should(
+            'contain',
+            `The date range must have both 'from' and 'to'`,
+        );
+
+        cy.get('.q-field__control-container > [data-cy="To_date"]').type(
+            '16/02/2025{enter}',
+        );
+        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
+        cy.searchBtnFilterPanel();
+        cy.wait('@ticketFilter').then(({ request }) => {
+            const { query } = request;
+            expect(query).to.have.property('from');
+            expect(query).to.have.property('to');
+        });
+        cy.location('href').should('contain', '#/ticket/999999');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 4164d373e..800ce6aaa 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -41,8 +41,8 @@ describe('TicketList', () => {
     it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
-        cy.wait('@ticketSearchbar').then((interception) => {
-            const { query } = interception.request;
+        cy.wait('@ticketSearchbar').then(({ request }) => {
+            const { query } = request;
             expect(query).to.have.property('from');
             expect(query).to.have.property('to');
             expect(query).to.not.have.property('clientFk');
@@ -50,8 +50,8 @@ describe('TicketList', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.get('[data-cy="Customer ID_input"]').clear('1');
         cy.get('[data-cy="Customer ID_input"]').type('1101{enter}');
-        cy.wait('@ticketFilter').then((interception) => {
-            const { query } = interception.request;
+        cy.wait('@ticketFilter').then(({ request }) => {
+            const { query } = request;
             expect(query).to.not.have.property('from');
             expect(query).to.not.have.property('to');
             expect(query).to.have.property('clientFk');
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index c4e2c29ca..4606ea56c 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -368,3 +368,8 @@ Cypress.Commands.add('clickButtonWithText', (buttonText) => {
 Cypress.Commands.add('selectOptionBeta', (index = 1) => {
     cy.get(`[role="listbox"] .q-item:nth-child(${index})`).click();
 });
+Cypress.Commands.add('searchBtnFilterPanel', () => {
+    cy.get(
+        '.q-scrollarea__content > .q-btn--standard > .q-btn__content > .q-icon',
+    ).click();
+});

From 443a2747ccf852d9d43f618c67e350ed1db010cd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 23:46:05 +0100
Subject: [PATCH 12/75] style: remove proposal

---
 src/components/ui/VnFilterPanel.vue                 |  8 --------
 src/pages/Ticket/TicketFilter.vue                   | 11 -----------
 src/pages/Ticket/TicketList.vue                     |  5 +----
 test/cypress/integration/ticket/tickeFilter.spec.js |  2 --
 test/cypress/integration/ticket/ticketList.spec.js  | 10 +++++-----
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index da01d7174..5ebba5028 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -14,10 +14,6 @@ const $props = defineProps({
         type: Object,
         default: () => {},
     },
-    searchBarRef: {
-        type: Object,
-        default: () => {},
-    },
     dataKey: {
         type: String,
         required: true,
@@ -65,10 +61,6 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    requiredParams: {
-        type: [Array, Object],
-        default: () => [],
-    },
     useSearchbar: {
         type: [Boolean, Function],
         default: false,
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index d4d56d20f..549618e55 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -17,10 +17,6 @@ const props = defineProps({
         type: String,
         required: true,
     },
-    searchBarRef: {
-        type: Object,
-        default: () => ({}),
-    },
 });
 
 const provinces = ref([]);
@@ -45,11 +41,6 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-const userParams = computed(() => {
-    from.value = from.toISOString();
-    to.value = to.toISOString();
-    return { from, to };
-});
 function validateDateRange(params) {
     const hasFrom = 'from' in params;
     const hasTo = 'to' in params;
@@ -79,11 +70,9 @@ function validateDateRange(params) {
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel
-        :searchBarRef="$props.searchBarRef"
         :data-key="props.dataKey"
         :search-button="true"
         :use-searchbar="validateDateRange"
-        :requiredParams="{ ...userParams }"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 03db94732..ad8865a57 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -491,10 +491,7 @@ watch(
         }"
     >
         <template #advanced-menu>
-            <TicketFilter
-                data-key="TicketList"
-                :searchbarRef="$refs.sectionRef?.$refs.searchbarRef"
-            />
+            <TicketFilter data-key="TicketList" />
         </template>
         <template #body>
             <VnTable
diff --git a/test/cypress/integration/ticket/tickeFilter.spec.js b/test/cypress/integration/ticket/tickeFilter.spec.js
index b2bf78743..408c5a19f 100644
--- a/test/cypress/integration/ticket/tickeFilter.spec.js
+++ b/test/cypress/integration/ticket/tickeFilter.spec.js
@@ -1,7 +1,5 @@
 /// <reference types="cypress" />
 describe('TicketFilter', () => {
-    const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
-
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 800ce6aaa..e6ddc2fa1 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -48,8 +48,8 @@ describe('TicketList', () => {
             expect(query).to.not.have.property('clientFk');
         });
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
-        cy.get('[data-cy="Customer ID_input"]').clear('1');
-        cy.get('[data-cy="Customer ID_input"]').type('1101{enter}');
+        cy.dataCy('Customer ID_input').clear('1');
+        cy.dataCy('Customer ID_input').type('1101{enter}');
         cy.wait('@ticketFilter').then(({ request }) => {
             const { query } = request;
             expect(query).to.not.have.property('from');
@@ -57,11 +57,11 @@ describe('TicketList', () => {
             expect(query).to.have.property('clientFk');
         });
         cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
-        cy.get('[data-cy="Customer_select"]').should('have.value', 'Bruce Wayne');
-        cy.get('[data-cy="Address_select"]').click();
+        cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
+        cy.dataCy('Address_select').click();
 
         cy.selectOptionBeta().click();
-        cy.get('[data-cy="Address_select"]').should('have.value', 'Bruce Wayne');
+        cy.dataCy('Address_select').should('have.value', 'Bruce Wayne');
     });
     it('Client list create new client', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');

From 3e3713a9376757da87b2621ad71d6659d5d97346 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 16 Feb 2025 23:47:31 +0100
Subject: [PATCH 13/75] perf: remove unnussed import

---
 src/components/ui/VnSearchbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index c33f80da8..f4b4f0fe8 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch, provide } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';

From c0823b0f48e92a60bbffed2b1385900490eaac30 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 17 Feb 2025 19:33:29 +0100
Subject: [PATCH 14/75] perf: comments

---
 src/components/ui/VnFilterPanel.vue | 14 ++++++++------
 src/pages/Ticket/TicketFilter.vue   |  3 +--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 5ebba5028..7af226bff 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, provide, inject, onMounted } from 'vue';
+import { ref, computed, inject, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';
@@ -89,28 +89,30 @@ const store = arrayData.store;
 const userParams = ref(useFilterParams($props.dataKey).params);
 const userOrders = ref(useFilterParams($props.dataKey).orders);
 const searchbar = ref(null);
-defineExpose({ search, params: userParams, remove });
+const isLoading = ref(false);
+
 onMounted(() => {
     searchbar.value = inject('searchbar');
 });
-const isLoading = ref(false);
+
+defineExpose({ search, params: userParams, remove });
+
 async function search(evt) {
     try {
         if ($props.useSearchbar) {
             if (!searchbar.value) {
-                console.error('Searchbar not found');
                 return;
             }
             if (typeof $props.useSearchbar === 'function') {
                 $props.useSearchbar(userParams.value);
 
-                if (Object.keys(userParams.value).length == 0) {
+                if (!Object.keys(userParams.value).length) {
                     searchbar.value();
                     return;
                 }
             }
         }
-        if (evt && $props.disableSubmitEvent) debugger;
+        if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 549618e55..254b89e60 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -8,7 +8,6 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import { Notify } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 
 const { t } = useI18n();

From 7f370dc29c4381d0c4f51a6d33e3a8ae32bf9496 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 17 Feb 2025 22:57:11 +0100
Subject: [PATCH 15/75] test: improve getOption command

---
 .../integration/client/clientAddress.spec.js       |  2 +-
 .../cypress/integration/ticket/tickeFilter.spec.js |  2 +-
 test/cypress/integration/ticket/ticketList.spec.js |  2 +-
 .../integration/vnComponent/UserPanel.spec.js      | 14 ++++----------
 .../integration/vnComponent/VnLocation.spec.js     | 10 +++++-----
 test/cypress/support/commands.js                   |  6 +++++-
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/test/cypress/integration/client/clientAddress.spec.js b/test/cypress/integration/client/clientAddress.spec.js
index 434180047..4d6186679 100644
--- a/test/cypress/integration/client/clientAddress.spec.js
+++ b/test/cypress/integration/client/clientAddress.spec.js
@@ -18,7 +18,7 @@ describe('Client consignee', () => {
             const addressName = 'test';
             cy.dataCy('Consignee_input').type(addressName);
             cy.dataCy('Location_select').click();
-            cy.get('[role="listbox"] .q-item:nth-child(1)').click();
+            cy.getOption();
             cy.dataCy('Street address_input').type('TEST ADDRESS');
             cy.get('.q-btn-group > .q-btn--standard').click();
             cy.location('href').should('contain', '#/customer/1107/address');
diff --git a/test/cypress/integration/ticket/tickeFilter.spec.js b/test/cypress/integration/ticket/tickeFilter.spec.js
index 408c5a19f..59abb0164 100644
--- a/test/cypress/integration/ticket/tickeFilter.spec.js
+++ b/test/cypress/integration/ticket/tickeFilter.spec.js
@@ -7,7 +7,7 @@ describe('TicketFilter', () => {
         cy.domContentLoad();
     });
 
-    it.only('use search button', function () {
+    it('use search button', function () {
         cy.waitForElement('.q-page');
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.searchBtnFilterPanel();
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index e6ddc2fa1..d0ea14779 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -60,7 +60,7 @@ describe('TicketList', () => {
         cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
         cy.dataCy('Address_select').click();
 
-        cy.selectOptionBeta().click();
+        cy.getOption().click();
         cy.dataCy('Address_select').should('have.value', 'Bruce Wayne');
     });
     it('Client list create new client', () => {
diff --git a/test/cypress/integration/vnComponent/UserPanel.spec.js b/test/cypress/integration/vnComponent/UserPanel.spec.js
index e83d07954..25724e873 100644
--- a/test/cypress/integration/vnComponent/UserPanel.spec.js
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@@ -18,7 +18,7 @@ describe('UserPanel', () => {
         cy.get(userWarehouse).should('have.value', 'VNL').click();
 
         // Actualizo la opción
-        getOption(3);
+        cy.getOption(3);
 
         //Compruebo la notificación
         cy.get('.q-notification').should('be.visible');
@@ -26,7 +26,7 @@ describe('UserPanel', () => {
 
         //Restauro el valor
         cy.get(userWarehouse).click();
-        getOption(2);
+        cy.getOption(2);
     });
     it('should notify when update user company', () => {
         const userCompany =
@@ -39,7 +39,7 @@ describe('UserPanel', () => {
         cy.get(userCompany).should('have.value', 'Warehouse One').click();
 
         //Actualizo la opción
-        getOption(2);
+        cy.getOption(2);
 
         //Compruebo la notificación
         cy.get('.q-notification').should('be.visible');
@@ -47,12 +47,6 @@ describe('UserPanel', () => {
 
         //Restauro el valor
         cy.get(userCompany).click();
-        getOption(1);
+        cy.getOption(1);
     });
 });
-
-function getOption(index) {
-    cy.waitForElement('[role="listbox"]');
-    const option = `[role="listbox"] .q-item:nth-child(${index})`;
-    cy.get(option).click();
-}
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index 751b3a065..9074fc089 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -40,7 +40,7 @@ describe('VnLocation', () => {
             cy.selectOption(countrySelector, country);
             cy.dataCy('locationProvince').type(`${province}{enter}`);
             cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) `
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) `,
             ).click();
             cy.dataCy('locationProvince').should('have.value', province);
         });
@@ -87,9 +87,9 @@ describe('VnLocation', () => {
                 .get(':nth-child(1)')
                 .should('have.length.at.least', 2);
             cy.get(
-                firstOption.concat(' > .q-item__section > .q-item__label--caption')
+                firstOption.concat(' > .q-item__section > .q-item__label--caption'),
             ).should('have.text', postCodeLabel);
-            cy.get(firstOption).click();
+            cy.getOption();
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
@@ -103,7 +103,7 @@ describe('VnLocation', () => {
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
-                province
+                province,
             );
             cy.get(dialogInputs).eq(0).clear();
             cy.get(dialogInputs).eq(0).type(postCode);
@@ -156,7 +156,7 @@ describe('VnLocation', () => {
             cy.get(createLocationButton).click();
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
-                'España'
+                'España',
             );
             cy.dataCy('Province_icon').click();
 
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 4606ea56c..fab881620 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -362,12 +362,16 @@ Cypress.Commands.add('clickButtonWith', (type, value) => {
 Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
     cy.get(`.q-icon.${iconClass}`).parent().click();
 });
+
 Cypress.Commands.add('clickButtonWithText', (buttonText) => {
     cy.get('.q-btn').contains(buttonText).click();
 });
-Cypress.Commands.add('selectOptionBeta', (index = 1) => {
+
+Cypress.Commands.add('getOption', (index = 1) => {
+    cy.waitForElement('[role="listbox"]');
     cy.get(`[role="listbox"] .q-item:nth-child(${index})`).click();
 });
+
 Cypress.Commands.add('searchBtnFilterPanel', () => {
     cy.get(
         '.q-scrollarea__content > .q-btn--standard > .q-btn__content > .q-icon',

From df794391ec8d97852b5457b4434964ab72a23cc8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 17 Feb 2025 23:08:57 +0100
Subject: [PATCH 16/75] feat: agency in ticketlist sort data

---
 .../Route/Agency/composables/getAgencies.js    | 18 ++++++++++--------
 src/pages/Ticket/TicketFilter.vue              |  7 ++++++-
 src/pages/Ticket/TicketList.vue                |  3 +++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js
index 850f87456..2462ec718 100644
--- a/src/pages/Route/Agency/composables/getAgencies.js
+++ b/src/pages/Route/Agency/composables/getAgencies.js
@@ -1,11 +1,11 @@
 import axios from 'axios';
-import agency from 'src/router/modules/agency';
 
 export async function getAgencies(formData, client, _filter = {}) {
     if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
-    
+
     const filter = {
-        ..._filter
+        order: ['name ASC'],
+        ..._filter,
     };
 
     let defaultAgency = null;
@@ -18,9 +18,11 @@ export async function getAgencies(formData, client, _filter = {}) {
 
     const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
 
-    if(data && client) {
-        defaultAgency = data.find((agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk );
-    };
-    
-    return {options: data, agency: defaultAgency}
+    if (data && client) {
+        defaultAgency = data.find(
+            (agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk,
+        );
+    }
+
+    return { options: data, agency: defaultAgency };
 }
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 254b89e60..722db879d 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -66,7 +66,12 @@ function validateDateRange(params) {
         "
         auto-load
     />
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :sort-by="['name ASC']"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel
         :data-key="props.dataKey"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad8865a57..aba05980e 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -651,6 +651,9 @@ watch(
                                                 {{ scope.opt?.city }}
                                             </span>
                                         </QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ `#${scope.opt?.id}` }}
+                                        </QItemLabel>
                                     </QItemSection>
                                 </QItem>
                             </template>

From e6e21b61bdbc7d02b57243e8d786233ec4d66173 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 17 Feb 2025 23:27:22 +0100
Subject: [PATCH 17/75] perf: orderList

---
 src/pages/Order/OrderList.vue | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 21cb5ed7e..3876d21e2 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -152,11 +152,23 @@ onMounted(() => {
 });
 
 async function fetchClientAddress(id, formData = {}) {
-    const { data } = await axios.get(
-        `Clients/${id}/addresses?filter[order]=isActive DESC`
-    );
+    const { data } = await axios.get(`Clients/${id}/addresses`, {
+        params: {
+            filter: JSON.stringify({
+                include: [
+                    {
+                        relation: 'client',
+                        scope: {
+                            fields: ['defaultAddressFk'],
+                        },
+                    },
+                ],
+                order: ['isActive DESC'],
+            }),
+        },
+    });
     addressOptions.value = data;
-    formData.addressId = data.defaultAddressFk;
+    formData.addressId = data[0].client.defaultAddressFk;
     fetchAgencies(formData);
 }
 
@@ -164,7 +176,13 @@ async function fetchAgencies({ landed, addressId }) {
     if (!landed || !addressId) return (agencyList.value = []);
 
     const { data } = await axios.get('Agencies/landsThatDay', {
-        params: { addressFk: addressId, landed },
+        params: {
+            filter: JSON.stringify({
+                order: ['agencyMode DESC', 'agencyModeFk ASC'],
+            }),
+            addressFk: addressId,
+            landed,
+        },
     });
     agencyList.value = data;
 }
@@ -255,6 +273,7 @@ const getDateColor = (date) => {
                         </template>
                     </VnSelect>
                     <VnSelect
+                        :disable="!data.clientFk"
                         v-model="data.addressId"
                         :options="addressOptions"
                         :label="t('module.address')"
@@ -281,6 +300,9 @@ const getDateColor = (date) => {
                                         {{ scope.opt?.street }},
                                         {{ scope.opt?.city }}
                                     </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>

From 3ca73d03a063cf53ec12fb58c87fba519ce69545 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 18 Feb 2025 00:45:52 +0100
Subject: [PATCH 18/75] test: fix

---
 .../composables/__tests__/getAgencies.spec.js | 23 +++++++++++--------
 .../Route/Agency/composables/getAgencies.js   |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js b/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
index ccf7872cb..99966569c 100644
--- a/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
+++ b/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
@@ -27,14 +27,17 @@ describe('getAgencies', () => {
             landed: 'true',
         };
         const filter = {
-            fields: ['nickname', 'street', 'city', 'id'],
+            fields: ['name', 'street', 'city', 'id'],
             where: { isActive: true },
-            order: 'nickname ASC',
+            order: ['name ASC'],
         };
 
         await getAgencies(formData, null, filter);
 
-        expect(axios.get).toHaveBeenCalledWith('Agencies/getAgenciesWithWarehouse', generateParams(formData, filter));
+        expect(axios.get).toHaveBeenCalledWith(
+            'Agencies/getAgenciesWithWarehouse',
+            generateParams(formData, filter),
+        );
     });
 
     it('should not call API when formData is missing required landed field', async () => {
@@ -64,19 +67,19 @@ describe('getAgencies', () => {
     it('should return options and agency when default agency is found', async () => {
         const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
         const client = { defaultAddress: { agencyModeFk: 'Agency1' } };
-        
+
         const { options, agency } = await getAgencies(formData, client);
-        
+
         expect(options).toEqual(response.data);
         expect(agency).toEqual(response.data[0]);
-      });
+    });
 
-      it('should return options and agency when client is not provided', async () => {
+    it('should return options and agency when client is not provided', async () => {
         const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
-        
+
         const { options, agency } = await getAgencies(formData);
-        
+
         expect(options).toEqual(response.data);
         expect(agency).toBeNull();
-      });
+    });
 });
diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js
index 2462ec718..f837f54e9 100644
--- a/src/pages/Route/Agency/composables/getAgencies.js
+++ b/src/pages/Route/Agency/composables/getAgencies.js
@@ -4,8 +4,8 @@ export async function getAgencies(formData, client, _filter = {}) {
     if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
 
     const filter = {
-        order: ['name ASC'],
         ..._filter,
+        order: ['name ASC'],
     };
 
     let defaultAgency = null;

From 89673b05db578087d027d1fd7987ac27059fe152 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 18 Feb 2025 12:55:40 +0100
Subject: [PATCH 19/75] fix: country addressEdit

---
 src/pages/Customer/components/CustomerAddressEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index d650bbbda..1ea107f66 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -233,7 +233,7 @@ function handleLocation(data, location) {
                             postcode: data.postalCode,
                             city: data.city,
                             province: data.province,
-                            country: data.province.country,
+                            country: data.province?.country,
                         }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>

From f62f72832a0a27d0762820a69855929da881cac4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 00:03:28 +0100
Subject: [PATCH 20/75] perf: rename prop

---
 src/components/ui/VnFilterPanel.vue           | 23 +++++++++++--------
 src/pages/Ticket/TicketFilter.vue             |  2 +-
 .../integration/ticket/tickeFilter.spec.js    | 17 ++++++++++----
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 7af226bff..8f2c9f05e 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -61,9 +61,12 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    useSearchbar: {
-        type: [Boolean, Function],
-        default: false,
+    searchbarOptions: {
+        type: Object,
+        default: () => ({
+            use: false,
+            validateFn: null,
+        }),
     },
 });
 
@@ -99,17 +102,17 @@ defineExpose({ search, params: userParams, remove });
 
 async function search(evt) {
     try {
-        if ($props.useSearchbar) {
+        if ($props.searchbarOptions.use) {
             if (!searchbar.value) {
                 return;
             }
-            if (typeof $props.useSearchbar === 'function') {
-                $props.useSearchbar(userParams.value);
+            if (typeof $props.searchbarOptions.validateFn === 'function') {
+                $props.searchbarOptions.validateFn(userParams.value);
+            }
 
-                if (!Object.keys(userParams.value).length) {
-                    searchbar.value();
-                    return;
-                }
+            if (!Object.keys(userParams.value).length) {
+                searchbar.value();
+                return;
             }
         }
         if (evt && $props.disableSubmitEvent) return;
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 722db879d..a7205b6a6 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -76,7 +76,7 @@ function validateDateRange(params) {
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
-        :use-searchbar="validateDateRange"
+        :searchbar-options="{ use: true, validateFn: validateDateRange }"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/test/cypress/integration/ticket/tickeFilter.spec.js b/test/cypress/integration/ticket/tickeFilter.spec.js
index 59abb0164..c92bae844 100644
--- a/test/cypress/integration/ticket/tickeFilter.spec.js
+++ b/test/cypress/integration/ticket/tickeFilter.spec.js
@@ -19,16 +19,16 @@ describe('TicketFilter', () => {
         cy.on('uncaught:exception', () => {
             return false;
         });
-        cy.get('.q-field__control-container > [data-cy="From_date"]').type(
-            '14-02-2025{enter}',
-        );
+        cy.get('.q-field__control-container > [data-cy="From_date"]')
+            .type(`${today()} `)
+            .type('{enter}');
         cy.get('.q-notification').should(
             'contain',
             `The date range must have both 'from' and 'to'`,
         );
 
         cy.get('.q-field__control-container > [data-cy="To_date"]').type(
-            '16/02/2025{enter}',
+            `${today()}{enter}`,
         );
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.searchBtnFilterPanel();
@@ -40,3 +40,12 @@ describe('TicketFilter', () => {
         cy.location('href').should('contain', '#/ticket/999999');
     });
 });
+function today() {
+    // return new Date().toISOString().split('T')[0];
+
+    return new Intl.DateTimeFormat('es-ES', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+    }).format(new Date());
+}

From f33d396d825e4cd3bef33f5748aed68637d34db9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 00:12:01 +0100
Subject: [PATCH 21/75] perf: minor changes

---
 src/pages/Route/Agency/composables/getAgencies.js | 14 ++++++++------
 src/pages/Ticket/TicketList.vue                   |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js
index f837f54e9..180ac943e 100644
--- a/src/pages/Route/Agency/composables/getAgencies.js
+++ b/src/pages/Route/Agency/composables/getAgencies.js
@@ -8,7 +8,7 @@ export async function getAgencies(formData, client, _filter = {}) {
         order: ['name ASC'],
     };
 
-    let defaultAgency = null;
+    let agency = null;
     let params = {
         filter: JSON.stringify(filter),
         warehouseFk: formData.warehouseId,
@@ -16,13 +16,15 @@ export async function getAgencies(formData, client, _filter = {}) {
         landed: formData.landed,
     };
 
-    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+    const { data: options } = await axios.get('Agencies/getAgenciesWithWarehouse', {
+        params,
+    });
 
-    if (data && client) {
-        defaultAgency = data.find(
-            (agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk,
+    if (options && client) {
+        agency = options.find(
+            ({ agencyModeFk }) => agencyModeFk === client.defaultAddress.agencyModeFk,
         );
     }
 
-    return { options: data, agency: defaultAgency };
+    return { options, agency };
 }
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index aba05980e..1fe6baf00 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -478,7 +478,6 @@ watch(
         auto-load
     />
     <VnSection
-        ref="sectionRef"
         :data-key="dataKey"
         :columns="columns"
         prefix="card"

From 61374493bdb150f9beaebf11119b8c0871203283 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 19 Feb 2025 12:19:59 +0100
Subject: [PATCH 22/75] perf: default params

---
 src/composables/useArrayData.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 805e9cf85..657390688 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -76,7 +76,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function fetch(fetchOptions) {
-        let { append = false, updateRouter = true } = fetchOptions;
+        let { append = false, updateRouter = true } = fetchOptions ?? {};
         if (!store.url) return;
 
         cancelRequest();

From 57c0171bdd570caccc228a2e8baee2ee02fd5bff Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 21 Feb 2025 08:38:15 +0100
Subject: [PATCH 23/75] fix: transfer style

---
 src/pages/Ticket/Card/TicketTransferProxy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketTransferProxy.vue b/src/pages/Ticket/Card/TicketTransferProxy.vue
index 3f3f018df..7d5d82f85 100644
--- a/src/pages/Ticket/Card/TicketTransferProxy.vue
+++ b/src/pages/Ticket/Card/TicketTransferProxy.vue
@@ -42,7 +42,7 @@ const transferRef = ref(null);
             />
         </div>
 
-        <div v-else>
+        <div style="display: flex; flex-direction: row" v-else>
             <TicketTransfer
                 ref="transferRef"
                 :ticket="$props.ticket"

From faa245899708a0cb01b06b532d400b11b6b8243e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 21 Feb 2025 12:02:38 +0100
Subject: [PATCH 24/75] test: refs #8594 add vehicle summary component and
 integration tests for vehicle list functionality

---
 .../Route/Vehicle/Card/VehicleSummary.vue     |  7 ++-
 .../route/vehicle/vehicleList.spec.js         | 58 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/route/vehicle/vehicleList.spec.js

diff --git a/src/pages/Route/Vehicle/Card/VehicleSummary.vue b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
index 981870cb2..e4b0a9497 100644
--- a/src/pages/Route/Vehicle/Card/VehicleSummary.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
@@ -22,7 +22,12 @@ const links = {
 };
 </script>
 <template>
-    <CardSummary data-key="Vehicle" :url="`Vehicles/${entityId}`" :filter="VehicleFilter">
+    <CardSummary
+        data-key="Vehicle"
+        :url="`Vehicles/${entityId}`"
+        module-name="Vehicle"
+        :filter="VehicleFilter"
+    >
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.numberPlate }}</div>
         </template>
diff --git a/test/cypress/integration/route/vehicle/vehicleList.spec.js b/test/cypress/integration/route/vehicle/vehicleList.spec.js
new file mode 100644
index 000000000..e633b2fa2
--- /dev/null
+++ b/test/cypress/integration/route/vehicle/vehicleList.spec.js
@@ -0,0 +1,58 @@
+describe('Vehicle list', () => {
+    const selectors = {
+        saveFormBtn: 'FormModelPopup_save',
+        summaryPopupBtn: 'tr:last-child > .q-table--col-auto-width > .q-btn',
+        summaryGoToSummaryBtn: '.header > .q-icon',
+        summaryHeader: '.summaryHeader > div',
+        numberPlate: 'tr:last-child > [data-col-field="numberPlate"] > .no-padding',
+    };
+
+    const data = {
+        'Nº Plate': { val: '9465-LPA' },
+        'Trade Mark': { val: 'WAYNE INDUSTRIES' },
+        Model: { val: 'BATREMOLQUE' },
+        Type: { val: 'remolque', type: 'select' },
+        Warehouse: { val: 'Warehouse One', type: 'select' },
+        Country: { val: 'Portugal', type: 'select' },
+        Description: { val: 'Exclusive for batpod transport' },
+    };
+
+    const summaryUrl = '/summary';
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/route/vehicle/list`);
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('should list vehicles', () => {
+        cy.get('.q-table')
+            .children()
+            .should('be.visible')
+            .should('have.length.greaterThan', 0);
+    });
+
+    it('Should add new vehicle', () => {
+        cy.addBtnClick();
+        cy.fillInForm(data);
+        cy.dataCy(selectors.saveFormBtn).should('be.visible').click();
+
+        cy.checkNotification('Data created');
+        cy.get(selectors.summaryHeader).should('contain', data['Nº Plate'].val);
+        cy.url().should('include', summaryUrl);
+    });
+
+    it('should open summary by clicking a vehicle', () => {
+        cy.get(selectors.numberPlate).click();
+        cy.get(selectors.summaryHeader).should('contain', data['Nº Plate'].val);
+        cy.url().should('include', summaryUrl);
+    });
+
+    it('should redirect to vehicle summary when click summary icon on summary pop-up', () => {
+        cy.get(selectors.summaryPopupBtn).click();
+        cy.get(selectors.summaryHeader).should('contain', data['Nº Plate'].val);
+        cy.get(selectors.summaryGoToSummaryBtn).click();
+        cy.url().should('include', summaryUrl);
+    });
+});

From 93326db2d97bdea10efe59114d0a7067f365d814 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 23 Feb 2025 13:11:43 +0100
Subject: [PATCH 25/75] fix: call filterpanel from searchbar

---
 src/components/common/VnSection.vue | 26 ++++++++++++---
 src/components/ui/VnFilterPanel.vue | 49 +++++++++++++++++----------
 src/components/ui/VnSearchbar.vue   | 51 ++++++++++++++++++++++-------
 src/composables/useArrayData.js     | 15 +++++++--
 src/pages/Ticket/TicketFilter.vue   | 29 ++++++++++++----
 src/pages/Ticket/TicketList.vue     | 23 ++++++-------
 6 files changed, 138 insertions(+), 55 deletions(-)

diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index 6677fa312..1b1c18d7d 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -2,7 +2,7 @@
 import RightAdvancedMenu from './RightAdvancedMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, onMounted, onUnmounted, computed, ref, provide } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, computed, ref, inject, watch } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute, useRouter } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
@@ -36,6 +36,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    filterPanelRef: {
+        type: Object,
+        default: null,
+    },
     redirect: {
         type: Boolean,
         default: true,
@@ -52,12 +56,13 @@ const router = useRouter();
 let arrayData;
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
 const isMainSection = ref(false);
-const searchbarRef = ref(null);
 
 const searchbarId = 'section-searchbar';
 const advancedMenuSlot = 'advanced-menu';
 const hasContent = useHasContent(`#${searchbarId}`);
-provide('searchbar', () => searchbarRef.value?.search());
+// const filterPanel = ref(inject('filterPanel', null));
+
+// filterPanel.value = inject('filterPanel', null);
 
 onBeforeMount(() => {
     if ($props.dataKey)
@@ -69,14 +74,26 @@ onBeforeMount(() => {
         });
     checkIsMain();
 });
+// const filterPanel = ref(inject('filterPanel', null));
 
 onMounted(() => {
     const unsubscribe = router.afterEach(() => {
         checkIsMain();
     });
+    // filterPanel.value = inject('filterPanel', null);
     onUnmounted(unsubscribe);
 });
 
+watch(
+    () => inject('filterPanel'),
+    (newValue) => {
+        if (newValue) {
+            debugger;
+            // hacer algo cuando el valor esté disponible
+        }
+    },
+    { immediate: true },
+);
 onUnmounted(() => {
     if (arrayData) arrayData.destroy();
 });
@@ -90,9 +107,10 @@ function checkIsMain() {
 }
 </script>
 <template>
+    <pre>{{ filterPanelRef }}</pre>
     <slot name="searchbar">
         <VnSearchbar
-            ref="searchbarRef"
+            :filterPanel="filterPanelRef"
             v-if="searchBar && !hasContent"
             v-bind="arrayDataProps"
             :data-key="dataKey"
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index d09fbf3e5..20570ad50 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, inject, onMounted } from 'vue';
+import { ref, computed, inject, onMounted, provide } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';
@@ -61,12 +61,13 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    searchbarOptions: {
+    validations: {
+        type: Array,
+        default: () => [],
+    },
+    excludeParams: {
         type: Object,
-        default: () => ({
-            use: false,
-            validateFn: null,
-        }),
+        default: null,
     },
 });
 
@@ -93,7 +94,7 @@ const userParams = ref(useFilterParams($props.dataKey).params);
 const userOrders = ref(useFilterParams($props.dataKey).orders);
 const searchbar = ref(null);
 const isLoading = ref(false);
-
+const excludeParams = ref($props.excludeParams);
 onMounted(() => {
     searchbar.value = inject('searchbar');
 });
@@ -102,25 +103,36 @@ defineExpose({ search, params: userParams, remove });
 
 async function search(evt) {
     try {
-        if ($props.searchbarOptions.use) {
-            if (!searchbar.value) {
-                return;
-            }
-            if (typeof $props.searchbarOptions.validateFn === 'function') {
-                $props.searchbarOptions.validateFn(userParams.value);
-            }
+        // if ($props.searchbarOptions.use) {
+        //     // if (!searchbar.value) {
+        //     //     return;
+        //     // }
+        const validations = $props.validations.every((validation) => {
+            return validation(userParams.value);
+        });
+        // $props.searchbarOptions.validateFn(userParams.value);
 
-            if (!Object.keys(userParams.value).length) {
-                searchbar.value();
-                return;
-            }
+        if (!validations) {
+            return;
         }
+
+        if (Object.keys(userParams.value).length) {
+            excludeParams.value = null;
+        }
+
+        // }
         if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
         const filter = { ...userParams.value, ...$props.modelValue };
         store.userParamsChanged = true;
+        if (excludeParams.value) {
+            filter.params = {
+                ...filter.params,
+                exclude: excludeParams.value,
+            };
+        }
         await arrayData.addFilter({
             params: filter,
         });
@@ -131,6 +143,7 @@ async function search(evt) {
         isLoading.value = false;
     }
 }
+provide('filterPanel', search);
 
 async function clearFilters() {
     try {
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index f4b4f0fe8..3f7399a2b 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, computed, watch, inject, onUpdated } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -69,9 +69,13 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
-    excludeParams: {
+    filterPanelOptions: {
+        type: Boolean,
+        default: true,
+    },
+    filterPanel: {
         type: Object,
-        default: null,
+        default: true,
     },
 });
 
@@ -101,6 +105,29 @@ const to = computed(() => {
     return url;
 });
 
+// watch(
+//     () => filterPanel.value,
+//     (newValue) => {
+//         if (newValue) {
+//             // hacer algo cuando el valor esté disponible
+//             filterPanel.value = newValue;
+//         }
+//     },
+//     { immediate: true },
+// );
+
+const filterPanelRef = ref(null);
+const filterPanel = ref(null);
+watch(
+    () => filterPanelRef.value,
+    (newValue) => {
+        if (newValue) {
+            // hacer algo cuando el valor esté disponible
+            filterPanelRef.value = newValue;
+        }
+    },
+    { immediate: true },
+);
 watch(
     () => props.dataKey,
     (val) => {
@@ -108,6 +135,12 @@ watch(
         store = arrayData.store;
     },
 );
+watch(
+    () => props.filterPanel,
+    (val) => {
+        filterPanel.value = val;
+    },
+);
 
 onMounted(() => {
     const params = store.userParams;
@@ -120,7 +153,10 @@ async function search() {
     arrayData.resetPagination();
 
     let filter = { params: { search: searchText.value } };
-
+    if (props.filterPanelOptions && filterPanel.value) {
+        filterPanel.value.filterPanelRef.search(filter);
+        return;
+    }
     if (!props.searchRemoveParams || !searchText.value) {
         filter = {
             params: {
@@ -139,16 +175,9 @@ async function search() {
         };
         delete filter.params.search;
     }
-    if (props.excludeParams) {
-        filter.params = {
-            ...filter.params,
-            exclude: props.excludeParams,
-        };
-    }
     await arrayData.applyFilter(filter);
     searchText.value = undefined;
 }
-defineExpose({ search });
 </script>
 <template>
     <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 657390688..b5ebba83c 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -165,14 +165,19 @@ export function useArrayData(key, userOptions) {
 
     async function addFilter({ filter, params }) {
         if (filter) store.filter = filter;
-
+        let exclude = {};
+        if (params?.params?.exclude) {
+            exclude = params.params.exclude;
+            // params = { ...params, ...params.exclude };
+            delete params.params.exclude;
+        }
         let userParams = { ...store.userParams, ...params };
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
         resetPagination();
 
-        await fetch({});
+        await fetch({ exclude });
         return { filter, params };
     }
 
@@ -224,7 +229,11 @@ export function useArrayData(key, userOptions) {
 
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
-            if (params[param] === '' || params[param] === null) {
+            if (
+                params[param] === '' ||
+                params[param] === null ||
+                !Object(params[param]).length
+            ) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index a7205b6a6..cdca48101 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -1,6 +1,8 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed, provide } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { toDateString } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
@@ -17,14 +19,29 @@ const props = defineProps({
         required: true,
     },
 });
+const route = useRoute();
+const userParams = {
+    from: null,
+    to: null,
+};
+const filterPanelRef = ref(null);
 
+// Proveer específicamente el filterPanel
+provide('filterPanel', filterPanelRef);
+defineExpose({ filterPanelRef });
 const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
 const warehouses = ref([]);
 const groupedStates = ref([]);
 const { notify } = useNotify();
-
+const initializeFromQuery = computed(() => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+    from.value = query.from || from.toISOString();
+    to.value = query.to || to.toISOString();
+    Object.assign(userParams, { from, to });
+    return userParams;
+});
 const getGroupedStates = (data) => {
     for (const state of data) {
         groupedStates.value.push({
@@ -46,11 +63,9 @@ function validateDateRange(params) {
 
     if (hasFrom !== hasTo) {
         notify(t(`dateRangeMustHaveBothFrom`), 'negative');
-
-        throw new Error(t(`dateRangeMustHaveBothFrom`));
     }
 
-    return hasFrom && hasTo;
+    return (hasFrom && hasTo) || (!hasFrom && !hasTo);
 }
 </script>
 
@@ -74,9 +89,11 @@ function validateDateRange(params) {
     />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel
+        ref="filterPanelRef"
         :data-key="props.dataKey"
         :search-button="true"
-        :searchbar-options="{ use: true, validateFn: validateDateRange }"
+        :validations="[validateDateRange]"
+        :exclude-params="initializeFromQuery"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 1fe6baf00..f49fc2294 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -44,22 +44,13 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-const userParams = {
-    from: null,
-    to: null,
-};
+
 onBeforeMount(() => {
-    initializeFromQuery();
+    // initializeFromQuery();
     stateStore.rightDrawer = true;
     if (!route.query.createForm) return;
     onClientSelected(JSON.parse(route.query.createForm));
 });
-const initializeFromQuery = () => {
-    const query = route.query.table ? JSON.parse(route.query.table) : {};
-    from.value = query.from || from.toISOString();
-    to.value = query.to || to.toISOString();
-    Object.assign(userParams, { from, to });
-};
 
 const selectedRows = ref([]);
 const hasSelectedRows = computed(() => selectedRows.value.length > 0);
@@ -464,6 +455,7 @@ watch(
     },
     { immediate: true },
 );
+const filterPanelRef = ref(null);
 </script>
 
 <template>
@@ -484,13 +476,18 @@ watch(
         :array-data-props="{
             url: 'Tickets/filter',
             order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
-            excludeParams: { ...userParams },
+            filterPanelOptions: true,
+            filterPanel: filterPanelRef,
             searchRemoveParams: true,
             exprBuilder,
         }"
     >
         <template #advanced-menu>
-            <TicketFilter data-key="TicketList" />
+            <TicketFilter
+                ref="filterPanelRef"
+                data-key="TicketList"
+                :excludeParams="{ ...userParams }"
+            />
         </template>
         <template #body>
             <VnTable

From 1ce2009ca8b180bb8c8c6d6712811c9acce5bc48 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 23 Feb 2025 13:11:57 +0100
Subject: [PATCH 26/75] test: rename test

---
 .../ticket/{tickeFilter.spec.js => ticketFilter.spec.js}    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename test/cypress/integration/ticket/{tickeFilter.spec.js => ticketFilter.spec.js} (93%)

diff --git a/test/cypress/integration/ticket/tickeFilter.spec.js b/test/cypress/integration/ticket/ticketFilter.spec.js
similarity index 93%
rename from test/cypress/integration/ticket/tickeFilter.spec.js
rename to test/cypress/integration/ticket/ticketFilter.spec.js
index c92bae844..10973c5c5 100644
--- a/test/cypress/integration/ticket/tickeFilter.spec.js
+++ b/test/cypress/integration/ticket/ticketFilter.spec.js
@@ -11,7 +11,7 @@ describe('TicketFilter', () => {
         cy.waitForElement('.q-page');
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.searchBtnFilterPanel();
-        cy.wait('@ticketFilter').then(({ request }) => {
+        cy.waitRequest('@ticketFilter', ({ request }) => {
             const { query } = request;
             expect(query).to.have.property('from');
             expect(query).to.have.property('to');
@@ -40,12 +40,12 @@ describe('TicketFilter', () => {
         cy.location('href').should('contain', '#/ticket/999999');
     });
 });
-function today() {
+function today(date) {
     // return new Date().toISOString().split('T')[0];
 
     return new Intl.DateTimeFormat('es-ES', {
         day: '2-digit',
         month: '2-digit',
         year: 'numeric',
-    }).format(new Date());
+    }).format(date ?? new Date());
 }

From aff783eb2eb3d6edcc8d97af4761f2003fd45f83 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 23 Feb 2025 14:06:25 +0100
Subject: [PATCH 27/75] perf: remove comments

---
 src/components/common/VnSection.vue | 23 +-------------------
 src/components/ui/VnFilterPanel.vue | 13 +-----------
 src/components/ui/VnSearchbar.vue   | 33 +++--------------------------
 3 files changed, 5 insertions(+), 64 deletions(-)

diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index 1b1c18d7d..4bd17124f 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -2,7 +2,7 @@
 import RightAdvancedMenu from './RightAdvancedMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, onMounted, onUnmounted, computed, ref, inject, watch } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute, useRouter } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
@@ -36,10 +36,6 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    filterPanelRef: {
-        type: Object,
-        default: null,
-    },
     redirect: {
         type: Boolean,
         default: true,
@@ -60,9 +56,6 @@ const isMainSection = ref(false);
 const searchbarId = 'section-searchbar';
 const advancedMenuSlot = 'advanced-menu';
 const hasContent = useHasContent(`#${searchbarId}`);
-// const filterPanel = ref(inject('filterPanel', null));
-
-// filterPanel.value = inject('filterPanel', null);
 
 onBeforeMount(() => {
     if ($props.dataKey)
@@ -74,26 +67,14 @@ onBeforeMount(() => {
         });
     checkIsMain();
 });
-// const filterPanel = ref(inject('filterPanel', null));
 
 onMounted(() => {
     const unsubscribe = router.afterEach(() => {
         checkIsMain();
     });
-    // filterPanel.value = inject('filterPanel', null);
     onUnmounted(unsubscribe);
 });
 
-watch(
-    () => inject('filterPanel'),
-    (newValue) => {
-        if (newValue) {
-            debugger;
-            // hacer algo cuando el valor esté disponible
-        }
-    },
-    { immediate: true },
-);
 onUnmounted(() => {
     if (arrayData) arrayData.destroy();
 });
@@ -107,10 +88,8 @@ function checkIsMain() {
 }
 </script>
 <template>
-    <pre>{{ filterPanelRef }}</pre>
     <slot name="searchbar">
         <VnSearchbar
-            :filterPanel="filterPanelRef"
             v-if="searchBar && !hasContent"
             v-bind="arrayDataProps"
             :data-key="dataKey"
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 20570ad50..6f5f68a94 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, inject, onMounted, provide } from 'vue';
+import { ref, computed, provide } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';
@@ -92,25 +92,16 @@ const arrayData =
 const store = arrayData.store;
 const userParams = ref(useFilterParams($props.dataKey).params);
 const userOrders = ref(useFilterParams($props.dataKey).orders);
-const searchbar = ref(null);
 const isLoading = ref(false);
 const excludeParams = ref($props.excludeParams);
-onMounted(() => {
-    searchbar.value = inject('searchbar');
-});
 
 defineExpose({ search, params: userParams, remove });
 
 async function search(evt) {
     try {
-        // if ($props.searchbarOptions.use) {
-        //     // if (!searchbar.value) {
-        //     //     return;
-        //     // }
         const validations = $props.validations.every((validation) => {
             return validation(userParams.value);
         });
-        // $props.searchbarOptions.validateFn(userParams.value);
 
         if (!validations) {
             return;
@@ -120,7 +111,6 @@ async function search(evt) {
             excludeParams.value = null;
         }
 
-        // }
         if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
@@ -143,7 +133,6 @@ async function search(evt) {
         isLoading.value = false;
     }
 }
-provide('filterPanel', search);
 
 async function clearFilters() {
     try {
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 3f7399a2b..7dcad95db 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch, inject, onUpdated } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -69,10 +69,6 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
-    filterPanelOptions: {
-        type: Boolean,
-        default: true,
-    },
     filterPanel: {
         type: Object,
         default: true,
@@ -93,6 +89,7 @@ if (props.redirect)
     };
 let arrayData = useArrayData(props.dataKey, arrayDataProps);
 let store = arrayData.store;
+const filterPanel = ref(props.filterPanel);
 const to = computed(() => {
     const url = { path: route.path, query: { ...(route.query ?? {}) } };
     const searchUrl = arrayData.store.searchUrl;
@@ -104,30 +101,6 @@ const to = computed(() => {
     if (searchUrl) url.query[searchUrl] = JSON.stringify(currentFilter);
     return url;
 });
-
-// watch(
-//     () => filterPanel.value,
-//     (newValue) => {
-//         if (newValue) {
-//             // hacer algo cuando el valor esté disponible
-//             filterPanel.value = newValue;
-//         }
-//     },
-//     { immediate: true },
-// );
-
-const filterPanelRef = ref(null);
-const filterPanel = ref(null);
-watch(
-    () => filterPanelRef.value,
-    (newValue) => {
-        if (newValue) {
-            // hacer algo cuando el valor esté disponible
-            filterPanelRef.value = newValue;
-        }
-    },
-    { immediate: true },
-);
 watch(
     () => props.dataKey,
     (val) => {
@@ -153,7 +126,7 @@ async function search() {
     arrayData.resetPagination();
 
     let filter = { params: { search: searchText.value } };
-    if (props.filterPanelOptions && filterPanel.value) {
+    if (filterPanel.value) {
         filterPanel.value.filterPanelRef.search(filter);
         return;
     }

From 2725571ee15e66bcf3a8ad182720ddb89a311325 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 23 Feb 2025 14:06:31 +0100
Subject: [PATCH 28/75] perf: remove comments

---
 src/pages/Ticket/TicketFilter.vue | 2 --
 src/pages/Ticket/TicketList.vue   | 2 --
 test/cypress/support/commands.js  | 4 ++++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index cdca48101..e0b5835ca 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -26,8 +26,6 @@ const userParams = {
 };
 const filterPanelRef = ref(null);
 
-// Proveer específicamente el filterPanel
-provide('filterPanel', filterPanelRef);
 defineExpose({ filterPanelRef });
 const provinces = ref([]);
 const states = ref([]);
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index f49fc2294..6830d319e 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -46,7 +46,6 @@ to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
 
 onBeforeMount(() => {
-    // initializeFromQuery();
     stateStore.rightDrawer = true;
     if (!route.query.createForm) return;
     onClientSelected(JSON.parse(route.query.createForm));
@@ -476,7 +475,6 @@ const filterPanelRef = ref(null);
         :array-data-props="{
             url: 'Tickets/filter',
             order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
-            filterPanelOptions: true,
             filterPanel: filterPanelRef,
             searchRemoveParams: true,
             exprBuilder,
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 4470b6027..7c8aacc8a 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -396,3 +396,7 @@ Cypress.Commands.add('searchBtnFilterPanel', () => {
         '.q-scrollarea__content > .q-btn--standard > .q-btn__content > .q-icon',
     ).click();
 });
+
+Cypress.Commands.add('waitRequest', (alias, cb) => {
+    cy.wait(alias).then(cb);
+});

From 7daa97999b95289887698e9bda9049ef41231b8b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 23 Feb 2025 14:08:28 +0100
Subject: [PATCH 29/75] perf: remove comments

---
 src/pages/Ticket/TicketFilter.vue | 3 +--
 src/pages/Ticket/TicketList.vue   | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index e0b5835ca..0493fe8b4 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -1,8 +1,7 @@
 <script setup>
-import { ref, computed, provide } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { toDateString } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 6830d319e..6e9d23492 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -59,6 +59,8 @@ const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
 const dataKey = 'TicketList';
+const filterPanelRef = ref(null);
+const formInitialData = ref({});
 
 const columns = computed(() => [
     {
@@ -189,8 +191,6 @@ const columns = computed(() => [
         attrs: {
             url: 'warehouses',
             fields: ['id', 'name'],
-            optionLabel: 'name',
-            optionValue: 'id',
         },
         format: (row) => row.warehouse,
         columnField: {
@@ -438,7 +438,6 @@ function setReference(data) {
     dialogData.value.value.description = newDescription;
 }
 
-const formInitialData = ref({});
 watch(
     () => route.query.table,
     (newValue) => {
@@ -454,7 +453,6 @@ watch(
     },
     { immediate: true },
 );
-const filterPanelRef = ref(null);
 </script>
 
 <template>

From ed43f413f5c6436fc88c7c9db57d21dbd4ab2a16 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 23 Feb 2025 20:57:22 +0100
Subject: [PATCH 30/75] perf: remove comments

---
 src/components/ui/VnFilterPanel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 6f5f68a94..d8ac750d5 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, provide } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';

From 403159629bd41e7f9a3a53fb853cca8c5c4c1921 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Feb 2025 02:32:27 +0100
Subject: [PATCH 31/75] feat: ticketVolum 6 cols

---
 src/pages/Ticket/Card/TicketVolume.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 71b16f878..db78094cf 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -142,7 +142,7 @@ onMounted(() => (stateStore.rightDrawer = true));
         <template #column-concept="{ row }">
             <span>{{ row.item.name }}</span>
             <span class="color-vn-label q-pl-md">{{ row.item.subName }}</span>
-            <FetchedTags :item="row.item" />
+            <FetchedTags :item="row.item" :columns="6" />
         </template>
         <template #column-volume="{ rowIndex }">
             <span>{{ packingTypeVolume?.[rowIndex]?.volume }}</span>

From 43bbf05adfa1ffecede95d14877682ca2f7d8083 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Feb 2025 02:32:50 +0100
Subject: [PATCH 32/75] perf: apply search

---
 src/components/ui/VnFilterPanel.vue | 2 +-
 src/components/ui/VnSearchbar.vue   | 2 +-
 src/composables/useArrayData.js     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index d8ac750d5..c6bc11e2b 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -115,7 +115,7 @@ async function search(evt) {
 
         store.filter.where = {};
         isLoading.value = true;
-        const filter = { ...userParams.value, ...$props.modelValue };
+        const filter = { ...userParams.value, ...$props.modelValue, ...evt };
         store.userParamsChanged = true;
         if (excludeParams.value) {
             filter.params = {
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 7dcad95db..064baec20 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -126,7 +126,7 @@ async function search() {
     arrayData.resetPagination();
 
     let filter = { params: { search: searchText.value } };
-    if (filterPanel.value) {
+    if (filterPanel?.value?.filterPanelRef) {
         filterPanel.value.filterPanelRef.search(filter);
         return;
     }
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index b5ebba83c..1d86fc8e6 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -100,8 +100,8 @@ export function useArrayData(key, userOptions) {
 
         params.filter = JSON.stringify(params.filter);
         if (fetchOptions?.exclude) {
-            params = { ...params, ...fetchOptions.exclude };
             delete params.exclude;
+            params = { ...params.params, ...fetchOptions.exclude };
         }
         store.isLoading = true;
         const response = await axios.get(store.url, {
@@ -232,7 +232,7 @@ export function useArrayData(key, userOptions) {
             if (
                 params[param] === '' ||
                 params[param] === null ||
-                !Object(params[param]).length
+                !Object.keys(params[param]).length
             ) {
                 delete store.userParams[param];
                 delete params[param];

From 2117cbfb55386e0eccbabaf653b0fc7848b6dd33 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Feb 2025 12:22:42 +0100
Subject: [PATCH 33/75] fix: date ticketExpedition

---
 src/pages/Ticket/Card/TicketExpedition.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index f8084ff2f..a41d492ed 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -105,6 +105,9 @@ const columns = computed(() => [
         name: 'created',
         align: 'left',
         cardVisible: true,
+        columnFilter: {
+            component: 'date',
+        },
         format: (row) => toDateTimeFormat(row.created),
     },
     {
@@ -201,7 +204,7 @@ const getExpeditionState = async (expedition) => {
 
 const openGrafana = (expeditionFk) => {
     useOpenURL(
-        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
+        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`,
     );
 };
 
@@ -287,7 +290,7 @@ onMounted(async () => {
                         openConfirmationModal(
                             '',
                             t('expedition.removeExpeditionSubtitle'),
-                            deleteExpedition
+                            deleteExpedition,
                         )
                     "
                 >
@@ -302,7 +305,6 @@ onMounted(async () => {
         url="Expeditions/filter"
         search-url="expeditions"
         :columns="columns"
-        :filter="expeditionsFilter"
         v-model:selected="selectedRows"
         :table="{
             'row-key': 'id',
@@ -316,6 +318,8 @@ onMounted(async () => {
                         return { id: value };
                     case 'packageItemName':
                         return { packagingItemFk: value };
+                    case 'created':
+                        return { 'e.created': { gte: value } };
                 }
             }
         "

From 7a1a5ad5015295a056e03d3fefcce6a4a3afa394 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Feb 2025 12:54:41 +0100
Subject: [PATCH 34/75] fix: refs #7356 ticketService

---
 src/pages/Ticket/Card/TicketService.vue | 51 +++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 6ce69a6aa..6e3ddc2c6 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -121,6 +121,53 @@ async function handleSave() {
         isSaving.value = false;
     }
 }
+function validateFields(item, isUpdate = false) {
+    // Only validate fields that are being updated
+    const shouldValidate = (field) => !isUpdate || field in item;
+
+    if (shouldValidate('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
+        notify('Descriptssion is required', 'negative');
+        return false;
+    }
+
+    if (shouldValidate('quantity') && (!item.quantity || item.quantity <= 0)) {
+        notify('Quantity must be greater than 0', 'negative');
+        return false;
+    }
+
+    if (shouldValidate('price') && (item.price === null || item.price < 0)) {
+        notify('Price must be valid', 'negative');
+        return false;
+    }
+
+    return true;
+}
+
+function beforeSave(data) {
+    const { creates = [], updates = [] } = data;
+    const validData = { creates: [], updates: [] };
+
+    // Validate creates
+    if (creates.length) {
+        for (const create of creates) {
+            if (validateFields(create)) {
+                validData.creates.push(create);
+            }
+            create.ticketFk = route.params.id;
+        }
+    }
+
+    // Validate updates
+    if (updates.length) {
+        for (const update of updates) {
+            if (validateFields(update, true)) {
+                validData.updates.push(update);
+                return false;
+            }
+        }
+    }
+    return validData;
+}
 </script>
 
 <template>
@@ -141,6 +188,7 @@ async function handleSave() {
         v-model:selected="selected"
         :order="['description ASC']"
         :default-remove="false"
+        :beforeSaveFn="beforeSave"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -170,6 +218,7 @@ async function handleSave() {
                             option-value="id"
                             hide-selected
                             sort-by="name ASC"
+                            :required="true"
                         >
                             <template #form>
                                 <TicketCreateServiceType
@@ -185,6 +234,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.quantity"
                             type="number"
+                            :required="true"
                             min="0"
                             :info="t('service.quantityInfo')"
                         />
@@ -196,6 +246,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.price"
                             type="number"
+                            :required="true"
                             min="0"
                             @keyup.enter="handleSave"
                         />

From e0524bdecf77e3ccd2d77d4c134f65010c0807d4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Feb 2025 12:54:50 +0100
Subject: [PATCH 35/75] feat: refs #7356 update CrudModel

---
 src/components/CrudModel.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 93a2ac96a..ede91a5ed 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -184,8 +184,11 @@ async function saveChanges(data) {
     if ($props.beforeSaveFn) {
         changes = await $props.beforeSaveFn(changes, getChanges);
     }
-
     try {
+        if (changes.creates.length === 0 && changes.updates.length === 0) {
+            return;
+        }
+
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } finally {
         isLoading.value = false;

From 1c4b5aa720463a085ebf41de37593f194d96d947 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 26 Feb 2025 10:40:06 +0100
Subject: [PATCH 36/75] feat: refs #8242 remove teleport

---
 src/components/common/VnCardBeta.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 7c82316dc..56b12f67f 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -1,10 +1,9 @@
 <script setup>
 import { onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
-import LeftMenu from 'components/LeftMenu.vue';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 
 const props = defineProps({
@@ -27,7 +26,13 @@ const arrayData = useArrayData(props.dataKey, {
     oneRecord: true,
 });
 
+onBeforeRouteLeave((to, from) => {
+    stateStore.cardDescriptorChangeValue(null);
+});
+
 onBeforeMount(async () => {
+    stateStore.cardDescriptorChangeValue(props.descriptor);
+
     const route = router.currentRoute.value;
     try {
         await fetch(route.params.id);
@@ -39,6 +44,9 @@ onBeforeMount(async () => {
 });
 
 onBeforeRouteUpdate(async (to, from) => {
+    // if (to.matched.length < from.matched.length) {
+    //     stateStore.cardDescriptorChangeValue(null);
+    // }
     if (hasRouteParam(to.params)) {
         const { matched } = router.currentRoute.value;
         const { name } = matched.at(-3);
@@ -62,11 +70,6 @@ function hasRouteParam(params, valueToCheck = ':addressId') {
 }
 </script>
 <template>
-    <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
-        <component :is="descriptor" />
-        <QSeparator />
-        <LeftMenu source="card" />
-    </Teleport>
     <VnSubToolbar />
     <div :class="[useCardSize(), $attrs.class]">
         <RouterView :key="$route.path" />

From 82faba62ca9b775a2719795645e22826e76ce165 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 26 Feb 2025 10:40:17 +0100
Subject: [PATCH 37/75] feat: refs #8242 use stateStore

---
 src/components/common/VnModule.vue | 12 +++++++++---
 src/stores/useStateStore.js        |  6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnModule.vue b/src/components/common/VnModule.vue
index 038ee1d60..747a7c951 100644
--- a/src/components/common/VnModule.vue
+++ b/src/components/common/VnModule.vue
@@ -12,7 +12,7 @@ const $props = defineProps({
     },
 });
 onMounted(
-    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false),
 );
 
 const teleportRef = ref({});
@@ -35,8 +35,14 @@ onMounted(() => {
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
-            <div id="left-panel" ref="teleportRef"></div>
-            <LeftMenu v-if="!hasContent" />
+            <div id="left-panel" ref="teleportRef">
+                <template v-if="stateStore.cardDescriptor">
+                    <component :is="stateStore.cardDescriptor" />
+                    <QSeparator />
+                    <LeftMenu source="card" />
+                </template>
+                <template v-else> <LeftMenu /></template>
+            </div>
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index e48b67279..ca447bc11 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -7,7 +7,11 @@ export const useStateStore = defineStore('stateStore', () => {
     const rightDrawer = ref(false);
     const rightAdvancedDrawer = ref(false);
     const subToolbar = ref(false);
+    const cardDescriptor = ref(null);
 
+    function cardDescriptorChangeValue(descriptor) {
+        cardDescriptor.value = descriptor;
+    }
     function toggleLeftDrawer() {
         leftDrawer.value = !leftDrawer.value;
     }
@@ -49,6 +53,8 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     return {
+        cardDescriptor,
+        cardDescriptorChangeValue,
         leftDrawer,
         rightDrawer,
         rightAdvancedDrawer,

From 2427fed2e88cde0e9deee47c11d88c68eca97301 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 26 Feb 2025 11:54:14 +0100
Subject: [PATCH 38/75] fix: refs #8242 workerDepartmentTree bug

---
 src/components/common/VnCardBeta.vue  | 5 +----
 src/pages/Worker/WorkerDepartment.vue | 9 +--------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 56b12f67f..620dc2ad2 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -26,7 +26,7 @@ const arrayData = useArrayData(props.dataKey, {
     oneRecord: true,
 });
 
-onBeforeRouteLeave((to, from) => {
+onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
 });
 
@@ -44,9 +44,6 @@ onBeforeMount(async () => {
 });
 
 onBeforeRouteUpdate(async (to, from) => {
-    // if (to.matched.length < from.matched.length) {
-    //     stateStore.cardDescriptorChangeValue(null);
-    // }
     if (hasRouteParam(to.params)) {
         const { matched } = router.currentRoute.value;
         const { name } = matched.at(-3);
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
index baf6db154..e1411250b 100644
--- a/src/pages/Worker/WorkerDepartment.vue
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -1,16 +1,9 @@
 <script setup>
-import VnSection from 'src/components/common/VnSection.vue';
 import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <VnSection data-key="WorkerDepartment" :search-bar="false">
-        <template #body>
-            <div class="flex flex-center q-pa-md">
-                <WorkerDepartmentTree />
-            </div>
-        </template>
-    </VnSection>
+    <QPage class="q-pa-md flex justify-center"> <WorkerDepartmentTree /> </QPage>
 </template>
 
 <i18n>

From 70c2f6b2b06a779aed5fcf1067579af3cac71541 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 26 Feb 2025 12:33:35 +0100
Subject: [PATCH 39/75] refactor: refs #8594 update vehicle summary tests to
 use expected variable for consistency

---
 test/cypress/integration/route/vehicle/vehicleList.spec.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/cypress/integration/route/vehicle/vehicleList.spec.js b/test/cypress/integration/route/vehicle/vehicleList.spec.js
index e633b2fa2..2b3c9cdbc 100644
--- a/test/cypress/integration/route/vehicle/vehicleList.spec.js
+++ b/test/cypress/integration/route/vehicle/vehicleList.spec.js
@@ -17,6 +17,7 @@ describe('Vehicle list', () => {
         Description: { val: 'Exclusive for batpod transport' },
     };
 
+    const expected = data['Nº Plate'].val;
     const summaryUrl = '/summary';
 
     beforeEach(() => {
@@ -39,19 +40,19 @@ describe('Vehicle list', () => {
         cy.dataCy(selectors.saveFormBtn).should('be.visible').click();
 
         cy.checkNotification('Data created');
-        cy.get(selectors.summaryHeader).should('contain', data['Nº Plate'].val);
+        cy.get(selectors.summaryHeader).should('contain', expected);
         cy.url().should('include', summaryUrl);
     });
 
     it('should open summary by clicking a vehicle', () => {
         cy.get(selectors.numberPlate).click();
-        cy.get(selectors.summaryHeader).should('contain', data['Nº Plate'].val);
+        cy.get(selectors.summaryHeader).should('contain', expected);
         cy.url().should('include', summaryUrl);
     });
 
     it('should redirect to vehicle summary when click summary icon on summary pop-up', () => {
         cy.get(selectors.summaryPopupBtn).click();
-        cy.get(selectors.summaryHeader).should('contain', data['Nº Plate'].val);
+        cy.get(selectors.summaryHeader).should('contain', expected);
         cy.get(selectors.summaryGoToSummaryBtn).click();
         cy.url().should('include', summaryUrl);
     });

From 321e99f5013bd967ff639d37d2af56b893fbf9d8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 27 Feb 2025 19:14:21 +0000
Subject: [PATCH 40/75] feat: add order for table

---
 src/pages/Ticket/TicketAdvance.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 05bd14075..94b4623aa 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -456,6 +456,7 @@ watch(
             :pagination="{ rowsPerPage: 0 }"
             :no-data-label="t('globals.noResults')"
             :right-search="false"
+            :order="['futureTotalWithVat ASC']"            
             auto-load
             :disable-option="{ card: true }"
         >

From 15a6e3a3c5c0457e9dcf70e3faa1a23567ba7614 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 28 Feb 2025 14:12:12 +0100
Subject: [PATCH 41/75] test: skip EntryStockBought test suite

---
 test/cypress/integration/entry/stockBought.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index b282a19a5..87cbb3f9c 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -1,4 +1,4 @@
-describe('EntryStockBought', () => {
+describe.skip('EntryStockBought', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');

From 86437338508d3a4ed9b5d29e7ca5c73430f3fcd8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 28 Feb 2025 14:28:09 +0100
Subject: [PATCH 42/75] feat(orderCatalog): load when reload section

---
 src/pages/Order/Card/OrderCatalog.vue       | 28 ++++++++++++++++++++-
 src/pages/Order/Card/OrderCatalogFilter.vue | 20 +++++----------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 4b3992f21..dbb66c0ec 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -10,6 +10,7 @@ import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { onUnmounted } from 'vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -23,16 +24,40 @@ const catalogParams = {
 const arrayData = useArrayData(dataKey, {
     url: 'Orders/CatalogFilter',
     userParams: catalogParams,
+    exprBuilder,
+    searchUrl: 'table',
 });
 const store = arrayData.store;
 const tags = ref([]);
 const itemRefs = ref({});
 
-onMounted(() => {
+onMounted(async () => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
+
+    if (
+        arrayData.store.userParams &&
+        Object.keys(arrayData.store.userParams).some((key) => !key.startsWith('order'))
+    ) {
+        await arrayData.fetch({});
+    }
 });
 
+onUnmounted(() => {
+    arrayData.destroy();
+});
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'categoryFk':
+        case 'typeFk':
+            return { [param]: value };
+        case 'search':
+            if (/^\d+$/.test(value)) return { 'i.id': value };
+            else return { 'i.name': { like: `%${value}%` } };
+    }
+}
+
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
     if (response.data.isConfirmed === 1) {
@@ -96,6 +121,7 @@ watch(
                 :tag-value="tagValue"
                 :tags="tags"
                 :initial-catalog-params="catalogParams"
+                :arrayData
             />
         </template>
     </RightMenu>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 262f503fd..476d16df5 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -24,6 +24,10 @@ const props = defineProps({
         type: Array,
         required: true,
     },
+    arrayData: {
+        type: Object,
+        required: true,
+    },
 });
 
 const { t } = useI18n();
@@ -74,17 +78,6 @@ const loadTypes = async (id) => {
     typeList.value = data;
 };
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'categoryFk':
-        case 'typeFk':
-            return { [param]: value };
-        case 'search':
-            if (/^\d+$/.test(value)) return { 'i.id': value };
-            else return { 'i.name': { like: `%${value}%` } };
-    }
-}
-
 const applyTags = (tagInfo, params, search) => {
     if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
@@ -152,9 +145,8 @@ function addOrder(value, field, params) {
         :data-key="props.dataKey"
         :hidden-tags="['filter', 'orderFk', 'orderBy']"
         :unremovable-params="['orderFk', 'orderBy']"
-        :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
-        :redirect="false"
+        :arrayData
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk' && typeList">
@@ -184,7 +176,7 @@ function addOrder(value, field, params) {
                         {{
                             t(
                                 categoryList.find((c) => c.id == customTag.value)?.name ||
-                                    ''
+                                    '',
                             )
                         }}
                     </strong>

From 824ed0b8d698fe773a4ca760af0ecd97518817d3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 28 Feb 2025 14:59:06 +0100
Subject: [PATCH 43/75] fix: customer table ticket list

---
 src/pages/Customer/Card/CustomerSummary.vue            | 2 +-
 src/pages/Customer/components/CustomerSummaryTable.vue | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 324da0771..c98bf1ffb 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -325,7 +325,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-max">
                 <VnTitle :text="t('Latest tickets')" />
-                <CustomerSummaryTable />
+                <CustomerSummaryTable :id="entityId" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index bb6f4442b..09c7e714c 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -20,7 +20,12 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const { viewSummary } = useSummaryDialog();
-
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: null,
+    },
+});
 const filter = {
     include: [
         {
@@ -43,7 +48,7 @@ const filter = {
             },
         },
     ],
-    where: { clientFk: route.params.id },
+    where: { clientFk: $props.id ?? route.params.id },
     order: ['shipped DESC', 'id'],
     limit: 30,
 };

From 38658b6df940a0b04f134c4d1004086968d63c5f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Feb 2025 15:31:01 +0100
Subject: [PATCH 44/75] fix: error 400

---
 src/pages/Worker/Card/WorkerCalendarItem.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 893a81c6d..72c8266dc 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -79,7 +79,7 @@ const editEvent = async (event) => {
     };
     const { data } = await axios.patch(
         `Workers/${route.params.id}/updateAbsence`,
-        params
+        params,
     );
 
     if (data) emit('refresh');
@@ -94,7 +94,7 @@ const deleteEvent = async (event, date) => {
     if (data) emit('onDeletedEvent', date.getTime());
 };
 
-const handleDateSelected = (date) => {
+const handleDateSelected = async (date) => {
     if (!props.absenceType) {
         notify(t('Choose an absence type from the right menu'), 'warning');
         return;
@@ -108,14 +108,14 @@ const handleDateSelected = (date) => {
     if (!event) createEvent(_date);
 };
 
-const handleEventSelected = (event, { year, month, day }) => {
+const handleEventSelected = async (event, { year, month, day }) => {
     if (!props.absenceType) {
         notify(t('Choose an absence type from the right menu'), 'warning');
         return;
     }
 
     const date = new Date(year, month - 1, day);
-    if (!event?.absenceId) createEvent(date);
+    if (!event?.absenceId) await createEvent(date);
     else if (event.type == props.absenceType.code) deleteEvent(event, date);
     else editEvent(event);
 };

From 65ed3025942841514a5a655901e2a52e82642932 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 28 Feb 2025 15:32:02 +0100
Subject: [PATCH 45/75] fix: hotfix calendar error400

---
 src/pages/Worker/Card/WorkerCalendarItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 72c8266dc..86d227ad3 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -94,7 +94,7 @@ const deleteEvent = async (event, date) => {
     if (data) emit('onDeletedEvent', date.getTime());
 };
 
-const handleDateSelected = async (date) => {
+const handleDateSelected = (date) => {
     if (!props.absenceType) {
         notify(t('Choose an absence type from the right menu'), 'warning');
         return;

From c3b9a4f719ca6c6b58e1952d05d0613b21b2342a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 02:23:47 +0100
Subject: [PATCH 46/75] feat: add --browser chromium

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e78b0cf3c..fc7f9c15d 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-        "test:e2e": "cypress open",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test:e2e": "cypress open --browser chromium",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run --browser chromium",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:unit": "vitest",
         "test:unit:ci": "vitest run",

From e97c499e399e435fac2cac4f7a5690ca6ee69942 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 02:23:59 +0100
Subject: [PATCH 47/75] feat: rename test:unit by test:front

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fc7f9c15d..709d17f40 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
         "test:e2e": "cypress open --browser chromium",
         "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run --browser chromium",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-        "test:unit": "vitest",
-        "test:unit:ci": "vitest run",
+        "test:front": "vitest",
+        "test:front:ci": "vitest run",
         "commitlint": "commitlint --edit",
         "prepare": "npx husky install",
         "addReferenceTag": "node .husky/addReferenceTag.js",

From 1e9158b723f4df57b30d5f7ab14b81b5cbae8ae3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 09:46:02 +0100
Subject: [PATCH 48/75] revert: browser chromium package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 709d17f40..1361d1fd8 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-        "test:e2e": "cypress open --browser chromium",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run --browser chromium",
+        "test:e2e": "cypress open",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:front": "vitest",
         "test:front:ci": "vitest run",

From 15969eff43befda19e24ea03a91e96784f736e69 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 1 Mar 2025 09:46:21 +0100
Subject: [PATCH 49/75] ci: replace test:unit by test:front

---
 Jenkinsfile | 2 +-
 README.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a52a9e91d..ea3f1b439 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
             parallel {
                 stage('Unit') {
                     steps {
-                        sh 'pnpm run test:unit:ci'
+                        sh 'pnpm run test:front:ci'
                     }
                     post {
                         always {
diff --git a/README.md b/README.md
index e87a84d60..262e12e58 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ quasar dev
 ### Run unit tests
 
 ```bash
-pnpm run test:unit
+pnpm run test:front
 ```
 
 ### Run e2e tests

From 2d316b3721ac2a53560818800f6856c06fb98bc7 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Sat, 1 Mar 2025 20:57:03 +0100
Subject: [PATCH 50/75] feat: refs #8697 enable data-cy attribute for VnTable,
 update test cases to remove skips and adjust selectors

---
 src/components/VnTable/VnTable.vue                 | 1 +
 src/pages/Entry/Card/EntryBuys.vue                 | 1 -
 test/cypress/integration/entry/entryList.spec.js   | 2 +-
 test/cypress/integration/entry/stockBought.spec.js | 4 ++--
 test/cypress/integration/ticket/ticketList.spec.js | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index dd2cefd89..7e9f7aae0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -681,6 +681,7 @@ const rowCtrlClickFunction = computed(() => {
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
                 :hide-selected-banner="true"
+                :data-cy="$props.dataCy ?? 'vnTable'"
             >
                 <template #top-left v-if="!$props.withoutHeader">
                     <slot name="top-left"> </slot>
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 6e67c31ed..684ed5f59 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -656,7 +656,6 @@ onMounted(() => {
         :without-header="!editableMode"
         :with-filters="editableMode"
         :right-search="editableMode"
-        :right-search-icon="true"
         :row-click="false"
         :columns="columns"
         :beforeSaveFn="beforeSave"
diff --git a/test/cypress/integration/entry/entryList.spec.js b/test/cypress/integration/entry/entryList.spec.js
index bdaa66f79..d43ec895a 100644
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@@ -1,4 +1,4 @@
-describe.skip('Entry', () => {
+describe('Entry', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 87cbb3f9c..2a8431cf0 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -16,9 +16,9 @@ describe.skip('EntryStockBought', () => {
         cy.get('input[aria-label="Reserve"]').type('1');
         cy.get('input[aria-label="Date"]').eq(1).clear();
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerBossNick');
+        cy.get('input[aria-label="Buyer"]').type('itNick');
         cy.get('div[role="listbox"] > div > div[role="option"]')
-            .eq(0)
+            .eq(1)
             .should('be.visible')
             .click();
 
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 1c96b027f..593021e6e 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe.skip('TicketList', () => {
+describe('TicketList', () => {
     const firstRow = 'tbody > :nth-child(1)';
 
     beforeEach(() => {

From e4f83de123732449b6f3d8757fff4f4ce7db5deb Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Sun, 2 Mar 2025 00:15:24 +0100
Subject: [PATCH 51/75] test: refs #8697 enable EntryStockBought test suite by
 removing skip

---
 test/cypress/integration/entry/stockBought.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 2a8431cf0..91e0d507e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -1,4 +1,4 @@
-describe.skip('EntryStockBought', () => {
+describe('EntryStockBought', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');

From b4dad7a29b94947915d8918ccbc89ae4ea8e28e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 2 Mar 2025 23:22:01 +0100
Subject: [PATCH 52/75] revert: filter logic moved to other branch

---
 src/components/ui/VnFilterPanel.vue | 31 ++-----------------
 src/components/ui/VnSearchbar.vue   | 22 ++++----------
 src/composables/useArrayData.js     | 30 +++++--------------
 src/pages/Ticket/TicketFilter.vue   | 46 ++---------------------------
 src/pages/Ticket/TicketList.vue     | 21 ++++++++-----
 5 files changed, 30 insertions(+), 120 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index c6bc11e2b..d6b525dc8 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -61,14 +61,6 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    validations: {
-        type: Array,
-        default: () => [],
-    },
-    excludeParams: {
-        type: Object,
-        default: null,
-    },
 });
 
 const emit = defineEmits([
@@ -92,37 +84,18 @@ const arrayData =
 const store = arrayData.store;
 const userParams = ref(useFilterParams($props.dataKey).params);
 const userOrders = ref(useFilterParams($props.dataKey).orders);
-const isLoading = ref(false);
-const excludeParams = ref($props.excludeParams);
 
 defineExpose({ search, params: userParams, remove });
 
+const isLoading = ref(false);
 async function search(evt) {
     try {
-        const validations = $props.validations.every((validation) => {
-            return validation(userParams.value);
-        });
-
-        if (!validations) {
-            return;
-        }
-
-        if (Object.keys(userParams.value).length) {
-            excludeParams.value = null;
-        }
-
         if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
-        const filter = { ...userParams.value, ...$props.modelValue, ...evt };
+        const filter = { ...userParams.value, ...$props.modelValue };
         store.userParamsChanged = true;
-        if (excludeParams.value) {
-            filter.params = {
-                ...filter.params,
-                exclude: excludeParams.value,
-            };
-        }
         await arrayData.addFilter({
             params: filter,
         });
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 064baec20..8607d9694 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -69,10 +69,6 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
-    filterPanel: {
-        type: Object,
-        default: true,
-    },
 });
 
 const searchText = ref();
@@ -89,7 +85,6 @@ if (props.redirect)
     };
 let arrayData = useArrayData(props.dataKey, arrayDataProps);
 let store = arrayData.store;
-const filterPanel = ref(props.filterPanel);
 const to = computed(() => {
     const url = { path: route.path, query: { ...(route.query ?? {}) } };
     const searchUrl = arrayData.store.searchUrl;
@@ -101,6 +96,7 @@ const to = computed(() => {
     if (searchUrl) url.query[searchUrl] = JSON.stringify(currentFilter);
     return url;
 });
+
 watch(
     () => props.dataKey,
     (val) => {
@@ -108,12 +104,6 @@ watch(
         store = arrayData.store;
     },
 );
-watch(
-    () => props.filterPanel,
-    (val) => {
-        filterPanel.value = val;
-    },
-);
 
 onMounted(() => {
     const params = store.userParams;
@@ -126,10 +116,7 @@ async function search() {
     arrayData.resetPagination();
 
     let filter = { params: { search: searchText.value } };
-    if (filterPanel?.value?.filterPanelRef) {
-        filterPanel.value.filterPanelRef.search(filter);
-        return;
-    }
+
     if (!props.searchRemoveParams || !searchText.value) {
         filter = {
             params: {
@@ -217,8 +204,9 @@ async function search() {
 }
 
 :deep(.q-field--focused) {
-    .q-icon {
-        color: black;
+    .q-icon,
+    .q-placeholder {
+        color: var(--vn-black-text-color);
     }
 }
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 1d86fc8e6..fcc61972a 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -75,13 +75,12 @@ export function useArrayData(key, userOptions) {
         }
     }
 
-    async function fetch(fetchOptions) {
-        let { append = false, updateRouter = true } = fetchOptions ?? {};
+    async function fetch({ append = false, updateRouter = true }) {
         if (!store.url) return;
 
         cancelRequest();
         canceller = new AbortController();
-        let { params, limit } = setCurrentFilter();
+        const { params, limit } = setCurrentFilter();
 
         let exprFilter;
         if (store?.exprBuilder) {
@@ -99,10 +98,7 @@ export function useArrayData(key, userOptions) {
         if (!params?.filter?.order?.length) delete params?.filter?.order;
 
         params.filter = JSON.stringify(params.filter);
-        if (fetchOptions?.exclude) {
-            delete params.exclude;
-            params = { ...params.params, ...fetchOptions.exclude };
-        }
+
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
@@ -154,30 +150,22 @@ export function useArrayData(key, userOptions) {
     async function applyFilter({ filter, params }, fetchOptions = {}) {
         if (filter) store.userFilter = filter;
         store.filter = {};
-        if (params?.exclude) {
-            fetchOptions = { ...fetchOptions, exclude: params.exclude };
-            delete params.exclude;
-        }
         if (params) store.userParams = { ...params };
+
         const response = await fetch(fetchOptions);
         return response;
     }
 
     async function addFilter({ filter, params }) {
         if (filter) store.filter = filter;
-        let exclude = {};
-        if (params?.params?.exclude) {
-            exclude = params.params.exclude;
-            // params = { ...params, ...params.exclude };
-            delete params.params.exclude;
-        }
+
         let userParams = { ...store.userParams, ...params };
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
         resetPagination();
 
-        await fetch({ exclude });
+        await fetch({});
         return { filter, params };
     }
 
@@ -229,11 +217,7 @@ export function useArrayData(key, userOptions) {
 
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
-            if (
-                params[param] === '' ||
-                params[param] === null ||
-                !Object.keys(params[param]).length
-            ) {
+            if (params[param] === '' || params[param] === null) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index a3193f352..5da2a858c 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -1,7 +1,6 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
@@ -9,7 +8,6 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import useNotify from 'src/composables/useNotify';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -18,27 +16,13 @@ const props = defineProps({
         required: true,
     },
 });
-const route = useRoute();
-const userParams = {
-    from: null,
-    to: null,
-};
-const filterPanelRef = ref(null);
 
-defineExpose({ filterPanelRef });
 const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
 const warehouses = ref([]);
 const groupedStates = ref([]);
-const { notify } = useNotify();
-const initializeFromQuery = computed(() => {
-    const query = route.query.table ? JSON.parse(route.query.table) : {};
-    from.value = query.from || from.toISOString();
-    to.value = query.to || to.toISOString();
-    Object.assign(userParams, { from, to });
-    return userParams;
-});
+
 const getGroupedStates = (data) => {
     for (const state of data) {
         groupedStates.value.push({
@@ -48,22 +32,6 @@ const getGroupedStates = (data) => {
         });
     }
 };
-const from = Date.vnNew();
-from.setHours(0, 0, 0, 0);
-from.setDate(from.getDate() - 7);
-const to = Date.vnNew();
-to.setHours(23, 59, 0, 0);
-to.setDate(to.getDate() + 1);
-function validateDateRange(params) {
-    const hasFrom = 'from' in params;
-    const hasTo = 'to' in params;
-
-    if (hasFrom !== hasTo) {
-        notify(t(`dateRangeMustHaveBothFrom`), 'negative');
-    }
-
-    return (hasFrom && hasTo) || (!hasFrom && !hasTo);
-}
 </script>
 
 <template>
@@ -85,13 +53,7 @@ function validateDateRange(params) {
         auto-load
     />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel
-        ref="filterPanelRef"
-        :data-key="props.dataKey"
-        :search-button="true"
-        :validations="[validateDateRange]"
-        :exclude-params="initializeFromQuery"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -341,7 +303,6 @@ function validateDateRange(params) {
 
 <i18n>
 en:
-    dateRangeMustHaveBothFrom: The date range must have both 'from' and 'to'
     params:
         search: Contains
         clientFk: Customer
@@ -370,7 +331,6 @@ en:
     DELIVERED: Delivered
     ON_PREVIOUS: ON_PREVIOUS
 es:
-    dateRangeMustHaveBothFrom: El rango de fechas debe tener 'desde' y 'hasta'
     params:
         search: Contiene
         clientFk: Cliente
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 01bb23807..ee092d40f 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -44,12 +44,22 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-
+const userParams = {
+    from: null,
+    to: null,
+};
 onBeforeMount(() => {
+    initializeFromQuery();
     stateStore.rightDrawer = true;
     if (!route.query.createForm) return;
     onClientSelected(JSON.parse(route.query.createForm));
 });
+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+    from.value = query.from || from.toISOString();
+    to.value = query.to || to.toISOString();
+    Object.assign(userParams, { from, to });
+};
 
 const selectedRows = ref([]);
 const hasSelectedRows = computed(() => selectedRows.value.length > 0);
@@ -471,17 +481,11 @@ watch(
         :array-data-props="{
             url: 'Tickets/filter',
             order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
-            filterPanel: filterPanelRef,
-            searchRemoveParams: true,
             exprBuilder,
         }"
     >
         <template #advanced-menu>
-            <TicketFilter
-                ref="filterPanelRef"
-                data-key="TicketList"
-                :excludeParams="{ ...userParams }"
-            />
+            <TicketFilter data-key="TicketList" />
         </template>
         <template #body>
             <VnTable
@@ -495,6 +499,7 @@ watch(
                 }"
                 default-mode="table"
                 :columns="columns"
+                :user-params="userParams"
                 :right-search="false"
                 redirect="ticket"
                 v-model:selected="selectedRows"

From 947024ef565cf6c67001d2003805c1a184660feb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 2 Mar 2025 23:50:23 +0100
Subject: [PATCH 53/75] perf: refs #7356 minor changes

---
 src/pages/Ticket/Card/TicketService.vue | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 6e3ddc2c6..1bd1548a4 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -121,21 +121,21 @@ async function handleSave() {
         isSaving.value = false;
     }
 }
-function validateFields(item, isUpdate = false) {
+function validateFields(item) {
     // Only validate fields that are being updated
-    const shouldValidate = (field) => !isUpdate || field in item;
+    const shouldExist = (field) => !isUpdate || field in item;
 
-    if (shouldValidate('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
-        notify('Descriptssion is required', 'negative');
+    if (!shouldExist('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
+        notify('Description is required', 'negative');
         return false;
     }
 
-    if (shouldValidate('quantity') && (!item.quantity || item.quantity <= 0)) {
+    if (!shouldExist('quantity') && (!item.quantity || item.quantity <= 0)) {
         notify('Quantity must be greater than 0', 'negative');
         return false;
     }
 
-    if (shouldValidate('price') && (item.price === null || item.price < 0)) {
+    if (!shouldExist('price') && (!item.price || item.price < 0)) {
         notify('Price must be valid', 'negative');
         return false;
     }
@@ -150,20 +150,17 @@ function beforeSave(data) {
     // Validate creates
     if (creates.length) {
         for (const create of creates) {
+            create.ticketFk = route.params.id;
             if (validateFields(create)) {
                 validData.creates.push(create);
             }
-            create.ticketFk = route.params.id;
         }
     }
 
     // Validate updates
     if (updates.length) {
         for (const update of updates) {
-            if (validateFields(update, true)) {
-                validData.updates.push(update);
-                return false;
-            }
+            validData.updates.push(update);
         }
     }
     return validData;

From f9b410405d632a4c820238e14edc9dc742cafc9b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 3 Mar 2025 09:13:38 +0100
Subject: [PATCH 54/75] refactor: refs #8697 simplify date handling in
 ItemDiary component

---
 src/pages/Item/Card/ItemDiary.vue | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 83cd562a0..f839c1f71 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -158,15 +158,10 @@ const getBadgeAttrs = (_date) => {
 
 const scrollToToday = async () => {
     await nextTick();
-    const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
-    if (todayCell) {
-        todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
-    }
-};
-
-const formatDateForAttribute = (dateValue) => {
-    if (dateValue instanceof Date) return date.formatDate(dateValue, 'YYYY-MM-DD');
-    return dateValue;
+    const todayCell = document.querySelector(
+        `td[data-date="${date.formatDate(today, 'YYYY-MM-DD')}"]`,
+    );
+    if (todayCell) todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
 };
 
 async function updateWarehouse(warehouseFk) {
@@ -242,7 +237,7 @@ async function updateWarehouse(warehouseFk) {
                 </QTd>
             </template>
             <template #body-cell-date="{ row }">
-                <QTd @click.stop :data-date="formatDateForAttribute(row.shipped)">
+                <QTd @click.stop :data-date="row?.shipped.substring(0, 10)">
                     <QBadge
                         v-bind="getBadgeAttrs(row.shipped)"
                         class="q-ma-none"

From 967848c790e3c82f9d9063195a711595639f1507 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 10:19:19 +0100
Subject: [PATCH 55/75] fix: refs #7356 chaining params

---
 src/components/CrudModel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index ede91a5ed..8c4f70f3b 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -185,7 +185,7 @@ async function saveChanges(data) {
         changes = await $props.beforeSaveFn(changes, getChanges);
     }
     try {
-        if (changes.creates.length === 0 && changes.updates.length === 0) {
+        if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
             return;
         }
 

From a7af697947500799df02d86270aad0733a445695 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 10:22:07 +0100
Subject: [PATCH 56/75] style: refs #7356 eslint format

---
 src/components/__tests__/CrudModel.spec.js | 64 ++++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/components/__tests__/CrudModel.spec.js b/src/components/__tests__/CrudModel.spec.js
index e0afd30ad..f6c93e0d5 100644
--- a/src/components/__tests__/CrudModel.spec.js
+++ b/src/components/__tests__/CrudModel.spec.js
@@ -30,8 +30,8 @@ describe('CrudModel', () => {
                 saveFn: '',
             },
         });
-        wrapper=wrapper.wrapper;
-        vm=wrapper.vm;
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
 
     beforeEach(() => {
@@ -143,14 +143,14 @@ describe('CrudModel', () => {
         });
 
         it('should return true if object is empty', async () => {
-            dummyObj ={};
-            result = vm.isEmpty(dummyObj);    
+            dummyObj = {};
+            result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(true);
         });
 
         it('should return false if object is not empty', async () => {
-            dummyObj = {a:1, b:2, c:3};
+            dummyObj = { a: 1, b: 2, c: 3 };
             result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(false);
@@ -158,29 +158,31 @@ describe('CrudModel', () => {
 
         it('should return true if array is empty', async () => {
             dummyArray = [];
-            result = vm.isEmpty(dummyArray); 
+            result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(true);
         });
-        
+
         it('should return false if array is not empty', async () => {
-            dummyArray = [1,2,3];
+            dummyArray = [1, 2, 3];
             result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(false);
-        })
+        });
     });
 
     describe('resetData()', () => {
         it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
-            data = [{
-                name: 'Tony',
-                lastName: 'Stark',
-                age: 42,
-            }];
+            data = [
+                {
+                    name: 'Tony',
+                    lastName: 'Stark',
+                    age: 42,
+                },
+            ];
 
             vm.resetData(data);
-            
+
             expect(vm.originalData).toEqual(data);
             expect(vm.originalData[0].$index).toEqual(0);
             expect(vm.formData).toEqual(data);
@@ -200,7 +202,7 @@ describe('CrudModel', () => {
                 lastName: 'Stark',
                 age: 42,
             };
-            
+
             vm.resetData(data);
 
             expect(vm.originalData).toEqual(data);
@@ -210,17 +212,19 @@ describe('CrudModel', () => {
     });
 
     describe('saveChanges()', () => {
-        data = [{
-            name: 'Tony',
-            lastName: 'Stark',
-            age: 42,
-        }];
+        data = [
+            {
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            },
+        ];
 
         it('should call saveFn if exists', async () => {
             await wrapper.setProps({ saveFn: vi.fn() });
 
             vm.saveChanges(data);
-            
+
             expect(vm.saveFn).toHaveBeenCalledOnce();
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
@@ -229,13 +233,15 @@ describe('CrudModel', () => {
         });
 
         it("should use default url if there's not saveFn", async () => {
-            const postMock =vi.spyOn(axios, 'post');
-            
-            vm.formData = [{
-                name: 'Bruce',
-                lastName: 'Wayne',
-                age: 45,
-            }]
+            const postMock = vi.spyOn(axios, 'post');
+
+            vm.formData = [
+                {
+                    name: 'Bruce',
+                    lastName: 'Wayne',
+                    age: 45,
+                },
+            ];
 
             await vm.saveChanges(data);
 

From 5e6ce6efda1e9705eff0a33e5f2f9a49b4588aad Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 3 Mar 2025 13:06:50 +0100
Subject: [PATCH 57/75] fix: workerBasicData

---
 src/pages/Worker/Card/WorkerBasicData.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index cf43412af..ace220983 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';

From d2ccc232ef1db23c646346b87220bde2d9379030 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 3 Mar 2025 15:11:47 +0100
Subject: [PATCH 58/75] refactor: refs #8581 improve note components and update
 filter handling

---
 src/components/ui/VnNotes.vue             | 29 ++++++++++++--------
 src/pages/Claim/Card/ClaimNotes.vue       | 33 +++++++++++------------
 src/pages/Customer/Card/CustomerNotes.vue | 19 +++----------
 src/pages/Worker/Card/WorkerNotes.vue     | 16 ++++++-----
 4 files changed, 46 insertions(+), 51 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index ec6289a67..6740934d4 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -26,12 +26,13 @@ const $attrs = computed(() => {
 });
 
 const isRequired = computed(() => {
-    return Object.keys($attrs).includes('required')
+    return Object.keys($attrs).includes('required');
 });
 
 const $props = defineProps({
     url: { type: String, default: null },
-    saveUrl: {type: String, default: null},
+    saveUrl: { type: String, default: null },
+    userFilter: { type: Object, default: () => {} },
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
@@ -65,7 +66,7 @@ async function insert() {
 }
 
 function confirmAndUpdate() {
-    if(!newNote.text && originalText)
+    if (!newNote.text && originalText)
         quasar
             .dialog({
                 component: VnConfirm,
@@ -88,11 +89,17 @@ async function update() {
         ...body,
         ...{ notes: newNote.text },
     };
-    await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
+    await axios.patch(
+        `${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`,
+        newBody,
+    );
 }
 
 onBeforeRouteLeave((to, from, next) => {
-    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
+    if (
+        (newNote.text && !$props.justInput) ||
+        (newNote.text !== originalText && $props.justInput)
+    )
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -104,12 +111,11 @@ onBeforeRouteLeave((to, from, next) => {
     else next();
 });
 
-function fetchData([ data ]) {
+function fetchData([data]) {
     newNote.text = data?.notes;
     originalText = data?.notes;
     emit('onFetch', data);
 }
-
 </script>
 <template>
     <FetchData
@@ -126,8 +132,8 @@ function fetchData([ data ]) {
         @on-fetch="fetchData"
         auto-load
     />
-    <QCard 
-        class="q-pa-xs q-mb-lg full-width" 
+    <QCard
+        class="q-pa-xs q-mb-lg full-width"
         :class="{ 'just-input': $props.justInput }"
         v-if="$props.addNote || $props.justInput"
     >
@@ -179,7 +185,8 @@ function fetchData([ data ]) {
         :url="$props.url"
         order="created DESC"
         :limit="0"
-        :user-filter="$props.filter"
+        :user-filter="userFilter"
+        :filter="filter"
         auto-load
         ref="vnPaginateRef"
         class="show"
@@ -218,7 +225,7 @@ function fetchData([ data ]) {
                                 >
                                     {{
                                         observationTypes.find(
-                                            (ot) => ot.id === note.observationTypeFk
+                                            (ot) => ot.id === note.observationTypeFk,
                                         )?.description
                                     }}
                                 </QBadge>
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index cc6e33779..68cb220ee 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, useAttrs } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
@@ -7,7 +7,6 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 const route = useRoute();
 const state = useState();
 const user = state.getUser();
-const $attrs = useAttrs();
 
 const $props = defineProps({
     id: { type: [Number, String], default: null },
@@ -15,24 +14,21 @@ const $props = defineProps({
 });
 const claimId = computed(() => $props.id || route.params.id);
 
-const claimFilter = computed(() => {
-    return {
-        where: { claimFk: claimId.value },
-        fields: ['id', 'created', 'workerFk', 'text'],
-        include: {
-            relation: 'worker',
-            scope: {
-                fields: ['id', 'firstName', 'lastName'],
-                include: {
-                    relation: 'user',
-                    scope: {
-                        fields: ['id', 'nickname', 'name'],
-                    },
+const claimFilter = {
+    fields: ['id', 'created', 'workerFk', 'text'],
+    include: {
+        relation: 'worker',
+        scope: {
+            fields: ['id', 'firstName', 'lastName'],
+            include: {
+                relation: 'user',
+                scope: {
+                    fields: ['id', 'nickname', 'name'],
                 },
             },
         },
-    };
-});
+    },
+};
 
 const body = {
     claimFk: claimId.value,
@@ -43,7 +39,8 @@ const body = {
     <VnNotes
         url="claimObservations"
         :add-note="$props.addNote"
-        :filter="claimFilter"
+        :user-filter="claimFilter"
+        :filter="{ where: { claimFk: claimId } }"
         :body="body"
         v-bind="$attrs"
         style="overflow-y: auto"
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 189b59904..5a078b0cb 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -1,28 +1,15 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
 import VnNotes from 'src/components/ui/VnNotes.vue';
-
-const route = useRoute();
-
-const noteFilter = computed(() => {
-    return {
-        order: 'created DESC',
-        where: {
-            clientFk: `${route.params.id}`,
-        },
-    };
-});
 </script>
-
 <template>
     <VnNotes
         url="clientObservations"
         :add-note="true"
-        :filter="noteFilter"
-        :body="{ clientFk: route.params.id }"
+        :filter="{ where: { clientFk: $route.params.id } }"
+        :body="{ clientFk: $route.params.id }"
         style="overflow-y: auto"
         :select-type="true"
         required
+        order="created DESC"
     />
 </template>
diff --git a/src/pages/Worker/Card/WorkerNotes.vue b/src/pages/Worker/Card/WorkerNotes.vue
index 4f123206b..da274f3fa 100644
--- a/src/pages/Worker/Card/WorkerNotes.vue
+++ b/src/pages/Worker/Card/WorkerNotes.vue
@@ -5,9 +5,9 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 
 const route = useRoute();
 
-const filter = {
+const userFilter = {
     order: 'created DESC',
-    where: { workerFk: route.params.id },
+
     include: {
         relation: 'worker',
         scope: {
@@ -22,11 +22,15 @@ const filter = {
     },
 };
 
-const body = {
-    workerFk: route.params.id,
-};
+const body = { workerFk: route.params.id };
 </script>
 
 <template>
-    <VnNotes :add-note="true" url="WorkerObservations" :filter="filter" :body="body" />
+    <VnNotes
+        :add-note="true"
+        url="WorkerObservations"
+        :user-filter="userFilter"
+        :filter="{ where: { workerFk: $route.params.id } }"
+        :body="body"
+    />
 </template>

From 9b8eb74b17540a2ecc1927d94d51a1590459d6ca Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 3 Mar 2025 15:53:17 +0100
Subject: [PATCH 59/75] build: refs #8713 add changelog

---
 CHANGELOG.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b68b7fa..10b7c73f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,41 @@
+# Version 25.08 - 2025-03-04
+
+### Added 🆕
+
+- feat: add order for table (origin/8681_ticketAdvance_updates) by:Javier Segarra
+- feat: detect when is descriptor proxy by:Javier Segarra
+- feat: refs #7356 update CrudModel by:Javier Segarra
+- feat: refs #8242 remove teleport by:Javier Segarra
+- feat: refs #8242 use stateStore by:Javier Segarra
+- fix: fixed negative bases style by:Jon
+- fix: fixed style when clicking on icons by:Jon
+- refactor: refs #6897 remove debug logs and unused style (origin/6897-fixSomeCaus) by:pablone
+- style: refs #7356 eslint format by:Javier Segarra
+
+### Changed 📦
+
+- perf: refs #7356 minor changes (origin/7356_ticketService) by:Javier Segarra
+- refactor: refs #6897 remove debug logs and unused style (origin/6897-fixSomeCaus) by:pablone
+- refactor: refs #6897 update component props and attributes for consistency and improved functionality (origin/6897-fixMinorIssues) by:pablone
+- refactor: refs #6897 update component props and improve UI handling in Entry pages by:pablone
+- refactor: refs #6897 update VnTable components for improved value handling and UI adjustments (origin/6897-minorFixes) by:pablone
+- refactor: refs #8697 simplify date handling in ItemDiary component by:pablone
+
+### Fixed 🛠️
+
+- fix: add datakey by:Javier Segarra
+- fix: fixed account descriptor menu and created e2e by:Jon
+- fix: fixed negative bases style by:Jon
+- fix: fixed style when clicking on icons by:Jon
+- fix: refs #6553 workerBusiness (origin/6553-fixWorkerBusinessV2) by:carlossa
+- fix: refs #6553 workerBusiness v3 by:carlossa
+- fix: refs #6897 prevent default event behavior in autocompleteExpense function by:pablone
+- fix: refs #7356 chaining params by:Javier Segarra
+- fix: refs #7356 ticketService by:Javier Segarra
+- fix: refs #8242 workerDepartmentTree bug (origin/8242_leftMenu_responsive) by:Javier Segarra
+- fix: workerBasicData by:carlossa
+- Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" (origin/fix_revert_revert, fix_revert_revert) by:alexm
+
 # Version 25.06 - 2025-02-18
 
 ### Added 🆕

From b84eb9c23c57accaf79003a64930e82582f3bbf9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 3 Mar 2025 15:55:31 +0100
Subject: [PATCH 60/75] fix:  cy.domContentLoad(); not exist

---
 test/cypress/integration/ticket/ticketFilter.spec.js | 1 -
 test/cypress/integration/ticket/ticketList.spec.js   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketFilter.spec.js b/test/cypress/integration/ticket/ticketFilter.spec.js
index 10973c5c5..659a9f83c 100644
--- a/test/cypress/integration/ticket/ticketFilter.spec.js
+++ b/test/cypress/integration/ticket/ticketFilter.spec.js
@@ -4,7 +4,6 @@ describe('TicketFilter', () => {
         cy.login('developer');
         cy.viewport(1920, 1080);
         cy.visit('/#/ticket/list');
-        cy.domContentLoad();
     });
 
     it('use search button', function () {
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 3b5ddef79..6a6dc24af 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -6,7 +6,6 @@ describe('TicketList', () => {
         cy.login('developer');
         cy.viewport(1920, 1080);
         cy.visit('/#/ticket/list');
-        cy.domContentLoad();
     });
 
     const searchResults = (search) => {

From 6fb160ec8dc1f0bef548612018b2b53d03b6113c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 22:01:30 +0100
Subject: [PATCH 61/75] feat: update Cypress configuration and improve ticket
 components with new features

---
 cypress.config.js                             |  1 +
 src/components/ui/CardDescriptor.vue          | 28 +++++++++----------
 src/pages/Ticket/Card/TicketSale.vue          |  1 +
 .../integration/ticket/ticketList.spec.js     | 18 +++---------
 .../integration/ticket/ticketSale.spec.js     |  2 +-
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/cypress.config.js b/cypress.config.js
index a9e27fcfd..07b9451e6 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -5,6 +5,7 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
     e2e: {
+        defaultBrowser: 'chromium',
         baseUrl: 'http://localhost:9000/',
         experimentalStudio: true,
         fixturesFolder: 'test/cypress/fixtures',
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8ed1fa0fa..8280a6a88 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -200,22 +200,22 @@ const toModule = computed(() =>
                         </div>
                     </QItemLabel>
                     <QItem>
-                        <QItemLabel class="subtitle" caption>
+                        <QItemLabel class="subtitle">
                             #{{ getValueFromPath(subtitle) ?? entity.id }}
-                            <QBtn
-                                round
-                                flat
-                                dense
-                                size="sm"
-                                icon="content_copy"
-                                color="primary"
-                                @click.stop="copyIdText(entity.id)"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.copyId') }}
-                                </QTooltip>
-                            </QBtn>
                         </QItemLabel>
+                        <QBtn
+                            round
+                            flat
+                            dense
+                            size="sm"
+                            icon="content_copy"
+                            color="primary"
+                            @click.stop="copyIdText(entity.id)"
+                        >
+                            <QTooltip>
+                                {{ t('globals.copyId') }}
+                            </QTooltip>
+                        </QBtn>
                     </QItem>
                 </QList>
                 <div class="list-box q-mt-xs">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 456a151a3..2efa2083c 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -681,6 +681,7 @@ watch(
         :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
+            <QIcon name="vn:reserved" v-if="row.reserved"></QIcon>
             <TicketProblems :row="row" />
         </template>
         <template #body-cell-picture="{ row }">
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 3b5ddef79..2d185f2e6 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -12,12 +12,12 @@ describe('TicketList', () => {
     const searchResults = (search) => {
         if (search) cy.typeSearchbar().type(search);
         cy.dataCy('vn-searchbar').find('input').type('{enter}');
-        cy.dataCy('ticketListTable').should('exist');
+        // cy.dataCy('ticketListTable').should('exist');
         cy.get(firstRow).should('exist');
     };
 
     it('should search results', () => {
-        cy.dataCy('ticketListTable').should('not.exist');
+        // cy.dataCy('ticketListTable').should('not.exist');
         cy.get('.q-field__control').should('exist');
         searchResults();
     });
@@ -41,21 +41,11 @@ describe('TicketList', () => {
     it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
-        cy.wait('@ticketSearchbar').then(({ request }) => {
-            const { query } = request;
-            expect(query).to.have.property('from');
-            expect(query).to.have.property('to');
-            expect(query).to.not.have.property('clientFk');
-        });
+
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.dataCy('Customer ID_input').clear('1');
         cy.dataCy('Customer ID_input').type('1101{enter}');
-        cy.wait('@ticketFilter').then(({ request }) => {
-            const { query } = request;
-            expect(query).to.not.have.property('from');
-            expect(query).to.not.have.property('to');
-            expect(query).to.have.property('clientFk');
-        });
+
         cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
         cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
         cy.dataCy('Address_select').click();
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index 63562bd26..c7c5f91d5 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -6,6 +6,7 @@ describe('TicketSale', () => {
             cy.login('developer');
             cy.viewport(1920, 1080);
             cy.visit('/#/ticket/31/sale');
+            cy.domContentLoad();
         });
 
         const firstRow = 'tbody > :nth-child(1)';
@@ -112,7 +113,6 @@ describe('TicketSale', () => {
             cy.dataCy('ticketSaleTransferBtn').click();
             cy.dataCy('ticketTransferPopup').should('exist');
             cy.dataCy('ticketTransferNewTicketBtn').click();
-            //check the new ticket has been created succesfully
             cy.get('.q-item > .q-item__label').should('not.have.text', ' #32');
         });
 

From 399437d3342ef59b9eb17510849c5045fbe9d52a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 22:47:47 +0100
Subject: [PATCH 62/75] feat: add reserved icon to TicketProblems and update
 Cypress tests for ticket sale functionality

---
 src/components/TicketProblems.vue             | 11 ++++++
 src/pages/Ticket/Card/TicketSale.vue          |  1 -
 .../integration/ticket/ticketFilter.spec.js   | 39 +------------------
 .../integration/ticket/ticketSale.spec.js     | 39 +++++++++----------
 4 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/src/components/TicketProblems.vue b/src/components/TicketProblems.vue
index 783f2556f..a537174c3 100644
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@@ -17,6 +17,17 @@ defineProps({ row: { type: Object, required: true } });
                 </QTooltip>
             </QIcon>
         </router-link>
+        <QIcon
+            v-if="row?.reserved"
+            color="primary"
+            name="vn:reserva"
+            size="xs"
+            data-cy="ticketSaleReservedIcon"
+        >
+            <QTooltip>
+                {{ t('ticketSale.reserved') }}
+            </QTooltip>
+        </QIcon>
         <QIcon
             v-if="row?.risk"
             name="vn:risk"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2efa2083c..456a151a3 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -681,7 +681,6 @@ watch(
         :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
-            <QIcon name="vn:reserved" v-if="row.reserved"></QIcon>
             <TicketProblems :row="row" />
         </template>
         <template #body-cell-picture="{ row }">
diff --git a/test/cypress/integration/ticket/ticketFilter.spec.js b/test/cypress/integration/ticket/ticketFilter.spec.js
index 10973c5c5..3520e7373 100644
--- a/test/cypress/integration/ticket/ticketFilter.spec.js
+++ b/test/cypress/integration/ticket/ticketFilter.spec.js
@@ -9,43 +9,8 @@ describe('TicketFilter', () => {
 
     it('use search button', function () {
         cy.waitForElement('.q-page');
-        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
+        cy.get('[data-cy="Customer ID_input"]').type('1105');
         cy.searchBtnFilterPanel();
-        cy.waitRequest('@ticketFilter', ({ request }) => {
-            const { query } = request;
-            expect(query).to.have.property('from');
-            expect(query).to.have.property('to');
-        });
-        cy.on('uncaught:exception', () => {
-            return false;
-        });
-        cy.get('.q-field__control-container > [data-cy="From_date"]')
-            .type(`${today()} `)
-            .type('{enter}');
-        cy.get('.q-notification').should(
-            'contain',
-            `The date range must have both 'from' and 'to'`,
-        );
-
-        cy.get('.q-field__control-container > [data-cy="To_date"]').type(
-            `${today()}{enter}`,
-        );
-        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
-        cy.searchBtnFilterPanel();
-        cy.wait('@ticketFilter').then(({ request }) => {
-            const { query } = request;
-            expect(query).to.have.property('from');
-            expect(query).to.have.property('to');
-        });
-        cy.location('href').should('contain', '#/ticket/999999');
+        cy.location('href').should('contain', '#/ticket/15/summary');
     });
 });
-function today(date) {
-    // return new Date().toISOString().split('T')[0];
-
-    return new Intl.DateTimeFormat('es-ES', {
-        day: '2-digit',
-        month: '2-digit',
-        year: 'numeric',
-    }).format(date ?? new Date());
-}
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index c7c5f91d5..61c6208bd 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -138,7 +138,7 @@ describe('TicketSale', () => {
         it('update price', () => {
             const price = Number((Math.random() * 99 + 1).toFixed(2));
             cy.waitForElement(firstRow);
-            cy.get(':nth-child(10) > .q-btn').click();
+            cy.get('[data-col-field="price"]').find('.q-btn').click();
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
             cy.waitForElement('[data-cy="Price_input"]');
@@ -147,15 +147,14 @@ describe('TicketSale', () => {
             cy.dataCy('saveManaBtn').click();
             handleVnConfirm();
 
-            cy.get(':nth-child(10) > .q-btn > .q-btn__content').should(
-                'have.text',
-                `€${price}`,
-            );
+            cy.get('[data-col-field="price"]')
+                .find('.q-btn > .q-btn__content')
+                .should('have.text', `€${price}`);
         });
-        it('update dicount', () => {
+        it('update discount', () => {
             const discount = Math.floor(Math.random() * 100) + 1;
             selectFirstRow();
-            cy.get(':nth-child(11) > .q-btn').click();
+            cy.get('[data-col-field="discount"]').find('.q-btn').click();
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
             cy.waitForElement('[data-cy="Disc_input"]');
@@ -164,26 +163,24 @@ describe('TicketSale', () => {
             cy.dataCy('saveManaBtn').click();
             handleVnConfirm();
 
-            cy.get(':nth-child(11) > .q-btn > .q-btn__content').should(
-                'have.text',
-                `${discount}.00%`,
-            );
+            cy.get('[data-col-field="discount"]')
+                .find('.q-btn > .q-btn__content')
+                .should('have.text', `${discount}.00%`);
         });
 
-        it('change concept', () => {
-            const quantity = Math.floor(Math.random() * 100) + 1;
+        it.only('change concept', () => {
+            const concept = Math.floor(Math.random() * 100) + 1;
             cy.waitForElement(firstRow);
-            cy.get(':nth-child(8) > .row').click();
-            cy.get(
-                '.q-menu > [data-v-ca3f07a4=""] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="undefined_input"]',
-            )
-                .type(quantity)
+            cy.get('[data-col-field="item"]').click();
+            cy.get('.q-menu')
+                .find('[data-cy="undefined_input"]')
+                .type(concept)
                 .type('{enter}');
             handleVnConfirm();
 
-            cy.get(':nth-child(8) >.row').should('contain.text', `${quantity}`);
+            cy.get('[data-col-field="item"]').should('contain.text', `${concept}`);
         });
-        it('changequantity ', () => {
+        it('change quantity ', () => {
             const quantity = Math.floor(Math.random() * 100) + 1;
             cy.waitForElement(firstRow);
             cy.dataCy('ticketSaleQuantityInput').clear();
@@ -200,7 +197,7 @@ describe('TicketSale', () => {
 });
 
 function handleVnConfirm() {
-    cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
+    cy.get('[data-cy="VnConfirm_confirm"]').click();
     cy.waitForElement('.q-notification__message');
 
     cy.get('.q-notification__message').should('be.visible');

From 15d94ca165ebe7dd23f6c9c185a2cef8f1aa6727 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 23:10:44 +0100
Subject: [PATCH 63/75] fix: add order and sortBy

---
 src/components/FilterTravelForm.vue            | 2 +-
 src/pages/Entry/EntryFilter.vue                | 1 +
 src/pages/Route/Card/RouteAutonomousFilter.vue | 3 +--
 src/pages/Ticket/TicketFilter.vue              | 7 ++++++-
 src/pages/Travel/ExtraCommunityFilter.vue      | 1 +
 src/pages/Travel/TravelCreate.vue              | 1 +
 src/pages/Travel/TravelFilter.vue              | 3 +--
 src/pages/Zone/ZoneFilterPanel.vue             | 3 ++-
 src/pages/Zone/ZoneList.vue                    | 3 +--
 9 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 4d43c3810..cd4b28a44 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
     <FetchData
         url="AgencyModes"
         @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         auto-load
     />
     <FetchData
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 0f632c0ef..715133386 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -89,6 +89,7 @@ const companiesOptions = ref([]);
                         v-model="params.companyFk"
                         @update:model-value="searchFn()"
                         :options="companiesOptions"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="code"
                         hide-selected
diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue
index 3be409ec9..f70f60e1c 100644
--- a/src/pages/Route/Card/RouteAutonomousFilter.vue
+++ b/src/pages/Route/Card/RouteAutonomousFilter.vue
@@ -44,8 +44,7 @@ const exprBuilder = (param, value) => {
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name ASC"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencyList = data)"
         auto-load
     />
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index c82c0067f..aeb758c62 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -46,7 +46,12 @@ const getGroupedStates = (data) => {
         "
         auto-load
     />
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index b903aeabf..4f5a7d065 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -73,6 +73,7 @@ warehouses();
     />
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 72c34aad8..35a936134 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -39,6 +39,7 @@ const redirectToTravelBasicData = (_, { id }) => {
 <template>
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 90901ee4d..4a9c80952 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -52,9 +52,8 @@ defineExpose({ states });
                     v-model="params.agencyModeFk"
                     @update:model-value="searchFn()"
                     url="agencyModes"
+                    sort-by="name ASC"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="name"
                     dense
                     outlined
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 3a35527ab..9f5763e46 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -5,6 +5,7 @@ import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import order from 'src/router/modules/order';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -24,7 +25,7 @@ const agencies = ref([]);
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencies = data)"
         auto-load
     />
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index e4a1774fe..b146071ed 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -212,9 +212,8 @@ function showValidAddresses(row) {
         <template #more-create-dialog="{ data }">
             <VnSelect
                 url="AgencyModes"
+                sort-by="name ASC"
                 v-model="data.agencyModeFk"
-                option-value="id"
-                option-label="name"
                 :label="t('list.agency')"
             />
             <VnInput

From 73eab5baa41bc1b11618f0551cf86528319b193e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 23:35:29 +0100
Subject: [PATCH 64/75] refactor: remove default browser setting and update
 test case to run normally

---
 cypress.config.js                                  | 1 -
 test/cypress/integration/ticket/ticketSale.spec.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cypress.config.js b/cypress.config.js
index 07b9451e6..a9e27fcfd 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -5,7 +5,6 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
     e2e: {
-        defaultBrowser: 'chromium',
         baseUrl: 'http://localhost:9000/',
         experimentalStudio: true,
         fixturesFolder: 'test/cypress/fixtures',
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index 61c6208bd..6dd7a63e7 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -168,7 +168,7 @@ describe('TicketSale', () => {
                 .should('have.text', `${discount}.00%`);
         });
 
-        it.only('change concept', () => {
+        it('change concept', () => {
             const concept = Math.floor(Math.random() * 100) + 1;
             cy.waitForElement(firstRow);
             cy.get('[data-col-field="item"]').click();

From d13fb26b1af555846b9113238387ed66f5fd5b1e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 08:07:38 +0100
Subject: [PATCH 65/75] fix(TicketProblems): isTaxDataChecked

---
 src/components/TicketProblems.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/TicketProblems.vue b/src/components/TicketProblems.vue
index a537174c3..105813e99 100644
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@@ -78,12 +78,7 @@ defineProps({ row: { type: Object, required: true } });
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon
-            v-if="row?.isTaxDataChecked !== 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
+        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
         <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">

From 09c80bda41759a0f7ed3081ffb2ad89082a47398 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 08:19:53 +0100
Subject: [PATCH 66/75] fix(VnSelect): event.preventDefault(); (git revert)

---
 src/components/common/VnSelect.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index d111780bd..339f90e0e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -302,6 +302,8 @@ defineExpose({ opts: myOptions, vnSelectRef });
 
 function handleKeyDown(event) {
     if (event.key === 'Tab' && !event.shiftKey) {
+        event.preventDefault();
+
         const inputValue = vnSelectRef.value?.inputValue;
 
         if (inputValue) {

From 6b414d04f0d086cbc92b6b1bf6016572ac656aee Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 08:29:36 +0100
Subject: [PATCH 67/75] fix: unnecessary function

---
 test/cypress/integration/ticket/ticketSale.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index b8a0c83b5..805198857 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -6,7 +6,6 @@ describe('TicketSale', () => {
             cy.login('developer');
             cy.viewport(1920, 1080);
             cy.visit('/#/ticket/31/sale');
-            cy.domContentLoad();
         });
 
         const firstRow = 'tbody > :nth-child(1)';

From 62706535891eaf9f3954fd92d10705911987a312 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 08:48:09 +0100
Subject: [PATCH 68/75] fix(TicketExpedition): add filter

---
 src/pages/Ticket/Card/TicketExpedition.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index a41d492ed..e9e153b70 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -37,7 +37,6 @@ const expeditionStateTypes = ref([]);
 
 const expeditionsFilter = computed(() => ({
     where: { ticketFk: route.params.id },
-    order: ['created DESC'],
 }));
 
 const ticketArrayData = useArrayData('Ticket');
@@ -325,6 +324,7 @@ onMounted(async () => {
         "
         :redirect="false"
         order="created DESC"
+        :filter="expeditionsFilter"
     >
         <template #column-freightItemName="{ row }">
             <span class="link" @click.stop>

From 71dd5fc73d6670e8d27985082e5090fc9f78cb62 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 09:05:59 +0100
Subject: [PATCH 69/75] fix(TicketProblems): handle null credit value in risk
 calculation

---
 src/components/TicketProblems.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TicketProblems.vue b/src/components/TicketProblems.vue
index 105813e99..62eeb6b2d 100644
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@@ -36,7 +36,7 @@ defineProps({ row: { type: Object, required: true } });
         >
             <QTooltip>
                 {{ $t('salesTicketsTable.risk') }}:
-                {{ toCurrency(row.risk - row.credit) }}
+                {{ toCurrency(row.risk - (row.credit ?? 0)) }}
             </QTooltip>
         </QIcon>
         <QIcon

From f5204ed2faf914eee072138e3c3f38195d711317 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 09:11:21 +0100
Subject: [PATCH 70/75] fix(TicketProblems): update risk condition to use
 hasRisk property

---
 src/components/TicketProblems.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/TicketProblems.vue b/src/components/TicketProblems.vue
index 62eeb6b2d..5978f4e21 100644
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@@ -29,7 +29,7 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.risk"
+            v-if="row?.hasRisk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"

From 8faf1aa97c350a2d3a83559087e0b1f1836b4984 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 09:29:50 +0100
Subject: [PATCH 71/75] fix(VnNotes): simplify attribute handling by removing
 unnecessary computed property

---
 src/components/ui/VnNotes.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 6740934d4..eb0804af0 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -18,12 +18,7 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
-const originalAttrs = useAttrs();
-
-const $attrs = computed(() => {
-    const { style, ...rest } = originalAttrs;
-    return rest;
-});
+const $attrs = useAttrs();
 
 const isRequired = computed(() => {
     return Object.keys($attrs).includes('required');

From 3d0e25f8deb53ff88bbc0368c134581d0b388d43 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 4 Mar 2025 11:15:21 +0100
Subject: [PATCH 72/75] feat: define prop

---
 src/components/VnTable/VnTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0d186bd57..28a24690f 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: [Function, Boolean],
         default: null,
     },
+    rowCtrlClick: {
+        type: [Function, Boolean],
+        default: null,
+    },
     redirect: {
         type: String,
         default: null,

From 856ec7f6a5114e7ca8d4d997257502e6d27b1bf0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 4 Mar 2025 11:16:08 +0100
Subject: [PATCH 73/75] feat: define rowCtrlClick

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

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 2ec862df0..782175cd6 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -17,6 +17,7 @@ import MonitorTicketFilter from './MonitorTicketFilter.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000;
 const { t } = useI18n();
@@ -321,8 +322,7 @@ const totalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const openTab = (id) =>
-    window.open(`#/ticket/${id}/sale`, '_blank', 'noopener, noreferrer');
+const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
 </script>
 <template>
     <FetchData
@@ -397,6 +397,7 @@ const openTab = (id) =>
         default-mode="table"
         auto-load
         :row-click="({ id }) => openTab(id)"
+        :row-ctrl-click="(_, { id }) => openTab(id)"
         :disable-option="{ card: true }"
         :user-params="{ from, to, scopeDays: 0 }"
     >

From 14cae9de45132440c1585253fefea0dad34674b2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 4 Mar 2025 11:31:16 +0100
Subject: [PATCH 74/75] feat: refs #6919 add additional fields to filter
 options

---
 src/pages/Supplier/Card/SupplierFilter.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/Supplier/Card/SupplierFilter.js b/src/pages/Supplier/Card/SupplierFilter.js
index 3ce5c3de2..3aabe2c6d 100644
--- a/src/pages/Supplier/Card/SupplierFilter.js
+++ b/src/pages/Supplier/Card/SupplierFilter.js
@@ -11,6 +11,11 @@ export default {
         'isSerious',
         'isTrucker',
         'account',
+        'workerFk',
+        'note',
+        'isReal',
+        'isPayMethodChecked',
+        'companySize',
     ],
     include: [
         {

From 849d1b889a534b4b1d071a183301d4beb4f60f0b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 4 Mar 2025 12:03:00 +0100
Subject: [PATCH 75/75] fix(TicketDescriptor): fix risk, adding client credit

---
 src/pages/Monitor/locale/en.yml            | 2 +-
 src/pages/Monitor/locale/es.yml            | 2 +-
 src/pages/Ticket/Card/TicketDescriptor.vue | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 496c8761a..c049a5e53 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -22,7 +22,7 @@ salesTicketsTable:
     notVisible: Not visible
     purchaseRequest: Purchase request
     clientFrozen: Client frozen
-    risk: Risk
+    risk: Excess risk
     componentLack: Component lack
     tooLittle: Ticket too little
     identifier: Identifier
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index f6a29879f..a02d7f36f 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -22,7 +22,7 @@ salesTicketsTable:
     notVisible: No visible
     purchaseRequest: Petición de compra
     clientFrozen: Cliente congelado
-    risk: Riesgo
+    risk: Exceso de riesgo
     componentLack: Faltan componentes
     tooLittle: Ticket demasiado pequeño
     identifier: Identificador
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index c5f3233b1..1e585592f 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -93,9 +93,9 @@ function ticketFilter(ticket) {
             <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
             <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
-        <template #icons>
+        <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-xs">
-                <TicketProblems :row="problems" />
+                <TicketProblems :row="{ ...entity?.client, ...problems }" />
             </QCardActions>
         </template>
         <template #actions="{ entity }">