From af065eb66e935c299fd26a9a924a2299d900fd21 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Tue, 6 May 2025 14:07:16 +0200
Subject: [PATCH] fix: fix Description & TicketId filters on
 CustomerConsumption

---
 .../Customer/Card/CustomerConsumption.vue     | 33 ++++++++++---------
 src/pages/Customer/locale/en.yml              | 27 +++++++++++++++
 src/pages/Customer/locale/es.yml              | 27 +++++++++++++++
 3 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 640e37ed3..a968526e3 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -17,6 +17,7 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
 const arrayData = useArrayData('Client');
 const { t } = useI18n();
@@ -50,7 +51,7 @@ const columns = computed(() => [
         label: t('globals.ticket'),
         cardVisible: true,
         columnFilter: {
-            inWhere: true,
+            name: 'ticketId',
         },
     },
     {
@@ -67,24 +68,19 @@ const columns = computed(() => [
         label: t('globals.description'),
         columnClass: 'expand',
         columnFilter: {
-            inWhere: true,
+            name: 'description',
+            
         },
     },
     {
-        name: 'quantity',
+         name: 'quantity',
         label: t('globals.quantity'),
         cardVisible: true,
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        name: 'grouped',
-        label: t('Group by items'),
-        component: 'checkbox',
-        visible: false,
-        orderBy: false,
+        visible: true,
+        columnFilter: false
+         
     },
+   
 ]);
 
 onBeforeMount(async () => {
@@ -199,9 +195,9 @@ const updateDateParams = (value, params) => {
             <div v-if="row.subName" class="subName">
                 {{ row.subName }}
             </div>
-            <FetchedTags :item="row" :max-length="3" />
+            <FetchedTags :item="row" :columns="6"/>
         </template>
-        <template #moreFilterPanel="{ params }">
+        <template #moreFilterPanel="{ params, searchFn}">
             <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
                 <VnSelect
                     v-model="params.campaign"
@@ -240,6 +236,13 @@ const updateDateParams = (value, params) => {
                     class="q-px-xs q-pt-none fit"
                     dense
                 />
+                <VnCheckbox
+                    v-model="params.grouped"
+                    :label="t('Group by items')"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                    @update:modelValue="() => searchFn()"
+                />
             </div>
         </template>
     </VnTable>
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 18cee7309..4b95da6fc 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -94,3 +94,30 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
+    search: Search customer
+    searchInfo: You can search by customer ID
+    params:
+        id: Id
+        isWorker: Is Worker
+        payMethod: Payment Method
+        workerFk: Author
+        observation: Last Observation
+        created: Last Update Date
+        creditInsurance: Credit Insurance
+        defaulterSinced: Defaulted Since
+        hasRecovery: Has Recovery
+        socialName: Social name
+        typeId: Type
+        buyerId: Buyer
+        categoryId: Category
+        city: City
+        phone: Phone
+        postcode: Postcode
+        campaign: Campaign
+        grouped: Grouped
+        search: Contains
+        itemId: Item Id
+        ticketFk: Ticket Id
+        description: Description
+        quantity: Quantity
+        ticketId: Ticket
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index b544f8ad7..29dc54a58 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -96,3 +96,30 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
+    search: Buscar cliente
+    searchInfo: Puedes buscar por id o nombre del cliente
+    params:
+        id: ID
+        isWorker: Es trabajador
+        payMethod: F. Pago
+        workerFk: Autor
+        observation: Última observación
+        created: Fecha Ú. O.
+        creditInsurance: Crédito A.
+        defaulterSinced: Desde
+        hasRecovery: Tiene recobro
+        socialName: Razón social
+        campaign: Campaña
+        typeId: Familia
+        buyerId: Comprador
+        categoryId: Reino
+        city: Ciudad
+        phone: Teléfono
+        postcode: Código postal
+        grouped: Agrupado
+        search: Contiene
+        itemId: Id Artículo
+        ticketFk: Id Ticket
+        description: Descripción
+        quantity: Cantidad
+        ticketId: Ticket