From 81927c5af54cb25b99452064b421fe88c3d5b598 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 09:58:41 +0100
Subject: [PATCH 1/4] fix: zoneFilter

---
 src/pages/Zone/ZoneFilterPanel.vue | 2 +-
 src/pages/Zone/ZoneList.vue        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 25c55d75c..24a401925 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,7 +22,7 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData url="agencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index d160ea6b5..b01f8b7e7 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -73,6 +73,7 @@ const columns = computed(() => [
             inWhere: true,
             attrs: {
                 url: 'AgencyModes',
+                fields: ['id', 'name'],
             },
         },
         columnField: {

From 8eb76cd0fc06693a0f17a696427599ed46483c21 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 10:00:04 +0100
Subject: [PATCH 2/4] fix: url name

---
 src/pages/Zone/ZoneFilterPanel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 24a401925..5e2bad5f2 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,7 +22,7 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData url="agencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From 178753ddcc575460df7082322bde3a474e7658c0 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 10:11:14 +0100
Subject: [PATCH 3/4] fix: add scope fields on filter

---
 src/pages/Zone/ZoneFilterPanel.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 5e2bad5f2..98bfd35ed 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,7 +22,12 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From b68868e1039be4019b63618073a19906aaafb03d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 13 Nov 2024 12:11:15 +0100
Subject: [PATCH 4/4] feat: add city name

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

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 7667f60dc..5e03e9cdf 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -105,11 +105,14 @@ watch(
                 <template #option="{ itemProps, opt }">
                     <QItem v-bind="itemProps">
                         <QItemSection v-if="opt.code">
-                            <QItemLabel>{{ opt.code }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ opt.town?.province?.name }},
-                                {{ opt.town?.province?.country?.name }}</QItemLabel
-                            >
+                            <QItemLabel>
+                                {{ `${opt.code}, ${opt.town?.name}` }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                {{
+                                    `${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
+                                }}
+                            </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>