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,