From 0263af793850a26c12aecaad5e66bc0656aeec0f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 2 Mar 2025 23:58:36 +0100
Subject: [PATCH 01/16] test: refs #7356 init each missing e2e

---
 .../integration/ticket/ticketBasicData.spec.js       | 12 ++++++++++++
 .../integration/ticket/ticketComponents.spec.js      | 11 +++++++++++
 .../cypress/integration/ticket/ticketPackage.spec.js | 12 ++++++++++++
 .../integration/ticket/ticketPictures.spec.js        | 11 +++++++++++
 .../integration/ticket/ticketSaleTracking.spec.js    | 12 ++++++++++++
 .../cypress/integration/ticket/ticketService.spec.js | 12 ++++++++++++
 test/cypress/integration/ticket/ticketSms.spec.js    | 12 ++++++++++++
 .../integration/ticket/ticketTracking.spec.js        | 12 ++++++++++++
 test/cypress/integration/ticket/ticketVolume.spec.js | 12 ++++++++++++
 9 files changed, 106 insertions(+)
 create mode 100644 test/cypress/integration/ticket/ticketBasicData.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketComponents.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketPackage.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketPictures.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketSaleTracking.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketService.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketSms.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketTracking.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketVolume.spec.js

diff --git a/test/cypress/integration/ticket/ticketBasicData.spec.js b/test/cypress/integration/ticket/ticketBasicData.spec.js
new file mode 100644
index 000000000..ac57e47e6
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketBasicData.spec.js
@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/basic-data');
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketComponents.spec.js b/test/cypress/integration/ticket/ticketComponents.spec.js
new file mode 100644
index 000000000..f6107486c
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketComponents.spec.js
@@ -0,0 +1,11 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/request');
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketPackage.spec.js b/test/cypress/integration/ticket/ticketPackage.spec.js
new file mode 100644
index 000000000..1f54af5b1
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketPackage.spec.js
@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/request');
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketPictures.spec.js b/test/cypress/integration/ticket/ticketPictures.spec.js
new file mode 100644
index 000000000..a2f4ad506
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketPictures.spec.js
@@ -0,0 +1,11 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/picture');
+    });
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketSaleTracking.spec.js b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
new file mode 100644
index 000000000..30ac79e0f
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/sale-tracking');
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketService.spec.js b/test/cypress/integration/ticket/ticketService.spec.js
new file mode 100644
index 000000000..35a126fc8
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketService.spec.js
@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/service');
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketSms.spec.js b/test/cypress/integration/ticket/ticketSms.spec.js
new file mode 100644
index 000000000..69a48b341
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketSms.spec.js
@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/sms');
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketTracking.spec.js b/test/cypress/integration/ticket/ticketTracking.spec.js
new file mode 100644
index 000000000..1f54af5b1
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketTracking.spec.js
@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/request');
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketVolume.spec.js b/test/cypress/integration/ticket/ticketVolume.spec.js
new file mode 100644
index 000000000..7b3d890b8
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketVolume.spec.js
@@ -0,0 +1,12 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/volume');
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-page').should('be.visible');
+    });
+});

From aebd9ea83cdf21b310977906a0aaa585817e034e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Mar 2025 03:24:10 +0100
Subject: [PATCH 02/16] fix: refs #7356 update validation logic and enhance
 Cypress tests for ticket components

---
 src/composables/useValidator.js               |  3 +-
 src/pages/Item/Card/ItemDescriptorProxy.vue   |  2 +-
 src/pages/Ticket/Card/TicketVolume.vue        |  2 +-
 src/pages/Zone/Card/ZoneDescriptorProxy.vue   |  2 +-
 .../ticket/ticketComponents.spec.js           | 60 ++++++++++++++++++-
 .../integration/ticket/ticketPackage.spec.js  | 14 ++++-
 .../integration/ticket/ticketPictures.spec.js | 13 +++-
 .../ticket/ticketSaleTracking.spec.js         | 37 +++++++++++-
 .../integration/ticket/ticketService.spec.js  | 18 +++++-
 .../integration/ticket/ticketVolume.spec.js   | 19 +++++-
 10 files changed, 153 insertions(+), 17 deletions(-)

diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index 7a7032608..ae6c47d91 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -78,7 +78,8 @@ export function useValidator() {
                 if (min >= 0)
                     if (Math.floor(value) < min) return t('inputMin', { value: min });
             },
-            custom: (value) => validation.bindedFunction(value) || 'Invalid value',
+            custom: (value) =>
+                eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
         };
     };
 
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index f686e8221..6e1f6d71f 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -22,7 +22,7 @@ const $props = defineProps({
 });
 </script>
 <template>
-    <QPopupProxy style="max-width: 10px">
+    <QPopupProxy style="max-width: 10px" data-cy="ItemDescriptor">
         <ItemDescriptor
             v-if="$props.id"
             :id="$props.id"
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index db78094cf..690ae9063 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -134,7 +134,7 @@ onMounted(() => (stateStore.rightDrawer = true));
         auto-load
     >
         <template #column-itemFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
diff --git a/src/pages/Zone/Card/ZoneDescriptorProxy.vue b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
index 27102ac07..a16d231e6 100644
--- a/src/pages/Zone/Card/ZoneDescriptorProxy.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
@@ -11,7 +11,7 @@ const $props = defineProps({
 </script>
 
 <template>
-    <QPopupProxy>
+    <QPopupProxy data-cy="ZoneDescriptor">
         <ZoneDescriptor v-if="$props.id" :id="$props.id" :summary="ZoneSummary" />
     </QPopupProxy>
 </template>
diff --git a/test/cypress/integration/ticket/ticketComponents.spec.js b/test/cypress/integration/ticket/ticketComponents.spec.js
index f6107486c..f5bfd144d 100644
--- a/test/cypress/integration/ticket/ticketComponents.spec.js
+++ b/test/cypress/integration/ticket/ticketComponents.spec.js
@@ -1,11 +1,67 @@
 /// <reference types="cypress" />
-describe('TicketRequest', () => {
+describe('TicketComponents', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/request');
+        cy.visit('/#/ticket/1/components');
     });
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
+        /* ==== Generated with Cypress Studio ==== */
+        cy.get('.q-scrollarea__content > :nth-child(2) > :nth-child(2)').should(
+            'have.text',
+            'Base to commission: €799.20',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(2) > :nth-child(3)').should(
+            'have.text',
+            'Total without VAT: €807.20',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(3) > :nth-child(2)').should(
+            'have.text',
+            'valor de compra: €425.000',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(3) > :nth-child(4)').should(
+            'have.text',
+            'maná auto: €7.998',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(2)').should(
+            'have.text',
+            'Price: €5.00',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(3)').should(
+            'have.text',
+            'Bonus: €1.00',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(5)').should(
+            'have.text',
+            'Packages: 6',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(4)').should(
+            'have.text',
+            'Zone: Zone pickup A ',
+        );
+        cy.get('.q-scrollarea__content > :nth-child(5) > :nth-child(2)').should(
+            'have.text',
+            'Total price: €16.00',
+        );
+        cy.get(':nth-child(4) > .link').click();
+
+        cy.dataCy('ZoneDescriptor').should('exist');
+        cy.get(':nth-child(1) > [data-col-field="total"]').should(
+            'have.text',
+            '€250.000€247.000€4.970',
+        );
+        cy.get(':nth-child(1) > [data-col-field="import"]').should(
+            'have.text',
+            '€50.000€49.400€0.994',
+        );
+        cy.get(':nth-child(1) > [data-col-field="components"]').should(
+            'have.text',
+            'valor de compramargenmaná auto',
+        );
+        cy.get(':nth-child(1) > [data-col-field="serie"]').should(
+            'have.text',
+            'costeempresacartera_comercial',
+        );
     });
 });
diff --git a/test/cypress/integration/ticket/ticketPackage.spec.js b/test/cypress/integration/ticket/ticketPackage.spec.js
index 1f54af5b1..e7980a413 100644
--- a/test/cypress/integration/ticket/ticketPackage.spec.js
+++ b/test/cypress/integration/ticket/ticketPackage.spec.js
@@ -1,12 +1,22 @@
 /// <reference types="cypress" />
-describe('TicketRequest', () => {
+describe('TicketPackages', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/request');
+        cy.visit('/#/ticket/31/package');
     });
 
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
+        cy.get('.vn-row > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('[data-cy="Package_select"]').click();
+        cy.get('.q-menu :nth-child(1) >.q-item__section').click();
+        cy.get('[data-cy="Quantity_input"]').clear();
+        cy.get('[data-cy="Quantity_input"]').type('5');
+        cy.get('[data-cy="crudModelDefaultSaveBtn"] > .q-btn__content').click();
+        cy.checkNotification('Data saved');
+        cy.get('.q-mb-md > .text-primary').click();
+        cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
+        cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketPictures.spec.js b/test/cypress/integration/ticket/ticketPictures.spec.js
index a2f4ad506..28ccd14d4 100644
--- a/test/cypress/integration/ticket/ticketPictures.spec.js
+++ b/test/cypress/integration/ticket/ticketPictures.spec.js
@@ -1,11 +1,18 @@
 /// <reference types="cypress" />
 describe('TicketRequest', () => {
     beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/31/picture');
     });
     it('Should load layout', () => {
-        cy.get('.q-page').should('be.visible');
+        cy.get(
+            ':nth-child(1) > .q-card > .img-wrapper > .q-img > .q-img__container > .q-img__image',
+        ).should('be.visible');
+        cy.get(':nth-child(1) > .q-card > .content').should('be.visible');
+        cy.get('.content > .link').should('be.visible').click();
+        cy.dataCy('ItemDescriptor').should('exist');
+        cy.get('[data-cy="vnLvColor:"]').should('be.visible');
+        cy.get('[data-cy="vnLvColor:"]').should('be.visible');
+        cy.get('[data-cy="vnLvTallos:"]').should('be.visible');
+        cy.get('.q-mt-md').should('be.visible');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketSaleTracking.spec.js b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
index 30ac79e0f..5ffcf9975 100644
--- a/test/cypress/integration/ticket/ticketSaleTracking.spec.js
+++ b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
@@ -1,12 +1,47 @@
 /// <reference types="cypress" />
+function uncheckedSVG(className, state) {
+    cy.get(`${className} .q-checkbox__svg`).should(
+        state === 'checked' ? 'not.have.attr' : 'have.attr',
+        'fill',
+        'none',
+    );
+}
+function checkedSVG(className, state) {
+    cy.get(`${className} .q-checkbox__svg> .q-checkbox__truthy`).should(
+        state === 'checked' ? 'not.have.attr' : 'have.attr',
+        'fill',
+        'none',
+    );
+}
 describe('TicketRequest', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/sale-tracking');
+        cy.visit('/#/ticket/1/sale-tracking');
     });
 
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
+        // Check checkbox states
+        uncheckedSVG('.pink', 'checked');
+        uncheckedSVG('.cyan', 'checked');
+        uncheckedSVG('.warning', 'checked');
+        uncheckedSVG('.info', 'checked');
+        checkedSVG('.yellow', 'unchecked');
+
+        cy.get('.q-page').click();
+        cy.get(
+            ':nth-child(1) > :nth-child(6) > :nth-child(2) > .q-btn__content > .q-icon',
+        ).click();
+        cy.get('.q-dialog__backdrop').click();
+        cy.get(
+            ':nth-child(1) > :nth-child(6) > :nth-child(1) > .q-btn__content > .q-icon',
+        ).click();
+        cy.get('.q-dialog__backdrop').click();
+        cy.get(
+            ':nth-child(1) > :nth-child(2) > div > .link > .q-btn > .q-btn__content',
+        ).click();
+
+        cy.dataCy('ItemDescriptor').should('exist');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketService.spec.js b/test/cypress/integration/ticket/ticketService.spec.js
index 35a126fc8..bb5257272 100644
--- a/test/cypress/integration/ticket/ticketService.spec.js
+++ b/test/cypress/integration/ticket/ticketService.spec.js
@@ -1,12 +1,24 @@
 /// <reference types="cypress" />
 describe('TicketRequest', () => {
     beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/31/service');
     });
 
-    it('Should load layout', () => {
+    it('Add and remove service', () => {
         cy.get('.q-page').should('be.visible');
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('[data-cy="Description_icon"]').click();
+        cy.get('[data-cy="Description_input"]').clear();
+        cy.get('[data-cy="Description_input"]').type('test');
+        cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
+        cy.selectOption('[data-cy="Description_select"]', 'test');
+
+        cy.get('[data-cy="Quantity_input"]').clear('1');
+        cy.get('[data-cy="Quantity_input"]').type('1');
+        cy.get('[data-cy="Price_input"]').clear('2');
+        cy.get('[data-cy="Price_input"]').type('2');
+        cy.get('[data-cy="crudModelDefaultSaveBtn"] > .q-btn__content > .block').click();
+        cy.checkNotification('Data saved');
+        cy.get(':nth-child(5) > .q-icon').click();
     });
 });
diff --git a/test/cypress/integration/ticket/ticketVolume.spec.js b/test/cypress/integration/ticket/ticketVolume.spec.js
index 7b3d890b8..2a1b254ce 100644
--- a/test/cypress/integration/ticket/ticketVolume.spec.js
+++ b/test/cypress/integration/ticket/ticketVolume.spec.js
@@ -1,12 +1,27 @@
 /// <reference types="cypress" />
+function checkRightLabel(index, value, tag = 'Volume: ') {
+    cy.get(`.q-scrollarea__content > :nth-child(${index}) > :nth-child(2) > span`)
+        .should('be.visible')
+        .should('have.text', `${tag}${value}`);
+}
 describe('TicketRequest', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/volume');
+        cy.visit('/#/ticket/1/volume');
     });
 
-    it('Should load layout', () => {
+    it('Check right panel info', () => {
         cy.get('.q-page').should('be.visible');
+        checkRightLabel(2, '0.028');
+        checkRightLabel(3, '0.014');
+        checkRightLabel(4, '1.526');
+    });
+    it('Descriptors', () => {
+        cy.get(':nth-child(1) > [data-col-field="itemFk"]')
+            .find('span')
+            .should('have.class', 'link')
+            .click();
+        cy.dataCy('ItemDescriptor').should('exist');
     });
 });

From 73740822a35c72d579eb62f9170211500a483290 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Mar 2025 13:18:41 +0100
Subject: [PATCH 03/16] test: refs #7356 update ticket tracking components and
 remove unused TicketCreateTracking.vue

---
 src/pages/Claim/Card/ClaimSummaryAction.vue   |   4 +-
 .../Ticket/Card/TicketCreateTracking.vue      |  59 --------
 src/pages/Ticket/Card/TicketTracking.vue      | 135 +++++++++---------
 .../Worker/Card/WorkerDescriptorProxy.vue     |   2 +-
 .../integration/ticket/ticketTracking.spec.js |  19 ++-
 .../vnComponent/vnSelect.commands.js          |   3 +
 .../vnComponent/vnTable.commands.js           |   3 +
 test/cypress/support/commands.js              |   5 +
 8 files changed, 96 insertions(+), 134 deletions(-)
 delete mode 100644 src/pages/Ticket/Card/TicketCreateTracking.vue
 create mode 100644 test/cypress/integration/vnComponent/vnSelect.commands.js
 create mode 100644 test/cypress/integration/vnComponent/vnTable.commands.js

diff --git a/src/pages/Claim/Card/ClaimSummaryAction.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
index 577ac2a65..be3b9e896 100644
--- a/src/pages/Claim/Card/ClaimSummaryAction.vue
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -88,13 +88,13 @@ const columns = [
         auto-load
     >
         <template #column-itemFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
         </template>
         <template #column-ticketFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.ticketFk }}
                 <TicketDescriptorProxy :id="row.ticketFk" />
             </span>
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
deleted file mode 100644
index 5c1e916f2..000000000
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
-import FormModelPopup from 'components/FormModelPopup.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-
-import { useState } from 'src/composables/useState';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
-const emit = defineEmits(['onRequestCreated']);
-
-const route = useRoute();
-const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
-const stateFetchDataRef = ref(null);
-const statesOptions = ref([]);
-
-const onStateFkChange = (formData) => (formData.userFk = user.value.id);
-</script>
-<template>
-    <FetchData
-        ref="stateFetchDataRef"
-        url="States"
-        auto-load
-        @on-fetch="(data) => (statesOptions = data)"
-    />
-    <FormModelPopup
-        :title="t('Create tracking')"
-        url-create="Tickets/state"
-        model="CreateTicketTracking"
-        :form-initial-data="{ ticketFk: route.params.id }"
-        @on-data-saved="() => emit('onRequestCreated')"
-    >
-        <template #form-inputs="{ data }">
-            <VnRow>
-                <VnSelect
-                    v-model="data.stateFk"
-                    :label="t('ticketList.state')"
-                    :options="statesOptions"
-                    @update:model-value="onStateFkChange(data)"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                />
-                <VnSelectWorker v-model="data.userFk" :fields="['id', 'name']" />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-    es:
-        Create tracking: Crear estado
-</i18n>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 00610de44..4cfc49290 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -1,27 +1,31 @@
 <script setup>
-import { ref, computed, watch, reactive } from 'vue';
+import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import TicketCreateTracking from './TicketCreateTracking.vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import { useState } from 'src/composables/useState';
 
 import { toDateTimeFormat } from 'src/filters/date.js';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+const state = useState();
+
+const user = state.getUser();
 
 const route = useRoute();
 const { t } = useI18n();
-const createTrackingDialogRef = ref(null);
-const paginateRef = ref(null);
-
-watch(
-    () => route.params.id,
-    async (val) => {
-        paginateFilter.where.ticketFk = val;
-        paginateRef.value.fetch();
-    },
-);
+const tableRef = ref(null);
 
+// watch(
+//     () => route.params.id,
+//     async (val) => {
+//         paginateFilter.where.ticketFk = val;
+//         paginateRef.value.fetch();
+//     },
+// );
+const onStateFkChange = (formData) => (formData.userFk = user.value.id);
 const paginateFilter = reactive({
     include: [
         {
@@ -50,81 +54,74 @@ const paginateFilter = reactive({
     },
 });
 
-const columns = computed(() => [
+const columns = [
     {
         label: t('ticketList.state'),
         name: 'state',
         field: 'state',
         align: 'left',
-        format: (val) => val.name,
+        format: (row) => row.state?.name,
     },
     {
         label: t('expedition.worker'),
         name: 'worker',
         align: 'left',
+        field: 'user',
     },
     {
         label: t('expedition.created'),
         name: 'created',
         field: 'created',
         align: 'left',
-        format: (val) => toDateTimeFormat(val),
+        format: (row) => toDateTimeFormat(row.created),
     },
-]);
-
-const openCreateModal = () => createTrackingDialogRef.value.show();
+];
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md">
-        <VnPaginate
-            ref="paginateRef"
-            data-key="TicketTracking"
-            :user-filter="paginateFilter"
-            search-url="table"
-            url="TicketTrackings"
-            auto-load
-            order="created DESC"
-            :limit="0"
-        >
-            <template #body="{ rows }">
-                <QTable
-                    :rows="rows"
-                    :columns="columns"
-                    row-key="id"
-                    :pagination="{ rowsPerPage: 0 }"
-                    class="full-width q-mt-md"
-                    :no-data-label="t('globals.noResults')"
-                >
-                    <template #body-cell-worker="{ row }">
-                        <QTd>
-                            <QBtn flat class="link" @click.stop>
-                                {{ row.user?.name }}
-                                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
-                            </QBtn>
-                        </QTd>
-                    </template>
-                </QTable>
-            </template>
-        </VnPaginate>
-        <QDialog
-            ref="createTrackingDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <TicketCreateTracking @on-request-created="paginateRef.fetch()" />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn
-                @click="openCreateModal()"
-                color="primary"
-                fab
-                icon="add"
-                v-shortcut="'+'"
+    <VnTable
+        ref="tableRef"
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true, table: true }"
+        :search-url="false"
+        :columns="columns"
+        data-key="TicketTracking"
+        :user-filter="paginateFilter"
+        url="TicketTrackings"
+        auto-load
+        order="created DESC"
+        :limit="0"
+        :without-header="true"
+        :create="{
+            urlCreate: 'Tickets/state',
+            title: t('Create tracking'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {
+                ticketFk: route.params.id,
+            },
+        }"
+    >
+        <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="States"
+                v-model="data.stateFk"
+                :label="t('ticketList.state')"
+                auto-load
+                @update:model-value="onStateFkChange(data)"
+                hide-selected
             />
-            <QTooltip class="text-no-wrap">
-                {{ t('tracking.addState') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+            <VnSelectWorker v-model="data.userFk" :fields="['id', 'name']" />
+        </template>
+        <template #column-worker="{ row }">
+            <span class="link" @click.stop>
+                {{ row.user.name }}
+                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
+            </span>
+        </template>
+    </VnTable>
 </template>
+<i18n>
+    es:
+        Create tracking: Crear estado
+</i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptorProxy.vue b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
index 5f71abbea..baa9aa571 100644
--- a/src/pages/Worker/Card/WorkerDescriptorProxy.vue
+++ b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
@@ -11,7 +11,7 @@ const $props = defineProps({
 </script>
 
 <template>
-    <QPopupProxy>
+    <QPopupProxy data-cy="WorkerDescriptor">
         <WorkerDescriptor
             v-if="$props.id"
             :id="$props.id"
diff --git a/test/cypress/integration/ticket/ticketTracking.spec.js b/test/cypress/integration/ticket/ticketTracking.spec.js
index 1f54af5b1..53bf6704e 100644
--- a/test/cypress/integration/ticket/ticketTracking.spec.js
+++ b/test/cypress/integration/ticket/ticketTracking.spec.js
@@ -1,12 +1,25 @@
 /// <reference types="cypress" />
-describe('TicketRequest', () => {
+describe('Ticket tracking', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/request');
+        cy.visit('/#/ticket/31/tracking');
     });
 
-    it('Should load layout', () => {
+    it('Add new tracking', () => {
         cy.get('.q-page').should('be.visible');
+
+        cy.firstRow('worker').find('span').should('have.class', 'link').click();
+        cy.dataCy('WorkerDescriptor').should('exist');
+        cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
+        cy.selectOption('.q-field--float [data-cy="State_select"]', 'OK').click();
+        cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
+        cy.get(
+            ':last-child > [data-col-field="state"] > [data-cy="vnTableCell_state"]',
+        ).should('have.text', 'OK');
+        cy.get(':last-child > [data-col-field="worker"]').should(
+            'have.text',
+            'developer ',
+        );
     });
 });
diff --git a/test/cypress/integration/vnComponent/vnSelect.commands.js b/test/cypress/integration/vnComponent/vnSelect.commands.js
new file mode 100644
index 000000000..017b6e7ea
--- /dev/null
+++ b/test/cypress/integration/vnComponent/vnSelect.commands.js
@@ -0,0 +1,3 @@
+Cypress.Commands.add('clickOption', (index = 1) =>
+    cy.get(`.q-menu :nth-child(${index}) >.q-item__section`).click(),
+);
diff --git a/test/cypress/integration/vnComponent/vnTable.commands.js b/test/cypress/integration/vnComponent/vnTable.commands.js
new file mode 100644
index 000000000..15cbf6f9a
--- /dev/null
+++ b/test/cypress/integration/vnComponent/vnTable.commands.js
@@ -0,0 +1,3 @@
+Cypress.Commands.add('firstRow', (field, index = 1) =>
+    cy.get(`:nth-child(${index}) > [data-col-field="${field}"]`),
+);
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 7f5203547..7ed6ef238 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -29,7 +29,12 @@
 // import { registerCommands } from '@quasar/quasar-app-extension-testing-e2e-cypress';
 import moment from 'moment';
 import waitUntil from './waitUntil';
+// Importar dinámicamente todos los archivos con el sufijo .commands.js dentro de la carpeta src/test/cypress/integration
+const requireCommands = require.context('../integration', true, /\.commands\.js$/);
+// Iterar sobre cada archivo y requerirlo
+requireCommands.keys().forEach(requireCommands);
 
+// Common comma
 Cypress.Commands.add('waitUntil', { prevSubject: 'optional' }, waitUntil);
 
 Cypress.Commands.add('resetDB', () => {

From 2190a0c17dc7d5b6ba65deaf3b20cb548e8d9ef1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Mar 2025 14:41:44 +0100
Subject: [PATCH 04/16] test: refs #7356 removing unused mapper functions and
 updating default mapper logic

---
 src/components/FormModel.vue                  | 20 ++++-----
 src/pages/Customer/Card/CustomerBasicData.vue |  7 +---
 .../Customer/Card/CustomerFiscalData.vue      |  7 ----
 .../components/CustomerNewPayment.vue         | 12 ------
 .../Ticket/Card/BasicData/TicketBasicData.vue | 10 ++---
 .../Card/BasicData/TicketBasicDataView.vue    |  8 ++--
 .../ticket/ticketBasicData.spec.js            | 42 ++++++++++++++++++-
 .../integration/ticket/ticketSms.spec.js      | 12 +++++-
 8 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index c4d9a4149..663764ee6 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -69,7 +69,12 @@ const $props = defineProps({
     },
     mapper: {
         type: Function,
-        default: null,
+        default: (formData, originalData) => {
+            return getUpdatedValues(
+                Object.keys(getDifferences(formData, originalData)),
+                formData,
+            );
+        },
     },
     clearStoreOnUnmount: {
         type: Boolean,
@@ -221,9 +226,7 @@ async function save() {
     isLoading.value = true;
     try {
         formData.value = trimData(formData.value);
-        const body = $props.mapper
-            ? $props.mapper(formData.value, originalData.value)
-            : formData.value;
+        const body = $props.mapper(formData.value, originalData.value);
         const method = $props.urlCreate ? 'post' : 'patch';
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
@@ -289,12 +292,7 @@ function trimData(data) {
     }
     return data;
 }
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
+
 async function onKeyup(evt) {
     if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
         const input = evt.target;
@@ -331,7 +329,7 @@ defineExpose({
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
-            :mapper="onBeforeSave"
+            :mapper="mapper"
         >
             <QCard>
                 <slot
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 9c9d1b50b..6d9110ed4 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -52,12 +52,7 @@ function onBeforeSave(formData, originalData) {
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
-    <FormModel
-        :url-update="`Clients/${route.params.id}`"
-        auto-load
-        :mapper="onBeforeSave"
-        model="Customer"
-    >
+    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 93909eb9c..518bf1242 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -31,12 +31,6 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
 
 async function checkEtChanges(data, _, originalData) {
     const equalizatedHasChanged = originalData.isEqualizated != data.isEqualizated;
@@ -75,7 +69,6 @@ async function acceptPropagate({ isEqualizated }) {
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
         model="Customer"
-        :mapper="onBeforeSave"
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index ac80fdaa4..5b351d598 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -103,17 +103,6 @@ const calculateFromDeliveredAmount = (event) => {
     initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
 };
 
-function onBeforeSave(data) {
-    const exceededAmount = data.amountPaid > maxAmount.value;
-    if (isCash.value && exceededAmount)
-        return notify(t('Amount exceeded', { maxAmount: maxAmount.value }), 'negative');
-
-    if (isCash.value && shouldSendEmail.value && !data.email)
-        return notify(t('There is no assigned email for this client'), 'negative');
-
-    return data;
-}
-
 async function onDataSaved(formData, { id }) {
     try {
         if (shouldSendEmail.value && isCash.value)
@@ -182,7 +171,6 @@ async function getAmountPaid() {
             ref="formModelRef"
             :form-initial-data="initialData"
             :url-create="urlCreate"
-            :mapper="onBeforeSave"
             @on-data-saved="onDataSaved"
             :prevent-submit="true"
         >
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 055c9a0ff..83c621b20 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -91,7 +91,7 @@ const totalPrice = computed(() => {
 const totalNewPrice = computed(() => {
     return rows.value.reduce(
         (acc, item) => acc + item.component.newPrice * item.quantity,
-        0
+        0,
     );
 });
 
@@ -210,18 +210,18 @@ onMounted(async () => {
         flat
     >
         <template #body-cell-item="{ row }">
-            <QTd @click.stop class="link">
-                <QBtn flat>
+            <QTd align="center">
+                <span @click.stop class="link">
                     {{ row.itemFk }}
                     <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
+                </span>
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
             <QTd style="min-width: 120px; max-width: 120px">
                 <div class="column q-pb-xs" style="min-width: 120px">
                     <span>{{ row.item.name }}</span>
-                    <FetchedTags :item="row.item" class="full-width" />
+                    <FetchedTags :item="row.item" class="full-width" :columns="6" />
                 </div>
             </QTd>
         </template>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 3c2fe95e5..23c73a0cf 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 
 import TicketBasicData from './TicketBasicData.vue';
 import TicketBasicDataForm from './TicketBasicDataForm.vue';
@@ -13,6 +13,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 
 const { notify } = useNotify();
 const router = useRouter();
+const route = useRoute();
 const { t } = useI18n();
 const stepperRef = ref(null);
 const { openConfirmationModal } = useVnConfirm();
@@ -21,6 +22,7 @@ const step = ref(1);
 const haveNegatives = ref(true);
 
 const ticket = computed(() => useArrayData('Ticket').store?.data);
+const entityId = computed(() => +route?.params?.id);
 
 const isFormInvalid = () => {
     return (
@@ -44,7 +46,7 @@ const getPriceDifference = async () => {
         shipped: ticket.value.shipped,
     };
     const { data } = await axios.post(
-        `tickets/${formData.value.id}/priceDifference`,
+        `tickets/${entityId.value}/priceDifference`,
         params,
     );
     ticket.value.sale = data;
@@ -71,7 +73,7 @@ const submit = async () => {
     };
 
     const { data } = await axios.post(
-        `tickets/${formData.value.id}/componentUpdate`,
+        `tickets/${entityId.value}/componentUpdate`,
         params,
     );
 
diff --git a/test/cypress/integration/ticket/ticketBasicData.spec.js b/test/cypress/integration/ticket/ticketBasicData.spec.js
index ac57e47e6..c5a8b0464 100644
--- a/test/cypress/integration/ticket/ticketBasicData.spec.js
+++ b/test/cypress/integration/ticket/ticketBasicData.spec.js
@@ -6,7 +6,47 @@ describe('TicketRequest', () => {
         cy.visit('/#/ticket/31/basic-data');
     });
 
-    it('Should load layout', () => {
+    it('Should redirect to customer basic data', () => {
         cy.get('.q-page').should('be.visible');
+        cy.get(':nth-child(2) > div > .text-primary').click();
+        cy.get('[data-cy="Address_select"]').click();
+        cy.get('.q-btn-group > [data-v-d4506789=""] > .q-btn__content > .q-icon').click();
+        cy.get(
+            '[data-cy="CustomerBasicData-menu-item"] > .q-item__section--main',
+        ).click();
+        cy.url().should('include', '/customer/1104/basic-data');
+    });
+    it.only('stepper', () => {
+        cy.get('.q-stepper__tab--active').should('have.class', 'q-stepper__tab--active');
+
+        cy.get('.q-stepper__nav > .q-btn--standard').click();
+        cy.get('.q-stepper__tab--done').should('have.class', 'q-stepper__tab--done');
+        cy.get('.q-stepper__tab--active').should('have.class', 'q-stepper__tab--active');
+        cy.get('tr:nth-child(1)>:nth-child(1)>span').should('have.class', 'link').click();
+        cy.dataCy('ItemDescriptor').should('exist');
+        cy.get('.q-drawer__content > :nth-child(1) > :nth-child(2) > span').should(
+            'have.text',
+            'Price: €34.40',
+        );
+        cy.get('.q-drawer__content > :nth-child(1) > :nth-child(3) > span').should(
+            'have.text',
+            'New price: €34.20',
+        );
+        cy.get('.q-drawer__content > :nth-child(1) > :nth-child(4) > span').should(
+            'have.text',
+            'Difference: €0.20',
+        );
+        cy.get(
+            ':nth-child(3) > .q-radio > .q-radio__inner > .q-radio__bg > .q-radio__check',
+        ).should('have.class', 'q-radio__check');
+        cy.get(
+            '.q-stepper__step-inner > .q-drawer-container > .q-drawer > .q-drawer__content',
+        ).click();
+        cy.get(':nth-child(2) > :nth-child(1) > .text-weight-bold').click();
+        cy.get(':nth-child(3) > .q-radio > .q-radio__inner').should(
+            'have.class',
+            'q-radio__inner--truthy',
+        );
+        cy.get('.q-drawer__content > :nth-child(2)').click();
     });
 });
diff --git a/test/cypress/integration/ticket/ticketSms.spec.js b/test/cypress/integration/ticket/ticketSms.spec.js
index 69a48b341..0978898d9 100644
--- a/test/cypress/integration/ticket/ticketSms.spec.js
+++ b/test/cypress/integration/ticket/ticketSms.spec.js
@@ -3,10 +3,20 @@ describe('TicketRequest', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/sms');
+        cy.visit('/#/ticket/32/sms');
     });
 
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
+        cy.get('.q-infinite-scroll > :nth-child(1)').should(
+            'have.text',
+            '0004 444444444Lorem ipsum dolor sit amet, consectetur adipiscing elit.2001-01-01 00:00:00OK',
+        );
+        cy.get(
+            ':nth-child(1) > .q-item > .q-item__section--top > .column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image',
+        ).should('have.class', 'q-img__image--loaded');
+        cy.get(
+            ':nth-child(1) > .q-item > .q-item__section--side.justify-center > .center > .q-chip > .q-chip__content',
+        ).should('have.class', 'q-chip__content');
     });
 });

From 1be8e65fa11615db95aa9915574c2e84cf55f005 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Mar 2025 15:02:18 +0100
Subject: [PATCH 05/16] revert: refs #7356 update default mapper logic to
 handle null values and refactor onBeforeSave function

---
 src/components/FormModel.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 663764ee6..c4d9a4149 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -69,12 +69,7 @@ const $props = defineProps({
     },
     mapper: {
         type: Function,
-        default: (formData, originalData) => {
-            return getUpdatedValues(
-                Object.keys(getDifferences(formData, originalData)),
-                formData,
-            );
-        },
+        default: null,
     },
     clearStoreOnUnmount: {
         type: Boolean,
@@ -226,7 +221,9 @@ async function save() {
     isLoading.value = true;
     try {
         formData.value = trimData(formData.value);
-        const body = $props.mapper(formData.value, originalData.value);
+        const body = $props.mapper
+            ? $props.mapper(formData.value, originalData.value)
+            : formData.value;
         const method = $props.urlCreate ? 'post' : 'patch';
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
@@ -292,7 +289,12 @@ function trimData(data) {
     }
     return data;
 }
-
+function onBeforeSave(formData, originalData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(formData, originalData)),
+        formData,
+    );
+}
 async function onKeyup(evt) {
     if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
         const input = evt.target;
@@ -329,7 +331,7 @@ defineExpose({
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
-            :mapper="mapper"
+            :mapper="onBeforeSave"
         >
             <QCard>
                 <slot

From fbe3eae670d2692e9c3c1de28b18de4a62ecb848 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Mar 2025 09:39:30 +0100
Subject: [PATCH 06/16] test: refs #7356 fix ticket*.spec.js

---
 .../cypress/integration/ticket/ticketBasicData.spec.js |  2 +-
 test/cypress/integration/ticket/ticketPictures.spec.js | 10 ++++++----
 .../integration/ticket/ticketSaleTracking.spec.js      |  2 +-
 test/cypress/integration/ticket/ticketService.spec.js  |  6 ++++--
 test/cypress/integration/ticket/ticketSms.spec.js      |  4 ++--
 test/cypress/integration/ticket/ticketVolume.spec.js   |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketBasicData.spec.js b/test/cypress/integration/ticket/ticketBasicData.spec.js
index c5a8b0464..b029e0229 100644
--- a/test/cypress/integration/ticket/ticketBasicData.spec.js
+++ b/test/cypress/integration/ticket/ticketBasicData.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('TicketRequest', () => {
+describe('TicketBasicData', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
diff --git a/test/cypress/integration/ticket/ticketPictures.spec.js b/test/cypress/integration/ticket/ticketPictures.spec.js
index 28ccd14d4..26edbc3ac 100644
--- a/test/cypress/integration/ticket/ticketPictures.spec.js
+++ b/test/cypress/integration/ticket/ticketPictures.spec.js
@@ -1,12 +1,11 @@
 /// <reference types="cypress" />
-describe('TicketRequest', () => {
+describe('TicketPictures', () => {
     beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/31/picture');
     });
     it('Should load layout', () => {
-        cy.get(
-            ':nth-child(1) > .q-card > .img-wrapper > .q-img > .q-img__container > .q-img__image',
-        ).should('be.visible');
         cy.get(':nth-child(1) > .q-card > .content').should('be.visible');
         cy.get('.content > .link').should('be.visible').click();
         cy.dataCy('ItemDescriptor').should('exist');
@@ -14,5 +13,8 @@ describe('TicketRequest', () => {
         cy.get('[data-cy="vnLvColor:"]').should('be.visible');
         cy.get('[data-cy="vnLvTallos:"]').should('be.visible');
         cy.get('.q-mt-md').should('be.visible');
+        cy.get(
+            ':nth-child(1) > .q-card > .img-wrapper > .q-img > .q-img__container > .q-img__image',
+        ).should('be.visible');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketSaleTracking.spec.js b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
index 5ffcf9975..78f17f771 100644
--- a/test/cypress/integration/ticket/ticketSaleTracking.spec.js
+++ b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
@@ -13,7 +13,7 @@ function checkedSVG(className, state) {
         'none',
     );
 }
-describe('TicketRequest', () => {
+describe('TicketSaleTracking', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
diff --git a/test/cypress/integration/ticket/ticketService.spec.js b/test/cypress/integration/ticket/ticketService.spec.js
index bb5257272..4ffc7f731 100644
--- a/test/cypress/integration/ticket/ticketService.spec.js
+++ b/test/cypress/integration/ticket/ticketService.spec.js
@@ -1,12 +1,14 @@
 /// <reference types="cypress" />
-describe('TicketRequest', () => {
+describe('TicketService', () => {
     beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/31/service');
     });
 
     it('Add and remove service', () => {
         cy.get('.q-page').should('be.visible');
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.addBtnClick();
         cy.get('[data-cy="Description_icon"]').click();
         cy.get('[data-cy="Description_input"]').clear();
         cy.get('[data-cy="Description_input"]').type('test');
diff --git a/test/cypress/integration/ticket/ticketSms.spec.js b/test/cypress/integration/ticket/ticketSms.spec.js
index 0978898d9..75b30858b 100644
--- a/test/cypress/integration/ticket/ticketSms.spec.js
+++ b/test/cypress/integration/ticket/ticketSms.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('TicketRequest', () => {
+describe('TicketSms', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
@@ -9,7 +9,7 @@ describe('TicketRequest', () => {
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
         cy.get('.q-infinite-scroll > :nth-child(1)').should(
-            'have.text',
+            'contain.text',
             '0004 444444444Lorem ipsum dolor sit amet, consectetur adipiscing elit.2001-01-01 00:00:00OK',
         );
         cy.get(
diff --git a/test/cypress/integration/ticket/ticketVolume.spec.js b/test/cypress/integration/ticket/ticketVolume.spec.js
index 2a1b254ce..59ff6dcb2 100644
--- a/test/cypress/integration/ticket/ticketVolume.spec.js
+++ b/test/cypress/integration/ticket/ticketVolume.spec.js
@@ -4,7 +4,7 @@ function checkRightLabel(index, value, tag = 'Volume: ') {
         .should('be.visible')
         .should('have.text', `${tag}${value}`);
 }
-describe('TicketRequest', () => {
+describe('TicketVolume', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);

From 5a642f4c3a0c62a3f94e56c260a74d1debc261f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Mar 2025 19:46:56 +0100
Subject: [PATCH 07/16] fix: refs #7356 update reference value in
 routeAutonomous test

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

diff --git a/test/cypress/integration/route/routeAutonomous.spec.js b/test/cypress/integration/route/routeAutonomous.spec.js
index acf82bd95..a070a04d3 100644
--- a/test/cypress/integration/route/routeAutonomous.spec.js
+++ b/test/cypress/integration/route/routeAutonomous.spec.js
@@ -22,7 +22,7 @@ describe('RouteAutonomous', () => {
     };
 
     const data = {
-        reference: 'Test invoice',
+        reference: '1234',
         total: '€206.40',
         supplier: 'PLANTS SL',
         route: 'first route',

From e7a501f5289e9b1d429e0501a677cc2c8b1ac70d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Mar 2025 22:27:45 +0100
Subject: [PATCH 08/16] test: refs #7356 remove child class

---
 test/cypress/integration/ticket/ticketPictures.spec.js | 4 +---
 test/cypress/integration/ticket/ticketSms.spec.js      | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketPictures.spec.js b/test/cypress/integration/ticket/ticketPictures.spec.js
index 26edbc3ac..d8f48df32 100644
--- a/test/cypress/integration/ticket/ticketPictures.spec.js
+++ b/test/cypress/integration/ticket/ticketPictures.spec.js
@@ -13,8 +13,6 @@ describe('TicketPictures', () => {
         cy.get('[data-cy="vnLvColor:"]').should('be.visible');
         cy.get('[data-cy="vnLvTallos:"]').should('be.visible');
         cy.get('.q-mt-md').should('be.visible');
-        cy.get(
-            ':nth-child(1) > .q-card > .img-wrapper > .q-img > .q-img__container > .q-img__image',
-        ).should('be.visible');
+        cy.get(':nth-child(1) > .q-card > .img-wrapper').should('be.visible');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketSms.spec.js b/test/cypress/integration/ticket/ticketSms.spec.js
index 75b30858b..feafb2157 100644
--- a/test/cypress/integration/ticket/ticketSms.spec.js
+++ b/test/cypress/integration/ticket/ticketSms.spec.js
@@ -13,8 +13,8 @@ describe('TicketSms', () => {
             '0004 444444444Lorem ipsum dolor sit amet, consectetur adipiscing elit.2001-01-01 00:00:00OK',
         );
         cy.get(
-            ':nth-child(1) > .q-item > .q-item__section--top > .column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image',
-        ).should('have.class', 'q-img__image--loaded');
+            ':nth-child(1) > .q-item > .q-item__section--top > .column > .q-avatar',
+        ).should('be.visible');
         cy.get(
             ':nth-child(1) > .q-item > .q-item__section--side.justify-center > .center > .q-chip > .q-chip__content',
         ).should('have.class', 'q-chip__content');

From 59c08be80420e2c1cf849752a40f6b80e385d27e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 26 Mar 2025 21:27:48 +0100
Subject: [PATCH 09/16] test: refs #7356 add waitRequest

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

diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 5613a5854..44e5fe5a1 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -43,8 +43,9 @@ describe('TicketList', () => {
         cy.dataCy('Customer ID_input').clear('1');
         cy.dataCy('Customer ID_input').type('1101{enter}');
 
+        cy.intercept('GET', /\/api\/Clients\?filter/).as('clientFilter');
         cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
-        cy.waitSpinner();
+        cy.wait('@clientFilter');
         cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
         cy.dataCy('Address_select').click();
 

From 9492c71128b8ef27e43d55955ee48ef1679cd2d2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 27 Mar 2025 23:29:11 +0100
Subject: [PATCH 10/16] fix: refs #7356 remove bad code

---
 src/pages/Customer/Card/CustomerBasicData.vue    |  7 ++++++-
 src/pages/Customer/Card/CustomerFiscalData.vue   |  7 +++++++
 .../Customer/components/CustomerNewPayment.vue   | 12 ++++++++++++
 .../Card/BasicData/TicketBasicDataView.vue       |  4 +---
 src/pages/Ticket/Card/TicketTracking.vue         | 16 ++++------------
 src/pages/Zone/ZoneList.vue                      |  1 -
 .../integration/route/routeAutonomous.spec.js    |  2 +-
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 6d9110ed4..9c9d1b50b 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -52,7 +52,12 @@ function onBeforeSave(formData, originalData) {
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
-    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
+    <FormModel
+        :url-update="`Clients/${route.params.id}`"
+        auto-load
+        :mapper="onBeforeSave"
+        model="Customer"
+    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 518bf1242..93909eb9c 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -31,6 +31,12 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
+function onBeforeSave(formData, originalData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(formData, originalData)),
+        formData,
+    );
+}
 
 async function checkEtChanges(data, _, originalData) {
     const equalizatedHasChanged = originalData.isEqualizated != data.isEqualizated;
@@ -69,6 +75,7 @@ async function acceptPropagate({ isEqualizated }) {
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
         model="Customer"
+        :mapper="onBeforeSave"
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 5b351d598..ac80fdaa4 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -103,6 +103,17 @@ const calculateFromDeliveredAmount = (event) => {
     initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
 };
 
+function onBeforeSave(data) {
+    const exceededAmount = data.amountPaid > maxAmount.value;
+    if (isCash.value && exceededAmount)
+        return notify(t('Amount exceeded', { maxAmount: maxAmount.value }), 'negative');
+
+    if (isCash.value && shouldSendEmail.value && !data.email)
+        return notify(t('There is no assigned email for this client'), 'negative');
+
+    return data;
+}
+
 async function onDataSaved(formData, { id }) {
     try {
         if (shouldSendEmail.value && isCash.value)
@@ -171,6 +182,7 @@ async function getAmountPaid() {
             ref="formModelRef"
             :form-initial-data="initialData"
             :url-create="urlCreate"
+            :mapper="onBeforeSave"
             @on-data-saved="onDataSaved"
             :prevent-submit="true"
         >
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 286ce7dad..76191b099 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 
 import TicketBasicData from './TicketBasicData.vue';
 import TicketBasicDataForm from './TicketBasicDataForm.vue';
@@ -13,7 +13,6 @@ import { useArrayData } from 'src/composables/useArrayData';
 
 const { notify } = useNotify();
 const router = useRouter();
-const route = useRoute();
 const { t } = useI18n();
 const stepperRef = ref(null);
 const { openConfirmationModal } = useVnConfirm();
@@ -22,7 +21,6 @@ const step = ref(1);
 const haveNegatives = ref(true);
 
 const ticket = computed(() => useArrayData('Ticket').store?.data);
-const entityId = computed(() => +route?.params?.id);
 
 const isFormInvalid = () => {
     return (
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 4cfc49290..06171366d 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -17,14 +17,6 @@ const user = state.getUser();
 const route = useRoute();
 const { t } = useI18n();
 const tableRef = ref(null);
-
-// watch(
-//     () => route.params.id,
-//     async (val) => {
-//         paginateFilter.where.ticketFk = val;
-//         paginateRef.value.fetch();
-//     },
-// );
 const onStateFkChange = (formData) => (formData.userFk = user.value.id);
 const paginateFilter = reactive({
     include: [
@@ -54,7 +46,7 @@ const paginateFilter = reactive({
     },
 });
 
-const columns = [
+const columns = computed(() => [
     {
         label: t('ticketList.state'),
         name: 'state',
@@ -73,9 +65,9 @@ const columns = [
         name: 'created',
         field: 'created',
         align: 'left',
-        format: (row) => toDateTimeFormat(row.created),
+        format: ({ created }) => toDateTimeFormat(created),
     },
-];
+]);
 </script>
 
 <template>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 8d7c4a165..d86530fb3 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -260,7 +260,6 @@ const closeEventForm = () => {
                             onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
                             formInitialData: {},
                         }"
-                        table-height="85vh"
                         v-model:selected="selectedRows"
                         :table="{
                             'row-key': 'id',
diff --git a/test/cypress/integration/route/routeAutonomous.spec.js b/test/cypress/integration/route/routeAutonomous.spec.js
index 3c5c2cede..08fd7d7ea 100644
--- a/test/cypress/integration/route/routeAutonomous.spec.js
+++ b/test/cypress/integration/route/routeAutonomous.spec.js
@@ -22,7 +22,7 @@ describe.skip('RouteAutonomous', () => {
     };
 
     const data = {
-        reference: '1234',
+        reference: 'Test invoice',
         total: '€206.40',
         supplier: 'PLANTS SL',
         route: 'first route',

From bdfc1fa3091ef695bd108e41cea4356f720d60b9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 28 Mar 2025 00:25:27 +0100
Subject: [PATCH 11/16] test: refs #7356 clean commands

---
 .../ticket/ticketBasicData.spec.js            | 14 ++--
 .../ticket/ticketComponents.spec.js           | 69 +++++--------------
 .../integration/ticket/ticketList.spec.js     | 13 ++--
 .../integration/ticket/ticketNotes.spec.js    |  2 +-
 .../integration/ticket/ticketPackage.spec.js  |  9 ++-
 .../integration/ticket/ticketPictures.spec.js |  6 +-
 .../integration/ticket/ticketRequest.spec.js  |  3 +-
 .../integration/ticket/ticketSale.spec.js     | 24 ++++---
 .../integration/ticket/ticketService.spec.js  | 15 ++--
 .../integration/ticket/ticketTracking.spec.js |  6 +-
 .../vnComponent/crudModel.commands.js         |  3 +
 .../vnComponent/formModel.commands.js         |  3 +
 .../vnComponent/vnConfirm.commands.js         |  3 +
 .../vnComponent/vnTable.commands.js           | 17 ++++-
 test/cypress/support/commands.js              | 29 ++++++--
 15 files changed, 107 insertions(+), 109 deletions(-)
 create mode 100644 test/cypress/integration/vnComponent/crudModel.commands.js
 create mode 100644 test/cypress/integration/vnComponent/formModel.commands.js
 create mode 100644 test/cypress/integration/vnComponent/vnConfirm.commands.js

diff --git a/test/cypress/integration/ticket/ticketBasicData.spec.js b/test/cypress/integration/ticket/ticketBasicData.spec.js
index b029e0229..4a0ddce7d 100644
--- a/test/cypress/integration/ticket/ticketBasicData.spec.js
+++ b/test/cypress/integration/ticket/ticketBasicData.spec.js
@@ -9,7 +9,7 @@ describe('TicketBasicData', () => {
     it('Should redirect to customer basic data', () => {
         cy.get('.q-page').should('be.visible');
         cy.get(':nth-child(2) > div > .text-primary').click();
-        cy.get('[data-cy="Address_select"]').click();
+        cy.dataCy('Address_select').click();
         cy.get('.q-btn-group > [data-v-d4506789=""] > .q-btn__content > .q-icon').click();
         cy.get(
             '[data-cy="CustomerBasicData-menu-item"] > .q-item__section--main',
@@ -25,16 +25,16 @@ describe('TicketBasicData', () => {
         cy.get('tr:nth-child(1)>:nth-child(1)>span').should('have.class', 'link').click();
         cy.dataCy('ItemDescriptor').should('exist');
         cy.get('.q-drawer__content > :nth-child(1) > :nth-child(2) > span').should(
-            'have.text',
-            'Price: €34.40',
+            'contain.text',
+            'Price: €',
         );
         cy.get('.q-drawer__content > :nth-child(1) > :nth-child(3) > span').should(
-            'have.text',
-            'New price: €34.20',
+            'contain.text',
+            'New price: €',
         );
         cy.get('.q-drawer__content > :nth-child(1) > :nth-child(4) > span').should(
-            'have.text',
-            'Difference: €0.20',
+            'contain.text',
+            'Difference: €',
         );
         cy.get(
             ':nth-child(3) > .q-radio > .q-radio__inner > .q-radio__bg > .q-radio__check',
diff --git a/test/cypress/integration/ticket/ticketComponents.spec.js b/test/cypress/integration/ticket/ticketComponents.spec.js
index f5bfd144d..23dbf8bcd 100644
--- a/test/cypress/integration/ticket/ticketComponents.spec.js
+++ b/test/cypress/integration/ticket/ticketComponents.spec.js
@@ -1,4 +1,5 @@
 /// <reference types="cypress" />
+
 describe('TicketComponents', () => {
     beforeEach(() => {
         cy.login('developer');
@@ -7,61 +8,23 @@ describe('TicketComponents', () => {
     });
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
-        /* ==== Generated with Cypress Studio ==== */
-        cy.get('.q-scrollarea__content > :nth-child(2) > :nth-child(2)').should(
-            'have.text',
-            'Base to commission: €799.20',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(2) > :nth-child(3)').should(
-            'have.text',
-            'Total without VAT: €807.20',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(3) > :nth-child(2)').should(
-            'have.text',
-            'valor de compra: €425.000',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(3) > :nth-child(4)').should(
-            'have.text',
-            'maná auto: €7.998',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(2)').should(
-            'have.text',
-            'Price: €5.00',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(3)').should(
-            'have.text',
-            'Bonus: €1.00',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(5)').should(
-            'have.text',
-            'Packages: 6',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(4) > :nth-child(4)').should(
-            'have.text',
-            'Zone: Zone pickup A ',
-        );
-        cy.get('.q-scrollarea__content > :nth-child(5) > :nth-child(2)').should(
-            'have.text',
-            'Total price: €16.00',
-        );
+        cy.validateScrollContent([
+            { row: 2, col: 2, text: 'Base to commission: €799.20' },
+            { row: 2, col: 3, text: 'Total without VAT: €807.20' },
+            { row: 3, col: 2, text: 'valor de compra: €425.000' },
+            { row: 3, col: 4, text: 'maná auto: €7.998' },
+            { row: 4, col: 2, text: 'Price: €5.00' },
+            { row: 4, col: 3, text: 'Bonus: €1.00' },
+            { row: 4, col: 5, text: 'Packages: 6' },
+            { row: 4, col: 4, text: 'Zone: Zone pickup A ' },
+            { row: 5, col: 2, text: 'Total price: €16.00' },
+        ]);
         cy.get(':nth-child(4) > .link').click();
 
         cy.dataCy('ZoneDescriptor').should('exist');
-        cy.get(':nth-child(1) > [data-col-field="total"]').should(
-            'have.text',
-            '€250.000€247.000€4.970',
-        );
-        cy.get(':nth-child(1) > [data-col-field="import"]').should(
-            'have.text',
-            '€50.000€49.400€0.994',
-        );
-        cy.get(':nth-child(1) > [data-col-field="components"]').should(
-            'have.text',
-            'valor de compramargenmaná auto',
-        );
-        cy.get(':nth-child(1) > [data-col-field="serie"]').should(
-            'have.text',
-            'costeempresacartera_comercial',
-        );
+        cy.getRowCol('total').should('have.text', '€250.000€247.000€4.970');
+        cy.getRowCol('import').should('have.text', '€50.000€49.400€0.994');
+        cy.getRowCol('components').should('have.text', 'valor de compramargenmaná auto');
+        cy.getRowCol('serie').should('have.text', 'costeempresacartera_comercial');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 44e5fe5a1..e18025319 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,7 +1,5 @@
 /// <reference types="cypress" />
 describe('TicketList', () => {
-    const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
-
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
@@ -11,7 +9,7 @@ describe('TicketList', () => {
     const searchResults = (search) => {
         if (search) cy.typeSearchbar().type(search);
         cy.dataCy('vn-searchbar').find('input').type('{enter}');
-        cy.get(firstRow).should('exist');
+        cy.getRow().should('exist');
     };
 
     it('should search results', () => {
@@ -24,13 +22,13 @@ describe('TicketList', () => {
         cy.window().then((win) => {
             cy.stub(win, 'open').as('windowOpen');
         });
-        cy.get(firstRow).should('be.visible').find('.q-btn:first').click();
+        cy.getRow().should('be.visible').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.getRow().find('.q-btn:last').click();
         cy.get('.summaryHeader').should('exist');
         cy.get('.summaryBody').should('exist');
     });
@@ -44,7 +42,7 @@ describe('TicketList', () => {
         cy.dataCy('Customer ID_input').type('1101{enter}');
 
         cy.intercept('GET', /\/api\/Clients\?filter/).as('clientFilter');
-        cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
+        cy.vnTableCreateBtn();
         cy.wait('@clientFilter');
         cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
         cy.dataCy('Address_select').click();
@@ -53,8 +51,7 @@ describe('TicketList', () => {
         cy.dataCy('Address_select').should('have.value', 'Bruce Wayne');
     });
     it('Client list create new ticket', () => {
-        cy.dataCy('vnTableCreateBtn').should('exist');
-        cy.dataCy('vnTableCreateBtn').click();
+        cy.vnTableCreateBtn();
         const data = {
             Customer: { val: 1, type: 'select' },
             Warehouse: { val: 'Warehouse One', type: 'select' },
diff --git a/test/cypress/integration/ticket/ticketNotes.spec.js b/test/cypress/integration/ticket/ticketNotes.spec.js
index 5b44f9e1f..df1ff9137 100644
--- a/test/cypress/integration/ticket/ticketNotes.spec.js
+++ b/test/cypress/integration/ticket/ticketNotes.spec.js
@@ -19,7 +19,7 @@ describe('TicketNotes', () => {
         cy.checkNotification('Data saved');
         cy.dataCy('ticketNotesRemoveNoteBtn').should('exist');
         cy.dataCy('ticketNotesRemoveNoteBtn').click();
-        cy.dataCy('VnConfirm_confirm').click();
+        cy.confirmVnConfirm();
         cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketPackage.spec.js b/test/cypress/integration/ticket/ticketPackage.spec.js
index e7980a413..992efd53b 100644
--- a/test/cypress/integration/ticket/ticketPackage.spec.js
+++ b/test/cypress/integration/ticket/ticketPackage.spec.js
@@ -9,14 +9,13 @@ describe('TicketPackages', () => {
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
         cy.get('.vn-row > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('[data-cy="Package_select"]').click();
+        cy.dataCy('Package_select').click();
         cy.get('.q-menu :nth-child(1) >.q-item__section').click();
-        cy.get('[data-cy="Quantity_input"]').clear();
-        cy.get('[data-cy="Quantity_input"]').type('5');
-        cy.get('[data-cy="crudModelDefaultSaveBtn"] > .q-btn__content').click();
+        cy.dataCy('Quantity_input').clear().type('5');
+        cy.saveCrudModel();
         cy.checkNotification('Data saved');
         cy.get('.q-mb-md > .text-primary').click();
-        cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
+        cy.confirmVnConfirm();
         cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketPictures.spec.js b/test/cypress/integration/ticket/ticketPictures.spec.js
index d8f48df32..1165b54bf 100644
--- a/test/cypress/integration/ticket/ticketPictures.spec.js
+++ b/test/cypress/integration/ticket/ticketPictures.spec.js
@@ -9,9 +9,9 @@ describe('TicketPictures', () => {
         cy.get(':nth-child(1) > .q-card > .content').should('be.visible');
         cy.get('.content > .link').should('be.visible').click();
         cy.dataCy('ItemDescriptor').should('exist');
-        cy.get('[data-cy="vnLvColor:"]').should('be.visible');
-        cy.get('[data-cy="vnLvColor:"]').should('be.visible');
-        cy.get('[data-cy="vnLvTallos:"]').should('be.visible');
+        cy.dataCy('vnLvColor:');
+        cy.dataCy('vnLvColor:');
+        cy.dataCy('vnLvTallos:');
         cy.get('.q-mt-md').should('be.visible');
         cy.get(':nth-child(1) > .q-card > .img-wrapper').should('be.visible');
     });
diff --git a/test/cypress/integration/ticket/ticketRequest.spec.js b/test/cypress/integration/ticket/ticketRequest.spec.js
index b9dc509ef..3b237826e 100644
--- a/test/cypress/integration/ticket/ticketRequest.spec.js
+++ b/test/cypress/integration/ticket/ticketRequest.spec.js
@@ -7,8 +7,7 @@ describe('TicketRequest', () => {
     });
 
     it('Creates a new request', () => {
-        cy.dataCy('vnTableCreateBtn').should('exist');
-        cy.dataCy('vnTableCreateBtn').click();
+        cy.vnTableCreateBtn();
         const data = {
             Description: { val: 'Purchase description' },
             Atender: { val: 'buyerNick', type: 'select' },
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index 6d84f214c..97a5aeaf7 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -16,9 +16,11 @@ describe('TicketSale', () => {
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
             cy.waitForElement('[data-cy="Price_input"]');
-            cy.dataCy('Price_input').clear();
-            cy.dataCy('Price_input').type(price);
+            cy.dataCy('Price_input').clear().type(price);
+            cy.intercept('POST', '**/api').as('saveMana');
+
             cy.dataCy('saveManaBtn').click();
+            cy.wait('@saveMana').its('response.statusCode').should('eq', 200);
             handleVnConfirm();
 
             cy.get('[data-col-field="price"]')
@@ -34,7 +36,10 @@ describe('TicketSale', () => {
             cy.waitForElement('[data-cy="Disc_input"]');
             cy.dataCy('Disc_input').clear();
             cy.dataCy('Disc_input').type(discount);
+            cy.intercept('POST', '**/api').as('saveMana');
+
             cy.dataCy('saveManaBtn').click();
+            cy.wait('@saveMana').its('response.statusCode').should('eq', 200);
             handleVnConfirm();
 
             cy.get('[data-col-field="discount"]')
@@ -82,12 +87,12 @@ describe('TicketSale', () => {
             selectFirstRow();
             cy.dataCy('ticketSaleMoreActionsDropdown').click();
             cy.dataCy('createClaimItem').click();
-            cy.dataCy('VnConfirm_confirm').click();
+            cy.confirmVnConfirm();
             cy.url().should('contain', 'claim/');
             // Delete created claim to avoid cluttering the database
             cy.dataCy('descriptor-more-opts').click();
             cy.dataCy('deleteClaim').click();
-            cy.dataCy('VnConfirm_confirm').click();
+            cy.confirmVnConfirm();
         });
     });
     describe('Free ticket #31', () => {
@@ -138,8 +143,10 @@ describe('TicketSale', () => {
             cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
             cy.dataCy('ticketSaleDiscountInput').find('input').focus();
             cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
+            cy.intercept('POST', '**/api').as('saveMana');
+
             cy.dataCy('saveManaBtn').click();
-            cy.waitForElement('.q-notification__message');
+            cy.wait('@saveMana').its('response.statusCode').should('eq', 200);
             cy.checkNotification('Data saved');
             cy.dataCy('ticketSaleMoreActionsDropdown').should('be.disabled');
         });
@@ -148,7 +155,7 @@ describe('TicketSale', () => {
             selectFirstRow();
             cy.dataCy('ticketSaleMoreActionsDropdown').click();
             cy.dataCy('createClaimItem').click();
-            cy.dataCy('VnConfirm_confirm').click();
+            cy.confirmVnConfirm();
             cy.checkNotification('Future ticket date not allowed');
         });
 
@@ -194,9 +201,6 @@ function selectFirstRow() {
     cy.get(firstRow).find('.q-checkbox__inner').click();
 }
 function handleVnConfirm() {
-    cy.get('[data-cy="VnConfirm_confirm"]').click();
-    cy.waitForElement('.q-notification__message');
-
-    cy.get('.q-notification__message').should('be.visible');
+    cy.confirmVnConfirm();
     cy.checkNotification('Data saved');
 }
diff --git a/test/cypress/integration/ticket/ticketService.spec.js b/test/cypress/integration/ticket/ticketService.spec.js
index 4ffc7f731..5bf8e2aab 100644
--- a/test/cypress/integration/ticket/ticketService.spec.js
+++ b/test/cypress/integration/ticket/ticketService.spec.js
@@ -9,17 +9,14 @@ describe('TicketService', () => {
     it('Add and remove service', () => {
         cy.get('.q-page').should('be.visible');
         cy.addBtnClick();
-        cy.get('[data-cy="Description_icon"]').click();
-        cy.get('[data-cy="Description_input"]').clear();
-        cy.get('[data-cy="Description_input"]').type('test');
-        cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
+        cy.dataCy('Description_icon').click();
+        cy.dataCy('Description_input').clear().type('test');
+        cy.saveFormModel();
         cy.selectOption('[data-cy="Description_select"]', 'test');
 
-        cy.get('[data-cy="Quantity_input"]').clear('1');
-        cy.get('[data-cy="Quantity_input"]').type('1');
-        cy.get('[data-cy="Price_input"]').clear('2');
-        cy.get('[data-cy="Price_input"]').type('2');
-        cy.get('[data-cy="crudModelDefaultSaveBtn"] > .q-btn__content > .block').click();
+        cy.dataCy('Quantity_input').clear().type('1');
+        cy.dataCy('Price_input').clear().type('2');
+        cy.saveCrudModel();
         cy.checkNotification('Data saved');
         cy.get(':nth-child(5) > .q-icon').click();
     });
diff --git a/test/cypress/integration/ticket/ticketTracking.spec.js b/test/cypress/integration/ticket/ticketTracking.spec.js
index 53bf6704e..f351ee0a1 100644
--- a/test/cypress/integration/ticket/ticketTracking.spec.js
+++ b/test/cypress/integration/ticket/ticketTracking.spec.js
@@ -9,11 +9,11 @@ describe('Ticket tracking', () => {
     it('Add new tracking', () => {
         cy.get('.q-page').should('be.visible');
 
-        cy.firstRow('worker').find('span').should('have.class', 'link').click();
+        cy.getRowCol('worker').find('span').should('have.class', 'link').click();
         cy.dataCy('WorkerDescriptor').should('exist');
-        cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
+        cy.vnTableCreateBtn();
         cy.selectOption('.q-field--float [data-cy="State_select"]', 'OK').click();
-        cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
+        cy.saveFormModel();
         cy.get(
             ':last-child > [data-col-field="state"] > [data-cy="vnTableCell_state"]',
         ).should('have.text', 'OK');
diff --git a/test/cypress/integration/vnComponent/crudModel.commands.js b/test/cypress/integration/vnComponent/crudModel.commands.js
new file mode 100644
index 000000000..9d08f064a
--- /dev/null
+++ b/test/cypress/integration/vnComponent/crudModel.commands.js
@@ -0,0 +1,3 @@
+Cypress.Commands.add('saveCrudModel', () =>
+    cy.dataCy('crudModelDefaultSaveBtn').should('exist').click(),
+);
diff --git a/test/cypress/integration/vnComponent/formModel.commands.js b/test/cypress/integration/vnComponent/formModel.commands.js
new file mode 100644
index 000000000..2814b0091
--- /dev/null
+++ b/test/cypress/integration/vnComponent/formModel.commands.js
@@ -0,0 +1,3 @@
+Cypress.Commands.add('saveFormModel', () =>
+    cy.dataCy('FormModelPopup_save').should('exist').click(),
+);
diff --git a/test/cypress/integration/vnComponent/vnConfirm.commands.js b/test/cypress/integration/vnComponent/vnConfirm.commands.js
new file mode 100644
index 000000000..9f93967d6
--- /dev/null
+++ b/test/cypress/integration/vnComponent/vnConfirm.commands.js
@@ -0,0 +1,3 @@
+Cypress.Commands.add('confirmVnConfirm', () =>
+    cy.dataCy('VnConfirm_confirm').should('exist').click(),
+);
diff --git a/test/cypress/integration/vnComponent/vnTable.commands.js b/test/cypress/integration/vnComponent/vnTable.commands.js
index 15cbf6f9a..6c7e71e13 100644
--- a/test/cypress/integration/vnComponent/vnTable.commands.js
+++ b/test/cypress/integration/vnComponent/vnTable.commands.js
@@ -1,3 +1,16 @@
-Cypress.Commands.add('firstRow', (field, index = 1) =>
-    cy.get(`:nth-child(${index}) > [data-col-field="${field}"]`),
+Cypress.Commands.add('getRow', (index = 1) =>
+    cy.get(`.vnTable .q-virtual-scroll__content tr:nth-child(${index})`),
+);
+Cypress.Commands.add('getRowCol', (field, index = 1) =>
+    cy.get(
+        `.vnTable .q-virtual-scroll__content > :nth-child(${index}) > [data-col-field="${field}"]`,
+    ),
+);
+
+Cypress.Commands.add('vnTableCreateBtn', () =>
+    cy.dataCy('vnTableCreateBtn').should('exist').click(),
+);
+
+Cypress.Commands.add('waitTableScrollLoad', () =>
+    cy.waitForElement('[data-q-vs-anchor]'),
 );
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 7ed6ef238..fe0469f9e 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -429,8 +429,29 @@ Cypress.Commands.add('searchByLabel', (label, value) => {
     cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
 });
 
-Cypress.Commands.add('dataCy', (tag, attr = 'data-cy') => {
-    return cy.get(`[${attr}="${tag}"]`);
+Cypress.Commands.add('dataCy', (tag, attr = 'data-cy', options = {}) => {
+    let chain = cy.get(`[${attr}="${tag}"]`).should('be.visible');
+
+    // Procesar cada opción y encadenar los comandos correspondientes
+    Object.entries(options).forEach(([key, value]) => {
+        switch (key) {
+            case 'click':
+                if (value) chain = chain.click();
+                break;
+            case 'type':
+                chain = chain.type(value);
+                break;
+            case 'clear':
+                if (value) chain = chain.clear();
+                break;
+            case 'should':
+                chain = chain.should(value);
+                break;
+            // Puedes añadir más casos según necesites
+        }
+    });
+
+    return chain;
 });
 
 Cypress.Commands.add('addBtnClick', () => {
@@ -610,7 +631,3 @@ Cypress.Commands.add('checkQueryParams', (expectedParams = {}) => {
         }
     });
 });
-
-Cypress.Commands.add('waitTableScrollLoad', () =>
-    cy.waitForElement('[data-q-vs-anchor]'),
-);

From 4ae9b69e113bbdfb74c4ac2a11acbb73f6460abe Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 28 Mar 2025 00:38:47 +0100
Subject: [PATCH 12/16] test: refs #7356 clean commands

---
 src/pages/Zone/ZoneList.vue                        |  1 +
 test/cypress/integration/ticket/ticketSale.spec.js | 10 +++++-----
 test/cypress/support/commands.js                   |  9 +++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index d86530fb3..8d7c4a165 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -260,6 +260,7 @@ const closeEventForm = () => {
                             onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
                             formInitialData: {},
                         }"
+                        table-height="85vh"
                         v-model:selected="selectedRows"
                         :table="{
                             'row-key': 'id',
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index 97a5aeaf7..f475728c5 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -2,9 +2,9 @@
 const firstRow = 'tbody > :nth-child(1)';
 
 describe('TicketSale', () => {
-    describe('Ticket  #23', () => {
+    describe('#23', () => {
         beforeEach(() => {
-            cy.login('developer');
+            cy.login('salesPerson');
             cy.viewport(1920, 1080);
             cy.visit('/#/ticket/23/sale');
         });
@@ -76,7 +76,7 @@ describe('TicketSale', () => {
                 .should('have.value', `${quantity}`);
         });
     });
-    describe('Ticket to add claim #24', () => {
+    describe('#24 add claim', () => {
         beforeEach(() => {
             cy.login('developer');
             cy.viewport(1920, 1080);
@@ -95,7 +95,7 @@ describe('TicketSale', () => {
             cy.confirmVnConfirm();
         });
     });
-    describe('Free ticket #31', () => {
+    describe('#31 free ticket', () => {
         beforeEach(() => {
             cy.login('developer');
             cy.viewport(1920, 1080);
@@ -180,7 +180,7 @@ describe('TicketSale', () => {
             cy.url().should('match', /\/ticket\/31\/log/);
         });
     });
-    describe('Ticket to transfer #32', () => {
+    describe('#32 transfer', () => {
         beforeEach(() => {
             cy.login('developer');
             cy.viewport(1920, 1080);
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index fe0469f9e..1504283da 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -631,3 +631,12 @@ Cypress.Commands.add('checkQueryParams', (expectedParams = {}) => {
         }
     });
 });
+
+Cypress.Commands.add('validateScrollContent', (validations) => {
+    validations.forEach(({ row, col, text }) => {
+        cy.get(`.q-scrollarea__content > :nth-child(${row}) > :nth-child(${col})`).should(
+            'have.text',
+            text,
+        );
+    });
+});

From 426438051cd496fc185f67f99e950d749f1e0386 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 31 Mar 2025 13:20:41 +0200
Subject: [PATCH 13/16] test: refs #7356 update command

---
 .../ticket/ticketBasicData.spec.js            | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketBasicData.spec.js b/test/cypress/integration/ticket/ticketBasicData.spec.js
index 4a0ddce7d..443e9569b 100644
--- a/test/cypress/integration/ticket/ticketBasicData.spec.js
+++ b/test/cypress/integration/ticket/ticketBasicData.spec.js
@@ -10,7 +10,7 @@ describe('TicketBasicData', () => {
         cy.get('.q-page').should('be.visible');
         cy.get(':nth-child(2) > div > .text-primary').click();
         cy.dataCy('Address_select').click();
-        cy.get('.q-btn-group > [data-v-d4506789=""] > .q-btn__content > .q-icon').click();
+        cy.get('.q-btn-group ').find('.q-btn__content > .q-icon').click();
         cy.get(
             '[data-cy="CustomerBasicData-menu-item"] > .q-item__section--main',
         ).click();
@@ -24,18 +24,12 @@ describe('TicketBasicData', () => {
         cy.get('.q-stepper__tab--active').should('have.class', 'q-stepper__tab--active');
         cy.get('tr:nth-child(1)>:nth-child(1)>span').should('have.class', 'link').click();
         cy.dataCy('ItemDescriptor').should('exist');
-        cy.get('.q-drawer__content > :nth-child(1) > :nth-child(2) > span').should(
-            'contain.text',
-            'Price: €',
-        );
-        cy.get('.q-drawer__content > :nth-child(1) > :nth-child(3) > span').should(
-            'contain.text',
-            'New price: €',
-        );
-        cy.get('.q-drawer__content > :nth-child(1) > :nth-child(4) > span').should(
-            'contain.text',
-            'Difference: €',
-        );
+
+        cy.get('.q-drawer__content > :nth-child(1)').each(() => {
+            cy.get('span').should('contain.text', 'Price: €');
+            cy.get('span').should('contain.text', 'New price: €');
+            cy.get('span').should('contain.text', 'Difference: €');
+        });
         cy.get(
             ':nth-child(3) > .q-radio > .q-radio__inner > .q-radio__bg > .q-radio__check',
         ).should('have.class', 'q-radio__check');

From 20f3525e502464076a62b751a79504d0916f5db7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 2 Apr 2025 13:23:00 +0200
Subject: [PATCH 14/16] revert: refs #7356 command dataCy proposal

---
 test/cypress/support/commands.js | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 1504283da..41f91e855 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -429,29 +429,8 @@ Cypress.Commands.add('searchByLabel', (label, value) => {
     cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
 });
 
-Cypress.Commands.add('dataCy', (tag, attr = 'data-cy', options = {}) => {
-    let chain = cy.get(`[${attr}="${tag}"]`).should('be.visible');
-
-    // Procesar cada opción y encadenar los comandos correspondientes
-    Object.entries(options).forEach(([key, value]) => {
-        switch (key) {
-            case 'click':
-                if (value) chain = chain.click();
-                break;
-            case 'type':
-                chain = chain.type(value);
-                break;
-            case 'clear':
-                if (value) chain = chain.clear();
-                break;
-            case 'should':
-                chain = chain.should(value);
-                break;
-            // Puedes añadir más casos según necesites
-        }
-    });
-
-    return chain;
+Cypress.Commands.add('dataCy', (tag, attr = 'data-cy') => {
+    return cy.get(`[${attr}="${tag}"]`);
 });
 
 Cypress.Commands.add('addBtnClick', () => {

From 21c9abf2735a1ba7ae60dfb83a3bf7958f322d2d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 2 Apr 2025 13:30:50 +0200
Subject: [PATCH 15/16] test: refs #7356 fix test ticketSale

---
 .../integration/ticket/ticketSale.spec.js     | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index f475728c5..f433f0d11 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -4,7 +4,7 @@ const firstRow = 'tbody > :nth-child(1)';
 describe('TicketSale', () => {
     describe('#23', () => {
         beforeEach(() => {
-            cy.login('salesPerson');
+            cy.login('salesBoss');
             cy.viewport(1920, 1080);
             cy.visit('/#/ticket/23/sale');
         });
@@ -17,11 +17,11 @@ describe('TicketSale', () => {
             cy.dataCy('ticketEditManaProxy').should('exist');
             cy.waitForElement('[data-cy="Price_input"]');
             cy.dataCy('Price_input').clear().type(price);
-            cy.intercept('POST', '**/api').as('saveMana');
+            cy.intercept('POST', /\/api\/Sales\/\d+\/updatePrice/).as('updatePrice');
 
             cy.dataCy('saveManaBtn').click();
-            cy.wait('@saveMana').its('response.statusCode').should('eq', 200);
             handleVnConfirm();
+            cy.wait('@updatePrice').its('response.statusCode').should('eq', 200);
 
             cy.get('[data-col-field="price"]')
                 .find('.q-btn > .q-btn__content')
@@ -34,13 +34,14 @@ describe('TicketSale', () => {
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
             cy.waitForElement('[data-cy="Disc_input"]');
-            cy.dataCy('Disc_input').clear();
-            cy.dataCy('Disc_input').type(discount);
-            cy.intercept('POST', '**/api').as('saveMana');
+            cy.dataCy('Disc_input').clear().type(discount);
+            cy.intercept('POST', /\/api\/Tickets\/\d+\/updateDiscount/).as(
+                'updateDiscount',
+            );
 
             cy.dataCy('saveManaBtn').click();
-            cy.wait('@saveMana').its('response.statusCode').should('eq', 200);
             handleVnConfirm();
+            cy.wait('@updateDiscount').its('response.statusCode').should('eq', 204);
 
             cy.get('[data-col-field="discount"]')
                 .find('.q-btn > .q-btn__content')
@@ -51,6 +52,8 @@ describe('TicketSale', () => {
             const concept = Math.floor(Math.random() * 100) + 1;
             cy.waitForElement(firstRow);
             cy.get('[data-col-field="item"]').click();
+            cy.intercept('POST', '**/api').as('postRequest');
+
             cy.get('.q-menu')
                 .find('[data-cy="undefined_input"]')
                 .type(concept)
@@ -63,6 +66,8 @@ describe('TicketSale', () => {
             const quantity = Math.floor(Math.random() * 100) + 1;
             cy.waitForElement(firstRow);
             cy.dataCy('ticketSaleQuantityInput').find('input').clear();
+            cy.intercept('POST', '**/api').as('postRequest');
+
             cy.dataCy('ticketSaleQuantityInput')
                 .find('input')
                 .type(quantity)
@@ -134,7 +139,9 @@ describe('TicketSale', () => {
             cy.dataCy('ticketSaleMoreActionsDropdown').should('be.disabled');
         });
 
-        it('should update discount when "Update discount" is clicked', () => {
+        it.only('should update discount when "Update discount" is clicked', () => {
+            const discount = Number((Math.random() * 99 + 1).toFixed(2));
+
             selectFirstRow();
             cy.dataCy('ticketSaleMoreActionsDropdown').click();
             cy.waitForElement('[data-cy="updateDiscountItem"]');
@@ -142,11 +149,13 @@ describe('TicketSale', () => {
             cy.dataCy('updateDiscountItem').click();
             cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
             cy.dataCy('ticketSaleDiscountInput').find('input').focus();
-            cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
-            cy.intercept('POST', '**/api').as('saveMana');
+            cy.intercept('POST', /\/api\/Tickets\/\d+\/updateDiscount/).as(
+                'updateDiscount',
+            );
+            cy.dataCy('ticketSaleDiscountInput').find('input').type(discount);
 
             cy.dataCy('saveManaBtn').click();
-            cy.wait('@saveMana').its('response.statusCode').should('eq', 200);
+            cy.wait('@updateDiscount').its('response.statusCode').should('eq', 204);
             cy.checkNotification('Data saved');
             cy.dataCy('ticketSaleMoreActionsDropdown').should('be.disabled');
         });
@@ -202,5 +211,6 @@ function selectFirstRow() {
 }
 function handleVnConfirm() {
     cy.confirmVnConfirm();
+
     cy.checkNotification('Data saved');
 }

From 6df58d021a8094e280d3687052ffed9254b395c2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 2 Apr 2025 15:25:27 +0200
Subject: [PATCH 16/16] test: refs #7356 ticketSaleTracking

---
 .../integration/ticket/ticketSaleTracking.spec.js  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketSaleTracking.spec.js b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
index 78f17f771..9ee9f8824 100644
--- a/test/cypress/integration/ticket/ticketSaleTracking.spec.js
+++ b/test/cypress/integration/ticket/ticketSaleTracking.spec.js
@@ -13,6 +13,13 @@ function checkedSVG(className, state) {
         'none',
     );
 }
+
+function clickIconAndCloseDialog(n) {
+    cy.get(
+        `:nth-child(1) > :nth-child(6) > :nth-child(${n}) > .q-btn__content > .q-icon`,
+    ).click();
+}
+
 describe('TicketSaleTracking', () => {
     beforeEach(() => {
         cy.login('developer');
@@ -33,15 +40,14 @@ describe('TicketSaleTracking', () => {
         cy.get(
             ':nth-child(1) > :nth-child(6) > :nth-child(2) > .q-btn__content > .q-icon',
         ).click();
-        cy.get('.q-dialog__backdrop').click();
+        cy.get('body').type('{esc}');
         cy.get(
             ':nth-child(1) > :nth-child(6) > :nth-child(1) > .q-btn__content > .q-icon',
         ).click();
-        cy.get('.q-dialog__backdrop').click();
         cy.get(
-            ':nth-child(1) > :nth-child(2) > div > .link > .q-btn > .q-btn__content',
+            '.q-dialog__inner > .q-table__container   :nth-child(1) > :nth-child(2) .link.q-btn',
         ).click();
 
-        cy.dataCy('ItemDescriptor').should('exist');
+        cy.dataCy('WorkerDescriptor').should('exist');
     });
 });