From 73f896f38a43360ba1054e6d29196580153dcb75 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 23 Apr 2025 15:05:26 +0200
Subject: [PATCH 1/2] fix: refactor canEditZone logic and improve date handling
 in getDate function

---
 .../Card/BasicData/TicketBasicDataForm.vue       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index a19526203..b1f98d44e 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -25,7 +25,9 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
-const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
+const canEditZone = useAcl().hasAny([
+    { model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
+]);
 
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
@@ -75,8 +77,15 @@ async function getDate(query, params) {
     if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
     formData.value.zoneFk = data.zoneFk;
-    if (data.landed) formData.value.landed = data.landed;
-    if (data.shipped) formData.value.shipped = data.shipped;
+    formData.value.landed = data.landed;
+    const shippedDate = new Date(params.shipped);
+    const landedDate = new Date(data.landed);
+    shippedDate.setHours(
+        landedDate.getHours(),
+        landedDate.getMinutes(),
+        landedDate.getSeconds(),
+    );
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 const onChangeZone = async (zoneId) => {
@@ -125,6 +134,7 @@ const addressId = computed({
             formData.value.addressFk = val;
             onChangeAddress(val);
             getShipped({
+                shipped: formData.value?.shipped,
                 landed: formData.value?.landed,
                 addressFk: val,
                 agencyModeFk: formData.value?.agencyModeFk,

From dfa7374bbc5db101181987f35495188c90c74c41 Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Wed, 23 Apr 2025 15:51:12 +0200
Subject: [PATCH 2/2] fix: fixed zone id filter

---
 src/pages/Zone/ZoneList.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 8d7c4a165..c505cd6b1 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -188,16 +188,14 @@ const exprBuilder = (param, value) => {
             return {
                 code: { like: `%${value}%` },
             };
+        case 'id':
+        case 'price':
         case 'agencyModeFk':
             return {
-                agencyModeFk: value,
+                [param]: value,
             };
         case 'search':
             return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
-        case 'price':
-            return {
-                price: value,
-            };
     }
 };