From 2992ac2d0d877d74bc3e436b5c81c40e33e63d15 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 3 Apr 2025 20:06:31 +0200
Subject: [PATCH 1/3] fix: rename 'shipped' to 'shippedDate' and 'shippedHour'

---
 src/pages/Ticket/TicketList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 039d3ca9e..634b8e50a 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -113,7 +113,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shipped',
+        name: 'shippedDate',
         cardVisible: true,
         label: t('ticketList.shipped'),
         columnFilter: {
@@ -123,7 +123,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shipped',
+        name: 'shippedHour',
         component: 'time',
         columnFilter: false,
         label: t('ticketList.hour'),

From 21c3384509f59ef04200cbd50c549455d823b480 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 3 Apr 2025 20:07:54 +0200
Subject: [PATCH 2/3] fix: use optional chaining for departmentFk in useRole
 composable

---
 src/composables/useRole.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/composables/useRole.js b/src/composables/useRole.js
index e700b1f2e..e4e4f52c7 100644
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@@ -13,7 +13,7 @@ export function useRole() {
             name: data.user.name,
             nickname: data.user.nickname,
             lang: data.user.lang || 'es',
-            departmentFk: data.user.worker.department.departmentFk,
+            departmentFk: data.user?.worker?.department?.departmentFk,
         };
         state.setUser(userData);
         state.setRoles(roles);

From 1a7a8dfc95b08338ae92eb20c30ba22e5704cda6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 3 Apr 2025 20:10:05 +0200
Subject: [PATCH 3/3] fix: add 'hour' translation to English locale for ticket
 list

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

diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 9eb8ce8cb..2e44df7aa 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -205,6 +205,7 @@ ticketList:
     toLines: Go to lines
     addressNickname: Address nickname
     ref: Reference
+    hour: Hour
     rounding: Rounding
     noVerifiedData: No verified data
     purchaseRequest: Purchase request