From 3fa7fe7ae083b50be4592daa6a76b01a70e58b86 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 17 Apr 2025 12:16:02 +0200
Subject: [PATCH 1/5] fix: make setDefault function async axios patch

---
 src/pages/Customer/Card/CustomerAddress.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index f1799d0cc..418c4ec30 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -77,10 +77,10 @@ const isDefaultAddress = (address) => {
     return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
 
-const setDefault = (address) => {
+const setDefault = async (address) => {
     const url = `Clients/${route.params.id}`;
     const payload = { defaultAddressFk: address.id };
-    axios.patch(url, payload).then((res) => {
+    await axios.patch(url, payload).then((res) => {
         if (res.data) {
             client.value.defaultAddressFk = res.data.defaultAddressFk;
             sortAddresses();

From 1985ab291031a5908a9c0bbb0fde9f7ec636c6c7 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Tue, 22 Apr 2025 09:16:01 +0200
Subject: [PATCH 2/5] fix: refs #8909 remove column shippedHour from ticket
 basicdata

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 9d70fea38..6ee601ed3 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -416,13 +416,6 @@ async function getZone(options) {
                 :rules="validate('ticketList.shipped')"
                 @update:model-value="setShipped"
             />
-            <VnInputTime
-                :label="t('basicData.shippedHour')"
-                v-model="formData.shipped"
-                :required="true"
-                :rules="validate('basicData.shippedHour')"
-                @update:model-value="setShipped"
-            />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"

From 6ff71374fcb138b7173185af0c038bfd5c23b0cc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 22 Apr 2025 12:31:50 +0200
Subject: [PATCH 3/5] fix: rename 'import' column to 'totalWithVat' in
 ticketColumns

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

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 588379ed9..6ed3afcc6 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -89,7 +89,7 @@ const ticketColumns = computed(() => [
     },
     {
         label: t('advanceTickets.import'),
-        name: 'import',
+        name: 'totalWithVat',
         align: 'left',
         headerClass: 'horizontal-separator',
         columnFilter: false,
@@ -317,7 +317,7 @@ watch(
                 </QBadge>
                 <span v-else> {{ dashIfEmpty(row.state) }}</span>
             </template>
-            <template #column-import="{ row }">
+            <template #column-totalWithVat="{ row }">
                 <QBadge
                     :text-color="
                         totalPriceColor(row.totalWithVat) === 'warning'

From bcdb89d1a76e8f4fd6ec9819ed18385ec685f2ce Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 23 Apr 2025 11:21:14 +0200
Subject: [PATCH 4/5] fix: refactor createTicket function to use formData
 directly and remove unused reactive state

---
 src/pages/Ticket/Card/ExpeditionNewTicket.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index 6ecadfe6d..aec8049af 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -30,31 +29,29 @@ const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
 
-const newTicketFormData = reactive({});
 const date = new Date();
 
-const createTicket = async () => {
+async function createTicket(formData) {
     const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
     const params = {
         clientId: $props.ticket.clientFk,
-        landed: newTicketFormData.landed,
+        landed: formData.landed,
         warehouseId: $props.ticket.warehouseFk,
         addressId: $props.ticket.addressFk,
         agencyModeId: $props.ticket.agencyModeFk,
-        routeId: newTicketFormData.routeFk,
+        routeId: formData.routeFk,
         expeditionIds: expeditionIds,
     };
-
     const { data } = await axios.post('Expeditions/moveExpeditions', params);
     notify(t('globals.dataSaved'), 'positive');
     router.push({ name: 'TicketSummary', params: { id: data.id } });
-};
+}
 </script>
 
 <template>
     <FormModelPopup
         model="expeditionNewTicket"
-        :form-initial-data="newTicketFormData"
+        :form-initial-data="{}"
         :save-fn="createTicket"
     >
         <template #form-inputs="{ data }">

From 3b6c41208fd3f70ee8d017eb57ebcd397216da57 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 24 Apr 2025 09:04:42 +0200
Subject: [PATCH 5/5] fix: remove unused props and simplify component structure
 in multiple descriptor proxies

---
 src/components/common/VnLog.vue               |  2 +-
 src/components/ui/EntityDescriptor.vue        | 50 +++++++++++--------
 .../Account/Card/AccountDescriptorProxy.vue   |  7 +--
 src/pages/Claim/Card/ClaimDescriptor.vue      | 12 ++---
 src/pages/Claim/Card/ClaimDescriptorProxy.vue |  7 +--
 src/pages/Item/Card/ItemDescriptorProxy.vue   |  1 -
 .../Parking/Card/ParkingDescriptorProxy.vue   |  7 +--
 7 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 7020c8489..6e9128a43 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, onMounted, onUnmounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
diff --git a/src/components/ui/EntityDescriptor.vue b/src/components/ui/EntityDescriptor.vue
index 751a6bd9c..e4baabe34 100644
--- a/src/components/ui/EntityDescriptor.vue
+++ b/src/components/ui/EntityDescriptor.vue
@@ -1,8 +1,6 @@
 <script setup>
-import { onBeforeMount, watch, computed, ref } from 'vue';
+import { watch, ref, onMounted } from 'vue';
 import { useArrayData } from 'composables/useArrayData';
-import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
 import VnDescriptor from './VnDescriptor.vue';
 
 const $props = defineProps({
@@ -20,39 +18,50 @@ const $props = defineProps({
     },
 });
 
-const state = useState();
-const route = useRoute();
 let arrayData;
 let store;
-let entity;
+const entity = ref();
 const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-defineExpose({ getData });
+const containerRef = ref(null);
 
-onBeforeMount(async () => {
-    arrayData = useArrayData($props.dataKey, {
+onMounted(async () => {
+    let isPopup;
+    let el = containerRef.value.$el;
+    while (el) {
+        if (el.classList?.contains('q-menu')) {
+            isPopup = true;
+            break;
+        }
+        el = el.parentElement;
+    }
+
+    arrayData = useArrayData($props.dataKey + (isPopup ? 'Proxy' : ''), {
         url: $props.url,
         userFilter: $props.filter,
         skip: 0,
         oneRecord: true,
     });
     store = arrayData.store;
-    entity = computed(() => {
-        const data = store.data ?? {};
-        if (data) emit('onFetch', data);
-        return data;
-    });
 
-    // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
         () => [$props.url, $props.filter],
         async () => {
-            if (!isSameDataKey.value) await getData();
+            await getData();
+        },
+        { immediate: true },
+    );
+
+    watch(
+        () => arrayData.store.data,
+        (newValue) => {
+            entity.value = newValue;
         },
     );
 });
 
+defineExpose({ getData });
+const emit = defineEmits(['onFetch']);
+
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -60,18 +69,15 @@ async function getData() {
     try {
         await arrayData.fetch({ append: false, updateRouter: false });
         const { data } = store;
-        state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {
         isLoading.value = false;
     }
 }
-
-const emit = defineEmits(['onFetch']);
 </script>
 
 <template>
-    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
+    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey" ref="containerRef">
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
diff --git a/src/pages/Account/Card/AccountDescriptorProxy.vue b/src/pages/Account/Card/AccountDescriptorProxy.vue
index 6a4b3e267..b7bbc1ef9 100644
--- a/src/pages/Account/Card/AccountDescriptorProxy.vue
+++ b/src/pages/Account/Card/AccountDescriptorProxy.vue
@@ -4,11 +4,6 @@ import AccountSummary from './AccountSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <AccountDescriptor
-            v-if="$attrs.id"
-            v-bind="$attrs"
-            :summary="AccountSummary"
-            :proxy-render="true"
-        />
+        <AccountDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="AccountSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 76ede81ed..ba248e539 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDateHourMinSec, toPercentage } from 'src/filters';
@@ -9,7 +9,6 @@ import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/Departme
 import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import { getUrl } from 'src/composables/getUrl';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import filter from './ClaimFilter.js';
 
@@ -23,7 +22,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const salixUrl = ref();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -37,10 +35,6 @@ const STATE_COLOR = {
 function stateColor(code) {
     return STATE_COLOR[code];
 }
-
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-});
 </script>
 
 <template>
@@ -133,7 +127,7 @@ onMounted(async () => {
                     size="md"
                     icon="assignment"
                     color="primary"
-                    :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
+                    :to="{ name: 'TicketSaleTracking', params: { id: entity.ticketFk } }"
                 >
                     <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
                 </QBtn>
@@ -141,7 +135,7 @@ onMounted(async () => {
                     size="md"
                     icon="visibility"
                     color="primary"
-                    :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
+                    :to="{ name: 'TicketTracking', params: { id: entity.ticketFk } }"
                 >
                     <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
                 </QBtn>
diff --git a/src/pages/Claim/Card/ClaimDescriptorProxy.vue b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
index 78e686745..f4eff0843 100644
--- a/src/pages/Claim/Card/ClaimDescriptorProxy.vue
+++ b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ClaimSummary from './ClaimSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <ClaimDescriptor
-            v-if="$attrs.id"
-            v-bind="$attrs.id"
-            :summary="ClaimSummary"
-            :proxy-render="true"
-        />
+        <ClaimDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="ClaimSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index f686e8221..d47fe8788 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -30,7 +30,6 @@ const $props = defineProps({
             :dated="dated"
             :sale-fk="saleFk"
             :warehouse-fk="warehouseFk"
-            :proxy-render="true"
         />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
index e78a2b238..cff1f75c2 100644
--- a/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ParkingSummary from './ParkingSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <ParkingDescriptor
-            v-if="$attrs.id"
-            v-bind="$attrs.id"
-            :summary="ParkingSummary"
-            :proxy-render="true"
-        />
+        <ParkingDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="ParkingSummary" />
     </QPopupProxy>
 </template>