From 40e46f5a72917d6a5b3201eb862aaa714f04dab2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 18:13:46 +0200
Subject: [PATCH 01/46] fix: refs #7830 customer credit

---
 src/components/FetchData.vue                                | 2 +-
 src/pages/Customer/Card/CustomerCreditContracts.vue         | 3 +++
 src/pages/Customer/Card/CustomerCreditOpinion.vue           | 5 +++++
 .../Customer/components/CustomerCreditContractsCreate.vue   | 6 ++++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 2a0864d3e..3038aa88e 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -44,7 +44,7 @@ onMounted(async () => {
 
 async function fetch(fetchFilter = {}) {
     try {
-        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
+        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
         if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 568adcf0b..1110b9f65 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -53,6 +53,8 @@ const openDialog = (item) => {
             promise: updateData,
         },
     });
+    updateData();
+    showQPageSticky.value = true;
 };
 
 const openViewCredit = (credit) => {
@@ -65,6 +67,7 @@ const openViewCredit = (credit) => {
 };
 
 const updateData = () => {
+    console.log('entrando');
     vnPaginateRef.value?.fetch();
 };
 </script>
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 9c060b1a5..2b85cbd7d 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -71,6 +71,10 @@ watch(
         clientInformasRef.value?.fetch();
     }
 );
+
+const onDataSaved = () => {
+    clientInformasRef.value?.fetch();
+};
 </script>
 
 <template>
@@ -86,6 +90,7 @@ watch(
         :form-initial-data="{}"
         :observe-form-changes="false"
         :url-create="`Clients/${route.params.id}/setRating`"
+        @on-data-saved="onDataSaved"
     >
         <template #form="{ data }">
             <VnRow>
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c4434e870..c25e59e1a 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive } from 'vue';
+import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -10,10 +10,12 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const routeId = computed(() => route.params.id);
 const router = useRouter();
 
 const initialData = reactive({
-    clientFK: Number(route.params.id),
+    started: Date.vnNew(),
+    clientFk: routeId.value,
 });
 
 const toCustomerCreditContracts = () => {

From c31aa3258ff2f679fcb363d745a73e61a4285d3c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 18:15:16 +0200
Subject: [PATCH 02/46] fix: refs #7830 remove console.log

---
 src/pages/Customer/Card/CustomerCreditContracts.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 1110b9f65..7b72a4d6d 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -67,7 +67,6 @@ const openViewCredit = (credit) => {
 };
 
 const updateData = () => {
-    console.log('entrando');
     vnPaginateRef.value?.fetch();
 };
 </script>

From bd83a959f7895c0c032d41053f1659678a523a54 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 14 Aug 2024 10:11:52 +0200
Subject: [PATCH 03/46] fix: customer credit opinion

---
 .../Customer/Card/CustomerCreditOpinion.vue   | 50 +++++++------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 2b85cbd7d..c164ab450 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -16,7 +16,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { t } = useI18n();
 const route = useRoute();
 
-const clientInformasRef = ref(null);
+const clientInformasRef = ref();
 const rows = ref([]);
 
 const filter = {
@@ -71,45 +71,35 @@ watch(
         clientInformasRef.value?.fetch();
     }
 );
-
-const onDataSaved = () => {
-    clientInformasRef.value?.fetch();
-};
 </script>
 
 <template>
     <FetchData
+        ref="clientInformasRef"
+        url="ClientInformas"
         :filter="filter"
         @on-fetch="(data) => (rows = data)"
         auto-load
-        ref="clientInformasRef"
-        url="ClientInformas"
     />
-
     <FormModel
         :form-initial-data="{}"
-        :observe-form-changes="false"
         :url-create="`Clients/${route.params.id}/setRating`"
-        @on-data-saved="onDataSaved"
+        @on-data-saved="clientInformasRef.fetch()"
     >
         <template #form="{ data }">
             <VnRow>
-                <div class="col">
-                    <VnInput
-                        :label="t('Rating')"
-                        clearable
-                        type="number"
-                        v-model.number="data.rating"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Recommended credit')"
-                        clearable
-                        type="number"
-                        v-model.number="data.recommendedCredit"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Rating')"
+                    clearable
+                    type="number"
+                    v-model.number="data.rating"
+                />
+                <VnInput
+                    :label="t('Recommended credit')"
+                    clearable
+                    type="number"
+                    v-model.number="data.recommendedCredit"
+                />
             </VnRow>
         </template>
     </FormModel>
@@ -125,17 +115,13 @@ const onDataSaved = () => {
             class="card-width q-px-lg"
         >
             <template #body-cell-employee="{ row }">
-                <QTd auto-width @click.stop>
-                    <QBtn color="blue" flat no-caps>{{ row.worker.user.nickname }}</QBtn>
+                <QTd @click.stop>
+                    <span class="link">{{ row.worker.user.nickname }}</span>
                     <WorkerDescriptorProxy :id="row.clientFk" />
                 </QTd>
             </template>
         </QTable>
     </div>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
 </template>
 
 <i18n>

From e45e551526313668bfb315f5649e4dbd2943b9ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 Aug 2024 15:16:35 +0200
Subject: [PATCH 04/46] feat: customer consumption

---
 src/components/VnTable/VnTable.vue            |   4 +-
 src/components/ui/CatalogItem.vue             |   5 -
 src/components/ui/VnFilterPanel.vue           |   2 +
 src/composables/useArrayData.js               |  18 +-
 src/css/app.scss                              |   5 +
 src/i18n/locale/en.yml                        |   4 +
 src/i18n/locale/es.yml                        |   4 +
 src/pages/Customer/Card/CustomerCard.vue      |   8 +-
 .../Customer/Card/CustomerConsumption.vue     | 176 +++++++++++++++++-
 .../Card/CustomerConsumptionFilter.vue        |   2 +-
 src/pages/Customer/Card/CustomerSamples.vue   |  88 ++++-----
 src/pages/Login/ResetPassword.vue             |   1 -
 12 files changed, 249 insertions(+), 68 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d6b35d4da..6f22a4dd9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -67,7 +67,7 @@ const $props = defineProps({
     },
     hasSubToolbar: {
         type: Boolean,
-        default: true,
+        default: null,
     },
     disableOption: {
         type: Object,
@@ -341,7 +341,7 @@ defineExpose({
             :search-url="searchUrl"
             :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
-            :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
+            :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
         >
             <template
diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index ef722483b..545bfbbb4 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -127,11 +127,6 @@ const dialog = ref(null);
     flex-direction: column;
     gap: 4px;
 
-    .subName {
-        color: var(--vn-label-color);
-        text-transform: uppercase;
-    }
-
     p {
         margin-bottom: 0;
     }
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index e3019663c..045f45bec 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -3,6 +3,7 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
+import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -190,6 +191,7 @@ async function remove(key) {
 }
 
 function formatValue(value) {
+    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..446816788 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,12 +86,26 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        if (filter?.where || store.filter?.where)
-            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        // ARRAY DATA FALLA AL JUNTAR WHERE'S
+        console.log(
+            'userParams?.filter?.where: ',
+            userParams?.filter?.where,
+            filter?.where,
+            store.filter?.where
+        );
+        if ((userParams?.filter?.where, filter?.where || store.filter?.where))
+            where = Object.assign(
+                userParams?.filter?.where ?? {},
+                filter?.where ?? {},
+                store.filter?.where ?? {}
+            );
         Object.assign(filter, store.filter);
         filter.where = where;
+        console.log('where: ', where);
         const params = { filter };
+        console.log('params: ', params);
 
+        delete userParams?.filter;
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
         if (store.order && store.order.length) params.filter.order = store.order;
diff --git a/src/css/app.scss b/src/css/app.scss
index c233b14f0..85a39b480 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -268,3 +268,8 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+
+.subName {
+    color: var(--vn-label-color);
+    text-transform: uppercase;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7d3682525..69373e23b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -93,6 +93,10 @@ globals:
     since: Since
     from: From
     to: To
+    quantity: Quantity
+    item: Item
+    ticket: Ticket
+    campaign: Campaign
     pageTitles:
         logIn: Login
         summary: Summary
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8157f1803..48b2d3ad4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -93,6 +93,10 @@ globals:
     since: Desde
     from: Desde
     to: Hasta
+    quantity: Cantidad
+    item: Artículo
+    ticket: Ticket
+    campaign: Campaña
     pageTitles:
         logIn: Inicio de sesión
         summary: Resumen
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 229946ea2..9562be001 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,14 +1,20 @@
 <script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import CustomerFilter from '../CustomerFilter.vue';
+const route = useRoute();
+
+const routeName = computed(() => route.name);
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        :filter-panel="CustomerFilter"
+        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
             url: 'Clients/extendedListFilter',
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 98a3115da..835223488 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,17 +1,183 @@
 <script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
-import { useStateStore } from 'src/stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useRoute } from 'vue-router';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
 const { t } = useI18n();
+const route = useRoute();
+const campaignList = ref();
+const columns = computed(() => [
+    {
+        name: 'search',
+        align: 'left',
+        label: t('globals.search'),
+        visible: false,
+    },
+    {
+        name: 'itemFk',
+        align: 'left',
+        label: t('globals.item'),
+        columnClass: 'shrink',
+        columnFilter: {
+            name: 'itemId',
+        },
+    },
+    {
+        name: 'ticketFk',
+        align: 'left',
+        label: t('globals.ticket'),
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        name: 'shipped',
+        align: 'left',
+        label: t('globals.shipped'),
+        format: ({ shipped }) => toDate(shipped),
+        columnFilter: false,
+    },
+    {
+        name: 'description',
+        align: 'left',
+        label: t('globals.description'),
+    },
+    {
+        name: 'quantity',
+        label: t('globals.quantity'),
+    },
+    {
+        name: 'grouped',
+        label: t('Group by items'),
+        component: 'checkbox',
+        visible: false,
+        orderBy: false,
+    },
+]);
+
+onBeforeMount(async () => {
+    campaignList.value = (await axios('Campaigns/latest')).data;
+});
+
+const filter = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        campaign: campaignList.value[0]?.id,
+        from: minDate,
+        to: maxDate,
+        filter: {
+            where: {
+                clientFk: route.params.id,
+            },
+        },
+    };
+});
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </Teleport>
+    <VnTable
+        v-if="campaignList"
+        data-key="CustomerConsumption"
+        url="Clients/consumption"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :columns="columns"
+        search-url="consumption"
+        :user-params="filter"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :has-sub-toolbar="true"
+        auto-load
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                color="primary"
+                icon="delete"
+                flat
+                @click="remove(selected)"
+                :disable="!selected?.length"
+                :title="t('globals.remove')"
+            />
+        </template>
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-description="{ row }">
+            <div>{{ row.concept }}</div>
+            <div v-if="row.subName" class="subName">
+                {{ row.subName }}
+            </div>
+            <FetchedTags :item="row" :max-length="3" />
+        </template>
+        <template #moreFilterPanel="{ params }">
+            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
+                <VnSelect
+                    v-model="params.campaign"
+                    :options="campaignList"
+                    :label="t('globals.campaign')"
+                    :filled="true"
+                    class="q-px-sm q-pt-none fit"
+                    dense
+                    option-label="code"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }}
+                                    {{
+                                        new Date(scope.opt?.dated).getFullYear()
+                                    }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInputDate
+                    v-model="params.to"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+                <VnInputDate
+                    v-model="params.from"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+            </div>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
     Enter a new search: Introduce una nueva búsqueda
+    Group by items: Agrupar por artículos
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..31289c007 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
 </script>
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" search-url="consumption">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index de998d8d3..e28e290f4 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -26,27 +26,20 @@ const filter = {
     limit: 20,
 };
 
+const basicSpan = {
+    component: 'span',
+    props: () => {},
+    event: () => {},
+};
 const tableColumnComponents = {
-    sent: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    description: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
+    sent: basicSpan,
+    description: basicSpan,
     worker: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    company: {
         component: 'span',
-        props: () => {},
+        props: () => ({ class: 'link' }),
         event: () => {},
     },
+    company: basicSpan,
 };
 
 const columns = computed(() => [
@@ -90,41 +83,34 @@ const toCustomerSamplesCreate = () => {
         url="ClientSamples"
     />
 
-    <div class="full-width flex justify-center">
-        <QPage class="card-width q-pa-lg">
-            <QTable
-                :columns="columns"
-                :pagination="{ rowsPerPage: 12 }"
-                :rows="rows"
-                class="full-width q-mt-md"
-                row-key="id"
-                :no-data-label="t('globals.noResults')"
-            >
-                <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 }}
-                                <WorkerDescriptorProxy
-                                    :id="props.row.userFk"
-                                    v-if="props.col.name === 'worker'"
-                                />
-                            </component>
-                        </QTr>
-                    </QTd>
-                </template>
-            </QTable>
-        </QPage>
-    </div>
+    <QTable
+        :columns="columns"
+        :pagination="{ rowsPerPage: 12 }"
+        :rows="rows"
+        class="full-width q-mt-md"
+        row-key="id"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell="props">
+            <QTd auto-width :props="props">
+                <span :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)"
+                        :title="props.value"
+                    >
+                        {{ props.value }}
+                        <WorkerDescriptorProxy
+                            :id="props.row.userFk"
+                            v-if="props.col.name === 'worker'"
+                        />
+                    </component>
+                </span>
+            </QTd>
+        </template>
+    </QTable>
 
     <QPageSticky :offset="[18, 18]">
         <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue
index eff718e97..2751f1ceb 100644
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@@ -33,7 +33,6 @@ async function onSubmit() {
     };
 
     try {
-        console.log('newPassword: ', newPassword);
         await axios.post(
             'VnUsers/reset-password',
             { newPassword: newPassword.value },

From f927e9b722e7c470487f4c711ba67aff0fc156f7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 19 Aug 2024 14:31:52 +0200
Subject: [PATCH 05/46] fix: #6943 fix customerSummaryTable

---
 .../components/CustomerSummaryTable.vue       | 31 +++++++++----------
 .../CustomerSummaryTableActions.vue           | 10 +++++-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index dc9969b61..c25870fd8 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -162,7 +162,8 @@ const navigateToticketSummary = (id) => {
         params: { id },
     });
 };
-const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
+const commonColumns = (col) =>
+    ['date', 'state', 'total', 'route', 'nickname'].includes(col);
 </script>
 
 <template>
@@ -190,13 +191,19 @@ const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
                             v-bind="tableColumnComponents[props.col.name].props(props)"
                         >
                             <template v-if="!commonColumns(props.col.name)">
-                                <span
-                                    :class="{
-                                        link:
-                                            props.col.name === 'route' ||
-                                            props.col.name === 'nickname',
-                                    }"
-                                >
+                                <span>
+                                    {{ props.value }}
+                                </span>
+                            </template>
+                            <template v-if="props.col.name === 'route'">
+                                <span class="link" @click.stop>
+                                    <RouteDescriptorProxy :id="props.row.routeFk" />
+                                    {{ props.value }}
+                                </span>
+                            </template>
+                            <template v-if="props.col.name === 'nickname'">
+                                <span class="link" @click.stop>
+                                    <CustomerDescriptorProxy :id="props.row.clientFk" />
                                     {{ props.value }}
                                 </span>
                             </template>
@@ -220,14 +227,6 @@ const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
                                 </QBadge>
                                 <div v-else>{{ toCurrency(props.value) }}</div>
                             </template>
-                            <CustomerDescriptorProxy
-                                :id="props.row.clientFk"
-                                v-if="props.col.name === 'nickname'"
-                            />
-                            <RouteDescriptorProxy
-                                :id="props.row.routeFk"
-                                v-if="props.col.name === 'route'"
-                            />
                         </component>
                     </QTr>
                 </QTd>
diff --git a/src/pages/Customer/components/CustomerSummaryTableActions.vue b/src/pages/Customer/components/CustomerSummaryTableActions.vue
index 6e9038374..154a37d22 100644
--- a/src/pages/Customer/components/CustomerSummaryTableActions.vue
+++ b/src/pages/Customer/components/CustomerSummaryTableActions.vue
@@ -1,10 +1,12 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
 
 const { t } = useI18n();
+const router = useRouter();
 
 defineProps({
     id: {
@@ -18,7 +20,13 @@ const { viewSummary } = useSummaryDialog();
 
 <template>
     <div>
-        <QIcon color="primary" name="vn:lines" size="sm">
+        {{ id }}
+        <QIcon
+            color="primary"
+            name="vn:lines"
+            size="sm"
+            @click.stop="router.push({ params: { id }, name: 'TicketSale' })"
+        >
             <QTooltip>
                 {{ t('Go to lines') }}
             </QTooltip>

From bc1ea611cede24ec2ac8ad95e17ef10d97862866 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 10:34:54 +0200
Subject: [PATCH 06/46] feat: CustomerConsumptionFilter

---
 .../Card/CustomerConsumptionFilter.vue        | 93 ++++++++++++++++++-
 .../Card/SupplierConsumptionFilter.vue        | 52 +++--------
 2 files changed, 102 insertions(+), 43 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..91536e954 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -5,6 +5,8 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { QItem } from 'quasar';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
 
 const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
@@ -33,6 +35,8 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.buyerId"
                         url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         :label="t('params.buyer')"
                         option-value="id"
                         option-label="nickname"
@@ -48,30 +52,93 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.typeId"
                         url="ItemTypes"
-                        :label="t('params.type')"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
                         option-label="name"
                         option-value="id"
                         dense
                         outlined
                         rounded
                     >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
                     </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
+                        v-model="params.categoryId"
                         url="ItemCategories"
-                        :label="t('params.category')"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
                         option-label="name"
                         option-value="id"
-                        v-model="params.categoryId"
                         dense
                         outlined
                         rounded
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -82,10 +149,30 @@ en:
         buyer: Buyer
         type: Type
         category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
 es:
     params:
         item: Id artículo
         buyer: Comprador
         type: Tipo
         category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
 </i18n>
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 3fc61b15e..401bde8fa 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -1,56 +1,21 @@
 <script setup>
-import { ref } from 'vue';
 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 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const buyersOptions = ref([]);
-const itemTypesOptions = ref([]);
-const itemCategoriesOptions = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        :filter="{
-            fields: ['id', 'nickname'],
-            order: 'nickname ASC',
-        }"
-        @on-fetch="(data) => (buyersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemTypes"
-        :filter="{
-            fields: ['id', 'name', 'categoryFk'],
-            include: 'category',
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemTypesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemCategories"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemCategoriesOptions = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -82,7 +47,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
                         @update:model-value="searchFn()"
-                        :options="buyersOptions"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
@@ -98,7 +65,10 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.typeId')"
                         v-model="params.typeId"
                         @update:model-value="searchFn()"
-                        :options="itemTypesOptions"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -125,7 +95,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
                         @update:model-value="searchFn()"
-                        :options="itemCategoriesOptions"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 0d99c5f609ce7e7a73b995669f028bfddeca4d01 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 15:30:22 +0200
Subject: [PATCH 07/46] feat: CustomerConsumptionFilter

---
 src/composables/usePrintService.js            |   1 +
 .../Customer/Card/CustomerConsumption.vue     | 166 ++++++++++++++++++
 .../Card/CustomerConsumptionFilter.vue        |  15 +-
 3 files changed, 180 insertions(+), 2 deletions(-)

diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index edf9598b2..ff43c65a1 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -17,6 +17,7 @@ export function usePrintService() {
     }
 
     function openReport(path, params) {
+        if (typeof params === 'string') params = JSON.parse(params);
         params = Object.assign(
             {
                 access_token: getTokenMultimedia(),
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 4d3da1116..a8c34991a 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,15 +1,181 @@
 <script setup>
+import { computed, ref, watch } from 'vue';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import { toDate } from 'src/filters';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
+import { usePrintService } from 'src/composables/usePrintService';
+import SendEmailDialog from 'src/components/common/SendEmailDialog.vue';
+
+const { openReport, sendEmail } = usePrintService();
+const arrayData = useArrayData('Client');
+const { t } = useI18n();
+const quasar = useQuasar();
+
+const route = useRoute();
+const tableRef = ref();
+const filter = computed(() => ({
+    where: { and: [{ isPackaging: false }, { clientFk: route.params.id }] },
+    limit: 30,
+    skip: 10,
+}));
+
+const showActionBtns = computed(() => handleQueryParams());
+function handleQueryParams() {
+    const query = JSON.parse(route.query.table);
+    return query.from && query.to;
+}
+watch(
+    () => route.query,
+    () => {
+        showActionBtns.value = handleQueryParams();
+    }
+);
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'ticketFk',
+        label: t('Ticket'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('Creation date'),
+        format: ({ shipped }) => toDate(shipped),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+
+    {
+        align: 'left',
+        name: 'description',
+        label: t('Description'),
+        class: 'extend',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'quantity',
+        label: t('Quantity'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+]);
+function getParams() {
+    const query = JSON.parse(route.query.table);
+    return {
+        from: query.from,
+        to: query.to,
+        recipient: arrayData.store.data.email,
+        recipientId: arrayData.store.data.id,
+    };
+}
+const openReportPdf = () => {
+    openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
+};
+
+const openSendEmailDialog = async () => {
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: arrayData.store.data.email,
+            },
+            promise: sendCampaignMetricsEmail,
+        },
+    });
+};
+const sendCampaignMetricsEmail = ({ address }) => {
+    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+        recipient: address,
+        ...getParams().value,
+    });
+};
 </script>
 
 <template>
     <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
         <CustomerConsumptionFilter data-key="CustomerConsumption" />
     </Teleport>
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn
+                color="primary"
+                icon-right="picture_as_pdf"
+                @click="openReportPdf()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                color="primary"
+                icon-right="email"
+                @click="openSendEmailDialog()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
+    <VnTable
+        data-key="CustomerConsumption"
+        ref="tableRef"
+        :filter="filter"
+        url="Clients/Consumption"
+        :columns="columns"
+        :right-search="false"
+        :use-model="true"
+        auto-load
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+    >
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+            <!-- <FetchedTags :item="row" :max-length="6" /> -->
+        </template>
+        <template #column-description="{ row }">
+            <FetchedTags :item="row" :max-length="6" />
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span> </template
+    ></VnTable>
 </template>
 
 <i18n>
 es:
+    Group by item: Agrupar por artículo
+
     Enter a new search: Introduce una nueva búsqueda
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 91536e954..0f5148007 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -12,14 +12,23 @@ const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
 </script>
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection
+                    ><QCheckbox
+                        v-model="params.grouped"
+                        :label="t('Group by item')"
+                        @update:model-value="searchFn()"
+                        dense
+                /></QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -145,6 +154,7 @@ defineProps({ dataKey: { type: String, required: true } });
 <i18n>
 en:
     params:
+        grouped: Group by item
         item: Item id
         buyer: Buyer
         type: Type
@@ -161,6 +171,7 @@ en:
         allSaints: All Saints' Day
 es:
     params:
+        grouped: Agrupar por artículo
         item: Id artículo
         buyer: Comprador
         type: Tipo

From 56f687ce3603e2383b4066c48b9445132e6fc4e9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 21:06:15 +0200
Subject: [PATCH 08/46] perf: sendEmail customerConsumption

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Customer/Card/CustomerConsumption.vue     | 38 ++++----
 .../Card/CustomerConsumptionFilter.vue        |  2 +-
 src/pages/Ticket/Card/TicketTransfer.vue      | 29 ++-----
 src/pages/Ticket/Card/TicketTransferForm.vue  | 86 +++++++++++++++++++
 6 files changed, 111 insertions(+), 46 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketTransferForm.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index aa7e83fb3..0c0ede5f7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -2,6 +2,7 @@ globals:
     lang:
         es: Spanish
         en: English
+    quantity: Quantity
     language: Language
     entity: Entity
     user: User
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 100bf54ad..e4392627c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -3,6 +3,7 @@ globals:
         es: Español
         en: Inglés
     language: Idioma
+    quantity: Cantidad
     entity: Entidad
     user: Usuario
     details: Detalles
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index a8c34991a..eddabc154 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { computed, ref, watch } from 'vue';
-import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
 import { useStateStore } from 'src/stores/useStateStore';
@@ -13,12 +12,12 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
-import SendEmailDialog from 'src/components/common/SendEmailDialog.vue';
+import { useVnConfirm } from 'src/composables/useVnConfirm';
 
+const { openConfirmationModal } = useVnConfirm();
 const { openReport, sendEmail } = usePrintService();
 const arrayData = useArrayData('Client');
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const route = useRoute();
 const tableRef = ref();
@@ -61,7 +60,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
-        label: t('Creation date'),
+        label: t('shipped'),
         format: ({ shipped }) => toDate(shipped),
         cardVisible: true,
         columnFilter: {
@@ -72,7 +71,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'description',
-        label: t('Description'),
+        label: t('globals.description'),
         class: 'extend',
         columnFilter: {
             inWhere: true,
@@ -81,7 +80,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'quantity',
-        label: t('Quantity'),
+        label: t('globals.quantity'),
         cardVisible: true,
         columnFilter: {
             inWhere: true,
@@ -102,20 +101,16 @@ const openReportPdf = () => {
 };
 
 const openSendEmailDialog = async () => {
-    quasar.dialog({
-        component: SendEmailDialog,
-        componentProps: {
-            data: {
-                address: arrayData.store.data.email,
-            },
-            promise: sendCampaignMetricsEmail,
-        },
-    });
+    openConfirmationModal(
+        t('The consumption report will be sent'),
+        t('Please, confirm'),
+        () => sendCampaignMetricsEmail({ address: arrayData.store.data.email })
+    );
 };
 const sendCampaignMetricsEmail = ({ address }) => {
-    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+    sendEmail(`Clients/${route.params.id}/campaign-metrics-email`, {
         recipient: address,
-        ...getParams().value,
+        ...getParams(),
     });
 };
 </script>
@@ -140,7 +135,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 @click="openSendEmailDialog()"
                 :disabled="!showActionBtns"
             >
-                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+                <QTooltip>{{ t('Send to email') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -160,7 +155,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
-            <!-- <FetchedTags :item="row" :max-length="6" /> -->
         </template>
         <template #column-description="{ row }">
             <FetchedTags :item="row" :max-length="6" />
@@ -175,7 +169,9 @@ const sendCampaignMetricsEmail = ({ address }) => {
 
 <i18n>
 es:
-    Group by item: Agrupar por artículo
-
+    Send to email: Enviar por email
+    Search by item id or name: Buscar por id de artículo o nombre
+    The consumption report will be sent: Se enviará el informe de consumo
+    Please, confirm: Por favor, confirma
     Enter a new search: Introduce una nueva búsqueda
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 0f5148007..52e6cdc79 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -24,7 +24,7 @@ defineProps({ dataKey: { type: String, required: true } });
                 <QItemSection
                     ><QCheckbox
                         v-model="params.grouped"
-                        :label="t('Group by item')"
+                        :label="t('params.grouped')"
                         @update:model-value="searchFn()"
                         dense
                 /></QItemSection>
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 9a22c764c..1944b80f4 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
+import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
@@ -135,9 +136,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :columns="destinationTicketColumns"
                 :title="t('Destination ticket')"
                 row-key="id"
-                :pagination="{ rowsPerPage: 0 }"
                 class="full-width q-mt-md"
-                :no-data-label="t('globals.noResults')"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,29 +157,11 @@ onMounted(() => (_transfer.value = $props.transfer));
                     </QTd>
                 </template>
 
+                <template #no-data>
+                    <TicketTransferForm v-bind="$props" />
+                </template>
                 <template #bottom>
-                    <QForm class="q-mt-lg full-width">
-                        <VnInput
-                            v-model.number="_transfer.ticketId"
-                            :label="t('Transfer to ticket')"
-                            :clearable="false"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="keyboard_arrow_right"
-                                    color="primary"
-                                    @click="transferSales(_transfer.ticketId)"
-                                    style="width: 30px"
-                                />
-                            </template>
-                        </VnInput>
-                        <QBtn
-                            :label="t('New ticket')"
-                            color="primary"
-                            class="full-width q-my-lg"
-                            @click="transferSales()"
-                        />
-                    </QForm>
+                    <TicketTransferForm v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
new file mode 100644
index 000000000..9507429e6
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+
+const $props = defineProps({
+    mana: {
+        type: Number,
+        default: null,
+    },
+    newPrice: {
+        type: Number,
+        default: 0,
+    },
+    transfer: {
+        type: Object,
+        default: () => {},
+    },
+    ticket: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['refreshData']);
+
+const router = useRouter();
+const { t } = useI18n();
+
+const _transfer = ref(null);
+
+const transferSales = async (ticketId) => {
+    const params = {
+        ticketId: ticketId,
+        sales: $props.transfer.sales,
+    };
+
+    const { data } = await axios.post(
+        `tickets/${$props.ticket.id}/transferSales`,
+        params
+    );
+
+    if (data && data.id === $props.ticket.id) emit('refreshData');
+    else router.push({ name: 'TicketSale', params: { id: data.id } });
+};
+
+onMounted(() => (_transfer.value = $props.transfer));
+</script>
+
+<template>
+    {{ _transfer }}
+    <QForm class="q-mt-lg full-width">
+        <VnInput
+            v-model.number="_transfer.ticketId"
+            :label="t('Transfer to ticket')"
+            :clearable="false"
+        >
+            <template #append>
+                <QBtn
+                    icon="keyboard_arrow_right"
+                    color="primary"
+                    @click="transferSales(_transfer.ticketId)"
+                    style="width: 30px"
+                />
+            </template>
+        </VnInput>
+        <QBtn
+            :label="t('New ticket')"
+            color="primary"
+            class="full-width q-my-lg"
+            @click="transferSales()"
+        />
+    </QForm>
+</template>
+
+<i18n>
+es:
+    Sales to transfer: Líneas a transferir
+    Destination ticket: Ticket destinatario
+    Transfer to ticket: Transferir a ticket
+    New ticket: Nuevo ticket
+</i18n>

From 6c887c36b10f302d419d794b644e45069111fb9d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Aug 2024 12:26:21 +0200
Subject: [PATCH 09/46] fix: CustomerDescriptor.bussinessTypeFk

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

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 0e76bcfed..ed68d1ce6 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -68,7 +68,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
             </VnLv>
             <VnLv
                 :label="t('customer.card.businessTypeFk')"
-                :value="entity.businessTypeFk"
+                :value="entity.businessType.description"
             />
         </template>
         <template #icons="{ entity }">

From 9a48cb07428c23769e72b0074bc55fcfac39c3e1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Aug 2024 12:26:31 +0200
Subject: [PATCH 10/46] feat: VnImg draggable

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

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 9585b81d8..7dbc3ac2a 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -52,6 +52,7 @@ defineExpose({
 </script>
 <template>
     <QImg
+        :draggable="true"
         :class="{ zoomIn: zoom }"
         :src="getUrl()"
         v-bind="$attrs"
@@ -60,6 +61,7 @@ defineExpose({
     />
     <QDialog v-if="$props.zoom" v-model="show">
         <QImg
+            :draggable="true"
             :src="getUrl(true)"
             v-bind="$attrs"
             spinner-color="primary"

From 10747d7a4ff49d7057e3d49425e5075871dc2958 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:28 +0200
Subject: [PATCH 11/46] perf: customerSummaryTable

---
 src/components/VnTable/VnTable.vue            |  16 +-
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   2 +
 src/pages/Customer/Card/CustomerSummary.vue   |  32 ++-
 .../components/CustomerSummaryTable.vue       | 249 ++++++++----------
 .../CustomerSummaryTableActions.vue           |  52 ----
 6 files changed, 139 insertions(+), 213 deletions(-)
 delete mode 100644 src/pages/Customer/components/CustomerSummaryTableActions.vue

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6c77d44df..1708f9b6c 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -65,6 +65,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    disableInfiniteScroll: {
+        type: Boolean,
+        default: false,
+    },
     hasSubToolbar: {
         type: Boolean,
         default: true,
@@ -335,11 +339,13 @@ defineExpose({
     <div class="q-px-md">
         <CrudModel
             v-bind="$attrs"
-            :limit="20"
+            :limit="$attrs['limit'] ?? 20"
             ref="CrudModelRef"
             @on-fetch="(...args) => emit('onFetch', ...args)"
             :search-url="searchUrl"
-            :disable-infinite-scroll="isTableMode"
+            :disable-infinite-scroll="
+                $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+            "
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
@@ -486,11 +492,7 @@ defineExpose({
                                 :icon="btn.icon"
                                 class="q-px-sm"
                                 flat
-                                :class="
-                                    btn.isPrimary
-                                        ? 'text-primary-light'
-                                        : 'color-vn-text '
-                                "
+                                :class="'text-primary-light'"
                                 :style="`visibility: ${
                                     (btn.show && btn.show(row)) ?? true
                                         ? 'visible'
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0c0ede5f7..7bb4dcd64 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -375,6 +375,7 @@ customer:
         averageInvoiced: Average invoiced
         claimRate: Claming rate
         risk: Risk
+        maximumRisk: Solunion's maximum risk
         riskInfo: Invoices minus payments plus orders not yet invoiced
         credit: Credit
         creditInfo: Company's maximum risk
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e4392627c..bc0934e6d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -373,6 +373,8 @@ customer:
         priceIncreasingRate: Ratio de incremento de precio
         averageInvoiced: Facturación media
         claimRate: Ratio de reclamaciones
+        maximumRisk: Riesgo máximo asumido por Solunion
+
         risk: Riesgo
         riskInfo: Facturas menos recibos mas pedidos sin facturar
         credit: Crédito
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 15bf19b48..cee8b7c0a 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -2,6 +2,8 @@
 import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -40,11 +42,11 @@ const balanceDue = computed(() => {
 const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
-    return customer.value.claimsRatio.claimingRate;
+    return customer.value.claimsRatio?.claimingRate ?? 0;
 });
 
 const priceIncreasingRate = computed(() => {
-    return customer.value.claimsRatio.priceIncreasing / 100;
+    return customer.value.claimsRatio?.priceIncreasing ?? 0 / 100;
 });
 
 const debtWarning = computed(() => {
@@ -91,7 +93,13 @@ const creditWarning = computed(() => {
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
                     :value="entity?.salesPersonUser?.name"
-                />
+                >
+                    <template #value>
+                        <VnUserLink
+                            :name="entity.salesPersonUser?.name"
+                            :worker-id="entity.salesPersonFk"
+                        /> </template
+                ></VnLv>
                 <VnLv
                     :label="t('customer.summary.contactChannel')"
                     :value="entity?.contactChannel?.name"
@@ -131,7 +139,7 @@ const creditWarning = computed(() => {
                     :url="`#/customer/${entityId}/fiscal-data`"
                     :text="t('customer.summary.fiscalData')"
                 />
-                <VnRow>
+                <VnRow class="block">
                     <VnLv
                         :label="t('customer.summary.isEqualizated')"
                         :value="entity.isEqualizated"
@@ -140,8 +148,8 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.isActive')"
                         :value="entity.isActive"
                     />
-                </VnRow>
-                <VnRow>
+                    <!-- </VnRow>
+                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.verifiedData')"
                         :value="entity.isTaxDataChecked"
@@ -150,8 +158,8 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.hasToInvoice')"
                         :value="entity.hasToInvoice"
                     />
-                </VnRow>
-                <VnRow>
+                    <!-- </VnRow>
+                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
@@ -170,7 +178,7 @@ const creditWarning = computed(() => {
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
-                <VnRow class="q-mt-sm" wrap>
+                <VnRow class="q-mt-sm block">
                     <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
                     <VnLv
                         :label="t('customer.summary.hasCoreVnl')"
@@ -227,7 +235,6 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.mana?.mana)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.priceIncreasingRate')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
@@ -236,7 +243,6 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.averageInvoiced?.invoiced)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
@@ -262,12 +268,10 @@ const creditWarning = computed(() => {
                 />
 
                 <VnLv
-                    v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
                     :value="toCurrency(entity.creditInsurance)"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
-
                 <VnLv
                     :label="t('customer.summary.balance')"
                     :value="toCurrency(entity.sumRisk) || toCurrency(0)"
@@ -297,7 +301,7 @@ const creditWarning = computed(() => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard>
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index c25870fd8..da310934d 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -1,22 +1,25 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { QBtn, date } from 'quasar';
+import { date } from 'quasar';
+import { toDateFormat } from 'src/filters/date.js';
 
 import { toCurrency } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
-import CustomerSummaryTableActions from './CustomerSummaryTableActions.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
+
+import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+// import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-
-const rows = ref([]);
+const { viewSummary } = useSummaryDialog();
 
 const filter = {
     include: [
@@ -32,57 +35,6 @@ const filter = {
     ],
     where: { clientFk: route.params.id },
     order: ['shipped DESC', 'id'],
-    limit: 10,
-};
-
-const tableColumnComponents = {
-    id: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    nickname: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    agency: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    route: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: () => {},
-    },
-    packages: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    date: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    state: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    total: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    actions: {
-        component: CustomerSummaryTableActions,
-        props: (prop) => ({
-            id: prop.row.id,
-        }),
-        event: () => {},
-    },
 };
 
 const columns = computed(() => [
@@ -94,21 +46,18 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'nickname',
         label: t('Nickname'),
         name: 'nickname',
     },
     {
         align: 'left',
-        field: (row) => row?.agencyMode?.name,
+        format: (row) => row.agencyMode.name,
         label: t('Agency'),
-        name: 'agency',
     },
     {
         align: 'left',
-        field: 'routeFk',
+        name: 'routeFk',
         label: t('Route'),
-        name: 'route',
     },
     {
         align: 'left',
@@ -118,13 +67,12 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: (row) => date.formatDate(row?.shipped, 'DD/MM/YYYY'),
+        format: ({ shipped }) => date.formatDate(shipped, 'DD/MM/YYYY'),
         label: t('Date'),
-        name: 'date',
+        name: 'shipped',
     },
     {
         align: 'left',
-        field: (row) => row?.ticketState?.state?.name,
         label: t('State'),
         name: 'state',
     },
@@ -134,11 +82,26 @@ const columns = computed(() => [
         label: t('Total'),
         name: 'total',
     },
+
     {
-        align: 'left',
-        field: 'totalWithVat',
+        align: 'right',
         label: '',
-        name: 'actions',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'vn:lines',
+                action: ({ id }) =>
+                    router.push({ params: { id }, name: 'TicketSummary' }),
+                isPrimary: true,
+            },
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row.id, TicketSummary),
+            },
+        ],
     },
 ]);
 
@@ -156,83 +119,89 @@ const setTotalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const navigateToticketSummary = (id) => {
-    router.push({
-        name: 'TicketSummary',
-        params: { id },
-    });
+const setShippedColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    const ticketShipped = new Date(date);
+    ticketShipped.setHours(0, 0, 0, 0);
+
+    const difference = today - ticketShipped;
+
+    if (difference == 0) return 'warning';
+    if (difference < 0) return 'success';
 };
-const commonColumns = (col) =>
-    ['date', 'state', 'total', 'route', 'nickname'].includes(col);
 </script>
 
 <template>
-    <FetchData
+    <VnTable
+        data-key="CustomerTickets"
         :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
         url="Tickets"
-    />
-    <QCard class="vn-one q-py-sm flex justify-between">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width"
-            row-key="id"
-        >
-            <template #body-cell="props">
-                <QTd :props="props" @click="navigateToticketSummary(props.row.id)">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                            class="rounded-borders"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                        >
-                            <template v-if="!commonColumns(props.col.name)">
-                                <span>
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'route'">
-                                <span class="link" @click.stop>
-                                    <RouteDescriptorProxy :id="props.row.routeFk" />
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'nickname'">
-                                <span class="link" @click.stop>
-                                    <CustomerDescriptorProxy :id="props.row.clientFk" />
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'date'">
-                                <QBadge class="q-pa-sm" color="warning">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'state'">
-                                <QBadge :color="setStateColor(props.row)" class="q-pa-sm">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'total'">
-                                <QBadge
-                                    :color="setTotalPriceColor(props.row)"
-                                    class="q-pa-sm"
-                                    v-if="setTotalPriceColor(props.row)"
-                                >
-                                    {{ toCurrency(props.value) }}
-                                </QBadge>
-                                <div v-else>{{ toCurrency(props.value) }}</div>
-                            </template>
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QCard>
+        :columns="columns"
+        search-url="tickets"
+        :without-header="true"
+        auto-load
+        order="shipped DESC, id"
+        limit="5"
+    >
+        <template #column-nickname="{ row }">
+            <span class="link">
+                {{ row.nickname }}
+                <TicketDescriptorProxy :id="row.nickname" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+
+        <template #column-routeFk="{ row }">
+            <span class="link">
+                {{ row.routeFk }}
+                <RouteDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-total="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                v-if="setTotalPriceColor(row)"
+                :color="setTotalPriceColor(row)"
+            >
+                <!-- {{ setTotalPriceColor(row) }} -->
+                {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
+            <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
+        </template>
+        <template #column-state="{ row }">
+            <span v-if="row.invoiceOut">
+                <span :class="{ link: row.invoiceOut.ref }">
+                    {{ row.invoiceOut.ref }}
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />
+                </span>
+            </span>
+            <QBadge
+                class="q-pa-sm"
+                :color="setStateColor(row)"
+                v-else-if="setStateColor(row)"
+            >
+                {{ row?.ticketState?.state.name }}
+            </QBadge>
+            <span v-else> {{ row?.ticketState?.state.name }}</span>
+        </template>
+        <template #column-shipped="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                :color="setShippedColor(row.shipped)"
+                v-if="setShippedColor(row.shipped)"
+            >
+                {{ toDateFormat(row.shipped) }}
+            </QBadge>
+            <span v-else> {{ toDateFormat(row.shipped) }}</span>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/components/CustomerSummaryTableActions.vue b/src/pages/Customer/components/CustomerSummaryTableActions.vue
deleted file mode 100644
index 154a37d22..000000000
--- a/src/pages/Customer/components/CustomerSummaryTableActions.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
-
-const { t } = useI18n();
-const router = useRouter();
-
-defineProps({
-    id: {
-        type: Number,
-        required: true,
-    },
-});
-
-const { viewSummary } = useSummaryDialog();
-</script>
-
-<template>
-    <div>
-        {{ id }}
-        <QIcon
-            color="primary"
-            name="vn:lines"
-            size="sm"
-            @click.stop="router.push({ params: { id }, name: 'TicketSale' })"
-        >
-            <QTooltip>
-                {{ t('Go to lines') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            @click.stop="viewSummary(id, TicketSummary)"
-            class="q-ml-md"
-            color="primary"
-            name="preview"
-            size="sm"
-        >
-            <QTooltip>
-                {{ t('Preview') }}
-            </QTooltip>
-        </QIcon>
-    </div>
-</template>
-
-<i18n>
-es:
-    Go to lines: Ir a lineas
-    Preview: Vista previa
-</i18n>

From db97e8322e5a895c73e8b4e2d8221b86b27cd6f6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:40 +0200
Subject: [PATCH 12/46] feat: change url CustomerList

---
 src/pages/Customer/CustomerList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..12580a06f 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -359,6 +359,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
             },
         ],
@@ -395,7 +396,7 @@ function handleLocation(data, location) {
     <VnTable
         ref="tableRef"
         data-key="Customer"
-        url="Clients/extendedListFilter"
+        url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
             title: 'Create client',

From 61c7c622f72fd05071115c12ff766874b811c964 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:54 +0200
Subject: [PATCH 13/46] perf: update CustommerDescriptor

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index ed68d1ce6..274e0f376 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -57,7 +57,11 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.creditInsurance)"
             />
 
-            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
+            <VnLv
+                :label="t('customer.card.debt')"
+                :value="toCurrency(entity.debt)"
+                :info="t('customer.summary.riskInfo')"
+            />
             <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink

From 452b084cafcdc7b463c258a0e4b6ef2079d15c5a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:13:49 +0200
Subject: [PATCH 14/46] feat: change QBadge color

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index da310934d..fd41cdd35 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -48,15 +48,18 @@ const columns = computed(() => [
         align: 'left',
         label: t('Nickname'),
         name: 'nickname',
+        columnClass: 'expand',
     },
     {
         align: 'left',
         format: (row) => row.agencyMode.name,
+        columnClass: 'expand',
         label: t('Agency'),
     },
     {
         align: 'left',
         name: 'routeFk',
+        columnClass: 'shrink',
         label: t('Route'),
     },
     {
@@ -64,6 +67,7 @@ const columns = computed(() => [
         field: 'packages',
         label: t('Packages'),
         name: 'packages',
+        columnClass: 'shrink',
     },
     {
         align: 'left',
@@ -169,8 +173,8 @@ const setShippedColor = (date) => {
                 class="q-pa-sm"
                 v-if="setTotalPriceColor(row)"
                 :color="setTotalPriceColor(row)"
+                text-color="black"
             >
-                <!-- {{ setTotalPriceColor(row) }} -->
                 {{ toCurrency(row.totalWithVat) }}
             </QBadge>
             <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
@@ -185,6 +189,7 @@ const setShippedColor = (date) => {
             <QBadge
                 class="q-pa-sm"
                 :color="setStateColor(row)"
+                text-color="black"
                 v-else-if="setStateColor(row)"
             >
                 {{ row?.ticketState?.state.name }}
@@ -195,6 +200,7 @@ const setShippedColor = (date) => {
             <QBadge
                 class="q-pa-sm"
                 :color="setShippedColor(row.shipped)"
+                text-color="black"
                 v-if="setShippedColor(row.shipped)"
             >
                 {{ toDateFormat(row.shipped) }}

From b481876e819708f154b3aad6a65cc552a68dd083 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:37:30 +0200
Subject: [PATCH 15/46] fix: CustommerSummaryTable Proxy

---
 .../Customer/components/CustomerSummaryTable.vue   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index fd41cdd35..cd519eb54 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -15,6 +15,7 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 // import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -141,31 +142,28 @@ const setShippedColor = (date) => {
     <VnTable
         data-key="CustomerTickets"
         :filter="filter"
+        :right-search="false"
+        :column-search="false"
         url="Tickets"
         :columns="columns"
         search-url="tickets"
         :without-header="true"
         auto-load
         order="shipped DESC, id"
+        :disable-option="{ card: true, table: true }"
         limit="5"
     >
         <template #column-nickname="{ row }">
             <span class="link">
                 {{ row.nickname }}
-                <TicketDescriptorProxy :id="row.nickname" />
-            </span>
-        </template>
-        <template #column-ticketFk="{ row }">
-            <span class="link">
-                {{ row.ticketFk }}
-                <TicketDescriptorProxy :id="row.ticketFk" />
+                <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
 
         <template #column-routeFk="{ row }">
             <span class="link">
                 {{ row.routeFk }}
-                <RouteDescriptorProxy :id="row.ticketFk" />
+                <RouteDescriptorProxy :id="row.routeFk" />
             </span>
         </template>
         <template #column-total="{ row }">

From 20ddabcc0183971eee3edc3c87771d85b7b4b737 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 16:30:32 +0200
Subject: [PATCH 16/46] Merge remote-tracking branch
 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable

---
 src/i18n/locale/en.yml                        |   1 -
 src/i18n/locale/es.yml                        |   1 -
 .../Customer/Card/CustomerConsumption.vue     | 201 ++++++++++++------
 .../Card/CustomerConsumptionFilter.vue        | 189 ----------------
 4 files changed, 138 insertions(+), 254 deletions(-)
 delete mode 100644 src/pages/Customer/Card/CustomerConsumptionFilter.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 048be1d30..5a72fb812 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -95,7 +95,6 @@ globals:
     from: From
     to: To
     notes: Notes
-    quantity: Quantity
     item: Item
     ticket: Ticket
     campaign: Campaign
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8c68299da..e5b0d24ee 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -95,7 +95,6 @@ globals:
     from: Desde
     to: Hasta
     notes: Notas
-    quantity: Cantidad
     item: Artículo
     ticket: Ticket
     campaign: Campaña
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 9ea809cef..6d4da3a28 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,84 +1,76 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
-import { useStateStore } from 'src/stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useRoute } from 'vue-router';
+
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import { toDate } from 'src/filters';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
 import { useVnConfirm } from 'src/composables/useVnConfirm';
 
 const { openConfirmationModal } = useVnConfirm();
 const { openReport, sendEmail } = usePrintService();
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
 const arrayData = useArrayData('Client');
 const { t } = useI18n();
-
 const route = useRoute();
-const tableRef = ref();
-const filter = computed(() => ({
-    where: { and: [{ isPackaging: false }, { clientFk: route.params.id }] },
-    limit: 30,
-    skip: 10,
-}));
-
+const campaignList = ref();
 const showActionBtns = computed(() => handleQueryParams());
 function handleQueryParams() {
-    const query = JSON.parse(route.query.table);
+    const query = getQueryParams();
     return query.from && query.to;
 }
-watch(
-    () => route.query,
-    () => {
-        showActionBtns.value = handleQueryParams();
-    }
-);
 const columns = computed(() => [
     {
+        name: 'search',
         align: 'left',
+        label: t('globals.search'),
+        visible: false,
+    },
+    {
         name: 'itemFk',
-        label: t('Item'),
+        align: 'left',
+        label: t('globals.item'),
+        columnClass: 'shrink',
         cardVisible: true,
         columnFilter: {
-            inWhere: true,
+            name: 'itemId',
         },
     },
     {
-        align: 'left',
         name: 'ticketFk',
-        label: t('Ticket'),
+        align: 'left',
+        label: t('globals.ticket'),
         cardVisible: true,
         columnFilter: {
             inWhere: true,
         },
     },
     {
-        align: 'left',
         name: 'shipped',
-        label: t('shipped'),
+        align: 'left',
+        label: t('globals.shipped'),
         format: ({ shipped }) => toDate(shipped),
+        columnFilter: false,
         cardVisible: true,
-        columnFilter: {
-            inWhere: true,
-        },
     },
-
     {
-        align: 'left',
         name: 'description',
+        align: 'left',
         label: t('globals.description'),
-        class: 'extend',
+        columnClass: 'expand',
         columnFilter: {
             inWhere: true,
         },
     },
     {
-        align: 'left',
         name: 'quantity',
         label: t('globals.quantity'),
         cardVisible: true,
@@ -86,9 +78,24 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
+    {
+        name: 'grouped',
+        label: t('Group by items'),
+        component: 'checkbox',
+        visible: false,
+        orderBy: false,
+    },
 ]);
+
+onBeforeMount(async () => {
+    campaignList.value = (await axios('Campaigns/latest')).data;
+});
+
+function getQueryParams() {
+    return JSON.parse(route.query.consumption);
+}
 function getParams() {
-    const query = JSON.parse(route.query.table);
+    const query = getQueryParams();
     return {
         from: query.from,
         to: query.to,
@@ -96,6 +103,25 @@ function getParams() {
         recipientId: arrayData.store.data.id,
     };
 }
+const filter = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        campaign: campaignList.value[0]?.id,
+        from: minDate,
+        to: maxDate,
+        filter: {
+            where: {
+                clientFk: route.params.id,
+            },
+        },
+    };
+});
 const openReportPdf = () => {
     openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
 };
@@ -116,13 +142,32 @@ const sendCampaignMetricsEmail = ({ address }) => {
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </Teleport>
-    <VnSubToolbar>
-        <template #st-actions>
+    <VnTable
+        v-if="campaignList"
+        data-key="CustomerConsumption"
+        url="Clients/consumption"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :columns="columns"
+        search-url="consumption"
+        :user-params="filter"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :has-sub-toolbar="true"
+        auto-load
+    >
+        <template #moreBeforeActions>
+            <!-- <QBtn
+                color="primary"
+                icon="delete"
+                flat
+                @click="remove(selected)"
+                :disable="!selected?.length"
+                :title="t('globals.remove')"
+            /> -->
             <QBtn
                 color="primary"
+                flat
                 icon-right="picture_as_pdf"
                 @click="openReportPdf()"
                 :disabled="!showActionBtns"
@@ -131,6 +176,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
             </QBtn>
             <QBtn
                 color="primary"
+                flat
                 icon-right="email"
                 @click="openSendEmailDialog()"
                 :disabled="!showActionBtns"
@@ -138,41 +184,70 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 <QTooltip>{{ t('Send to email') }}</QTooltip>
             </QBtn>
         </template>
-    </VnSubToolbar>
-    <VnTable
-        data-key="CustomerConsumption"
-        ref="tableRef"
-        :filter="filter"
-        url="Clients/Consumption"
-        :columns="columns"
-        :right-search="false"
-        :use-model="true"
-        auto-load
-        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
-    >
         <template #column-itemFk="{ row }">
             <span class="link">
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
         </template>
-        <template #column-description="{ row }">
-            <FetchedTags :item="row" :max-length="6" />
-        </template>
         <template #column-ticketFk="{ row }">
             <span class="link">
                 {{ row.ticketFk }}
                 <TicketDescriptorProxy :id="row.ticketFk" />
-            </span> </template
-    ></VnTable>
+            </span>
+        </template>
+        <template #column-description="{ row }">
+            <div>{{ row.concept }}</div>
+            <div v-if="row.subName" class="subName">
+                {{ row.subName }}
+            </div>
+            <FetchedTags :item="row" :max-length="3" />
+        </template>
+        <template #moreFilterPanel="{ params }">
+            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
+                <VnSelect
+                    v-model="params.campaign"
+                    :options="campaignList"
+                    :label="t('globals.campaign')"
+                    :filled="true"
+                    class="q-px-sm q-pt-none fit"
+                    dense
+                    option-label="code"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }}
+                                    {{
+                                        new Date(scope.opt?.dated).getFullYear()
+                                    }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInputDate
+                    v-model="params.to"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+                <VnInputDate
+                    v-model="params.from"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+            </div>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
-    Send to email: Enviar por email
-    Search by item id or name: Buscar por id de artículo o nombre
-    The consumption report will be sent: Se enviará el informe de consumo
-    Please, confirm: Por favor, confirma
     Enter a new search: Introduce una nueva búsqueda
     Group by items: Agrupar por artículos
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
deleted file mode 100644
index b960186f4..000000000
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import { QItem } from 'quasar';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { QItemSection } from 'quasar';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import { toDate } from 'src/filters';
-
-const { t } = useI18n();
-defineProps({ dataKey: { type: String, required: true } });
-</script>
-<template>
-    <VnFilterPanel :data-key="dataKey" search-url="consumption" :redirect="false">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection
-                    ><QCheckbox
-                        v-model="params.grouped"
-                        :label="t('params.grouped')"
-                        @update:model-value="searchFn()"
-                        dense
-                /></QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.item')"
-                        v-model="params.itemId"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.buyerId"
-                        url="TicketRequests/getItemTypeWorker"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname ASC"
-                        :label="t('params.buyer')"
-                        option-value="id"
-                        option-label="nickname"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <!--It's required to include the relation category !! There's 413 records in production-->
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.typeId"
-                        url="ItemTypes"
-                        :include="['category']"
-                        :fields="['id', 'name', 'categoryFk']"
-                        sort-by="name ASC"
-                        :label="t('params.typeId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.category?.name
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.categoryId"
-                        url="ItemCategories"
-                        :fields="['id', 'name']"
-                        sort-by="name ASC"
-                        :label="t('params.categoryId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.campaignId"
-                        url="Campaigns/latest"
-                        sort-by="dated DESC"
-                        :label="t('params.campaignId')"
-                        option-label="code"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.code}`)
-                                    }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        toDate(scope.opt.dated)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.from')"
-                        v-model="params.from"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.to')"
-                        v-model="params.to"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-en:
-    params:
-        grouped: Group by item
-        item: Item id
-        buyer: Buyer
-        type: Type
-        category: Category
-        itemId: Item id
-        buyerId: Buyer
-        typeId: Type
-        categoryId: Category
-        from: From
-        to: To
-        campaignId: Campaña
-        valentinesDay: Valentine's Day
-        mothersDay: Mother's Day
-        allSaints: All Saints' Day
-es:
-    params:
-        grouped: Agrupar por artículo
-        item: Id artículo
-        buyer: Comprador
-        type: Tipo
-        category: Categoría
-        itemId: Id Artículo
-        buyerId: Comprador
-        typeId: Tipo
-        categoryId: Reino
-        from: Desde
-        to: Hasta
-        campaignId: Campaña
-        valentinesDay: Día de San Valentín
-        mothersDay: Día de la Madre
-        allSaints: Día de Todos los Santos
-</i18n>

From ca74ad85b44e95894c9505a3ec4b5e5cd1c4d275 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 20:46:51 +0200
Subject: [PATCH 17/46] fix: Customerconsumption

---
 .../Customer/Card/CustomerConsumption.vue     | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 6d4da3a28..27c1b746c 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onBeforeMount } from 'vue';
+import { ref, computed, onBeforeMount, onMounted } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters/index';
@@ -90,9 +90,12 @@ const columns = computed(() => [
 onBeforeMount(async () => {
     campaignList.value = (await axios('Campaigns/latest')).data;
 });
+// onMounted(() => {
+//     showActionBtns.value = handleQueryParams();
+// });
 
 function getQueryParams() {
-    return JSON.parse(route.query.consumption);
+    return JSON.parse(route.query.consumption ?? '{}');
 }
 function getParams() {
     const query = getQueryParams();
@@ -103,7 +106,7 @@ function getParams() {
         recipientId: arrayData.store.data.id,
     };
 }
-const filter = computed(() => {
+const userParams = computed(() => {
     const minDate = Date.vnNew();
     minDate.setHours(0, 0, 0, 0);
     minDate.setMonth(minDate.getMonth() - 2);
@@ -115,11 +118,6 @@ const filter = computed(() => {
         campaign: campaignList.value[0]?.id,
         from: minDate,
         to: maxDate,
-        filter: {
-            where: {
-                clientFk: route.params.id,
-            },
-        },
     };
 });
 const openReportPdf = () => {
@@ -149,7 +147,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
         :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
         :columns="columns"
         search-url="consumption"
-        :user-params="filter"
+        :filter="filter"
+        :user-params="userParams"
         :default-remove="false"
         :default-reset="false"
         :default-save="false"
@@ -157,14 +156,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
         auto-load
     >
         <template #moreBeforeActions>
-            <!-- <QBtn
-                color="primary"
-                icon="delete"
-                flat
-                @click="remove(selected)"
-                :disable="!selected?.length"
-                :title="t('globals.remove')"
-            /> -->
             <QBtn
                 color="primary"
                 flat
@@ -228,15 +219,15 @@ const sendCampaignMetricsEmail = ({ address }) => {
                     </template>
                 </VnSelect>
                 <VnInputDate
-                    v-model="params.to"
+                    v-model="params.from"
                     :label="t('globals.from')"
                     :filled="true"
                     class="q-px-xs q-pt-none fit"
                     dense
                 />
                 <VnInputDate
-                    v-model="params.from"
-                    :label="t('globals.from')"
+                    v-model="params.to"
+                    :label="t('globals.to')"
                     :filled="true"
                     class="q-px-xs q-pt-none fit"
                     dense

From e8f660ea3750c1993560142544575836a5601d33 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 20:32:13 +0200
Subject: [PATCH 18/46] perf: CustomerBasicData

---
 src/pages/Customer/Card/CustomerBasicData.vue | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 87a3b08f7..e4c9ab062 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -38,7 +38,7 @@ const title = ref();
                     clearable
                     v-model="data.name"
                 />
-                <QSelect
+                <VnSelect
                     :input-debounce="0"
                     :label="t('customer.basicData.businessType')"
                     :options="businessTypes"
@@ -89,15 +89,18 @@ const title = ref();
             </VnRow>
             <VnRow>
                 <VnSelect
-                    url="Workers/activeWithInheritedRole"
-                    :filter="{ where: { role: 'salesPerson' } }"
-                    option-filter="firstName"
+                    url="Workers/search"
                     v-model="data.salesPersonFk"
                     :label="t('customer.basicData.salesPerson')"
+                    :params="{
+                        departmentCodes: ['VT', 'shopping'],
+                    }"
+                    :fields="['id', 'nickname']"
+                    sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
                     :use-like="false"
-                    :emit-value="false"
-                    @update:model-value="(val) => (title = val?.nickname)"
+                    emit-value
+                    auto-load
                 >
                     <template #prepend>
                         <VnAvatar
@@ -106,8 +109,19 @@ const title = ref();
                             :title="title"
                         />
                     </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption
+                                    >{{ scope.opt?.nickname }},
+                                    {{ scope.opt?.code }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.contactChannelFk"
                     :options="contactChannels"
                     option-value="id"
@@ -120,7 +134,9 @@ const title = ref();
                 />
             </VnRow>
             <VnRow>
-                <QSelect
+                <VnSelect
+                    url="Clients"
+                    :where="{ id: { neq: $route.params.id } }"
                     :input-debounce="0"
                     :label="t('customer.basicData.previousClient')"
                     :options="clients"
@@ -129,7 +145,9 @@ const title = ref();
                     map-options
                     option-label="name"
                     option-value="id"
+                    sort-by="name ASC"
                     v-model="data.transferorFk"
+                    :fields="['id', 'name']"
                 >
                     <template #append>
                         <QIcon name="info" class="cursor-pointer">
@@ -140,7 +158,7 @@ const title = ref();
                             }}</QTooltip>
                         </QIcon>
                     </template>
-                </QSelect>
+                </VnSelect>
             </VnRow>
         </template>
     </FormModel>

From 7d526f4aa42305ebf55425036a5f51f6e325ac7b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 20:33:22 +0200
Subject: [PATCH 19/46] fix: CusomerSummary to Address

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

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index cee8b7c0a..e02f63347 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -193,7 +193,7 @@ const creditWarning = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="entity.defaultAddress">
                 <VnTitle
-                    :url="`#/customer/${entityId}/consignees`"
+                    :url="`#/customer/${entityId}/address`"
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv

From 375e65aed0c4fff39c47a3db6258b813cccedd6b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 12:20:34 +0200
Subject: [PATCH 20/46] fix: CustomerDescriptorAccount

---
 .../Customer/Card/CustomerDescriptor.vue      | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 274e0f376..dcd106873 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -11,6 +11,10 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
+import { useState } from 'src/composables/useState';
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
 
 const $props = defineProps({
     id: {
@@ -43,7 +47,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
         :subtitle="data.subtitle"
         @on-fetch="setData"
         :summary="$props.summary"
-        data-key="customerData"
+        data-key="customer"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
@@ -75,21 +79,26 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="entity.businessType.description"
             />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons>
+            <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!entity.isActive"
+                    v-if="!customer.isActive"
                     name="vn:disabled"
                     size="xs"
                     color="primary"
                 >
                     <QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isFreezed" name="vn:frozen" size="xs" color="primary">
+                <QIcon
+                    v-if="customer.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.account.active"
+                    v-if="!customer.account.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
@@ -97,7 +106,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.debt > entity.credit"
+                    v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
                     color="primary"
@@ -105,7 +114,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.isTaxDataChecked"
+                    v-if="!customer.isTaxDataChecked"
                     name="vn:no036"
                     size="xs"
                     color="primary"
@@ -113,7 +122,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
                 <QBtn
-                    v-if="entity.unpaid"
+                    v-if="customer.unpaid"
                     flat
                     size="sm"
                     icon="vn:Client_unpaid"
@@ -125,13 +134,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(entity.unpaid.dated),
+                                dated: toDate(customer.unpaid.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(entity.unpaid.amount),
+                                amount: toCurrency(customer.unpaid.amount),
                             })
                         }}
                     </QTooltip>
@@ -165,7 +174,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 <QBtn
                     :to="{
                         name: 'OrderCreate',
-                        query: { clientId: entity.id },
+                        query: { table: JSON.stringify({ clientFk: entity.id }) },
                     }"
                     size="md"
                     icon="vn:basketadd"
@@ -175,12 +184,8 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'AccountList',
-                        query: {
-                            table: JSON.stringify({
-                                filter: { where: { id: entity.id } },
-                            }),
-                        },
+                        name: 'AccountSummary',
+                        params: { id: entity.id },
                     }"
                     size="md"
                     icon="face"

From c727e5f66908db89ff50c5b53a70606d6bc36679 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 14:23:18 +0200
Subject: [PATCH 21/46] feat: copy customer countryFk

---
 src/components/CreateBankEntityForm.vue         | 9 +++++++--
 src/pages/Customer/Card/CustomerBasicData.vue   | 1 +
 src/pages/Customer/Card/CustomerBillingData.vue | 5 ++---
 src/pages/Customer/Card/CustomerDescriptor.vue  | 2 +-
 src/pages/Customer/CustomerList.vue             | 7 ++++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index c46ac7752..1117225c7 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref, onMounted, nextTick } from 'vue';
+import { reactive, ref, onMounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -7,16 +7,21 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
+import { useState } from 'src/composables/useState';
 
 defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: null,
+    countryFk: customer.value.countryFk,
     id: null,
 });
 
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index e4c9ab062..8cc59ef3c 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -25,6 +25,7 @@ const title = ref();
     />
     <FetchData
         url="BusinessTypes"
+        :filter="{ fields: ['code', 'description'], order: 'description ASC ' }"
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index b01dc4523..290bde909 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -85,9 +85,8 @@ const getBankEntities = (data, formData) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection v-if="scope.opt">
-                                <QItemLabel
-                                    >{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
-                                >
+                                <QItemLabel>{{ scope.opt.bic }} </QItemLabel>
+                                <QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index dcd106873..9ae453df0 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -98,7 +98,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!customer.account.active"
+                    v-if="!customer.account?.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 12580a06f..25cac5361 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -353,7 +353,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:ticket',
-                action: redirectToCreateView,
+                action: redirectToTicketsList,
                 isPrimary: true,
             },
             {
@@ -367,11 +367,12 @@ const columns = computed(() => [
 ]);
 
 const { viewSummary } = useSummaryDialog();
-const redirectToCreateView = (row) => {
+const redirectToTicketsList = (row) => {
     router.push({
         name: 'TicketList',
+
         query: {
-            params: JSON.stringify({
+            table: JSON.stringify({
                 clientFk: row.id,
             }),
         },

From b66ff783be7e0d354c56a254e78a4d9ee4f468c5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 15:29:57 +0200
Subject: [PATCH 22/46] feat: CustomerBalance

---
 src/components/ui/VnUserLink.vue              | 12 +++---
 src/pages/Customer/Card/CustomerBalance.vue   |  7 +---
 src/pages/Customer/CustomerList.vue           | 42 +++++++++++++++++--
 .../components/CustomerSummaryTable.vue       |  4 +-
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index b04ea7476..8fb571c80 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,20 +1,18 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import { useI18n } from 'vue-i18n';
 
-const $props = defineProps({
+defineProps({
     name: { type: String, default: null },
+    tag: { type: String, default: null },
     workerId: { type: Number, default: null },
     defaultName: { type: Boolean, default: false },
 });
-
-const { t } = useI18n();
 </script>
 <template>
     <slot name="link">
-        <span :class="{ link: $props.workerId }">
-            {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
+        <span :class="{ link: workerId }">
+            {{ defaultName ? name ?? $t('globals.system') : tag ?? name }}
         </span>
     </slot>
-    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
+    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
 </template>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 346e76681..52edecea5 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -95,12 +95,7 @@ const columns = computed(() => [
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => {
-                return {
-                    workerId: row.workerFk,
-                    name: row.userName,
-                };
-            },
+            attrs: ({ row }) => ({ workerId: row.workerFk, tag: row.userName }),
         },
         cardVisible: true,
     },
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 25cac5361..e0a786174 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,6 +2,7 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -69,7 +70,7 @@ const columns = computed(() => [
             optionFilter: 'firstName',
             useLike: false,
         },
-        create: true,
+        create: false,
         columnField: {
             component: null,
         },
@@ -195,6 +196,8 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'BusinessTypes',
+            fields: ['code', 'description'],
+            sortBy: 'description ASC ',
             optionLabel: 'description',
             optionValue: 'code',
         },
@@ -357,7 +360,7 @@ const columns = computed(() => [
                 isPrimary: true,
             },
             {
-                title: t('Client ticket list'),
+                title: t('Preview'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
@@ -400,7 +403,7 @@ function handleLocation(data, location) {
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
-            title: 'Create client',
+            title: t('globals.pageTitles.customerCreate'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -413,6 +416,39 @@ function handleLocation(data, location) {
         auto-load
     >
         <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Workers/search"
+                v-model="data.salesPersonFk"
+                :label="t('customer.basicData.salesPerson')"
+                :params="{
+                    departmentCodes: ['VT', 'shopping'],
+                }"
+                :fields="['id', 'nickname']"
+                sort-by="nickname ASC"
+                :use-like="false"
+                emit-value
+                auto-load
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
+                    />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+
             <VnLocation
                 :roles-allowed-to-create="['deliveryAssistant']"
                 v-model="data.location"
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index cd519eb54..25db561c5 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -12,7 +12,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
 
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-// import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
@@ -96,8 +95,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:lines',
-                action: ({ id }) =>
-                    router.push({ params: { id }, name: 'TicketSummary' }),
+                action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
                 isPrimary: true,
             },
             {

From 8b4fcbd888bd5b5fcc25c05a93cb0fe152976d38 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 15:30:09 +0200
Subject: [PATCH 23/46] feat: CustomerGreuges

---
 src/pages/Customer/Card/CustomerGreuges.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 12173727f..2909bcaaf 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -52,9 +52,8 @@ const columns = computed(() => [
         component: 'userLink',
         attrs: ({ row }) => {
             return {
-                defaultName: true,
                 workerId: row.user?.id,
-                name: row.user?.name,
+                tag: row.user?.name,
             };
         },
     },
@@ -73,6 +72,7 @@ const columns = computed(() => [
         columnCreate: {
             component: 'select',
             url: 'greugeTypes',
+            sortBy: 'name ASC ',
             limit: 0,
         },
     },
@@ -107,7 +107,7 @@ const setRows = (data) => {
         @on-fetch="(data) => setRows(data)"
         :create="{
             urlCreate: `Greuges`,
-            title: t('New credit'),
+            title: t('New greuge'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: { shipped: new Date(), clientFk: route.params.id },
         }"

From 0314ca83974ded83e367bb47df9c2cfa38eecebb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 12:41:03 +0200
Subject: [PATCH 24/46] fix: customerSummaryToTicketList button

---
 .../Customer/Card/CustomerDescriptor.vue      |  8 +++++++-
 src/pages/Ticket/Card/TicketSummary.vue       |  3 ++-
 src/pages/Ticket/TicketList.vue               | 20 ++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 9ae453df0..4980e5495 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -152,7 +152,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 <QBtn
                     :to="{
                         name: 'TicketList',
-                        query: { table: JSON.stringify({ clientFk: entity.id }) },
+                        query: {
+                            from: undefined,
+                            to: undefined,
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
                     icon="vn:ticket"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 177384663..feebe85a6 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -162,8 +162,9 @@ async function changeState(value) {
                     :value="ticket.warehouse?.name"
                 />
                 <VnLv
+                    v-if="ticket?.ticketCollections?.length > 0"
                     :label="t('ticket.summary.collection')"
-                    :value="ticket.ticketCollections[0]?.collectionFk"
+                    :value="ticket?.ticketCollections[0]?.collectionFk"
                 >
                     <template #value>
                         <a
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index cbd102317..f3e0e5c06 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -14,6 +14,8 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 
+import { useRoute } from 'vue-router';
+const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -27,8 +29,17 @@ const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
 
 const userParams = {
-    from: from.toISOString(),
-    to: to.toISOString(),
+    from: null,
+    to: null,
+};
+// Método para inicializar las variables desde la query string
+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+
+    // Asigna los valores a las variables correspondientes
+    from.value = query.from || from.toISOString();
+    to.value = query.to || to.toISOString();
+    Object.assign(userParams, { from, to });
 };
 
 const columns = computed(() => [
@@ -200,7 +211,10 @@ const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
 
-onMounted(() => (stateStore.rightDrawer = true));
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+});
 </script>
 
 <template>

From d155b40bde5fe32df7bd448b8e655bd16f630739 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 12:41:59 +0200
Subject: [PATCH 25/46] revert: vnUSerLink change

---
 src/components/VnTable/VnTable.vue          | 1 +
 src/components/ui/VnUserLink.vue            | 2 +-
 src/pages/Customer/Card/CustomerGreuges.vue | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 510f63360..c63973f20 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -741,6 +741,7 @@ es:
     }
     .q-table__top {
         top: 0;
+        padding: 12px 0;
     }
     tbody {
         .q-checkbox {
diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index 8fb571c80..00c50ee34 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -11,7 +11,7 @@ defineProps({
 <template>
     <slot name="link">
         <span :class="{ link: workerId }">
-            {{ defaultName ? name ?? $t('globals.system') : tag ?? name }}
+            {{ defaultName ? name ?? $t('globals.system') : name }}
         </span>
     </slot>
     <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 2909bcaaf..a670329b5 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -47,13 +47,14 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'userFk',
+        // name: 'userFk',
         label: t('Created by'),
         component: 'userLink',
         attrs: ({ row }) => {
             return {
+                defaultName: true,
                 workerId: row.user?.id,
-                tag: row.user?.name,
+                name: row.user?.name,
             };
         },
     },

From 4762c9fa53e23b72d11be2a6a117f3d751231b3e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 13:02:39 +0200
Subject: [PATCH 26/46] perf: disable card option

---
 src/pages/Customer/Card/CustomerBalance.vue    | 1 +
 src/pages/Customer/Card/CustomerGreuges.vue    | 1 +
 src/pages/Customer/Card/CustomerRecoveries.vue | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 52edecea5..4e01b9ac5 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -254,6 +254,7 @@ const showBalancePdf = ({ id }) => {
         :is-editable="false"
         :column-search="false"
         @on-fetch="onFetch"
+        :disable-option="{ card: true }"
         auto-load
     >
         <template #column-balance="{ rowIndex }">
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index a670329b5..8a83d49db 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -106,6 +106,7 @@ const setRows = (data) => {
         :use-model="true"
         :column-search="false"
         @on-fetch="(data) => setRows(data)"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: `Greuges`,
             title: t('New greuge'),
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 8d3d05702..3ea8998e9 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -89,6 +89,7 @@ function setFinished(id) {
         :columns="columns"
         :use-model="true"
         :right-search="false"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: 'Recoveries',
             title: 'New recovery',

From 00acd5b0ab3e992a3748b93fc30c29c611e64362 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 14:24:25 +0200
Subject: [PATCH 27/46] feat: CustomerCredit section

---
 src/pages/Customer/Card/CustomerCard.vue      |  2 +-
 .../Customer/Card/CustomerCreditContracts.vue | 23 +++++
 .../Customer/Card/CustomerCreditOpinion.vue   | 91 ++++++++++---------
 .../CustomerCreditContractsCreate.vue         |  1 +
 .../CustomerCreditContractsInsurance.vue      | 78 ++++------------
 5 files changed, 88 insertions(+), 107 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 9562be001..139917d05 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -17,7 +17,7 @@ const routeName = computed(() => route.name);
         :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
-            url: 'Clients/extendedListFilter',
+            url: 'Clients/filter',
             label: 'Search customer',
             info: 'You can search by customer id or name',
         }"
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 7b72a4d6d..38c08f4ce 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
@@ -72,6 +73,28 @@ const updateData = () => {
 </script>
 
 <template>
+    <!-- <VnTable
+        ref="tableRef"
+        data-key="Greuges"
+        url="Greuges"
+        search-url="greuges"
+        :filter="filter"
+        :order="['shipped DESC', 'amount']"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        @on-fetch="(data) => setRows(data)"
+        :disable-option="{ card: true }"
+        :create="{
+            urlCreate: `Greuges`,
+            title: t('New greuge'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: { shipped: new Date(), clientFk: route.params.id },
+        }"
+        auto-load
+    ></VnTable> -->
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index c164ab450..af1b0138e 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -3,9 +3,8 @@ import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { QBtn } from 'quasar';
-
 import { toCurrency, toDateHourMin } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
@@ -16,8 +15,8 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { t } = useI18n();
 const route = useRoute();
 
-const clientInformasRef = ref();
-const rows = ref([]);
+const tableRef = ref();
+// const rows = ref([]);
 
 const filter = {
     include: [
@@ -37,10 +36,9 @@ const filter = {
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
-        format: (value) => toDateHourMin(value),
+        format: ({ created }) => toDateHourMin(created),
         label: t('Since'),
-        name: 'since',
+        name: 'created',
     },
     {
         align: 'left',
@@ -53,59 +51,63 @@ const columns = computed(() => [
         field: 'rating',
         label: t('Rating'),
         name: 'rating',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
     {
         align: 'right',
         field: 'recommendedCredit',
-        format: (value) => toCurrency(value),
+        format: ({ recommendedCredit }) => toCurrency(recommendedCredit),
         label: t('Recommended credit'),
         name: 'recommendedCredit',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
 ]);
 
-watch(
-    () => route.params.id,
-    (newValue) => {
-        if (!newValue) return;
-        filter.where.clientFk = newValue;
-        clientInformasRef.value?.fetch();
-    }
-);
+// watch(
+//     () => route.params.id,
+//     (newValue) => {
+//         if (!newValue) return;
+//         filter.where.clientFk = newValue;
+//         clientInformasRef.value?.fetch();
+//     }
+// );
 </script>
 
 <template>
-    <FetchData
-        ref="clientInformasRef"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientInformas"
         url="ClientInformas"
         :filter="filter"
-        @on-fetch="(data) => (rows = data)"
+        :order="['created DESC']"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
         auto-load
-    />
-    <FormModel
-        :form-initial-data="{}"
-        :url-create="`Clients/${route.params.id}/setRating`"
-        @on-data-saved="clientInformasRef.fetch()"
+        :create="{
+            urlCreate: `Clients/${route.params.id}/setRating`,
+            title: 'Create rating',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
     >
-        <template #form="{ data }">
-            <VnRow>
-                <VnInput
-                    :label="t('Rating')"
-                    clearable
-                    type="number"
-                    v-model.number="data.rating"
-                />
-                <VnInput
-                    :label="t('Recommended credit')"
-                    clearable
-                    type="number"
-                    v-model.number="data.recommendedCredit"
-                />
-            </VnRow>
+        <template #column-employee="{ row }">
+            <span class="link" @click.stop>{{ row.worker.user.nickname }}</span>
+            <WorkerDescriptorProxy :id="row.clientFk" />
         </template>
-    </FormModel>
-
-    <div class="full-width flex justify-center" v-if="rows.length">
-        <QTable
+    </VnTable>
+    <!-- <QTable
             :columns="columns"
             :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
@@ -120,8 +122,7 @@ watch(
                     <WorkerDescriptorProxy :id="row.clientFk" />
                 </QTd>
             </template>
-        </QTable>
-    </div>
+        </QTable> -->
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c25e59e1a..24f3746dc 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -48,6 +48,7 @@ const toCustomerCreditContracts = () => {
                         clearable
                         type="number"
                         v-model.number="data.credit"
+                        autofocus
                     />
                 </div>
                 <div class="col">
diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
index ce880d4b5..70f7cf046 100644
--- a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
@@ -1,47 +1,26 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { toCurrency, toDateHourMinSec } from 'src/filters';
+import { toCurrency, toDate } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const rows = ref([]);
-
 const filter = {
     where: {
         creditClassificationFk: `${route.params.creditId}`,
     },
     limit: 20,
 };
-
-const tableColumnComponents = {
-    created: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    grade: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    credit: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
         field: 'created',
-        format: (value) => toDateHourMinSec(value),
+        format: ({ created }) => toDate(created),
         label: t('Created'),
         name: 'created',
     },
@@ -53,8 +32,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'credit',
-        format: (value) => toCurrency(value),
+        format: ({ credit }) => toCurrency(credit),
         label: t('Credit'),
         name: 'credit',
     },
@@ -62,41 +40,19 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
+    <VnTable
         url="CreditInsurances"
-    />
-
-    <QPage class="column items-center q-pa-md" v-if="rows.length">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-        >
-            <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 }}
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
+        ref="tableRef"
+        data-key="creditInsurances"
+        :filter="filter"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        auto-load
+    ></VnTable>
 </template>
 
 <i18n>

From cf3b9b2ef8d7d737b9ba6458963053def389214a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 4 Sep 2024 17:55:27 +0200
Subject: [PATCH 28/46] perf: CustomerSummary

---
 src/i18n/locale/en.yml                        | 130 -----------------
 src/i18n/locale/es.yml                        | 130 -----------------
 .../Customer/Card/CustomerDescriptor.vue      |   8 +-
 src/pages/Customer/Card/CustomerSummary.vue   |  11 +-
 .../components/CustomerSummaryTable.vue       |   4 +-
 src/pages/Customer/locale/en.yml              | 131 ++++++++++++++++++
 src/pages/Customer/locale/es.yml              | 131 ++++++++++++++++++
 7 files changed, 277 insertions(+), 268 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3935cead4..4bfde9ea1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -309,136 +309,6 @@ resetPassword:
     repeatPassword: Repeat password
     passwordNotMatch: Passwords don't match
     passwordChanged: Password changed
-customer:
-    list:
-        phone: Phone
-        email: Email
-        customerOrders: Display customer orders
-        moreOptions: More options
-    card:
-        customerList: Customer list
-        customerId: Claim ID
-        salesPerson: Sales person
-        credit: Credit
-        risk: Risk
-        securedCredit: Secured credit
-        payMethod: Pay method
-        debt: Debt
-        isFrozen: Customer frozen
-        hasDebt: Customer has debt
-        isDisabled: Customer inactive
-        notChecked: Customer no checked
-        webAccountInactive: Web account inactive
-        noWebAccess: Web access is disabled
-        businessType: Business type
-        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
-        businessTypeFk: Business type
-    summary:
-        basicData: Basic data
-        fiscalAddress: Fiscal address
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignee: Default consignee
-        businessData: Business data
-        financialData: Financial data
-        customerId: Customer ID
-        name: Name
-        contact: Contact
-        phone: Phone
-        mobile: Mobile
-        email: Email
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        socialName: Social name
-        fiscalId: Fiscal ID
-        postcode: Postcode
-        province: Province
-        country: Country
-        street: Address
-        isEqualizated: Is equalizated
-        isActive: Is active
-        invoiceByAddress: Invoice by address
-        verifiedData: Verified data
-        hasToInvoice: Has to invoice
-        notifyByEmail: Notify by email
-        vies: VIES
-        payMethod: Pay method
-        bankAccount: Bank account
-        dueDay: Due day
-        hasLcr: Has LCR
-        hasCoreVnl: Has core VNL
-        hasB2BVnl: Has B2B VNL
-        addressName: Address name
-        addressCity: City
-        addressStreet: Street
-        username: Username
-        webAccess: Web access
-        totalGreuge: Total greuge
-        mana: Mana
-        priceIncreasingRate: Price increasing rate
-        averageInvoiced: Average invoiced
-        claimRate: Claming rate
-        risk: Risk
-        maximumRisk: Solunion's maximum risk
-        riskInfo: Invoices minus payments plus orders not yet invoiced
-        credit: Credit
-        creditInfo: Company's maximum risk
-        securedCredit: Secured credit
-        securedCreditInfo: Solunion's maximum risk
-        balance: Balance
-        balanceInfo: Invoices minus payments
-        balanceDue: Balance due
-        balanceDueInfo: Deviated invoices minus payments
-        recoverySince: Recovery since
-        businessType: Business Type
-        city: City
-        descriptorInfo: Invoices minus payments plus orders not yet
-        rating: Rating
-        recommendCredit: Recommended credit
-    basicData:
-        socialName: Fiscal name
-        businessType: Business type
-        contact: Contact
-        youCanSaveMultipleEmails: You can save multiple emails
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        previousClient: Previous client
-    extendedList:
-        tableVisibleColumns:
-            id: Identifier
-            name: Name
-            socialName: Social name
-            fi: Tax number
-            salesPersonFk: Salesperson
-            credit: Credit
-            creditInsurance: Credit insurance
-            phone: Phone
-            mobile: Mobile
-            street: Street
-            countryFk: Country
-            provinceFk: Province
-            city: City
-            postcode: Postcode
-            email: Email
-            created: Created
-            businessTypeFk: Business type
-            payMethodFk: Billing data
-            sageTaxTypeFk: Sage tax type
-            sageTransactionTypeFk: Sage tr. type
-            isActive: Active
-            isVies: Vies
-            isTaxDataChecked: Verified data
-            isEqualizated: Is equalizated
-            isFreezed: Freezed
-            hasToInvoice: Invoice
-            hasToInvoiceByAddress: Invoice by address
-            isToBeMailed: Mailing
-            hasLcr: Received LCR
-            hasCoreVnl: VNL core received
-            hasSepaVnl: VNL B2B received
 entry:
     list:
         newEntry: New entry
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f319f9430..14064ddcf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -309,136 +309,6 @@ resetPassword:
     repeatPassword: Repetir contraseña
     passwordNotMatch: Las contraseñas no coinciden
     passwordChanged: Contraseña cambiada
-customer:
-    list:
-        phone: Teléfono
-        email: Email
-        customerOrders: Mostrar órdenes del cliente
-        moreOptions: Más opciones
-    card:
-        customerId: ID cliente
-        salesPerson: Comercial
-        credit: Crédito
-        risk: Riesgo
-        securedCredit: Crédito asegurado
-        payMethod: Método de pago
-        debt: Riesgo
-        isFrozen: Cliente congelado
-        hasDebt: Cliente con riesgo
-        isDisabled: Cliente inactivo
-        notChecked: Cliente no comprobado
-        webAccountInactive: Sin acceso web
-        noWebAccess: El acceso web está desactivado
-        businessType: Tipo de negocio
-        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
-        businessTypeFk: Tipo de negocio
-    summary:
-        basicData: Datos básicos
-        fiscalAddress: Dirección fiscal
-        fiscalData: Datos fiscales
-        billingData: Datos de facturación
-        consignee: Consignatario pred.
-        businessData: Datos comerciales
-        financialData: Datos financieros
-        customerId: ID cliente
-        name: Nombre
-        contact: Contacto
-        phone: Teléfono
-        mobile: Móvil
-        email: Email
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        socialName: Razón social
-        fiscalId: NIF/CIF
-        postcode: Código postal
-        province: Provincia
-        country: País
-        street: Calle
-        isEqualizated: Recargo de equivalencia
-        isActive: Activo
-        invoiceByAddress: Facturar por consignatario
-        verifiedData: Datos verificados
-        hasToInvoice: Facturar
-        notifyByEmail: Notificar por email
-        vies: VIES
-        payMethod: Método de pago
-        bankAccount: Cuenta bancaria
-        dueDay: Día de pago
-        hasLcr: Recibido LCR
-        hasCoreVnl: Recibido core VNL
-        hasB2BVnl: Recibido B2B VNL
-        addressName: Nombre de la dirección
-        addressCity: Ciudad
-        addressStreet: Calle
-        username: Usuario
-        webAccess: Acceso web
-        totalGreuge: Greuge total
-        mana: Maná
-        priceIncreasingRate: Ratio de incremento de precio
-        averageInvoiced: Facturación media
-        claimRate: Ratio de reclamaciones
-        maximumRisk: Riesgo máximo asumido por Solunion
-
-        risk: Riesgo
-        riskInfo: Facturas menos recibos mas pedidos sin facturar
-        credit: Crédito
-        creditInfo: Riesgo máximo asumido por la empresa
-        securedCredit: Crédito asegurado
-        securedCreditInfo: Riesgo máximo asumido por Solunion
-        balance: Balance
-        balanceInfo: Facturas menos recibos
-        balanceDue: Saldo vencido
-        balanceDueInfo: Facturas fuera de plazo menos recibos
-        recoverySince: Recobro desde
-        businessType: Tipo de negocio
-        city: Población
-        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
-        rating: Clasificación
-        recommendCredit: Crédito recomendado
-    basicData:
-        socialName: Nombre fiscal
-        businessType: Tipo de negocio
-        contact: Contacto
-        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        previousClient: Cliente anterior
-    extendedList:
-        tableVisibleColumns:
-            id: Identificador
-            name: Nombre
-            socialName: Razón social
-            fi: NIF / CIF
-            salesPersonFk: Comercial
-            credit: Crédito
-            creditInsurance: Crédito asegurado
-            phone: Teléfono
-            mobile: Móvil
-            street: Dirección fiscal
-            countryFk: País
-            provinceFk: Provincia
-            city: Población
-            postcode: Código postal
-            email: Email
-            created: Fecha creación
-            businessTypeFk: Tipo de negocio
-            payMethodFk: Forma de pago
-            sageTaxTypeFk: Tipo de impuesto Sage
-            sageTransactionTypeFk: Tipo tr. sage
-            isActive: Activo
-            isVies: Vies
-            isTaxDataChecked: Datos comprobados
-            isEqualizated: Recargo de equivalencias
-            isFreezed: Congelado
-            hasToInvoice: Factura
-            hasToInvoiceByAddress: Factura por consigna
-            isToBeMailed: Env. emails
-            hasLcr: Recibido LCR
-            hasCoreVnl: Recibido core VNL
-            hasSepaVnl: Recibido B2B VNL
 entry:
     list:
         newEntry: Nueva entrada
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 4980e5495..5cab825a9 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import { toCurrency, toDate } from 'src/filters';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
@@ -66,12 +66,14 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.debt)"
                 :info="t('customer.summary.riskInfo')"
             />
-            <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
+            <VnLv :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink
-                        :name="entity.salesPersonUser?.name"
+                        v-if="entity.salesPersonUser"
+                        :name="entity.salesPersonUser.name"
                         :worker-id="entity.salesPersonFk"
                     />
+                    <span v-else>{{ dashIfEmpty(entity.salesPersonUser) }}</span>
                 </template>
             </VnLv>
             <VnLv
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index e02f63347..c0ac562c0 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -60,6 +60,11 @@ const creditWarning = computed(() => {
 
     return tooMuchInsurance || noCreditInsurance ? 'negative' : '';
 });
+const sumRisk = ({ clientRisks }) => {
+    let total = clientRisks.reduce((acc, risk) => acc + risk.amount, 0);
+
+    return total;
+};
 </script>
 
 <template>
@@ -170,7 +175,7 @@ const creditWarning = computed(() => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
@@ -250,7 +255,7 @@ const creditWarning = computed(() => {
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
                     :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
-                    :text="t('customer.summary.financialData')"
+                    :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
                 />
                 <VnLv
@@ -274,7 +279,7 @@ const creditWarning = computed(() => {
                 />
                 <VnLv
                     :label="t('customer.summary.balance')"
-                    :value="toCurrency(entity.sumRisk) || toCurrency(0)"
+                    :value="toCurrency(sumRisk(entity)) || toCurrency(0)"
                     :info="t('customer.summary.balanceInfo')"
                 />
 
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 25db561c5..e2fb61322 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -93,13 +93,13 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Client ticket list'),
+                title: t('customer.summary.goToLines'),
                 icon: 'vn:lines',
                 action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
                 isPrimary: true,
             },
             {
-                title: t('Client ticket list'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row.id, TicketSummary),
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 6eb7cfa85..4d5e7dfb1 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -2,3 +2,134 @@ customerFilter:
     filter:
         name: Name
         socialName: Social name
+customer:
+    list:
+        phone: Phone
+        email: Email
+        customerOrders: Display customer orders
+        moreOptions: More options
+    card:
+        customerList: Customer list
+        customerId: Claim ID
+        salesPerson: Sales person
+        credit: Credit
+        risk: Risk
+        securedCredit: Secured credit
+        payMethod: Pay method
+        debt: Debt
+        isFrozen: Customer frozen
+        hasDebt: Customer has debt
+        isDisabled: Customer inactive
+        notChecked: Customer no checked
+        webAccountInactive: Web account inactive
+        noWebAccess: Web access is disabled
+        businessType: Business type
+        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
+        businessTypeFk: Business type
+    summary:
+        basicData: Basic data
+        fiscalAddress: Fiscal address
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignee: Default consignee
+        businessData: Business data
+        financialData: Financial data
+        customerId: Customer ID
+        name: Name
+        contact: Contact
+        phone: Phone
+        mobile: Mobile
+        email: Email
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        socialName: Social name
+        fiscalId: Fiscal ID
+        postcode: Postcode
+        province: Province
+        country: Country
+        street: Address
+        isEqualizated: Is equalizated
+        isActive: Is active
+        invoiceByAddress: Invoice by address
+        verifiedData: Verified data
+        hasToInvoice: Has to invoice
+        notifyByEmail: Notify by email
+        vies: VIES
+        payMethod: Pay method
+        bankAccount: Bank account
+        dueDay: Due day
+        hasLcr: Has LCR
+        hasCoreVnl: Has core VNL
+        hasB2BVnl: Has B2B VNL
+        addressName: Address name
+        addressCity: City
+        addressStreet: Street
+        username: Username
+        webAccess: Web access
+        totalGreuge: Total greuge
+        mana: Mana
+        priceIncreasingRate: Price increasing rate
+        averageInvoiced: Average invoiced
+        claimRate: Claming rate
+        risk: Risk
+        maximumRisk: Solunion's maximum risk
+        riskInfo: Invoices minus payments plus orders not yet invoiced
+        credit: Credit
+        creditInfo: Company's maximum risk
+        securedCredit: Secured credit
+        securedCreditInfo: Solunion's maximum risk
+        balance: Balance
+        balanceInfo: Invoices minus payments
+        balanceDue: Balance due
+        balanceDueInfo: Deviated invoices minus payments
+        recoverySince: Recovery since
+        businessType: Business Type
+        city: City
+        descriptorInfo: Invoices minus payments plus orders not yet
+        rating: Rating
+        recommendCredit: Recommended credit
+        goToLines: Go to lines
+    basicData:
+        socialName: Fiscal name
+        businessType: Business type
+        contact: Contact
+        youCanSaveMultipleEmails: You can save multiple emails
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        previousClient: Previous client
+    extendedList:
+        tableVisibleColumns:
+            id: Identifier
+            name: Name
+            socialName: Social name
+            fi: Tax number
+            salesPersonFk: Salesperson
+            credit: Credit
+            creditInsurance: Credit insurance
+            phone: Phone
+            mobile: Mobile
+            street: Street
+            countryFk: Country
+            provinceFk: Province
+            city: City
+            postcode: Postcode
+            email: Email
+            created: Created
+            businessTypeFk: Business type
+            payMethodFk: Billing data
+            sageTaxTypeFk: Sage tax type
+            sageTransactionTypeFk: Sage tr. type
+            isActive: Active
+            isVies: Vies
+            isTaxDataChecked: Verified data
+            isEqualizated: Is equalizated
+            isFreezed: Freezed
+            hasToInvoice: Invoice
+            hasToInvoiceByAddress: Invoice by address
+            isToBeMailed: Mailing
+            hasLcr: Received LCR
+            hasCoreVnl: VNL core received
+            hasSepaVnl: VNL B2B received
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 111696f21..4fcbe3fa2 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -4,3 +4,134 @@ customerFilter:
     filter:
         name: Nombre
         socialName: Razón Social
+customer:
+    list:
+        phone: Teléfono
+        email: Email
+        customerOrders: Mostrar órdenes del cliente
+        moreOptions: Más opciones
+    card:
+        customerId: ID cliente
+        salesPerson: Comercial
+        credit: Crédito
+        risk: Riesgo
+        securedCredit: Crédito asegurado
+        payMethod: Método de pago
+        debt: Riesgo
+        isFrozen: Cliente congelado
+        hasDebt: Cliente con riesgo
+        isDisabled: Cliente inactivo
+        notChecked: Cliente no comprobado
+        webAccountInactive: Sin acceso web
+        noWebAccess: El acceso web está desactivado
+        businessType: Tipo de negocio
+        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
+        businessTypeFk: Tipo de negocio
+    summary:
+        basicData: Datos básicos
+        fiscalAddress: Dirección fiscal
+        fiscalData: Datos fiscales
+        billingData: Datos de facturación
+        consignee: Consignatario pred.
+        businessData: Datos comerciales
+        financialData: Datos financieros
+        customerId: ID cliente
+        name: Nombre
+        contact: Contacto
+        phone: Teléfono
+        mobile: Móvil
+        email: Email
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        socialName: Razón social
+        fiscalId: NIF/CIF
+        postcode: Código postal
+        province: Provincia
+        country: País
+        street: Calle
+        isEqualizated: Recargo de equivalencia
+        isActive: Activo
+        invoiceByAddress: Facturar por consignatario
+        verifiedData: Datos verificados
+        hasToInvoice: Facturar
+        notifyByEmail: Notificar por email
+        vies: VIES
+        payMethod: Método de pago
+        bankAccount: Cuenta bancaria
+        dueDay: Día de pago
+        hasLcr: Recibido LCR
+        hasCoreVnl: Recibido core VNL
+        hasB2BVnl: Recibido B2B VNL
+        addressName: Nombre de la dirección
+        addressCity: Ciudad
+        addressStreet: Calle
+        username: Usuario
+        webAccess: Acceso web
+        totalGreuge: Greuge total
+        mana: Maná
+        priceIncreasingRate: Ratio de incremento de precio
+        averageInvoiced: Facturación media
+        claimRate: Ratio de reclamaciones
+        maximumRisk: Riesgo máximo asumido por Solunion
+        payMethodFk: Forma de pago
+        risk: Riesgo
+        riskInfo: Facturas menos recibos mas pedidos sin facturar
+        credit: Crédito
+        creditInfo: Riesgo máximo asumido por la empresa
+        securedCredit: Crédito asegurado
+        securedCreditInfo: Riesgo máximo asumido por Solunion
+        balance: Balance
+        balanceInfo: Facturas menos recibos
+        balanceDue: Saldo vencido
+        balanceDueInfo: Facturas fuera de plazo menos recibos
+        recoverySince: Recobro desde
+        businessType: Tipo de negocio
+        city: Población
+        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
+        rating: Clasificación
+        recommendCredit: Crédito recomendado
+        goToLines: Ir a líneas
+    basicData:
+        socialName: Nombre fiscal
+        businessType: Tipo de negocio
+        contact: Contacto
+        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
+        email: Email
+        phone: Teléfono
+        mobile: Móvil
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        previousClient: Cliente anterior
+    extendedList:
+        tableVisibleColumns:
+            id: Identificador
+            name: Nombre
+            socialName: Razón social
+            fi: NIF / CIF
+            salesPersonFk: Comercial
+            credit: Crédito
+            creditInsurance: Crédito asegurado
+            phone: Teléfono
+            mobile: Móvil
+            street: Dirección fiscal
+            countryFk: País
+            provinceFk: Provincia
+            city: Población
+            postcode: Código postal
+            email: Email
+            created: Fecha creación
+            businessTypeFk: Tipo de negocio
+            payMethodFk: Forma de pago
+            sageTaxTypeFk: Tipo de impuesto Sage
+            sageTransactionTypeFk: Tipo tr. sage
+            isActive: Activo
+            isVies: Vies
+            isTaxDataChecked: Datos comprobados
+            isEqualizated: Recargo de equivalencias
+            isFreezed: Congelado
+            hasToInvoice: Factura
+            hasToInvoiceByAddress: Factura por consigna
+            isToBeMailed: Env. emails
+            hasLcr: Recibido LCR
+            hasCoreVnl: Recibido core VNL
+            hasSepaVnl: Recibido B2B VNL

From 62cdc1d52733b629cc438567f84eddebdc5d266b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 14:56:50 +0200
Subject: [PATCH 29/46] feat: CustomerCreateTicket

---
 .../Customer/Card/CustomerDescriptorMenu.vue  |  23 +-
 src/pages/Ticket/TicketCreateDialog.vue       | 226 ++++++++++++++++++
 2 files changed, 239 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/Ticket/TicketCreateDialog.vue

diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 560ee51c8..2d8cceda3 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import axios from 'axios';
 import { useQuasar } from 'quasar';
@@ -8,6 +9,8 @@ import { useQuasar } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
+import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import { ref } from 'vue';
 
 const $props = defineProps({
     customer: {
@@ -40,20 +43,20 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
+const ticketCreateFormDialog = ref(null);
+
+const openTicketCreateForm = () => {
+    ticketCreateFormDialog.value.show();
+};
 </script>
 
 <template>
-    <QItem v-ripple clickable>
+    <QItem v-ripple clickable @click="openTicketCreateForm()">
         <QItemSection>
-            <RouterLink
-                :to="{
-                    name: 'TicketCreate',
-                    query: { clientFk: customer.id },
-                }"
-                class="color-vn-text"
-            >
-                {{ t('Simple ticket') }}
-            </RouterLink>
+            {{ t('globals.pageTitles.createTicket') }}
+            <QDialog ref="ticketCreateFormDialog">
+                <TicketCreateDialog />
+            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable>
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
new file mode 100644
index 000000000..1493adc53
--- /dev/null
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -0,0 +1,226 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { onBeforeMount, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useDialogPluginComponent } from 'quasar';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+import { useState } from 'composables/useState';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const state = useState();
+const user = state.getUser();
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const initialFormState = reactive({
+    clientId: Number(route.query?.clientFk) || null,
+    addressId: null,
+    agencyModeId: null,
+    warehouseId: user.value.warehouseFk,
+    landed: null,
+});
+const clientOptions = ref([]);
+const agenciesOptions = ref([]);
+const addressesOptions = ref([]);
+const warehousesOptions = ref([]);
+const selectedClient = ref(null);
+
+onBeforeMount(async () => {
+    await onClientSelected(initialFormState);
+});
+
+const fetchClient = async (formData) => {
+    try {
+        const filter = {
+            include: {
+                relation: 'defaultAddress',
+                scope: {
+                    fields: ['id', 'agencyModeFk'],
+                },
+            },
+            where: { id: formData.clientId },
+        };
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get('Clients', { params });
+        const [client] = data;
+        selectedClient.value = client;
+    } catch (err) {
+        console.error('Error fetching client');
+    }
+};
+
+const fetchAddresses = async (formData) => {
+    try {
+        if (!formData.clientId) return;
+
+        const filter = {
+            fields: ['nickname', 'street', 'city', 'id'],
+            where: { isActive: true },
+            order: 'nickname ASC',
+        };
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
+            params,
+        });
+        addressesOptions.value = data;
+
+        const { defaultAddress } = selectedClient.value;
+        formData.addressId = defaultAddress.id;
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+
+const onClientSelected = async (formData) => {
+    await fetchClient(formData);
+    await fetchAddresses(formData);
+};
+
+const fetchAvailableAgencies = async (formData) => {
+    if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
+    let params = {
+        warehouseFk: formData.warehouseId,
+        addressFk: formData.addressId,
+        landed: formData.landed,
+    };
+
+    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+
+    agenciesOptions.value = data;
+
+    const defaultAgency = agenciesOptions.value.find(
+        (agency) =>
+            agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
+    );
+
+    if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
+};
+
+const redirectToTicketList = (_, { id }) => {
+    router.push({ name: 'TicketSummary', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Clients"
+        @on-fetch="(data) => (clientOptions = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        order="name"
+        auto-load
+    />
+
+    <FormModelPopup
+        :title="t('globals.pageTitles.createTicket')"
+        url-create="Tickets/new"
+        model="ticket"
+        :form-initial-data="initialFormState"
+        @on-data-saved="redirectToTicketList"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.client')"
+                        v-model="data.clientId"
+                        :options="clientOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="(client) => onClientSelected(data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.name }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt.id}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.address')"
+                        v-model="data.addressId"
+                        :options="addressesOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :disable="!data.clientId"
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.nickname }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `${scope.opt.street}, ${scope.opt.city}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnInputDate
+                        placeholder="dd-mm-aaa"
+                        :label="t('ticket.create.landed')"
+                        v-model="data.landed"
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.warehouse')"
+                        v-model="data.warehouseId"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.agency')"
+                        v-model="data.agencyModeId"
+                        :options="agenciesOptions"
+                        option-value="agencyModeFk"
+                        option-label="agencyMode"
+                        hide-selected
+                        :disable="!data.clientId || !data.landed || !data.warehouseId"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>

From 6476a8307a75dca74aa7da9722474f8dfacb840e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 15:08:59 +0200
Subject: [PATCH 30/46] perf: i18n

---
 src/pages/Customer/locale/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 4d5e7dfb1..545c3f274 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -71,6 +71,7 @@ customer:
         priceIncreasingRate: Price increasing rate
         averageInvoiced: Average invoiced
         claimRate: Claming rate
+        payMethodFk: Billing data
         risk: Risk
         maximumRisk: Solunion's maximum risk
         riskInfo: Invoices minus payments plus orders not yet invoiced

From b3391ab522b2f8f6a562b8bac31eb7b3d025106c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 20:51:33 +0200
Subject: [PATCH 31/46] perf: minor comments

---
 src/components/VnTable/VnTable.vue            | 535 +++++++++---------
 src/composables/useArrayData.js               |  18 +-
 .../Customer/Card/CustomerConsumption.vue     |   5 +-
 .../Customer/Card/CustomerCreditContracts.vue |  23 -
 .../Customer/Card/CustomerCreditOpinion.vue   |  16 +-
 .../Customer/Card/CustomerDescriptorMenu.vue  |   1 -
 src/pages/Customer/Card/CustomerSummary.vue   |  10 +-
 .../CustomerCreditContractsCreate.vue         |   1 -
 8 files changed, 271 insertions(+), 338 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 898e9c193..44b430e86 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -346,302 +346,281 @@ defineExpose({
         </QScrollArea>
     </QDrawer>
     <!-- class in div to fix warn-->
-    <div class="q-px-md">
-        <CrudModel
-            v-bind="$attrs"
-            :class="$attrs['class'] ?? 'q-px-md'"
-            :limit="$attrs['limit'] ?? 20"
-            ref="CrudModelRef"
-            @on-fetch="(...args) => emit('onFetch', ...args)"
-            :search-url="searchUrl"
-            :disable-infinite-scroll="
-                $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
-            "
-            @save-changes="reload"
-            :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
-            :auto-load="hasParams || $attrs['auto-load']"
-        >
-            <template
-                v-for="(_, slotName) in $slots"
-                #[slotName]="slotData"
-                :key="slotName"
+    <CrudModel
+        v-bind="$attrs"
+        :class="$attrs['class']"
+        :limit="$attrs['limit'] ?? 20"
+        ref="CrudModelRef"
+        @on-fetch="(...args) => emit('onFetch', ...args)"
+        :search-url="searchUrl"
+        :disable-infinite-scroll="
+            $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+        "
+        @save-changes="reload"
+        :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
+        :auto-load="hasParams || $attrs['auto-load']"
+    >
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
+        <template #body="{ rows }">
+            <QTable
+                v-bind="table"
+                class="vnTable"
+                :columns="splittedColumns.columns"
+                :rows="rows"
+                v-model:selected="selected"
+                :grid="!isTableMode"
+                table-header-class="bg-header"
+                card-container-class="grid-three"
+                flat
+                :style="isTableMode && `max-height: ${tableHeight}`"
+                virtual-scroll
+                @virtual-scroll="
+                    (event) =>
+                        event.index > rows.length - 2 &&
+                        CrudModelRef.vnPaginateRef.paginate()
+                "
+                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
+                @update:selected="emit('update:selected', $event)"
             >
-                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-            </template>
-            <template #body="{ rows }">
-                <QTable
-                    v-bind="table"
-                    class="vnTable"
-                    :columns="splittedColumns.columns"
-                    :rows="rows"
-                    v-model:selected="selected"
-                    :grid="!isTableMode"
-                    table-header-class="bg-header"
-                    card-container-class="grid-three"
-                    flat
-                    :style="isTableMode && `max-height: ${tableHeight}`"
-                    virtual-scroll
-                    @virtual-scroll="
-                        (event) =>
-                            event.index > rows.length - 2 &&
-                            CrudModelRef.vnPaginateRef.paginate()
-                    "
-                    @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
-                    @update:selected="emit('update:selected', $event)"
-                >
-                    <template #top-left v-if="!$props.withoutHeader">
-                        <slot name="top-left"></slot>
-                    </template>
-                    <template #top-right v-if="!$props.withoutHeader">
-                        <VnVisibleColumn
-                            v-if="isTableMode"
-                            v-model="splittedColumns.columns"
-                            :table-code="tableCode ?? route.name"
-                            :skip="columnsVisibilitySkipped"
-                        />
-                        <QBtnToggle
-                            v-model="mode"
-                            toggle-color="primary"
-                            class="bg-vn-section-color"
-                            dense
-                            :options="tableModes.filter((mode) => !mode.disable)"
-                        />
-                        <QBtn
-                            v-if="$props.rightSearch"
-                            icon="filter_alt"
-                            class="bg-vn-section-color q-ml-md"
-                            dense
-                            @click="stateStore.toggleRightDrawer()"
-                        />
-                    </template>
-                    <template #header-cell="{ col }">
-                        <QTh v-if="col.visible ?? true">
-                            <div
-                                class="column self-start q-ml-xs ellipsis"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                :style="$props.columnSearch ? 'height: 75px' : ''"
-                            >
-                                <div
-                                    class="row items-center no-wrap"
-                                    style="height: 30px"
-                                >
-                                    <QTooltip v-if="col.toolTip">{{
-                                        col.toolTip
-                                    }}</QTooltip>
-                                    <VnTableOrder
-                                        v-model="orders[col.orderBy ?? col.name]"
-                                        :name="col.orderBy ?? col.name"
-                                        :label="col?.label"
-                                        :data-key="$attrs['data-key']"
-                                        :search-url="searchUrl"
-                                    />
-                                </div>
-                                <VnTableFilter
-                                    v-if="$props.columnSearch"
-                                    :column="col"
-                                    :show-title="true"
+                <template #top-left v-if="!$props.withoutHeader">
+                    <slot name="top-left"></slot>
+                </template>
+                <template #top-right v-if="!$props.withoutHeader">
+                    <VnVisibleColumn
+                        v-if="isTableMode"
+                        v-model="splittedColumns.columns"
+                        :table-code="tableCode ?? route.name"
+                        :skip="columnsVisibilitySkipped"
+                    />
+                    <QBtnToggle
+                        v-model="mode"
+                        toggle-color="primary"
+                        class="bg-vn-section-color"
+                        dense
+                        :options="tableModes.filter((mode) => !mode.disable)"
+                    />
+                    <QBtn
+                        v-if="$props.rightSearch"
+                        icon="filter_alt"
+                        class="bg-vn-section-color q-ml-md"
+                        dense
+                        @click="stateStore.toggleRightDrawer()"
+                    />
+                </template>
+                <template #header-cell="{ col }">
+                    <QTh v-if="col.visible ?? true">
+                        <div
+                            class="column self-start q-ml-xs ellipsis"
+                            :class="`text-${col?.align ?? 'left'}`"
+                            :style="$props.columnSearch ? 'height: 75px' : ''"
+                        >
+                            <div class="row items-center no-wrap" style="height: 30px">
+                                <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
+                                <VnTableOrder
+                                    v-model="orders[col.orderBy ?? col.name]"
+                                    :name="col.orderBy ?? col.name"
+                                    :label="col?.label"
                                     :data-key="$attrs['data-key']"
-                                    v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
-                                    class="full-width"
                                 />
                             </div>
-                        </QTh>
-                    </template>
-                    <template #header-cell-tableActions>
-                        <QTh auto-width class="sticky" />
-                    </template>
-                    <template #body-cell-tableStatus="{ col, row }">
-                        <QTd auto-width :class="getColAlign(col)">
-                            <VnTableChip
-                                :columns="splittedColumns.columnChips"
+                            <VnTableFilter
+                                v-if="$props.columnSearch"
+                                :column="col"
+                                :show-title="true"
+                                :data-key="$attrs['data-key']"
+                                v-model="params[columnName(col)]"
+                                :search-url="searchUrl"
+                                class="full-width"
+                            />
+                        </div>
+                    </QTh>
+                </template>
+                <template #header-cell-tableActions>
+                    <QTh auto-width class="sticky" />
+                </template>
+                <template #body-cell-tableStatus="{ col, row }">
+                    <QTd auto-width :class="getColAlign(col)">
+                        <VnTableChip :columns="splittedColumns.columnChips" :row="row">
+                            <template #afterChip>
+                                <slot name="afterChip" :row="row"></slot>
+                            </template>
+                        </VnTableChip>
+                    </QTd>
+                </template>
+                <template #body-cell="{ col, row, rowIndex }">
+                    <!-- Columns -->
+                    <QTd
+                        auto-width
+                        class="no-margin q-px-xs"
+                        :class="[getColAlign(col), col.columnClass]"
+                        v-if="col.visible ?? true"
+                        @click.ctrl="
+                            ($event) =>
+                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
+                        "
+                    >
+                        <slot
+                            :name="`column-${col.name}`"
+                            :col="col"
+                            :row="row"
+                            :row-index="rowIndex"
+                        >
+                            <VnTableColumn
+                                :column="col"
                                 :row="row"
-                            >
-                                <template #afterChip>
-                                    <slot name="afterChip" :row="row"></slot>
-                                </template>
-                            </VnTableChip>
-                        </QTd>
-                    </template>
-                    <template #body-cell="{ col, row, rowIndex }">
-                        <!-- Columns -->
-                        <QTd
-                            auto-width
-                            class="no-margin q-px-xs"
-                            :class="[getColAlign(col), col.columnClass]"
-                            v-if="col.visible ?? true"
-                            @click.ctrl="
-                                ($event) =>
-                                    rowCtrlClickFunction &&
-                                    rowCtrlClickFunction($event, row)
+                                :is-editable="col.isEditable ?? isEditable"
+                                v-model="row[col.name]"
+                                component-prop="columnField"
+                            />
+                        </slot>
+                    </QTd>
+                </template>
+                <template #body-cell-tableActions="{ col, row }">
+                    <QTd
+                        auto-width
+                        :class="getColAlign(col)"
+                        class="sticky no-padding"
+                        @click="stopEventPropagation($event)"
+                    >
+                        <QBtn
+                            v-for="(btn, index) of col.actions"
+                            :key="index"
+                            :title="btn.title"
+                            :icon="btn.icon"
+                            class="q-px-sm"
+                            flat
+                            :class="
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                            "
+                            :style="`visibility: ${
+                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
+                            }`"
+                            @click="btn.action(row)"
+                        />
+                    </QTd>
+                </template>
+                <template #item="{ row, colsMap }">
+                    <component
+                        :is="$props.redirect ? 'router-link' : 'span'"
+                        :to="`/${$props.redirect}/` + row.id"
+                    >
+                        <QCard
+                            bordered
+                            flat
+                            class="row no-wrap justify-between cursor-pointer"
+                            @click="
+                                (_, row) => {
+                                    $props.rowClick && $props.rowClick(row);
+                                }
                             "
                         >
-                            <slot
-                                :name="`column-${col.name}`"
-                                :col="col"
-                                :row="row"
-                                :row-index="rowIndex"
-                            >
-                                <VnTableColumn
-                                    :column="col"
-                                    :row="row"
-                                    :is-editable="col.isEditable ?? isEditable"
-                                    v-model="row[col.name]"
-                                    component-prop="columnField"
-                                />
-                            </slot>
-                        </QTd>
-                    </template>
-                    <template #body-cell-tableActions="{ col, row }">
-                        <QTd
-                            auto-width
-                            :class="getColAlign(col)"
-                            class="sticky no-padding"
-                            @click="stopEventPropagation($event)"
-                        >
-                            <QBtn
-                                v-for="(btn, index) of col.actions"
-                                :key="index"
-                                :title="btn.title"
-                                :icon="btn.icon"
-                                class="q-px-sm"
-                                flat
-                                :class="
-                                    btn.isPrimary
-                                        ? 'text-primary-light'
-                                        : 'color-vn-text '
-                                "
-                                :style="`visibility: ${
-                                    (btn.show && btn.show(row)) ?? true
-                                        ? 'visible'
-                                        : 'hidden'
-                                }`"
-                                @click="btn.action(row)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #item="{ row, colsMap }">
-                        <component
-                            :is="$props.redirect ? 'router-link' : 'span'"
-                            :to="`/${$props.redirect}/` + row.id"
-                        >
-                            <QCard
-                                bordered
-                                flat
-                                class="row no-wrap justify-between cursor-pointer"
-                                @click="
-                                    (_, row) => {
-                                        $props.rowClick && $props.rowClick(row);
-                                    }
-                                "
+                            <QCardSection
+                                vertical
+                                class="no-margin no-padding"
+                                :class="colsMap.tableActions ? 'w-80' : 'fit'"
                             >
+                                <!-- Chips -->
                                 <QCardSection
-                                    vertical
-                                    class="no-margin no-padding"
-                                    :class="colsMap.tableActions ? 'w-80' : 'fit'"
+                                    v-if="splittedColumns.chips.length"
+                                    class="no-margin q-px-xs q-py-none"
                                 >
-                                    <!-- Chips -->
-                                    <QCardSection
-                                        v-if="splittedColumns.chips.length"
-                                        class="no-margin q-px-xs q-py-none"
+                                    <VnTableChip
+                                        :columns="splittedColumns.chips"
+                                        :row="row"
                                     >
-                                        <VnTableChip
-                                            :columns="splittedColumns.chips"
-                                            :row="row"
-                                        >
-                                            <template #afterChip>
-                                                <slot name="afterChip" :row="row"></slot>
-                                            </template>
-                                        </VnTableChip>
-                                    </QCardSection>
-                                    <!-- Title -->
-                                    <QCardSection
-                                        v-if="splittedColumns.title"
-                                        class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
+                                        <template #afterChip>
+                                            <slot name="afterChip" :row="row"></slot>
+                                        </template>
+                                    </VnTableChip>
+                                </QCardSection>
+                                <!-- Title -->
+                                <QCardSection
+                                    v-if="splittedColumns.title"
+                                    class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
+                                >
+                                    <span
+                                        :title="row[splittedColumns.title.name]"
+                                        @click="stopEventPropagation($event)"
+                                        class="cursor-text"
                                     >
-                                        <span
-                                            :title="row[splittedColumns.title.name]"
-                                            @click="stopEventPropagation($event)"
-                                            class="cursor-text"
-                                        >
-                                            {{ row[splittedColumns.title.name] }}
-                                        </span>
-                                    </QCardSection>
-                                    <!-- Fields -->
-                                    <QCardSection
-                                        class="q-pl-sm q-pr-lg q-py-xs"
-                                        :class="$props.cardClass"
+                                        {{ row[splittedColumns.title.name] }}
+                                    </span>
+                                </QCardSection>
+                                <!-- Fields -->
+                                <QCardSection
+                                    class="q-pl-sm q-pr-lg q-py-xs"
+                                    :class="$props.cardClass"
+                                >
+                                    <div
+                                        v-for="(
+                                            col, index
+                                        ) of splittedColumns.cardVisible"
+                                        :key="col.name"
+                                        class="fields"
                                     >
-                                        <div
-                                            v-for="(
-                                                col, index
-                                            ) of splittedColumns.cardVisible"
-                                            :key="col.name"
-                                            class="fields"
+                                        <VnLv
+                                            :label="
+                                                !col.component && col.label
+                                                    ? `${col.label}:`
+                                                    : ''
+                                            "
                                         >
-                                            <VnLv
-                                                :label="
-                                                    !col.component && col.label
-                                                        ? `${col.label}:`
-                                                        : ''
-                                                "
-                                            >
-                                                <template #value>
-                                                    <span
-                                                        @click="
-                                                            stopEventPropagation($event)
-                                                        "
+                                            <template #value>
+                                                <span
+                                                    @click="stopEventPropagation($event)"
+                                                >
+                                                    <slot
+                                                        :name="`column-${col.name}`"
+                                                        :col="col"
+                                                        :row="row"
+                                                        :row-index="index"
                                                     >
-                                                        <slot
-                                                            :name="`column-${col.name}`"
-                                                            :col="col"
+                                                        <VnTableColumn
+                                                            :column="col"
                                                             :row="row"
-                                                            :row-index="index"
-                                                        >
-                                                            <VnTableColumn
-                                                                :column="col"
-                                                                :row="row"
-                                                                :is-editable="false"
-                                                                v-model="row[col.name]"
-                                                                component-prop="columnField"
-                                                                :show-label="true"
-                                                            />
-                                                        </slot>
-                                                    </span>
-                                                </template>
-                                            </VnLv>
-                                        </div>
-                                    </QCardSection>
+                                                            :is-editable="false"
+                                                            v-model="row[col.name]"
+                                                            component-prop="columnField"
+                                                            :show-label="true"
+                                                        />
+                                                    </slot>
+                                                </span>
+                                            </template>
+                                        </VnLv>
+                                    </div>
                                 </QCardSection>
-                                <!-- Actions -->
-                                <QCardSection
-                                    v-if="colsMap.tableActions"
-                                    class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
-                                    @click="stopEventPropagation($event)"
-                                >
-                                    <QBtn
-                                        v-for="(btn, index) of splittedColumns.actions
-                                            .actions"
-                                        :key="index"
-                                        :title="btn.title"
-                                        :icon="btn.icon"
-                                        class="q-pa-xs"
-                                        flat
-                                        :class="
-                                            btn.isPrimary
-                                                ? 'text-primary-light'
-                                                : 'color-vn-text '
-                                        "
-                                        @click="btn.action(row)"
-                                    />
-                                </QCardSection>
-                            </QCard>
-                        </component>
-                    </template>
-                </QTable>
-            </template>
-        </CrudModel>
-    </div>
+                            </QCardSection>
+                            <!-- Actions -->
+                            <QCardSection
+                                v-if="colsMap.tableActions"
+                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
+                                @click="stopEventPropagation($event)"
+                            >
+                                <QBtn
+                                    v-for="(btn, index) of splittedColumns.actions
+                                        .actions"
+                                    :key="index"
+                                    :title="btn.title"
+                                    :icon="btn.icon"
+                                    class="q-pa-xs"
+                                    flat
+                                    :class="
+                                        btn.isPrimary
+                                            ? 'text-primary-light'
+                                            : 'color-vn-text '
+                                    "
+                                    @click="btn.action(row)"
+                                />
+                            </QCardSection>
+                        </QCard>
+                    </component>
+                </template>
+            </QTable>
+        </template>
+    </CrudModel>
     <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
         <QBtn @click="showForm = !showForm" color="primary" fab icon="add" shortcut="+" />
         <QTooltip>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 446816788..32b91b115 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,13 +86,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        // ARRAY DATA FALLA AL JUNTAR WHERE'S
-        console.log(
-            'userParams?.filter?.where: ',
-            userParams?.filter?.where,
-            filter?.where,
-            store.filter?.where
-        );
+        //FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
+        // console.log(
+        //     'userParams?.filter?.where: ',
+        //     userParams?.filter?.where,
+        //     filter?.where,
+        //     store.filter?.where
+        // );
         if ((userParams?.filter?.where, filter?.where || store.filter?.where))
             where = Object.assign(
                 userParams?.filter?.where ?? {},
@@ -101,9 +101,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             );
         Object.assign(filter, store.filter);
         filter.where = where;
-        console.log('where: ', where);
+        // console.log('where: ', where);
         const params = { filter };
-        console.log('params: ', params);
+        // console.log('params: ', params);
 
         delete userParams?.filter;
         Object.assign(params, userParams);
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 27c1b746c..35f366e47 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onBeforeMount, onMounted } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters/index';
@@ -90,9 +90,6 @@ const columns = computed(() => [
 onBeforeMount(async () => {
     campaignList.value = (await axios('Campaigns/latest')).data;
 });
-// onMounted(() => {
-//     showActionBtns.value = handleQueryParams();
-// });
 
 function getQueryParams() {
     return JSON.parse(route.query.consumption ?? '{}');
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 8519e88f3..0ff074793 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
@@ -73,28 +72,6 @@ const updateData = () => {
 </script>
 
 <template>
-    <!-- <VnTable
-        ref="tableRef"
-        data-key="Greuges"
-        url="Greuges"
-        search-url="greuges"
-        :filter="filter"
-        :order="['shipped DESC', 'amount']"
-        :columns="columns"
-        :right-search="false"
-        :is-editable="false"
-        :use-model="true"
-        :column-search="false"
-        @on-fetch="(data) => setRows(data)"
-        :disable-option="{ card: true }"
-        :create="{
-            urlCreate: `Greuges`,
-            title: t('New greuge'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: { shipped: new Date(), clientFk: route.params.id },
-        }"
-        auto-load
-    ></VnTable> -->
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index af1b0138e..6a839ff3f 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -1,22 +1,17 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { toCurrency, toDateHourMin } from 'src/filters';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
-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';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
 const tableRef = ref();
-// const rows = ref([]);
 
 const filter = {
     include: [
@@ -70,15 +65,6 @@ const columns = computed(() => [
         },
     },
 ]);
-
-// watch(
-//     () => route.params.id,
-//     (newValue) => {
-//         if (!newValue) return;
-//         filter.where.clientFk = newValue;
-//         clientInformasRef.value?.fetch();
-//     }
-// );
 </script>
 
 <template>
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 2d8cceda3..88eec33a4 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import axios from 'axios';
 import { useQuasar } from 'quasar';
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 1a1ae0e46..1c511b45d 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -61,7 +61,7 @@ const creditWarning = computed(() => {
     return tooMuchInsurance || noCreditInsurance ? 'negative' : '';
 });
 const sumRisk = ({ clientRisks }) => {
-    let total = clientRisks.reduce((acc, risk) => acc + risk.amount, 0);
+    let total = clientRisks.reduce((acc, { amount }) => acc + amount, 0);
 
     return total;
 };
@@ -153,8 +153,6 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.isActive')"
                         :value="entity.isActive"
                     />
-                    <!-- </VnRow>
-                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.verifiedData')"
                         :value="entity.isTaxDataChecked"
@@ -163,8 +161,6 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.hasToInvoice')"
                         :value="entity.hasToInvoice"
                     />
-                    <!-- </VnRow>
-                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
@@ -231,7 +227,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
+                    :url="`${grafanaUrl}/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.businessData')"
                     icon="vn:grafana"
                 />
@@ -258,7 +254,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
+                    :url="`${grafanaUrl}/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
                 />
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index 24f3746dc..c25e59e1a 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -48,7 +48,6 @@ const toCustomerCreditContracts = () => {
                         clearable
                         type="number"
                         v-model.number="data.credit"
-                        autofocus
                     />
                 </div>
                 <div class="col">

From 1f96f5c09af8fc9df520b1760c2d448066d09054 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 22:20:57 +0200
Subject: [PATCH 32/46] feat: orderCreateDialog

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Customer/Card/CustomerDescriptor.vue      |  12 -
 .../Customer/Card/CustomerDescriptorMenu.vue  |  15 +-
 src/pages/Order/Card/OrderCreateDialog.vue    | 220 ++++++++++++++++++
 5 files changed, 236 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/Order/Card/OrderCreateDialog.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 364cc74c7..82ecc4378 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -126,6 +126,7 @@ globals:
         notifications: Notifications
         defaulter: Defaulter
         customerCreate: New customer
+        createOrder: New order
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ac83b499d..85f106d5f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -123,6 +123,7 @@ globals:
         inheritedRoles: Roles heredados
         customers: Clientes
         customerCreate: Nuevo cliente
+        createOrder: Nuevo pedido
         list: Listado
         webPayments: Pagos Web
         extendedList: Listado extendido
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 5cab825a9..b18f90d20 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -179,17 +179,6 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'OrderCreate',
-                        query: { table: JSON.stringify({ clientFk: entity.id }) },
-                    }"
-                    size="md"
-                    icon="vn:basketadd"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('New order') }}</QTooltip>
-                </QBtn>
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
@@ -214,7 +203,6 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
     Go to user: Ir al usuario
     Customer unpaid: Cliente impago
     Unpaid: Impagado
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 88eec33a4..89b10a4fe 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -9,6 +9,7 @@ import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
 import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
 import { ref } from 'vue';
 
 const $props = defineProps({
@@ -42,11 +43,15 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
-const ticketCreateFormDialog = ref(null);
 
+const ticketCreateFormDialog = ref(null);
 const openTicketCreateForm = () => {
     ticketCreateFormDialog.value.show();
 };
+const orderCreateFormDialog = ref(null);
+const openOrderCreateForm = () => {
+    orderCreateFormDialog.value.show();
+};
 </script>
 
 <template>
@@ -58,6 +63,14 @@ const openTicketCreateForm = () => {
             </QDialog>
         </QItemSection>
     </QItem>
+    <QItem v-ripple clickable @click="openOrderCreateForm()">
+        <QItemSection>
+            {{ t('globals.pageTitles.createOrder') }}
+            <QDialog ref="orderCreateFormDialog">
+                <OrderCreateDialog :client-fk="customer.id" />
+            </QDialog>
+        </QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
new file mode 100644
index 000000000..9d5c9281e
--- /dev/null
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -0,0 +1,220 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useState } from 'composables/useState';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import { useDialogPluginComponent } from 'quasar';
+import { reactive } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const state = useState();
+const ORDER_MODEL = 'order';
+
+const router = useRouter();
+const clientList = ref([]);
+const agencyList = ref([]);
+const addressList = ref([]);
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const fetchAddressList = async (addressId) => {
+    try {
+        const { data } = await axios.get('addresses', {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['id', 'nickname', 'street', 'city'],
+                    where: { id: addressId },
+                }),
+            },
+        });
+        addressList.value = data;
+        if (addressList.value?.length === 1) {
+            state.get(ORDER_MODEL).addressId = addressList.value[0].id;
+        }
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+
+const fetchAgencyList = async (landed, addressFk) => {
+    if (!landed || !addressFk) {
+        return;
+    }
+    try {
+        const { data } = await axios.get('Agencies/landsThatDay', {
+            params: {
+                addressFk,
+                landed: new Date(landed).toISOString(),
+            },
+        });
+        agencyList.value = data;
+    } catch (err) {
+        console.error(`Error fetching agencies`, err);
+        return err.response;
+    }
+};
+
+// const fetchOrderDetails = (order) => {
+//     fetchAddressList(order?.addressFk);
+//     fetchAgencyList(order?.landed, order?.addressFk);
+// };
+const $props = defineProps({
+    clientFk: {
+        type: Number,
+        default: null,
+    },
+});
+const initialFormState = reactive({
+    active: true,
+    addressId: null,
+    clientFk: $props.clientFk,
+});
+// const orderMapper = (order) => {
+//     return {
+//         addressId: order.addressFk,
+//         agencyModeId: order.agencyModeFk,
+//         landed: new Date(order.landed).toISOString(),
+//     };
+// };
+// const orderFilter = {
+//     include: [
+//         { relation: 'agencyMode', scope: { fields: ['name'] } },
+//         {
+//             relation: 'address',
+//             scope: { fields: ['nickname'] },
+//         },
+//         { relation: 'rows', scope: { fields: ['id'] } },
+//         {
+//             relation: 'client',
+//             scope: {
+//                 fields: [
+//                     'salesPersonFk',
+//                     'name',
+//                     'isActive',
+//                     'isFreezed',
+//                     'isTaxDataChecked',
+//                 ],
+//                 include: {
+//                     relation: 'salesPersonUser',
+//                     scope: { fields: ['id', 'name'] },
+//                 },
+//             },
+//         },
+//     ],
+// };
+
+const onClientChange = async (clientId = $props.clientFk) => {
+    try {
+        const { data } = await axios.get(`Clients/${clientId}`);
+        await fetchAddressList(data.defaultAddressFk);
+    } catch (error) {
+        console.error('Error al cambiar el cliente:', error);
+    }
+};
+
+async function onDataSaved(_, id) {
+    await router.push({ path: `/order/${id}/catalog` });
+}
+onMounted(async () => {
+    await onClientChange();
+});
+</script>
+
+<template>
+    <FetchData
+        url="addresses"
+        @on-fetch="(data) => (clientOptions = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
+        auto-load
+    />
+    <FormModelPopup
+        url-create="Orders/new"
+        :title="t('Create Order')"
+        @on-data-saved="onDataSaved"
+        :model="ORDER_MODEL"
+        :filter="orderFilter"
+        :form-initial-data="initialFormState"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    url="Clients"
+                    :label="t('order.form.clientFk')"
+                    v-model="data.clientFk"
+                    option-value="id"
+                    option-label="name"
+                    :filter="{
+                        fields: ['id', 'name', 'defaultAddressFk'],
+                    }"
+                    hide-selected
+                    @update:model-value="onClientChange"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('order.form.addressFk')"
+                    v-model="data.addressId"
+                    :options="addressList"
+                    option-value="id"
+                    option-label="street"
+                    hide-selected
+                    :disable="!addressList?.length"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{
+                                        `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                    }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate
+                    placeholder="dd-mm-aaa"
+                    :label="t('order.form.landed')"
+                    v-model="data.landed"
+                    @update:model-value="
+                        () => fetchAgencyList(data.landed, data.addressId)
+                    "
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    :label="t('order.form.agencyModeFk')"
+                    v-model="data.agencyModeId"
+                    :options="agencyList"
+                    option-value="agencyModeFk"
+                    option-label="agencyMode"
+                    hide-selected
+                    :disable="!agencyList?.length"
+                >
+                </VnSelect>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        No default address found for the client: No hay ninguna dirección asociada a este cliente.
+</i18n>

From 2667d3afaee4e46ebd7b87b62704b82dafb1e0a2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 12:07:22 +0200
Subject: [PATCH 33/46] feat: show preparation field

---
 src/pages/Ticket/TicketAdvance.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 45bd8fd39..0ef6b5f46 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -133,6 +133,14 @@ const ticketColumns = computed(() => [
         sortable: true,
         columnFilter: null,
     },
+    {
+        label: t('advanceTickets.preparation'),
+        name: 'preparation',
+        field: 'preparation',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
     {
         label: t('advanceTickets.liters'),
         name: 'liters',
@@ -624,6 +632,7 @@ onMounted(async () => {
                     </QIcon>
                 </QTd>
             </template>
+
             <template #body-cell-ticketId="{ row }">
                 <QTd>
                     <QBtn flat class="link">

From 8c57bca4e07138945686f88002aced5628214684 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 10 Sep 2024 10:36:41 +0200
Subject: [PATCH 34/46] hotfix cau #218919 accountPrivileges fix

---
 src/pages/Account/Card/AccountPrivileges.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 1300f5018..513be7594 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -12,16 +12,21 @@ const route = useRoute();
 
 const rolesOptions = ref([]);
 const formModelRef = ref();
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset()
+);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
     <FormModel
         ref="formModelRef"
         model="AccountPrivileges"
-        :url="`VnUsers/${route.params.id}/privileges`"
-        :url-create="`VnUsers/${route.params.id}/privileges`"
+        url="VnUsers/preview"
+        :filter="{ where: { id: route.params.id } }"
+        :url-update="`VnUsers/${route.params.id}`"
+        :id="route.params.id"
         auto-load
-        @on-data-saved="formModelRef.fetch()"
     >
         <template #form="{ data }">
             <div class="q-gutter-y-sm">

From 7b2545798c4001621794e4bd0322780581988938 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 10 Sep 2024 12:38:09 +0200
Subject: [PATCH 35/46] fix(account_privileges): fix url update

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

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 513be7594..fea57105b 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -24,7 +24,7 @@ watch(
         model="AccountPrivileges"
         url="VnUsers/preview"
         :filter="{ where: { id: route.params.id } }"
-        :url-update="`VnUsers/${route.params.id}`"
+        :url-create="`VnUsers/${route.params.id}/privileges`"
         :id="route.params.id"
         auto-load
     >

From 070c9ca25f8c13dfc3e027db42a261cdc1329440 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 14:17:59 +0200
Subject: [PATCH 36/46] fix: refs #6900 e2e error

---
 src/components/LeftMenuItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..444022776 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>

From 77f2a4d8250764b2d99fc8ec3766fe8ebe99bd95 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 14:36:44 +0200
Subject: [PATCH 37/46] fix: refs #6900 rollback

---
 src/components/LeftMenuItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 444022776..9fe66e278 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding?.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>

From a41143b410d8d25ea401ec8e0dff057a53d28318 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 14:43:35 +0200
Subject: [PATCH 38/46] chore: refs #6772 fix e2e

---
 src/components/common/VnCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 5cee06582..7d29da232 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -79,7 +79,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.fullPath" />
+                <RouterView :key="route.path" />
             </div>
         </QPage>
     </QPageContainer>

From 622afca9be3859ef2777b241d2b3c82d5d4034b6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 15:17:10 +0200
Subject: [PATCH 39/46] feat: CustomerSample to VnTable

---
 src/components/LeftMenuItem.vue               |  2 +-
 src/components/VnTable/VnTable.vue            |  6 +-
 .../Customer/Card/CustomerBillingData.vue     |  4 +-
 src/pages/Customer/Card/CustomerGreuges.vue   |  1 -
 src/pages/Customer/Card/CustomerSamples.vue   | 80 ++++++-----------
 .../components/CustomerAddressCreate.vue      |  4 +-
 .../components/CustomerAddressEdit.vue        |  8 +-
 .../CustomerFileManagementCreate.vue          | 12 +--
 .../components/CustomerFileManagementEdit.vue | 10 +--
 .../components/CustomerSamplesCreate.vue      | 90 ++++++++-----------
 .../components/CustomerSummaryTable.vue       |  1 +
 src/pages/Dashboard/DashboardMain.vue         |  2 +-
 .../Department/Card/DepartmentBasicData.vue   |  4 +-
 13 files changed, 93 insertions(+), 131 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..2a6de5e2e 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4ba7d0227..964dafabe 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -363,7 +363,7 @@ function handleOnDataSaved(_, res) {
     <!-- class in div to fix warn-->
     <CrudModel
         v-bind="$attrs"
-        :class="$attrs['class']"
+        :class="$attrs['class'] ?? 'q-px-md'"
         :limit="$attrs['limit'] ?? 20"
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
@@ -638,7 +638,7 @@ function handleOnDataSaved(_, res) {
             </QTable>
         </template>
     </CrudModel>
-    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+    <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
         <QBtn
             @click="
                 () =>
@@ -650,7 +650,7 @@ function handleOnDataSaved(_, res) {
             shortcut="+"
         />
         <QTooltip>
-            {{ createForm.title }}
+            {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
     <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 290bde909..e375846c9 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -31,8 +31,8 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
+    <FetchData
         ref="bankEntitiesRef"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         :filter="filter"
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 8a83d49db..1c78392e7 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -47,7 +47,6 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        // name: 'userFk',
         label: t('Created by'),
         component: 'userLink',
         attrs: ({ row }) => {
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index e28e290f4..49697aab7 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -3,18 +3,18 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { QBtn } from 'quasar';
+import { QBtn, useQuasar } from 'quasar';
 
-import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
+import CustomerSamplesCreate from '../components/CustomerSamplesCreate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const rows = ref([]);
-
 const filter = {
     include: [
         { relation: 'type', scope: { fields: ['code', 'description'] } },
@@ -26,91 +26,67 @@ const filter = {
     limit: 20,
 };
 
-const basicSpan = {
-    component: 'span',
-    props: () => {},
-    event: () => {},
-};
-const tableColumnComponents = {
-    sent: basicSpan,
-    description: basicSpan,
-    worker: {
-        component: 'span',
-        props: () => ({ class: 'link' }),
-        event: () => {},
-    },
-    company: basicSpan,
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
+        name: 'created',
         label: t('Sent'),
-        name: 'sent',
-        format: (value) => toDateTimeFormat(value),
+        format: ({ created }) => toDateTimeFormat(created),
     },
     {
         align: 'left',
-        field: (value) => value.type.description,
+        format: (row) => row.type.description,
         label: t('Description'),
         name: 'description',
     },
     {
         align: 'left',
-        field: (value) => value.user.name,
         label: t('Worker'),
         name: 'worker',
     },
     {
         align: 'left',
-        field: (value) => value.company?.code,
+        format: ({ company }) => company?.code ?? dashIfEmpty(company),
         label: t('Company'),
         name: 'company',
     },
 ]);
+const quasar = useQuasar();
 
 const toCustomerSamplesCreate = () => {
-    router.push({ name: 'CustomerSamplesCreate' });
+    quasar
+        .dialog({
+            component: CustomerSamplesCreate,
+        })
+        .onOk(() => tableRef.value.reload());
 };
+const tableRef = ref();
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientSamples"
         auto-load
+        :filter="filter"
         url="ClientSamples"
-    />
-
-    <QTable
         :columns="columns"
         :pagination="{ rowsPerPage: 12 }"
+        :disable-option="{ card: true }"
         :rows="rows"
         class="full-width q-mt-md"
         row-key="id"
+        :create="false"
         :no-data-label="t('globals.noResults')"
     >
-        <template #body-cell="props">
-            <QTd auto-width :props="props">
-                <span :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)"
-                        :title="props.value"
-                    >
-                        {{ props.value }}
-                        <WorkerDescriptorProxy
-                            :id="props.row.userFk"
-                            v-if="props.col.name === 'worker'"
-                        />
-                    </component>
-                </span>
-            </QTd>
+        <template #column-worker="{ row }">
+            <div v-if="row.user">
+                <span class="link">{{ row.user?.name }}</span
+                ><WorkerDescriptorProxy :id="row.userFk" />
+            </div>
+            <span v-else>{{ dashIfEmpty(row.user) }}</span>
         </template>
-    </QTable>
+    </VnTable>
 
     <QPageSticky :offset="[18, 18]">
         <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..f93406185 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -57,12 +57,12 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
 
     <FormModel
         :form-initial-data="formInitialData"
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..ddcb8e2d6 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -113,18 +113,18 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData
         @on-fetch="(data) => (customsAgents = data)"
         auto-load
         url="CustomsAgents"
     />
-    <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
+    <FetchData @on-fetch="getData" auto-load url="ObservationTypes" />
 
     <FormModel
         :observe-form-changes="false"
diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
index 7c15e0b71..f33a47bcc 100644
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@@ -83,35 +83,35 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (client = data)"
         auto-load
         :url="`Clients/${route.params.id}/getCard`"
     />
-    <fetch-data
+    <FetchData
         :filter="filterFindOne"
         @on-fetch="(data) => (findOne = data)"
         auto-load
         url="DmsTypes/findOne"
     />
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load
diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
index 80eaa44f9..107f41330 100644
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@@ -69,25 +69,25 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
-    <fetch-data
+    <FetchData :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 79f4fe449..c7772ab4e 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 import { usePrintService } from 'composables/usePrintService';
-import { useQuasar } from 'quasar';
+import { useDialogPluginComponent, useQuasar } from 'quasar';
 
 import { useState } from 'src/composables/useState';
 import { useValidator } from 'src/composables/useValidator';
@@ -18,6 +18,10 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
 import { useStateStore } from 'stores/useStateStore';
+import FormPopup from 'src/components/FormPopup.vue';
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -181,6 +185,7 @@ const onDataSaved = async () => {
         const samplesData = await getSamples();
         const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
         await sendEmail(path, params);
+        onDialogOK(params);
     } catch (error) {
         notify('errors.create', 'negative');
     }
@@ -197,73 +202,54 @@ const toCustomerSamples = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         :filter="filterEmailUsers"
         @on-fetch="setEmailUser"
         auto-load
         url="EmailUsers"
     />
-    <fetch-data
+    <FetchData
         :filter="filterClientsAddresses"
         :url="`Clients/${route.params.id}/addresses`"
         @on-fetch="setClientsAddresses"
         auto-load
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterSamplesVisible"
         @on-fetch="(data) => (optionsSamplesVisible = data)"
         auto-load
         url="Samples/visible"
     />
 
-    <Teleport v-if="stateStore?.isSubToolbarShown()" to="#st-actions">
-        <QBtnGroup push class="q-gutter-x-sm">
-            <QBtn
-                :label="t('globals.cancel')"
-                @click="toCustomerSamples"
-                color="primary"
-                flat
-                icon="close"
-            />
-            <QBtn
-                :disabled="isLoading || !sampleType?.hasPreview"
-                :label="t('Preview')"
-                :loading="isLoading"
-                @click.stop="getPreview()"
-                color="primary"
-                flat
-                icon="preview"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.reset')"
-                :loading="isLoading"
-                @click="setInitialData"
-                color="primary"
-                flat
-                icon="restart_alt"
-                type="reset"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.save')"
-                :loading="isLoading"
-                @click="onSubmit"
-                color="primary"
-                icon="save"
-            />
-        </QBtnGroup>
-    </Teleport>
-
-    <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
-            <QForm>
+    <QDialog ref="dialogRef">
+        <FormPopup
+            :default-cancel-button="false"
+            :default-submit-button="false"
+            @on-submit="onSubmit()"
+        >
+            <template #custom-buttons>
+                <QBtn
+                    :disabled="isLoading || !sampleType?.hasPreview"
+                    :label="t('Preview')"
+                    :loading="isLoading"
+                    @click.stop="getPreview()"
+                    color="primary"
+                    flat
+                    icon="preview" /><QBtn
+                    :disabled="!hasChanged"
+                    :label="t('globals.save')"
+                    :loading="isLoading"
+                    @click="onSubmit"
+                    color="primary"
+                    icon="save"
+            /></template>
+            <template #form-inputs>
                 <div class="col">
                     <VnSelect
                         :label="t('Sample')"
@@ -371,15 +357,15 @@ const toCustomerSamples = () => {
                             required="true"
                             v-model="initialData.from"
                         />
-                    </div>
-                </VnRow>
-            </QForm>
-        </QCard>
-    </div>
+                    </div> </VnRow
+            ></template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
 es:
+    New sample: Crear plantilla
     Sample: Plantilla
     Recipient: Destinatario
     Reply to: Responder a
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index e2fb61322..87e4cffa7 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -150,6 +150,7 @@ const setShippedColor = (date) => {
         order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
         limit="5"
+        class="full-width"
     >
         <template #column-nickname="{ row }">
             <span class="link">
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index a339120e2..56054156a 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -60,7 +60,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                             <QTooltip>
                                                 {{
                                                     'Ctrl + Alt + ' +
-                                                    item.keyBinding.toUpperCase()
+                                                    item?.keyBinding?.toUpperCase()
                                                 }}
                                             </QTooltip>
                                         </div>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 4573f7b66..98abfd6b9 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -16,12 +16,12 @@ const workersOptions = ref([]);
 const clientsOptions = ref([]);
 </script>
 <template>
-    <fetch-data
+    <FetchData
         url="Workers/search"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
     />
-    <fetch-data url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
+    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FormModel
         :url="`Departments/${route.params.id}`"
         model="department"

From 19eb77089365f497ee73860e21724a2dc93d2f85 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 08:41:16 +0200
Subject: [PATCH 40/46] feat: remove cli warnings

---
 src/components/VnTable/VnTable.vue            |  2 +-
 src/components/common/VnSelectDialog.vue      |  1 -
 src/pages/Customer/Card/CustomerUnpaid.vue    |  5 +-
 .../components/CustomerSamplesCreate.vue      | 56 +++++++------------
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 964dafabe..0ed3de261 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -303,7 +303,7 @@ defineExpose({
     CrudModelRef,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved(this);
     else $props.create.onDataSaved(_);
 }
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 219e6dc98..17f893255 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -28,7 +28,6 @@ const $props = defineProps({
 
 const role = useRole();
 const acl = useAcl();
-const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
     if ($props.acls.length) return acl.hasAny($props.acls);
diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index 5b9a6cde2..ad00cbf59 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -151,7 +151,10 @@ watch(
                             clearable
                             type="number"
                             v-model="amount"
-                        />
+                            autofocus
+                        >
+                            <template #append>€</template></VnInput
+                        >
                     </div>
                 </VnRow>
             </QForm>
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index c7772ab4e..3c9eb856b 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, reactive, ref } from 'vue';
+import { computed, onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -17,9 +17,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
-import { useStateStore } from 'stores/useStateStore';
 import FormPopup from 'src/components/FormPopup.vue';
-defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
@@ -31,17 +29,17 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const stateStore = useStateStore();
 const { sendEmail } = usePrintService();
-const client = ref({});
 const hasChanged = ref(false);
 const isLoading = ref(false);
-const optionsClientsAddressess = ref([]);
-const optionsCompanies = ref([]);
+const addressess = ref([]);
+const companies = ref([]);
 const optionsEmailUsers = ref([]);
 const optionsSamplesVisible = ref([]);
 const sampleType = ref({ hasPreview: false });
-
+const initialData = reactive({});
+const entityId = computed(() => route.params.id);
+const customer = computed(() => state.get('customer'));
 const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
@@ -63,14 +61,13 @@ const filterSamplesVisible = {
     ],
     order: ['description'],
 };
-const initialData = reactive({});
+
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 onBeforeMount(async () => {
-    const { data } = await axios.get(`Clients/1/getCard`);
-    client.value = data;
-    initialData.clientFk = route.params?.id;
-    initialData.recipient = data.email;
-    initialData.recipientId = data.id;
+    initialData.clientFk = customer.value.id;
+    initialData.recipient = customer.value.email;
+    initialData.recipientId = customer.value.id;
 });
 
 const setEmailUser = (data) => {
@@ -80,7 +77,7 @@ const setEmailUser = (data) => {
 
 const setClientsAddresses = (data) => {
     initialData.addressId = data[0].id;
-    optionsClientsAddressess.value = data;
+    addressess.value = data;
 };
 
 const setSampleType = (sampleId) => {
@@ -93,20 +90,6 @@ const setSampleType = (sampleId) => {
     initialData.companyId = companyFk;
 };
 
-const setInitialData = () => {
-    hasChanged.value = false;
-
-    initialData.addressId = optionsClientsAddressess.value[0].id;
-    initialData.companyFk = null;
-    initialData.from = null;
-    initialData.recipient = client.value.email;
-    initialData.recipientId = client.value.id;
-    initialData.replyTo = optionsEmailUsers.value[0]?.email;
-    initialData.typeFk = '';
-
-    sampleType.value = {};
-};
-
 const validateMessage = () => {
     if (!initialData.recipient) return 'Email cannot be blank';
     if (!sampleType.value) return 'Choose a sample';
@@ -125,14 +108,14 @@ const setParams = (params) => {
 const getPreview = async () => {
     try {
         const params = {
-            recipientId: route.params.id,
+            recipientId: entityId,
         };
         const validationMessage = validateMessage();
         if (validationMessage) return notify(t(validationMessage), 'negative');
 
         setParams(params);
 
-        const path = `${sampleType.value.model}/${route.params.id}/${sampleType.value.code}-html`;
+        const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`;
         const { data } = await axios.get(path, { params });
 
         if (!data) return;
@@ -173,7 +156,6 @@ const getSamples = async () => {
     }
 };
 
-getSamples();
 const onDataSaved = async () => {
     try {
         const params = {
@@ -183,7 +165,7 @@ const onDataSaved = async () => {
         };
         setParams(params);
         const samplesData = await getSamples();
-        const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+        const path = `${samplesData.model}/${entityId.value}/${samplesData.code}-email`;
         await sendEmail(path, params);
         onDialogOK(params);
     } catch (error) {
@@ -210,13 +192,13 @@ const toCustomerSamples = () => {
     />
     <FetchData
         :filter="filterClientsAddresses"
-        :url="`Clients/${route.params.id}/addresses`"
+        :url="`Clients/${entityId}/addresses`"
         @on-fetch="setClientsAddresses"
         auto-load
     />
     <FetchData
         :filter="filterCompanies"
-        @on-fetch="(data) => (optionsCompanies = data)"
+        @on-fetch="(data) => (companies = data)"
         auto-load
         url="Companies"
     />
@@ -306,7 +288,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Company')"
-                            :options="optionsCompanies"
+                            :options="companies"
                             :rules="validate('entry.companyFk')"
                             hide-selected
                             option-label="code"
@@ -319,7 +301,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Address')"
-                            :options="optionsClientsAddressess"
+                            :options="addressess"
                             hide-selected
                             option-label="nickname"
                             option-value="id"

From 2d8322c6da3f53e322fc0577889f42be32cf7a2f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 09:20:54 +0200
Subject: [PATCH 41/46] fix: remove FIXME

---
 src/composables/useArrayData.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 32b91b115..651bcefb0 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,26 +86,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        //FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
-        // console.log(
-        //     'userParams?.filter?.where: ',
-        //     userParams?.filter?.where,
-        //     filter?.where,
-        //     store.filter?.where
-        // );
-        if ((userParams?.filter?.where, filter?.where || store.filter?.where))
-            where = Object.assign(
-                userParams?.filter?.where ?? {},
-                filter?.where ?? {},
-                store.filter?.where ?? {}
-            );
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
         Object.assign(filter, store.filter);
         filter.where = where;
-        // console.log('where: ', where);
         const params = { filter };
-        // console.log('params: ', params);
 
-        delete userParams?.filter;
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
         if (store.order && store.order.length) params.filter.order = store.order;

From e2d3154878974fb8b4b8f83f34e0ffc10547e162 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Sep 2024 09:21:30 +0200
Subject: [PATCH 42/46] fix(ClaimLines): not reload when change quantity

---
 src/pages/Claim/Card/ClaimLines.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 52fbfca98..77c7dacf1 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -45,7 +45,7 @@ async function onFetchClaim(data) {
 
 const amount = ref();
 const amountClaimed = ref();
-async function onFetch(rows, newRows) {
+function onFetch(rows, newRows) {
     if (newRows) rows = newRows;
     amount.value = 0;
     amountClaimed.value = 0;
@@ -155,7 +155,7 @@ function showImportDialog() {
 async function saveWhenHasChanges() {
     if (claimLinesForm.value.getChanges().updates) {
         await claimLinesForm.value.onSubmit();
-        await claimLinesForm.value.reload();
+        onFetch(claimLinesForm.value.formData);
     }
 }
 </script>
@@ -211,7 +211,7 @@ async function saveWhenHasChanges() {
                     <template #body-cell-claimed="{ row }">
                         <QTd auto-width align="right" class="text-primary">
                             <QInput
-                                v-model="row.quantity"
+                                v-model.number="row.quantity"
                                 type="number"
                                 dense
                                 @keyup.enter="saveWhenHasChanges()"
@@ -266,7 +266,9 @@ async function saveWhenHasChanges() {
                                             <template v-if="column.name === 'claimed'">
                                                 <QItemLabel class="text-primary">
                                                     <QInput
-                                                        v-model="props.row.quantity"
+                                                        v-model.number="
+                                                            props.row.quantity
+                                                        "
                                                         type="number"
                                                         dense
                                                         autofocus

From 1c9e13fe15ebb1ec325e4aed137345a64b799874 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 11 Sep 2024 10:23:27 +0200
Subject: [PATCH 43/46] refs #7962 fix claimSummary

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

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 9538e753f..b66692e8a 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -95,8 +95,8 @@ const detailsColumns = ref([
     {
         name: 'total',
         label: 'claim.total',
-        field: ({ sale }) =>
-            toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
+        field: (row) =>
+            toCurrency(row.quantity * row.sale.price * ((100 - row.sale.discount) / 100)),
         sortable: true,
     },
 ]);

From 8d96539b240bd5cb809f691725df850fb1f39938 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 13:18:54 +0200
Subject: [PATCH 44/46] perf: solve reload CardSummary component

---
 src/components/common/VnCard.vue            | 2 +-
 src/pages/Customer/Card/CustomerSummary.vue | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 5cee06582..7d29da232 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -79,7 +79,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.fullPath" />
+                <RouterView :key="route.path" />
             </div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 1c511b45d..f049426e2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
@@ -25,11 +24,6 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const clientUrl = ref();
-
-onMounted(async () => {
-    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
-});
 
 const balanceDue = computed(() => {
     return (

From 18fc5e241c67a9080ae19b69550091d2fc022a2f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Sep 2024 14:07:31 +0200
Subject: [PATCH 45/46] fix: refs #7903 fixed ticket's search bar and
 keybinding tooltip

---
 src/components/LeftMenuItem.vue      |  2 +-
 src/pages/Ticket/Card/TicketCard.vue |  8 +-------
 src/pages/Ticket/TicketList.vue      | 27 ++++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 2a6de5e2e..ab74c1de5 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -35,7 +35,7 @@ const itemComputed = computed(() => {
         </QItemSection>
         <QItemSection>
             {{ t(itemComputed.title) }}
-            <QTooltip>
+            <QTooltip v-if="item.keyBinding">
                 {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index cf15cb7fa..73b6f5543 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,17 +1,11 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
 
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketFilter from '../TicketFilter.vue';
 
 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => routeName.value);
 </script>
 <template>
     <VnCard
@@ -21,7 +15,7 @@ const customRouteRedirectName = computed(() => routeName.value);
         :descriptor="TicketDescriptor"
         search-data-key="TicketList"
         :searchbar-props="{
-            customRouteRedirectName,
+            url: 'Tickets/filter',
             label: t('card.search'),
             info: t('card.searchInfo'),
         }"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index cbd102317..25315b5d1 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters/index';
@@ -22,8 +23,11 @@ const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
 const selectedClient = ref();
 const stateStore = useStateStore();
+const route = useRoute();
 const from = Date.vnNew();
+from.setHours(0, 0, 0, 0);
 const to = Date.vnNew();
+to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
 
 const userParams = {
@@ -31,6 +35,16 @@ const userParams = {
     to: to.toISOString(),
 };
 
+// Método para inicializar las variables desde la query string
+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+
+    // Asigna los valores a las variables correspondientes
+    from.value = query.from || from.toISOString();
+    to.value = query.to || to.toISOString();
+    Object.assign(userParams, { from, to });
+};
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -200,23 +214,26 @@ const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
 
-onMounted(() => (stateStore.rightDrawer = true));
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+});
 </script>
 
 <template>
     <VnSearchbar
-        data-key="Tickets"
+        data-key="Ticket"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Tickets" />
+            <TicketFilter data-key="Ticket" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Tickets"
+        data-key="Ticket"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
@@ -225,7 +242,7 @@ onMounted(() => (stateStore.rightDrawer = true));
             formInitialData: {},
         }"
         default-mode="table"
-        order="id DESC"
+        :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
         :columns="columns"
         :user-params="userParams"
         :right-search="false"

From 4a234dd875c1425bf5bf235d58110b3d4d3fea6f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 12 Sep 2024 08:31:57 +0200
Subject: [PATCH 46/46] fix: duplicate code

---
 src/pages/Ticket/TicketList.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 81e185014..bd0bda6e3 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -15,7 +15,6 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 
-import { useRoute } from 'vue-router';
 const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -25,7 +24,6 @@ const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
 const selectedClient = ref();
 const stateStore = useStateStore();
-const route = useRoute();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
 const to = Date.vnNew();
@@ -46,16 +44,6 @@ const initializeFromQuery = () => {
     Object.assign(userParams, { from, to });
 };
 
-// Método para inicializar las variables desde la query string
-const initializeFromQuery = () => {
-    const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
-    from.value = query.from || from.toISOString();
-    to.value = query.to || to.toISOString();
-    Object.assign(userParams, { from, to });
-};
-
 const columns = computed(() => [
     {
         align: 'left',