Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front

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('Customer');
 const { t } = useI18n();
@@ -50,7 +51,7 @@ const columns = computed(() => [
         label: t('globals.ticket'),
         cardVisible: true,
         columnFilter: {
-            inWhere: true,
+            name: 'ticketId',
         },
     },
     {
@@ -84,25 +85,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,
         visible: true,
-        columnFilter: {
+        columnFilter: false
-            inWhere: true,
+         
-        },
-    },
-    {
-        name: 'grouped',
-        label: t('Group by items'),
-        component: 'checkbox',
-        visible: false,
-        orderBy: false,
     },
+   
 ]);
 
 onBeforeMount(async () => {
@@ -218,9 +213,9 @@ 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 }">
+        <template #moreFilterPanel="{ params, searchFn}">
             <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
                 <VnSelect
                     :filled="true"
@@ -290,6 +285,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>

src/pages/Customer/locale/en.yml

@@ -123,3 +123,4 @@ customer:
         ticketFk: Ticket Id
         description: Description
         quantity: Quantity
+        ticketId: Ticket

src/pages/Customer/locale/es.yml

@@ -123,3 +123,4 @@ customer:
         ticketFk: Id Ticket
         description: Descripción
         quantity: Cantidad
+        ticketId: Ticket