From 92e172fcaf8874678f36f77df9dd04cf9a7a53ac Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 25 Apr 2024 12:56:02 +0200
Subject: [PATCH 01/27] feat: refs #7039 country change column country - name

---
 src/components/CreateBankEntityForm.vue         | 4 ++--
 src/components/CreateNewPostcodeForm.vue        | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 2 +-
 src/pages/Supplier/SupplierListFilter.vue       | 4 ++--
 src/pages/Worker/Card/WorkerBasicData.vue       | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 2d098beb0..6bf0afe56 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -26,7 +26,7 @@ const bankEntityFormData = reactive({
 });
 
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
 };
 
 const countriesOptions = ref([]);
@@ -83,7 +83,7 @@ onMounted(async () => {
                         v-model="data.countryFk"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         :required="true"
                         :rules="validate('bankEntity.countryFk')"
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 02e84849c..2c546acc3 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -142,7 +142,7 @@ const onProvinceCreated = async ({ name }, formData) => {
                         :label="t('Country')"
                         :options="countriesOptions"
                         hide-selected
-                        option-label="country"
+                        option-label="name"
                         option-value="id"
                         v-model="data.countryFk"
                         :rules="validate('postcode.countryFk')"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 746ee130f..cf1c852a7 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -90,7 +90,7 @@ function getTotal(type) {
         url="Countries"
         auto-load
         @on-fetch="(data) => (countries = data)"
-        sort-by="country"
+        sort-by="name"
     />
     <FetchData
         url="Intrastats"
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
index ff90df6e1..50b47a782 100644
--- a/src/pages/Supplier/SupplierListFilter.vue
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -29,7 +29,7 @@ const countriesOptions = ref([]);
     />
     <FetchData
         url="countries"
-        :filter="{ fields: ['id', 'country'], order: 'country ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
     />
@@ -92,7 +92,7 @@ const countriesOptions = ref([]);
                         @update:model-value="searchFn()"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         dense
                         outlined
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 775472065..5fccd665b 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -36,8 +36,8 @@ const workersFilter = {
     limit: 30,
 };
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
-    order: 'country ASC',
+    fields: ['id', 'name', 'code'],
+    order: 'name ASC',
     limit: 30,
 };
 const educationLevelsFilter = { fields: ['id', 'name'], order: 'name ASC', limit: 30 };
@@ -126,7 +126,7 @@ const maritalStatus = [
                     :label="t('Origin country')"
                     :options="countriesOptions"
                     hide-selected
-                    option-label="country"
+                    option-label="name"
                     option-value="id"
                     v-model="data.originCountryFk"
                 />

From 93bbd0c222634a86a888ec41ce868c4e3e56348d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 10:48:25 +0200
Subject: [PATCH 02/27] fix: icons

---
 src/router/modules/customer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 5ef5945f3..092d60639 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -87,7 +87,7 @@ export default {
                     name: 'CustomerNotifications',
                     meta: {
                         title: 'notifications',
-                        icon: 'notifications',
+                        icon: 'campaign',
                     },
                     component: () =>
                         import(
@@ -99,7 +99,7 @@ export default {
                     name: 'CustomerDefaulter',
                     meta: {
                         title: 'defaulter',
-                        icon: 'vn:risk',
+                        icon: 'vn:defaulter',
                     },
                     component: () =>
                         import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),

From f169ca6778c6d0c327239cb13331ceab4d66e2a2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 11:02:48 +0200
Subject: [PATCH 03/27] fix: add button showPDF

---
 src/pages/Customer/Card/CustomerBalance.vue | 24 +++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index f7d22a345..420bef9bc 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -11,6 +11,7 @@ import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useValidator } from 'src/composables/useValidator';
 import { usePrintService } from 'src/composables/usePrintService';
+import { useSession } from 'src/composables/useSession';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -19,6 +20,9 @@ import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+const session = useSession();
+
+const tokenMultimedia = session.getTokenMultimedia();
 
 const { sendEmail } = usePrintService();
 const { t } = useI18n();
@@ -188,6 +192,11 @@ const saveFieldValue = async (row) => {
 const sendEmailAction = () => {
     sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`);
 };
+
+const showBalancePdf = (balance) => {
+    const url = `api/InvoiceOuts/${balance.id}/download?access_token=${tokenMultimedia}`;
+    window.open(url, '_blank');
+};
 </script>
 
 <template>
@@ -257,17 +266,28 @@ const sendEmailAction = () => {
                     <QTd align="center">
                         <QIcon
                             @click.stop="showDialog = true"
-                            class="q-ml-md"
+                            class="q-ml-md fill-icon"
                             color="primary"
                             name="outgoing_mail"
                             size="sm"
-                            style="font-variation-settings: 'FILL' 1"
                             v-if="row.isCompensation"
                         >
                             <QTooltip>
                                 {{ t('Send compensation') }}
                             </QTooltip>
                         </QIcon>
+                        <QIcon
+                            @click="showBalancePdf(row)"
+                            class="q-ml-md fill-icon"
+                            color="primary"
+                            name="cloud_download"
+                            size="sm"
+                            v-if="row.hasPdf"
+                        >
+                            <QTooltip>
+                                {{ t('globals.downloadPdf') }}
+                            </QTooltip>
+                        </QIcon>
 
                         <QDialog v-model="showDialog">
                             <QCard class="q-pa-sm">

From 7831a69aa902a0c51b3c1ce8ae27aeeb9cf9ef12 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 11:03:40 +0200
Subject: [PATCH 04/27] fix: i18n and icon class

---
 src/i18n/locale/en.yml                              | 1 +
 src/i18n/locale/es.yml                              | 1 +
 src/pages/Customer/Card/CustomerCreditContracts.vue | 2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue             | 4 +---
 src/pages/Route/RouteTickets.vue                    | 8 ++------
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..2f4caedf8 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -31,6 +31,7 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
+    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..6e688a602 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -58,6 +58,7 @@ globals:
     amount: Importe
     packages: Bultos
     download: Descargar
+    downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
     allRows: 'Todo { numberRows } filas(s)'
     markAll: Marcar todo
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 1729ac076..568adcf0b 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -105,7 +105,7 @@ const updateData = () => {
                                             color="primary"
                                             name="lock"
                                             size="md"
-                                            style="font-variation-settings: 'FILL' 1"
+                                            class="fill-icon"
                                         >
                                             <QTooltip>{{ t('Close contract') }}</QTooltip>
                                         </QIcon>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index c77502af5..a969c2c4b 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -139,7 +139,7 @@ const openCreateInvoiceModal = () => {
                             icon="cloud_download"
                             :disable="selectedCards.size === 0"
                         >
-                            <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+                            <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
                         </QBtn>
                         <QCheckbox
                             left-label
@@ -234,13 +234,11 @@ en:
     fileDenied: Browser denied file download...
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
-    downloadPdf: Download PDF
     createInvoice: Make invoice
 es:
     searchInvoice: Buscar factura emitida
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    downloadPdf: Descargar PDF
     createInvoice: Crear factura
 </i18n>
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index c1ca5507e..88a435d6e 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -274,7 +274,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="filter_alt"
                     color="primary"
-                    class="q-mr-sm filled-icon"
+                    class="q-mr-sm fill-icon"
                     :disable="!selectedRows?.length"
                     @click="deletePriorities"
                 >
@@ -295,7 +295,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="sms"
                     color="primary"
-                    class="q-mr-sm filled-icon"
+                    class="q-mr-sm fill-icon"
                     :disable="!selectedRows?.length"
                     @click="openSmsDialog"
                 >
@@ -425,10 +425,6 @@ const openSmsDialog = async () => {
 .table-actions {
     gap: 12px;
 }
-
-.filled-icon {
-    font-variation-settings: 'FILL' 1;
-}
 </style>
 <i18n>
 es:

From 320f6afd17c86f8d719687637a6e7d2dc908facf Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 11:27:55 +0200
Subject: [PATCH 05/27] fix: CustomerDefaulter

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 5816eb1ec..3daf7ee54 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,6 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
+import { useStateStore } from 'stores/useStateStore';
 
 import { toCurrency, toDate } from 'filters/index';
 
@@ -14,9 +15,11 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
+const stateStore = useStateStore();
 
 const { t } = useI18n();
 const quasar = useQuasar();
+const dataRef = ref(null);
 
 const balanceDueTotal = ref(0);
 const selected = ref([]);
@@ -184,22 +187,45 @@ const viewAddObservation = (rowsSelected) => {
     });
 };
 
-const refreshData = () => {
-    setRows();
+const refreshData = async () => {
+    await dataRef.value.fetch();
 };
 
 const onFetch = (data) => {
     for (const element of data) {
         element.isWorker = element.businessTypeFk === 'worker';
     }
-    rows.value = data;
+    setRows(data);
 };
 </script>
 
 <template>
-    <FetchData :filter="filter" @on-fetch="onFetch" auto-load url="Defaulters/filter" />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport></template
+    >
+    <FetchData
+        ref="dataRef"
+        :filter="filter"
+        @on-fetch="onFetch"
+        auto-load
+        url="Defaulters/filter"
+    />
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
         </QScrollArea>
@@ -214,7 +240,9 @@ const onFetch = (data) => {
                     icon="vn:notes"
                     :disabled="!selected.length"
                     @click.stop="viewAddObservation(selected)"
-                />
+                >
+                    <QTooltip>{{ t('Add observation') }}</QTooltip>
+                </QBtn>
             </div>
         </template>
     </VnSubToolbar>
@@ -289,6 +317,7 @@ const onFetch = (data) => {
 
 <i18n>
 es:
+    Add observation:  Añadir observación
     Client: Cliente
     Is worker: Es trabajador
     Salesperson: Comercial

From be1857bb9445a3a78cd39308c41c830919b1e7df Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 11:28:09 +0200
Subject: [PATCH 06/27] fix: FilterPanel menu icon

---
 src/pages/Claim/ClaimList.vue                 |  1 -
 .../ExtendedList/CustomerExtendedList.vue     | 17 ++++++++++++++
 .../Notifications/CustomerNotifications.vue   | 22 ++++++++++++++++++-
 .../Customer/Payments/CustomerPayments.vue    |  8 +------
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 6e0a08f2c..c3c5f5b7b 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -12,7 +12,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { getUrl } from 'src/composables/getUrl';
 
 const stateStore = useStateStore();
 const router = useRouter();
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a24d3211a..3cefc1c02 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -485,6 +485,23 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport></template
+    >
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerExtendedListFilter
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index 52ea4cc27..e54c3eecf 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -8,6 +8,9 @@ import FetchData from 'components/FetchData.vue';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
 
 const { t } = useI18n();
 
@@ -82,6 +85,23 @@ const selectCustomerId = (id) => {
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport></template
+    >
     <FetchData
         :filter="filter"
         @on-fetch="(data) => (rows = data)"
@@ -89,7 +109,7 @@ const selectCustomerId = (id) => {
         url="Clients"
     />
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
         </QScrollArea>
diff --git a/src/pages/Customer/Payments/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
index 623d610ef..e53da84a3 100644
--- a/src/pages/Customer/Payments/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -110,13 +110,7 @@ function stateColor(row) {
             </div>
         </Teleport>
     </template>
-    <QDrawer
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-        :breakpoint="1600"
-    >
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
         </QScrollArea>

From 94a948c9332a5b89d12c93444d8dec4ac0ae2e86 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 12:29:55 +0200
Subject: [PATCH 07/27] fix: add socialName

---
 src/i18n/locale/en.yml                                |  1 +
 src/i18n/locale/es.yml                                |  1 +
 .../Customer/ExtendedList/CustomerExtendedList.vue    | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 2f4caedf8..caed66926 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -259,6 +259,7 @@ customer:
         tableVisibleColumns:
             id: Identifier
             name: Name
+            socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
             credit: Credit
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6e688a602..5aa3c86cd 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -257,6 +257,7 @@ customer:
         tableVisibleColumns:
             id: Identificador
             name: Nombre
+            socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
             credit: Crédito
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index 3cefc1c02..c7c5fd9c5 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -70,6 +70,11 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     fi: {
         component: 'span',
         props: () => {},
@@ -283,6 +288,12 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.name'),
         name: 'name',
     },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('customer.extendedList.tableVisibleColumns.socialName'),
+        name: 'socialName',
+    },
     {
         align: 'left',
         field: 'fi',

From 71f60b82e4e5a73fbd67eda19073eaa6a82a24fd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 12:30:17 +0200
Subject: [PATCH 08/27] fix: minor bugs use VnSubToolbar

---
 src/pages/Customer/ExtendedList/CustomerExtendedList.vue | 2 +-
 src/pages/Entry/EntryLatestBuys.vue                      | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index c7c5fd9c5..e6064878b 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -523,7 +523,7 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
         </QScrollArea>
     </QDrawer>
     <VnSubToolbar>
-        <template #st-actions>
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="clientsDetail"
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index dbfb03f8f..21302c0f4 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
@@ -636,18 +637,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (intrastatOptions = data)"
     />
-    <QToolbar class="justify-end">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="latestBuys"
                 labels-traductions-path="entry.latestBuys"
                 @on-config-saved="visibleColumns = ['picture', ...$event]"
             />
-        </div>
+        </template>
         <QSpace />
         <div id="st-actions"></div>
-    </QToolbar>
+    </VnSubToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <EntryLatestBuysFilter data-key="EntryLatestBuys" :tags="tags" />

From 813703ce93a2dcba0ff8ab6005c8038dc2afe973 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 12:39:09 +0200
Subject: [PATCH 09/27] fix: show icons

---
 .../Customer/ExtendedList/CustomerExtendedList.vue    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index e6064878b..cd39c7d6f 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -549,6 +549,17 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
                     {{ value }}
                 </QTd>
             </template>
+            <template #body-cell-customerStatus="props">
+                <QTd @click="stopEventPropagation($event, props.col)">
+                    <component
+                        :is="tableColumnComponents[props.col.name].component"
+                        class="col-content"
+                        v-bind="tableColumnComponents[props.col.name].props(props)"
+                        @click="tableColumnComponents[props.col.name].event(props)"
+                    >
+                    </component>
+                </QTd>
+            </template>
             <template #body-cell-id="props">
                 <QTd @click="stopEventPropagation($event, props.col)">
                     <component

From d92a0ba77e15264a175966b4e745091ddfcf4a7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 07:46:57 +0200
Subject: [PATCH 10/27] fix: Roadmap Summary ID

---
 src/pages/Route/Roadmap/RoadmapSummary.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 1fed6aa78..9aa8f40d7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -72,7 +72,12 @@ const openAddStopDialog = () => {
 
 <template>
     <div class="q-pa-md full-width">
-        <CardSummary ref="summary" :url="`Roadmaps/${entityId}`" :filter="filter">
+        <CardSummary
+            data-key="RoadmapSummary"
+            ref="summary"
+            :url="`Roadmaps/${entityId}`"
+            :filter="filter"
+        >
             <template #header-left>
                 <RouterLink :to="{ name: `RoadmapSummary`, params: { id: entityId } }">
                     <QIcon name="open_in_new" color="white" size="sm" />

From c2ba7bfe22086cb05d9248b7b1a76e20b95527ff Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 2 May 2024 12:57:34 +0200
Subject: [PATCH 11/27] fix: campaign button

---
 .../Notifications/CustomerNotifications.vue   |  34 ++++-
 ...stomerNotificationsCampaignConsumption.vue | 126 ++++++++++++++++++
 2 files changed, 157 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue

diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index e54c3eecf..211309dc1 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue';
+import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 
 import { QBtn } from 'quasar';
@@ -9,6 +10,7 @@ import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useStateStore } from 'stores/useStateStore';
+import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
 
 const stateStore = useStateStore();
 
@@ -17,6 +19,8 @@ const { t } = useI18n();
 const rows = ref([]);
 const selected = ref([]);
 const selectedCustomerId = ref(0);
+const quasar = useQuasar();
+const dataRef = ref(null);
 
 const tableColumnComponents = {
     id: {
@@ -82,6 +86,19 @@ const columns = computed(() => [
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
 };
+
+const campaignConsumption = () => {
+    quasar.dialog({
+        component: CustomerNotificationsCampaignConsumption,
+        componentProps: {
+            clients: selected,
+            promise: refreshData,
+        },
+    });
+};
+const refreshData = async () => {
+    await dataRef.value.fetch();
+};
 </script>
 
 <template>
@@ -114,9 +131,19 @@ const selectCustomerId = (id) => {
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
         </QScrollArea>
     </QDrawer>
-
-    <VnSubToolbar />
-
+    <VnSubToolbar class="justify-end">
+        <template #st-data>
+            <QBtn
+                icon="show_chart"
+                color="primary"
+                class="q-mr-sm"
+                :disabled="!selected.length"
+                @click="campaignConsumption"
+            >
+                <QTooltip>{{ t('Campaign consumption') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
@@ -160,4 +187,5 @@ es:
     Phone: Teléfono
     City: Población
     Email: Email
+    Campaign consumption: Consumo campaña
 </i18n>
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
new file mode 100644
index 000000000..641cdb851
--- /dev/null
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -0,0 +1,126 @@
+<script setup>
+import { ref, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useDialogPluginComponent } from 'quasar';
+import useNotify from 'src/composables/useNotify';
+import { useValidator } from 'src/composables/useValidator';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { onMounted } from 'vue';
+
+const $props = defineProps({
+    clients: {
+        type: Array,
+        required: true,
+    },
+    promise: {
+        type: Function,
+        required: true,
+    },
+});
+
+const { dialogRef } = useDialogPluginComponent();
+const { notify } = useNotify();
+const { t } = useI18n();
+const validationsStore = useValidator();
+const campaignParams = reactive({});
+const moreFields = ref([]);
+
+async function onSubmit() {
+    try {
+        const data = {
+            clients: $props.clients._value.map((item) => item.id),
+            from: this.campaignParams.from,
+            to: this.campaignParams.to,
+        };
+
+        const params = JSON.stringify(data);
+        await axios.post('ClientConsumptionQueues', { params });
+
+        notify('globals.dataSaved', 'positive');
+    } catch (error) {
+        notify(error.message, 'negative');
+    }
+}
+onMounted(async () => {
+    const { models } = validationsStore;
+    const properties = models.Item?.properties || {};
+    const _moreFields = ['valentinesDay', 'mothersDay', 'allSaints'];
+
+    _moreFields.forEach((field) => {
+        let prop = properties[field];
+        const label = t(`params.${field}`);
+        moreFields.value.push({
+            name: field,
+            label,
+            type: prop ? prop.type : null,
+        });
+    });
+});
+</script>
+
+<template>
+    <FetchData
+        url="Campaigns/latest"
+        @on-fetch="(data) => (campaignsOptions = data)"
+        :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
+        auto-load
+    />
+    <QDialog ref="dialogRef">
+        <QCard class="q-pa-md q-mb-md">
+            <QCardSection>
+                <QForm @submit="onSubmit()" class="q-pa-sm">
+                    <div>
+                        {{ t('Campaign consumption') }}
+                    </div>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <QSelect
+                            :options="moreFields"
+                            v-model="campaignParams.campaign"
+                            :label="t('Campaign')"
+                            option-label="label"
+                        />
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <VnInputDate v-model="campaignParams.from" :label="t('From')" />
+                        <VnInputDate v-model="campaignParams.to" :label="t('To')" />
+                    </VnRow>
+                    <div class="q-mt-lg row justify-end">
+                        <QBtn
+                            :label="t('globals.cancel')"
+                            color="primary"
+                            flat
+                            class="q-mr-md"
+                            v-close-popup
+                        />
+                        <QBtn
+                            :label="t('globals.save')"
+                            type="submit"
+                            color="primary"
+                            v-close-popup
+                        />
+                    </div>
+                </QForm>
+            </QCardSection>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+    en:
+        params:
+            valentinesDay: Valentine's Day
+            mothersDay: Mother's Day
+            allSaints: All Saints' Day
+    es:
+        params:
+            valentinesDay: Día de San Valentín
+            mothersDay: Día de la Madre
+            allSaints: Día de Todos los Santos
+        Campaign consumption: Consumo campaña
+        Campaign: Campaña
+        From: Desde
+        To: Hasta
+</i18n>

From 3467f30b124a2a9bb14ad55dbfd6b002ae139aef Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 3 May 2024 08:40:53 +0200
Subject: [PATCH 12/27] refactor: refs #7274 changed
 CustomerNotificationsCampaignConsumption template and logic

---
 .../Notifications/CustomerNotifications.vue   | 38 ++------
 ...stomerNotificationsCampaignConsumption.vue | 89 +++++++++----------
 2 files changed, 50 insertions(+), 77 deletions(-)

diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index 211309dc1..d19b52c2c 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -1,10 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
-import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-
 import { QBtn } from 'quasar';
-
 import FetchData from 'components/FetchData.vue';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
@@ -13,14 +10,10 @@ import { useStateStore } from 'stores/useStateStore';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
 
 const stateStore = useStateStore();
-
 const { t } = useI18n();
-
 const rows = ref([]);
 const selected = ref([]);
 const selectedCustomerId = ref(0);
-const quasar = useQuasar();
-const dataRef = ref(null);
 
 const tableColumnComponents = {
     id: {
@@ -86,19 +79,6 @@ const columns = computed(() => [
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
 };
-
-const campaignConsumption = () => {
-    quasar.dialog({
-        component: CustomerNotificationsCampaignConsumption,
-        componentProps: {
-            clients: selected,
-            promise: refreshData,
-        },
-    });
-};
-const refreshData = async () => {
-    await dataRef.value.fetch();
-};
 </script>
 
 <template>
@@ -117,8 +97,8 @@ const refreshData = async () => {
                     </QTooltip>
                 </QBtn>
             </div>
-        </Teleport></template
-    >
+        </Teleport>
+    </template>
     <FetchData
         :filter="filter"
         @on-fetch="(data) => (rows = data)"
@@ -133,15 +113,11 @@ const refreshData = async () => {
     </QDrawer>
     <VnSubToolbar class="justify-end">
         <template #st-data>
-            <QBtn
-                icon="show_chart"
-                color="primary"
-                class="q-mr-sm"
-                :disabled="!selected.length"
-                @click="campaignConsumption"
-            >
-                <QTooltip>{{ t('Campaign consumption') }}</QTooltip>
-            </QBtn>
+            <CustomerNotificationsCampaignConsumption
+                :selected-rows="selected.length > 0"
+                :clients="selected"
+                :promise="refreshData"
+            />
         </template>
     </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
index 641cdb851..d168aed6c 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -2,7 +2,6 @@
 import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 import { useValidator } from 'src/composables/useValidator';
 import VnRow from 'components/ui/VnRow.vue';
@@ -19,23 +18,24 @@ const $props = defineProps({
         type: Function,
         required: true,
     },
+    selectedRows: {
+        type: Boolean,
+    },
 });
 
-const { dialogRef } = useDialogPluginComponent();
 const { notify } = useNotify();
 const { t } = useI18n();
 const validationsStore = useValidator();
 const campaignParams = reactive({});
 const moreFields = ref([]);
 
-async function onSubmit() {
+const onSubmit = async () => {
     try {
         const data = {
-            clients: $props.clients._value.map((item) => item.id),
-            from: this.campaignParams.from,
-            to: this.campaignParams.to,
+            clients: $props.clients.map((item) => item.id),
+            from: campaignParams.from,
+            to: campaignParams.to,
         };
-
         const params = JSON.stringify(data);
         await axios.post('ClientConsumptionQueues', { params });
 
@@ -43,7 +43,7 @@ async function onSubmit() {
     } catch (error) {
         notify(error.message, 'negative');
     }
-}
+};
 onMounted(async () => {
     const { models } = validationsStore;
     const properties = models.Item?.properties || {};
@@ -68,44 +68,41 @@ onMounted(async () => {
         :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
         auto-load
     />
-    <QDialog ref="dialogRef">
-        <QCard class="q-pa-md q-mb-md">
-            <QCardSection>
-                <QForm @submit="onSubmit()" class="q-pa-sm">
-                    <div>
-                        {{ t('Campaign consumption') }}
-                    </div>
-                    <VnRow class="row q-gutter-md q-mb-md">
-                        <QSelect
-                            :options="moreFields"
-                            v-model="campaignParams.campaign"
-                            :label="t('Campaign')"
-                            option-label="label"
-                        />
-                    </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
-                        <VnInputDate v-model="campaignParams.from" :label="t('From')" />
-                        <VnInputDate v-model="campaignParams.to" :label="t('To')" />
-                    </VnRow>
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :label="t('globals.cancel')"
-                            color="primary"
-                            flat
-                            class="q-mr-md"
-                            v-close-popup
-                        />
-                        <QBtn
-                            :label="t('globals.save')"
-                            type="submit"
-                            color="primary"
-                            v-close-popup
-                        />
-                    </div>
-                </QForm>
-            </QCardSection>
-        </QCard>
-    </QDialog>
+    <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <QSelect
+                        :options="moreFields"
+                        v-model="campaignParams.campaign"
+                        :label="t('Campaign')"
+                        option-label="label"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInputDate v-model="campaignParams.from" :label="t('From')" />
+                    <VnInputDate v-model="campaignParams.to" :label="t('To')" />
+                </VnRow>
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        flat
+                        class="q-mr-md"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.save')"
+                        type="submit"
+                        color="primary"
+                        @click="onSubmit()"
+                    />
+                </div>
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Campaign consumption') }}</QTooltip>
+    </QBtn>
 </template>
 
 <i18n>

From 6ce57d3c406375a39d51750face88148459e929e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 6 May 2024 14:59:23 +0200
Subject: [PATCH 13/27] fix: #7274

---
 ...stomerNotificationsCampaignConsumption.vue | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
index d168aed6c..34cb0c307 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
@@ -7,8 +7,8 @@ import { useValidator } from 'src/composables/useValidator';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
+import { watch } from 'vue';
 import { onMounted } from 'vue';
-
 const $props = defineProps({
     clients: {
         type: Array,
@@ -23,27 +23,41 @@ const $props = defineProps({
     },
 });
 
+const { selectedRows } = toRefs($props);
 const { notify } = useNotify();
 const { t } = useI18n();
 const validationsStore = useValidator();
-const campaignParams = reactive({});
+const campaignParams = ref(null);
 const moreFields = ref([]);
+const popupProxyRef = ref(null);
+const upcomingOptions = ref(null);
 
+watch(selectedRows, () => {
+    const from = new Date(upcomingOptions.value.dated);
+    from.setDate(from.getDate() - upcomingOptions.value.scopeDays);
+    campaignParams.value = {
+        code: upcomingOptions.value.code,
+        from: from,
+        to: upcomingOptions.value.dated,
+    };
+});
 const onSubmit = async () => {
     try {
         const data = {
             clients: $props.clients.map((item) => item.id),
-            from: campaignParams.from,
-            to: campaignParams.to,
+            from: campaignParams.value.from,
+            to: campaignParams.value.to,
         };
         const params = JSON.stringify(data);
         await axios.post('ClientConsumptionQueues', { params });
 
         notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
     } catch (error) {
         notify(error.message, 'negative');
     }
 };
+
 onMounted(async () => {
     const { models } = validationsStore;
     const properties = models.Item?.properties || {};
@@ -68,14 +82,20 @@ onMounted(async () => {
         :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
         auto-load
     />
+    <FetchData
+        url="Campaigns/upcoming"
+        @on-fetch="(data) => (upcomingOptions = data)"
+        auto-load
+    />
     <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
+                {{ campaignParams }}
                 <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <QSelect
                         :options="moreFields"
-                        v-model="campaignParams.campaign"
+                        v-model="campaignParams.code"
                         :label="t('Campaign')"
                         option-label="label"
                     />

From b21abf40d212302ce1320f958f5d2751e7e776ad Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 6 May 2024 15:15:35 +0200
Subject: [PATCH 14/27] fix: Update from-to when cmpaign changes

---
 ...stomerNotificationsCampaignConsumption.vue | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
index 34cb0c307..5a4c63925 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -5,6 +5,7 @@ import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import { useValidator } from 'src/composables/useValidator';
 import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { watch } from 'vue';
@@ -28,18 +29,25 @@ const { notify } = useNotify();
 const { t } = useI18n();
 const validationsStore = useValidator();
 const campaignParams = ref(null);
+const campaignsOptions = ref(null);
 const moreFields = ref([]);
 const popupProxyRef = ref(null);
 const upcomingOptions = ref(null);
-
-watch(selectedRows, () => {
-    const from = new Date(upcomingOptions.value.dated);
-    from.setDate(from.getDate() - upcomingOptions.value.scopeDays);
+const campaignChange = ({ name }) => {
+    const campaign = campaignsOptions.value.find((c) => c.code === name);
+    handleDates(campaign);
+};
+const handleDates = (campaign) => {
+    const from = new Date(campaign.dated);
+    from.setDate(from.getDate() - campaign.scopeDays);
     campaignParams.value = {
-        code: upcomingOptions.value.code,
+        code: campaign.code,
         from: from,
-        to: upcomingOptions.value.dated,
+        to: campaign.dated,
     };
+};
+watch(selectedRows, () => {
+    handleDates(upcomingOptions.value);
 });
 const onSubmit = async () => {
     try {
@@ -90,14 +98,15 @@ onMounted(async () => {
     <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
-                {{ campaignParams }}
                 <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <QSelect
+                    <VnSelectFilter
                         :options="moreFields"
+                        option-value="code"
+                        option-label="label"
                         v-model="campaignParams.code"
                         :label="t('Campaign')"
-                        option-label="label"
+                        @update:model-value="campaignChange"
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">

From 0dc95ca3a08f867ea9a86184b1e501783befaba8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 7 May 2024 11:35:41 +0200
Subject: [PATCH 15/27] fix: VnSelectFilter

---
 .../CustomerNotificationsCampaignConsumption.vue              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
index 5a4c63925..6d8e00966 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -5,7 +5,7 @@ import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import { useValidator } from 'src/composables/useValidator';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { watch } from 'vue';
@@ -100,7 +100,7 @@ onMounted(async () => {
             <QCard class="column q-pa-md">
                 <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         :options="moreFields"
                         option-value="code"
                         option-label="label"

From b5951a5cefd70230a6c952d4be3dad7416925f98 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 9 May 2024 10:15:24 +0200
Subject: [PATCH 16/27] fix: CustomerNotifications paginate

---
 .../Notifications/CustomerNotifications.vue   | 78 ++++++++++++-------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index d19b52c2c..9ccac98ff 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -2,16 +2,15 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
-import FetchData from 'components/FetchData.vue';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useStateStore } from 'stores/useStateStore';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const rows = ref([]);
 const selected = ref([]);
 const selectedCustomerId = ref(0);
 
@@ -75,6 +74,7 @@ const columns = computed(() => [
         name: 'email',
     },
 ]);
+const refreshKey = ref(0);
 
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
@@ -99,12 +99,6 @@ const selectCustomerId = (id) => {
             </div>
         </Teleport>
     </template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        url="Clients"
-    />
 
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
@@ -121,30 +115,54 @@ const selectCustomerId = (id) => {
         </template>
     </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-            selection="multiple"
-            v-model:selected="selected"
+        <VnPaginate
+            :key="refreshKey"
+            data-key="CustomerNotifications"
+            url="Clients"
+            auto-load
         >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            {{ props.value }}
-                            <CustomerDescriptorProxy :id="selectedCustomerId" />
-                        </component>
-                    </QTr>
-                </QTd>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="id"
+                        selection="multiple"
+                        v-model:selected="selected"
+                    >
+                        <template #body-cell="props">
+                            <QTd :props="props">
+                                <QTr :props="props" class="cursor-pointer">
+                                    <component
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
+                                        class="col-content"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
+                                    >
+                                        {{ props.value }}
+                                        <CustomerDescriptorProxy
+                                            :id="selectedCustomerId"
+                                        />
+                                    </component>
+                                </QTr>
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 

From dac00236bc6ec4e493a4fbf4607163d84c545aab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 9 May 2024 10:20:28 +0200
Subject: [PATCH 17/27] fix: CustomerDefaulter paginate

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 153 ++++++++++--------
 1 file changed, 88 insertions(+), 65 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 3daf7ee54..1af5b3fd9 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -6,8 +6,7 @@ import { QBtn, QCheckbox, useQuasar } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 
 import { toCurrency, toDate } from 'filters/index';
-
-import FetchData from 'components/FetchData.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -16,6 +15,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 const stateStore = useStateStore();
+const refreshKey = ref(0);
 
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -23,7 +23,6 @@ const dataRef = ref(null);
 
 const balanceDueTotal = ref(0);
 const selected = ref([]);
-const rows = ref([]);
 
 const tableColumnComponents = {
     client: {
@@ -171,7 +170,6 @@ const columns = computed(() => [
 ]);
 
 const setRows = (data) => {
-    rows.value = data;
     balanceDueTotal.value = data.reduce((accumulator, currentValue) => {
         return accumulator + (currentValue['amount'] || 0);
     }, 0);
@@ -217,13 +215,6 @@ const onFetch = (data) => {
             </div>
         </Teleport></template
     >
-    <FetchData
-        ref="dataRef"
-        :filter="filter"
-        @on-fetch="onFetch"
-        auto-load
-        url="Defaulters/filter"
-    />
 
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
@@ -248,63 +239,95 @@ const onFetch = (data) => {
     </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="clientFk"
-            selection="multiple"
-            v-model:selected="selected"
+        <VnPaginate
+            @on-fetch="onFetch"
+            data-key="CustomerDefaulter"
+            :key="refreshKey"
+            :filter="filter"
+            auto-load
+            url="Defaulters/filter"
         >
-            <template #header="props">
-                <QTr :props="props" class="bg">
-                    <QTh>
-                        <QCheckbox v-model="props.selected" />
-                    </QTh>
-                    <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                        {{ t(col.label) }}
-                        <QTooltip v-if="col.tooltip">{{ col.tooltip }}</QTooltip>
-                    </QTh>
-                </QTr>
-            </template>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="clientFk"
+                        selection="multiple"
+                        v-model:selected="selected"
+                    >
+                        <template #header="props">
+                            <QTr :props="props" class="bg">
+                                <QTh>
+                                    <QCheckbox v-model="props.selected" />
+                                </QTh>
+                                <QTh
+                                    v-for="col in props.cols"
+                                    :key="col.name"
+                                    :props="props"
+                                >
+                                    {{ t(col.label) }}
+                                    <QTooltip v-if="col.tooltip">{{
+                                        col.tooltip
+                                    }}</QTooltip>
+                                </QTh>
+                            </QTr>
+                        </template>
 
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            <template v-if="props.col.name !== 'isWorker'">
-                                <div v-if="props.col.name === 'lastObservation'">
-                                    <VnInput
-                                        type="textarea"
-                                        v-model="props.value"
-                                        autogrow
-                                    />
-                                </div>
-                                <div v-else>{{ props.value }}</div>
-                            </template>
+                        <template #body-cell="props">
+                            <QTd :props="props">
+                                <QTr :props="props" class="cursor-pointer">
+                                    <component
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
+                                        class="col-content"
+                                        v-bind="
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
+                                    >
+                                        <template v-if="props.col.name !== 'isWorker'">
+                                            <div
+                                                v-if="
+                                                    props.col.name === 'lastObservation'
+                                                "
+                                            >
+                                                <VnInput
+                                                    type="textarea"
+                                                    v-model="props.value"
+                                                    autogrow
+                                                />
+                                            </div>
+                                            <div v-else>{{ props.value }}</div>
+                                        </template>
 
-                            <WorkerDescriptorProxy
-                                :id="props.row.salesPersonFk"
-                                v-if="props.col.name === 'salesPerson'"
-                            />
-                            <WorkerDescriptorProxy
-                                :id="props.row.workerFk"
-                                v-if="props.col.name === 'author'"
-                            />
-                            <CustomerDescriptorProxy
-                                :id="props.row.clientFk"
-                                v-if="props.col.name === 'client'"
-                            />
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
+                                        <WorkerDescriptorProxy
+                                            :id="props.row.salesPersonFk"
+                                            v-if="props.col.name === 'salesPerson'"
+                                        />
+                                        <WorkerDescriptorProxy
+                                            :id="props.row.workerFk"
+                                            v-if="props.col.name === 'author'"
+                                        />
+                                        <CustomerDescriptorProxy
+                                            :id="props.row.clientFk"
+                                            v-if="props.col.name === 'client'"
+                                        />
+                                    </component>
+                                </QTr>
+                            </QTd>
+                        </template>
+                    </QTable></div></template
+        ></VnPaginate>
     </QPage>
 </template>
 

From 437a75da4e34e4b9f99e81688bffe4918ec071ca Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 9 May 2024 10:25:27 +0200
Subject: [PATCH 18/27] fix: CustomerExtendedList paginate

---
 .../Customer/Defaulter/CustomerDefaulter.vue  |   2 -
 .../ExtendedList/CustomerExtendedList.vue     | 152 ++++++++++--------
 .../Notifications/CustomerNotifications.vue   |   8 +-
 3 files changed, 90 insertions(+), 72 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 1af5b3fd9..475672009 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -15,7 +15,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 const stateStore = useStateStore();
-const refreshKey = ref(0);
 
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -242,7 +241,6 @@ const onFetch = (data) => {
         <VnPaginate
             @on-fetch="onFetch"
             data-key="CustomerDefaulter"
-            :key="refreshKey"
             :filter="filter"
             auto-load
             url="Defaulters/filter"
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index cd39c7d6f..b5b509d1b 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -10,7 +10,7 @@ import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
@@ -37,8 +37,6 @@ onMounted(() => {
     allColumnNames.value = filteredColumns.map((col) => col.name);
 });
 
-const rows = computed(() => arrayData.value.store.data);
-
 const selectedCustomerId = ref(0);
 const selectedSalesPersonId = ref(0);
 const allColumnNames = ref([]);
@@ -536,69 +534,97 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
     </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-            :visible-columns="visibleColumns"
-            @row-click="(evt, row, id) => navigateToTravelId(row.id)"
+        <VnPaginate
+            data-key="CustomerExtendedList"
+            url="Clients/extendedListFilter"
+            auto-load
         >
-            <template #body-cell="{ col, value }">
-                <QTd @click="stopEventPropagation($event, col)">
-                    {{ value }}
-                </QTd>
-            </template>
-            <template #body-cell-customerStatus="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
+            <template #body="{ rows }">
+                <div class="q-pa-md">
+                    <QTable
+                        :columns="columns"
+                        :rows="rows"
+                        class="full-width q-mt-md"
+                        row-key="id"
+                        :visible-columns="visibleColumns"
+                        @row-click="(evt, row, id) => navigateToTravelId(row.id)"
                     >
-                    </component>
-                </QTd>
+                        <template #body-cell="{ col, value }">
+                            <QTd @click="stopEventPropagation($event, col)">
+                                {{ value }}
+                            </QTd>
+                        </template>
+                        <template #body-cell-customerStatus="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                </component>
+                            </QTd>
+                        </template>
+                        <template #body-cell-id="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                    <CustomerDescriptorProxy :id="props.row.id" />
+                                    {{ props.row.id }}
+                                </component>
+                            </QTd>
+                        </template>
+                        <template #body-cell-salesPersonFk="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    v-if="props.row.salesPerson"
+                                    class="col-content"
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                    <WorkerDescriptorProxy
+                                        :id="props.row.salesPersonFk"
+                                    />
+                                    {{ props.row.salesPerson }}
+                                </component>
+                                <span class="col-content" v-else>-</span>
+                            </QTd>
+                        </template>
+                        <template #body-cell-actions="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                />
+                            </QTd>
+                        </template>
+                    </QTable>
+                </div>
             </template>
-            <template #body-cell-id="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    >
-                        <CustomerDescriptorProxy :id="props.row.id" />
-                        {{ props.row.id }}
-                    </component>
-                </QTd>
-            </template>
-            <template #body-cell-salesPersonFk="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        v-if="props.row.salesPerson"
-                        class="col-content"
-                        :is="tableColumnComponents[props.col.name].component"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    >
-                        <WorkerDescriptorProxy :id="props.row.salesPersonFk" />
-                        {{ props.row.salesPerson }}
-                    </component>
-                    <span class="col-content" v-else>-</span>
-                </QTd>
-            </template>
-            <template #body-cell-actions="props">
-                <QTd @click="stopEventPropagation($event, props.col)">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    />
-                </QTd>
-            </template>
-        </QTable>
+        </VnPaginate>
     </QPage>
 </template>
 
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index 9ccac98ff..9ff6b2301 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -74,7 +74,6 @@ const columns = computed(() => [
         name: 'email',
     },
 ]);
-const refreshKey = ref(0);
 
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
@@ -115,12 +114,7 @@ const selectCustomerId = (id) => {
         </template>
     </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
-        <VnPaginate
-            :key="refreshKey"
-            data-key="CustomerNotifications"
-            url="Clients"
-            auto-load
-        >
+        <VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
             <template #body="{ rows }">
                 <div class="q-pa-md">
                     <QTable

From e7833206e7581d1cb32b902748c6a07faf533493 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 9 May 2024 12:10:26 +0200
Subject: [PATCH 19/27] fix: Risk field

---
 src/components/ui/CardSummary.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 1a4514ef5..f99fcd412 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -135,6 +135,9 @@ async function fetch() {
             box-shadow: none;
 
             .vn-label-value {
+                &.negative > .value span {
+                    color: $alert;
+                }
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;

From e4637b7d150e243d4065bfa6b640e45ab575b446 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 14 May 2024 14:39:55 +0200
Subject: [PATCH 20/27] fix: refs #7274 add note

---
 src/components/common/VnInput.vue             |  2 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  | 31 +++++++------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 684770e9c..9d5849b68 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -83,7 +83,7 @@ const inputRules = [
                 <slot name="prepend" />
             </template>
 
-            <template #append>
+            <template #append v-if="!!$attrs.disabled">
                 <slot name="append" v-if="$slots.append" />
                 <QIcon
                     name="close"
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 475672009..3817e8a49 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -168,31 +168,20 @@ const columns = computed(() => [
     },
 ]);
 
-const setRows = (data) => {
-    balanceDueTotal.value = data.reduce((accumulator, currentValue) => {
-        return accumulator + (currentValue['amount'] || 0);
-    }, 0);
-};
-
 const viewAddObservation = (rowsSelected) => {
     quasar.dialog({
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
-            promise: refreshData,
+            promise: async () => await dataRef.value.fetch(),
         },
     });
 };
 
-const refreshData = async () => {
-    await dataRef.value.fetch();
-};
-
 const onFetch = (data) => {
-    for (const element of data) {
-        element.isWorker = element.businessTypeFk === 'worker';
-    }
-    setRows(data);
+    for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
+
+    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 </script>
 
@@ -212,8 +201,8 @@ const onFetch = (data) => {
                     </QTooltip>
                 </QBtn>
             </div>
-        </Teleport></template
-    >
+        </Teleport>
+    </template>
 
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
@@ -239,6 +228,7 @@ const onFetch = (data) => {
 
     <QPage class="column items-center q-pa-md">
         <VnPaginate
+            ref="dataRef"
             @on-fetch="onFetch"
             data-key="CustomerDefaulter"
             :filter="filter"
@@ -303,6 +293,7 @@ const onFetch = (data) => {
                                                     type="textarea"
                                                     v-model="props.value"
                                                     autogrow
+                                                    :disable="true"
                                                 />
                                             </div>
                                             <div v-else>{{ props.value }}</div>
@@ -324,8 +315,10 @@ const onFetch = (data) => {
                                 </QTr>
                             </QTd>
                         </template>
-                    </QTable></div></template
-        ></VnPaginate>
+                    </QTable>
+                </div>
+            </template>
+        </VnPaginate>
     </QPage>
 </template>
 

From 9d9d3db43bacc7f2430f6186f229efb602f95dcd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 14 May 2024 17:29:15 +0200
Subject: [PATCH 21/27] fix: refs #7274 defaulterFilter

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 33 +++++++++++++++++--
 .../Defaulter/CustomerDefaulterFilter.vue     |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 3817e8a49..6fc36bcff 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 
-import { toCurrency, toDate } from 'filters/index';
+import { toCurrency, toDate, dateRange } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
@@ -16,7 +16,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 const stateStore = useStateStore();
 
-const { t } = useI18n();
+const { t, locale } = useI18n();
 const quasar = useQuasar();
 const dataRef = ref(null);
 
@@ -183,6 +183,34 @@ const onFetch = (data) => {
 
     balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
+
+function getRange(value) {
+    let date;
+    if (locale.value === 'es') {
+        const [day, month, year] = value.split('/');
+        date = new Date(year, month - 1, day);
+    } else date = new Date(value);
+
+    return dateRange(date);
+}
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'clientFk':
+            return { [`d.${param}`]: value?.id };
+        case 'creditInsurance':
+        case 'amount':
+        case 'workerFk':
+        case 'countryFk':
+        case 'payMethod':
+        case 'salesPersonFk':
+            return { [`d.${param}`]: value };
+        case 'date':
+            return { 'd.created': { between: getRange(value) } };
+        case 'defaulterSinced':
+            return { 'd.defaulterSinced': { between: getRange(value) } };
+    }
+}
 </script>
 
 <template>
@@ -232,6 +260,7 @@ const onFetch = (data) => {
             @on-fetch="onFetch"
             data-key="CustomerDefaulter"
             :filter="filter"
+            :expr-builder="exprBuilder"
             auto-load
             url="Defaulters/filter"
         >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 9d173087b..0a594f92f 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -57,7 +57,7 @@ const authors = ref();
                         hide-selected
                         map-options
                         option-label="name"
-                        option-value="clientTypeFk"
+                        option-value="id"
                         outlined
                         rounded
                         use-input

From 2eca98d31d241bf0494ae0c05a0122890ca93748 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 15 May 2024 11:54:14 +0200
Subject: [PATCH 22/27] feat: refs #7274 show total on rightMenu

---
 src/pages/Customer/Card/CustomerGreuges.vue | 53 ++++++++++++---------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 0c6e04520..0dcb3a3a9 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -1,20 +1,17 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-
+import { useRoute } from 'vue-router';
 import { QBtn } from 'quasar';
-
+import { useStateStore } from 'src/stores/useStateStore';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
-
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
-
+const stateStore = computed(() => useStateStore());
 const rows = ref([]);
 const totalAmount = ref(0);
 
@@ -105,28 +102,40 @@ const columns = computed(() => [
 
 const setRows = (data) => {
     rows.value = data;
-    totalAmount.value = data.reduce((accumulator, currentValue) => {
-        return accumulator + currentValue.amount;
-    }, 0);
-};
-
-const toCustomerGreugeCreate = () => {
-    router.push({ name: 'CustomerGreugeCreate' });
+    totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 </script>
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
+        <QCard class="full-width q-pa-sm">
+            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
+                <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
+                {{ toCurrency(totalAmount) }}
+            </h6>
+            <QSkeleton v-else type="QInput" square />
+        </QCard>
+    </QDrawer>
     <div class="full-width flex justify-center">
         <QPage class="card-width q-pa-lg">
-            <QCard class="full-width q-pa-sm" v-if="totalAmount">
-                <h6 class="flex justify-end q-my-lg q-pr-lg">
-                    <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
-                    {{ toCurrency(totalAmount) }}
-                </h6>
-            </QCard>
-
             <QCard class="q-pa-sm q-mt-md">
                 <QTable
                     :columns="columns"
@@ -164,7 +173,7 @@ const toCustomerGreugeCreate = () => {
     </div>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerGreugeCreate()" color="primary" fab icon="add" />
+        <QBtn color="primary" fab icon="add" :to="{ name: 'CustomerGreugeCreate' }" />
         <QTooltip>
             {{ t('New greuge') }}
         </QTooltip>

From bf43893b054a4c8e76e0e29c68bc0867fe76bcd1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 15 May 2024 14:06:42 +0200
Subject: [PATCH 23/27] fix: refs #7274 use VnInputDate

---
 src/pages/Customer/Defaulter/CustomerDefaulter.vue | 14 ++------------
 .../Customer/Defaulter/CustomerDefaulterFilter.vue |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 6fc36bcff..c1e537c0a 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -184,16 +184,6 @@ const onFetch = (data) => {
     balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 
-function getRange(value) {
-    let date;
-    if (locale.value === 'es') {
-        const [day, month, year] = value.split('/');
-        date = new Date(year, month - 1, day);
-    } else date = new Date(value);
-
-    return dateRange(date);
-}
-
 function exprBuilder(param, value) {
     switch (param) {
         case 'clientFk':
@@ -206,9 +196,9 @@ function exprBuilder(param, value) {
         case 'salesPersonFk':
             return { [`d.${param}`]: value };
         case 'date':
-            return { 'd.created': { between: getRange(value) } };
+            return { 'd.created': { between: dateRange(value) } };
         case 'defaulterSinced':
-            return { 'd.defaulterSinced': { between: getRange(value) } };
+            return { 'd.defaulterSinced': { between: dateRange(value) } };
     }
 }
 </script>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 0a594f92f..26a6743d5 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -162,7 +162,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput
+                    <VnInputDate
                         :label="t('L. O. Date')"
                         clearable
                         is-outlined

From 628fc888ba0916d69b763bc57ed654fa58f3aaa1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 15 May 2024 14:31:51 +0200
Subject: [PATCH 24/27] fix: refs #7281 fix warnings

---
 src/components/CreateBankEntityForm.vue       |  7 +------
 src/components/FormModelPopup.vue             |  2 +-
 src/components/FormPopup.vue                  |  2 +-
 src/components/common/SendEmailDialog.vue     |  6 ++++--
 src/components/ui/VnLinkPhone.vue             | 11 +++--------
 src/components/ui/VnTree.vue                  |  2 +-
 src/pages/Agency/Card/AgencySummary.vue       |  7 -------
 src/pages/Claim/ClaimList.vue                 |  1 -
 src/pages/Customer/Card/CustomerAddress.vue   |  4 ++--
 src/pages/Customer/Card/CustomerWebAccess.vue |  1 -
 .../Customer/Card/CustomerWebPayment.vue      |  1 -
 .../components/CustomerAddressCreate.vue      |  1 -
 .../components/CustomerAddressEdit.vue        |  1 -
 .../components/CustomerNewCustomsAgent.vue    |  1 -
 src/pages/Entry/Card/EntrySummary.vue         |  1 -
 src/pages/Item/ItemFixedPrice.vue             |  6 +++---
 src/pages/Monitor/SalesOrdersTable.vue        |  2 --
 src/pages/Monitor/SalesTicketsTable.vue       | 19 +++----------------
 src/pages/Order/Card/OrderForm.vue            |  2 +-
 src/pages/Route/Roadmap/RoadmapCreate.vue     |  9 ++-------
 src/pages/Shelving/Card/ShelvingSummary.vue   | 17 +++--------------
 .../Supplier/Card/SupplierAddressesCreate.vue | 11 +----------
 .../Supplier/Card/SupplierConsumption.vue     |  2 +-
 src/pages/Travel/TravelFilter.vue             |  1 -
 src/pages/Wagon/Type/WagonTypeList.vue        |  1 -
 src/pages/Worker/WorkerCreate.vue             |  1 -
 src/pages/Zone/ZoneList.vue                   | 13 +++----------
 27 files changed, 30 insertions(+), 102 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 068646c9a..fb50865a1 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -8,12 +8,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
-const props = defineProps({
-    showEntityField: {
-        type: Boolean,
-        default: true,
-    },
-});
+defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index c5caf9778..25213a8b7 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -6,7 +6,7 @@ import FormModel from 'components/FormModel.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index e203a7c75..2da986006 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
diff --git a/src/components/common/SendEmailDialog.vue b/src/components/common/SendEmailDialog.vue
index 501c48a4d..d73133921 100644
--- a/src/components/common/SendEmailDialog.vue
+++ b/src/components/common/SendEmailDialog.vue
@@ -29,10 +29,12 @@ async function confirm() {
     const response = { address: address.value };
     if (props.promise) {
         isLoading.value = true;
-        const { address: _address, ...restData } = props.data;
 
         try {
-            Object.assign(response, restData);
+            const dataCopy = JSON.parse(JSON.stringify({ ...props.data }));
+            delete dataCopy.address;
+
+            Object.assign(response, dataCopy);
             await props.promise(response);
         } finally {
             isLoading.value = false;
diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index b04ab3e5b..3ce0b7aa6 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,21 +1,16 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-const props = defineProps({
-    phoneNumber: { type: [String, Number], default: null },
-});
-const { t } = useI18n();
+defineProps({ phoneNumber: { type: [String, Number], default: null } });
 </script>
 <template>
     <QBtn
-        v-if="props.phoneNumber"
+        v-if="phoneNumber"
         flat
         round
         icon="phone"
         size="sm"
         color="primary"
         padding="none"
-        :href="`sip:${props.phoneNumber}`"
+        :href="`sip:${phoneNumber}`"
         @click.stop
     />
 </template>
-<style scoped></style>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 13aa05635..928d045e9 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -90,7 +90,7 @@ const onNodeCreated = async () => {
     await fetchNodeLeaves(creationNodeSelectedId.value);
 };
 
-onMounted(async (n) => {
+onMounted(async () => {
     const tree = [...state.get('Tree'), 1];
     const lastStateTree = state.get('TreeState');
     if (tree) {
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index a4a6a2a18..d2cf41763 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -3,11 +3,9 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const $props = defineProps({
     id: {
@@ -18,11 +16,6 @@ const $props = defineProps({
 const { params } = useRoute();
 const { t } = useI18n();
 const entityId = computed(() => $props.id || params.id);
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
 </script>
 
 <template>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 6e0a08f2c..c3c5f5b7b 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -12,7 +12,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { getUrl } from 'src/composables/getUrl';
 
 const stateStore = useStateStore();
 const router = useRouter();
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index cd5ef1483..f3bf6038d 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -202,9 +202,9 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <div v-if="item.observations.length">
                         <div
-                            :key="index"
+                            :key="obsIndex"
                             class="flex q-mb-sm"
-                            v-for="(observation, index) in item.observations"
+                            v-for="(observation, obsIndex) in item.observations"
                         >
                             <div class="text-weight-bold q-mr-sm">
                                 {{ observation.observationType.description }}:
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index f447c5256..9e534235c 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -11,7 +11,6 @@ import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 
diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue
index b1c45aa6c..13ec6b128 100644
--- a/src/pages/Customer/Card/CustomerWebPayment.vue
+++ b/src/pages/Customer/Card/CustomerWebPayment.vue
@@ -7,7 +7,6 @@ import axios from 'axios';
 
 import { toCurrency, toDateHourMinSec } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
 import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
 
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index d92377f54..57997fb01 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 734924993..2d14b571e 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index b6aa7a173..3c95dcae6 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnRow from 'components/ui/VnRow.vue';
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 1f9aaea28..766587bde 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 2a753a3a5..e74f7f828 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -309,9 +309,9 @@ const addRow = () => {
     const lastItemCopy = JSON.parse(
         JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
     );
-    const { id, ...restOfItem } = lastItemCopy;
-    fixedPricesOriginalData.value.push(restOfItem);
-    fixedPrices.value.push(restOfItem);
+    delete lastItemCopy.id;
+    fixedPricesOriginalData.value.push(lastItemCopy);
+    fixedPrices.value.push(lastItemCopy);
 };
 
 const openEditTableCellDialog = () => {
diff --git a/src/pages/Monitor/SalesOrdersTable.vue b/src/pages/Monitor/SalesOrdersTable.vue
index d8e28f6b7..0ba900393 100644
--- a/src/pages/Monitor/SalesOrdersTable.vue
+++ b/src/pages/Monitor/SalesOrdersTable.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -16,7 +15,6 @@ import axios from 'axios';
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 
-const router = useRouter();
 const paginateRef = ref(null);
 const workersActiveOptions = ref([]);
 const clientsOptions = ref([]);
diff --git a/src/pages/Monitor/SalesTicketsTable.vue b/src/pages/Monitor/SalesTicketsTable.vue
index f451123e9..222ccb9d0 100644
--- a/src/pages/Monitor/SalesTicketsTable.vue
+++ b/src/pages/Monitor/SalesTicketsTable.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, reactive, watch } from 'vue';
+import { ref, computed, onMounted, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -18,7 +18,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
-import { toCurrency } from 'src/filters';
+import { toCurrency, dateRange } from 'src/filters';
 const DEFAULT_AUTO_REFRESH = 1000;
 const { t } = useI18n();
 const autoRefresh = ref(false);
@@ -32,15 +32,6 @@ const visibleColumns = ref([]);
 const allColumnNames = ref([]);
 const { viewSummary } = useSummaryDialog();
 
-const dateRange = (value) => {
-    const minHour = new Date(value);
-    minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
-    maxHour.setHours(23, 59, 59, 59);
-
-    return [minHour, maxHour];
-};
-
 function exprBuilder(param, value) {
     switch (param) {
         case 'stateFk':
@@ -54,11 +45,7 @@ function exprBuilder(param, value) {
         case 'practicalHour':
             return { 'zed.etc': value };
         case 'shippedDate':
-            return {
-                't.shipped': {
-                    between: dateRange(value),
-                },
-            };
+            return { 't.shipped': { between: dateRange(value) } };
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 08ed074e5..378073897 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { reactive, ref, onMounted } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
diff --git a/src/pages/Route/Roadmap/RoadmapCreate.vue b/src/pages/Route/Roadmap/RoadmapCreate.vue
index f5cc9ee66..fb3b29f33 100644
--- a/src/pages/Route/Roadmap/RoadmapCreate.vue
+++ b/src/pages/Route/Roadmap/RoadmapCreate.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -9,7 +9,6 @@ import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const router = useRouter();
 const defaultInitialData = {
     etd: Date.vnNew().toISOString(),
@@ -31,11 +30,7 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput
-                    v-model="data.name"
-                    :label="t('Roadmap')"
-                    clearable
-                />
+                <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
                 <VnInputDate v-model="data.etd" :label="t('ETD date')" />
                 <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
             </VnRow>
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 649799b00..168552832 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -1,11 +1,9 @@
 <script setup>
-import { computed, onMounted, onUnmounted } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 
 const $props = defineProps({
@@ -15,19 +13,10 @@ const $props = defineProps({
     },
 });
 const route = useRoute();
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-const isDialog = false;
-// const hideRightDrawer = () => {
-//     if (!isDialog) {
-//         stateStore.rightDrawer = false;
-//     }
-// };
-// onMounted(hideRightDrawer);
-// onUnmounted(hideRightDrawer);
+
 const filter = {
     include: [
         {
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 440922ebc..eccf06204 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -2,23 +2,16 @@
 import { useI18n } from 'vue-i18n';
 import { reactive, ref, onMounted, onBeforeMount } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const provincesOptions = ref([]);
 const postcodesOptions = ref([]);
-const townsLocationOptions = ref([]);
 const viewAction = ref();
 const updateAddressId = ref(null);
 const newAddressForm = reactive({
@@ -94,9 +87,7 @@ function handleLocation(data, location) {
                         :roles-allowed-to-create="['deliveryAssistant']"
                         :options="postcodesOptions"
                         v-model="data.location"
-                        @update:model-value="
-                            (location) => handleLocation(data, location)
-                        "
+                        @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
                 </VnRow>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 8dbb87529..4eac24469 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { computed, onMounted, watch, onUnmounted, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import FetchedTags from 'components/ui/FetchedTags.vue';
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 43e0db3eb..77f7ec112 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 23f56e4c3..3ecca1ea3 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -6,7 +6,6 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonTypeList');
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 85259c043..7347417a9 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -9,7 +9,6 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 3806a519e..5a7d07d71 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -2,11 +2,9 @@
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { onMounted, computed } from 'vue';
-import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
+import { toCurrency } from 'src/filters';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
 import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import ZoneFilterPanel from './ZoneFilterPanel.vue';
@@ -29,9 +27,6 @@ const redirectToZoneSummary = (event, { id }) => {
     router.push({ name: 'ZoneSummary', params: { id } });
 };
 
-function redirectToCreateView() {
-    router.push({ path: `/zone/create` });
-}
 const columns = computed(() => [
     {
         name: 'ID',
@@ -117,9 +112,7 @@ const handleClone = (id) => {
         () => clone(id)
     );
 };
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
+onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
@@ -212,7 +205,7 @@ onMounted(async () => {
             </VnPaginate>
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="redirectToCreateView()" fab icon="add" color="primary">
+            <QBtn :to="{ path: `/zone/create` }" fab icon="add" color="primary">
                 <QTooltip>{{ t('list.create') }}</QTooltip>
             </QBtn>
         </QPageSticky>

From c7cb59100877f2a03ae6cdc8f2ba250cefd0b4bf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 16 May 2024 08:52:02 +0200
Subject: [PATCH 25/27] warmFix(customerFiscalData): fix vnRows

---
 .../Customer/Card/CustomerFiscalData.vue      | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 50fbec25d..deaaefc50 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -102,22 +102,24 @@ function handleLocation(data, location) {
                 </VnLocation>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Active')" v-model="data.isActive" />
                 <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
-                <QCheckbox :label="t('Vies')" v-model="data.isVies" />
-                <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                    <QTooltip>
-                        {{ t('whenActivatingIt') }}
-                    </QTooltip>
-                </QIcon>
+                <div>
+                    <QCheckbox :label="t('Vies')" v-model="data.isVies" />
+                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                        <QTooltip>
+                            {{ t('whenActivatingIt') }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
                 <QCheckbox
                     :label="t('Invoice by address')"
@@ -125,17 +127,22 @@ function handleLocation(data, location) {
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
-                <QCheckbox :label="t('Is equalizated')" v-model="data.isEqualizated" />
-                <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
-                    <QTooltip>
-                        {{ t('inOrderToInvoice') }}
-                    </QTooltip>
-                </QIcon>
+            <VnRow>
+                <div>
+                    <QCheckbox
+                        :label="t('Is equalizated')"
+                        v-model="data.isEqualizated"
+                    />
+                    <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
+                        <QTooltip>
+                            {{ t('inOrderToInvoice') }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
                 <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     :label="t('Incoterms authorization')"
                     v-model="data.hasIncoterms"

From 1654fb93d432853dc81f4ccd2ed41fc73e9fde2f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 May 2024 09:06:12 +0200
Subject: [PATCH 26/27] fix: refs #6598 build

---
 src/pages/Customer/Card/CustomerAddress.vue | 4 ++--
 src/pages/Order/Card/OrderSummary.vue       | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index f3bf6038d..6c8279d84 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -202,9 +202,9 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <div v-if="item.observations.length">
                         <div
-                            :key="obsIndex"
+                            :key="obIndex"
                             class="flex q-mb-sm"
-                            v-for="(observation, obsIndex) in item.observations"
+                            v-for="(observation, obIndex) in item.observations"
                         >
                             <div class="text-weight-bold q-mr-sm">
                                 {{ observation.observationType.description }}:
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index a674a20d0..426cdc712 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
@@ -11,7 +10,6 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();
 
 const $props = defineProps({
     id: {

From 2855499148b5a551e385453b8d92695a27dad8fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 May 2024 12:07:47 +0200
Subject: [PATCH 27/27] fix: refs #6891 hide across only on disable

---
 src/components/common/VnInput.vue | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 9d5849b68..8358cd6e6 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -37,14 +37,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const onEnterPress = () => {
-    emit('keyup.enter');
-};
-
-const handleValue = (val = null) => {
-    value.value = val;
-};
-
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -73,7 +65,7 @@ const inputRules = [
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
             :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
@@ -82,14 +74,14 @@ const inputRules = [
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-
-            <template #append v-if="!!$attrs.disabled">
-                <slot name="append" v-if="$slots.append" />
+            
+            <template #append>
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
-                    @click="handleValue(null)"
+                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    @click="value = null"
                 ></QIcon>
             </template>
         </QInput>