From 31ac61b01f183a652add0b6e2fdd3cbd7d638fe4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 13 Mar 2024 11:33:10 +0100
Subject: [PATCH 1/4] refactor: #6988 changed ticket summary view and fixed
 notes functionality

---
 src/css/app.scss                        |  2 +-
 src/pages/Ticket/Card/TicketSummary.vue | 64 ++++++++++++++++---------
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 38dd642a3..741dbe332 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -110,4 +110,4 @@ input::-webkit-inner-spin-button {
     appearance: none;
     -webkit-appearance: none;
     -moz-appearance: none;
-}
+}
\ No newline at end of file
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index fbca21086..72bfe4a67 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -130,22 +130,6 @@ async function changeState(value) {
             </QBtnDropdown>
         </template>
         <template #body>
-            <QCard class="vn-max">
-                <div class="taxes">
-                    <VnLv
-                        :label="t('ticket.summary.subtotal')"
-                        :value="toCurrency(ticket.totalWithoutVat)"
-                    />
-                    <VnLv
-                        :label="t('ticket.summary.vat')"
-                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
-                    />
-                    <VnLv
-                        :label="t('ticket.summary.total')"
-                        :value="toCurrency(ticket.totalWithVat)"
-                    />
-                </div>
-            </QCard>
             <QCard class="vn-one">
                 <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
                     {{ t('globals.summary.basicData') }}
@@ -235,7 +219,7 @@ async function changeState(value) {
                     :value="formattedAddress()"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="ticket.notes.length">
                 <a class="header header-link" :href="ticketUrl + 'observation'">
                     {{ t('ticket.pageTitles.notes') }}
                     <QIcon name="open_in_new" />
@@ -254,9 +238,31 @@ async function changeState(value) {
                             class="notes"
                             readonly
                         />
+                        
                     </template>
                 </VnLv>
             </QCard>
+            <QCard class="vn-one ">
+                <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
+                    {{t('Summary')}}
+                    <QIcon name="open_in_new" />
+                </a>
+                <div class="bodyCard">
+                    <VnLv
+                        :label="t('ticket.summary.subtotal')"
+                        :value="toCurrency(ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.vat')"
+                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.total')"
+                        :value="toCurrency(ticket.totalWithVat)"
+                    />
+                </div>
+                    
+            </QCard>
             <QCard class="vn-max">
                 <a class="header header-link" :href="ticketUrl + 'sale'">
                     {{ t('ticket.summary.saleLines') }}
@@ -452,20 +458,32 @@ async function changeState(value) {
     width: max-content;
 }
 .cardSummary .summaryBody > .q-card > .taxes {
-    border: 2px solid gray;
+    margin-right: 90px;
     padding: 0;
-    > .vn-label-value {
-        text-align: right;
+    & > .vn-label-value {
+        text-align: left;
         display: flex;
         flex-direction: row;
         margin-top: 5px;
-        justify-content: flex-end;
-        padding-right: 20px;
+        justify-content: flex-start;
+        padding-left: 10px;
+    }
+}
+
+.q-card.q-card--dark.q-dark.vn-one {
+    & > .bodyCard{
+        padding: 1%;
+        margin-right: 40%;
     }
 }
 
 .cardSummary .summaryBody > .q-card:has(.taxes) {
     margin-top: 2px;
-    padding: 0;
+    padding: 0%;
 }
 </style>
+
+<i18n>
+    es:
+        Summary: Resumen
+</i18n>

From 17145b7fe8d33f12ad06aa4b471a1343b3cb510b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 22 Mar 2024 13:36:31 +0100
Subject: [PATCH 2/4] fix: refs #6988 fix style

---
 src/pages/Ticket/Card/TicketSummary.vue | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index c0c271bfc..93c9fa081 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,10 +243,7 @@ async function changeState(value) {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
-                    {{ t('Summary') }}
-                    <QIcon name="open_in_new" />
-                </a>
+                <VnTitle :text="t('Summary')" />
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
@@ -452,30 +449,12 @@ async function changeState(value) {
 .notes {
     width: max-content;
 }
-.cardSummary .summaryBody > .q-card > .taxes {
-    margin-right: 90px;
-    padding: 0;
-    & > .vn-label-value {
-        text-align: left;
-        display: flex;
-        flex-direction: row;
-        margin-top: 5px;
-        justify-content: flex-start;
-        padding-left: 10px;
-    }
-}
 
 .q-card.q-card--dark.q-dark.vn-one {
     & > .bodyCard {
         padding: 1%;
-        margin-right: 40%;
     }
 }
-
-.cardSummary .summaryBody > .q-card:has(.taxes) {
-    margin-top: 2px;
-    padding: 0%;
-}
 </style>
 
 <i18n>

From 84a25acf22db975eeaae12435952a0b60260bb0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 11:42:29 +0100
Subject: [PATCH 3/4] refactor: refs #6988 used global translations

---
 src/i18n/en/index.js                    | 1 +
 src/i18n/es/index.js                    | 1 +
 src/pages/Ticket/Card/TicketSummary.vue | 7 +------
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a9ce1a6ed..1365d4c17 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -492,6 +492,7 @@ export default {
             request: 'Request',
             weight: 'Weight',
             goTo: 'Go to',
+            summaryAmount: 'Resumen',
         },
     },
     claim: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0977448fb..f5f07f543 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -491,6 +491,7 @@ export default {
             request: 'Petición de compra',
             weight: 'Peso',
             goTo: 'Ir a',
+            summaryAmount: 'Resumen',
         },
     },
     claim: {
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 93c9fa081..5d2b62944 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,7 +243,7 @@ async function changeState(value) {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :text="t('Summary')" />
+                <VnTitle :text="t('ticket.summary.summaryAmount')" />
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
@@ -456,8 +456,3 @@ async function changeState(value) {
     }
 }
 </style>
-
-<i18n>
-    es:
-        Summary: Resumen
-</i18n>

From 3e0f1515703a8deedad200aee1a48dcee17880eb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 12:36:50 +0100
Subject: [PATCH 4/4] refactor: refs #6988 fixed error

---
 src/i18n/en/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1365d4c17..839d768b4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -492,7 +492,7 @@ export default {
             request: 'Request',
             weight: 'Weight',
             goTo: 'Go to',
-            summaryAmount: 'Resumen',
+            summaryAmount: 'Summary',
         },
     },
     claim: {