From 954c5a3badcfef9de0c8ced29ddb81e1689c4573 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 10 Apr 2025 12:11:10 +0200
Subject: [PATCH 1/2] fix: update phone number component handling

---
 src/pages/Customer/Card/CustomerBalance.vue |  1 +
 src/pages/Customer/CustomerList.vue         | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 15f80b2f6..43b0ef84f 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -131,6 +131,7 @@ const columns = computed(() => [
         name: 'isConciliate',
         label: t('Conciliated'),
         cardVisible: true,
+        component: 'checkbox',
     },
     {
         align: 'left',
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index b721a6ad9..f5e7485a2 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -111,14 +111,11 @@ const columns = computed(() => [
             component: 'number',
         },
         columnField: {
-            component: null,
-            after: {
-                component: markRaw(VnLinkPhone),
-                attrs: ({ model }) => {
-                    return {
-                        'phone-number': model,
-                    };
-                },
+            component: markRaw(VnLinkPhone),
+            attrs: ({ model }) => {
+                return {
+                    'phone-number': model,
+                };
             },
         },
     },

From 31451a86edf84379959ed83f4db75ef0bfecc1f3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 10 Apr 2025 14:59:52 +0200
Subject: [PATCH 2/2] fix: 'shippedDate' filter

---
 src/pages/Ticket/TicketFilter.vue |  2 ++
 src/pages/Ticket/TicketList.vue   | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index d84d1c082..43311007d 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -273,6 +273,7 @@ en:
         orderFk: Order
         from: From
         shipped: Shipped
+        shippedDate: Shipped date
         to: To
         stateFk: State
         groupedStates: Grouped State
@@ -300,6 +301,7 @@ es:
         orderFk: Pedido
         from: Desde
         shipped: F. envío
+        shippedDate: F. envío
         to: Hasta
         stateFk: Estado
         groupedStates: Estado agrupado
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 634b8e50a..3612cb24a 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -113,13 +113,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shippedDate',
+        name: 'shipped',
         cardVisible: true,
         label: t('ticketList.shipped'),
         columnFilter: {
             component: 'date',
         },
-        format: ({ shippedDate }) => toDate(shippedDate),
+        format: ({ shipped }) => toDate(shipped),
     },
     {
         align: 'left',
@@ -477,7 +477,7 @@ function setReference(data) {
         prefix="card"
         :array-data-props="{
             url: 'Tickets/filter',
-            order: ['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
+            order: ['shipped DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
             exprBuilder,
         }"
     >
@@ -515,10 +515,10 @@ function setReference(data) {
                         <DepartmentDescriptorProxy :id="row.departmentFk" />
                     </span>
                 </template>
-                <template #column-shippedDate="{ row }">
+                <template #column-shipped="{ row }">
                     <span v-if="getDateColor(row.shipped)">
                         <QChip :class="getDateColor(row.shipped)" dense square>
-                            {{ toDate(row.shippedDate) }}
+                            {{ toDate(row.shipped) }}
                         </QChip>
                     </span>
                 </template>