From 3892df250cc87c166eb6b4dd71d0b05b2bcb1527 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 08:53:46 +0000
Subject: [PATCH 01/12] fix: #5938 grouped filter

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

diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index bb597a525..6345f62b3 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -153,7 +153,7 @@ onMounted(async () => {
                         :label="t('params.state')"
                         v-model="params.state"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
@@ -169,7 +169,7 @@ onMounted(async () => {
                         :label="t('params.futureState')"
                         v-model="params.futureState"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense

From a3afe790b942e0154cf6b1fc720156d223a62716 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 12:00:07 +0200
Subject: [PATCH 02/12] fix: CustomerGreuges

---
 src/pages/Customer/Card/CustomerGreuges.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 1c78392e7..1d8b8585f 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -5,10 +5,10 @@ import { useRoute } from 'vue-router';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'components/VnTable/VnTable.vue';
-
+import FetchData from 'components/FetchData.vue';
+const entityId = computed(() => route.params.id);
 const { t } = useI18n();
 const route = useRoute();
-const rows = ref([]);
 const totalAmount = ref();
 const tableRef = ref();
 const filter = computed(() => {
@@ -28,7 +28,7 @@ const filter = computed(() => {
             },
         ],
         where: {
-            clientFk: route.params.id,
+            clientFk: entityId,
         },
     };
 });
@@ -84,14 +84,14 @@ const columns = computed(() => [
         create: true,
     },
 ]);
-
-const setRows = (data) => {
-    rows.value = data;
-    totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
-};
 </script>
 
 <template>
+    <FetchData
+        :url="`Greuges/${entityId}/sumAmount`"
+        auto-load
+        @on-fetch="({ sumAmount }) => (totalAmount = sumAmount)"
+    ></FetchData>
     <VnTable
         ref="tableRef"
         data-key="Greuges"
@@ -104,7 +104,6 @@ const setRows = (data) => {
         :is-editable="false"
         :use-model="true"
         :column-search="false"
-        @on-fetch="(data) => setRows(data)"
         :disable-option="{ card: true }"
         :create="{
             urlCreate: `Greuges`,

From cfdfc7f53100d2b2698cd3f36c0ab68639389ab1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 13:19:37 +0200
Subject: [PATCH 03/12] fix: CustomerSamples

---
 src/components/VnTable/VnTable.vue            |  7 +-
 src/components/ui/VnPaginate.vue              |  9 ++-
 src/composables/usePrintService.js            |  5 +-
 src/pages/Customer/Card/CustomerBalance.vue   | 80 +++++++------------
 .../components/CustomerSummaryTable.vue       |  1 +
 .../Card/InvoiceOutDescriptorMenu.vue         |  3 +-
 src/pages/Route/RouteList.vue                 | 19 +++--
 src/pages/Ticket/TicketFutureFilter.vue       |  4 +-
 8 files changed, 54 insertions(+), 74 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0ed3de261..d6008de0b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -369,7 +369,7 @@ function handleOnDataSaved(_) {
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
         :disable-infinite-scroll="
-            $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+            $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
         "
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
@@ -507,11 +507,8 @@ function handleOnDataSaved(_) {
                             :key="index"
                             :title="btn.title"
                             :icon="btn.icon"
-                            class="q-px-sm"
+                            class="q-px-sm text-primary-light"
                             flat
-                            :class="
-                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
-                            "
                             :style="`visibility: ${
                                 (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
                             }`"
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 441a8ff48..79a79c383 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -224,13 +224,20 @@ defineExpose({ fetch, addFilter, paginate });
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
-        <div v-if="isLoading" class="info-row q-pa-md text-center">
+        <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
             <QSpinner color="primary" size="md" />
         </div>
     </QInfiniteScroll>
 </template>
 
 <style lang="scss" scoped>
+.spinner {
+    z-index: 1;
+    align-content: end;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+}
 .info-row {
     width: 100%;
 
diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index ff43c65a1..68a009d7b 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -16,7 +16,7 @@ export function usePrintService() {
         );
     }
 
-    function openReport(path, params) {
+    function openReport(path, params, isNewTab = '_self') {
         if (typeof params === 'string') params = JSON.parse(params);
         params = Object.assign(
             {
@@ -26,8 +26,7 @@ export function usePrintService() {
         );
 
         const query = new URLSearchParams(params).toString();
-
-        window.open(`api/${path}?${query}`);
+        window.open(`api/${path}?${query}`, isNewTab);
     }
 
     return {
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 70747bb3f..2a1991bbd 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -5,12 +5,12 @@ import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import FetchData from 'components/FetchData.vue';
 
 import { toCurrency, toDate, toDateHourMin } from 'src/filters';
 import { useState } from 'composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { usePrintService } from 'composables/usePrintService';
-import { useSession } from 'composables/useSession';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -22,12 +22,10 @@ import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const { openConfirmationModal } = useVnConfirm();
-const { sendEmail } = usePrintService();
+const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
 const { hasAny } = useAcl();
-
-const session = useSession();
-const tokenMultimedia = session.getTokenMultimedia();
+const currentBalance = ref({});
 const quasar = useQuasar();
 const route = useRoute();
 const state = useState();
@@ -36,7 +34,7 @@ const user = state.getUser();
 
 const clientRisk = ref([]);
 const tableRef = ref();
-const companyId = ref();
+const companyId = ref(user.value.companyFk);
 const companyLastId = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
@@ -76,14 +74,14 @@ const companyFilterColumn = {
 
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'right',
         name: 'payed',
         label: t('Date'),
         format: ({ payed }) => toDate(payed),
         cardVisible: true,
     },
     {
-        align: 'left',
+        align: 'right',
         name: 'created',
         label: t('Creation date'),
         format: ({ created }) => toDateHourMin(created),
@@ -91,11 +89,10 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'workerFk',
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => ({ workerId: row.workerFk, tag: row.userName }),
+            attrs: ({ row }) => ({ workerId: row.workerFk, name: row.userName }),
         },
         cardVisible: true,
     },
@@ -120,14 +117,14 @@ const columns = computed(() => [
         isId: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'credit',
         label: t('Havings'),
         format: ({ credit }) => credit && toCurrency(credit),
         cardVisible: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'balance',
         label: t('Balance'),
         format: ({ balance }) => toCurrency(balance),
@@ -166,41 +163,15 @@ const columns = computed(() => [
 
 onBeforeMount(() => {
     stateStore.rightDrawer = true;
-    companyId.value = user.value.companyFk;
 });
 
-async function getClientRisk() {
-    const { data } = await axios.get(`clientRisks`, {
-        params: {
-            filter: JSON.stringify({
-                include: { relation: 'company', scope: { fields: ['code'] } },
-                where: { clientFk: route.params.id, companyFk: user.value.companyFk },
-            }),
-        },
-    });
-    clientRisk.value = data;
-    return clientRisk.value;
-}
-
-async function getCurrentBalance() {
-    const currentBalance = (await getClientRisk()).find((balance) => {
-        return balance.companyFk === companyId.value;
-    });
-    return currentBalance && currentBalance.amount;
-}
-
-async function onFetch(data) {
-    balances.value = [];
-    for (const [index, balance] of data.entries()) {
-        if (index === 0) {
-            balance.balance = await getCurrentBalance();
-            continue;
-        }
-        const previousBalance = data[index - 1];
-        balance.balance =
-            previousBalance?.balance - (previousBalance?.debit - previousBalance?.credit);
+async function getCurrentBalance(data) {
+    for (const balance of data) {
+        currentBalance.value[balance.companyFk] = {
+            code: balance.company.code,
+            amount: balance.amount,
+        };
     }
-    balances.value = data;
 }
 
 const showNewPaymentDialog = () => {
@@ -215,19 +186,27 @@ const showNewPaymentDialog = () => {
 };
 
 const showBalancePdf = ({ id }) => {
-    const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
-    window.open(url, '_blank');
+    openReport(`InvoiceOuts/${id}/download`, {}, '_blank');
 };
 </script>
 
 <template>
+    <FetchData
+        url="clientRisks"
+        :filter="{
+            include: { relation: 'company', scope: { fields: ['code'] } },
+            where: { clientFk: route.params.id, companyFk: companyId },
+        }"
+        auto-load
+        @on-fetch="getCurrentBalance"
+    ></FetchData>
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
                 <span class="text-bold">{{ t('Total by company') }}</span>
-                <div class="row justify-center" v-if="clientRisk?.length">
-                    {{ clientRisk[0].company.code }}:
-                    {{ toCurrency(clientRisk[0].amount) }}
+                <div class="row justify-center">
+                    {{ currentBalance[companyId]?.code }}:
+                    {{ toCurrency(currentBalance[companyId]?.amount) }}
                 </div>
             </div>
         </template>
@@ -253,7 +232,6 @@ const showBalancePdf = ({ id }) => {
         :right-search="false"
         :is-editable="false"
         :column-search="false"
-        @on-fetch="onFetch"
         :disable-option="{ card: true }"
         auto-load
     >
@@ -262,7 +240,7 @@ const showBalancePdf = ({ id }) => {
         </template>
         <template #column-description="{ row }">
             <div class="link" v-if="row.isInvoice">
-                {{ row.description }}
+                {{ t('bill', { ref: row.description }) }}
                 <InvoiceOutDescriptorProxy :id="row.description" />
             </div>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 87e4cffa7..374769a57 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -151,6 +151,7 @@ const setShippedColor = (date) => {
         :disable-option="{ card: true, table: true }"
         limit="5"
         class="full-width"
+        :disable-infinite-scroll="true"
     >
         <template #column-nickname="{ row }">
             <span class="link">
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 213e25b4a..08b21fb4a 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -41,8 +41,7 @@ const invoiceFormType = ref('pdf');
 const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
 const showInvoicePdf = () => {
-    const url = `api/InvoiceOuts/${$props.invoiceOutData.id}/download?access_token=${token}`;
-    window.open(url, '_blank');
+    openReport(`InvoiceOuts/${$props.invoiceOutData.id}/download`, {}, '_blank');
 };
 
 const showInvoiceCsv = () => {
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 7e2358236..1e20df99c 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -17,7 +17,9 @@ import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import { usePrintService } from 'src/composables/usePrintService';
 
+const { openReport } = usePrintService();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
@@ -235,18 +237,15 @@ const cloneRoutes = () => {
 const showRouteReport = () => {
     const ids = selectedRows.value.map((row) => row?.id);
     const idString = ids.join(',');
-    let url;
-
-    if (selectedRows.value.length <= 1) {
-        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
-    } else {
-        const params = new URLSearchParams({
-            access_token: session.getTokenMultimedia(),
+    let url = `Routes/${idString}/driver-route-pdf`;
+    let params = {};
+    if (selectedRows.value.length >= 1) {
+        params = {
             id: idString,
-        });
-        url = `api/Routes/downloadZip?${params.toString()}`;
+        };
+        url = `Routes/downloadZip`;
     }
-    window.open(url, '_blank');
+    openReport(url, params, '_blank');
 };
 
 function markAsServed() {
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index bb597a525..6345f62b3 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -153,7 +153,7 @@ onMounted(async () => {
                         :label="t('params.state')"
                         v-model="params.state"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
@@ -169,7 +169,7 @@ onMounted(async () => {
                         :label="t('params.futureState')"
                         v-model="params.futureState"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense

From dcb8c5daad7821cc786aa69d5eb0bfdd77db3546 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 12 Sep 2024 13:27:28 +0200
Subject: [PATCH 04/12] fix: workerDms filter workerFk

---
 src/pages/Worker/Card/WorkerDms.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerDms.vue b/src/pages/Worker/Card/WorkerDms.vue
index a4f7ef5a9..e2b62bc4f 100644
--- a/src/pages/Worker/Card/WorkerDms.vue
+++ b/src/pages/Worker/Card/WorkerDms.vue
@@ -10,6 +10,6 @@ const route = useRoute();
         delete-model="WorkerDms"
         download-model="WorkerDms"
         default-dms-code="hhrrData"
-        filter="worker"
+        filter="wd.workerFk"
     />
 </template>

From 8fc7e3cfb45291a6b0d2ed0427b371413b6ade2e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 20:43:50 +0200
Subject: [PATCH 05/12] fix: CustomerSamples

---
 src/pages/Customer/Card/CustomerSamples.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index 49697aab7..8e2ab92a0 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -1,7 +1,7 @@
 <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, useQuasar } from 'quasar';
 
@@ -13,7 +13,6 @@ import CustomerSamplesCreate from '../components/CustomerSamplesCreate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
 
 const filter = {
     include: [
@@ -42,7 +41,16 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('Worker'),
-        name: 'worker',
+        columnField: {
+            component: 'userLink',
+            attrs: ({ row }) => {
+                return {
+                    defaultName: true,
+                    workerId: row?.user?.id,
+                    name: row?.user?.name,
+                };
+            },
+        },
     },
     {
         align: 'left',
@@ -73,7 +81,9 @@ const tableRef = ref();
         :columns="columns"
         :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
+        :right-search="false"
         :rows="rows"
+        :order="['created DESC']"
         class="full-width q-mt-md"
         row-key="id"
         :create="false"

From 24f4af712ec3ab8e680a32b58619f58d649ef33a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 20:59:35 +0200
Subject: [PATCH 06/12] fix: CustomerMandates

---
 src/pages/Customer/Card/CustomerMandates.vue | 108 +++++--------------
 1 file changed, 27 insertions(+), 81 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue
index 7af3e5828..248515b4a 100644
--- a/src/pages/Customer/Card/CustomerMandates.vue
+++ b/src/pages/Customer/Card/CustomerMandates.vue
@@ -1,20 +1,19 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { toDateTimeFormat } from 'src/filters/date';
 
-import FetchData from 'components/FetchData.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const rows = ref([]);
-
 const filter = {
     include: [
-        { relation: 'mandateType', scope: { fields: ['id', 'name'] } },
+        { relation: 'mandateType', scope: { fields: ['id', 'code'] } },
         { relation: 'company', scope: { fields: ['id', 'code'] } },
     ],
     where: { clientFk: route.params.id },
@@ -22,114 +21,61 @@ const filter = {
     limit: 20,
 };
 
-const tableColumnComponents = {
-    id: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    company: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    type: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    registerDate: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    endDate: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'id',
-        label: t('Id'),
         name: 'id',
+        label: t('globals.id'),
+        field: 'id',
+        isId: true,
     },
     {
         align: 'left',
-        field: (row) => row.company.code,
-        label: t('Company'),
+        cardVisible: true,
+        format: ({ company }) => company.code,
+        label: t('globals.company'),
         name: 'company',
     },
     {
         align: 'left',
-        field: (row) => row.mandateType.name,
-        label: t('Type'),
+        cardVisible: true,
+        format: ({ mandateType }) => mandateType.code,
+        label: t('globals.type'),
         name: 'type',
     },
     {
         align: 'left',
-        field: 'created',
+        cardVisible: true,
         label: t('Register date'),
-        name: 'registerDate',
-        format: (value) => toDateTimeFormat(value),
+        name: 'created',
+        format: ({ created }) => toDateTimeFormat(created),
     },
     {
-        align: 'left',
-        field: 'finished',
+        align: 'right',
+        cardVisible: true,
+        name: 'finished',
         label: t('End date'),
-        name: 'endDate',
-        format: (value) => (value ? toDateTimeFormat(value) : '-'),
+        format: ({ finished }) => dashIfEmpty(toDateTimeFormat(finished)),
     },
 ]);
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        url="Mandates"
-    />
-
     <QPage class="column items-center q-pa-md">
-        <QTable
+        <VnTable
+            :filter="filter"
+            auto-load
+            url="Mandates"
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
             class="full-width q-mt-md"
-            row-key="id"
-            v-if="rows?.length"
-        >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                            class="rounded-borders q-pa-sm"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                        >
-                            {{ props.value }}
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-
-        <h5 class="flex justify-center color-vn-label" v-else>
-            {{ t('globals.noResults') }}
-        </h5>
+            :right-search="false"
+            :row-click="false"
+        />
     </QPage>
 </template>
 
 <i18n>
 es:
-    Id: Id
-    Company: Empresa
-    Type: Tipo
     Register date: Fecha alta
     End date: Fecha baja
 </i18n>

From 70d0132710a4f4075216642399edf94f70de4f6b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:03:19 +0200
Subject: [PATCH 07/12] fix: CustomerWebPayment

---
 src/pages/Customer/Card/CustomerWebPayment.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue
index 13ec6b128..482582078 100644
--- a/src/pages/Customer/Card/CustomerWebPayment.vue
+++ b/src/pages/Customer/Card/CustomerWebPayment.vue
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 
 import axios from 'axios';
 
-import { toCurrency, toDateHourMinSec } from 'src/filters';
+import { toCurrency, toDateHourMin } from 'src/filters';
 
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
 import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
@@ -74,7 +74,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Date'),
         name: 'date',
-        format: (value) => toDateHourMinSec(value),
+        format: (value) => toDateHourMin(value),
     },
     {
         align: 'left',

From 39f2deafc4b879426075095e28167642fd8845aa Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:08:41 +0200
Subject: [PATCH 08/12] fix: CustomerCreditOpinion workerDescriptor

---
 src/pages/Customer/Card/CustomerCreditOpinion.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 6a839ff3f..92fef1d76 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -44,7 +44,7 @@ const columns = computed(() => [
     {
         align: 'right',
         field: 'rating',
-        label: t('Rating'),
+        label: t('customer.summary.rating'),
         name: 'rating',
         create: true,
         columnCreate: {
@@ -56,7 +56,7 @@ const columns = computed(() => [
         align: 'right',
         field: 'recommendedCredit',
         format: ({ recommendedCredit }) => toCurrency(recommendedCredit),
-        label: t('Recommended credit'),
+        label: t('customer.summary.recommendCredit'),
         name: 'recommendedCredit',
         create: true,
         columnCreate: {
@@ -89,8 +89,8 @@ const columns = computed(() => [
         }"
     >
         <template #column-employee="{ row }">
-            <span class="link" @click.stop>{{ row.worker.user.nickname }}</span>
-            <WorkerDescriptorProxy :id="row.clientFk" />
+            <span class="link">{{ row.worker.user.nickname }}</span>
+            <WorkerDescriptorProxy :id="row.worker.id" />
         </template>
     </VnTable>
     <!-- <QTable
@@ -113,7 +113,6 @@ const columns = computed(() => [
 
 <i18n>
 es:
-    Rating: Clasificación
     Recommended credit: Crédito recomendado
     Since: Desde
     Employee: Empleado

From 54fc7f6394e2f7bdc2698145c424c948fe0d4fdd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:10:06 +0200
Subject: [PATCH 09/12] fix: CustomerRecovery transalate label

---
 src/pages/Customer/Card/CustomerRecoveries.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 3ea8998e9..48576ca20 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -92,7 +92,7 @@ function setFinished(id) {
         :disable-option="{ card: true }"
         :create="{
             urlCreate: 'Recoveries',
-            title: 'New recovery',
+            title: t('New recovery'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: { clientFk: route.params.id, started: Date.vnNew() },
         }"

From 6e784bb290d0f472f4e1d2c06a8f92dda8f45b59 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:11:51 +0200
Subject: [PATCH 10/12] fix: address-create i18n

---
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d29b864b9..213d302cb 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -133,6 +133,7 @@ globals:
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
+        'address-create': New address
         notes: Notes
         credits: Credits
         greuges: Greuges
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3d905509d..72d4fb1b1 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -136,6 +136,7 @@ globals:
         fiscalData: Datos fiscales
         billingData: Forma de pago
         consignees: Consignatarios
+        'address-create': Nuevo consignatario
         notes: Notas
         credits: Créditos
         greuges: Greuges

From fa408dc2267405062175a77c3d561b3a0fae4302 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:20:30 +0200
Subject: [PATCH 11/12] fix: CustomerAddress mobile

---
 src/pages/Customer/Card/CustomerAddress.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index a9e7affef..d76707079 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -179,6 +179,13 @@ const toCustomerAddressEdit = (addressId) => {
                             {{ item.postalCode }} - {{ item.city }},
                             {{ setProvince(item.provinceFk) }}
                         </div>
+                        <div>
+                            {{ item.phone }}
+                            <span v-if="item.mobile"
+                                >,
+                                {{ item.mobile }}
+                            </span>
+                        </div>
                         <div class="flex">
                             <QCheckbox
                                 :label="t('Is equalizated')"

From aca13d91196ed8b0b884a211a2323d013e4c6cd3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:26:28 +0200
Subject: [PATCH 12/12] fix: CustomerBillingData

---
 .../Customer/Card/CustomerBillingData.vue     | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 5eeaea50b..a968d0ec8 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -14,8 +13,6 @@ import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 const { t } = useI18n();
 const route = useRoute();
 
-const payMethods = ref([]);
-const bankEntitiesOptions = ref([]);
 const bankEntitiesRef = ref(null);
 
 const filter = {
@@ -31,15 +28,6 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <FetchData @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
-    <FetchData
-        ref="bankEntitiesRef"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        :filter="filter"
-        auto-load
-        url="BankEntities"
-    />
-
     <FormModel
         :url-update="`Clients/${route.params.id}`"
         :url="`Clients/${route.params.id}/getCard`"
@@ -49,8 +37,9 @@ const getBankEntities = (data, formData) => {
         <template #form="{ data, validate }">
             <VnRow>
                 <VnSelect
+                    auto-load
+                    url="PayMethods"
                     :label="t('Billing data')"
-                    :options="payMethods"
                     hide-selected
                     option-label="name"
                     option-value="id"
@@ -69,7 +58,10 @@ const getBankEntities = (data, formData) => {
                 </VnInput>
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
-                    :options="bankEntitiesOptions"
+                    ref="bankEntitiesRef"
+                    :filter="filter"
+                    auto-load
+                    url="BankEntities"
                     :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                     :rules="validate('Worker.bankEntity')"
                     hide-selected