From b82453582a9e25f25d65ffe27ee1ae3a2af62de1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 17 Oct 2024 07:44:31 +0200
Subject: [PATCH 01/35] fix: refs #7304 7304 clean warning

---
 src/components/ui/VnAvatar.vue                | 2 +-
 src/pages/Customer/Card/CustomerBasicData.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index 1deb105db..2423f8ba7 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -6,7 +6,7 @@ import { useColor } from 'src/composables/useColor';
 import { getCssVar } from 'quasar';
 
 const $props = defineProps({
-    workerId: { type: Number, required: true },
+    workerId: { type: Number, default: null },
     description: { type: String, default: null },
     title: { type: String, default: null },
     color: { type: String, default: null },
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index d31669b43..3743a4b76 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -155,7 +155,6 @@ const exprBuilder = (param, value) => {
                     url="Clients"
                     :input-debounce="0"
                     :label="t('customer.basicData.previousClient')"
-                    :options="clients"
                     :rules="validate('client.transferorFk')"
                     emit-value
                     map-options

From 2be55ca81c5ab4514a7657dfaa94a8d8c95c79f9 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 19 Nov 2024 08:01:00 +0100
Subject: [PATCH 02/35] fix: refs #7304 fix list

---
 src/pages/Customer/CustomerList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 3cb17332c..865287aeb 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -12,6 +12,7 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { toDate } from 'src/filters';
 import CustomerFilter from './CustomerFilter.vue';
+import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const { t } = useI18n();
 const router = useRouter();

From b9ba67c5a652495aee05d6f8172cfe9fa9fa7d94 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 19 Nov 2024 11:39:35 +0100
Subject: [PATCH 03/35] fix: refs #7304 fix warning

---
 src/components/ui/VnAvatar.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index 2423f8ba7..0fe943ee2 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -6,7 +6,7 @@ import { useColor } from 'src/composables/useColor';
 import { getCssVar } from 'quasar';
 
 const $props = defineProps({
-    workerId: { type: Number, default: null },
+    workerId: { type: [Number, undefined], default: null },
     description: { type: String, default: null },
     title: { type: String, default: null },
     color: { type: String, default: null },
@@ -38,7 +38,13 @@ watch(src, () => (showLetter.value = false));
             <template v-if="showLetter">
                 {{ title.charAt(0) }}
             </template>
-            <QImg v-else :src="src" spinner-color="white" @error="showLetter = true" />
+            <QImg
+                v-else-if="workerId"
+                :src="src"
+                spinner-color="white"
+                @error="showLetter = true"
+            />
+            <QIcon v-else name="mood" size="xs" />
         </QAvatar>
         <div class="description">
             <slot name="description" v-if="description">

From 59648d14f0129345b6db9491ec1ef86e021e6ac5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 27 Nov 2024 06:18:41 +0100
Subject: [PATCH 04/35] fix: refs #8114 orderList

---
 src/pages/Order/Card/OrderCreateDialog.vue | 19 +++++++++----------
 src/pages/Order/OrderList.vue              | 10 ++--------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index c78b04d7f..4b16e4c7b 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -59,17 +59,17 @@ const initialFormState = reactive({
     clientFk: $props.clientFk,
 });
 
-const onClientChange = async (clientId = $props.clientFk) => {
-    const { data } = await axios.get(`Clients/${clientId}`);
-    await fetchAddressList(data.defaultAddressFk);
-};
+// const onClientChange = async (clientId = $props.clientFk) => {
+//     const { data } = await axios.get(`Clients/${clientId}`);
+//     await fetchAddressList(data.defaultAddressFk);
+// };
 
 async function onDataSaved(_, id) {
     await router.push({ path: `/order/${id}/catalog` });
 }
-onMounted(async () => {
-    await onClientChange();
-});
+// onMounted(async () => {
+//     await onClientChange();
+// });
 </script>
 
 <template>
@@ -90,10 +90,9 @@ onMounted(async () => {
                     option-value="id"
                     option-label="name"
                     :filter="{
-                        fields: ['id', 'name', 'defaultAddressFk'],
+                        fields: ['id', 'name'],
                     }"
                     hide-selected
-                    @update:model-value="onClientChange"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -110,7 +109,7 @@ onMounted(async () => {
                     :label="t('order.form.addressFk')"
                     v-model="data.addressId"
                     url="addresses"
-                    :fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
+                    :fields="['id', 'nickname', 'street', 'city']"
                     sort-by="id"
                     option-value="id"
                     option-label="street"
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index cb59d7c4a..20fd3aafa 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -141,12 +141,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk);
-});
 async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
         params: { filter: { include: { relation: 'addresses' } } },
@@ -191,7 +185,7 @@ const getDateColor = (date) => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-               tableRef.redirect(`${url}/catalog`);
+                tableRef.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,
@@ -250,7 +244,7 @@ const getDateColor = (date) => {
                 :label="t('module.address')"
                 option-value="id"
                 option-label="nickname"
-                @update:model-value="() => fetchAgencies(data)"
+                @update:model-value="() => fetchClientAddress(data)"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

From a53197342111a3dc5fdb308ed4ac932c65268df9 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 27 Nov 2024 10:18:32 +0100
Subject: [PATCH 05/35] fix: hotfix search

---
 src/pages/Travel/Card/TravelCard.vue | 8 ++++----
 src/pages/Travel/TravelList.vue      | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 50cecef34..fd442d58b 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -7,13 +7,13 @@ import filter from './TravelFilter.js';
     <VnCard
         data-key="Travel"
         base-url="Travels"
-        search-data-key="TravelList"
-        :filter="filter"
         :descriptor="TravelDescriptor"
+        :filter="filter"
+        search-data-key="TravelList"
         :searchbar-props="{
-            url: 'Travels',
+            url: 'Travels/filter',
+            searchUrl: 'table',
             label: 'Search travel',
-            info: 'You can search by travel id or name',
         }"
     />
 </template>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 852003a95..0e69250a8 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -208,6 +208,7 @@ const columns = computed(() => [
         ref="tableRef"
         data-key="TravelList"
         url="Travels/filter"
+        redirect="travel"
         :create="{
             urlCreate: 'Travels',
             title: t('Create Travels'),
@@ -221,9 +222,7 @@ const columns = computed(() => [
         order="landed DESC"
         :columns="columns"
         auto-load
-        redirect="travel"
         :is-editable="false"
-        :use-model="true"
     >
         <template #column-status="{ row }">
             <div class="row">

From 25b8535f192cfc5bb0dad7ecb1e0bb034df6eefc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 12:54:11 +0100
Subject: [PATCH 06/35] refactor: refs #6818 check prefix

---
 src/components/ui/VnLinkPhone.vue             | 16 ++++++++---
 src/filters/parsePhone.js                     | 18 ++++++-------
 src/pages/Customer/Card/CustomerSummary.vue   |  1 +
 .../components/common/VnLinkPhone.spec.js     | 27 +++++++++++--------
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 4068498cd..6fefd1914 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,10 +1,10 @@
 <script setup>
 import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
-import { parsePhone } from 'src/filters';
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
     channel: { type: Number, default: null },
+    country: { type: String, default: null },
 });
 
 const config = reactive({
@@ -25,11 +25,19 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        config[type].href = `${url}?customerIdentity=%2B${parsePhone(
-            props.phoneNumber
-        )}&channelId=${channel}`;
+        const phone = await parsePhone(props.phoneNumber, props.country.toLowerCase());
+        config[type].href = `${url}?customerIdentity=%2B${phone}&channelId=${channel}`;
     }
 });
+
+async function parsePhone(phone, country) {
+    if (phone.startsWith('+')) return `${phone.slice(1)}`;
+    if (phone.startsWith('00')) return `${phone.slice(2)}`;
+
+    const prefix = (await axios.get(`Prefixes/${country.toLowerCase()}`)).data?.prefix;
+    if (phone.startsWith(prefix)) return phone;
+    return `${prefix}${phone}`;
+}
 </script>
 <template>
     <QBtn
diff --git a/src/filters/parsePhone.js b/src/filters/parsePhone.js
index 696f55007..f99ab0646 100644
--- a/src/filters/parsePhone.js
+++ b/src/filters/parsePhone.js
@@ -1,12 +1,10 @@
-export default function (phone, prefix = 34) {
-    if (phone.startsWith('+')) {
-        return `${phone.slice(1)}`;
-    }
-    if (phone.startsWith('00')) {
-        return `${phone.slice(2)}`;
-    }
-    if (phone.startsWith(prefix) && phone.length === prefix.length + 9) {
-        return `${prefix}${phone.slice(prefix.length)}`;
-    }
+import axios from 'axios';
+
+export default async function parsePhone(phone, country) {
+    if (phone.startsWith('+')) return `${phone.slice(1)}`;
+    if (phone.startsWith('00')) return `${phone.slice(2)}`;
+
+    const prefix = (await axios.get(`Prefixes/${country.toLowerCase()}`)).data?.prefix;
+    if (phone.startsWith(prefix)) return phone;
     return `${prefix}${phone}`;
 }
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 4fa7b9bdc..2cad13115 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -95,6 +95,7 @@ const sumRisk = ({ clientRisks }) => {
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
                             class="q-ml-xs"
+                            :country="entity.country?.code"
                         />
                     </template>
                 </VnLv>
diff --git a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
index e460ab2fc..a14e509ae 100644
--- a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
+++ b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
@@ -1,29 +1,34 @@
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, beforeAll, vi } from 'vitest';
+import { axios } from 'app/test/vitest/helper';
 import parsePhone from 'src/filters/parsePhone';
 
 describe('parsePhone filter', () => {
-    it("adds prefix +34 if it doesn't have one", () => {
-        const resultado = parsePhone('123456789', '34');
+    beforeAll(async () => {
+        vi.spyOn(axios, 'get').mockReturnValue({ data: { prefix: '34' } });
+    });
+
+    it("adds prefix +34 if it doesn't have one", async () => {
+        const resultado = await parsePhone('123456789', '34');
         expect(resultado).toBe('34123456789');
     });
 
-    it('maintains prefix +34 if it is already correct', () => {
-        const resultado = parsePhone('+34123456789', '34');
+    it('maintains prefix +34 if it is already correct', async () => {
+        const resultado = await parsePhone('+34123456789', '34');
         expect(resultado).toBe('34123456789');
     });
 
-    it('converts prefix 0034 to +34', () => {
-        const resultado = parsePhone('0034123456789', '34');
+    it('converts prefix 0034 to +34', async () => {
+        const resultado = await parsePhone('0034123456789', '34');
         expect(resultado).toBe('34123456789');
     });
 
-    it('converts prefix 34 without symbol to +34', () => {
-        const resultado = parsePhone('34123456789', '34');
+    it('converts prefix 34 without symbol to +34', async () => {
+        const resultado = await parsePhone('34123456789', '34');
         expect(resultado).toBe('34123456789');
     });
 
-    it('replaces incorrect prefix with the correct one', () => {
-        const resultado = parsePhone('+44123456789', '34');
+    it('replaces incorrect prefix with the correct one', async () => {
+        const resultado = await parsePhone('+44123456789', '34');
         expect(resultado).toBe('44123456789');
     });
 });

From d4028da92e976b68dae1032b95ae33d5002fd68b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 10:25:50 +0100
Subject: [PATCH 07/35] fix: refs #6818 refactor phone parsing and improve
 error handling

---
 src/components/ui/VnLinkPhone.vue | 22 +++++++++-------------
 src/filters/parsePhone.js         | 13 +++++++++----
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 6fefd1914..c5023f69e 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,12 +1,15 @@
 <script setup>
-import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
+import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
+import { parsePhone } from 'src/filters';
+
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
     channel: { type: Number, default: null },
     country: { type: String, default: null },
 });
 
+const phone = ref(props.phoneNumber);
 const config = reactive({
     sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
@@ -25,23 +28,16 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        const phone = await parsePhone(props.phoneNumber, props.country.toLowerCase());
-        config[type].href = `${url}?customerIdentity=%2B${phone}&channelId=${channel}`;
+        phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
+        config[
+            type
+        ].href = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
     }
 });
-
-async function parsePhone(phone, country) {
-    if (phone.startsWith('+')) return `${phone.slice(1)}`;
-    if (phone.startsWith('00')) return `${phone.slice(2)}`;
-
-    const prefix = (await axios.get(`Prefixes/${country.toLowerCase()}`)).data?.prefix;
-    if (phone.startsWith(prefix)) return phone;
-    return `${prefix}${phone}`;
-}
 </script>
 <template>
     <QBtn
-        v-if="phoneNumber"
+        v-if="phone"
         flat
         round
         :icon="config[type].icon"
diff --git a/src/filters/parsePhone.js b/src/filters/parsePhone.js
index f99ab0646..4fcf1386d 100644
--- a/src/filters/parsePhone.js
+++ b/src/filters/parsePhone.js
@@ -3,8 +3,13 @@ import axios from 'axios';
 export default async function parsePhone(phone, country) {
     if (phone.startsWith('+')) return `${phone.slice(1)}`;
     if (phone.startsWith('00')) return `${phone.slice(2)}`;
-
-    const prefix = (await axios.get(`Prefixes/${country.toLowerCase()}`)).data?.prefix;
-    if (phone.startsWith(prefix)) return phone;
-    return `${prefix}${phone}`;
+    try {
+        const prefix = (
+            await axios.get(`Prefixes/${country.toLowerCase()}`)
+        ).data?.prefix.replace(/^0+/, '');
+        if (phone.startsWith(prefix)) return phone;
+        return `${prefix}${phone}`;
+    } catch (e) {
+        return null;
+    }
 }

From 6745c15b0efe762aa9403b97252ed2aa3c7747f1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 10:28:06 +0100
Subject: [PATCH 08/35] fix: refs #6818 add early return for empty phone input
 in parsePhone function

---
 src/filters/parsePhone.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/filters/parsePhone.js b/src/filters/parsePhone.js
index 4fcf1386d..27474321f 100644
--- a/src/filters/parsePhone.js
+++ b/src/filters/parsePhone.js
@@ -1,6 +1,7 @@
 import axios from 'axios';
 
 export default async function parsePhone(phone, country) {
+    if (!phone) return;
     if (phone.startsWith('+')) return `${phone.slice(1)}`;
     if (phone.startsWith('00')) return `${phone.slice(2)}`;
     try {

From aaeabefdfeda0838e3ffe73ce0f54fabcfd4cd98 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 28 Nov 2024 11:11:45 +0100
Subject: [PATCH 09/35] fix: refs #8114 fix removeAddress

---
 src/pages/Order/Card/OrderCreateDialog.vue | 32 ++++------------------
 src/pages/Order/OrderList.vue              | 20 ++++++--------
 2 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 4b16e4c7b..f37c4bfc9 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -1,9 +1,8 @@
 <script setup>
 import { useRouter } from 'vue-router';
-import { reactive, onMounted, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { useState } from 'composables/useState';
 import FormModelPopup from 'components/FormModelPopup.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
@@ -11,39 +10,26 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import { useDialogPluginComponent } from 'quasar';
 
 const { t } = useI18n();
-const state = useState();
 const ORDER_MODEL = 'order';
 
 const router = useRouter();
 const agencyList = ref([]);
-const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
-const fetchAddressList = async (addressId) => {
-    const { data } = await axios.get('addresses', {
-        params: {
-            filter: JSON.stringify({
-                fields: ['id', 'nickname', 'street', 'city'],
-                where: { id: addressId },
-            }),
-        },
-    });
-    addressList.value = data;
-    if (addressList.value?.length === 1) {
-        state.get(ORDER_MODEL).addressId = addressList.value[0].id;
-    }
-};
-
 const fetchAgencyList = async (landed, addressFk) => {
+    console.log('hola');
     if (!landed || !addressFk) {
         return;
     }
+
+    console.log('despuesdelIf');
     const { data } = await axios.get('Agencies/landsThatDay', {
         params: {
             addressFk,
             landed: new Date(landed).toISOString(),
         },
     });
+    console.log('fetchAgency', data);
     agencyList.value = data;
 };
 
@@ -59,17 +45,9 @@ const initialFormState = reactive({
     clientFk: $props.clientFk,
 });
 
-// const onClientChange = async (clientId = $props.clientFk) => {
-//     const { data } = await axios.get(`Clients/${clientId}`);
-//     await fetchAddressList(data.defaultAddressFk);
-// };
-
 async function onDataSaved(_, id) {
     await router.push({ path: `/order/${id}/catalog` });
 }
-// onMounted(async () => {
-//     await onClientChange();
-// });
 </script>
 
 <template>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 20fd3aafa..769a2cbd1 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, onMounted, ref } from 'vue';
+import { computed, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -14,14 +14,12 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
-const addressesList = ref([]);
-const route = useRoute();
+const addressOptions = ref([]);
 const columns = computed(() => [
     {
         align: 'left',
@@ -141,12 +139,13 @@ const columns = computed(() => [
         ],
     },
 ]);
+
 async function fetchClientAddress(id, formData = {}) {
-    const { data } = await axios.get(`Clients/${id}`, {
-        params: { filter: { include: { relation: 'addresses' } } },
-    });
-    addressesList.value = data.addresses;
-    formData.addressId = data.defaultAddressFk;
+    const { data } = await axios.get(
+        `Clients/${id}/addresses?filter[order]=isActive DESC`
+    );
+    addressOptions.value = data;
+    console.log('formData', formData);
     fetchAgencies(formData);
 }
 
@@ -240,11 +239,10 @@ const getDateColor = (date) => {
             </VnSelect>
             <VnSelect
                 v-model="data.addressId"
-                :options="addressesList"
+                :options="addressOptions"
                 :label="t('module.address')"
                 option-value="id"
                 option-label="nickname"
-                @update:model-value="() => fetchClientAddress(data)"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

From b83c6407604681f7324cd65fda3f2661f7890b57 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 07:32:31 +0100
Subject: [PATCH 10/35] feat: improve  Merge branch 'test' into dev

---
 src/components/CreateNewPostcodeForm.vue | 76 ++++++++++++++++--------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 232f86a49..d082df9e5 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -22,13 +22,12 @@ const postcodeFormData = reactive({
     townFk: null,
 });
 
-const townsFetchDataRef = ref(false);
 const countriesRef = ref(false);
 const townsRef = ref(false);
 const provincesFetchDataRef = ref(false);
 const provincesOptions = ref([]);
+const townsOptions = ref([]);
 const town = ref({});
-const townFilter = ref({});
 const countryFilter = ref({});
 
 function onDataSaved(formData) {
@@ -50,13 +49,13 @@ function onDataSaved(formData) {
 
 async function onCityCreated(newTown, formData) {
     await provincesFetchDataRef.value.fetch();
-    newTown.province = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk
-    );
+    newTown.province = findProvince(newTown.provinceFk);
     formData.townFk = newTown;
     setTown(newTown, formData);
 }
-
+function findProvince(provinceId) {
+    return provincesOptions.value.find(({ id }) => id === provinceId);
+}
 function setTown(newTown, data) {
     town.value = newTown;
     data.provinceFk = newTown?.provinceFk ?? newTown;
@@ -71,12 +70,22 @@ async function setCountry(countryFk, data) {
 
 async function handleProvinces(data) {
     provincesOptions.value = data;
+    // handleTowns(data);
+}
+async function handleTowns(data) {
+    townsOptions.value = data;
+    // whereTowns.value.provinceFk.inq = mapData(data);
+    // townsRef.value.opts = [];
 }
 
 async function setProvince(id, data) {
-    const newProvince = provincesOptions.value.find((province) => province.id == id);
-    if (!newProvince) return;
-
+    const newProvince = findProvince(id);
+    if (!newProvince) {
+        data.townFk = null;
+        return;
+    }
+    whereTowns.value.provinceFk.inq = [id];
+    // handleTowns([newProvince]);
     data.countryFk = newProvince.countryFk;
 }
 
@@ -87,13 +96,26 @@ async function onProvinceCreated(data) {
     postcodeFormData.provinceFk = data.id;
 }
 
-const whereTowns = computed(() => {
-    return {
-        provinceFk: {
-            inq: provincesOptions.value.map(({ id }) => id),
-        },
-    };
-});
+const whereTowns = ref({});
+// const whereTowns = ref(() => {
+//     if (!postcodeFormData.provinceFk) return { provinceFk: { inq: null } };
+//     if (postcodeFormData.provinceFk)
+//         return {
+//             provinceFk: {
+//                 inq: [postcodeFormData.provinceFk], //provincesOptions.value.map(({ id }) => id),
+//             },
+//         };
+
+//     return {
+//         provinceFk: {
+//             inq: mapData(provincesOptions.value),
+//         },
+//     };
+// });
+function mapData(data) {
+    if (data.length === 0) return data;
+    return data.map(({ id }) => id);
+}
 </script>
 
 <template>
@@ -101,10 +123,19 @@ const whereTowns = computed(() => {
         ref="provincesFetchDataRef"
         @on-fetch="handleProvinces"
         :sort-by="['name ASC']"
-        :limit="30"
+        :limit="2"
         auto-load
         url="Provinces/location"
     />
+    <FetchData
+        ref="townsRef"
+        @on-fetch="handleTowns"
+        :sort-by="['name ASC']"
+        :limit="2"
+        auto-load
+        :where="whereTowns"
+        url="Towns/location"
+    />
 
     <FormModelPopup
         url-create="postcodes"
@@ -116,6 +147,7 @@ const whereTowns = computed(() => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
+            {{ whereTowns }}
             <VnRow>
                 <VnInput
                     :label="t('Postcode')"
@@ -125,18 +157,14 @@ const whereTowns = computed(() => {
                     required
                 />
                 <VnSelectDialog
-                    ref="townsRef"
-                    :sort-by="['name ASC']"
-                    :limit="30"
-                    auto-load
-                    url="Towns/location"
-                    :where="whereTowns"
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
                     option-label="name"
+                    :options="townsOptions"
                     option-value="id"
+                    @input-value="(evt) => (whereTowns.name = { like: `%${evt}%` })"
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
@@ -178,7 +206,7 @@ const whereTowns = computed(() => {
                 />
                 <VnSelect
                     ref="countriesRef"
-                    :limit="30"
+                    :limit="2"
                     :filter="countryFilter"
                     :sort-by="['name ASC']"
                     auto-load

From 67d6d4ef4571b3c130bd64fb5d8213a55057fe62 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 29 Nov 2024 10:05:09 +0100
Subject: [PATCH 11/35] fix: hotfix webAccess

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

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index eec127fde..85615e668 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -27,7 +27,7 @@ async function hasCustomerRole() {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateUser`"
         :filter="filter"
-        model="customer"
+        url="VnUsers/preview"
         :mapper="
             ({ active, name, email }) => {
                 return {
@@ -41,7 +41,7 @@ async function hasCustomerRole() {
         auto-load
     >
         <template #form="{ data, validate }">
-            <QCheckbox :label="t('Enable web access')" v-model="data.account.active" />
+            <QCheckbox :label="t('Enable web access')" v-model="data.active" />
             <VnInput :label="t('User')" clearable v-model="data.name" />
             <VnInput
                 :label="t('Recovery email')"

From 514d54b222883e14a293c3da4ca2ab171c154b05 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 29 Nov 2024 12:20:53 +0100
Subject: [PATCH 12/35] fix: hotfix-accountWeb

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

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 85615e668..9d2e43262 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -27,7 +27,7 @@ async function hasCustomerRole() {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateUser`"
         :filter="filter"
-        url="VnUsers/preview"
+        model="customer"
         :mapper="
             ({ active, name, email }) => {
                 return {
@@ -41,14 +41,14 @@ async function hasCustomerRole() {
         auto-load
     >
         <template #form="{ data, validate }">
-            <QCheckbox :label="t('Enable web access')" v-model="data.active" />
-            <VnInput :label="t('User')" clearable v-model="data.name" />
+            <QCheckbox :label="t('Enable web access')" v-model="data.account.active" />
+            <VnInput :label="t('User')" clearable v-model="data.account.name" />
             <VnInput
                 :label="t('Recovery email')"
                 :rules="validate('client.email')"
                 clearable
                 type="email"
-                v-model="data.email"
+                data.account.name
                 class="q-mt-sm"
                 :info="t('This email is used for user to regain access their account')"
             />

From 940fe5c2b94c1fe5871eb829abe7adf9841e03f3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 13:21:19 +0100
Subject: [PATCH 13/35] fix: #6943 CustomerAddressCreate

---
 .../components/CustomerAddressCreate.vue        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index f4a188243..6cf42b20e 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -18,8 +18,6 @@ const router = useRouter();
 
 const formInitialData = reactive({ isDefaultAddress: false });
 
-const urlCreate = ref('');
-
 const agencyModes = ref([]);
 const incoterms = ref([]);
 const customsAgents = ref([]);
@@ -40,13 +38,18 @@ function handleLocation(data, location) {
     data.countryFk = countryFk;
 }
 
-function onAgentCreated(requestResponse, data) {
-    customsAgents.value.push(requestResponse);
-    data.customsAgentFk = requestResponse.id;
+function onAgentCreated({ id, fiscalName }, data) {
+    customsAgents.value.push({ id, fiscalName });
+    data.customsAgentFk = id;
 }
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (customsAgents = data)"
+        auto-load
+        url="CustomsAgents"
+    />
     <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
@@ -57,7 +60,7 @@ function onAgentCreated(requestResponse, data) {
     <FormModel
         :form-initial-data="formInitialData"
         :observe-form-changes="false"
-        :url-create="urlCreate"
+        :url-create="`Clients/${route.params.id}/createAddress`"
         @on-data-saved="toCustomerAddress()"
         model="client"
     >
@@ -141,7 +144,7 @@ function onAgentCreated(requestResponse, data) {
                     <template #form>
                         <CustomerNewCustomsAgent
                             @on-data-saved="
-                                (_, requestResponse) =>
+                                (requestResponse, _) =>
                                     onAgentCreated(requestResponse, data)
                             "
                         />

From 51460c1138957fbc3067262b5f5964695998378a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 13:27:36 +0100
Subject: [PATCH 14/35] fix: #6943 use v-model

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

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 9d2e43262..ea901c65a 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -48,7 +48,7 @@ async function hasCustomerRole() {
                 :rules="validate('client.email')"
                 clearable
                 type="email"
-                data.account.name
+                v-model="data.account.email"
                 class="q-mt-sm"
                 :info="t('This email is used for user to regain access their account')"
             />

From 2e1a5ecdd986b8922efb3f999d09c343a6f36c4f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 13:29:15 +0100
Subject: [PATCH 15/35] fix: #6943 CustomerAddressCreate

---
 src/pages/Customer/components/CustomerAddressCreate.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 6cf42b20e..bc4d6a128 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -144,8 +144,7 @@ function onAgentCreated({ id, fiscalName }, data) {
                     <template #form>
                         <CustomerNewCustomsAgent
                             @on-data-saved="
-                                (requestResponse, _) =>
-                                    onAgentCreated(requestResponse, data)
+                                (requestResponse) => onAgentCreated(requestResponse, data)
                             "
                         />
                     </template>

From 37e557264c8a3f414a41640832dc961a02428dfd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 22:45:32 +0100
Subject: [PATCH 16/35] fix: useRequired composable

---
 src/composables/useRequired.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/composables/useRequired.js b/src/composables/useRequired.js
index e650c91f5..d211b96b4 100644
--- a/src/composables/useRequired.js
+++ b/src/composables/useRequired.js
@@ -2,8 +2,14 @@ import { useValidator } from 'src/composables/useValidator';
 
 export function useRequired($attrs) {
     const { validations } = useValidator();
-
-    const isRequired = Object.keys($attrs).includes('required');
+    const hasRequired = Object.keys($attrs).includes('required');
+    let isRequired = false;
+    if (hasRequired) {
+        const required = $attrs['required'];
+        if (typeof required === 'boolean') {
+            isRequired = required;
+        }
+    }
     const requiredFieldRule = (val) => validations().required(isRequired, val);
 
     return {

From 883104f1f1519d807e72ac0f67e7942cb7296457 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 22:45:42 +0100
Subject: [PATCH 17/35] fix: dataByOrder when is null composable

---
 src/utils/dataByOrder.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/dataByOrder.js b/src/utils/dataByOrder.js
index 1bdedb8a1..eb4a4f586 100644
--- a/src/utils/dataByOrder.js
+++ b/src/utils/dataByOrder.js
@@ -1,6 +1,7 @@
 function orderData(data, order) {
     if (typeof order === 'function') return data.sort(data);
     if (typeof order === 'string') order = [order];
+    if (!Array.isArray(data)) return [];
     if (Array.isArray(order)) {
         let orderComp = [];
 

From 0c7be99ecb332963c184b0a7efae890e8f945421 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 22:46:15 +0100
Subject: [PATCH 18/35] fix: input sage required

---
 src/components/common/VnSelect.vue             | 9 ++++++++-
 src/pages/Customer/Card/CustomerFiscalData.vue | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 14005e1cc..1a41d261a 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -8,7 +8,14 @@ import dataByOrder from 'src/utils/dataByOrder';
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 const $attrs = useAttrs();
 const { t } = useI18n();
-const { isRequired, requiredFieldRule } = useRequired($attrs);
+
+const isRequired = computed(() => {
+    return useRequired($attrs).isRequired;
+});
+const requiredFieldRule = computed(() => {
+    return useRequired($attrs).requiredFieldRule;
+});
+
 const $props = defineProps({
     modelValue: {
         type: [String, Number, Object],
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 24d8d1e5d..673c7dda9 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -67,6 +67,7 @@ function handleLocation(data, location) {
                     option-label="vat"
                     option-value="id"
                     v-model="data.sageTaxTypeFk"
+                    data-cy="sageTaxTypeFk"
                     :required="data.isTaxDataChecked"
                 />
                 <VnSelect
@@ -75,6 +76,7 @@ function handleLocation(data, location) {
                     hide-selected
                     option-label="transaction"
                     option-value="id"
+                    data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
                     :required="data.isTaxDataChecked"
                 >

From 918c8bea6007ef1e97e06afd30e92c0b4a3dc8d9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 29 Nov 2024 22:46:26 +0100
Subject: [PATCH 19/35] test: input sage required

---
 test/cypress/integration/client/clientFiscalData.spec.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/client/clientFiscalData.spec.js b/test/cypress/integration/client/clientFiscalData.spec.js
index e337c26f8..05e0772e9 100644
--- a/test/cypress/integration/client/clientFiscalData.spec.js
+++ b/test/cypress/integration/client/clientFiscalData.spec.js
@@ -3,11 +3,16 @@ describe('Client fiscal data', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit('#/customer/1110/fiscal-data', {
+        cy.visit('#/customer/1107/fiscal-data', {
             timeout: 5000,
         });
     });
-    it('Should load layout', () => {
+    it('Should change required value when change customer', () => {
         cy.get('.q-card').should('be.visible');
+        cy.dataCy('sageTaxTypeFk').filter('input').should('not.have.attr', 'required');
+        cy.get('#searchbar input').clear();
+        cy.get('#searchbar input').type('1{enter}');
+        cy.get('.q-item > .q-item__label').should('have.text', ' #1');
+        cy.dataCy('sageTaxTypeFk').filter('input').should('have.attr', 'required');
     });
 });

From 444f68e937af5903cc02fed4b963fe11cb780c6e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 1 Dec 2024 23:52:41 +0100
Subject: [PATCH 20/35] fix: #8016 fetching data

---
 src/components/CreateNewPostcodeForm.vue      | 126 ++++++++++--------
 src/components/VnSelectProvince.vue           |   2 +-
 src/components/common/VnLocation.vue          |   1 -
 .../vnComponent/VnLocation.spec.js            |  23 ++--
 4 files changed, 79 insertions(+), 73 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index d082df9e5..8000aac52 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -21,9 +21,10 @@ const postcodeFormData = reactive({
     provinceFk: null,
     townFk: null,
 });
+const townsFetchDataRef = ref(false);
+const townFilter = ref({});
 
 const countriesRef = ref(false);
-const townsRef = ref(false);
 const provincesFetchDataRef = ref(false);
 const provincesOptions = ref([]);
 const townsOptions = ref([]);
@@ -47,74 +48,79 @@ function onDataSaved(formData) {
     emit('onDataSaved', newPostcode);
 }
 
-async function onCityCreated(newTown, formData) {
-    await provincesFetchDataRef.value.fetch();
-    newTown.province = findProvince(newTown.provinceFk);
-    formData.townFk = newTown;
-    setTown(newTown, formData);
-}
-function findProvince(provinceId) {
-    return provincesOptions.value.find(({ id }) => id === provinceId);
-}
-function setTown(newTown, data) {
-    town.value = newTown;
-    data.provinceFk = newTown?.provinceFk ?? newTown;
-    data.countryFk = newTown?.province?.countryFk ?? newTown;
-}
-
 async function setCountry(countryFk, data) {
     data.townFk = null;
     data.provinceFk = null;
     data.countryFk = countryFk;
+    await fetchTowns();
 }
 
+// Province
+
 async function handleProvinces(data) {
     provincesOptions.value = data;
-    // handleTowns(data);
-}
-async function handleTowns(data) {
-    townsOptions.value = data;
-    // whereTowns.value.provinceFk.inq = mapData(data);
-    // townsRef.value.opts = [];
-}
-
-async function setProvince(id, data) {
-    const newProvince = findProvince(id);
-    if (!newProvince) {
-        data.townFk = null;
-        return;
+    if (postcodeFormData.countryFk) {
+        await fetchTowns();
     }
-    whereTowns.value.provinceFk.inq = [id];
-    // handleTowns([newProvince]);
-    data.countryFk = newProvince.countryFk;
 }
-
+async function setProvince(id, data) {
+    if (data.provinceFk === id) return;
+    const newProvince = provincesOptions.value.find((province) => province.id == id);
+    if (newProvince) data.countryFk = newProvince.countryFk;
+    postcodeFormData.provinceFk = id;
+    await fetchTowns();
+}
 async function onProvinceCreated(data) {
     await provincesFetchDataRef.value.fetch({
         where: { countryFk: postcodeFormData.countryFk },
     });
     postcodeFormData.provinceFk = data.id;
 }
+function provinceByCountry(countryFk = postcodeFormData.countryFk) {
+    return provincesOptions.value
+        .filter((province) => province.countryFk === countryFk)
+        .map(({ id }) => id);
+}
 
-const whereTowns = ref({});
-// const whereTowns = ref(() => {
-//     if (!postcodeFormData.provinceFk) return { provinceFk: { inq: null } };
-//     if (postcodeFormData.provinceFk)
-//         return {
-//             provinceFk: {
-//                 inq: [postcodeFormData.provinceFk], //provincesOptions.value.map(({ id }) => id),
-//             },
-//         };
+// Town
+async function handleTowns(data) {
+    townsOptions.value = data;
+}
+function setTown(newTown, data) {
+    town.value = newTown;
+    data.provinceFk = newTown?.provinceFk ?? newTown;
+    data.countryFk = newTown?.province?.countryFk ?? newTown;
+}
+async function onCityCreated(newTown, formData) {
+    await provincesFetchDataRef.value.fetch();
+    newTown.province = provincesOptions.value.find(
+        (province) => province.id === newTown.provinceFk
+    );
+    formData.townFk = newTown;
+    setTown(newTown, formData);
+}
+async function fetchTowns(countryFk = postcodeFormData.countryFk) {
+    if (!countryFk) return;
+    const provinces = postcodeFormData.provinceFk
+        ? [postcodeFormData.provinceFk]
+        : provinceByCountry();
+    townFilter.value.where = {
+        provinceFk: {
+            inq: provinces,
+        },
+    };
+    await townsFetchDataRef.value?.fetch();
+}
 
-//     return {
-//         provinceFk: {
-//             inq: mapData(provincesOptions.value),
-//         },
-//     };
-// });
-function mapData(data) {
-    if (data.length === 0) return data;
-    return data.map(({ id }) => id);
+async function filterTowns(name) {
+    if (name !== '') {
+        townFilter.value.where = {
+            name: {
+                like: `%${name}%`,
+            },
+        };
+        await townsFetchDataRef.value?.fetch();
+    }
 }
 </script>
 
@@ -128,12 +134,12 @@ function mapData(data) {
         url="Provinces/location"
     />
     <FetchData
-        ref="townsRef"
-        @on-fetch="handleTowns"
+        ref="townsFetchDataRef"
         :sort-by="['name ASC']"
-        :limit="2"
+        :limit="30"
+        :filter="townFilter"
+        @on-fetch="handleTowns"
         auto-load
-        :where="whereTowns"
         url="Towns/location"
     />
 
@@ -155,21 +161,23 @@ function mapData(data) {
                     :rules="validate('postcode.code')"
                     clearable
                     required
+                    data-cy="locationPostcode"
                 />
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
+                    @filter="filterTowns"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
-                    option-label="name"
                     :options="townsOptions"
+                    option-label="name"
                     option-value="id"
                     @input-value="(evt) => (whereTowns.name = { like: `%${evt}%` })"
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
-                    :clearable="true"
                     required
+                    data-cy="locationTown"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -200,7 +208,6 @@ function mapData(data) {
                     :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
-                    @on-province-fetched="handleProvinces"
                     @on-province-created="onProvinceCreated"
                     required
                 />
@@ -219,6 +226,7 @@ function mapData(data) {
                     v-model="data.countryFk"
                     :rules="validate('postcode.countryFk')"
                     @update:model-value="(value) => setCountry(value, data)"
+                    data-cy="locationCountry"
                 />
             </VnRow>
         </template>
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index bfc4ab7b7..7d1297abf 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -64,11 +64,11 @@ watch(
         auto-load
     />
     <VnSelectDialog
+        data-cy="locationProvince"
         :label="t('Province')"
         :options="provincesOptions"
         :tooltip="t('Create province')"
         hide-selected
-        :clearable="true"
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
         :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 6de402a26..af273150e 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -75,7 +75,6 @@ const handleModelValue = (data) => {
         :input-debounce="300"
         :class="{ required: isRequired }"
         v-bind="$attrs"
-        clearable
         :emit-value="false"
         :tooltip="t('Create new location')"
         :rules="mixinRules"
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index b98d42fdd..1fea8f738 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -43,11 +43,9 @@ describe('VnLocation', () => {
                 province
             );
             cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) `
             ).click();
-            cy.get(
-                `#q-portal--dialog--5 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
-            ).should('have.value', province);
+            cy.dataCy('locationProvince').should('have.value', province);
         });
     });
     describe('Worker Create', () => {
@@ -124,17 +122,18 @@ describe('VnLocation', () => {
             cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
             cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) `
             ).click();
             cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
             cy.get('#q-portal--dialog--3 .q-input').type(province);
-            cy.get('#q-portal--dialog--3 .q-btn--standard').click();
-            cy.get('#q-portal--dialog--1 .q-btn--standard').click();
+            cy.dataCy('FormModelPopup_save').eq(1).click();
+            cy.dataCy('FormModelPopup_save').eq(0).click();
+
             cy.waitForElement('.q-form');
             checkVnLocation(postCode, province);
         });
 
-        it('Create province without country', () => {
+        it.only('Create province without country', () => {
             const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
             cy.get(
@@ -146,7 +145,7 @@ describe('VnLocation', () => {
             cy.countSelectOptions('#q-portal--dialog--3 .q-select', 4);
             cy.get('#q-portal--dialog--3 .q-input').type(provinceName);
 
-            cy.get('#q-portal--dialog--3 .q-btn--standard').click();
+            cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 
         it('Create city with country', () => {
@@ -157,13 +156,13 @@ describe('VnLocation', () => {
                 'Italia'
             );
             cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2)  `
             ).click();
             cy.selectOption('#q-portal--dialog--4 .q-select', 'Province four');
             cy.countSelectOptions('#q-portal--dialog--4 .q-select', 1);
 
             cy.get('#q-portal--dialog--4 .q-input').type(cityName);
-            cy.get('#q-portal--dialog--4 .q-btn--standard').click();
+            cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 
         it('Create province with country', () => {
@@ -183,7 +182,7 @@ describe('VnLocation', () => {
             cy.countSelectOptions('#q-portal--dialog--4 .q-select', 2);
 
             cy.get('#q-portal--dialog--4 .q-input').type(provinceName);
-            cy.get('#q-portal--dialog--4 .q-btn--standard').click();
+            cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 
         function checkVnLocation(postCode, province) {

From 007b95a616b1519a4876034e11a6c6460de3efa2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Dec 2024 00:50:31 +0100
Subject: [PATCH 21/35] test: remove #q-

---
 src/components/CreateNewCityForm.vue          |  2 +
 src/components/CreateNewPostcodeForm.vue      |  6 +--
 src/components/CreateNewProvinceForm.vue      |  2 +
 .../vnComponent/VnLocation.spec.js            | 50 +++++++++----------
 4 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 1cbba42fc..9ab942dda 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -48,12 +48,14 @@ const onDataSaved = (...args) => {
                     v-model="data.name"
                     :rules="validate('city.name')"
                     required
+                    data-cy="cityName"
                 />
                 <VnSelectProvince
                     :province-selected="$props.provinceSelected"
                     :country-fk="$props.countryFk"
                     v-model="data.provinceFk"
                     required
+                    data-cy="provinceCity"
                 />
             </VnRow>
         </template>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 8000aac52..d3d6708f0 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -129,7 +129,7 @@ async function filterTowns(name) {
         ref="provincesFetchDataRef"
         @on-fetch="handleProvinces"
         :sort-by="['name ASC']"
-        :limit="2"
+        :limit="30"
         auto-load
         url="Provinces/location"
     />
@@ -153,7 +153,6 @@ async function filterTowns(name) {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
-            {{ whereTowns }}
             <VnRow>
                 <VnInput
                     :label="t('Postcode')"
@@ -172,7 +171,6 @@ async function filterTowns(name) {
                     :options="townsOptions"
                     option-label="name"
                     option-value="id"
-                    @input-value="(evt) => (whereTowns.name = { like: `%${evt}%` })"
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
@@ -213,7 +211,7 @@ async function filterTowns(name) {
                 />
                 <VnSelect
                     ref="countriesRef"
-                    :limit="2"
+                    :limit="30"
                     :filter="countryFilter"
                     :sort-by="['name ASC']"
                     auto-load
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 887ca957c..d35690eeb 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -53,8 +53,10 @@ const where = computed(() => {
                     v-model="data.name"
                     :rules="validate('province.name')"
                     required
+                    data-cy="provinceName"
                 />
                 <VnSelect
+                    data-cy="autonomyProvince"
                     required
                     ref="autonomiesRef"
                     auto-load
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index 1fea8f738..eab5d63b9 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -116,7 +116,7 @@ describe('VnLocation', () => {
             checkVnLocation(postCode, province);
         });
 
-        it('Create city without country', () => {
+        it.only('Create city without country', () => {
             const postCode = randomNumber();
             const province = randomString({ length: 4 });
             cy.get(createLocationButton).click();
@@ -124,8 +124,8 @@ describe('VnLocation', () => {
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) `
             ).click();
-            cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
-            cy.get('#q-portal--dialog--3 .q-input').type(province);
+            cy.selectOption('[data-cy="locationProvince"]:last', 'Province one');
+            cy.get('[data-cy="cityName"]').type(province);
             cy.dataCy('FormModelPopup_save').eq(1).click();
             cy.dataCy('FormModelPopup_save').eq(0).click();
 
@@ -133,22 +133,7 @@ describe('VnLocation', () => {
             checkVnLocation(postCode, province);
         });
 
-        it.only('Create province without country', () => {
-            const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
-            cy.get(createLocationButton).click();
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            )
-                .eq(0)
-                .click();
-            cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
-            cy.countSelectOptions('#q-portal--dialog--3 .q-select', 4);
-            cy.get('#q-portal--dialog--3 .q-input').type(provinceName);
-
-            cy.dataCy('FormModelPopup_save').eq(1).click();
-        });
-
-        it('Create city with country', () => {
+        it.only('Create city with country', () => {
             const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
             cy.selectOption(
@@ -158,10 +143,25 @@ describe('VnLocation', () => {
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2)  `
             ).click();
-            cy.selectOption('#q-portal--dialog--4 .q-select', 'Province four');
-            cy.countSelectOptions('#q-portal--dialog--4 .q-select', 1);
+            cy.selectOption('[data-cy="locationProvince"]:last', 'Province four');
+            cy.countSelectOptions('[data-cy="locationProvince"]:last', 1);
+
+            cy.get('[data-cy="cityName"]').type(cityName);
+            cy.dataCy('FormModelPopup_save').eq(1).click();
+        });
+
+        it('Create province without country', () => {
+            const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
+            cy.get(createLocationButton).click();
+            cy.get(
+                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
+            )
+                .eq(0)
+                .click();
+            cy.selectOption('[data-cy="autonomyProvince"] ', 'Autonomy one');
+            cy.countSelectOptions('[data-cy="autonomyProvince"]', 4);
+            cy.get('[data-cy="provinceName"]').type(provinceName);
 
-            cy.get('#q-portal--dialog--4 .q-input').type(cityName);
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 
@@ -178,10 +178,10 @@ describe('VnLocation', () => {
                 .eq(0)
                 .click();
 
-            cy.selectOption('#q-portal--dialog--4 .q-select', 'one');
-            cy.countSelectOptions('#q-portal--dialog--4 .q-select', 2);
+            cy.selectOption('[data-cy="autonomyProvince"] ', 'Autonomy one');
+            cy.countSelectOptions('[data-cy="autonomyProvince"]', 2);
 
-            cy.get('#q-portal--dialog--4 .q-input').type(provinceName);
+            cy.get('[data-cy="provinceName"]').type(provinceName);
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 

From 21dc47ed7479c50eaa847ff1bbdf79dd781a94b0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Dec 2024 01:25:42 +0100
Subject: [PATCH 22/35] perf: add dataCy

---
 src/components/CreateNewCityForm.vue          |  1 +
 src/components/common/VnSelectDialog.vue      |  1 +
 .../vnComponent/VnLocation.spec.js            | 32 ++++++-------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 9ab942dda..bf3830522 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -40,6 +40,7 @@ const onDataSaved = (...args) => {
         url-create="towns"
         model="city"
         @on-data-saved="onDataSaved"
+        data-cy="newCityForm"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow>
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 350aa9272..12322c3fa 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -43,6 +43,7 @@ const isAllowedToCreate = computed(() => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
+                :data-cy="$attrs.dataCy ?? $attrs.label + '_icon'"
                 @click.stop.prevent="$refs.dialog.show()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index eab5d63b9..82d12a1e4 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -116,16 +116,14 @@ describe('VnLocation', () => {
             checkVnLocation(postCode, province);
         });
 
-        it.only('Create city without country', () => {
+        it('Create city without country', () => {
             const postCode = randomNumber();
             const province = randomString({ length: 4 });
             cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            ).click();
+            cy.dataCy('City_icon').click();
             cy.selectOption('[data-cy="locationProvince"]:last', 'Province one');
-            cy.get('[data-cy="cityName"]').type(province);
+            cy.dataCy('cityName').type(province);
             cy.dataCy('FormModelPopup_save').eq(1).click();
             cy.dataCy('FormModelPopup_save').eq(0).click();
 
@@ -133,34 +131,28 @@ describe('VnLocation', () => {
             checkVnLocation(postCode, province);
         });
 
-        it.only('Create city with country', () => {
+        it('Create city with country', () => {
             const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
                 'Italia'
             );
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2)  `
-            ).click();
+            cy.dataCy('City_icon').click();
             cy.selectOption('[data-cy="locationProvince"]:last', 'Province four');
             cy.countSelectOptions('[data-cy="locationProvince"]:last', 1);
 
-            cy.get('[data-cy="cityName"]').type(cityName);
+            cy.dataCy('cityName').type(cityName);
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 
         it('Create province without country', () => {
             const provinceName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            )
-                .eq(0)
-                .click();
+            cy.dataCy('Province_icon').click();
             cy.selectOption('[data-cy="autonomyProvince"] ', 'Autonomy one');
             cy.countSelectOptions('[data-cy="autonomyProvince"]', 4);
-            cy.get('[data-cy="provinceName"]').type(provinceName);
+            cy.dataCy('provinceName').type(provinceName);
 
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });
@@ -172,16 +164,12 @@ describe('VnLocation', () => {
                 `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
                 'España'
             );
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-select > ${createForm.sufix} > :nth-child(2) `
-            )
-                .eq(0)
-                .click();
+            cy.dataCy('Province_icon').click();
 
             cy.selectOption('[data-cy="autonomyProvince"] ', 'Autonomy one');
             cy.countSelectOptions('[data-cy="autonomyProvince"]', 2);
 
-            cy.get('[data-cy="provinceName"]').type(provinceName);
+            cy.dataCy('provinceName').type(provinceName);
             cy.dataCy('FormModelPopup_save').eq(1).click();
         });
 

From 7693d193f03c504efdc2278be8799c278f0a73ca Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Dec 2024 10:36:18 +0100
Subject: [PATCH 23/35] feat: refs #6818 add URL handling vn-link-phone

---
 src/components/ui/VnLinkPhone.vue             | 14 ++++++++---
 .../components/common/VnLinkPhone.spec.js     | 25 +++++++++++--------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index c5023f69e..c5d5df394 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -2,6 +2,7 @@
 import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
 import { parsePhone } from 'src/filters';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
@@ -14,13 +15,14 @@ const config = reactive({
     sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'vn:saysimple',
-        href: null,
+        url: null,
         channel: props.channel,
     },
 });
 const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
 
 onBeforeMount(async () => {
+    if (!phone.value) return;
     let { channel } = config[type];
 
     if (type === 'say-simple') {
@@ -31,9 +33,14 @@ onBeforeMount(async () => {
         phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
         config[
             type
-        ].href = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
+        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
     }
 });
+
+function handleClick() {
+    if (config[type].url) useOpenURL(config[type].url);
+    else if (config[type].href) window.location.href = config[type].href;
+}
 </script>
 <template>
     <QBtn
@@ -44,8 +51,7 @@ onBeforeMount(async () => {
         size="sm"
         color="primary"
         padding="none"
-        :href="config[type].href"
-        @click.stop
+        @click.stop="handleClick"
     >
         <QTooltip>
             {{ capitalize(type).replace('-', '') }}
diff --git a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
index a14e509ae..8b59ed1dc 100644
--- a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
+++ b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
@@ -7,28 +7,33 @@ describe('parsePhone filter', () => {
         vi.spyOn(axios, 'get').mockReturnValue({ data: { prefix: '34' } });
     });
 
+    it('no phone', () => {
+        const phone = parsePhone(null, '34');
+        expect(phone).toBe(undefined);
+    });
+
     it("adds prefix +34 if it doesn't have one", async () => {
-        const resultado = await parsePhone('123456789', '34');
-        expect(resultado).toBe('34123456789');
+        const phone = await parsePhone('123456789', '34');
+        expect(phone).toBe('34123456789');
     });
 
     it('maintains prefix +34 if it is already correct', async () => {
-        const resultado = await parsePhone('+34123456789', '34');
-        expect(resultado).toBe('34123456789');
+        const phone = await parsePhone('+34123456789', '34');
+        expect(phone).toBe('34123456789');
     });
 
     it('converts prefix 0034 to +34', async () => {
-        const resultado = await parsePhone('0034123456789', '34');
-        expect(resultado).toBe('34123456789');
+        const phone = await parsePhone('0034123456789', '34');
+        expect(phone).toBe('34123456789');
     });
 
     it('converts prefix 34 without symbol to +34', async () => {
-        const resultado = await parsePhone('34123456789', '34');
-        expect(resultado).toBe('34123456789');
+        const phone = await parsePhone('34123456789', '34');
+        expect(phone).toBe('34123456789');
     });
 
     it('replaces incorrect prefix with the correct one', async () => {
-        const resultado = await parsePhone('+44123456789', '34');
-        expect(resultado).toBe('44123456789');
+        const phone = await parsePhone('+44123456789', '34');
+        expect(phone).toBe('44123456789');
     });
 });

From c341c0617089dfcf1b21965ac79806b9aa870877 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Dec 2024 10:36:30 +0100
Subject: [PATCH 24/35] fix: refs #6818 test

---
 test/vitest/__tests__/components/common/VnLinkPhone.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
index 8b59ed1dc..1505e32f7 100644
--- a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
+++ b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
@@ -7,8 +7,8 @@ describe('parsePhone filter', () => {
         vi.spyOn(axios, 'get').mockReturnValue({ data: { prefix: '34' } });
     });
 
-    it('no phone', () => {
-        const phone = parsePhone(null, '34');
+    it('no phone', async () => {
+        const phone = await parsePhone(null, '34');
         expect(phone).toBe(undefined);
     });
 

From d360200e98edad5a673f3d5791d156355ac85804 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 2 Dec 2024 12:43:18 +0100
Subject: [PATCH 25/35] fix: refs #8263 itemTags order

---
 src/pages/Item/Card/ItemTags.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index f4ab90d93..a077c72c6 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -138,6 +138,7 @@ const insertTag = (rows) => {
                                 :required="false"
                                 :rules="validate('itemTag.tagFk')"
                                 :use-like="false"
+                                sort-by="value"
                             />
                             <VnInput
                                 v-else-if="

From 48482efe3b11c1730ae299b2fe52f1034ab02453 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 2 Dec 2024 13:25:07 +0100
Subject: [PATCH 26/35] fix: refs #8114 fix agencyList

---
 src/pages/Order/OrderList.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 769a2cbd1..4443472a6 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -14,11 +14,13 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
+const route = useRoute();
 const addressOptions = ref([]);
 const columns = computed(() => [
     {
@@ -145,11 +147,12 @@ async function fetchClientAddress(id, formData = {}) {
         `Clients/${id}/addresses?filter[order]=isActive DESC`
     );
     addressOptions.value = data;
-    console.log('formData', formData);
+    formData.addressId = data.defaultAddressFk;
     fetchAgencies(formData);
 }
 
 async function fetchAgencies({ landed, addressId }) {
+    console.log('addressId', addressId);
     if (!landed || !addressId) return (agencyList.value = []);
 
     const { data } = await axios.get('Agencies/landsThatDay', {
@@ -167,6 +170,12 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
 </script>
 <template>
     <OrderSearchbar />
@@ -243,6 +252,7 @@ const getDateColor = (date) => {
                 :label="t('module.address')"
                 option-value="id"
                 option-label="nickname"
+                @update:model-value="() => fetchAgencies(data)"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

From 50360523b34918c5d82519d79100cc33f9fc02ec Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 2 Dec 2024 13:26:26 +0100
Subject: [PATCH 27/35] fix: refs #8114 remove logs

---
 src/pages/Order/Card/OrderCreateDialog.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index f37c4bfc9..9a53b9e30 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -17,19 +17,15 @@ const agencyList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 const fetchAgencyList = async (landed, addressFk) => {
-    console.log('hola');
     if (!landed || !addressFk) {
         return;
     }
-
-    console.log('despuesdelIf');
     const { data } = await axios.get('Agencies/landsThatDay', {
         params: {
             addressFk,
             landed: new Date(landed).toISOString(),
         },
     });
-    console.log('fetchAgency', data);
     agencyList.value = data;
 };
 

From 1291dc17230cbc40c596affe07444e3c284fd07b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 2 Dec 2024 13:28:13 +0100
Subject: [PATCH 28/35] fix: refs #8114 clean

---
 src/pages/Order/OrderList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 4443472a6..dc614dbb0 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -152,7 +152,6 @@ async function fetchClientAddress(id, formData = {}) {
 }
 
 async function fetchAgencies({ landed, addressId }) {
-    console.log('addressId', addressId);
     if (!landed || !addressId) return (agencyList.value = []);
 
     const { data } = await axios.get('Agencies/landsThatDay', {

From 07b2be14ae95eadba05a4a50fd79be2cbd7d2e1d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Dec 2024 14:39:55 +0100
Subject: [PATCH 29/35] fix: refs #6818 get default prefix on err

---
 src/filters/parsePhone.js                          | 14 ++++++++------
 .../components/common/VnLinkPhone.spec.js          | 11 +++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/filters/parsePhone.js b/src/filters/parsePhone.js
index 27474321f..6cb1bea17 100644
--- a/src/filters/parsePhone.js
+++ b/src/filters/parsePhone.js
@@ -4,13 +4,15 @@ export default async function parsePhone(phone, country) {
     if (!phone) return;
     if (phone.startsWith('+')) return `${phone.slice(1)}`;
     if (phone.startsWith('00')) return `${phone.slice(2)}`;
+
+    let prefix;
     try {
-        const prefix = (
-            await axios.get(`Prefixes/${country.toLowerCase()}`)
-        ).data?.prefix.replace(/^0+/, '');
-        if (phone.startsWith(prefix)) return phone;
-        return `${prefix}${phone}`;
+        prefix = (await axios.get(`Prefixes/${country.toLowerCase()}`)).data?.prefix;
     } catch (e) {
-        return null;
+        prefix = (await axios.get('PbxConfigs/findOne')).data?.defaultPrefix;
     }
+    prefix = prefix.replace(/^0+/, '');
+
+    if (phone.startsWith(prefix)) return phone;
+    return `${prefix}${phone}`;
 }
diff --git a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
index 1505e32f7..3e0a532ed 100644
--- a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
+++ b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
@@ -36,4 +36,15 @@ describe('parsePhone filter', () => {
         const phone = await parsePhone('+44123456789', '34');
         expect(phone).toBe('44123456789');
     });
+
+    it('adds default prefix when entering the catch block', async () => {
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url.includes('Prefixes'))
+                return Promise.reject(new Error('Network error'));
+            else if (url.includes('PbxConfigs'))
+                return Promise.resolve({ data: { defaultPrefix: '39' } });
+        });
+        const phone = await parsePhone('123456789', '34');
+        expect(phone).toBe('39123456789');
+    });
 });

From baf76cf63365a963e3df87cd20f5fd6f37e6364c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Dec 2024 14:43:58 +0100
Subject: [PATCH 30/35] test: refs #6818 update description

---
 test/vitest/__tests__/components/common/VnLinkPhone.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
index 3e0a532ed..a34ef90a5 100644
--- a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
+++ b/test/vitest/__tests__/components/common/VnLinkPhone.spec.js
@@ -37,7 +37,7 @@ describe('parsePhone filter', () => {
         expect(phone).toBe('44123456789');
     });
 
-    it('adds default prefix when entering the catch block', async () => {
+    it('adds default prefix on error', async () => {
         vi.spyOn(axios, 'get').mockImplementation((url) => {
             if (url.includes('Prefixes'))
                 return Promise.reject(new Error('Network error'));

From b536cfe0afae87945fcca2c31928e4d063cfbd51 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 3 Dec 2024 09:35:19 +0100
Subject: [PATCH 31/35] fix: due date

---
 src/pages/InvoiceOut/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index 192f5b26f..feb9050fa 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -10,7 +10,7 @@ invoiceOutList:
         ref: Referencia
         issued: Fecha emisión
         created: F. creación
-        dueDate: F. máxima
+        dueDate: Fecha vencimiento
         invoiceOutSerial: Serial
         ticket: Ticket
         taxArea: Area

From b6980988231495b71b16bae57507e11ad253d0c7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 3 Dec 2024 11:03:40 +0100
Subject: [PATCH 32/35] fix: hotfix correct path "log"

---
 src/router/modules/travel.js | 4 ++--
 src/router/modules/zone.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index 627692be8..dff693d2f 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -75,9 +75,9 @@ export default {
                 },
                 {
                     name: 'TravelHistory',
-                    path: 'history',
+                    path: 'log',
                     meta: {
-                        title: 'history',
+                        title: 'log',
                         icon: 'history',
                     },
                     component: () => import('src/pages/Travel/Card/TravelLog.vue'),
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 1f27cc76f..c5ebe762e 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -106,7 +106,7 @@ export default {
                 },
                 {
                     name: 'ZoneHistory',
-                    path: 'history',
+                    path: 'log',
                     meta: {
                         title: 'log',
                         icon: 'history',

From b4a4c4a0a443ffdba61309bcdc536030e52032b0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 3 Dec 2024 14:34:01 +0100
Subject: [PATCH 33/35] build: new version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 04b75a0b0..39d49519b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.50.0",
+    "version": "24.52.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -64,4 +64,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
\ No newline at end of file
+}

From e55d116398f2120a7756d958d020d327a1678fb5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Dec 2024 10:31:59 +0100
Subject: [PATCH 34/35] fix: refs #8114 fix pr

---
 src/pages/Order/OrderList.vue | 50 +++++++++++++----------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 23ceaaacc..dc614dbb0 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -15,7 +15,6 @@ import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vu
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import { useRoute } from 'vue-router';
-import dataByOrder from 'src/utils/dataByOrder';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -144,16 +143,10 @@ const columns = computed(() => [
 ]);
 
 async function fetchClientAddress(id, formData = {}) {
-    const { data } = await axios.get(`Clients/${id}`, {
-        params: {
-            filter: {
-                order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
-                include: { relation: 'addresses' },
-            },
-        },
-    });
+    const { data } = await axios.get(
+        `Clients/${id}/addresses?filter[order]=isActive DESC`
+    );
     addressOptions.value = data;
-    addressesList.value = data.addresses;
     formData.addressId = data.defaultAddressFk;
     fetchAgencies(formData);
 }
@@ -164,7 +157,7 @@ async function fetchAgencies({ landed, addressId }) {
     const { data } = await axios.get('Agencies/landsThatDay', {
         params: { addressFk: addressId, landed },
     });
-    agencyList.value = dataByOrder(data, 'agencyMode ASC');
+    agencyList.value = data;
 }
 
 const getDateColor = (date) => {
@@ -261,27 +254,22 @@ onMounted(() => {
                 @update:model-value="() => fetchAgencies(data)"
             >
                 <template #option="scope">
-                    <QItem
-                        v-bind="scope.itemProps"
-                        :class="{ disabled: !scope.opt.isActive }"
-                    >
-                        <QItemSection style="min-width: min-content" avatar>
-                            <QIcon
-                                v-if="
-                                    scope.opt.isActive && data.addressId === scope.opt.id
-                                "
-                                size="sm"
-                                color="grey"
-                                name="star"
-                                class="fill-icon"
-                            />
-                        </QItemSection>
+                    <QItem v-bind="scope.itemProps">
                         <QItemSection>
-                            <QItemLabel>
-                                {{ scope.opt.nickname }}
-                            </QItemLabel>
-                            <QItemLabel caption>
-                                {{ `${scope.opt.street}, ${scope.opt.city}` }}
+                            <QItemLabel
+                                :class="{
+                                    'color-vn-label': !scope.opt?.isActive,
+                                }"
+                            >
+                                {{
+                                    `${
+                                        !scope.opt?.isActive
+                                            ? t('basicData.inactive')
+                                            : ''
+                                    } `
+                                }}
+                                {{ scope.opt?.nickname }}: {{ scope.opt?.street }},
+                                {{ scope.opt?.city }}
                             </QItemLabel>
                         </QItemSection>
                     </QItem>

From fc3c80d60dd4944c698367e63d0bc265cb5f3ec7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Dec 2024 10:35:33 +0100
Subject: [PATCH 35/35] fix: refs #8114 fix lifeCycle hooks

---
 src/pages/Order/OrderList.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index dc614dbb0..dfeb0f6e2 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -141,6 +141,12 @@ const columns = computed(() => [
         ],
     },
 ]);
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
 
 async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(
@@ -169,12 +175,6 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk);
-});
 </script>
 <template>
     <OrderSearchbar />