From e13090bb3bf4eca3aae47618d9bbc620407c69da Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 25 Oct 2024 07:01:58 +0200
Subject: [PATCH 01/37] feat: refs #8038 added new functionality in VnSelect
 and refactor styles

---
 src/components/VnTable/VnTable.vue |  2 +-
 src/components/common/VnSelect.vue | 23 +++++++++++++++++++++++
 src/css/app.scss                   |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b9c6edf50..7a7c341a6 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -379,7 +379,7 @@ function handleScroll() {
                             :name="col.orderBy ?? col.name"
                             :data-key="$attrs['data-key']"
                             :search-url="searchUrl"
-                            :vertical="true"
+                            :vertical="false"
                         />
                     </div>
                     <slot
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index b0aa648c1..86ca38468 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -230,6 +230,28 @@ function nullishToTrue(value) {
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 
 defineExpose({ opts: myOptions });
+
+function handleKeyDown(event) {
+    if (event.key === 'Tab') {
+        event.preventDefault();
+
+        const inputValue = vnSelectRef.value?.inputValue;
+
+        if (inputValue) {
+            const matchingOption = myOptions.value.find(
+                (option) =>
+                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
+            );
+
+            if (matchingOption) {
+                emit('update:modelValue', matchingOption[optionValue.value]);
+            } else {
+                emit('update:modelValue', inputValue);
+            }
+            vnSelectRef.value?.hidePopup();
+        }
+    }
+}
 </script>
 
 <template>
@@ -250,6 +272,7 @@ defineExpose({ opts: myOptions });
         :option-value="optionValue"
         v-bind="$attrs"
         @filter="filterHandler"
+        @keydown="handleKeyDown"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
diff --git a/src/css/app.scss b/src/css/app.scss
index d4c76ad6b..63a9f5c46 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -241,7 +241,7 @@ input::-webkit-inner-spin-button {
     th,
     td {
         padding: 1px 10px 1px 10px;
-        max-width: 100px;
+        max-width: 130px;
         div span {
             overflow: hidden;
             white-space: nowrap;

From fc73149dcfe1b2f83d06d3dd5cbaa6c6dc14008e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 11 Nov 2024 14:20:39 +0100
Subject: [PATCH 02/37] feat: refs #8087 refs#8087 Redadas en travel

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Card/BasicData/TicketBasicDataForm.vue    | 45 ++++++++++++++-----
 src/pages/Ticket/locale/en.yml                |  1 +
 src/pages/Ticket/locale/es.yml                |  1 +
 src/pages/Travel/Card/TravelBasicData.vue     |  5 ++-
 src/pages/Travel/Card/TravelDescriptor.vue    |  8 +---
 src/pages/Travel/Card/TravelSummary.vue       | 13 ++++--
 src/pages/Travel/TravelList.vue               |  8 ++--
 9 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index a6065e451..53d6e2e9e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1041,6 +1041,7 @@ travel:
         delivered: Delivered
         received: Received
         daysInForward: Days in forward
+        isRaid: Raid
     thermographs:
         code: Code
         temperature: Temperature
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6f01f7dd1..0e6ee61c8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1039,6 +1039,7 @@ travel:
         delivered: Enviada
         received: Recibida
         daysInForward: Días redada
+        isRaid: Redada
     thermographs:
         code: Código
         temperature: Temperatura
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index f6c20c514..3ac385fbd 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -36,6 +36,7 @@ const canEditZone = useAcl().hasAny([
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
+const currenciesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
@@ -289,6 +290,15 @@ async function getZone(options) {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
+    <FetchData
+        url="Currencies"
+        :filter="{
+            fields: ['id', 'code'],
+            order: 'code ASC',
+        }"
+        @on-fetch="(data) => (currenciesOptions = data)"
+        auto-load
+    />
     <FetchData
         ref="agencyFetchRef"
         url="AgencyModes/byWarehouse"
@@ -395,17 +405,6 @@ async function getZone(options) {
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
-            <VnSelect
-                :label="t('basicData.company')"
-                v-model="formData.companyFk"
-                option-value="id"
-                option-label="code"
-                :options="companiesOptions"
-                hide-selected
-                map-options
-                :required="true"
-                :rules="validate('basicData.company')"
-            />
             <VnSelect
                 :label="t('basicData.agency')"
                 v-model="agencyModeId"
@@ -444,6 +443,30 @@ async function getZone(options) {
                     </QItem>
                 </template>
             </VnSelect>
+            <VnSelect
+                :label="t('basicData.company')"
+                v-model="formData.companyFk"
+                option-value="id"
+                option-label="code"
+                :options="companiesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                :rules="validate('basicData.company')"
+            />
+        </VnRow>
+        <VnRow class="row q-gutter-md q-mb-md no-wrap">
+            <VnSelect
+                :label="t('basicData.currencyFk')"
+                v-model="formData.currencyFk"
+                option-value="id"
+                option-label="code"
+                :options="currenciesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                :rules="validate('basicData.currencyFk')"
+            />
         </VnRow>
         <VnRow>
             <VnInputDate
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 829ea7a91..a1f426c3c 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -170,6 +170,7 @@ basicData:
     negativesConfirmMessage: Negatives are going to be generated, are you sure you want to advance all the lines?
     chooseAnOption: Choose an option
     unroutedTicket: The ticket has been unrouted
+    currencyFk: Currency
 purchaseRequest:
     id: Id
     description: Description
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index eab38a402..a13d07566 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -88,6 +88,7 @@ basicData:
     negativesConfirmMessage: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
     chooseAnOption: Elige una opción
     unroutedTicket: El ticket ha sido desenrutado
+    currencyFk: Moneda
 weeklyTickets:
     id: ID Ticket
     client: Cliente
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index d6245e655..37af383e2 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -84,6 +84,7 @@ const agenciesOptions = ref([]);
                 </VnInput>
             </VnRow>
             <VnRow>
+                <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
                 <QCheckbox
                     :label="t('travel.basicData.delivered')"
                     v-model="data.isDelivered"
@@ -99,7 +100,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si no se especifican días, la fecha no cambiará
 en:
-    raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If no days are specified, the date will stay the same.
 </i18n>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 6025ad045..a77d7460e 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -32,6 +32,7 @@ const filter = {
         'warehouseOutFk',
         'cargoSupplierFk',
         'agencyModeFk',
+        'isRaid',
         'daysInForward',
     ],
     include: [
@@ -80,12 +81,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
-                <QIcon
-                    v-if="entity.daysInForward"
-                    name="vn:net"
-                    color="primary"
-                    size="xs"
-                >
+                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: entity.daysInForward })
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 7dc267671..6c98d18b8 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -268,6 +268,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.wareHouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
+                <QCheckbox
+                    :label="t('travel.basicData.isRaid')"
+                    v-model="travel.isRaid"
+                    :disable="true"
+                />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="travel.isDelivered"
@@ -286,6 +291,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.wareHouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
                 <QCheckbox
                     :label="t('travel.summary.received')"
                     v-model="travel.isReceived"
@@ -303,10 +312,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
-                <VnLv
-                    :label="t('travel.basicData.daysInForward')"
-                    :value="travel?.daysInForward"
-                />
             </QCard>
             <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 334640bff..89c7548cd 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -227,12 +227,14 @@ const columns = computed(() => [
     >
         <template #column-status="{ row }">
             <div class="row">
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
+                            t('globals.raid', {
+                                daysInForward: row.daysInForward,
+                            })
                         }}</QTooltip
-                    >
+                    >{{ console.log(row.daysInForward) }}
                 </QIcon>
             </div>
         </template>

From e9fad1a44e16324768c42c487e094857e467fe11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 11 Nov 2024 15:00:07 +0100
Subject: [PATCH 03/37] feat: refs #8087 refs#8087 Redadas en travel

---
 src/pages/Travel/Card/TravelBasicData.vue | 4 ++--
 src/pages/Travel/TravelList.vue           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 37af383e2..f71bcf72c 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -100,7 +100,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si no se especifican días, la fecha no cambiará
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
 en:
-    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If no days are specified, the date will stay the same.
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If left empty, the date will stay the same.
 </i18n>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 89c7548cd..d6dfd0368 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -234,7 +234,7 @@ const columns = computed(() => [
                                 daysInForward: row.daysInForward,
                             })
                         }}</QTooltip
-                    >{{ console.log(row.daysInForward) }}
+                    >
                 </QIcon>
             </div>
         </template>

From 4bfbd1925e01d8945e8a29cbcfa37308da9dd3c8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 11 Nov 2024 15:18:29 -0300
Subject: [PATCH 04/37] test: refs #8162 ticket list e2e tests

---
 src/components/VnTable/VnTable.vue            |  1 +
 src/components/ui/VnSearchbar.vue             |  1 +
 src/pages/Ticket/Card/TicketDescriptor.vue    |  2 +-
 src/pages/Ticket/Card/TicketSummary.vue       |  1 +
 src/pages/Ticket/TicketList.vue               |  2 +
 .../integration/ticket/ticketList.spec.js     | 54 +++++++++++++++++++
 test/cypress/support/commands.js              |  4 ++
 7 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/ticket/ticketList.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index fd7b0c51a..99a9a6801 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -737,6 +737,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             fab
             icon="add"
             shortcut="+"
+            data-testid="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index dc6d4751c..7a72a09ea 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -130,6 +130,7 @@ async function search() {
                 dense
                 standout
                 autofocus
+                data-testid="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 70fd9ab1e..e1f852af0 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -174,7 +174,7 @@ function ticketFilter(ticket) {
                     <QTooltip>{{ t('Client Frozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.problem.includes('hasRisk')"
+                    v-if="entity?.problem?.includes('hasRisk')"
                     name="vn:risk"
                     size="xs"
                     color="primary"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 61751357c..375044ed1 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -99,6 +99,7 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
+        data-testid="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 4317efb83..f5227b43b 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -457,6 +457,7 @@ function setReference(data) {
         data-key="Ticket"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
+        data-testid="ticketListSearchBar"
     />
     <RightMenu>
         <template #right-panel>
@@ -484,6 +485,7 @@ function setReference(data) {
             'row-key': 'id',
             selection: 'multiple',
         }"
+        data-testid="ticketListTable"
     >
         <template #column-statusIcons="{ row }">
             <div class="q-gutter-x-xs">
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
new file mode 100644
index 000000000..4bb882356
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -0,0 +1,54 @@
+/// <reference types="cypress" />
+describe('Ticket descriptor', () => {
+    const firstRow = 'tbody > :nth-child(1)';
+
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/list');
+    });
+
+    const searchResults = (search) => {
+        cy.dataCy('vnSearchBar').find('input').focus();
+        if (search) cy.dataCy('vnSearchBar').find('input').type(search);
+        cy.dataCy('vnSearchBar').find('input').type('{enter}');
+        cy.dataCy('ticketListTable').should('exist');
+        cy.get(firstRow).should('exist');
+    };
+
+    it('should search results', () => {
+        cy.dataCy('ticketListTable').should('not.exist');
+        cy.get('.q-field__control').should('exist');
+        searchResults();
+    });
+
+    it('should open ticket sales', () => {
+        searchResults();
+        cy.window().then((win) => {
+            cy.stub(win, 'open').as('windowOpen');
+        });
+        cy.get(firstRow).find('.q-btn:first').click();
+        cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
+    });
+
+    it('should open ticket summary', () => {
+        searchResults();
+        cy.get(firstRow).find('.q-btn:last').click();
+        cy.dataCy('ticketSummary').should('exist');
+    });
+
+    it('Client list create new client', () => {
+        cy.dataCy('vnTableCreateBtn').should('exist');
+        cy.dataCy('vnTableCreateBtn').click();
+        const data = {
+            Customer: { val: 1, type: 'select' },
+            Warehouse: { val: 'Warehouse One', type: 'select' },
+            Address: { val: 'employee: employeeLane, CENTRAL CITY', type: 'select' },
+            Landed: { val: '01-01-2024', type: 'date' },
+        };
+        cy.fillInForm(data);
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.checkNotification('Data created');
+        cy.url().should('match', /\/ticket\/\d+\/summary/);
+    });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 34aadad1d..91c0b3f05 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -311,3 +311,7 @@ Cypress.Commands.add('checkValueSelectForm', (id, search) => {
 Cypress.Commands.add('searchByLabel', (label, value) => {
     cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
 });
+
+Cypress.Commands.add('dataCy', (dataTestId, attr = 'data-testid') => {
+    return cy.get(`[${attr}="${dataTestId}"]`);
+});

From 18593cc3f9d780b005a0e6ac59e01b9b8a4b985e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Tue, 12 Nov 2024 16:27:40 +0100
Subject: [PATCH 05/37] feat: refs #8087 refs#8087 Redadas en travel

---
 src/pages/Entry/EntryList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e9179c239..a9c25af43 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -221,7 +221,7 @@ onMounted(async () => {
                         t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
                     }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: row.daysInForward })

From 4572817699a53b23bbba17b001a4f492af877534 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 16:37:59 +0100
Subject: [PATCH 06/37] feat: refs #8087 reactive data

---
 src/pages/Travel/Card/TravelBasicData.vue  |  7 +---
 src/pages/Travel/Card/TravelCard.vue       | 29 +----------------
 src/pages/Travel/Card/TravelDescriptor.vue | 38 +++-------------------
 src/pages/Travel/Card/TravelFilter.js      | 29 +++++++++++++++++
 4 files changed, 35 insertions(+), 68 deletions(-)
 create mode 100644 src/pages/Travel/Card/TravelFilter.js

diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index f71bcf72c..8d6b54cc8 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -21,12 +21,7 @@ const agenciesOptions = ref([]);
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FormModel
-        :url="`Travels/${route.params.id}`"
-        :url-update="`Travels/${route.params.id}`"
-        model="Travel"
-        auto-load
-    >
+    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('travel.basicData.reference')" />
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 44bd9d430..50cecef34 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,34 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
-
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
+import filter from './TravelFilter.js';
 </script>
 <template>
     <VnCard
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index a77d7460e..1f68cb21a 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -7,7 +7,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
-
+import filter from './TravelFilter.js';
 import { toDate } from 'src/filters';
 
 const $props = defineProps({
@@ -21,36 +21,6 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-        'isRaid',
-        'daysInForward',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -66,15 +36,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :title="data.title"
         :subtitle="data.subtitle"
         :filter="filter"
-        data-key="travelData"
+        data-key="Travel"
         @on-fetch="setData"
     >
         <template #menu="{ entity }">
             <TravelDescriptorMenuItems :travel="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('globals.wareHouseIn')" :value="entity.warehouseIn.name" />
-            <VnLv :label="t('globals.wareHouseOut')" :value="entity.warehouseOut.name" />
+            <VnLv :label="t('globals.wareHouseIn')" :value="entity.warehouseIn?.name" />
+            <VnLv :label="t('globals.wareHouseOut')" :value="entity.warehouseOut?.name" />
             <VnLv :label="t('globals.shipped')" :value="toDate(entity.shipped)" />
             <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
             <VnLv :label="t('globals.totalEntries')" :value="entity.totalEntries" />
diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
new file mode 100644
index 000000000..f5f4520fd
--- /dev/null
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -0,0 +1,29 @@
+export default {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+        'isRaid',
+        'daysInForward',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};

From d8c1bd5b16ebcd024d299af557347710ec10f0b9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 17 Nov 2024 15:24:46 -0300
Subject: [PATCH 07/37] test: refs #8162 more tests

---
 src/components/CrudModel.vue                  |  1 +
 src/components/common/VnSmsDialog.vue         |  3 +-
 src/components/ui/VnConfirm.vue               |  1 +
 src/pages/Ticket/Card/TicketDescriptor.vue    |  1 +
 src/pages/Ticket/Card/TicketEditMana.vue      |  1 +
 src/pages/Ticket/Card/TicketNotes.vue         |  4 ++
 src/pages/Ticket/Card/TicketSale.vue          | 16 ++++-
 .../Ticket/Card/TicketSaleMoreActions.vue     | 12 +++-
 .../integration/ticket/ticketList.spec.js     |  2 +-
 .../integration/ticket/ticketNotes.spec.js    | 25 ++++++++
 .../integration/ticket/ticketRequest.spec.js  | 22 +++++++
 .../integration/ticket/ticketSale.spec.js     | 61 +++++++++++++++++++
 12 files changed, 143 insertions(+), 6 deletions(-)
 create mode 100644 test/cypress/integration/ticket/ticketNotes.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketRequest.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketSale.spec.js

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index a4cb55a2c..ce20c4f41 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -394,6 +394,7 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
+                data-testid="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>
diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 064394445..dbe16f57b 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -86,7 +86,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef">
+    <QDialog ref="dialogRef" data-testid="vnSmsDialog">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -161,6 +161,7 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
+                    data-testid="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index 0b1913383..767e2ca5a 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -104,6 +104,7 @@ function cancel() {
                     unelevated
                     autofocus
                     data-cy="VnConfirm_confirm"
+                    data-testid="vnConfirmConfirmBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index e1f852af0..2584d1a55 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -130,6 +130,7 @@ function ticketFilter(ticket) {
                     <QBadge
                         text-color="black"
                         :color="entity.ticketState.state.classColor"
+                        data-testid="ticketDescriptorStateBadge"
                     >
                         {{ entity.ticketState.state.name }}
                     </QBadge>
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index 3d5b04a41..fd385087b 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -75,6 +75,7 @@ const cancel = () => {
                     dense
                     style="width: 50%"
                     @click="save()"
+                    data-testid="saveManaBtn"
                 >
                     {{ t('globals.save') }}
                 </QBtn>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index b5302d15f..edbaa2d2c 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -86,12 +86,14 @@ async function handleSave() {
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
+                            data-testid="ticketNotesObservationType"
                         />
                         <VnInput
                             :label="t('ticketNotes.description')"
                             v-model="row.description"
                             class="col"
                             @keyup.enter="handleSave"
+                            data-testid="ticketNotesDescription"
                         />
                         <QIcon
                             name="delete"
@@ -99,6 +101,7 @@ async function handleSave() {
                             class="cursor-pointer"
                             color="primary"
                             @click="handleDelete(row)"
+                            data-testid="ticketNotesRemoveNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}
@@ -113,6 +116,7 @@ async function handleSave() {
                             class="fill-icon-on-hover q-ml-md"
                             color="primary"
                             @click="ticketNotesCrudRef.insert()"
+                            data-testid="ticketNotesAddNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.addNote') }}
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 7529d4908..92227d90f 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -577,6 +577,7 @@ watch(
                     color="primary"
                     :disable="!isTicketEditable || ticketState === 'OK'"
                     @click="changeTicketState('OK')"
+                    data-testid="ticketSaleOkStateBtn"
                 >
                     <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
                 </QBtn>
@@ -585,6 +586,7 @@ watch(
                     color="primary"
                     :label="t('ticketSale.state')"
                     :disable="!isTicketEditable"
+                    data-testid="ticketSaleStateDropdown"
                 >
                     <VnSelect
                         :options="editableStatesOptions"
@@ -594,6 +596,7 @@ watch(
                         hide-dropdown-icon
                         focus-on-mount
                         @update:model-value="changeTicketState"
+                        data-testid="ticketSaleStateSelect"
                     />
                 </QBtnDropdown>
                 <TicketSaleMoreActions
@@ -833,7 +836,7 @@ watch(
                 <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                     {{ toPercentage(row.discount / 100) }}
                 </QBtn>
-                <TicketEditManaProxy
+                <!-- <TicketEditManaProxy
                     :mana="mana"
                     :new-price="getNewPrice"
                     :uses-mana="usesMana"
@@ -848,7 +851,7 @@ watch(
                     <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
                         <VnUsesMana :mana-code="manaCode" />
                     </div>
-                </TicketEditManaProxy>
+                </TicketEditManaProxy> -->
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>
@@ -858,7 +861,14 @@ watch(
     </VnTable>
 
     <QPageSticky :offset="[20, 20]" style="z-index: 2">
-        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" />
+        <QBtn
+            @click="newOrderFromTicket()"
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+            data-testid="ticketSaleAddToBasketBtn"
+        />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
         </QTooltip>
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 16b84ab5e..7da28deb8 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -179,6 +179,7 @@ const createRefund = async (withWarehouse) => {
         color="primary"
         :label="t('ticketSale.more')"
         :disable="disable"
+        data-testid="ticketSaleMoreActionsDropdown"
     >
         <template #label>
             <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -190,6 +191,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="showSmsDialog('productNotAvailable')"
+                data-testid="sendShortageSMSItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel>
@@ -201,12 +203,18 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="calculateSalePrice()"
+                data-testid="recalculatePriceItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
                 </QItemSection>
             </QItem>
-            <QItem clickable v-ripple @click="emit('getMana')">
+            <QItem
+                clickable
+                v-ripple
+                @click="emit('getMana')"
+                data-testid="updateDiscountItem"
+            >
                 <QItemSection>
                     <QItemLabel>{{ t('Update discount') }}</QItemLabel>
                 </QItemSection>
@@ -215,6 +223,7 @@ const createRefund = async (withWarehouse) => {
                         v-model.number="newDiscount"
                         :label="t('ticketSale.discount')"
                         type="number"
+                        data-testid="ticketSaleDiscountInput"
                     />
                 </TicketEditManaProxy>
             </QItem>
@@ -224,6 +233,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="createClaim()"
+                data-testid="createClaimItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Add claim') }}</QItemLabel>
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 4bb882356..0713eb43e 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('Ticket descriptor', () => {
+describe('TicketList', () => {
     const firstRow = 'tbody > :nth-child(1)';
 
     beforeEach(() => {
diff --git a/test/cypress/integration/ticket/ticketNotes.spec.js b/test/cypress/integration/ticket/ticketNotes.spec.js
new file mode 100644
index 000000000..f8fb530ef
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketNotes.spec.js
@@ -0,0 +1,25 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/observation');
+    });
+
+    it('Creates and deletes a note', () => {
+        cy.dataCy('ticketNotesAddNoteBtn').should('exist');
+        cy.dataCy('ticketNotesAddNoteBtn').click();
+        cy.dataCy('ticketNotesObservationType').should('exist');
+        cy.selectOption('[data-testid="ticketNotesObservationType"]:last', 'Weight');
+        cy.dataCy('ticketNotesDescription').should('exist');
+        cy.get('[data-testid="ticketNotesDescription"]:last').type(
+            'This is a note description'
+        );
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+        cy.dataCy('ticketNotesRemoveNoteBtn').should('exist');
+        cy.dataCy('ticketNotesRemoveNoteBtn').click();
+        cy.dataCy('vnConfirmConfirmBtn').click();
+        cy.checkNotification('Data saved');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketRequest.spec.js b/test/cypress/integration/ticket/ticketRequest.spec.js
new file mode 100644
index 000000000..b9dc509ef
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketRequest.spec.js
@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/request');
+    });
+
+    it('Creates a new request', () => {
+        cy.dataCy('vnTableCreateBtn').should('exist');
+        cy.dataCy('vnTableCreateBtn').click();
+        const data = {
+            Description: { val: 'Purchase description' },
+            Atender: { val: 'buyerNick', type: 'select' },
+            Quantity: { val: 2 },
+            Price: { val: 123 },
+        };
+        cy.fillInForm(data);
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.checkNotification('Data created');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
new file mode 100644
index 000000000..b3c3edd8b
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -0,0 +1,61 @@
+/// <reference types="cypress" />
+
+describe('TicketSale', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/sale');
+    });
+
+    const firstRow = 'tbody > :nth-child(1)';
+
+    const selectFirstRow = () => {
+        cy.waitForElement(firstRow);
+        cy.get(firstRow).find('.q-checkbox__inner').click();
+    };
+
+    it('it should add item to basket', () => {
+        cy.window().then((win) => {
+            cy.stub(win, 'open').as('windowOpen');
+        });
+        cy.dataCy('ticketSaleAddToBasketBtn').should('exist');
+        cy.dataCy('ticketSaleAddToBasketBtn').click();
+        cy.get('@windowOpen').should('be.calledWithMatch', /\/order\/\d+\/catalog/);
+    });
+
+    it('should send SMS', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-testid="sendShortageSMSItem"]');
+        cy.dataCy('sendShortageSMSItem').should('exist');
+        cy.dataCy('sendShortageSMSItem').click();
+        cy.dataCy('vnSmsDialog').should('exist');
+        cy.dataCy('sendSmsBtn').click();
+        cy.checkNotification('SMS sent');
+    });
+
+    it('should recalculate price when "Recalculate price" is clicked', () => {
+        cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-testid="recalculatePriceItem"]');
+        cy.dataCy('recalculatePriceItem').should('exist');
+        cy.dataCy('recalculatePriceItem').click();
+        cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
+        cy.checkNotification('Data saved');
+    });
+
+    it('should update discount when "Update discount" is clicked', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-testid="updateDiscountItem"]');
+        cy.dataCy('updateDiscountItem').should('exist');
+        cy.dataCy('updateDiscountItem').click();
+        cy.waitForElement('[data-testid="ticketSaleDiscountInput"]');
+        cy.dataCy('ticketSaleDiscountInput').find('input').focus();
+        cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
+        cy.dataCy('saveManaBtn').click();
+        cy.waitForElement('.q-notification__message');
+        cy.checkNotification('Data saved');
+    });
+});

From 452ba788c983fcb2e1c34046ce590c9ef85abdfb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Nov 2024 09:46:34 +0100
Subject: [PATCH 08/37] fix: how only the correct path of the search

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 66 +++++++++++++++++------
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 6b3934df7..afe3006ea 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -126,33 +126,69 @@ function getNodeIds(node) {
     return ids;
 }
 
+const findNodePath = (node, searchTerm, path = []) => {
+    if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
+        path.push(node.id);
+        return path;
+    }
+    if (node.childs) {
+        for (let child of node.childs) {
+            const resultPath = findNodePath(child, searchTerm, [...path, node.id]);
+            if (resultPath.length > 0) {
+                return resultPath;
+            }
+        }
+    }
+    return [];
+};
+
+const filterNodes = (nodes, searchTerm) => {
+    return nodes
+        .map((node) => {
+            if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
+                if (node.childs) {
+                    node.childs = filterNodes(node.childs, searchTerm);
+                }
+                return node;
+            }
+            if (node.childs) {
+                node.childs = filterNodes(node.childs, searchTerm);
+                if (node.childs.length > 0) {
+                    return node;
+                }
+            }
+            return null;
+        })
+        .filter((node) => node !== null);
+};
+
 watch(storeData, async (val) => {
     // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
-    nodes.value[0].childs = [...val];
-    const fetchedNodeKeys = val.flatMap(getNodeIds);
-    state.set('Tree', [...fetchedNodeKeys]);
+    const searchTerm = store.userParams?.search || '';
 
-    if (store.userParams?.search === '') {
-        val.forEach((n) => {
-            formatNodeSelected(n);
-        });
-    } else {
-        for (let n of state.get('Tree')) await fetchNodeLeaves(n);
-        expanded.value = [null, ...fetchedNodeKeys];
-    }
+    const filteredNodes = filterNodes(val, searchTerm);
+    let nodePath = [];
+    filteredNodes.forEach((node) => {
+        nodePath = findNodePath(node, searchTerm);
+    });
+
+    const finalFilteredNodes = filteredNodes.filter((node) => nodePath.includes(node.id));
+    nodes.value[0].childs = [...finalFilteredNodes];
+    const fetchedNodeKeys = finalFilteredNodes.flatMap(getNodeIds);
+    state.set('Tree', [...fetchedNodeKeys]);
+    expanded.value = [null, ...fetchedNodeKeys];
     previousExpandedNodes.value = new Set(expanded.value);
 });
 
 const reFetch = async () => {
     const { data } = await arrayData.fetch({ append: false });
     nodes.value = data;
+    expanded.value = [null];
 };
 
 onMounted(async () => {
-    if (store.userParams?.search && !props.showSearchBar) {
-        await reFetch();
-        return;
-    }
+    store.userParams.search = '';
+
     const stateTree = state.get('Tree');
     const tree = stateTree ? [...state.get('Tree')] : [null];
     const lastStateTree = state.get('TreeState');

From 73072794eecf0c69d818b122d94b4ed21d83a3db Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 18 Nov 2024 14:41:27 +0100
Subject: [PATCH 09/37] test: refs #8162 #8162 fix TicketList spec

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

diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 0713eb43e..bbdbcea92 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -43,7 +43,7 @@ describe('TicketList', () => {
         const data = {
             Customer: { val: 1, type: 'select' },
             Warehouse: { val: 'Warehouse One', type: 'select' },
-            Address: { val: 'employee: employeeLane, CENTRAL CITY', type: 'select' },
+            Address: { val: 'employee', type: 'select' },
             Landed: { val: '01-01-2024', type: 'date' },
         };
         cy.fillInForm(data);

From 28bfda869a23f315c9a7d0c52ba717fe3397b781 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 18 Nov 2024 10:47:57 -0300
Subject: [PATCH 10/37] refactor: refs #8162 remove comment

---
 src/pages/Ticket/Card/TicketSale.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 6ed7f8cbd..93278eb3d 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -836,7 +836,7 @@ watch(
                 <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                     {{ toPercentage(row.discount / 100) }}
                 </QBtn>
-                <!-- <TicketEditManaProxy
+                <TicketEditManaProxy
                     :mana="mana"
                     :new-price="getNewPrice"
                     :uses-mana="usesMana"
@@ -851,7 +851,7 @@ watch(
                     <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
                         <VnUsesMana :mana-code="manaCode" />
                     </div>
-                </TicketEditManaProxy> -->
+                </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>

From c2db7be8cd20311d2ae467dd44127c1676fa9a36 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 15:06:09 +0100
Subject: [PATCH 11/37] fix(orderCatalogFilter): fix searchByTag

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 297 ++++++++------------
 1 file changed, 116 insertions(+), 181 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 4c018bbb1..68764c1a5 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -9,10 +9,9 @@ import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
+// import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
+import { useArrayData } from 'composables/useArrayData';
 
-const { t } = useI18n();
-
-const route = useRoute();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -27,13 +26,19 @@ const props = defineProps({
         required: true,
     },
 });
+
+const { t } = useI18n();
+const route = useRoute();
+
+const arrayData = useArrayData(props.dataKey);
+
+const currentParams = ref({});
 const categoryList = ref(null);
-const selectedCategoryFk = ref(getParamWhere(route, 'categoryFk'));
+const selectedCategoryFk = ref(null);
 const typeList = ref([]);
 const selectedTypeFk = ref(null);
-const selectedTag = ref(null);
-const tagValues = ref([{}]);
-const tagOptions = ref([]);
+const searchByTag = ref(null);
+
 const vnFilterPanelRef = ref();
 const orderByList = ref([
     { id: 'relevancy DESC, name', name: t('params.relevancy'), priority: 999 },
@@ -48,32 +53,24 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-const createValue = (val, done) => {
-    if (val.length > 2) {
-        if (!tagOptions.value.includes(val)) {
-            done(tagOptions.value, 'add-unique');
-        }
-        tagValues.value.push({ value: val });
-    }
-};
-const resetCategory = () => {
+const resetCategory = (params, search) => {
     selectedCategoryFk.value = null;
     typeList.value = null;
-};
-
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
-        resetCategory();
-    }
+    params.categoryFk = null;
+    params.typeFk = null;
+    arrayData.store.userFilter = null;
+    removeTagGroupParam(params, search);
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        resetCategory();
+        resetCategory(params, search);
         params.categoryFk = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
+        params.typeFk = null;
+        selectedTypeFk.value = null;
         loadTypes(category?.id);
     }
     search();
@@ -86,19 +83,12 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
-const selectedCategory = computed(() =>
-    (categoryList.value || []).find(
+const selectedCategory = computed(() => {
+    return (categoryList.value || []).find(
         (category) => category?.id === selectedCategoryFk.value
-    )
-);
-function filterFn(val, update) {
-    update(() => {
-        const needle = val.toLowerCase();
-        tagOptions.value = props.tagValue.filter(
-            (v) => v.toLowerCase().indexOf(needle) > -1
-        );
-    });
-}
+    );
+});
+
 const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
@@ -114,37 +104,38 @@ function exprBuilder(param, value) {
     }
 }
 
-const applyTagFilter = (params, search) => {
-    if (!tagValues.value?.length) {
+const applyTags = (tagInfo, params, search) => {
+    if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
         search();
         return;
     }
-    if (!params.tagGroups) {
-        params.tagGroups = [];
-    }
-    params.tagGroups.push(
-        JSON.stringify({
-            values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
-            tagSelection: {
-                ...selectedTag.value,
-                orgShowField: selectedTag?.value?.name,
-            },
-            tagFk: selectedTag?.value?.tagFk,
-        })
-    );
+
+    if (!params.tagGroups) params.tagGroups = [];
+    params.tagGroups.push(tagInfo);
     search();
-    selectedTag.value = null;
-    tagValues.value = [{}];
 };
 
-const removeTagChip = (selection, params, search) => {
-    if (params.tagGroups) {
-        params.tagGroups = (params.tagGroups || []).filter(
-            (value) => value !== selection
-        );
+async function onSearchByTag(value) {
+    if (!value.target.value) return;
+    if (!currentParams.value?.tagGroups) {
+        currentParams.value.tagGroups = [];
+    }
+
+    currentParams.value.tagGroups.push({
+        values: [{ value: value.target.value }],
+    });
+    searchByTag.value = null;
+}
+
+const removeTagGroupParam = (params, search, valIndex = null) => {
+    if (!valIndex) {
+        params.tagGroups = null;
+        search();
+    } else {
+        params.tagGroups.splice(valIndex, 1);
+        search();
     }
-    search();
 };
 
 const setCategoryList = (data) => {
@@ -171,26 +162,27 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
+
+onMounted(() => {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
+});
 </script>
 
 <template>
-    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
+    <FetchData url="ItemCategories" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
         :hidden-tags="['orderFk', 'orderBy']"
         :un-removable-params="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
-        :custom-tags="['tagGroups']"
-        @remove="clearFilter"
+        :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
-        search-url="params"
+        v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
+            <strong v-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
@@ -199,25 +191,37 @@ function addOrder(value, field, params) {
             </div>
         </template>
         <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <template v-if="tag.label === 'tagGroups'">
-                    <VnFilterPanelChip
-                        v-for="chip in tag.value"
-                        :key="chip"
-                        removable
-                        @remove="removeTagChip(chip, params, searchFn)"
-                    >
-                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
-                        <span>{{
-                            (JSON.parse(chip).values || [])
-                                .map((item) => item.value)
-                                .join(' | ')
-                        }}</span>
-                    </VnFilterPanelChip>
-                </template>
+            <template v-for="customTag in customTags" :key="customTag.label">
+                <VnFilterPanelChip
+                    v-for="(tag, valIndex) in Array.isArray(customTag.value)
+                        ? customTag.value
+                        : 1"
+                    :key="valIndex"
+                    removable
+                    @remove="
+                        customTag.label === 'categoryFk'
+                            ? resetCategory(params, searchFn)
+                            : removeTagGroupParam(params, searchFn, valIndex)
+                    "
+                >
+                    <strong v-if="customTag.label === 'categoryFk'">
+                        {{ t(selectedCategory?.name || '') }}
+                    </strong>
+                    <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
+                        {{ tag.tagSelection.name }}:
+                    </strong>
+                    <span>
+                        {{
+                            (tag?.values || [])
+                                .map((item) => `"${item.value}"`)
+                                .join(', ')
+                        }}
+                    </span>
+                </VnFilterPanelChip>
             </template>
         </template>
         <template #body="{ params, searchFn }">
+            {{ params }}
             <QItem class="category-filter q-mt-md">
                 <div
                     v-for="category in categoryList"
@@ -298,91 +302,39 @@ function addOrder(value, field, params) {
                 </QItemSection>
             </QItem>
             <QSeparator />
-            <QItem class="q-mt-md">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.tag')"
-                        v-model="selectedTag"
-                        :options="props.tags || []"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        :emit-value="false"
-                        use-input
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-for="(value, index) in tagValues"
-                :key="value"
-                class="q-mt-md filter-value"
-            >
-                <FetchData
-                    v-if="selectedTag"
-                    :url="`Tags/${selectedTag}/filterValue`"
-                    limit="30"
-                    auto-load
-                    @on-fetch="(data) => (tagOptions = data)"
-                />
-                <VnSelect
-                    v-if="!selectedTag"
-                    :label="t('params.value')"
-                    v-model="value.value"
-                    :options="tagOptions || []"
-                    option-value="value"
-                    option-label="value"
-                    dense
-                    outlined
-                    rounded
-                    emit-value
-                    use-input
-                    class="filter-input"
-                    @new-value="createValue"
-                    @filter="filterFn"
-                    @update:model-value="applyTagFilter(params, searchFn)"
-                />
-                <VnSelect
-                    v-else-if="selectedTag === 1"
-                    :label="t('params.value')"
-                    v-model="value.value"
-                    :options="tagOptions || []"
-                    option-value="value"
-                    option-label="value"
-                    dense
-                    outlined
-                    rounded
-                    emit-value
-                    use-input
-                    class="filter-input"
-                    @new-value="createValue"
-                    @update:model-value="applyTagFilter(params, searchFn)"
-                />
+            <QItem class="q-mt-lg q-pa-none">
                 <VnInput
-                    v-else
-                    :label="t('params.value')"
-                    v-model="value.value"
+                    :label="t('components.itemsFilterPanel.value')"
                     dense
                     outlined
                     rounded
-                    class="filter-input"
-                    @keyup.enter="applyTagFilter(params, searchFn)"
-                />
-                <QIcon
-                    name="delete"
-                    class="filter-icon"
-                    @click="(tagValues || []).splice(index, 1)"
-                />
-            </QItem>
-            <QItem class="q-mt-lg">
-                <QBtn
-                    icon="add_circle"
-                    shortcut="+"
-                    flat
-                    class="filter-icon"
-                    @click="tagValues.push({})"
-                />
+                    :is-clearable="false"
+                    v-model="searchByTag"
+                    @keyup.enter="(val) => onSearchByTag(val, params)"
+                >
+                    <template #prepend>
+                        <QIcon name="search" />
+                    </template>
+                    <template #append>
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
+                            color="primary"
+                            size="md"
+                            dense
+                        />
+                        <QPopupProxy>
+                            <!-- <CatalogFilterValueDialog
+                                style="display: inline-block"
+                                :tags="tags"
+                                @apply-tags="
+                                    ($event) => applyTags($event, params, searchFn)
+                                "
+                            /> -->
+                        </QPopupProxy>
+                    </template>
+                </VnInput>
             </QItem>
             <QSeparator />
         </template>
@@ -417,23 +369,6 @@ function addOrder(value, field, params) {
         cursor: pointer;
     }
 }
-
-.filter-icon {
-    font-size: 24px;
-    color: $primary;
-    padding: 0 4px;
-    cursor: pointer;
-}
-
-.filter-input {
-    flex-shrink: 1;
-    min-width: 0;
-}
-
-.filter-value {
-    display: flex;
-    align-items: center;
-}
 </style>
 
 <i18n>

From 8c20b8736bf2b28f837f2e4c3c615f5c626c1153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Tue, 19 Nov 2024 11:10:37 +0100
Subject: [PATCH 12/37] feat: refs #8087 refs#8087 Redadas en travel

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 3ac385fbd..13f8bcee9 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -446,11 +446,8 @@ async function getZone(options) {
             <VnSelect
                 :label="t('basicData.company')"
                 v-model="formData.companyFk"
-                option-value="id"
                 option-label="code"
                 :options="companiesOptions"
-                hide-selected
-                map-options
                 :required="true"
                 :rules="validate('basicData.company')"
             />

From 98017df57d17239edaef1987d0e2e8397da77ce7 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 19 Nov 2024 12:25:15 +0100
Subject: [PATCH 13/37] fix: refs #8038 solve conflicts

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

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index aeed07653..396b26f65 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -138,8 +138,6 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-defineExpose({ opts: myOptions });
-
 const arrayDataKey =
     $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
 

From 5515f55bf69d3f2121410d28bdf5f35c4f9557b0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 19 Nov 2024 12:51:05 +0100
Subject: [PATCH 14/37] test: fix e2e

---
 .../integration/client/clientList.spec.js     | 31 ++++++++++++++-----
 .../vnComponent/vnLocation.spec.js            |  6 ++--
 test/cypress/support/commands.js              |  6 ++--
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index 93e53b9f6..b87ddff3b 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -6,7 +6,11 @@ describe('Client list', () => {
         cy.visit('/#/customer/list', {
             timeout: 5000,
             onBeforeLoad(win) {
-                cy.stub(win, 'open');
+                cy.stub(win, 'open')
+                    .callsFake((url) => {
+                        return win.open.wrappedMethod.call(win, url, '_self');
+                    })
+                    .as('Open');
             },
         });
     });
@@ -44,20 +48,31 @@ describe('Client list', () => {
         });
     });
 
-    it('Client founded create ticket', () => {
+    it.only('Client founded create ticket', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
-        cy.clickButtonsDescriptor(2);
+        cy.openActionDescriptor('Create ticket');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form');
-        cy.checkValueForm(1, search);
+        cy.waitForElement('.q-form', { timeout: 5000 });
+        cy.checkValueSelectForm(1, 1110);
+        cy.checkValueSelectForm(2, search);
+        // cy.get('@Open').should('have.been.calledOnceWithExactly', [
+        //     '/#/ticket/list?table={"clientFk":1110}&createForm={"addressId":10,"clientId":1110}',
+        //     '_blank',
+        //     'noopener,noreferrer',
+        // ]);
     });
-    it('Client founded create order', () => {
+    it.only('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
-        cy.clickButtonsDescriptor(4);
+        cy.openActionDescriptor('New order');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form');
+        cy.waitForElement('.q-form', { timeout: 5000 });
+        cy.checkValueForm(1, 1110);
         cy.checkValueForm(2, search);
+        // cy.get('@Open').should(
+        //     'have.been.calledOnceWithExactly',
+        //     '"/#/order/list?table={"clientFk":1110}&createForm={"addressId":10,"clientFk":1110}", "_blank", "noopener,noreferrer"'
+        // );
     });
 });
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 924b16adc..29e1f868f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -15,10 +15,10 @@ describe('VnLocation', () => {
             cy.domContentLoad();
             cy.get(createLocationButton).click();
         });
-        it('should filter provinces based on selected country', () => {
+        it.only('shoul d filter provinces based on selected country', () => {
             // Select a country
             cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
                 'Ecuador'
             );
             // Verify that provinces are filtered
@@ -32,7 +32,7 @@ describe('VnLocation', () => {
             ).should('have.length', 1);
         });
 
-        it('should filter towns based on selected province', () => {
+        it.only('should filter towns based on selected province', () => {
             // Select a country
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 34aadad1d..b92bbe269 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -295,16 +295,16 @@ Cypress.Commands.add('checkNotification', (text) => {
                 throw new Error(`Notification not found: "${text}"`);
         });
 });
-
+// :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container
 Cypress.Commands.add('checkValueForm', (id, search) => {
     cy.get(
-        `.grid-create > :nth-child(${id}) > .q-field__inner>.q-field__control> .q-field__control-container>.q-field__native >.q-field__input`
+        `.grid-create > :nth-child(${id})  > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
     ).should('have.value', search);
 });
 
 Cypress.Commands.add('checkValueSelectForm', (id, search) => {
     cy.get(
-        `.grid-create > :nth-child(${id}) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container>.q-field__native>.q-field__input`
+        `.grid-create > :nth-child(${id}) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
     ).should('have.value', search);
 });
 

From 65100fcf256f9c19494088c9c2b3d48422c8970b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 19 Nov 2024 13:45:44 +0100
Subject: [PATCH 15/37] test: fix e2e

---
 test/cypress/integration/vnComponent/vnLocation.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 29e1f868f..0ee453aa0 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -15,7 +15,7 @@ describe('VnLocation', () => {
             cy.domContentLoad();
             cy.get(createLocationButton).click();
         });
-        it.only('shoul d filter provinces based on selected country', () => {
+        it('should filter provinces based on selected country', () => {
             // Select a country
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
@@ -32,7 +32,7 @@ describe('VnLocation', () => {
             ).should('have.length', 1);
         });
 
-        it.only('should filter towns based on selected province', () => {
+        it('should filter towns based on selected province', () => {
             // Select a country
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,

From b4ee19bcde76c9d44568b7742aeab673fdf61b50 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 19 Nov 2024 15:56:27 +0100
Subject: [PATCH 16/37] test: #8162 fix clientList spec

---
 .../integration/client/clientList.spec.js     | 18 +++++-----
 .../vnComponent/vnLocation.spec.js            | 35 ++++++-------------
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index b87ddff3b..b3ac9d3df 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -15,7 +15,7 @@ describe('Client list', () => {
         });
     });
 
-    it('Client list create new client', () => {
+    it.only('Client list create new client', () => {
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
         const data = {
             Name: { val: 'Name 1' },
@@ -24,9 +24,9 @@ describe('Client list', () => {
             'Web user': { val: 'user_test_1' },
             Street: { val: 'C/ STREET 1' },
             Email: { val: 'user.test@1.com' },
-            'Business type': { val: 'Otros', type: 'select' },
-            'Sales person': { val: 'salesboss', type: 'select' },
+            'Sales person': { val: 'employee', type: 'select' },
             Location: { val: '46000, Valencia(Province one), España', type: 'select' },
+            'Business type': { val: 'Otros', type: 'select' },
         };
         cy.fillInForm(data);
 
@@ -48,13 +48,13 @@ describe('Client list', () => {
         });
     });
 
-    it.only('Client founded create ticket', () => {
+    it('Client founded create ticket', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
         cy.openActionDescriptor('Create ticket');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form', { timeout: 5000 });
-        cy.checkValueSelectForm(1, 1110);
+        cy.waitForElement('.q-form');
+        cy.checkValueSelectForm(1, search);
         cy.checkValueSelectForm(2, search);
         // cy.get('@Open').should('have.been.calledOnceWithExactly', [
         //     '/#/ticket/list?table={"clientFk":1110}&createForm={"addressId":10,"clientId":1110}',
@@ -62,13 +62,13 @@ describe('Client list', () => {
         //     'noopener,noreferrer',
         // ]);
     });
-    it.only('Client founded create order', () => {
+    it('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
         cy.openActionDescriptor('New order');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form', { timeout: 5000 });
-        cy.checkValueForm(1, 1110);
+        cy.waitForElement('.q-form');
+        cy.checkValueForm(1, search);
         cy.checkValueForm(2, search);
         // cy.get('@Open').should(
         //     'have.been.calledOnceWithExactly',
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 0ee453aa0..70c88b26f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -7,6 +7,9 @@ describe('VnLocation', () => {
         prefix: '.q-dialog__inner > .column > #formModel > .q-card',
         sufix: ' .q-field__inner > .q-field__control',
     };
+    const countrySelector = `${createForm.prefix} > :nth-child(5) > :nth-child(3) > ${createForm.sufix}`;
+    const provinceSelector = `${createForm.prefix} > :nth-child(5) > :nth-child(2) > ${createForm.sufix}`;
+    const citySelector = `${createForm.prefix} > :nth-child(4) > :nth-child(2) > ${createForm.sufix}`;
     describe('CreateFormDialog ', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
@@ -17,45 +20,29 @@ describe('VnLocation', () => {
         });
         it('should filter provinces based on selected country', () => {
             // Select a country
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
-                'Ecuador'
-            );
+            cy.selectOption(countrySelector, 'Ecuador');
             // Verify that provinces are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(countrySelector).should('have.length', 1);
 
             // Verify that towns are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(citySelector).should('have.length', 1);
         });
 
         it('should filter towns based on selected province', () => {
             // Select a country
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
-                'Ecuador'
-            );
+            cy.selectOption(countrySelector, 'Ecuador');
             // Verify that provinces are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(provinceSelector).should('have.length', 1);
 
             // Verify that towns are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(citySelector).should('have.length', 1);
         });
         it('should pass selected country', () => {
             // Select a country
             const country = 'Ecuador';
             const province = 'Province five';
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
-                country
-            );
+
+            cy.selectOption(countrySelector, country);
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
                 province

From 2806c94fdbb5c75529751441393c9499a3c5d28a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:22:50 +0100
Subject: [PATCH 17/37] fix: fix create bankEntity

---
 src/components/CreateBankEntityForm.vue      | 15 ++++++---------
 src/pages/Supplier/Card/SupplierAccounts.vue |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index a42be6ef8..5211d6e9d 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -9,8 +9,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import { useState } from 'src/composables/useState';
 
-defineProps({ showEntityField: { type: Boolean, default: true } });
-
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
@@ -22,13 +20,8 @@ const bankEntityFormData = reactive({
     name: null,
     bic: null,
     countryFk: customer.value?.countryFk,
-    id: null,
 });
 
-const countriesFilter = {
-    fields: ['id', 'name', 'code'],
-};
-
 const countriesOptions = ref([]);
 
 const onDataSaved = (...args) => {
@@ -44,7 +37,6 @@ onMounted(async () => {
 <template>
     <FetchData
         url="Countries"
-        :filter="countriesFilter"
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
@@ -85,7 +77,12 @@ onMounted(async () => {
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div v-if="showEntityField" class="col">
+                <div
+                    v-if="
+                        countriesOptions.find((c) => c.id === data.countryFk).code == 'ES'
+                    "
+                    class="col"
+                >
                     <VnInput
                         :label="t('id')"
                         v-model="data.id"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index bc009d3ad..08bebb67e 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -126,7 +126,6 @@ const setWireTransfer = async () => {
                                     (_, requestResponse) =>
                                         onBankEntityCreated(requestResponse, row)
                                 "
-                                :show-entity-field="false"
                             />
                         </template>
                         <template #option="scope">

From 1fb927488a2df2a312cb06dee4f9880ef014db7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 09:26:33 +0100
Subject: [PATCH 18/37] test: #8162 fix clientList spec

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

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index b3ac9d3df..37983cc70 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -15,7 +15,7 @@ describe('Client list', () => {
         });
     });
 
-    it.only('Client list create new client', () => {
+    it('Client list create new client', () => {
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
         const data = {
             Name: { val: 'Name 1' },

From 32fdc836f9923df5308586c5eae3b6f557ebcc73 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 09:26:38 +0100
Subject: [PATCH 19/37] fix(OrderCatalogFilter): fix field value

---
 .../Order/Card/CatalogFilterValueDialog.vue   | 159 ++++++++++++++++++
 src/pages/Order/Card/OrderCatalogFilter.vue   |  17 +-
 2 files changed, 167 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/Order/Card/CatalogFilterValueDialog.vue

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
new file mode 100644
index 000000000..120e2fb72
--- /dev/null
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -0,0 +1,159 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const props = defineProps({
+    tags: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['applyTags']);
+const { t } = useI18n();
+
+const tagValues = ref([{}]);
+const tagOptions = ref([]);
+const selectedTag = ref(null);
+
+const applyTags = () => {
+    if (tagValues.value.some((tag) => !tag.value)) return;
+    const tagInfo = {
+        values: [...tagValues.value],
+        tagFk: selectedTag?.value?.id,
+        tagSelection: {
+            name: selectedTag?.value?.name,
+        },
+    };
+    emit('applyTags', tagInfo);
+};
+
+const removeTagGroupParam = (valIndex = null) => {
+    if (!valIndex) {
+        tagValues.value = [{}];
+    } else {
+        (tagValues.value || []).splice(valIndex, 1);
+    }
+};
+
+const getSelectedTagValues = async (tag) => {
+    if (!tag?.id) return;
+    const filter = {
+        fields: ['value'],
+        order: 'value ASC',
+        limit: 30,
+    };
+
+    const url = `Tags/${tag?.id}/filterValue`;
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get(url, {
+        params,
+    });
+    tagOptions.value = data;
+};
+</script>
+
+<template>
+    <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
+        <QCard class="q-pa-sm column q-pa-lg">
+            <QBtn
+                round
+                color="primary"
+                style="position: absolute; z-index: 1; right: 0; top: 0"
+                icon="search"
+                type="submit"
+            >
+            </QBtn>
+
+            <VnSelect
+                :label="t('params.tag')"
+                v-model="selectedTag"
+                :options="props.tags"
+                option-value="id"
+                option-label="name"
+                dense
+                outlined
+                class="q-mb-md"
+                rounded
+                :emit-value="false"
+                use-input
+                @update:model-value="($event) => getSelectedTagValues($event)"
+            />
+            <QBtn
+                icon="add_circle"
+                shortcut="+"
+                flat
+                class="filter-icon q-mb-md"
+                size="md"
+                dense
+                :disabled="!selectedTag || !tagValues[0].value"
+                @click="tagValues.unshift({})"
+            />
+            <div
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="filter-value column align-left"
+            >
+                <div class="col row q-mb-md">
+                    <VnSelect
+                        v-if="!selectedTag?.isFree && tagOptions"
+                        :label="t('components.itemsFilterPanel.value')"
+                        v-model="value.value"
+                        :options="tagOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!value || !selectedTag"
+                        :is-clearable="false"
+                        class="col"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="value.value"
+                        :label="t('components.itemsFilterPanel.value')"
+                        :disable="!value"
+                        is-outlined
+                        :is-clearable="false"
+                        class="col"
+                    />
+                    <QBtn
+                        icon="delete"
+                        size="md"
+                        outlined
+                        dense
+                        rounded
+                        flat
+                        class="filter-icon col-2"
+                        :disabled="!value.value"
+                        @click="removeTagGroupParam(index)"
+                    />
+                </div>
+            </div>
+        </QCard>
+    </QForm>
+</template>
+
+<style scoped lang="scss">
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        tag: Tag
+es:
+    params:
+        tag: Etiqueta
+</i18n>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 68764c1a5..381a0516a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -9,7 +9,7 @@ import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
-// import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
+import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
 import { useArrayData } from 'composables/useArrayData';
 
 const props = defineProps({
@@ -128,12 +128,12 @@ async function onSearchByTag(value) {
     searchByTag.value = null;
 }
 
-const removeTagGroupParam = (params, search, valIndex = null) => {
-    if (!valIndex) {
-        params.tagGroups = null;
+const removeTagGroupParam = (search, valIndex) => {
+    if (!valIndex && valIndex !== 0) {
+        currentParams.value.tagGroups = null;
         search();
     } else {
-        params.tagGroups.splice(valIndex, 1);
+        currentParams.value.tagGroups.splice(valIndex, 1);
         search();
     }
 };
@@ -201,7 +201,7 @@ onMounted(() => {
                     @remove="
                         customTag.label === 'categoryFk'
                             ? resetCategory(params, searchFn)
-                            : removeTagGroupParam(params, searchFn, valIndex)
+                            : removeTagGroupParam(searchFn, valIndex)
                     "
                 >
                     <strong v-if="customTag.label === 'categoryFk'">
@@ -221,7 +221,6 @@ onMounted(() => {
             </template>
         </template>
         <template #body="{ params, searchFn }">
-            {{ params }}
             <QItem class="category-filter q-mt-md">
                 <div
                     v-for="category in categoryList"
@@ -325,13 +324,13 @@ onMounted(() => {
                             dense
                         />
                         <QPopupProxy>
-                            <!-- <CatalogFilterValueDialog
+                            <CatalogFilterValueDialog
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
                                     ($event) => applyTags($event, params, searchFn)
                                 "
-                            /> -->
+                            />
                         </QPopupProxy>
                     </template>
                 </VnInput>

From e10ee5e6c77d4dceff48d9eaf0e97a7694461adb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 09:26:40 +0100
Subject: [PATCH 20/37] test: #8162 fix vnLocation spec

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

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 70c88b26f..70a943688 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -107,7 +107,7 @@ describe('VnLocation', () => {
             cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
-        it('Create postCode', () => {
+        it.only('Create postCode', () => {
             const postCode = '1234475';
             const province = 'Valencia';
             cy.get(createLocationButton).click();

From 226f604f9d1f27b2a9bc9b6bc92cd1a72ee12c50 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 09:37:47 +0100
Subject: [PATCH 21/37] test: #8162 fix vnLocation spec

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

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 70a943688..70c88b26f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -107,7 +107,7 @@ describe('VnLocation', () => {
             cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
-        it.only('Create postCode', () => {
+        it('Create postCode', () => {
             const postCode = '1234475';
             const province = 'Valencia';
             cy.get(createLocationButton).click();

From c59baf9cf507c12df101318a99c569f1ff503d14 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:52:11 +0100
Subject: [PATCH 22/37] fix: fix code

---
 src/components/CreateBankEntityForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 5211d6e9d..cbd645056 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -79,7 +79,8 @@ onMounted(async () => {
                 </div>
                 <div
                     v-if="
-                        countriesOptions.find((c) => c.id === data.countryFk).code == 'ES'
+                        countriesOptions.find((c) => c.id === data.countryFk)?.code ==
+                        'ES'
                     "
                     class="col"
                 >

From 131cd2de8c52d9d3c28ec8cd1088618e71fea8ef Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:53:52 +0100
Subject: [PATCH 23/37] fix: options

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

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index cbd645056..2da3aa994 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -16,6 +16,10 @@ const state = useState();
 
 const customer = computed(() => state.get('customer'));
 
+const countriesFilter = {
+    fields: ['id', 'name', 'code'],
+};
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
@@ -46,6 +50,7 @@ onMounted(async () => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
+        :filter="countriesFilter"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">

From 9da04881841c5fc269f7fdeab4ed8f7f91790f0b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 10:03:23 +0100
Subject: [PATCH 24/37] feat: remove comments

---
 test/cypress/integration/client/clientList.spec.js  |  9 ---------
 .../integration/vnComponent/vnLocation.spec.js      | 13 -------------
 test/cypress/support/commands.js                    |  2 +-
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index 37983cc70..431ac0548 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -56,11 +56,6 @@ describe('Client list', () => {
         cy.waitForElement('.q-form');
         cy.checkValueSelectForm(1, search);
         cy.checkValueSelectForm(2, search);
-        // cy.get('@Open').should('have.been.calledOnceWithExactly', [
-        //     '/#/ticket/list?table={"clientFk":1110}&createForm={"addressId":10,"clientId":1110}',
-        //     '_blank',
-        //     'noopener,noreferrer',
-        // ]);
     });
     it('Client founded create order', () => {
         const search = 'Jessica Jones';
@@ -70,9 +65,5 @@ describe('Client list', () => {
         cy.waitForElement('.q-form');
         cy.checkValueForm(1, search);
         cy.checkValueForm(2, search);
-        // cy.get('@Open').should(
-        //     'have.been.calledOnceWithExactly',
-        //     '"/#/order/list?table={"clientFk":1110}&createForm={"addressId":10,"clientFk":1110}", "_blank", "noopener,noreferrer"'
-        // );
     });
 });
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 70c88b26f..ef08af679 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -19,26 +19,17 @@ describe('VnLocation', () => {
             cy.get(createLocationButton).click();
         });
         it('should filter provinces based on selected country', () => {
-            // Select a country
             cy.selectOption(countrySelector, 'Ecuador');
-            // Verify that provinces are filtered
             cy.get(countrySelector).should('have.length', 1);
-
-            // Verify that towns are filtered
             cy.get(citySelector).should('have.length', 1);
         });
 
         it('should filter towns based on selected province', () => {
-            // Select a country
             cy.selectOption(countrySelector, 'Ecuador');
-            // Verify that provinces are filtered
             cy.get(provinceSelector).should('have.length', 1);
-
-            // Verify that towns are filtered
             cy.get(citySelector).should('have.length', 1);
         });
         it('should pass selected country', () => {
-            // Select a country
             const country = 'Ecuador';
             const province = 'Province five';
 
@@ -67,13 +58,11 @@ describe('VnLocation', () => {
             cy.get(locationOptions).should('have.length.at.least', 5);
         });
         it('input filter location as "al"', function () {
-            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('al');
             cy.get(locationOptions).should('have.length.at.least', 4);
         });
         it('input filter location as "ecuador"', function () {
-            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
@@ -129,7 +118,6 @@ describe('VnLocation', () => {
             const province = 'Saskatchew';
             cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
-            // city create button
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
             ).click();
@@ -138,7 +126,6 @@ describe('VnLocation', () => {
             cy.get('#q-portal--dialog--3 .q-btn--standard').click();
             cy.get('#q-portal--dialog--1 .q-btn--standard').click();
             cy.waitForElement('.q-form');
-
             checkVnLocation(postCode, province);
         });
 
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index d4b2486e7..add41db57 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -294,7 +294,7 @@ Cypress.Commands.add('checkNotification', (text) => {
                 throw new Error(`Notification not found: "${text}"`);
         });
 });
-// :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container
+
 Cypress.Commands.add('checkValueForm', (id, search) => {
     cy.get(
         `.grid-create > :nth-child(${id})  > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`

From deb6467af8ed5072dc714cc459ca036b3803302e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 10:05:10 +0100
Subject: [PATCH 25/37] feat: remove comments

---
 test/cypress/support/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index add41db57..1765b9043 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -297,7 +297,7 @@ Cypress.Commands.add('checkNotification', (text) => {
 
 Cypress.Commands.add('checkValueForm', (id, search) => {
     cy.get(
-        `.grid-create > :nth-child(${id})  > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
+        `.grid-create > :nth-child(${id}) > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
     ).should('have.value', search);
 });
 

From d6aedad38e49ee64b2a6b2f49a107b3b5975a67d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 10:07:03 +0100
Subject: [PATCH 26/37] perf: use const in VnLocation

---
 test/cypress/integration/vnComponent/vnLocation.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index ef08af679..aeb938c6f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -19,13 +19,15 @@ describe('VnLocation', () => {
             cy.get(createLocationButton).click();
         });
         it('should filter provinces based on selected country', () => {
-            cy.selectOption(countrySelector, 'Ecuador');
+            const country = 'Ecuador';
+            cy.selectOption(countrySelector, country);
             cy.get(countrySelector).should('have.length', 1);
             cy.get(citySelector).should('have.length', 1);
         });
 
         it('should filter towns based on selected province', () => {
-            cy.selectOption(countrySelector, 'Ecuador');
+            const country = 'Ecuador';
+            cy.selectOption(countrySelector, country);
             cy.get(provinceSelector).should('have.length', 1);
             cy.get(citySelector).should('have.length', 1);
         });

From 2a1cc494990e9589d82e88ee7faeabd64f507be4 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 20 Nov 2024 13:15:40 +0100
Subject: [PATCH 27/37] fix: ticketDescriptor

---
 src/components/common/VnInput.vue              | 8 +++++++-
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 1246eedcd..a74044136 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -99,7 +99,13 @@ const mixinRules = [
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value && !$attrs.disabled && $props.clearable"
+                    v-if="
+                        hover &&
+                        value &&
+                        !$attrs.disabled &&
+                        !$attrs.readonly &&
+                        $props.clearable
+                    "
                     @click="
                         () => {
                             value = null;
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index f1d30b1bd..b8e64cb79 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -239,7 +239,7 @@ function makeInvoiceDialog() {
 }
 async function makeInvoice() {
     const params = {
-        ticketsIds: [parseInt(ticketId)],
+        ticketsIds: [parseInt(ticketId.value)],
     };
     await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
 
@@ -265,7 +265,7 @@ async function transferClient(client) {
 
 async function addTurn(day) {
     const params = {
-        ticketFk: parseInt(ticketId),
+        ticketFk: parseInt(ticketId.value),
         weekDay: day,
         agencyModeFk: ticket.value.agencyModeFk,
     };
@@ -280,7 +280,7 @@ async function addTurn(day) {
 
 async function createRefund(withWarehouse) {
     const params = {
-        ticketsIds: [parseInt(ticketId)],
+        ticketsIds: [parseInt(ticketId.value)],
         withWarehouse: withWarehouse,
         negative: true,
     };
@@ -368,7 +368,7 @@ async function uploadDocuware(force) {
 
     const { data } = await axios.post(`Docuwares/upload`, {
         fileCabinet: 'deliveryNote',
-        ticketIds: [parseInt(ticketId)],
+        ticketIds: [parseInt(ticketId.value)],
     });
 
     if (data) notify({ message: t('PDF sent!'), type: 'positive' });

From abd79283ff907b0896acee009115ea38af3967b5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 13:38:22 +0100
Subject: [PATCH 28/37] fix(CatalogFilterValueDialog): from dev and fix

---
 .../Order/Card/CatalogFilterValueDialog.vue   | 38 ++++++-------
 src/pages/Order/Card/OrderCatalog.vue         | 56 ++++++++++++++++---
 src/pages/Order/Card/OrderCatalogFilter.vue   | 23 +++++---
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index 120e2fb72..2cc6c74d3 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -59,15 +59,6 @@ const getSelectedTagValues = async (tag) => {
 <template>
     <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
         <QCard class="q-pa-sm column q-pa-lg">
-            <QBtn
-                round
-                color="primary"
-                style="position: absolute; z-index: 1; right: 0; top: 0"
-                icon="search"
-                type="submit"
-            >
-            </QBtn>
-
             <VnSelect
                 :label="t('params.tag')"
                 v-model="selectedTag"
@@ -82,16 +73,6 @@ const getSelectedTagValues = async (tag) => {
                 use-input
                 @update:model-value="($event) => getSelectedTagValues($event)"
             />
-            <QBtn
-                icon="add_circle"
-                shortcut="+"
-                flat
-                class="filter-icon q-mb-md"
-                size="md"
-                dense
-                :disabled="!selectedTag || !tagValues[0].value"
-                @click="tagValues.unshift({})"
-            />
             <div
                 v-for="(value, index) in tagValues"
                 :key="value"
@@ -120,7 +101,6 @@ const getSelectedTagValues = async (tag) => {
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
                         is-outlined
-                        :is-clearable="false"
                         class="col"
                     />
                     <QBtn
@@ -131,11 +111,25 @@ const getSelectedTagValues = async (tag) => {
                         rounded
                         flat
                         class="filter-icon col-2"
-                        :disabled="!value.value"
-                        @click="removeTagGroupParam(index)"
+                        @click="tagValues.splice(index, 1)"
                     />
                 </div>
             </div>
+            <QBtn
+                icon="add_circle"
+                shortcut="+"
+                flat
+                class="filter-icon q-mb-md"
+                size="md"
+                dense
+                @click="tagValues.push({})"
+            />
+            <QBtn
+                color="primary"
+                icon="search"
+                type="submit"
+                :label="$t('globals.search')"
+            />
         </QCard>
     </QForm>
 </template>
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b13e8661d..a266fc3d4 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,30 +1,57 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import CatalogItem from 'components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import getParamWhere from 'src/filters/getParamWhere';
+import { useArrayData } from 'composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
+const arrayData = useArrayData('OrderCatalogList');
+const store = arrayData.store;
+const showFilter = ref(null);
 const tags = ref([]);
 
+let catalogParams = {
+    orderFk: route.params.id,
+    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
+};
+
+onBeforeMount(() => {
+    const whereParams = getParamWhere(route);
+    if (whereParams) {
+        const formattedWhereParams = {};
+        if (whereParams.and) {
+            whereParams.and.forEach((item) => {
+                Object.assign(formattedWhereParams, item);
+            });
+        } else {
+            Object.assign(formattedWhereParams, whereParams);
+        }
+
+        catalogParams = {
+            ...catalogParams,
+            ...formattedWhereParams,
+        };
+    } else {
+        showFilter.value = true;
+    }
+});
+
 onMounted(() => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
 });
-onUnmounted(() => (stateStore.rightDrawer = false));
 
-const catalogParams = {
-    orderFk: route.params.id,
-    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
-};
+onUnmounted(() => (stateStore.rightDrawer = false));
 
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
@@ -34,6 +61,7 @@ async function checkOrderConfirmation() {
 }
 
 function extractTags(items) {
+    if (!items || !items.length) return;
     const resultTags = [];
     (items || []).forEach((item) => {
         (item.tags || []).forEach((tag) => {
@@ -61,6 +89,15 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
+const autoLoad = computed(() => !!catalogParams.categoryFk);
+
+watch(
+    () => store.data,
+    (val) => {
+        extractTags(val);
+    },
+    { immediate: true }
+);
 </script>
 
 <template>
@@ -74,11 +111,12 @@ function extractValueTags(items) {
         :info="t('You can search items by name or id')"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        <QScrollArea v-if="showFilter" class="fit text-grey-8">
             <OrderCatalogFilter
                 data-key="OrderCatalogList"
                 :tag-value="tagValue"
                 :tags="tags"
+                :initial-catalog-params="catalogParams"
             />
         </QScrollArea>
     </QDrawer>
@@ -89,8 +127,9 @@ function extractValueTags(items) {
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
-                @on-fetch="extractTags"
+                @on-fetch="showFilter = true"
                 :update-router="false"
+                :auto-load="autoLoad"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
@@ -102,6 +141,7 @@ function extractValueTags(items) {
                             :key="row.id"
                             :item="row"
                             is-catalog
+                            class="fill-icon"
                         />
                     </div>
                 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 381a0516a..8d5f2c1ca 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -59,20 +59,20 @@ const resetCategory = (params, search) => {
     params.categoryFk = null;
     params.typeFk = null;
     arrayData.store.userFilter = null;
-    removeTagGroupParam(params, search);
+    removeTagGroupParam(search);
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
         resetCategory(params, search);
         params.categoryFk = null;
-    } else {
-        selectedCategoryFk.value = category?.id;
-        params.categoryFk = category?.id;
-        params.typeFk = null;
-        selectedTypeFk.value = null;
-        loadTypes(category?.id);
+        return;
     }
+    selectedCategoryFk.value = category?.id;
+    params.categoryFk = category?.id;
+    params.typeFk = null;
+    selectedTypeFk.value = null;
+    loadTypes(category?.id);
     search();
 };
 
@@ -155,6 +155,12 @@ const getCategoryClass = (category, params) => {
     }
 };
 
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -179,6 +185,7 @@ onMounted(() => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
+        @remove="clearFilter"
         v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -328,7 +335,7 @@ onMounted(() => {
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
-                                    ($event) => applyTags($event, params, searchFn)
+                                    ($event) => applyTags($event, currentParams, searchFn)
                                 "
                             />
                         </QPopupProxy>

From 16133faca7308c22ae896731cfbebe5be8bea9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Wed, 20 Nov 2024 14:29:53 +0100
Subject: [PATCH 29/37] feat: refs #8087 refs#8087 Redadas en travel

---
 .../Card/BasicData/TicketBasicDataForm.vue    | 30 -------------------
 src/pages/Ticket/locale/en.yml                |  1 -
 src/pages/Ticket/locale/es.yml                |  1 -
 3 files changed, 32 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index cf10b9e21..0c53552fe 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -260,15 +260,6 @@ async function getZone(options) {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Currencies"
-        :filter="{
-            fields: ['id', 'code'],
-            order: 'code ASC',
-        }"
-        @on-fetch="(data) => (currenciesOptions = data)"
-        auto-load
-    />
     <FetchData
         ref="agencyFetchRef"
         url="AgencyModes/byWarehouse"
@@ -424,27 +415,6 @@ async function getZone(options) {
                     </QItem>
                 </template>
             </VnSelect>
-            <VnSelect
-                :label="t('basicData.company')"
-                v-model="formData.companyFk"
-                option-label="code"
-                :options="companiesOptions"
-                :required="true"
-                :rules="validate('basicData.company')"
-            />
-        </VnRow>
-        <VnRow class="row q-gutter-md q-mb-md no-wrap">
-            <VnSelect
-                :label="t('basicData.currencyFk')"
-                v-model="formData.currencyFk"
-                option-value="id"
-                option-label="code"
-                :options="currenciesOptions"
-                hide-selected
-                map-options
-                :required="true"
-                :rules="validate('basicData.currencyFk')"
-            />
         </VnRow>
         <VnRow>
             <VnInputDate
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 797179c4b..41c393a42 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -135,7 +135,6 @@ basicData:
     negativesConfirmMessage: Negatives are going to be generated, are you sure you want to advance all the lines?
     chooseAnOption: Choose an option
     unroutedTicket: The ticket has been unrouted
-    currencyFk: Currency
 purchaseRequest:
     requester: Requester
     atender: Atender
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 2b0bb516b..a851480c1 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -67,7 +67,6 @@ basicData:
     negativesConfirmMessage: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
     chooseAnOption: Elige una opción
     unroutedTicket: El ticket ha sido desenrutado
-    currencyFk: Moneda
 weeklyTickets:
     id: ID Ticket
     shipment: Salida

From 7039b68bba8d540be53d5f19ff3cdfc24ef508f1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 20 Nov 2024 17:23:40 +0100
Subject: [PATCH 30/37] fix: refs #7874 show name

---
 src/pages/Claim/Card/ClaimNotes.vue   | 2 +-
 src/pages/Worker/Card/WorkerNotes.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index a4d11e9f6..134ee33ab 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -25,7 +25,7 @@ const claimFilter = computed(() => {
                 include: {
                     relation: 'user',
                     scope: {
-                        fields: ['id', 'nickname'],
+                        fields: ['id', 'nickname', 'name'],
                     },
                 },
             },
diff --git a/src/pages/Worker/Card/WorkerNotes.vue b/src/pages/Worker/Card/WorkerNotes.vue
index c15b1dfab..4f123206b 100644
--- a/src/pages/Worker/Card/WorkerNotes.vue
+++ b/src/pages/Worker/Card/WorkerNotes.vue
@@ -15,7 +15,7 @@ const filter = {
             include: {
                 relation: 'user',
                 scope: {
-                    fields: ['id', 'nickname'],
+                    fields: ['id', 'nickname', 'name'],
                 },
             },
         },

From 3b5d385d22646f18809955bc91bbba2780194f75 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 22:43:04 +0100
Subject: [PATCH 31/37] fix: use id instead description to open
 InvoiceOutDescriptor

---
 src/pages/Claim/Card/ClaimLinesImport.vue   | 2 +-
 src/pages/Customer/Card/CustomerBalance.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLinesImport.vue b/src/pages/Claim/Card/ClaimLinesImport.vue
index 539d11a7f..d39262a86 100644
--- a/src/pages/Claim/Card/ClaimLinesImport.vue
+++ b/src/pages/Claim/Card/ClaimLinesImport.vue
@@ -130,7 +130,7 @@ function cancel() {
                 <template #body-cell-description="{ row, value }">
                     <QTd auto-width align="right" class="link">
                         {{ value }}
-                        <ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy>
+                        <ItemDescriptorProxy :id="row.itemFk" />
                     </QTd>
                 </template>
             </QTable>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index f6fc3eed2..712be5e09 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -256,10 +256,10 @@ const showBalancePdf = ({ id }) => {
             {{ toCurrency(balances[rowIndex]?.balance) }}
         </template>
         <template #column-description="{ row }">
-            <div class="link" v-if="row.isInvoice">
+            <span class="link" v-if="row.isInvoice" @click.stop>
                 {{ t('bill', { ref: row.description }) }}
-                <InvoiceOutDescriptorProxy :id="row.description" />
-            </div>
+                <InvoiceOutDescriptorProxy :id="row.id" />
+            </span>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
                 {{ row.description }}
             </span>

From 8e411125bfbc3d2fe4541b2e977d656d35427567 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 20 Nov 2024 18:58:08 -0300
Subject: [PATCH 32/37] test: refs #8162 more tests and change data-testid for
 data-cy

---
 src/components/CrudModel.vue                  |  2 +-
 src/components/VnTable/VnTable.vue            |  2 +-
 src/components/common/VnSmsDialog.vue         |  4 +-
 src/components/ui/VnConfirm.vue               |  1 -
 src/components/ui/VnSearchbar.vue             |  2 +-
 src/pages/Claim/Card/ClaimDescriptorMenu.vue  |  2 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |  2 +-
 src/pages/Ticket/Card/TicketEditMana.vue      |  2 +-
 src/pages/Ticket/Card/TicketNotes.vue         |  8 +-
 src/pages/Ticket/Card/TicketSale.vue          | 17 ++--
 .../Ticket/Card/TicketSaleMoreActions.vue     | 30 ++++---
 src/pages/Ticket/Card/TicketSummary.vue       |  2 +-
 src/pages/Ticket/Card/TicketTransfer.vue      |  2 +-
 src/pages/Ticket/Card/TicketTransferForm.vue  |  3 +
 src/pages/Ticket/TicketList.vue               |  4 +-
 .../integration/ticket/ticketNotes.spec.js    |  6 +-
 .../integration/ticket/ticketSale.spec.js     | 78 ++++++++++++++++++-
 test/cypress/support/commands.js              |  2 +-
 18 files changed, 130 insertions(+), 39 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index ee7caecc4..5eba97dc8 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -394,7 +394,7 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                data-testid="crudModelDefaultSaveBtn"
+                data-cy="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 99a9a6801..1213f61c5 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -737,7 +737,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             fab
             icon="add"
             shortcut="+"
-            data-testid="vnTableCreateBtn"
+            data-cy="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}
diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index dbe16f57b..8851a33b2 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -86,7 +86,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef" data-testid="vnSmsDialog">
+    <QDialog ref="dialogRef" data-cy="vnSmsDialog">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -161,7 +161,7 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
-                    data-testid="sendSmsBtn"
+                    data-cy="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index 767e2ca5a..0b1913383 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -104,7 +104,6 @@ function cancel() {
                     unelevated
                     autofocus
                     data-cy="VnConfirm_confirm"
-                    data-testid="vnConfirmConfirmBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 56397d63b..ccf87c6d6 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -130,7 +130,7 @@ async function search() {
                 dense
                 standout
                 autofocus
-                data-testid="vnSearchBar"
+                data-cy="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon
diff --git a/src/pages/Claim/Card/ClaimDescriptorMenu.vue b/src/pages/Claim/Card/ClaimDescriptorMenu.vue
index d88c3d120..d87091887 100644
--- a/src/pages/Claim/Card/ClaimDescriptorMenu.vue
+++ b/src/pages/Claim/Card/ClaimDescriptorMenu.vue
@@ -100,7 +100,7 @@ async function remove() {
         </QMenu>
     </QItem>
     <QSeparator />
-    <QItem @click="confirmRemove()" v-ripple clickable>
+    <QItem @click="confirmRemove()" v-ripple clickable data-cy="deleteClaim">
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 9ef30543c..4e77b633f 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -130,7 +130,7 @@ function ticketFilter(ticket) {
                     <QBadge
                         text-color="black"
                         :color="entity.ticketState.state.classColor"
-                        data-testid="ticketDescriptorStateBadge"
+                        data-cy="ticketDescriptorStateBadge"
                     >
                         {{ entity.ticketState.state.name }}
                     </QBadge>
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index fd385087b..693875712 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -75,7 +75,7 @@ const cancel = () => {
                     dense
                     style="width: 50%"
                     @click="save()"
-                    data-testid="saveManaBtn"
+                    data-cy="saveManaBtn"
                 >
                     {{ t('globals.save') }}
                 </QBtn>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index 871f36476..55a6188d9 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -86,14 +86,14 @@ async function handleSave() {
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
-                            data-testid="ticketNotesObservationType"
+                            data-cy="ticketNotesObservationType"
                         />
                         <VnInput
                             :label="t('basicData.description')"
                             v-model="row.description"
                             class="col"
                             @keyup.enter="handleSave"
-                            data-testid="ticketNotesDescription"
+                            data-cy="ticketNotesDescription"
                         />
                         <QIcon
                             name="delete"
@@ -101,7 +101,7 @@ async function handleSave() {
                             class="cursor-pointer"
                             color="primary"
                             @click="handleDelete(row)"
-                            data-testid="ticketNotesRemoveNoteBtn"
+                            data-cy="ticketNotesRemoveNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}
@@ -116,7 +116,7 @@ async function handleSave() {
                             class="fill-icon-on-hover q-ml-md"
                             color="primary"
                             @click="ticketNotesCrudRef.insert()"
-                            data-testid="ticketNotesAddNoteBtn"
+                            data-cy="ticketNotesAddNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.addNote') }}
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 93278eb3d..0967f60b6 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -577,7 +577,7 @@ watch(
                     color="primary"
                     :disable="!isTicketEditable || ticketState === 'OK'"
                     @click="changeTicketState('OK')"
-                    data-testid="ticketSaleOkStateBtn"
+                    data-cy="ticketSaleOkStateBtn"
                 >
                     <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
                 </QBtn>
@@ -586,7 +586,7 @@ watch(
                     color="primary"
                     :label="t('ticketList.state')"
                     :disable="!isTicketEditable"
-                    data-testid="ticketSaleStateDropdown"
+                    data-cy="ticketSaleStateDropdown"
                 >
                     <VnSelect
                         :options="editableStatesOptions"
@@ -596,7 +596,7 @@ watch(
                         hide-dropdown-icon
                         focus-on-mount
                         @update:model-value="changeTicketState"
-                        data-testid="ticketSaleStateSelect"
+                        data-cy="ticketSaleStateSelect"
                     />
                 </QBtnDropdown>
                 <TicketSaleMoreActions
@@ -629,6 +629,7 @@ watch(
                     icon="vn:splitline"
                     :disable="!isTicketEditable || !hasSelectedRows"
                     @click="setTransferParams()"
+                    data-cy="ticketSaleTransferBtn"
                 >
                     <QTooltip>{{ t('Transfer lines') }}</QTooltip>
                     <TicketTransfer
@@ -708,7 +709,13 @@ watch(
                     {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
                 </QTooltip>
             </QIcon>
-            <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
+            <QIcon
+                v-if="row.reserved"
+                color="primary"
+                name="vn:reserva"
+                size="xs"
+                data-cy="ticketSaleReservedIcon"
+            >
                 <QTooltip>
                     {{ t('ticketSale.reserved') }}
                 </QTooltip>
@@ -867,7 +874,7 @@ watch(
             fab
             icon="add"
             shortcut="+"
-            data-testid="ticketSaleAddToBasketBtn"
+            data-cy="ticketSaleAddToBasketBtn"
         />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 7da28deb8..2a8e0237f 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -179,7 +179,7 @@ const createRefund = async (withWarehouse) => {
         color="primary"
         :label="t('ticketSale.more')"
         :disable="disable"
-        data-testid="ticketSaleMoreActionsDropdown"
+        data-cy="ticketSaleMoreActionsDropdown"
     >
         <template #label>
             <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -191,7 +191,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="showSmsDialog('productNotAvailable')"
-                data-testid="sendShortageSMSItem"
+                data-cy="sendShortageSMSItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel>
@@ -203,7 +203,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="calculateSalePrice()"
-                data-testid="recalculatePriceItem"
+                data-cy="recalculatePriceItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
@@ -213,7 +213,7 @@ const createRefund = async (withWarehouse) => {
                 clickable
                 v-ripple
                 @click="emit('getMana')"
-                data-testid="updateDiscountItem"
+                data-cy="updateDiscountItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Update discount') }}</QItemLabel>
@@ -223,7 +223,7 @@ const createRefund = async (withWarehouse) => {
                         v-model.number="newDiscount"
                         :label="t('ticketSale.discount')"
                         type="number"
-                        data-testid="ticketSaleDiscountInput"
+                        data-cy="ticketSaleDiscountInput"
                     />
                 </TicketEditManaProxy>
             </QItem>
@@ -233,7 +233,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="createClaim()"
-                data-testid="createClaimItem"
+                data-cy="createClaimItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Add claim') }}</QItemLabel>
@@ -245,6 +245,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="setReserved(true)"
+                data-cy="markAsReservedItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
@@ -256,12 +257,13 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="setReserved(false)"
+                data-cy="unmarkAsReservedItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Unmark as reserved') }}</QItemLabel>
                 </QItemSection>
             </QItem>
-            <QItem clickable v-ripple>
+            <QItem clickable v-ripple data-cy="ticketSaleRefundItem">
                 <QItemSection>
                     <QItemLabel>{{ t('Refund') }}</QItemLabel>
                 </QItemSection>
@@ -270,12 +272,22 @@ const createRefund = async (withWarehouse) => {
                 </QItemSection>
                 <QMenu anchor="top end" self="top start" auto-close bordered>
                     <QList>
-                        <QItem v-ripple clickable @click="createRefund(true)">
+                        <QItem
+                            v-ripple
+                            clickable
+                            @click="createRefund(true)"
+                            data-cy="ticketSaleRefundWithWarehouse"
+                        >
                             <QItemSection>
                                 {{ t('with warehouse') }}
                             </QItemSection>
                         </QItem>
-                        <QItem v-ripple clickable @click="createRefund(false)">
+                        <QItem
+                            v-ripple
+                            clickable
+                            @click="createRefund(false)"
+                            data-cy="ticketSaleRefundWithoutWarehouse"
+                        >
                             <QItemSection>
                                 {{ t('without warehouse') }}
                             </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index b3ee9ad37..650e28e8f 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -100,7 +100,7 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
-        data-testid="ticketSummary"
+        data-cy="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index d7aff3ef7..005d74a0e 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -91,7 +91,7 @@ onMounted(() => (_transfer.value = $props.transfer));
 </script>
 
 <template>
-    <QPopupProxy ref="QPopupProxyRef">
+    <QPopupProxy ref="QPopupProxyRef" data-cy="ticketTransferPopup">
         <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
                 :rows="transfer.sales"
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index d07a9d2e7..ece3a3b97 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -57,6 +57,7 @@ defineExpose({ transferSales });
             v-model.number="_transfer.ticketId"
             :label="t('Transfer to ticket')"
             :clearable="false"
+            data-cy="ticketTransferDestinationTicketInput"
         >
             <template #append>
                 <QBtn
@@ -64,6 +65,7 @@ defineExpose({ transferSales });
                     color="primary"
                     @click="transferSales(_transfer.ticketId)"
                     style="width: 30px"
+                    data-cy="ticketTransferTransferBtn"
                 />
             </template>
         </VnInput>
@@ -72,6 +74,7 @@ defineExpose({ transferSales });
             color="primary"
             class="full-width q-my-lg"
             @click="transferSales()"
+            data-cy="ticketTransferNewTicketBtn"
         />
     </QForm>
 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 83f0f7c07..9246ac60d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -461,7 +461,7 @@ function setReference(data) {
         data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
-        data-testid="ticketListSearchBar"
+        data-cy="ticketListSearchBar"
     />
     <RightMenu>
         <template #right-panel>
@@ -489,7 +489,7 @@ function setReference(data) {
             'row-key': 'id',
             selection: 'multiple',
         }"
-        data-testid="ticketListTable"
+        data-cy="ticketListTable"
     >
         <template #column-statusIcons="{ row }">
             <div class="q-gutter-x-xs">
diff --git a/test/cypress/integration/ticket/ticketNotes.spec.js b/test/cypress/integration/ticket/ticketNotes.spec.js
index f8fb530ef..ef196c783 100644
--- a/test/cypress/integration/ticket/ticketNotes.spec.js
+++ b/test/cypress/integration/ticket/ticketNotes.spec.js
@@ -10,16 +10,16 @@ describe('TicketRequest', () => {
         cy.dataCy('ticketNotesAddNoteBtn').should('exist');
         cy.dataCy('ticketNotesAddNoteBtn').click();
         cy.dataCy('ticketNotesObservationType').should('exist');
-        cy.selectOption('[data-testid="ticketNotesObservationType"]:last', 'Weight');
+        cy.selectOption('[data-cy="ticketNotesObservationType"]:last', 'Weight');
         cy.dataCy('ticketNotesDescription').should('exist');
-        cy.get('[data-testid="ticketNotesDescription"]:last').type(
+        cy.get('[data-cy="ticketNotesDescription"]:last').type(
             'This is a note description'
         );
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
         cy.dataCy('ticketNotesRemoveNoteBtn').should('exist');
         cy.dataCy('ticketNotesRemoveNoteBtn').click();
-        cy.dataCy('vnConfirmConfirmBtn').click();
+        cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index b3c3edd8b..60f31dbf6 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -1,5 +1,7 @@
 /// <reference types="cypress" />
 
+const c = require('croppie');
+
 describe('TicketSale', () => {
     beforeEach(() => {
         cy.login('developer');
@@ -26,7 +28,7 @@ describe('TicketSale', () => {
     it('should send SMS', () => {
         selectFirstRow();
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-testid="sendShortageSMSItem"]');
+        cy.waitForElement('[data-cy="sendShortageSMSItem"]');
         cy.dataCy('sendShortageSMSItem').should('exist');
         cy.dataCy('sendShortageSMSItem').click();
         cy.dataCy('vnSmsDialog').should('exist');
@@ -38,7 +40,7 @@ describe('TicketSale', () => {
         cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
         selectFirstRow();
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-testid="recalculatePriceItem"]');
+        cy.waitForElement('[data-cy="recalculatePriceItem"]');
         cy.dataCy('recalculatePriceItem').should('exist');
         cy.dataCy('recalculatePriceItem').click();
         cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
@@ -48,14 +50,82 @@ describe('TicketSale', () => {
     it('should update discount when "Update discount" is clicked', () => {
         selectFirstRow();
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-testid="updateDiscountItem"]');
+        cy.waitForElement('[data-cy="updateDiscountItem"]');
         cy.dataCy('updateDiscountItem').should('exist');
         cy.dataCy('updateDiscountItem').click();
-        cy.waitForElement('[data-testid="ticketSaleDiscountInput"]');
+        cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
         cy.dataCy('ticketSaleDiscountInput').find('input').focus();
         cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
         cy.dataCy('saveManaBtn').click();
         cy.waitForElement('.q-notification__message');
         cy.checkNotification('Data saved');
     });
+
+    it('adds claim', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.dataCy('createClaimItem').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.url().should('match', /\/claim\/\d+\/basic-data/);
+        // Delete created claim to avoid cluttering the database
+        cy.dataCy('descriptor-more-opts').click();
+        cy.dataCy('deleteClaim').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('Data deleted');
+    });
+
+    it('marks row as reserved', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-cy="markAsReservedItem"]');
+        cy.dataCy('markAsReservedItem').click();
+        cy.dataCy('ticketSaleReservedIcon').should('exist');
+    });
+
+    it('unmarks row as reserved', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
+        cy.dataCy('unmarkAsReservedItem').click();
+        cy.dataCy('ticketSaleReservedIcon').should('not.exist');
+    });
+
+    it('refunds row with warehouse', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.dataCy('ticketSaleRefundItem').click();
+        cy.dataCy('ticketSaleRefundWithWarehouse').click();
+        cy.checkNotification('The following refund ticket have been created');
+    });
+
+    it('refunds row without warehouse', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.dataCy('ticketSaleRefundItem').click();
+        cy.dataCy('ticketSaleRefundWithoutWarehouse').click();
+        cy.checkNotification('The following refund ticket have been created');
+    });
+
+    it('transfers ticket', () => {
+        cy.visit('/#/ticket/32/sale');
+        selectFirstRow();
+        cy.dataCy('ticketSaleTransferBtn').click();
+        cy.dataCy('ticketTransferPopup').should('exist');
+        cy.dataCy('ticketTransferNewTicketBtn').click();
+        // existen 3 elementos "tbody" necesito checkear que el segundo elemento tbody tenga una row sola
+        cy.get('tbody').eq(1).find('tr').should('have.length', 1);
+        selectFirstRow();
+        cy.dataCy('ticketSaleTransferBtn').click();
+        cy.dataCy('ticketTransferPopup').should('exist');
+        cy.dataCy('ticketTransferDestinationTicketInput').find('input').focus();
+        cy.dataCy('ticketTransferDestinationTicketInput').find('input').type('32');
+        cy.dataCy('ticketTransferTransferBtn').click();
+        // checkear que la url contenga /ticket/1000002/sale
+        cy.url().should('match', /\/ticket\/32\/sale/);
+    });
+
+    it('should redirect to ticket logs', () => {
+        cy.get(firstRow).find('.q-btn:last').click();
+        cy.url().should('match', /\/ticket\/31\/log/);
+    });
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 91c0b3f05..68fc10b23 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -312,6 +312,6 @@ Cypress.Commands.add('searchByLabel', (label, value) => {
     cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
 });
 
-Cypress.Commands.add('dataCy', (dataTestId, attr = 'data-testid') => {
+Cypress.Commands.add('dataCy', (dataTestId, attr = 'data-cy') => {
     return cy.get(`[${attr}="${dataTestId}"]`);
 });

From c5acde22a32779d84d5c0f13f1021dce002d1ea2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Nov 2024 07:42:00 +0100
Subject: [PATCH 33/37] chore: requested changes

---
 .../Order/Card/CatalogFilterValueDialog.vue     | 16 ++++------------
 src/pages/Order/Card/OrderCatalog.vue           | 17 +++++++++--------
 src/pages/Order/Card/OrderCatalogFilter.vue     | 14 ++++++--------
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index 2cc6c74d3..9593e08c4 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import VnSelect from 'components/common/VnSelect.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const props = defineProps({
@@ -31,14 +31,6 @@ const applyTags = () => {
     emit('applyTags', tagInfo);
 };
 
-const removeTagGroupParam = (valIndex = null) => {
-    if (!valIndex) {
-        tagValues.value = [{}];
-    } else {
-        (tagValues.value || []).splice(valIndex, 1);
-    }
-};
-
 const getSelectedTagValues = async (tag) => {
     if (!tag?.id) return;
     const filter = {
@@ -57,7 +49,7 @@ const getSelectedTagValues = async (tag) => {
 </script>
 
 <template>
-    <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
+    <QForm @submit="applyTags()" class="all-pointer-events">
         <QCard class="q-pa-sm column q-pa-lg">
             <VnSelect
                 :label="t('params.tag')"
@@ -71,7 +63,7 @@ const getSelectedTagValues = async (tag) => {
                 rounded
                 :emit-value="false"
                 use-input
-                @update:model-value="($event) => getSelectedTagValues($event)"
+                @update:model-value="getSelectedTagValues"
             />
             <div
                 v-for="(value, index) in tagValues"
@@ -83,7 +75,7 @@ const getSelectedTagValues = async (tag) => {
                         v-if="!selectedTag?.isFree && tagOptions"
                         :label="t('components.itemsFilterPanel.value')"
                         v-model="value.value"
-                        :options="tagOptions || []"
+                        :options="tagOptions"
                         option-value="value"
                         option-label="value"
                         dense
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index a266fc3d4..b65f6bcd1 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -4,18 +4,19 @@ import { useRoute, useRouter } from 'vue-router';
 import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import CatalogItem from 'components/ui/CatalogItem.vue';
-import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CatalogItem from 'src/components/ui/CatalogItem.vue';
+import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import getParamWhere from 'src/filters/getParamWhere';
-import { useArrayData } from 'composables/useArrayData';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const arrayData = useArrayData('OrderCatalogList');
+const dataKey = 'OrderCatalogList';
+const arrayData = useArrayData('dataKey');
 const store = arrayData.store;
 const showFilter = ref(null);
 const tags = ref([]);
@@ -102,7 +103,7 @@ watch(
 
 <template>
     <VnSearchbar
-        data-key="OrderCatalogList"
+        :data-key="dataKey"
         :user-params="catalogParams"
         :static-params="['orderFk', 'orderBy']"
         :redirect="false"
@@ -113,7 +114,7 @@ watch(
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea v-if="showFilter" class="fit text-grey-8">
             <OrderCatalogFilter
-                data-key="OrderCatalogList"
+                :data-key="dataKey"
                 :tag-value="tagValue"
                 :tags="tags"
                 :initial-catalog-params="catalogParams"
@@ -123,7 +124,7 @@ watch(
     <QPage class="column items-center q-pa-md">
         <div class="full-width">
             <VnPaginate
-                data-key="OrderCatalogList"
+                :data-key="dataKey"
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 8d5f2c1ca..8aa88da0d 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -53,6 +53,11 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
+onMounted(() => {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
+});
+
 const resetCategory = (params, search) => {
     selectedCategoryFk.value = null;
     typeList.value = null;
@@ -65,7 +70,6 @@ const resetCategory = (params, search) => {
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
         resetCategory(params, search);
-        params.categoryFk = null;
         return;
     }
     selectedCategoryFk.value = category?.id;
@@ -131,11 +135,10 @@ async function onSearchByTag(value) {
 const removeTagGroupParam = (search, valIndex) => {
     if (!valIndex && valIndex !== 0) {
         currentParams.value.tagGroups = null;
-        search();
     } else {
         currentParams.value.tagGroups.splice(valIndex, 1);
-        search();
     }
+    search();
 };
 
 const setCategoryList = (data) => {
@@ -168,11 +171,6 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
-
-onMounted(() => {
-    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
-    selectedTypeFk.value = getParamWhere(route, 'typeFk');
-});
 </script>
 
 <template>

From 44f2ecca286f8a4d20a3352eebf990126031b1bf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Nov 2024 07:49:10 +0100
Subject: [PATCH 34/37] chore: requested changes

---
 src/components/ui/VnToSummary.vue     | 1 -
 src/pages/Order/Card/OrderCatalog.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/VnToSummary.vue b/src/components/ui/VnToSummary.vue
index 1c7d6cf01..305d65e02 100644
--- a/src/components/ui/VnToSummary.vue
+++ b/src/components/ui/VnToSummary.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { defineProps } from 'vue';
 
 const props = defineProps({
     routeName: {
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b65f6bcd1..66a1a132d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -16,7 +16,7 @@ const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const dataKey = 'OrderCatalogList';
-const arrayData = useArrayData('dataKey');
+const arrayData = useArrayData(dataKey);
 const store = arrayData.store;
 const showFilter = ref(null);
 const tags = ref([]);

From e5434e743613a0595df2af9aac285b5d7a1f6e91 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 21 Nov 2024 09:08:52 +0000
Subject: [PATCH 35/37] warmfix: ItemLastEntries to date

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

diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index 5c0251ea8..22fb9adc7 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -170,7 +170,7 @@ onMounted(async () => {
     from.value = getDate(_from, 'from');
     const _to = Date.vnNew();
     _to.setDate(_to.getDate() + 10);
-    to.value = getDate(Date.vnNew(), 'to');
+    to.value = getDate(_to, 'to');
 
     updateFilter();
 

From 5ff95c2b93c18af2b7cbe2db97d44a256c7c0f45 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 21 Nov 2024 10:10:44 +0100
Subject: [PATCH 36/37] fix: locations tree

---
 src/pages/Zone/Card/ZoneCard.vue          |   1 -
 src/pages/Zone/Card/ZoneLocationsTree.vue | 154 +++++++---------------
 2 files changed, 48 insertions(+), 107 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 8ad25b80f..a470cd5bd 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -24,7 +24,6 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
         :descriptor="ZoneDescriptor"
         :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
         :search-data-key="notIsLocations('ZoneList', undefined)"
-        :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
             url: notIsLocations('Zones', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index c91bf670c..23a37ef7c 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -39,8 +39,7 @@ const url = computed(() => `Zones/${route.params.id}/getLeaves`);
 const arrayData = useArrayData(datakey, {
     url: url.value,
 });
-const { store } = arrayData;
-const storeData = computed(() => store.data);
+const store = arrayData.store;
 
 const defaultNode = {
     id: null,
@@ -66,8 +65,20 @@ const onNodeExpanded = async (nodeKeysArray) => {
     if (!nodeKeysSet.has(null)) return;
 
     const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
-    if (wasExpanded) await fetchNodeLeaves(lastNodeKey);
-    else {
+    if (wasExpanded && treeRef.value) {
+        const node = treeRef.value?.getNodeByKey(lastNodeKey);
+        const params = { parentId: node.id };
+        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
+            params,
+        });
+        if (response.data) {
+            node.childs = response.data.map((n) => {
+                if (n.sons > 0) n.childs = [{}];
+                return n;
+            });
+        }
+        await fetchNodeLeaves(lastNodeKey, true);
+    } else {
         const difference = new Set(
             [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x))
         );
@@ -83,41 +94,21 @@ const formatNodeSelected = (node) => {
     if (node.selected === 1) node.selected = true;
     else if (node.selected === 0) node.selected = false;
 
-    if (node.childs && node.childs.length > 0) {
-        expanded.value.push(node.id);
-
-        node.childs.forEach((childNode) => {
-            formatNodeSelected(childNode);
-        });
-    }
-
     if (node.sons > 0 && !node.childs) node.childs = [{}];
 };
 
 const fetchNodeLeaves = async (nodeKey) => {
-    try {
-        const node = treeRef.value?.getNodeByKey(nodeKey);
-        if (!node || node.sons === 0) return;
+    if (!treeRef.value) return;
+    const node = treeRef.value?.getNodeByKey(nodeKey);
+    if (node.selected === 1) node.selected = true;
+    else if (node.selected === 0) node.selected = false;
+    if (!node || node.sons === 0) return;
 
-        const params = { parentId: node.id };
-        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
-            params,
-        });
-        if (response.data) {
-            node.childs = response.data.map((n) => {
-                formatNodeSelected(n);
-                return n;
-            });
-        }
-
-        state.set('Tree', node);
-    } catch (err) {
-        console.error('Error fetching department leaves', err);
-        throw new Error();
-    }
+    state.set('Tree', node);
 };
 
 function getNodeIds(node) {
+    if (!node) return [];
     let ids = [];
     if (node.id) ids.push(node.id);
 
@@ -128,59 +119,32 @@ function getNodeIds(node) {
     return ids;
 }
 
-const findNodePath = (node, searchTerm, path = []) => {
-    if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
-        path.push(node.id);
-        return path;
-    }
-    if (node.childs) {
-        for (let child of node.childs) {
-            const resultPath = findNodePath(child, searchTerm, [...path, node.id]);
-            if (resultPath.length > 0) {
-                return resultPath;
+watch(
+    () => store.data,
+    async (val) => {
+        if (!val) return;
+        // // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+        if (!nodes.value[0]) nodes.value = [defaultNode];
+        nodes.value[0].childs = [...val];
+        const fetchedNodeKeys = val.flatMap(getNodeIds);
+        state.set('Tree', [...fetchedNodeKeys]);
+
+        if (!store.userParams?.search) {
+            val.forEach((n) => {
+                formatNodeSelected(n);
+            });
+            store.data = null;
+            expanded.value = [null];
+        } else {
+            for (let n of state.get('Tree')) {
+                await fetchNodeLeaves(n);
             }
+            expanded.value = [null, ...fetchedNodeKeys];
         }
-    }
-    return [];
-};
-
-const filterNodes = (nodes, searchTerm) => {
-    return nodes
-        .map((node) => {
-            if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
-                if (node.childs) {
-                    node.childs = filterNodes(node.childs, searchTerm);
-                }
-                return node;
-            }
-            if (node.childs) {
-                node.childs = filterNodes(node.childs, searchTerm);
-                if (node.childs.length > 0) {
-                    return node;
-                }
-            }
-            return null;
-        })
-        .filter((node) => node !== null);
-};
-
-watch(storeData, async (val) => {
-    // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
-    const searchTerm = store.userParams?.search || '';
-
-    const filteredNodes = filterNodes(val, searchTerm);
-    let nodePath = [];
-    filteredNodes.forEach((node) => {
-        nodePath = findNodePath(node, searchTerm);
-    });
-
-    const finalFilteredNodes = filteredNodes.filter((node) => nodePath.includes(node.id));
-    nodes.value[0].childs = [...finalFilteredNodes];
-    const fetchedNodeKeys = finalFilteredNodes.flatMap(getNodeIds);
-    state.set('Tree', [...fetchedNodeKeys]);
-    expanded.value = [null, ...fetchedNodeKeys];
-    previousExpandedNodes.value = new Set(expanded.value);
-});
+        previousExpandedNodes.value = new Set(expanded.value);
+    },
+    { immediate: true }
+);
 
 const reFetch = async () => {
     const { data } = await arrayData.fetch({ append: false });
@@ -189,34 +153,12 @@ const reFetch = async () => {
 };
 
 onMounted(async () => {
-    store.userParams.search = '';
-
-    const stateTree = state.get('Tree');
-    const tree = stateTree ? [...state.get('Tree')] : [null];
-    const lastStateTree = state.get('TreeState');
-    if (tree) {
-        for (let n of tree) {
-            await fetchNodeLeaves(n);
-        }
-
-        if (lastStateTree) {
-            tree.push(lastStateTree);
-            await fetchNodeLeaves(lastStateTree);
-        }
-    }
-
-    setTimeout(() => {
-        if (lastStateTree) {
-            document.getElementById(lastStateTree).scrollIntoView();
-        }
-    }, 1000);
-
-    expanded.value.unshift(null);
-    previousExpandedNodes.value = new Set(expanded.value);
+    if (store.userParams?.search) await arrayData.fetch({});
 });
 
 onUnmounted(() => {
     state.set('Tree', undefined);
+    arrayData.destroy();
 });
 </script>
 

From 5268140d8bc229dfa59bd67baabb4f8de35800b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Thu, 21 Nov 2024 15:51:27 +0100
Subject: [PATCH 37/37] feat: refs#8087 Redadas en travel

---
 src/i18n/locale/en.yml                     |  1 +
 src/i18n/locale/es.yml                     |  1 +
 src/pages/Entry/EntryList.vue              |  2 +-
 src/pages/Travel/Card/TravelBasicData.vue  | 12 +++----
 src/pages/Travel/Card/TravelCard.vue       | 29 +---------------
 src/pages/Travel/Card/TravelDescriptor.vue | 39 ++--------------------
 src/pages/Travel/Card/TravelFilter.js      | 29 ++++++++++++++++
 src/pages/Travel/Card/TravelSummary.vue    |  9 +++++
 src/pages/Travel/TravelList.vue            |  6 ++--
 9 files changed, 53 insertions(+), 75 deletions(-)
 create mode 100644 src/pages/Travel/Card/TravelFilter.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 60f460b9d..613046f86 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -767,6 +767,7 @@ travel:
         hb: HB
     basicData:
         daysInForward: Days in forward
+        isRaid: Raid
     thermographs:
         temperature: Temperature
         destination: Destination
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index c6ab57dd7..58ddc98ef 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -761,6 +761,7 @@ travel:
         hb: HB
     basicData:
         daysInForward: Días redada
+        isRaid: Redada
     thermographs:
         temperature: Temperatura
         destination: Destino
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 38bf09b53..3487f86c0 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -221,7 +221,7 @@ onMounted(async () => {
                         t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
                     }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: row.daysInForward })
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index c3a13907a..faf408989 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -21,12 +21,7 @@ const agenciesOptions = ref([]);
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FormModel
-        :url="`Travels/${route.params.id}`"
-        :url-update="`Travels/${route.params.id}`"
-        model="Travel"
-        auto-load
-    >
+    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('globals.reference')" />
@@ -78,6 +73,7 @@ const agenciesOptions = ref([]);
                 </VnInput>
             </VnRow>
             <VnRow>
+                <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="data.isDelivered"
@@ -93,7 +89,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
 en:
-    raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If left empty, the date will stay the same.
 </i18n>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 44bd9d430..50cecef34 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,34 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
-
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
+import filter from './TravelFilter.js';
 </script>
 <template>
     <VnCard
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 295b47fa0..9d00d371a 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -7,6 +7,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
+import filter from './TravelFilter.js';
 
 import { toDate } from 'src/filters';
 
@@ -21,35 +22,6 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-        'daysInForward',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -65,7 +37,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :title="data.title"
         :subtitle="data.subtitle"
         :filter="filter"
-        data-key="travelData"
+        data-key="Travel"
         @on-fetch="setData"
     >
         <template #menu="{ entity }">
@@ -80,12 +52,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
-                <QIcon
-                    v-if="entity.daysInForward"
-                    name="vn:net"
-                    color="primary"
-                    size="xs"
-                >
+                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: entity.daysInForward })
diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
new file mode 100644
index 000000000..f5f4520fd
--- /dev/null
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -0,0 +1,29 @@
+export default {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+        'isRaid',
+        'daysInForward',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index d720abd11..5ed7da996 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -268,6 +268,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.warehouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
+                <QCheckbox
+                    :label="t('travel.basicData.isRaid')"
+                    v-model="travel.isRaid"
+                    :disable="true"
+                />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="travel.isDelivered"
@@ -286,6 +291,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.warehouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
                 <QCheckbox
                     :label="t('travel.summary.received')"
                     v-model="travel.isReceived"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index ee1427cf0..852003a95 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -227,10 +227,12 @@ const columns = computed(() => [
     >
         <template #column-status="{ row }">
             <div class="row">
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
+                            t('globals.raid', {
+                                daysInForward: row.daysInForward,
+                            })
                         }}</QTooltip
                     >
                 </QIcon>