Merge branch 'dev' into 8612-shelvinge2e

src/pages/Claim/Card/ClaimPhoto.vue

@@ -210,6 +210,7 @@ function onDrag() {
                     class="all-pointer-events absolute delete-button zindex"
                     @click.stop="viewDeleteDms(index)"
                     round
+                    :data-cy="`delete-button-${index+1}`"
                 />
                 <QIcon
                     name="play_circle"
@@ -227,6 +228,7 @@ function onDrag() {
                         class="rounded-borders cursor-pointer fit"
                         @click="openDialog(media.dmsFk)"
                         v-if="!media.isVideo"
+                        :data-cy="`file-${index+1}`"
                     >
                     </QImg>
                     <video
@@ -235,6 +237,7 @@ function onDrag() {
                         muted="muted"
                         v-if="media.isVideo"
                         @click="openDialog(media.dmsFk)"
+                        :data-cy="`file-${index+1}`"
                     />
                 </QCard>
             </div>

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -118,14 +118,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Allowed substitution') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="customer?.isFreezed"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
-                </QIcon>
                 <QIcon
                     v-if="!entity.account?.active"
                     color="primary"
@@ -150,6 +142,14 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
+                <QIcon
+                    v-if="entity?.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
+                </QIcon>
                 <QBtn
                     v-if="entity.unpaid"
                     flat
@@ -163,13 +163,13 @@ const debtWarning = computed(() => {
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(customer.unpaid?.dated),
+                                dated: toDate(entity.unpaid?.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(customer.unpaid?.amount),
+                                amount: toCurrency(entity.unpaid?.amount),
                             })
                         }}
                     </QTooltip>

test/cypress/integration/claim/claimPhoto.spec.js

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-// redmine.verdnatura.es/issues/8417
+describe('ClaimPhoto', () => {
-describe.skip('ClaimPhoto', () => {
+    const carrouselClose = '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon';
     beforeEach(() => {
         const claimId = 1;
         cy.login('developer');
@@ -16,6 +16,7 @@ describe.skip('ClaimPhoto', () => {
     });
 
     it('should add new file with drag and drop', () => {
+        cy.get('.container').should('be.visible').and('exist');
         cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', {
             action: 'drag-drop',
         });
@@ -23,33 +24,23 @@ describe.skip('ClaimPhoto', () => {
     });
 
     it('should open first image dialog change to second and close', () => {
-        cy.get(':nth-last-child(1) > .q-card').click();
+        cy.dataCy('file-1').click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
+        cy.get(carrouselClose).click();
-            'be.visible',
-        );
 
-        cy.get('.q-carousel__control > button').click();
+        cy.dataCy('file-1').click();
-
+        cy.get('.q-carousel__control > button').as('nextButton').click();
-        cy.get(
+        cy.get('.q-carousel__slide > .q-ma-none').should('be.visible');
-            '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon',
+        cy.get(carrouselClose).click();
-        ).click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'not.be.visible',
-        );
     });
 
     it('should remove third and fourth file', () => {
-        cy.get(
+        cy.dataCy('delete-button-4').click();
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
-        ).click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
 
-        cy.get(
+        cy.dataCy('delete-button-3').click();
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
-        ).click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();

test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js

@@ -17,7 +17,6 @@ describe('InvoiceOut summary', () => {
         cy.login('developer');
         cy.visit(`/#/invoice-out/1/summary`);
     });
-
     it('open the descriptors', () => {
         cy.get(firstRowDescriptors(1)).click();
         cy.get('.descriptor').should('be.visible');
@@ -33,9 +32,8 @@ describe('InvoiceOut summary', () => {
         cy.get('.q-item > .q-item__label').should('include.text', '1101');
     });
 
-    it.skip('should open the ticket list', () => {
+    it('should open the ticket list', () => {
         cy.get(toTicketList).click();
-        cy.get('.descriptor').should('be.visible');
         cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
     });