From a17c6763770a76826747285c88f6afaab38874c1 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 30 Apr 2025 10:02:03 +0200
Subject: [PATCH 1/7] feat(TravelFilter): add isDelivered and isReceived fields
 to filter options

---
 src/pages/Travel/Card/TravelFilter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
index 0799e449c..f07f200a1 100644
--- a/src/pages/Travel/Card/TravelFilter.js
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -13,6 +13,8 @@ export default {
         'daysInForward',
         'availabled',
         'awbFk',
+        'isDelivered',
+        'isReceived',
     ],
     include: [
         {

From 2d17868e7cc2a411eaca1ce747f8ee6e391ede21 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 30 Apr 2025 10:06:49 +0200
Subject: [PATCH 2/7] fix: update recipient email access in resendEmail
 function

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 18ce64158..613002146 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -412,7 +412,7 @@ const isUnsatisfied = async (reason) => {
 
 const resendEmail = async () => {
     const params = {
-        recipient: worker.value[0]?.user?.emailUser?.email,
+        recipient: worker.value?.user?.emailUser?.email,
         week: selectedWeekNumber.value,
         year: selectedDateYear.value,
         workerId: Number(route.params.id),

From 7eb02bee8c1a5b9d50492b1e588fb571c66cfb40 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 07:28:30 +0200
Subject: [PATCH 3/7] fix: ticketBasicData step1

---
 .../Card/BasicData/TicketBasicDataForm.vue    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 18af48283..b2e28f597 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -59,11 +59,25 @@ const zoneWhere = computed(() => {
 });
 
 async function getLanded(params) {
-    getDate(`Agencies/getLanded`, params);
+    const data = await getDate(`Agencies/getLanded`, params);
+    formData.value.landed = data.landed;
+    const shippedDate = new Date(params.shipped);
+    const landedDate = new Date(data.hour);
+    shippedDate.setHours(
+        landedDate.getHours(),
+        landedDate.getMinutes(),
+        landedDate.getSeconds(),
+    );
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getShipped(params) {
-    getDate(`Agencies/getShipped`, params);
+    const data = await getDate(`Agencies/getShipped`, params);
+    formData.value.landed = params.landed;
+    const [hours, minutes, seconds] = data.hour.split(':').map(Number);
+    let shippedDate = new Date(data.shipped);
+    shippedDate.setHours(hours, minutes, seconds);
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getDate(query, params) {
@@ -75,15 +89,8 @@ async function getDate(query, params) {
     if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
     formData.value.zoneFk = data.zoneFk;
-    formData.value.landed = data.landed;
-    const shippedDate = new Date(params.shipped);
-    const landedDate = new Date(data.hour);
-    shippedDate.setHours(
-        landedDate.getHours(),
-        landedDate.getMinutes(),
-        landedDate.getSeconds(),
-    );
-    formData.value.shipped = shippedDate.toISOString();
+
+    return data;
 }
 
 const onChangeZone = async (zoneId) => {

From eb0754b3d1e876581e25e42268568bdc5aea8dc9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 10:21:11 +0200
Subject: [PATCH 4/7] fix: minor bugs

---
 src/components/ui/CatalogItem.vue             |  3 +--
 .../Card/BasicData/TicketBasicDataForm.vue    | 19 +++++++++++++++++--
 src/pages/Ticket/TicketList.vue               |  4 ++--
 src/pages/Zone/ZoneDeliveryPanel.vue          |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 0ae890e37..7806562b2 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -132,8 +132,7 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-    white-space: nowrap;
-    width: 192px;
+
     p {
         margin-bottom: 0;
     }
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index b2e28f597..4f9d17a48 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -312,16 +312,28 @@ async function getZone(options) {
             <VnSelect
                 :label="t('basicData.address')"
                 v-model="addressId"
-                option-value="id"
                 option-label="nickname"
                 :options="addresses"
                 hide-selected
                 map-options
                 :required="true"
+                :sort-by="['isActive DESC']"
                 :rules="validate('basicData.address')"
             >
                 <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
+                    <QItem
+                        v-bind="scope.itemProps"
+                        :class="{ disabled: !scope.opt.isActive }"
+                    >
+                        <QItemSection style="min-width: min-content" avatar>
+                            <QIcon
+                                v-if="scope.opt.isActive && addressId === scope.opt.id"
+                                size="sm"
+                                color="grey"
+                                name="star"
+                                class="fill-icon"
+                            />
+                        </QItemSection>
                         <QItemSection>
                             <QItemLabel
                                 :class="{
@@ -347,6 +359,9 @@ async function getZone(options) {
                                     {{ scope.opt?.agencyMode?.name }}</span
                                 >
                             </QItemLabel>
+                            <QItemLabel caption>
+                                {{ `#${scope.opt?.id}` }}
+                            </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 096aa101c..456747cf8 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -579,7 +579,7 @@ function setReference(data) {
                             hide-selected
                             required
                             @update:model-value="() => onClientSelected(data)"
-                            :sort-by="'id ASC'"
+                            :sort-by="['id ASC']"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -605,7 +605,7 @@ function setReference(data) {
                             map-options
                             required
                             :disable="!data.clientId"
-                            :sort-by="'isActive DESC'"
+                            :sort-by="['isActive DESC']"
                             @update:model-value="() => fetchAvailableAgencies(data)"
                         >
                             <template #option="scope">
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index fc5c04b41..168065ec6 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -89,7 +89,7 @@ watch(
                 v-model="formData.geoFk"
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
-                :sort-by="'code ASC'"
+                :sort-by="['code ASC']"
                 option-value="geoFk"
                 option-label="code"
                 :filter-options="['code']"

From 18c18b56c96cd540292e7b4a241363b524dd690c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 10:42:26 +0200
Subject: [PATCH 5/7] feat: star defaultAddressFk instead selected address

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 8 ++++----
 src/pages/Ticket/Card/TicketFilter.js                   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 4f9d17a48..01b76ac56 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -8,7 +8,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -276,8 +275,6 @@ async function getZone(options) {
             <VnSelect
                 :label="t('ticketList.client')"
                 v-model="clientId"
-                option-value="id"
-                option-label="name"
                 url="Clients"
                 :fields="['id', 'name']"
                 sort-by="id"
@@ -327,7 +324,10 @@ async function getZone(options) {
                     >
                         <QItemSection style="min-width: min-content" avatar>
                             <QIcon
-                                v-if="scope.opt.isActive && addressId === scope.opt.id"
+                                v-if="
+                                    scope.opt.isActive &&
+                                    formData.client.defaultAddressFk === scope.opt.id
+                                "
                                 size="sm"
                                 color="grey"
                                 name="star"
diff --git a/src/pages/Ticket/Card/TicketFilter.js b/src/pages/Ticket/Card/TicketFilter.js
index daa204a7a..0f12e98a3 100644
--- a/src/pages/Ticket/Card/TicketFilter.js
+++ b/src/pages/Ticket/Card/TicketFilter.js
@@ -20,6 +20,7 @@ export default {
                     'isFreezed',
                     'isTaxDataChecked',
                     'hasElectronicInvoice',
+                    'defaultAddressFk',
                     'credit',
                 ],
                 include: [

From 750ce68f974abe35080aee8cb7d046df26c10561 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 2 May 2025 10:10:31 +0200
Subject: [PATCH 6/7] perf: remove itemPackingType set values

---
 .../components/CustomerSummaryTable.vue       | 19 +------------
 .../__tests__/getItemPackagingType.spec.js    | 27 +++++++++++++++++++
 .../composables/getItemPackagingType.js       | 11 ++++++++
 3 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
 create mode 100644 src/pages/Customer/composables/getItemPackagingType.js

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index feb137065..cc0afdca7 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -15,7 +15,7 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
-
+import { getItemPackagingType } from '../composables/getItemPackagingType.js';
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
@@ -161,23 +161,6 @@ const setShippedColor = (date) => {
 };
 const rowClick = ({ id }) =>
     window.open(router.resolve({ params: { id }, name: 'TicketSummary' }).href, '_blank');
-
-const getItemPackagingType = (ticketSales) => {
-    if (!ticketSales?.length) return '-';
-
-    const packagingTypes = ticketSales.reduce((types, sale) => {
-        const { itemPackingTypeFk } = sale.item;
-        if (
-            !types.includes(itemPackingTypeFk) &&
-            (itemPackingTypeFk === 'H' || itemPackingTypeFk === 'V')
-        ) {
-            types.push(itemPackingTypeFk);
-        }
-        return types;
-    }, []);
-
-    return dashIfEmpty(packagingTypes.join(', ') || '-');
-};
 </script>
 
 <template>
diff --git a/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
new file mode 100644
index 000000000..37f626691
--- /dev/null
+++ b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
@@ -0,0 +1,27 @@
+import { describe, it, expect } from 'vitest';
+import { getItemPackagingType } from '../getItemPackagingType';
+
+describe('getItemPackagingType', () => {
+    it('should return "-" if ticketSales is null or undefined', () => {
+        expect(getItemPackagingType(null)).toBe('-');
+        expect(getItemPackagingType(undefined)).toBe('-');
+    });
+
+    it('should return "-" if ticketSales does not have a length property', () => {
+        const ticketSales = { someKey: 'someValue' }; // No tiene propiedad length
+        expect(getItemPackagingType(ticketSales)).toBe('-');
+    });
+
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } }, // Duplicado
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V');
+    });
+
+    it('should return "-" if ticketSales is an empty array', () => {
+        expect(getItemPackagingType([])).toBe('-');
+    });
+});
diff --git a/src/pages/Customer/composables/getItemPackagingType.js b/src/pages/Customer/composables/getItemPackagingType.js
new file mode 100644
index 000000000..eba4d62f5
--- /dev/null
+++ b/src/pages/Customer/composables/getItemPackagingType.js
@@ -0,0 +1,11 @@
+import { dashIfEmpty } from 'src/filters';
+
+export function getItemPackagingType(ticketSales) {
+    if (!ticketSales?.length) return '-';
+
+    const packagingTypes = Array.from(
+        new Set(ticketSales.map(({ item: { itemPackingTypeFk } }) => itemPackingTypeFk)),
+    );
+
+    return dashIfEmpty(packagingTypes.join(', '));
+}

From 68e1b2ed2776953b049c41a914577ef5a32f9498 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 2 May 2025 10:11:36 +0200
Subject: [PATCH 7/7] test: improve test

---
 .../__tests__/getItemPackagingType.spec.js            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
index 37f626691..0607f729f 100644
--- a/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
+++ b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
@@ -16,10 +16,19 @@ describe('getItemPackagingType', () => {
         const ticketSales = [
             { item: { itemPackingTypeFk: 'H' } },
             { item: { itemPackingTypeFk: 'V' } },
-            { item: { itemPackingTypeFk: 'H' } }, // Duplicado
+            { item: { itemPackingTypeFk: 'H' } },
         ];
         expect(getItemPackagingType(ticketSales)).toBe('H, V');
     });
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'A' } },
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V, A');
+    });
 
     it('should return "-" if ticketSales is an empty array', () => {
         expect(getItemPackagingType([])).toBe('-');