verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 78 Releases Wiki Activity

fix: refactor canEditZone logic and improve date handling in getDate function
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Javier Segarra 2025-04-23 15:05:26 +02:00
parent 33bde1732f
commit 73f896f38a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
View File

@ -25,7 +25,9 @@ const { validate } = useValidator();
const { notify } = useNotify(); const { notify } = useNotify();
const router = useRouter(); const router = useRouter();
const { t } = useI18n(); const { t } = useI18n();
const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE'); const canEditZone = useAcl().hasAny([
{ model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
]);
const agencyFetchRef = ref(); const agencyFetchRef = ref();
const warehousesOptions = ref([]); const warehousesOptions = ref([]);
@ -75,8 +77,15 @@ async function getDate(query, params) {
if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative'); if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
formData.value.zoneFk = data.zoneFk; formData.value.zoneFk = data.zoneFk;
if (data.landed) formData.value.landed = data.landed; formData.value.landed = data.landed;
if (data.shipped) formData.value.shipped = data.shipped; 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) => { const onChangeZone = async (zoneId) => {
@ -125,6 +134,7 @@ const addressId = computed({
formData.value.addressFk = val; formData.value.addressFk = val;
onChangeAddress(val); onChangeAddress(val);
getShipped({ getShipped({
shipped: formData.value?.shipped,
landed: formData.value?.landed, landed: formData.value?.landed,
addressFk: val, addressFk: val,
agencyModeFk: formData.value?.agencyModeFk, agencyModeFk: formData.value?.agencyModeFk,