From 94278e2f53ee6ebbaf999004d53875da7b655dcf Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Dec 2023 15:36:56 +0100
Subject: [PATCH 1/5] refactor: refs #5835

---
 src/components/ui/VnLv.vue                    |  2 +-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue |  2 +-
 src/pages/InvoiceIn/InvoiceInList.vue         | 55 ++++++++-----------
 3 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 9a17fca05..e99ec4b05 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -5,7 +5,7 @@ import { dashIfEmpty } from 'src/filters';
 const $props = defineProps({
     label: { type: String, default: null },
     value: {
-        type: [String, Boolean],
+        type: [String, Boolean, Number],
         default: null,
     },
     info: { type: String, default: null },
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index d7039fe3d..6dd8a7ae9 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -265,7 +265,7 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.sage')"
-                    :value="invoiceIn.sageWithholding.withholding"
+                    :value="invoiceIn.sageWithholding?.withholding"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.vat')"
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 692251bff..c3ef866cd 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -84,9 +84,9 @@ function viewSummary(id) {
                         :key="row.id"
                         :title="row.supplierRef"
                         @click="navigate(row.id)"
+                        :id="row.id"
                     >
                         <template #list-items>
-                            <VnLv label="ID" :value="row.id" />
                             <VnLv
                                 :label="t('invoiceIn.list.supplierRef')"
                                 :value="row.supplierRef"
@@ -112,42 +112,35 @@ function viewSummary(id) {
                                 :label="t('invoiceIn.list.amount')"
                                 :value="toCurrency(row.amount)"
                             />
-                            <VnLv :label="t('invoiceIn.list.isBooked')">
-                                <template #value>
-                                    <QCheckbox
-                                        class="no-pointer-events"
-                                        v-model="row.isBooked"
-                                        size="xs"
-                                        :true-value="1"
-                                        :false-value="0"
-                                    />
-                                </template>
-                            </VnLv>
+                            <VnLv
+                                :label="t('invoiceIn.list.isBooked')"
+                                :value="!!row.isBooked"
+                            />
                         </template>
                         <template #actions>
                             <QBtn
-                                flat
-                                icon="arrow_circle_right"
+                                :label="t('components.smartCard.openCard')"
                                 @click.stop="navigate(row.id)"
-                            >
-                                <QTooltip>
-                                    {{ t('components.smartCard.openCard') }}
-                                </QTooltip>
-                            </QBtn>
-                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
-                                <QTooltip>
-                                    {{ t('components.smartCard.openSummary') }}
-                                </QTooltip>
-                            </QBtn>
+                                class="bg-vn-dark"
+                                outline
+                                type="reset"
+                            />
+
                             <QBtn
-                                flat
-                                icon="cloud_download"
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id)"
+                                color="primary"
+                                type="submit"
+                                style="margin-top: 15px"
+                            />
+                            <QBtn
+                                :label="t('components.smartCard.downloadFile')"
+                                style="margin-top: 15px"
+                                outline
                                 @click.stop="downloadFile(row.dmsFk)"
-                            >
-                                <QTooltip>
-                                    {{ t('components.smartCard.downloadFile') }}
-                                </QTooltip>
-                            </QBtn>
+                                type="submit"
+                                color="primary"
+                            />
                         </template>
                     </CardList>
                 </template>
-- 
2.40.1


From c84aeed202ceedf2b164f796276a686a8b99e579 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Dec 2023 15:39:26 +0100
Subject: [PATCH 2/5] fix test refs #5835

---
 test/cypress/integration/invoiceIn/invoiceInList.spec.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index bd722edab..60d8c5be1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -1,8 +1,8 @@
 /// <reference types="cypress" />
 describe('InvoiceInList', () => {
     const firstCard = '.q-card:nth-child(1)';
-    const firstId =
-        '.q-card:nth-child(1) .list-items > .vn-label-value:first-child > .value > span';
+    const firstChipId =
+        ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
     const firstDetailBtn = '.q-card:nth-child(1) .q-btn:nth-child(2)';
     const summaryHeaders = '.summaryBody .header';
 
@@ -12,9 +12,10 @@ describe('InvoiceInList', () => {
     });
 
     it('should redirect on clicking a invoice', () => {
-        cy.get(firstId)
+        cy.get(firstChipId)
             .invoke('text')
-            .then((id) => {
+            .then((content) => {
+                const id = content.substring(4);
                 cy.get(firstCard).click();
                 cy.url().should('include', `/invoice-in/${id}/summary`);
             });
-- 
2.40.1


From 5b79c2ace91690b666cf68ef85cd8c5aec8ae00b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Dec 2023 14:03:58 +0100
Subject: [PATCH 3/5] fix margin: refs #5835

---
 src/pages/InvoiceIn/InvoiceInList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index c3ef866cd..3efaec7fc 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -131,11 +131,11 @@ function viewSummary(id) {
                                 @click.stop="viewSummary(row.id)"
                                 color="primary"
                                 type="submit"
-                                style="margin-top: 15px"
+                                class="q-mt-sm"
                             />
                             <QBtn
                                 :label="t('components.smartCard.downloadFile')"
-                                style="margin-top: 15px"
+                                class="q-mt-sm"
                                 outline
                                 @click.stop="downloadFile(row.dmsFk)"
                                 type="submit"
-- 
2.40.1


From f3a1800cb0571c298655bc4f8b406ac110468338 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 20 Dec 2023 15:43:09 +0100
Subject: [PATCH 4/5] fix breadcrumbs & header: refs #5835

---
 src/components/NavBar.vue               | 10 +++++-----
 src/components/common/VnBreadcrumbs.vue |  4 ++++
 src/i18n/es/index.js                    |  2 +-
 src/stores/useNavigationStore.js        |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 2368e078e..12366e174 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -24,11 +24,8 @@ const pinnedModulesRef = ref();
 </script>
 
 <template>
-    <QHeader class="bg-dark" color="white" elevated>
-        <QToolbar
-            class="q-py-sm q-px-md"
-            :class="{ 'q-gutter-x-sm': !quasar.platform.is.mobile }"
-        >
+    <QHeader color="white" elevated>
+        <QToolbar class="q-py-sm q-px-md">
             <QBtn @click="stateStore.toggleLeftDrawer()" icon="menu" round dense flat>
                 <QTooltip bottom anchor="bottom right">
                     {{ t('globals.collapseMenu') }}
@@ -108,6 +105,9 @@ const pinnedModulesRef = ref();
 .searchbar {
     width: max-content;
 }
+.q-header {
+    background-color: var(--vn-dark);
+}
 </style>
 <i18n>
 en:
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 792671e21..666f14c72 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -69,6 +69,10 @@ function getBreadcrumb(param) {
     > div {
         flex-wrap: nowrap;
     }
+    &--last,
+    &__separator {
+        color: var(--vn-label);
+    }
 }
 @media (max-width: $breakpoint-md) {
     .q-breadcrumbs {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 4e570e7b4..0289b7e78 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -371,7 +371,7 @@ export default {
     },
     invoiceOut: {
         pageTitles: {
-            invoiceOuts: 'Fact. emitidas',
+            invoiceOuts: 'Crear factura',
             list: 'Listado',
             negativeBases: 'Bases Negativas',
             globalInvoicing: 'Facturación global',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index b5947f87b..5daa618d5 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -11,13 +11,13 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'claim',
         'ticket',
         'invoiceOut',
+        'invoiceIn',
         'worker',
         'shelving',
         'wagon',
         'route',
         'supplier',
         'travel',
-        'invoiceIn',
     ];
     const pinnedModules = ref([]);
     const role = useRole();
-- 
2.40.1


From 61d69f7cf72f33202cecfec69be8c73cacf801b9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 2 Jan 2024 09:05:59 +0100
Subject: [PATCH 5/5] change btn & prevent error: refs #5835

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 8 ++++----
 src/pages/InvoiceIn/InvoiceInList.vue         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 6dd8a7ae9..6c202c5a3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -203,7 +203,7 @@ function getLink(param) {
         @on-fetch="(data) => setData(data)"
     >
         <template #header="{ entity: invoiceIn }">
-            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier.name }}</div>
+            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier?.name }}</div>
         </template>
         <template #body="{ entity: invoiceIn }">
             <!--Basic Data-->
@@ -216,7 +216,7 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.supplier')"
-                    :value="invoiceIn.supplier.name"
+                    :value="invoiceIn.supplier?.name"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.supplierRef')"
@@ -224,7 +224,7 @@ function getLink(param) {
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.currency')"
-                    :value="invoiceIn.currency.code"
+                    :value="invoiceIn.currency?.code"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.docNumber')"
@@ -273,7 +273,7 @@ function getLink(param) {
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.company')"
-                    :value="invoiceIn.company.code"
+                    :value="invoiceIn.company?.code"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.booked')"
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 3efaec7fc..effccc830 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -134,9 +134,8 @@ function viewSummary(id) {
                                 class="q-mt-sm"
                             />
                             <QBtn
-                                :label="t('components.smartCard.downloadFile')"
+                                :label="t('Download')"
                                 class="q-mt-sm"
-                                outline
                                 @click.stop="downloadFile(row.dmsFk)"
                                 type="submit"
                                 color="primary"
@@ -169,4 +168,5 @@ function viewSummary(id) {
 es:
     Search invoice: Buscar factura emitida
     You can search by invoice reference: Puedes buscar por referencia de la factura
+    Download: Descargar
 </i18n>
-- 
2.40.1