From 6c8ccd011a0f9eba6b960421e5bdff1d279b4f78 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Tue, 6 May 2025 14:12:27 +0200
Subject: [PATCH] fix: merge

---
 src/pages/Customer/Card/CustomerConsumption.vue | 7 +++----
 src/pages/Customer/locale/en.yml                | 1 +
 src/pages/Customer/locale/es.yml                | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index ed1512788..8ae76acec 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -94,9 +94,8 @@ const columns = computed(() => [
         label: t('globals.quantity'),
         cardVisible: true,
         visible: true,
-        columnFilter: {
-            inWhere: true,
-        },
+        columnFilter: false
+         
     },
    
 ]);
@@ -214,7 +213,7 @@ const updateDateParams = (value, params) => {
             <div v-if="row.subName" class="subName">
                 {{ row.subName }}
             </div>
-            <FetchedTags :item="row" />
+            <FetchedTags :item="row" :columns="6"/>
         </template>
         <template #moreFilterPanel="{ params, searchFn}">
             <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index fca3354e6..3c651e7f3 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -123,3 +123,4 @@ customer:
         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 9b0009b36..ba80bd555 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -123,3 +123,4 @@ customer:
         ticketFk: Id Ticket
         description: Descripción
         quantity: Cantidad
+        ticketId: Ticket