From 0d718448e22e1ad19350fa451fb41cb24e8b8408 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 21 Jun 2024 13:09:34 +0200
Subject: [PATCH 01/40] perf: approach

---
 src/components/FormModel.vue       | 10 +++++++---
 src/components/FormModelPopup.vue  |  1 +
 src/components/common/VnInput.vue  |  8 +-------
 src/components/common/VnSelect.vue |  2 --
 src/composables/useValidator.js    |  2 +-
 src/i18n/locale/en.yml             |  2 +-
 src/i18n/locale/es.yml             |  3 +++
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index f10dee61a..4cc5d38ee 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -22,7 +22,7 @@ const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
-
+const myForm = ref(null);
 const $props = defineProps({
     url: {
         type: String,
@@ -106,11 +106,14 @@ const defaultButtons = computed(() => ({
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
+        click: () => myForm.value.submit(),
+        type: 'submit',
     },
     reset: {
         color: 'primary',
         icon: 'restart_alt',
         label: 'globals.reset',
+        click: () => reset(),
     },
     ...$props.defaultButtons,
 }));
@@ -262,6 +265,7 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
+            ref="myForm"
             v-if="formData"
             @submit="save"
             @reset="reset"
@@ -290,7 +294,7 @@ defineExpose({
                     :color="defaultButtons.reset.color"
                     :icon="defaultButtons.reset.icon"
                     flat
-                    @click="reset"
+                    @click="defaultButtons.reset.click"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.reset.label)"
                 />
@@ -330,7 +334,7 @@ defineExpose({
                     :label="tMobile('globals.save')"
                     color="primary"
                     icon="save"
-                    @click="save"
+                    @click="defaultButtons.save.click"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.save.label)"
                 />
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 0f2b6cbf0..581a2dd73 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -68,6 +68,7 @@ defineExpose({
                 <QBtn
                     :label="t('globals.save')"
                     :title="t('globals.save')"
+                    @submit="() => formModelRef.save()"
                     type="submit"
                     color="primary"
                     class="q-ml-sm"
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 07e82abed..711e0d90a 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -25,7 +25,6 @@ const $props = defineProps({
 });
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 const vnInputRef = ref(null);
 const value = computed({
     get() {
@@ -63,11 +62,7 @@ const inputRules = [
 </script>
 
 <template>
-    <div
-        @mouseover="hover = true"
-        @mouseleave="hover = false"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
-    >
+    <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
             ref="vnInputRef"
             v-model="value"
@@ -76,7 +71,6 @@ const inputRules = [
             :class="{ required: $attrs.required }"
             @keyup.enter="emit('keyup.enter')"
             :clearable="false"
-            :rules="inputRules"
             :lazy-rules="true"
             hide-bottom-space
         >
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 04ccca889..12d110170 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -143,7 +143,6 @@ async function filterHandler(val, update) {
 watch(options, (newValue) => {
     setOptions(newValue);
 });
-
 watch(modelValue, (newValue) => {
     if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
         fetchFilter(newValue);
@@ -175,7 +174,6 @@ watch(modelValue, (newValue) => {
         ref="vnSelectRef"
         lazy-rules
         :class="{ required: $attrs.required }"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
         virtual-scroll-slice-size="options.length"
     >
         <template v-if="isClearable" #append>
diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index 5ad96ea1b..11e7188b3 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -40,7 +40,7 @@ export function useValidator() {
                 if (!isValid) return message;
             },
             presence: (value) => {
-                let message = `Value can't be empty`;
+                let message = t(`globals.valueCantBeEmpty`);
                 if (validation.message)
                     message = t(validation.message) || validation.message;
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 515f8dd80..bf9d38840 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -74,7 +74,7 @@ globals:
     notificationSent: Notification sent
     warehouse: Warehouse
     company: Company
-    fieldRequired: Field required
+    fieldRequired: Field requdired
     allowedFilesText: 'Allowed file types: { allowedContentTypes }'
     smsSent: SMS sent
     confirmDeletion: Confirm deletion
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 762f641e0..19b4cfd21 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -75,6 +75,9 @@ globals:
     warehouse: Almacén
     company: Empresa
     fieldRequired: Campo requerido
+    valueCantBeEmpty: El valor no puede estar vacío
+    Value can't be blank: El valor no puede estar en blanco
+    Value can't be null: El valor no puede ser nulo
     allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }'
     smsSent: SMS enviado
     confirmDeletion: Confirmar eliminación

From ccbfe7e0d93d98f83fb76cdec5984435c7a138c4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 21 Jun 2024 15:04:38 +0200
Subject: [PATCH 02/40] updates

---
 src/components/common/VnInput.vue  |  5 ++++-
 src/components/common/VnSelect.vue | 15 +++++++++++----
 src/composables/useValidator.js    |  9 ++++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 711e0d90a..5df3b7a11 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -25,6 +25,7 @@ const $props = defineProps({
 });
 
 const { t } = useI18n();
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 const vnInputRef = ref(null);
 const value = computed({
     get() {
@@ -53,7 +54,8 @@ defineExpose({
     focus,
 });
 
-const inputRules = [
+const mixinRules = [
+    requiredFieldRule,
     (val) => {
         const { min } = vnInputRef.value.$attrs;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
@@ -71,6 +73,7 @@ const inputRules = [
             :class="{ required: $attrs.required }"
             @keyup.enter="emit('keyup.enter')"
             :clearable="false"
+            :rules="$attrs.required || $attrs.min ? mixinRules : null"
             :lazy-rules="true"
             hide-bottom-space
         >
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 12d110170..1ee6930eb 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,10 +1,10 @@
 <script setup>
 import { ref, toRefs, computed, watch } from 'vue';
 import { onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 const emit = defineEmits(['update:modelValue', 'update:options']);
-
 const $props = defineProps({
     modelValue: {
         type: [String, Number, Object],
@@ -60,8 +60,7 @@ const $props = defineProps({
     },
 });
 
-const { t } = useI18n();
-const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations({}).presence(val);
 
 const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
@@ -82,7 +81,9 @@ function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
+
 onMounted(() => {
+    console.log(vnSelectRef.value.rules);
     setOptions(options.value);
     if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
 });
@@ -147,6 +148,11 @@ watch(modelValue, (newValue) => {
     if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
         fetchFilter(newValue);
 });
+import { useAttrs } from 'vue';
+
+const $attrs = useAttrs();
+const mixinRules = () =>
+    $attrs.required ? [$attrs?.rules ?? [], requiredFieldRule] : null;
 </script>
 
 <template>
@@ -173,6 +179,7 @@ watch(modelValue, (newValue) => {
         fill-input
         ref="vnSelectRef"
         lazy-rules
+        :rules="mixinRules()"
         :class="{ required: $attrs.required }"
         virtual-scroll-slice-size="options.length"
     >
diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index 11e7188b3..a07f3e985 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -28,7 +28,7 @@ export function useValidator() {
     }
 
     const { t } = useI18n();
-    const validations = function (validation) {
+    const validations = function (validation = {}) {
         return {
             format: (value) => {
                 const { allowNull, with: format, allowBlank } = validation;
@@ -71,12 +71,19 @@ export function useValidator() {
                     return validator.isInt(value) || 'Value should be integer';
                 return validator.isNumeric(value) || 'Value should be a number';
             },
+            min: (value, min) => {
+                if (min >= 0)
+                    if (Math.floor(value) < min) return t('inputMin', { value: min });
+            },
             custom: (value) => validation.bindedFunction(value) || 'Invalid value',
         };
     };
+    // const requiredFieldRule = [(val) => validations({}).presence(val)];
 
     return {
         validate,
+        // requiredFieldRule,
+        validations,
         models,
     };
 }

From f0b329c226d65410fe13070cf65733bd3b7ae711 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 21 Jun 2024 15:04:55 +0200
Subject: [PATCH 03/40] examples(restore)

---
 src/components/CreateBankEntityForm.vue         | 7 +------
 src/pages/Customer/Card/CustomerBillingData.vue | 7 ++++++-
 src/pages/Entry/EntryCreate.vue                 | 1 -
 src/pages/Item/Card/ItemBasicData.vue           | 5 ++++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index b2c5226e6..7b0202b36 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -53,12 +53,7 @@ onMounted(async () => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput
-                    :label="t('name')"
-                    v-model="data.name"
-                    :required="true"
-                    :rules="validate('bankEntity.name')"
-                />
+                <VnInput :label="t('name')" v-model="data.name" :required="true" />
                 <VnInput
                     ref="bicInputRef"
                     :label="t('swift')"
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 63bbd872c..9da52988b 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -56,7 +56,12 @@ const getBankEntities = (data, formData) => {
                     option-value="id"
                     v-model="data.payMethod"
                 />
-                <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
+                <VnInput
+                    :label="t('Due day')"
+                    clearable
+                    v-model="data.dueDay"
+                    :required="true"
+                />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 3493dc903..dbf149b6f 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -88,7 +88,6 @@ const redirectToEntryBasicData = (_, { id }) => {
                         option-label="nickname"
                         hide-selected
                         :required="true"
-                        :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Item/Card/ItemBasicData.vue b/src/pages/Item/Card/ItemBasicData.vue
index eb486f551..bf5bb652c 100644
--- a/src/pages/Item/Card/ItemBasicData.vue
+++ b/src/pages/Item/Card/ItemBasicData.vue
@@ -80,6 +80,7 @@ const onIntrastatCreated = (response, formData) => {
                     option-label="name"
                     hide-selected
                     map-options
+                    :required="true"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -156,13 +157,14 @@ const onIntrastatCreated = (response, formData) => {
                 </VnSelectDialog>
                 <div class="col">
                     <VnSelect
-                        :label="t('basicData.expense')"
+                        :label="t('basicData.expfense')"
                         v-model="data.expenseFk"
                         :options="expensesOptions"
                         option-value="id"
                         option-label="name"
                         hide-selected
                         map-options
+                        :required="true"
                     />
                 </div>
             </VnRow>
@@ -172,6 +174,7 @@ const onIntrastatCreated = (response, formData) => {
                     v-model.number="data.weightByPiece"
                     :min="0"
                     type="number"
+                    :required="true"
                 />
                 <VnInput
                     :label="t('basicData.boxUnits')"

From 339fba72a799886ea26ec47040901e2d373c2335 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 8 Jul 2024 14:15:24 +0200
Subject: [PATCH 04/40] updates

---
 src/components/common/VnInput.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 5df3b7a11..2b2334c6a 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -65,6 +65,7 @@ const mixinRules = [
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
+        {{ $attrs }}
         <QInput
             ref="vnInputRef"
             v-model="value"
@@ -73,7 +74,7 @@ const mixinRules = [
             :class="{ required: $attrs.required }"
             @keyup.enter="emit('keyup.enter')"
             :clearable="false"
-            :rules="$attrs.required || $attrs.min ? mixinRules : null"
+            :rules="$attrs.required ? [...($attrs?.rules ?? []), ...mixinRules] : null"
             :lazy-rules="true"
             hide-bottom-space
         >

From 8c744fac5abae73d8edf2543f87a4e465afb8d5d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 9 Jul 2024 12:51:01 +0200
Subject: [PATCH 05/40] refactor: refs #7354 Zone migration changes

---
 src/pages/Zone/Card/ZoneDescriptor.vue        |   1 -
 .../Zone/Card/ZoneDescriptorMenuItems.vue     |   2 +-
 .../Zone/Card/ZoneEventExclusionForm.vue      |   1 +
 src/pages/Zone/Card/ZoneEvents.vue            |   4 +-
 src/pages/Zone/ZoneDeliveryPanel.vue          |   8 +-
 src/pages/Zone/ZoneList.vue                   | 191 +++++++-----------
 src/pages/Zone/ZoneMain.vue                   |   2 +-
 src/pages/Zone/ZoneUpcoming.vue               |   8 +-
 src/pages/Zone/locale/en.yml                  |   2 +
 src/pages/Zone/locale/es.yml                  |   2 +
 10 files changed, 91 insertions(+), 130 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 602fefde3..04fb22ba5 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -52,7 +52,6 @@ const setData = (entity) => {
         :filter="filter"
         @on-fetch="setData"
         data-key="zoneData"
-        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 8f1168ce9..62d7cafdd 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -40,7 +40,7 @@ const actions = {
     },
     remove: async () => {
         try {
-            await axios.post(`Zones/${zoneId}/setDeleted`);
+            await axios.delete(`Zones/${zoneId}`);
 
             notify({ message: t('Zone deleted'), type: 'positive' });
             notify({
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 721f4bbc3..9c325e047 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -116,6 +116,7 @@ const closeForm = () => emit('closeForm');
 const refetchEvents = async () => {
     await arrayData.refresh({ append: false });
     closeForm();
+    // window.location.reload();
 };
 
 onMounted(() => {
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index e4fe5ff22..8c26a808c 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -13,8 +13,8 @@ import { reactive } from 'vue';
 const { t } = useI18n();
 const stateStore = useStateStore();
 
-const firstDay = ref(null);
-const lastDay = ref(null);
+const firstDay = ref();
+const lastDay = ref();
 
 const events = ref([]);
 const formModeName = ref('include');
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 03f534701..8041e1a29 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -113,13 +113,7 @@ onMounted(async () => {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="
-                    t(
-                        deliveryMethodFk === 'delivery'
-                            ? 'deliveryPanel.agency'
-                            : 'deliveryPanel.warehouse'
-                    )
-                "
+                :label="t('deliveryPanel.agency')"
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 0932a0b57..04b973d8d 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -1,73 +1,95 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { onMounted, computed } from 'vue';
+import { computed, ref } from 'vue';
+import axios from 'axios';
+
 import { toCurrency } from 'src/filters';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toTimeFormat } from 'src/filters/date';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
-import { useStateStore } from 'stores/useStateStore';
-import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import ZoneFilterPanel from './ZoneFilterPanel.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
 const { viewSummary } = useSummaryDialog();
 const { openConfirmationModal } = useVnConfirm();
-
-const redirectToZoneSummary = (event, { id }) => {
-    router.push({ name: 'ZoneSummary', params: { id } });
-};
+const tableRef = ref();
+const tableFilter = ref({
+    include: [
+        {
+            relation: 'agencyMode',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+});
 
 const columns = computed(() => [
     {
-        name: 'ID',
-        label: t('list.id'),
-        field: (row) => row.id,
-        sortable: true,
         align: 'left',
+        name: 'id',
+        label: t('list.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
+        align: 'left',
         name: 'name',
         label: t('list.name'),
-        field: (row) => row.name,
-        sortable: true,
-        align: 'left',
+        isTitle: true,
     },
     {
-        name: 'agency',
+        align: 'left',
+        name: 'agencyModeFk',
         label: t('list.agency'),
-        field: (row) => row?.agencyMode?.name,
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row) => row?.agencyMode?.name,
     },
     {
-        name: 'close',
+        align: 'left',
+        name: 'hour',
         label: t('list.close'),
-        field: (row) => (row?.hour ? toTimeFormat(row?.hour) : '-'),
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
+        format: (row) => toTimeFormat(row.hour),
     },
     {
+        align: 'left',
         name: 'price',
         label: t('list.price'),
-        field: (row) => (row?.price ? toCurrency(row.price) : '-'),
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
+        format: (row) => toCurrency(row.price),
     },
     {
-        name: 'actions',
-        label: '',
-        sortable: false,
         align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('ZoneSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ZoneSummary),
+            },
+            {
+                title: t('globals.clone'),
+                icon: 'vn:clone',
+                action: (row) => handleClone(row.id),
+                isPrimary: true,
+            },
+        ],
     },
 ]);
 
@@ -83,88 +105,23 @@ const handleClone = (id) => {
         () => clone(id)
     );
 };
-onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="ZoneList"
-                url="Zones"
-                :filter="{
-                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
-                }"
-                :limit="20"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <div class="q-pa-md">
-                        <QTable
-                            :rows="rows"
-                            :columns="columns"
-                            row-key="clientId"
-                            class="full-width"
-                            @row-click="redirectToZoneSummary"
-                        >
-                            <template #header="props">
-                                <QTr :props="props" class="bg">
-                                    <QTh
-                                        v-for="col in props.cols"
-                                        :key="col.name"
-                                        :props="props"
-                                    >
-                                        {{ t(col.label) }}
-                                        <QTooltip v-if="col.tooltip">{{
-                                            col.tooltip
-                                        }}</QTooltip>
-                                    </QTh>
-                                </QTr>
-                            </template>
-
-                            <template #body-cell="props">
-                                <QTd :props="props">
-                                    <QTr :props="props" class="cursor-pointer">
-                                        {{ props.value }}
-                                    </QTr>
-                                </QTd>
-                            </template>
-                            <template #body-cell-actions="props">
-                                <QTd :props="props" class="q-gutter-x-sm">
-                                    <QIcon
-                                        name="vn:clone"
-                                        size="sm"
-                                        color="primary"
-                                        @click.stop="handleClone(props.row.id)"
-                                    >
-                                        <QTooltip>{{ t('globals.clone') }}</QTooltip>
-                                    </QIcon>
-                                    <QIcon
-                                        name="preview"
-                                        size="sm"
-                                        color="primary"
-                                        @click.stop="
-                                            viewSummary(props.row.id, ZoneSummary)
-                                        "
-                                    >
-                                        <QTooltip>{{ t('Preview') }}</QTooltip>
-                                    </QIcon>
-                                </QTd>
-                            </template>
-                        </QTable>
-                    </div>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn :to="{ path: `/zone/create` }" fab icon="add" color="primary">
-                <QTooltip>{{ t('list.create') }}</QTooltip>
-            </QBtn>
-        </QPageSticky>
-    </QPage>
+    <VnTable
+        ref="tableRef"
+        data-key="ZoneList"
+        url="Zones"
+        :filter="tableFilter"
+        :columns="columns"
+        default-mode="table"
+        redirect="zone"
+        :use-model="true"
+        auto-load
+    />
+    <QPageSticky position="bottom-right" :offset="[18, 18]" style="z-index: 2">
+        <QBtn :to="{ path: `/zone/create` }" fab icon="add" color="primary">
+            <QTooltip>{{ t('list.create') }}</QTooltip>
+        </QBtn>
+    </QPageSticky>
 </template>
diff --git a/src/pages/Zone/ZoneMain.vue b/src/pages/Zone/ZoneMain.vue
index 68ff9a5d1..4bfda1557 100644
--- a/src/pages/Zone/ZoneMain.vue
+++ b/src/pages/Zone/ZoneMain.vue
@@ -39,7 +39,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="ZoneList"
+        data-key="Zones"
         url="Zones"
         :filter="{
             include: { relation: 'agencyMode', scope: { fields: ['name'] } },
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index be7b12534..76f464e02 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -63,7 +63,13 @@ onMounted(() => weekdayStore.initStore());
                 <span class="header">
                     {{ getHeaderTitle(detail.shipped) }}
                 </span>
-                <QTable flat :columns="columns" :rows="detail.lines" class="full-width" />
+                <QTable
+                    flat
+                    :columns="columns"
+                    :rows="detail.lines"
+                    class="full-width"
+                    style="text-align: center"
+                />
             </div>
         </QCard>
     </QPage>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 31eeb2b7f..3f4871982 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -30,6 +30,8 @@ create:
     price: Price
     bonus: Bonus
     volumetric: Volumetric
+    itemMaxSize: Max m³
+    inflation: Inflation
 summary:
     agency: Agency
     price: Price
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index c670c2c08..29f036000 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -30,6 +30,8 @@ create:
     price: Precio
     bonus: Bonificación
     volumetric: Volumétrico
+    itemMaxSize: Medida máxima
+    inflation: Inflación
 summary:
     agency: Agencia
     price: Precio

From 0b135bbd526cbf9d546896b5d566cf6c1754ce15 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 9 Jul 2024 12:54:42 +0200
Subject: [PATCH 06/40] fix: refs #7354 fix delivery days

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

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 8041e1a29..8f3ad69d7 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -113,9 +113,19 @@ onMounted(async () => {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="t('deliveryPanel.agency')"
+                :label="
+                    t(
+                        deliveryMethodFk === 'delivery'
+                            ? 'deliveryPanel.agency'
+                            : 'deliveryPanel.warehouse'
+                    )
+                "
                 v-model="formData.agencyModeFk"
-                url="AgencyModes/isActive"
+                :url="
+                    deliveryMethodFk === 'delivery'
+                        ? 'AgencyModes/isActive'
+                        : 'Warehouses'
+                "
                 :fields="['id', 'name']"
                 :where="{
                     deliveryMethodFk: { inq: deliveryMethods },

From 8913c6a31b15a11dc9fd54570370f7d4d0dea0f8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 10 Jul 2024 09:37:32 +0200
Subject: [PATCH 07/40] fix: refs #7354 fix VnTable filters and agency field

---
 src/pages/Zone/ZoneList.vue     | 56 ++++++++++++++++++++++++++-------
 src/pages/Zone/ZoneUpcoming.vue |  8 +----
 src/pages/Zone/locale/en.yml    |  6 ++++
 src/pages/Zone/locale/es.yml    |  6 ++++
 4 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 04b973d8d..9c7036b94 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -11,6 +11,9 @@ import useNotify from 'src/composables/useNotify.js';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -18,7 +21,9 @@ const { notify } = useNotify();
 const { viewSummary } = useSummaryDialog();
 const { openConfirmationModal } = useVnConfirm();
 const tableRef = ref();
-const tableFilter = ref({
+const warehouseOptions = ref([]);
+
+const tableFilter = {
     include: [
         {
             relation: 'agencyMode',
@@ -27,7 +32,7 @@ const tableFilter = ref({
             },
         },
     ],
-});
+};
 
 const columns = computed(() => [
     {
@@ -44,21 +49,22 @@ const columns = computed(() => [
         name: 'name',
         label: t('list.name'),
         isTitle: true,
+        create: true,
     },
     {
         align: 'left',
         name: 'agencyModeFk',
         label: t('list.agency'),
         cardVisible: true,
+        create: true,
         component: 'select',
         attrs: {
-            url: 'agencyModes',
-            fields: ['id', 'name'],
+            url: 'AgencyModes',
         },
         columnField: {
             component: null,
         },
-        format: (row) => row?.agencyMode?.name,
+        format: (row, dashIfEmpty) => dashIfEmpty(row?.agencyMode?.name),
     },
     {
         align: 'left',
@@ -112,16 +118,42 @@ const handleClone = (id) => {
         ref="tableRef"
         data-key="ZoneList"
         url="Zones"
-        :filter="tableFilter"
+        :create="{
+            urlCreate: 'Zones',
+            title: t('list.createZone'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        :user-filter="tableFilter"
         :columns="columns"
         default-mode="table"
         redirect="zone"
         :use-model="true"
         auto-load
-    />
-    <QPageSticky position="bottom-right" :offset="[18, 18]" style="z-index: 2">
-        <QBtn :to="{ path: `/zone/create` }" fab icon="add" color="primary">
-            <QTooltip>{{ t('list.create') }}</QTooltip>
-        </QBtn>
-    </QPageSticky>
+    >
+        <template #more-create-dialog="{ data }">
+            <VnInput v-model="data.price" :label="t('list.price')" min="0" />
+            <VnInput v-model="data.bonus" :label="t('list.bonus')" min="0" />
+            <VnInput
+                v-model="data.travelingDays"
+                :label="t('list.travelingDays')"
+                type="number"
+                min="0"
+            />
+            <VnInputTime v-model="data.hour" :label="t('list.hour')" />
+            <VnSelect
+                url="Warehouses"
+                v-model="data.warehouseFK"
+                option-value="id"
+                option-label="name"
+                :label="t('list.warehouse')"
+                :options="warehouseOptions"
+            />
+            <QCheckbox
+                v-model="data.isVolumetric"
+                :label="t('list.isVolumetric')"
+                :toggle-indeterminate="false"
+            />
+        </template>
+    </VnTable>
 </template>
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index 76f464e02..be7b12534 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -63,13 +63,7 @@ onMounted(() => weekdayStore.initStore());
                 <span class="header">
                     {{ getHeaderTitle(detail.shipped) }}
                 </span>
-                <QTable
-                    flat
-                    :columns="columns"
-                    :rows="detail.lines"
-                    class="full-width"
-                    style="text-align: center"
-                />
+                <QTable flat :columns="columns" :rows="detail.lines" class="full-width" />
             </div>
         </QCard>
     </QPage>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 3f4871982..49ad3448b 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -21,6 +21,12 @@ list:
     searchInfo: Search zone by id or name
     confirmCloneTitle: All it's properties will be copied
     confirmCloneSubtitle: Do you want to clone this zone?
+    travelingDays: Traveling days
+    warehouse: Warehouse
+    bonus: Bonus
+    hour: Close
+    isVolumetric: Volumetric
+    createZone: Create zone
 create:
     name: Name
     warehouse: Warehouse
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 29f036000..dd673ec8d 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -21,6 +21,12 @@ list:
     searchInfo: Buscar zonas por identificador o nombre
     confirmCloneTitle: Todas sus propiedades serán copiadas
     confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
+    travelingDays: Días de viaje
+    warehouse: Almacén
+    bonus: Bonus
+    hour: Cierre
+    isVolumetric: Volumétrico
+    createZone: Crear zona
 create:
     name: Nombre
     warehouse: Almacén

From d7f8b11da796a70b9c545b04efe8a98ad9cf3608 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 10 Jul 2024 15:40:38 +0200
Subject: [PATCH 08/40] fix: refs #7354 requested changes

---
 src/pages/Zone/Card/ZoneDescriptorMenuItems.vue | 2 +-
 src/pages/Zone/Card/ZoneEventExclusionForm.vue  | 1 -
 src/pages/Zone/ZoneList.vue                     | 2 +-
 src/pages/Zone/locale/en.yml                    | 1 -
 src/pages/Zone/locale/es.yml                    | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 62d7cafdd..f549bb8d4 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -40,7 +40,7 @@ const actions = {
     },
     remove: async () => {
         try {
-            await axios.delete(`Zones/${zoneId}`);
+            await axios.post(`Zones/${zoneId}/deleteZone`);
 
             notify({ message: t('Zone deleted'), type: 'positive' });
             notify({
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 9c325e047..721f4bbc3 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -116,7 +116,6 @@ const closeForm = () => emit('closeForm');
 const refetchEvents = async () => {
     await arrayData.refresh({ append: false });
     closeForm();
-    // window.location.reload();
 };
 
 onMounted(() => {
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 9c7036b94..033aecab7 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -140,7 +140,7 @@ const handleClone = (id) => {
                 type="number"
                 min="0"
             />
-            <VnInputTime v-model="data.hour" :label="t('list.hour')" />
+            <VnInputTime v-model="data.hour" :label="t('list.close')" />
             <VnSelect
                 url="Warehouses"
                 v-model="data.warehouseFK"
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 49ad3448b..db2ef4ac4 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -24,7 +24,6 @@ list:
     travelingDays: Traveling days
     warehouse: Warehouse
     bonus: Bonus
-    hour: Close
     isVolumetric: Volumetric
     createZone: Create zone
 create:
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index dd673ec8d..34cda2c15 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -24,7 +24,6 @@ list:
     travelingDays: Días de viaje
     warehouse: Almacén
     bonus: Bonus
-    hour: Cierre
     isVolumetric: Volumétrico
     createZone: Crear zona
 create:

From 74bc4eb7db9711559b938fc8b2a972e75f531634 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 11 Jul 2024 07:13:54 +0200
Subject: [PATCH 09/40] refactor: refs #7354 reverse deliveryPanel changes

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 8f3ad69d7..03f534701 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -121,11 +121,7 @@ onMounted(async () => {
                     )
                 "
                 v-model="formData.agencyModeFk"
-                :url="
-                    deliveryMethodFk === 'delivery'
-                        ? 'AgencyModes/isActive'
-                        : 'Warehouses'
-                "
+                url="AgencyModes/isActive"
                 :fields="['id', 'name']"
                 :where="{
                     deliveryMethodFk: { inq: deliveryMethods },

From c016e9690430830e6e20ce8fcfa02db0d404163a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 15 Jul 2024 10:44:28 +0200
Subject: [PATCH 10/40] fix: refs #7354 fix VnSearchbar search for zone section
 & finished basic tests

---
 src/components/common/VnCard.vue              |  2 +
 src/components/ui/VnSearchbar.vue             | 39 ++++++++++++----
 src/pages/Zone/Card/ZoneCard.vue              | 26 +++--------
 src/pages/Zone/Card/ZoneWarehouses.vue        |  2 +-
 src/pages/Zone/ZoneFilterPanel.vue            |  1 +
 src/pages/Zone/ZoneList.vue                   |  8 ++++
 src/pages/Zone/ZoneMain.vue                   | 43 ------------------
 .../integration/zone/zoneBasicData.spec.js    | 23 ++++++++++
 .../integration/zone/zoneCreate.spec.js       | 45 +++++++++++++++++++
 .../cypress/integration/zone/zoneList.spec.js | 19 ++++++++
 .../integration/zone/zoneWarehouse.spec.js    | 34 ++++++++++++++
 test/cypress/support/commands.js              |  6 +++
 12 files changed, 175 insertions(+), 73 deletions(-)
 create mode 100644 test/cypress/integration/zone/zoneBasicData.spec.js
 create mode 100644 test/cypress/integration/zone/zoneCreate.spec.js
 create mode 100644 test/cypress/integration/zone/zoneList.spec.js
 create mode 100644 test/cypress/integration/zone/zoneWarehouse.spec.js

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 17fa74317..a352a6849 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -20,6 +20,7 @@ const props = defineProps({
     searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
+    searchKey: { type: String, default: 'search' },
     searchCustomRouteRedirect: { type: String, default: undefined },
     searchRedirect: { type: Boolean, default: true },
     searchMakeFetch: { type: Boolean, default: true },
@@ -72,6 +73,7 @@ if (props.baseUrl) {
             :info="props.searchbarInfo"
             :custom-route-redirect-name="searchCustomRouteRedirect"
             :redirect="searchRedirect"
+            :search-key="searchKey"
         />
     </slot>
     <slot v-else name="searchbar" />
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 0c7a8a3f6..6dd2f5f4b 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -61,15 +61,23 @@ const props = defineProps({
     },
     customRouteRedirectName: {
         type: String,
-        default: '',
+        default: null,
     },
     makeFetch: {
         type: Boolean,
         default: true,
     },
+    searchKey: {
+        type: String,
+        default: 'search',
+    },
+    isQueryFilter: {
+        type: Boolean,
+        default: false,
+    },
 });
 
-const searchText = ref('');
+const searchText = ref();
 let arrayDataProps = { ...props };
 if (props.redirect)
     arrayDataProps = {
@@ -105,13 +113,26 @@ async function search() {
     );
     arrayData.reset(['skip', 'page']);
 
-    if (props.makeFetch)
-        await arrayData.applyFilter({
-            params: {
-                ...Object.fromEntries(staticParams),
-                search: searchText.value,
-            },
-        });
+    if (props.isQueryFilter) {
+        if (props.makeFetch)
+            await arrayData.applyFilter({
+                params: {
+                    ...Object.fromEntries(staticParams),
+                },
+                filter: {
+                    where: {
+                        name: searchText.value == '' ? undefined : searchText.value,
+                    },
+                },
+            });
+    } else {
+        if (props.makeFetch)
+            await arrayData.applyFilter({
+                params: {
+                    ...Object.fromEntries(staticParams),
+                },
+            });
+    }
 }
 </script>
 <template>
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index f92ee1e4e..54f0f92a7 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,36 +1,22 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
 
 import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
+import ZoneFilterPanel from '../ZoneFilterPanel.vue';
 
 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => {
-    if (routeName.value === 'ZoneLocations') return null;
-    return routeName.value;
-});
-const searchbarMakeFetch = computed(() => routeName.value !== 'ZoneEvents');
-const searchBarDataKeys = {
-    ZoneWarehouses: 'ZoneWarehouses',
-    ZoneSummary: 'ZoneSummary',
-    ZoneLocations: 'ZoneLocations',
-    ZoneEvents: 'ZoneEvents',
-};
 </script>
 
 <template>
     <VnCard
         data-key="Zone"
+        base-url="Zones"
+        search-url="Zones"
+        search-key="name"
         :descriptor="ZoneDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
-        :search-redirect="!!customRouteRedirectName"
-        :search-make-fetch="searchbarMakeFetch"
+        :filter-panel="ZoneFilterPanel"
+        :search-data-key="'ZoneList'"
         :searchbar-label="t('list.searchZone')"
         :searchbar-info="t('list.searchInfo')"
     />
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 196333d08..1d28bf391 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -14,7 +14,7 @@ const { t } = useI18n();
 const route = useRoute();
 const { openConfirmationModal } = useVnConfirm();
 
-const paginateRef = ref(null);
+const paginateRef = ref();
 const createWarehouseDialogRef = ref(null);
 
 const arrayData = useArrayData('ZoneWarehouses');
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index c84355eb0..25c55d75c 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -27,6 +27,7 @@ const agencies = ref([]);
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
+        search-url="table"
     >
         <template #tags="{ tag }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 033aecab7..2e65ab39f 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -14,6 +14,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -114,6 +115,13 @@ const handleClone = (id) => {
 </script>
 
 <template>
+    <VnSearchbar
+        search-key="name"
+        data-key="ZoneList"
+        :label="t('Search claim')"
+        :info="t('You can search by claim id or customer name')"
+        :is-query-filter="true"
+    />
     <VnTable
         ref="tableRef"
         data-key="ZoneList"
diff --git a/src/pages/Zone/ZoneMain.vue b/src/pages/Zone/ZoneMain.vue
index 4bfda1557..66ce78f23 100644
--- a/src/pages/Zone/ZoneMain.vue
+++ b/src/pages/Zone/ZoneMain.vue
@@ -1,54 +1,11 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
-const { t } = useI18n();
 const stateStore = useStateStore();
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'agencyModeFk':
-            return {
-                agencyModeFk: value,
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        name: {
-                            like: `%${value}%`,
-                        },
-                    };
-                }
-            }
-    }
-};
 </script>
 
 <template>
-    <VnSearchbar
-        data-key="Zones"
-        url="Zones"
-        :filter="{
-            include: { relation: 'agencyMode', scope: { fields: ['name'] } },
-        }"
-        :expr-builder="exprBuilder"
-        :label="t('list.searchZone')"
-        :info="t('list.searchInfo')"
-        custom-route-redirect-name="ZoneSummary"
-    />
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
             <LeftMenu />
diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
new file mode 100644
index 000000000..18b1842a4
--- /dev/null
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -0,0 +1,23 @@
+describe('ZoneCreate', () => {
+    const notification = '.q-notification__message';
+
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/zone/4/basic-data');
+    });
+
+    it('should throw an error if the name is empty', () => {
+        cy.get('.q-card > :nth-child(1)').click();
+        cy.get('.q-card > :nth-child(1)').clear();
+        cy.get('.q-btn-group > .q-btn--standard').click();
+        cy.get(notification).should('contains.text', "can't be blank");
+    });
+
+    it("should edit the basicData's zone", () => {
+        cy.get('.q-card > :nth-child(1)').click();
+        cy.get('.q-card > :nth-child(1)').type(' modified');
+        cy.get('.q-btn-group > .q-btn--standard').click();
+        cy.get(notification).should('contains.text', 'Data saved');
+    });
+});
diff --git a/test/cypress/integration/zone/zoneCreate.spec.js b/test/cypress/integration/zone/zoneCreate.spec.js
new file mode 100644
index 000000000..668c485e7
--- /dev/null
+++ b/test/cypress/integration/zone/zoneCreate.spec.js
@@ -0,0 +1,45 @@
+describe('ZoneCreate', () => {
+    const notification = '.q-notification__message';
+
+    const data = {
+        Name: { val: 'Zone pickup D' },
+        Price: { val: '3' },
+        Bonus: { val: '0' },
+        'Traveling days': { val: '0' },
+        Close: {
+            val: {
+                h: '10',
+                m: '0',
+                x: 'PM',
+            },
+            type: 'time',
+            day: 11,
+        },
+        Warehouse: { val: 'Algemesi', type: 'select' },
+        Volumetric: { val: 'true', type: 'checkbox' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/zone/list');
+        cy.get('.q-page-sticky > div > .q-btn').click();
+    });
+
+    it('should throw an error if an agency has not been selected', () => {
+        cy.fillInForm({
+            ...data,
+        });
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.get(notification).should('contains.text', 'Agency cannot be blank');
+    });
+
+    it('should create a zone', () => {
+        cy.fillInForm({
+            ...data,
+            Agency: { val: 'inhouse pickup', type: 'select' },
+        });
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.get(notification).should('contains.text', 'Data created');
+    });
+});
diff --git a/test/cypress/integration/zone/zoneList.spec.js b/test/cypress/integration/zone/zoneList.spec.js
new file mode 100644
index 000000000..030250d74
--- /dev/null
+++ b/test/cypress/integration/zone/zoneList.spec.js
@@ -0,0 +1,19 @@
+describe('ZoneList', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/zone/list');
+    });
+
+    it('should filter by agency', () => {
+        cy.get('.bg-header > :nth-child(3) > .full-width > :nth-child(1) >').type(
+            '{downArrow}{enter}'
+        );
+    });
+
+    it('should open the zone summary', () => {
+        cy.get('.bg-header > :nth-child(2) > .full-width > :nth-child(1) >').type(
+            'zone refund{enter}'
+        );
+    });
+});
diff --git a/test/cypress/integration/zone/zoneWarehouse.spec.js b/test/cypress/integration/zone/zoneWarehouse.spec.js
new file mode 100644
index 000000000..3ffa3f69d
--- /dev/null
+++ b/test/cypress/integration/zone/zoneWarehouse.spec.js
@@ -0,0 +1,34 @@
+describe('ZoneWarehouse', () => {
+    const data = {
+        Warehouse: { val: 'Algemesi', type: 'select' },
+    };
+    const deviceProductionField =
+        '.vn-row > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
+    const dataError = "ER_DUP_ENTRY: Duplicate entry '2-2' for key 'zoneFk'";
+
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#/zone/2/warehouses`);
+    });
+
+    it('should throw an error if the warehouse chosen is already put in the zone', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(deviceProductionField).click();
+        cy.get(deviceProductionField).type('{upArrow}{enter}');
+        cy.get('.q-notification__message').should('have.text', dataError);
+    });
+
+    it('should create a warehouse', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(deviceProductionField).click();
+        cy.fillInForm(data);
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+    });
+
+    it('should delete a warehouse', () => {
+        cy.get('tbody > :nth-child(2) > :nth-child(2) > .q-icon').click();
+        cy.get('.q-card__actions > .q-btn--flat > .q-btn__content').click();
+        cy.reload();
+    });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 38a23f71c..33cc666f5 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -108,6 +108,12 @@ Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
                             .eq(day ? day - 1 : 0)
                             .click();
                         break;
+                    case 'time':
+                        cy.wrap(el).click();
+                        cy.get('.q-time .q-time__clock').contains(val.h).click();
+                        cy.get('.q-time .q-time__clock').contains(val.m).click();
+                        cy.get('.q-time .q-time__link').contains(val.x).click();
+                        break;
                     default:
                         cy.wrap(el).type(val);
                         break;

From fb2e3f1f9c99255ce6fe5430ee3ac710ec81c6d7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jul 2024 11:25:06 +0200
Subject: [PATCH 11/40] feat: required validation

---
 src/composables/useValidator.js | 5 +++--
 src/i18n/locale/en.yml          | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index a07f3e985..7a7032608 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -46,6 +46,9 @@ export function useValidator() {
 
                 return !validator.isEmpty(value ? String(value) : '') || message;
             },
+            required: (required, value) => {
+                return required ? !!value || t('globals.fieldRequired') : null;
+            },
             length: (value) => {
                 const options = {
                     min: validation.min || validation.is,
@@ -78,11 +81,9 @@ export function useValidator() {
             custom: (value) => validation.bindedFunction(value) || 'Invalid value',
         };
     };
-    // const requiredFieldRule = [(val) => validations({}).presence(val)];
 
     return {
         validate,
-        // requiredFieldRule,
         validations,
         models,
     };
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 84a0f3edc..9bcb3f921 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -67,6 +67,7 @@ globals:
     allRows: 'All { numberRows } row(s)'
     markAll: Mark all
     requiredField: Required field
+    valueCantBeEmpty: Value cannot be empty
     class: clase
     type: Type
     reason: reason
@@ -75,7 +76,7 @@ globals:
     notificationSent: Notification sent
     warehouse: Warehouse
     company: Company
-    fieldRequired: Field requdired
+    fieldRequired: Field required
     allowedFilesText: 'Allowed file types: { allowedContentTypes }'
     smsSent: SMS sent
     confirmDeletion: Confirm deletion

From bd359d13e408cdda72b681f9a045f2c925396625 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jul 2024 11:25:21 +0200
Subject: [PATCH 12/40] feat: vnInput*

---
 src/components/common/VnInput.vue     | 11 +++++++++--
 src/components/common/VnInputDate.vue | 11 +++++++++--
 src/components/common/VnInputTime.vue | 12 ++++++++----
 src/components/common/VnSelect.vue    |  9 ++++-----
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index da7f0d0b7..8c334e573 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useValidator } from 'src/composables/useValidator';
 
 const emit = defineEmits([
     'update:modelValue',
@@ -27,9 +28,11 @@ const $props = defineProps({
         default: true,
     },
 });
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+
 const vnInputRef = ref(null);
 const value = computed({
     get() {
@@ -57,11 +60,15 @@ const focus = () => {
 defineExpose({
     focus,
 });
+import { useAttrs } from 'vue';
+const $attrs = useAttrs();
 
 const mixinRules = [
     requiredFieldRule,
+    ...($attrs.rules ?? []),
     (val) => {
         const { min } = vnInputRef.value.$attrs;
+        if (!min) return null;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
     },
 ];
@@ -78,7 +85,7 @@ const mixinRules = [
             :class="{ required: $attrs.required }"
             @keyup.enter="emit('keyup.enter')"
             :clearable="false"
-            :rules="$attrs.required ? [...($attrs?.rules ?? []), ...mixinRules] : null"
+            :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
         >
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 72898483f..4fcfcce9b 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -2,6 +2,7 @@
 import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: String });
 const $props = defineProps({
@@ -10,9 +11,11 @@ const $props = defineProps({
         default: false,
     },
 });
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
@@ -78,6 +81,9 @@ watch(
     (val) => (formattedDate.value = val),
     { immediate: true }
 );
+const $attrs = useAttrs();
+
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 </script>
 
 <template>
@@ -89,9 +95,10 @@ watch(
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
             :clearable="false"
         >
+            {{ $attrs }}
             <template #append>
                 <QIcon
                     name="close"
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index def5dda51..afc1456ae 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,7 +1,9 @@
 <script setup>
 import { watch, computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: String });
 const props = defineProps({
@@ -14,8 +16,10 @@ const props = defineProps({
         default: false,
     },
 });
-const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const $attrs = useAttrs();
+
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
 const dateFormat = 'HH:mm';
 const isPopupOpen = ref();
@@ -73,7 +77,7 @@ watch(
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
             style="min-width: 100px"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
         >
             <template #append>
                 <QIcon
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index d33361c05..192fead44 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -69,10 +69,10 @@ const $props = defineProps({
     },
 });
 
-const requiredFieldRule = (val) => validations({}).presence(val);
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 const $attrs = useAttrs();
-const mixinRules = () =>
-    $attrs.required ? [$attrs?.rules ?? [], requiredFieldRule] : null;
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
+
 const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
@@ -116,7 +116,6 @@ function setOptions(data) {
 }
 
 onMounted(() => {
-    console.log(vnSelectRef.value.rules);
     setOptions(options.value);
     if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
 });
@@ -216,7 +215,7 @@ watch(modelValue, (newValue) => {
         fill-input
         ref="vnSelectRef"
         lazy-rules
-        :rules="mixinRules()"
+        :rules="mixinRules"
         :class="{ required: $attrs.required }"
         virtual-scroll-slice-size="options.length"
     >

From 734f8807ff4d3c99418b24bfe1e05bac778e5c63 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jul 2024 11:25:28 +0200
Subject: [PATCH 13/40] perf: examples

---
 src/components/CreateBankEntityForm.vue         | 15 ++++++---------
 src/pages/Customer/Card/CustomerBillingData.vue |  7 +------
 src/pages/Entry/EntryCreate.vue                 |  1 +
 src/pages/Ticket/TicketCreate.vue               |  4 +++-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 7b0202b36..d5a5f38b1 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -53,12 +53,15 @@ onMounted(async () => {
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput :label="t('name')" v-model="data.name" :required="true" />
+                <VnInput
+                    :label="t('name')"
+                    v-model="data.name"
+                    :rules="validate('bankEntity.name')"
+                />
                 <VnInput
                     ref="bicInputRef"
                     :label="t('swift')"
                     v-model="data.bic"
-                    :required="true"
                     :rules="validate('bankEntity.bic')"
                 />
             </VnRow>
@@ -71,17 +74,11 @@ onMounted(async () => {
                         option-value="id"
                         option-label="name"
                         hide-selected
-                        :required="true"
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
                 <div v-if="showEntityField" class="col">
-                    <VnInput
-                        :label="t('id')"
-                        v-model="data.id"
-                        :required="true"
-                        :rules="validate('city.name')"
-                    />
+                    <VnInput :label="t('id')" v-model="data.id" :required="true" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 9da52988b..63bbd872c 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -56,12 +56,7 @@ const getBankEntities = (data, formData) => {
                     option-value="id"
                     v-model="data.payMethod"
                 />
-                <VnInput
-                    :label="t('Due day')"
-                    clearable
-                    v-model="data.dueDay"
-                    :required="true"
-                />
+                <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index cb0fae3ad..4f2d13643 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -88,6 +88,7 @@ const redirectToEntryBasicData = (_, { id }) => {
                         option-label="nickname"
                         hide-selected
                         :required="true"
+                        :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 16f5a2a40..79a68c8b5 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -130,7 +130,7 @@ const redirectToTicketList = (_, { id }) => {
             :form-initial-data="initialFormState"
             @on-data-saved="redirectToTicketList"
         >
-            <template #form="{ data }">
+            <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnSelect
@@ -140,6 +140,7 @@ const redirectToTicketList = (_, { id }) => {
                             option-value="id"
                             option-label="name"
                             hide-selected
+                            :required="true"
                             @update:model-value="(client) => onClientSelected(data)"
                         >
                             <template #option="scope">
@@ -190,6 +191,7 @@ const redirectToTicketList = (_, { id }) => {
                             placeholder="dd-mm-aaa"
                             :label="t('ticket.create.landed')"
                             v-model="data.landed"
+                            :rules="validate('ticket.shipped')"
                             @update:model-value="() => fetchAvailableAgencies(data)"
                         />
                     </div>

From fabf9a2024a42ed82a5248e9177c524aa9a0143a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jul 2024 11:26:13 +0200
Subject: [PATCH 14/40] perf: remove print variables

---
 src/components/common/VnInput.vue     | 1 -
 src/components/common/VnInputDate.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 8c334e573..75d4b8a28 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -76,7 +76,6 @@ const mixinRules = [
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
-        {{ $attrs }}
         <QInput
             ref="vnInputRef"
             v-model="value"
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 4fcfcce9b..05f7c52d1 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -98,7 +98,6 @@ const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
             :rules="mixinRules"
             :clearable="false"
         >
-            {{ $attrs }}
             <template #append>
                 <QIcon
                     name="close"

From e60f84646457ee682734a98ee523aa76c206bde3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 19 Jul 2024 12:11:00 +0200
Subject: [PATCH 15/40] refactor: refs #7354 fix tableFilters

---
 src/pages/Zone/Card/ZoneCard.vue |  7 ++---
 src/pages/Zone/ZoneList.vue      | 51 +++++++++++++++++++++-----------
 src/pages/Zone/locale/en.yml     |  1 +
 src/pages/Zone/locale/es.yml     |  1 +
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 54f0f92a7..50b8e2303 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -10,13 +10,12 @@ const { t } = useI18n();
 
 <template>
     <VnCard
-        data-key="Zone"
+        data-key="zone"
         base-url="Zones"
-        search-url="Zones"
-        search-key="name"
         :descriptor="ZoneDescriptor"
         :filter-panel="ZoneFilterPanel"
-        :search-data-key="'ZoneList'"
+        search-data-key="ZoneList"
+        search-url="Zones"
         :searchbar-label="t('list.searchZone')"
         :searchbar-info="t('list.searchInfo')"
     />
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 2e65ab39f..b557cacf7 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -44,6 +44,9 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -51,6 +54,9 @@ const columns = computed(() => [
         label: t('list.name'),
         isTitle: true,
         create: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -58,35 +64,42 @@ const columns = computed(() => [
         label: t('list.agency'),
         cardVisible: true,
         create: true,
-        component: 'select',
-        attrs: {
-            url: 'AgencyModes',
+        columnFilter: {
+            component: 'select',
+            inWhere: true,
+            attrs: {
+                url: 'AgencyModes',
+            },
         },
         columnField: {
             component: null,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row?.agencyMode?.name),
     },
-    {
-        align: 'left',
-        name: 'hour',
-        label: t('list.close'),
-        cardVisible: true,
-        format: (row) => toTimeFormat(row.hour),
-    },
     {
         align: 'left',
         name: 'price',
         label: t('list.price'),
         cardVisible: true,
         format: (row) => toCurrency(row.price),
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'hour',
+        label: t('list.close'),
+        cardVisible: true,
+        format: (row) => toTimeFormat(row.hour),
+        hidden: true,
     },
     {
         align: 'right',
         name: 'tableActions',
         actions: [
             {
-                title: t('ZoneSummary'),
+                title: t('list.zoneSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, ZoneSummary),
             },
@@ -116,15 +129,14 @@ const handleClone = (id) => {
 
 <template>
     <VnSearchbar
-        search-key="name"
-        data-key="ZoneList"
-        :label="t('Search claim')"
-        :info="t('You can search by claim id or customer name')"
+        data-key="Zones"
+        :label="t('Search zone')"
+        :info="t('You can search zones by id or name')"
         :is-query-filter="true"
     />
     <VnTable
         ref="tableRef"
-        data-key="ZoneList"
+        data-key="Zones"
         url="Zones"
         :create="{
             urlCreate: 'Zones',
@@ -136,7 +148,6 @@ const handleClone = (id) => {
         :columns="columns"
         default-mode="table"
         redirect="zone"
-        :use-model="true"
         auto-load
     >
         <template #more-create-dialog="{ data }">
@@ -165,3 +176,9 @@ const handleClone = (id) => {
         </template>
     </VnTable>
 </template>
+
+<i18n>
+es:
+    Search zone: Buscar zona
+    You can search zones by id or name: Puedes buscar zonas por id o nombre
+</i18n>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index db2ef4ac4..ce64d304e 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -26,6 +26,7 @@ list:
     bonus: Bonus
     isVolumetric: Volumetric
     createZone: Create zone
+    zoneSummary: Summary
 create:
     name: Name
     warehouse: Warehouse
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 34cda2c15..6fa6d71bf 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -26,6 +26,7 @@ list:
     bonus: Bonus
     isVolumetric: Volumétrico
     createZone: Crear zona
+    zoneSummary: Resumen
 create:
     name: Nombre
     warehouse: Almacén

From 3ee7692bbce546c0ac2bd7b7154beb9b0729c4bc Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 9 Aug 2024 08:45:48 +0200
Subject: [PATCH 16/40] fix(zone): zoneLocation and the others searchbar

---
 src/components/VnTable/VnTable.vue        |  2 +-
 src/components/ui/VnFilterPanel.vue       | 11 ++++---
 src/components/ui/VnSearchbar.vue         | 22 ++++++--------
 src/pages/Zone/Card/ZoneCard.vue          | 25 +++++++++------
 src/pages/Zone/Card/ZoneEvents.vue        | 37 ++++++-----------------
 src/pages/Zone/Card/ZoneLocationsTree.vue | 14 ---------
 src/pages/Zone/ZoneList.vue               |  6 +++-
 src/pages/Zone/locale/en.yml              |  1 +
 src/pages/Zone/locale/es.yml              |  1 +
 src/router/modules/zone.js                |  9 ------
 10 files changed, 48 insertions(+), 80 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index be39570ee..34decbf95 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -363,7 +363,7 @@ defineExpose({
                     @update:selected="emit('update:selected', $event)"
                 >
                     <template #top-left v-if="!$props.withoutHeader">
-                        <slot name="top-left"></slot>
+                        <slot name="top-left"> </slot>
                     </template>
                     <template #top-right v-if="!$props.withoutHeader">
                         <VnVisibleColumn
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 430383e40..ecc481b82 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -81,24 +81,27 @@ onMounted(() => {
     emit('init', { params: userParams.value });
 });
 
-function setUserParams(watchedParams) {
+function setUserParams(watchedParams, quien) {
     if (!watchedParams) return;
 
     if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+    if (typeof watchedParams?.filter == 'string')
+        watchedParams.filter = JSON.parse(watchedParams.filter);
+
     watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
     delete watchedParams.filter;
-    userParams.value = { ...userParams.value, ...watchedParams };
+    userParams.value = { ...userParams.value, ...sanitizer(watchedParams) };
     emit('setUserParams', userParams.value);
 }
 
 watch(
     () => route.query[$props.searchUrl],
-    (val) => setUserParams(val)
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
 );
 
 watch(
     () => arrayData.store.userParams,
-    (val) => setUserParams(val)
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
 );
 
 watch(
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index ceceb59e6..47f1d91bf 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -61,15 +61,11 @@ const props = defineProps({
     },
     customRouteRedirectName: {
         type: String,
-        default: null,
+        default: '',
     },
-    makeFetch: {
-        type: Boolean,
-        default: true,
-    },
-    isQueryFilter: {
-        type: Boolean,
-        default: false,
+    whereFilter: {
+        type: Function,
+        default: undefined,
     },
 });
 
@@ -109,18 +105,18 @@ async function search() {
     );
     arrayData.reset(['skip', 'page']);
 
-    if (!props.makeFetch) return;
     const filter = {
         params: {
             ...Object.fromEntries(staticParams),
+            search: searchText.value,
         },
     };
-    if (props.isQueryFilter) {
+
+    if (props.whereFilter) {
         filter.filter = {
-            where: {
-                name: searchText.value == '' ? undefined : searchText.value,
-            },
+            where: props.whereFilter(searchText.value),
         };
+        delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
 }
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 992852714..77ce79602 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,11 +1,20 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
 
 import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
 import ZoneFilterPanel from '../ZoneFilterPanel.vue';
 
 const { t } = useI18n();
+const route = useRoute();
+const routeName = computed(() => route.name);
+
+function notIsLocations(ifIsFalse, ifIsTrue) {
+    if (routeName.value != 'ZoneLocations') return ifIsFalse;
+    return ifIsTrue;
+}
 </script>
 
 <template>
@@ -14,18 +23,14 @@ const { t } = useI18n();
         base-url="Zones"
         :descriptor="ZoneDescriptor"
         :filter-panel="ZoneFilterPanel"
-        search-data-key="ZoneList"
-        search-url="Zones"
-        :searchbar-label="t('list.searchZone')"
-        :searchbar-info="t('list.searchInfo')"
+        :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
         :searchbar-props="{
             url: 'Zones',
-            label: t('list.searchZone'),
+            label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
             info: t('list.searchInfo'),
+            whereFilter: notIsLocations((text) => {
+                return { name: { like: `%${text}%` } };
+            }),
         }"
-    >
-        <template #searchbar>
-            <ZoneSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 8c26a808c..21991481a 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -44,34 +44,15 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <ZoneEventsPanel
-                :first-day="firstDay"
-                :last-day="lastDay"
-                :events="events"
-                v-model:formModeName="formModeName"
-                @open-zone-form="openForm"
-            />
-        </QScrollArea>
-    </QDrawer>
+    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
+        <ZoneEventsPanel
+            :first-day="firstDay"
+            :last-day="lastDay"
+            :events="events"
+            v-model:formModeName="formModeName"
+            @open-zone-form="openForm"
+        />
+    </Teleport>
     <QPage class="q-pa-md flex justify-center">
         <ZoneCalendarGrid
             v-model:events="events"
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 70384a1bb..cb1508ed6 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -1,10 +1,7 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
@@ -30,7 +27,6 @@ const props = defineProps({
 
 const emit = defineEmits(['update:tickedNodes']);
 
-const { t } = useI18n();
 const route = useRoute();
 const state = useState();
 
@@ -186,16 +182,6 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <VnInput
-        v-if="showSearchBar"
-        v-model="store.userParams.search"
-        :placeholder="t('globals.search')"
-        @keydown.enter.prevent="reFetch()"
-    >
-        <template #prepend>
-            <QIcon class="cursor-pointer" name="search" />
-        </template>
-    </VnInput>
     <QTree
         ref="treeRef"
         :nodes="nodes"
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index b557cacf7..838f90617 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -132,7 +132,11 @@ const handleClone = (id) => {
         data-key="Zones"
         :label="t('Search zone')"
         :info="t('You can search zones by id or name')"
-        :is-query-filter="true"
+        :where-filter="
+            (text) => {
+                return { name: { like: `%${text}%` } };
+            }
+        "
     />
     <VnTable
         ref="tableRef"
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index ce64d304e..2608c071c 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -18,6 +18,7 @@ list:
     create: Create zone
     openSummary: Details
     searchZone: Search zones
+    searchLocation: Search locations
     searchInfo: Search zone by id or name
     confirmCloneTitle: All it's properties will be copied
     confirmCloneSubtitle: Do you want to clone this zone?
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 6fa6d71bf..dd919a0c5 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -18,6 +18,7 @@ list:
     create: Crear zona
     openSummary: Detalles
     searchZone: Buscar zonas
+    searchLocation: Buscar localizaciones
     searchInfo: Buscar zonas por identificador o nombre
     confirmCloneTitle: Todas sus propiedades serán copiadas
     confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 889b47464..48e9b08ad 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -68,15 +68,6 @@ export default {
                     },
                     component: () => import('src/pages/Zone/ZoneCreate.vue'),
                 },
-                // {
-                //     path: 'counter',
-                //     name: 'ZoneCounter',
-                //     meta: {
-                //         title: 'zoneCounter',
-                //         icon: 'add_circle',
-                //     },
-                //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
-                // },
                 {
                     name: 'ZoneUpcomingDeliveries',
                     path: 'upcoming-deliveries',

From a4d0483f891cb4cb5d985442324ebb9f402a350f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 9 Aug 2024 08:48:24 +0200
Subject: [PATCH 17/40] typo

---
 src/components/VnTable/VnTable.vue  | 2 +-
 src/components/ui/VnFilterPanel.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 34decbf95..be39570ee 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -363,7 +363,7 @@ defineExpose({
                     @update:selected="emit('update:selected', $event)"
                 >
                     <template #top-left v-if="!$props.withoutHeader">
-                        <slot name="top-left"> </slot>
+                        <slot name="top-left"></slot>
                     </template>
                     <template #top-right v-if="!$props.withoutHeader">
                         <VnVisibleColumn
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index ecc481b82..38dffe300 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -81,7 +81,7 @@ onMounted(() => {
     emit('init', { params: userParams.value });
 });
 
-function setUserParams(watchedParams, quien) {
+function setUserParams(watchedParams) {
     if (!watchedParams) return;
 
     if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);

From 41afc52f65230696421ee684e9ba9df3142e3088 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 12 Aug 2024 10:33:40 +0200
Subject: [PATCH 18/40] fix events and descriptor menu

---
 .../Zone/Card/ZoneDescriptorMenuItems.vue     | 19 ++---------
 .../Zone/Card/ZoneEventExclusionForm.vue      | 32 ++++++++-----------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index f549bb8d4..00d45e738 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -8,13 +8,6 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 
 import axios from 'axios';
 
-const $props = defineProps({
-    zone: {
-        type: Object,
-        default: () => {},
-    },
-});
-
 const { t } = useI18n();
 const { push, currentRoute } = useRouter();
 const zoneId = currentRoute.value.params.id;
@@ -22,20 +15,14 @@ const zoneId = currentRoute.value.params.id;
 const actions = {
     clone: async () => {
         const opts = { message: t('Zone cloned'), type: 'positive' };
-        let clonedZoneId;
 
         try {
-            const { data } = await axios.post(`Zones/${zoneId}/clone`, {
-                shipped: $props.zone.value.shipped,
-            });
-            clonedZoneId = data;
+            const { data } = await axios.post(`Zones/${zoneId}/clone`, {});
+            notify(opts);
+            push(`/zone/${data.id}/basic-data`);
         } catch (e) {
             opts.message = t('It was not able to clone the zone');
             opts.type = 'negative';
-        } finally {
-            notify(opts);
-
-            if (clonedZoneId) push({ name: 'ZoneSummary', params: { id: clonedZoneId } });
         }
     },
     remove: async () => {
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 721f4bbc3..5ab9a5f92 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -58,20 +58,12 @@ const arrayData = useArrayData('ZoneEvents');
 
 const exclusionGeoCreate = async () => {
     try {
-        if (isNew.value) {
-            const params = {
-                zoneFk: parseInt(route.params.id),
-                date: dated.value,
-                geoIds: tickedNodes.value,
-            };
-            await axios.post('Zones/exclusionGeo', params);
-        } else {
-            const params = {
-                zoneExclusionFk: props.event?.zoneExclusionFk,
-                geoIds: tickedNodes.value,
-            };
-            await axios.post('Zones/updateExclusionGeo', params);
-        }
+        const params = {
+            zoneFk: parseInt(route.params.id),
+            date: dated.value,
+            geoIds: tickedNodes.value,
+        };
+        await axios.post('Zones/exclusionGeo', params);
         await refetchEvents();
     } catch (err) {
         console.error('Error creating exclusion geo: ', err);
@@ -85,7 +77,7 @@ const exclusionCreate = async () => {
                 { dated: dated.value },
             ]);
         else
-            await axios.put(`Zones/${route.params.id}/exclusions/${props.event?.id}`, {
+            await axios.post(`Zones/${route.params.id}/exclusions`, {
                 dated: dated.value,
             });
 
@@ -103,8 +95,8 @@ const onSubmit = async () => {
 const deleteEvent = async () => {
     try {
         if (!props.event) return;
-        const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
-        await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
+        console.log('props.event: ', props.event);
+        await axios.delete(`Zones/${route.params.id}/exclusions`);
         await refetchEvents();
     } catch (err) {
         console.error('Error deleting event: ', err);
@@ -141,7 +133,11 @@ onMounted(() => {
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-lg">
-                <VnInputDate :label="t('eventsInclusionForm.day')" v-model="dated" />
+                <VnInputDate
+                    :label="t('eventsInclusionForm.day')"
+                    v-model="dated"
+                    :model-value="props.date"
+                />
             </VnRow>
             <div class="column q-gutter-y-sm q-mb-md">
                 <QRadio

From b955ded12351bbd3245b1392d6262b957cbbe01c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 12 Aug 2024 12:58:19 +0200
Subject: [PATCH 19/40] fix: refs #7354 fix list searchbar and filters

---
 .../Zone/Card/ZoneEventExclusionForm.vue      |  1 -
 src/pages/Zone/ZoneList.vue                   | 48 ++++++++++++++-----
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 5ab9a5f92..0ba2e640a 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -95,7 +95,6 @@ const onSubmit = async () => {
 const deleteEvent = async () => {
     try {
         if (!props.event) return;
-        console.log('props.event: ', props.event);
         await axios.delete(`Zones/${route.params.id}/exclusions`);
         await refetchEvents();
     } catch (err) {
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 838f90617..c2e0862ad 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import axios from 'axios';
 
 import { toCurrency } from 'src/filters';
@@ -9,18 +9,22 @@ import { toTimeFormat } from 'src/filters/date';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useStateStore } from 'stores/useStateStore';
 import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
 const { viewSummary } = useSummaryDialog();
 const { openConfirmationModal } = useVnConfirm();
+const stateStore = useStateStore();
 const tableRef = ref();
 const warehouseOptions = ref([]);
 
@@ -35,6 +39,17 @@ const tableFilter = {
     ],
 };
 
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
+        case 'name':
+            return { [param]: { like: `%${value}%` } };
+        case 'agencyModeFk':
+            return { [param]: value };
+    }
+}
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -48,22 +63,19 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
+    //TODO: acabar filtro name porque muestra [object Object]
     {
         align: 'left',
         name: 'name',
         label: t('list.name'),
         isTitle: true,
         create: true,
-        columnFilter: {
-            inWhere: true,
-        },
     },
     {
         align: 'left',
         name: 'agencyModeFk',
         label: t('list.agency'),
         cardVisible: true,
-        create: true,
         columnFilter: {
             component: 'select',
             inWhere: true,
@@ -125,6 +137,9 @@ const handleClone = (id) => {
         () => clone(id)
     );
 };
+
+//TODO: la tabla no tiene en cuenta el menú de la izquierda, arreglar
+onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
@@ -132,12 +147,13 @@ const handleClone = (id) => {
         data-key="Zones"
         :label="t('Search zone')"
         :info="t('You can search zones by id or name')"
-        :where-filter="
-            (text) => {
-                return { name: { like: `%${text}%` } };
-            }
-        "
+        :expr-builder="exprBuilder"
     />
+    <RightMenu>
+        <template #right-panel>
+            <ZoneFilterPanel data-key="Zones" :expr-builder="exprBuilder" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="Zones"
@@ -145,16 +161,24 @@ const handleClone = (id) => {
         :create="{
             urlCreate: 'Zones',
             title: t('list.createZone'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
+            onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
             formInitialData: {},
         }"
         :user-filter="tableFilter"
         :columns="columns"
-        default-mode="table"
         redirect="zone"
+        :right-search="false"
+        :expr-builder="exprBuilder"
         auto-load
     >
         <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="AgencyModes"
+                v-model="data.agencyModeFk"
+                option-value="id"
+                option-label="name"
+                :label="t('list.agency')"
+            />
             <VnInput v-model="data.price" :label="t('list.price')" min="0" />
             <VnInput v-model="data.bonus" :label="t('list.bonus')" min="0" />
             <VnInput

From aefcfdba51c68c37d4fbda6242e12692d9af715e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 12 Aug 2024 14:28:35 +0200
Subject: [PATCH 20/40] fix: refs #7354 fix zoneSearchbar

---
 src/pages/Zone/Card/ZoneSearchbar.vue | 54 +++++++++++++++++++++------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index 66ce78f23..607057d0b 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -1,17 +1,49 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
+import { useI18n } from 'vue-i18n';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
 
-const stateStore = useStateStore();
+const { t } = useI18n();
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'agencyModeFk':
+            return {
+                agencyModeFk: value,
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        name: {
+                            like: `%${value}%`,
+                        },
+                    };
+                }
+            }
+    }
+};
 </script>
 
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
+    <VnSearchbar
+        data-key="ZoneList"
+        url="Zones"
+        :filter="{
+            include: { relation: 'agencyMode', scope: { fields: ['name'] } },
+        }"
+        :expr-builder="exprBuilder"
+        :label="t('list.searchZone')"
+        :info="t('list.searchInfo')"
+        custom-route-redirect-name="ZoneSummary"
+    />
 </template>

From 0e9739f2a56ab7565c506f1383aa16619e305800 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 13 Aug 2024 14:39:50 +0200
Subject: [PATCH 21/40] refactor: refs #7354 refactor zones section and fixed
 e2e tests

---
 src/components/VnTable/VnTable.vue            | 12 +++++++-
 src/components/ui/VnFilterPanel.vue           | 14 +++++----
 src/pages/Zone/Card/ZoneCard.vue              |  6 ++--
 src/pages/Zone/Card/ZoneSearchbar.vue         | 14 ++-------
 src/pages/Zone/ZoneList.vue                   | 29 +++++--------------
 .../integration/zone/zoneCreate.spec.js       | 11 ++-----
 .../cypress/integration/zone/zoneList.spec.js | 11 ++++---
 7 files changed, 39 insertions(+), 58 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index dca30516f..5187cd6be 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -168,10 +168,20 @@ function setUserParams(watchedParams, watchedOrder) {
     watchedParams = { ...watchedParams, ...where };
     delete watchedParams.filter;
     delete params.value?.filter;
-    params.value = { ...params.value, ...watchedParams };
+    params.value = { ...params.value, ...sanitizer(watchedParams) };
     orders.value = parseOrder(order);
 }
 
+function sanitizer(params) {
+    for (const [key, value] of Object.entries(params)) {
+        if (typeof value == 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+        }
+    }
+    return params;
+}
+
 function splitColumns(columns) {
     splittedColumns.value = {
         columns: [],
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 4fd511631..46a128334 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -92,16 +92,18 @@ function setUserParams(watchedParams) {
     const order = watchedParams.filter?.order;
 
     delete watchedParams.filter;
-    userParams.value = { ...userParams.value, ...sanitizer(watchedParams) };
+    userParams.value = sanitizer(watchedParams);
     emit('setUserParams', userParams.value, order);
 }
 
 watch(
-    () => [route.query[$props.searchUrl], arrayData.store.userParams],
-    ([newSearchUrl, newUserParams], [oldSearchUrl, oldUserParams]) => {
-        if (newSearchUrl || oldSearchUrl) setUserParams(newSearchUrl);
-        if (newUserParams || oldUserParams) setUserParams(newUserParams);
-    }
+    () => route.query[$props.searchUrl],
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
+);
+
+watch(
+    () => arrayData.store.userParams,
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
 );
 
 watch(
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 77ce79602..d61c61abf 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -28,8 +28,10 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
             url: 'Zones',
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
             info: t('list.searchInfo'),
-            whereFilter: notIsLocations((text) => {
-                return { name: { like: `%${text}%` } };
+            whereFilter: notIsLocations((value) => {
+                return /^\d+$/.test(value)
+                    ? { id: value }
+                    : { name: { like: `%${value}%` } };
             }),
         }"
     />
diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index 607057d0b..06168eb62 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -19,24 +19,14 @@ const exprBuilder = (param, value) => {
                 agencyModeFk: value,
             };
         case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        name: {
-                            like: `%${value}%`,
-                        },
-                    };
-                }
-            }
+            return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
     }
 };
 </script>
 
 <template>
     <VnSearchbar
-        data-key="ZoneList"
+        data-key="Zones"
         url="Zones"
         :filter="{
             include: { relation: 'agencyMode', scope: { fields: ['name'] } },
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index c2e0862ad..f7c1de636 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -15,9 +15,9 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ZoneFilterPanel from './ZoneFilterPanel.vue';
+import ZoneSearchbar from './Card/ZoneSearchbar.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -39,17 +39,6 @@ const tableFilter = {
     ],
 };
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
-        case 'name':
-            return { [param]: { like: `%${value}%` } };
-        case 'agencyModeFk':
-            return { [param]: value };
-    }
-}
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -63,13 +52,16 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
-    //TODO: acabar filtro name porque muestra [object Object]
     {
         align: 'left',
         name: 'name',
         label: t('list.name'),
         isTitle: true,
         create: true,
+        columnFilter: {
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
     },
     {
         align: 'left',
@@ -138,20 +130,14 @@ const handleClone = (id) => {
     );
 };
 
-//TODO: la tabla no tiene en cuenta el menú de la izquierda, arreglar
 onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
-    <VnSearchbar
-        data-key="Zones"
-        :label="t('Search zone')"
-        :info="t('You can search zones by id or name')"
-        :expr-builder="exprBuilder"
-    />
+    <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
-            <ZoneFilterPanel data-key="Zones" :expr-builder="exprBuilder" />
+            <ZoneFilterPanel data-key="Zones" />
         </template>
     </RightMenu>
     <VnTable
@@ -168,7 +154,6 @@ onMounted(() => (stateStore.rightDrawer = true));
         :columns="columns"
         redirect="zone"
         :right-search="false"
-        :expr-builder="exprBuilder"
         auto-load
     >
         <template #more-create-dialog="{ data }">
diff --git a/test/cypress/integration/zone/zoneCreate.spec.js b/test/cypress/integration/zone/zoneCreate.spec.js
index 668c485e7..ae59de8db 100644
--- a/test/cypress/integration/zone/zoneCreate.spec.js
+++ b/test/cypress/integration/zone/zoneCreate.spec.js
@@ -6,15 +6,6 @@ describe('ZoneCreate', () => {
         Price: { val: '3' },
         Bonus: { val: '0' },
         'Traveling days': { val: '0' },
-        Close: {
-            val: {
-                h: '10',
-                m: '0',
-                x: 'PM',
-            },
-            type: 'time',
-            day: 11,
-        },
         Warehouse: { val: 'Algemesi', type: 'select' },
         Volumetric: { val: 'true', type: 'checkbox' },
     };
@@ -30,6 +21,7 @@ describe('ZoneCreate', () => {
         cy.fillInForm({
             ...data,
         });
+        cy.get('input[aria-label="Close"]').type('1000');
         cy.get('.q-mt-lg > .q-btn--standard').click();
         cy.get(notification).should('contains.text', 'Agency cannot be blank');
     });
@@ -39,6 +31,7 @@ describe('ZoneCreate', () => {
             ...data,
             Agency: { val: 'inhouse pickup', type: 'select' },
         });
+        cy.get('input[aria-label="Close"]').type('1000');
         cy.get('.q-mt-lg > .q-btn--standard').click();
         cy.get(notification).should('contains.text', 'Data created');
     });
diff --git a/test/cypress/integration/zone/zoneList.spec.js b/test/cypress/integration/zone/zoneList.spec.js
index 030250d74..92c77a2c6 100644
--- a/test/cypress/integration/zone/zoneList.spec.js
+++ b/test/cypress/integration/zone/zoneList.spec.js
@@ -6,14 +6,13 @@ describe('ZoneList', () => {
     });
 
     it('should filter by agency', () => {
-        cy.get('.bg-header > :nth-child(3) > .full-width > :nth-child(1) >').type(
-            '{downArrow}{enter}'
-        );
+        cy.get(
+            ':nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('{downArrow}{enter}');
     });
 
     it('should open the zone summary', () => {
-        cy.get('.bg-header > :nth-child(2) > .full-width > :nth-child(1) >').type(
-            'zone refund{enter}'
-        );
+        cy.get('input[aria-label="Name"]').type('zone refund');
+        cy.get('.q-scrollarea__content > .q-btn--standard > .q-btn__content').click();
     });
 });

From ed4bf3cfa8caddd49ea5ffa3ab05060cfe49b586 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 14 Aug 2024 10:44:45 +0200
Subject: [PATCH 22/40] refactor: refs #7354 requested changes

---
 src/i18n/locale/es.yml                          | 2 +-
 src/pages/Zone/Card/ZoneBasicData.vue           | 7 ++++++-
 src/pages/Zone/Card/ZoneDescriptorMenuItems.vue | 2 +-
 src/pages/Zone/ZoneDeliveryPanel.vue            | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 747a10d51..a1ffa8913 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -235,7 +235,7 @@ globals:
         purchaseRequest: Petición de compra
         weeklyTickets: Tickets programados
         formation: Formación
-        locations: Ubicaciones
+        locations: Localizaciones
         warehouses: Almacenes
         roles: Roles
         connections: Conexiones
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index a4874e5fc..94aa03f2b 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -95,7 +95,12 @@ const agencyOptions = ref([]);
             </VnRow>
 
             <VnRow>
-                <VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
+                <VnInput
+                    v-model="data.inflation"
+                    :label="t('Inflation')"
+                    type="number"
+                    clearable
+                />
                 <QCheckbox
                     v-model="data.isVolumetric"
                     :label="t('Volumetric')"
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 00d45e738..8cd416490 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -76,5 +76,5 @@ es:
     deleteZone: Eliminar zona
     confirmDeletion: Confirmar eliminación
     confirmDeletionMessage: Seguro que quieres eliminar este zona?
-
+    Zone deleted: Zona eliminada
 </i18n>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 03f534701..7c182a698 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -90,7 +90,7 @@ onMounted(async () => {
                 :label="t('deliveryPanel.postcode')"
                 v-model="formData.geoFk"
                 url="Postcodes/location"
-                :fields="['geoFk', 'code', 'townFk']"
+                :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
                 option-value="geoFk"
                 option-label="code"
@@ -106,7 +106,7 @@ onMounted(async () => {
                             <QItemLabel>{{ opt.code }}</QItemLabel>
                             <QItemLabel caption
                                 >{{ opt.town?.province?.name }},
-                                {{ opt.town?.province?.country?.country }}</QItemLabel
+                                {{ opt.town?.province?.country?.name }}</QItemLabel
                             >
                         </QItemSection>
                     </QItem>

From d12fcd3b345d896691f7053294a50863150003bb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 14 Aug 2024 15:09:28 +0200
Subject: [PATCH 23/40] refactor: refs #7354 refactor deliveryPanel

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 76 +++++++++++++++-------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 7c182a698..f7f77ed98 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -3,45 +3,22 @@ import { onMounted, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
-
 import { useArrayData } from 'src/composables/useArrayData';
-import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { watch } from 'vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const deliveryMethodFk = ref(null);
-const deliveryMethods = ref([]);
+const deliveryMethodFk = ref('delivery');
+const deliveryMethods = ref({});
 const formData = reactive({});
 
 const arrayData = useArrayData('ZoneDeliveryDays', {
     url: 'Zones/getEvents',
 });
 
-const fetchDeliveryMethods = async (filter) => {
-    try {
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get('DeliveryMethods', { params });
-        return data.map((deliveryMethod) => deliveryMethod.id);
-    } catch (err) {
-        console.error('Error fetching delivery methods: ', err);
-    }
-};
-
-watch(
-    () => deliveryMethodFk.value,
-    async (val) => {
-        let filter;
-        if (val === 'pickUp') filter = { where: { code: 'PICKUP' } };
-        else filter = { where: { code: { inq: ['DELIVERY', 'AGENCY'] } } };
-
-        deliveryMethods.value = await fetchDeliveryMethods(filter);
-    },
-    { immediate: true }
-);
-
+const deliveryMethodsConfig = { pickUp: ['PICKUP'], delivery: ['AGENCY', 'DELIVERY'] };
 const fetchData = async (params) => {
     try {
         const { data } = params
@@ -70,6 +47,22 @@ onMounted(async () => {
 </script>
 
 <template>
+    <FetchData
+        url="DeliveryMethods"
+        :fields="['id', 'name', 'deliveryMethodFk']"
+        @on-fetch="
+            (data) => {
+                console.log('data: ', data);
+                console.log('deliveryMethodsConfig: ', deliveryMethodsConfig);
+                Object.entries(deliveryMethodsConfig).forEach(([key, value]) => {
+                    deliveryMethods[key] = data
+                        .filter((code) => value.includes(code.code))
+                        .map((method) => method.id);
+                });
+            }
+        "
+        auto-load
+    />
     <QForm @submit="onSubmit()" class="q-pa-md">
         <div class="column q-gutter-y-sm">
             <QRadio
@@ -113,18 +106,31 @@ onMounted(async () => {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="
-                    t(
-                        deliveryMethodFk === 'delivery'
-                            ? 'deliveryPanel.agency'
-                            : 'deliveryPanel.warehouse'
-                    )
-                "
+                data-key="delivery"
+                v-if="deliveryMethodFk == 'delivery'"
+                :label="t('deliveryPanel.agency')"
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
                 :where="{
-                    deliveryMethodFk: { inq: deliveryMethods },
+                    deliveryMethodFk: { inq: deliveryMethods[deliveryMethodFk] },
+                }"
+                sort-by="name ASC"
+                option-value="id"
+                option-label="name"
+                hide-selected
+                dense
+                outlined
+                rounded
+            />
+            <VnSelect
+                v-else
+                :label="t('deliveryPanel.warehouse')"
+                v-model="formData.agencyModeFk"
+                url="AgencyModes/isActive"
+                :fields="['id', 'name']"
+                :where="{
+                    deliveryMethodFk: { inq: deliveryMethods[deliveryMethodFk] },
                 }"
                 sort-by="name ASC"
                 option-value="id"

From c878fc9cff92338894982ea61b98896a66d4722d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 15:26:47 +0200
Subject: [PATCH 24/40] feat: remove duplicity

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index f7f77ed98..d6c96b935 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, reactive } from 'vue';
+import { onMounted, ref, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -12,6 +12,7 @@ const { notify } = useNotify();
 
 const deliveryMethodFk = ref('delivery');
 const deliveryMethods = ref({});
+const inq = ref([]);
 const formData = reactive({});
 
 const arrayData = useArrayData('ZoneDeliveryDays', {
@@ -39,11 +40,18 @@ const onSubmit = async () => {
 };
 
 onMounted(async () => {
-    deliveryMethodFk.value = 'delivery';
     formData.geoFk = arrayData.store?.userParams?.geoFk;
     formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
     if (formData.geoFk || formData.agencyModeFk) await fetchData();
 });
+watch(
+    () => deliveryMethodFk.value,
+    () => {
+        inq.value = {
+            deliveryMethodFk: { inq: deliveryMethods.value[deliveryMethodFk.value] },
+        };
+    }
+);
 </script>
 
 <template>
@@ -52,13 +60,14 @@ onMounted(async () => {
         :fields="['id', 'name', 'deliveryMethodFk']"
         @on-fetch="
             (data) => {
-                console.log('data: ', data);
-                console.log('deliveryMethodsConfig: ', deliveryMethodsConfig);
                 Object.entries(deliveryMethodsConfig).forEach(([key, value]) => {
                     deliveryMethods[key] = data
                         .filter((code) => value.includes(code.code))
                         .map((method) => method.id);
                 });
+                inq = {
+                    deliveryMethodFk: { inq: deliveryMethods[deliveryMethodFk] },
+                };
             }
         "
         auto-load
@@ -112,9 +121,7 @@ onMounted(async () => {
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
-                :where="{
-                    deliveryMethodFk: { inq: deliveryMethods[deliveryMethodFk] },
-                }"
+                :where="inq"
                 sort-by="name ASC"
                 option-value="id"
                 option-label="name"
@@ -129,9 +136,7 @@ onMounted(async () => {
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
-                :where="{
-                    deliveryMethodFk: { inq: deliveryMethods[deliveryMethodFk] },
-                }"
+                :where="inq"
                 sort-by="name ASC"
                 option-value="id"
                 option-label="name"

From 3c4fc9473defafa87ce35a8f885c5ff146116731 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 16 Aug 2024 11:20:03 +0200
Subject: [PATCH 25/40] refactor: refs #7354 changed descriptor menu options

---
 .../Zone/Card/ZoneDescriptorMenuItems.vue     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 8cd416490..3ce262c34 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -51,29 +51,30 @@ function openConfirmDialog(callback) {
 }
 </script>
 <template>
-    <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
-        <QItemSection avatar>
-            <QIcon name="content_copy" />
-        </QItemSection>
-        <QItemSection>{{ t('To clone zone') }}</QItemSection>
-    </QItem>
     <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>
         <QItemSection>{{ t('deleteZone') }}</QItemSection>
     </QItem>
+    <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_copy" />
+        </QItemSection>
+        <QItemSection>{{ t('cloneZone') }}</QItemSection>
+    </QItem>
 </template>
 
 <i18n>
 en:
-    deleteZone: Delete zone
+    deleteZone: Delete
+    cloneZone: Clone
     confirmDeletion: Confirm deletion
     confirmDeletionMessage: Are you sure you want to delete this zone?
 
 es:
-    To clone zone: Clonar zone
-    deleteZone: Eliminar zona
+    cloneZone: Clonar
+    deleteZone: Eliminar
     confirmDeletion: Confirmar eliminación
     confirmDeletionMessage: Seguro que quieres eliminar este zona?
     Zone deleted: Zona eliminada

From 566a649c208c4a1d85ba7b0438b3abe730f49d61 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 26 Aug 2024 16:34:46 +0200
Subject: [PATCH 26/40] fix: refs #7524 use limit item Section

---
 src/components/ui/VnFilterPanel.vue   |  2 +-
 src/pages/Item/Card/ItemBotanical.vue | 28 +++++++++------------------
 src/pages/Item/Card/ItemShelving.vue  | 24 ++++++-----------------
 src/pages/Item/Card/ItemTags.vue      |  4 +++-
 src/pages/Item/ItemListFilter.vue     | 12 ++++--------
 src/pages/Item/ItemRequest.vue        | 12 +++---------
 src/pages/Item/ItemRequestFilter.vue  | 18 ++++-------------
 7 files changed, 30 insertions(+), 70 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index ab4e2e0da..b12a9f7b8 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -202,7 +202,7 @@ function formatValue(value) {
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
         if (typeof value == 'object')
-            params[key] = Object.values(value)[0].replaceAll('%', '');
+            params[key] = Object.values(value)?.[0]?.replaceAll('%', '');
     }
     return params;
 }
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 416c7f78b..599cd2b32 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -19,15 +19,6 @@ const itemSpeciesOptions = ref([]);
 const itemBotanicals = ref([]);
 let itemBotanicalsForm = reactive({ itemFk: null });
 
-const onGenusCreated = (response, formData) => {
-    itemGenusOptions.value = [...itemGenusOptions.value, response];
-    formData.genusFk = response.id;
-};
-
-const onSpecieCreated = (response, formData) => {
-    itemSpeciesOptions.value = [...itemSpeciesOptions.value, response];
-    formData.specieFk = response.id;
-};
 const entityId = computed(() => {
     return route.params.id;
 });
@@ -69,36 +60,35 @@ onMounted(async () => {
         <template #form="{ data }">
             <VnRow>
                 <VnSelectDialog
+                    ref="genusRef"
                     :label="t('Genus')"
                     v-model="data.genusFk"
-                    :options="itemGenusOptions"
+                    url="Genera"
                     option-label="name"
                     option-value="id"
+                    :fields="['id', 'name']"
+                    sort-by="name ASC"
                     hide-selected
                 >
                     <template #form>
                         <CreateGenusForm
-                            @on-data-saved="
-                                (_, requestResponse) =>
-                                    onGenusCreated(requestResponse, data)
-                            "
+                            @on-data-saved="(_, res) => (data.genusFk = res.id)"
                         />
                     </template>
                 </VnSelectDialog>
                 <VnSelectDialog
                     :label="t('Species')"
                     v-model="data.specieFk"
-                    :options="itemSpeciesOptions"
+                    url="Species"
                     option-label="name"
                     option-value="id"
+                    :fields="['id', 'name']"
+                    sort-by="name ASC"
                     hide-selected
                 >
                     <template #form>
                         <CreateSpecieForm
-                            @on-data-saved="
-                                (_, requestResponse) =>
-                                    onSpecieCreated(requestResponse, data)
-                            "
+                            @on-data-saved="(_, res) => (data.specieFk = res.id)"
                         />
                     </template>
                 </VnSelectDialog>
diff --git a/src/pages/Item/Card/ItemShelving.vue b/src/pages/Item/Card/ItemShelving.vue
index 7e7faab36..41cb34c03 100644
--- a/src/pages/Item/Card/ItemShelving.vue
+++ b/src/pages/Item/Card/ItemShelving.vue
@@ -3,7 +3,6 @@ import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@@ -24,8 +23,6 @@ const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 
 const rowsSelected = ref([]);
-const parkingsOptions = ref([]);
-const shelvingsOptions = ref([]);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -104,7 +101,9 @@ const columns = computed(() => [
             filterValue: null,
             event: getInputEvents,
             attrs: {
-                options: parkingsOptions.value,
+                url: 'parkings',
+                fields: ['code'],
+                'sort-by': 'code ASC',
                 'option-value': 'code',
                 'option-label': 'code',
                 dense: true,
@@ -124,7 +123,9 @@ const columns = computed(() => [
             filterValue: null,
             event: getInputEvents,
             attrs: {
-                options: shelvingsOptions.value,
+                url: 'shelvings',
+                fields: ['code'],
+                'sort-by': 'code ASC',
                 'option-value': 'code',
                 'option-label': 'code',
                 dense: true,
@@ -188,18 +189,6 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData
-        url="parkings"
-        :filter="{ fields: ['code'], order: 'code ASC' }"
-        auto-load
-        @on-fetch="(data) => (parkingsOptions = data)"
-    />
-    <FetchData
-        url="shelvings"
-        :filter="{ fields: ['code'], order: 'code ASC' }"
-        auto-load
-        @on-fetch="(data) => (shelvingsOptions = data)"
-    />
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#st-data">
             <div class="q-pa-md q-mr-lg q-ma-xs" style="border: 2px solid #222">
@@ -237,7 +226,6 @@ onMounted(async () => {
             </QBtn>
         </Teleport>
     </template>
-
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 40c9941e9..39723ae65 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -24,6 +24,7 @@ const getSelectedTagValues = async (tag) => {
         const filter = {
             fields: ['value'],
             order: 'value ASC',
+            limit: 30,
         };
 
         const params = { filter: JSON.stringify(filter) };
@@ -126,7 +127,7 @@ const insertTag = (rows) => {
                                 :key="row.tagFk"
                                 :label="t('Value')"
                                 v-model="row.value"
-                                :options="valueOptionsMap.get(row.tagFk)"
+                                :url="`Tags/${row.tagFk}/filterValue`"
                                 option-label="value"
                                 option-value="value"
                                 emit-value
@@ -135,6 +136,7 @@ const insertTag = (rows) => {
                                 :is-clearable="false"
                                 :required="false"
                                 :rules="validate('itemTag.tagFk')"
+                                :use-like="false"
                             />
                             <VnInput
                                 v-else-if="
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 62c0c56dc..22dce9c64 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -30,7 +30,7 @@ const itemTypesRef = ref(null);
 const categoriesOptions = ref([]);
 const itemTypesOptions = ref([]);
 const buyersOptions = ref([]);
-const suppliersOptions = ref([]);
+const tagOptions = ref([]);
 const tagValues = ref([]);
 const fieldFiltersValues = ref([]);
 const moreFields = ref([]);
@@ -161,12 +161,6 @@ onMounted(async () => {
         @on-fetch="(data) => (buyersOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC' }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-        auto-load
-    />
     <FetchData
         url="Tags"
         :filter="{ fields: ['id', 'name', 'isFree'] }"
@@ -261,9 +255,11 @@ onMounted(async () => {
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
-                        :options="suppliersOptions"
+                        url="Suppliers"
                         option-value="id"
                         option-label="name"
+                        :fields="['id', 'name', 'nickname']"
+                        sort-by="name ASC"
                         hide-selected
                         dense
                         outlined
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index ae6638953..c1ee15a7e 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -22,7 +22,6 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { notify } = useNotify();
 const stateStore = useStateStore();
-const workersOptions = ref([]);
 let filterParams = ref({});
 const denyFormRef = ref(null);
 const denyRequestId = ref(null);
@@ -208,13 +207,6 @@ onBeforeMount(() => {
 </script>
 
 <template>
-    <FetchData
-        url="Workers"
-        :filter="{ where: { role: 'buyer' } }"
-        order="id"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
     <VnSearchbar
         data-key="ItemRequests"
         url="TicketRequests/filter"
@@ -268,7 +260,9 @@ onBeforeMount(() => {
                 <QTd>
                     <VnSelect
                         v-model="row.attenderFk"
-                        :options="workersOptions"
+                        :where="{ role: 'buyer' }"
+                        sort-by="id"
+                        url="Workers"
                         hide-selected
                         option-label="firstName"
                         option-value="id"
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index c9340dc1f..aa07b8d50 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -24,7 +24,6 @@ const stateOptions = [
 
 const itemTypesOptions = ref([]);
 const warehousesOptions = ref([]);
-const workersOptions = ref([]);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -72,18 +71,6 @@ const decrement = (paramsObj, key) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Workers/search"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        :params="{
-            departmentCodes: ['VT'],
-        }"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
@@ -162,7 +149,10 @@ const decrement = (paramsObj, key) => {
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
-                        :options="workersOptions"
+                        url="Workers/search"
+                        :fields="['id', 'name']"
+                        order="name ASC"
+                        :params="{ departmentCodes: ['VT'] }"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 7c2a13db0b8b71388713b341d0c2710df2f0e318 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 26 Aug 2024 16:39:17 +0200
Subject: [PATCH 27/40] fix: refs #7524 use limit shelving Section

---
 src/pages/Shelving/Card/ShelvingFilter.vue | 55 +++++++---------------
 src/pages/Shelving/Card/ShelvingForm.vue   | 48 +++----------------
 2 files changed, 24 insertions(+), 79 deletions(-)

diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index abc91373b..0056ffaec 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -15,25 +16,13 @@ const props = defineProps({
 const emit = defineEmits(['search']);
 
 const workers = ref();
-const parkings = ref();
 
 function setWorkers(data) {
     workers.value = data;
 }
-
-function setParkings(data) {
-    parkings.value = data;
-}
 </script>
 
 <template>
-    <FetchData
-        url="Parkings"
-        :filter="{ fields: ['id', 'code'] }"
-        sort-by="code ASC"
-        @on-fetch="setParkings"
-        auto-load
-    />
     <FetchData
         url="Workers/activeWithInheritedRole"
         :filter="{ where: { role: 'salesPerson' } }"
@@ -54,44 +43,36 @@ function setParkings(data) {
         </template>
         <template #body="{ params }">
             <QItem class="q-my-sm">
-                <QItemSection v-if="!parkings">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="parkings">
-                    <QSelect
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.parkingFk"
+                        url="Parkings"
+                        :fields="['id', 'code']"
+                        :label="t('params.parkingFk')"
+                        option-value="id"
+                        option-label="code"
+                        :filter-options="['id', 'code']"
                         dense
                         outlined
                         rounded
-                        :label="t('params.parkingFk')"
-                        v-model="params.parkingFk"
-                        :options="parkings"
-                        option-value="id"
-                        option-label="code"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
+                        sort-by="code ASC"
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <QSelect
+                <QItemSection>
+                    <VnSelect
                         dense
                         outlined
                         rounded
                         :label="t('params.userFk')"
                         v-model="params.userFk"
-                        :options="workers"
+                        url="Workers/activeWithInheritedRole"
                         option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
+                        option-label="firstName"
+                        :where="{ role: 'salesPerson' }"
+                        sort-by="firstName ASC"
+                        :use-like="false"
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index dd1c4e4a2..aee6f7f3a 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -1,12 +1,11 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -20,30 +19,6 @@ const defaultInitialData = {
     isRecyclable: false,
 };
 
-const parkingFilter = { fields: ['id', 'code'] };
-const parkingList = ref([]);
-const parkingListCopy = ref([]);
-
-const setParkingList = (data) => {
-    parkingList.value = data;
-    parkingListCopy.value = data;
-};
-
-const parkingSelectFilter = {
-    options: parkingList,
-    filterFn: (options, value) => {
-        const search = value.trim().toLowerCase();
-
-        if (!search || search === '') {
-            return parkingListCopy.value;
-        }
-
-        return options.value.filter((option) =>
-            option.code.toLowerCase().startsWith(search)
-        );
-    },
-};
-
 const shelvingFilter = {
     include: [
         {
@@ -68,12 +43,6 @@ const onSave = (shelving, newShelving) => {
 </script>
 <template>
     <VnSubToolbar />
-    <FetchData
-        url="Parkings"
-        :filter="parkingFilter"
-        @on-fetch="setParkingList"
-        auto-load
-    />
     <FormModel
         :url="isNew ? null : `Shelvings/${shelvingId}`"
         :url-create="isNew ? 'Shelvings' : null"
@@ -84,27 +53,22 @@ const onSave = (shelving, newShelving) => {
         :form-initial-data="defaultInitialData"
         @on-data-saved="onSave"
     >
-        <template #form="{ data, validate, filter }">
+        <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
                     v-model="data.code"
                     :label="t('shelving.basicData.code')"
                     :rules="validate('Shelving.code')"
                 />
-                <QSelect
+                <VnSelect
                     v-model="data.parkingFk"
-                    :options="parkingList"
+                    url="Parkings"
                     option-value="id"
                     option-label="code"
-                    emit-value
+                    :filter-options="['id', 'code']"
+                    :fields="['id', 'code']"
                     :label="t('shelving.basicData.parking')"
-                    map-options
-                    use-input
-                    @filter="
-                        (value, update) => filter(value, update, parkingSelectFilter)
-                    "
                     :rules="validate('Shelving.parkingFk')"
-                    :input-debounce="0"
                 />
             </VnRow>
             <VnRow>

From 717c52fc02a39edeb554ac9b644daf088c06051c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 26 Aug 2024 16:55:16 +0200
Subject: [PATCH 28/40] fix: refs #7524 use id

---
 src/pages/Customer/Card/CustomerBasicData.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 87a3b08f7..a6150bb3f 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -97,7 +97,12 @@ const title = ref();
                     :rules="validate('client.salesPersonFk')"
                     :use-like="false"
                     :emit-value="false"
-                    @update:model-value="(val) => (title = val?.nickname)"
+                    @update:model-value="
+                        (val) => {
+                            title = val?.nickname;
+                            data.salesPersonFk = val?.id;
+                        }
+                    "
                 >
                     <template #prepend>
                         <VnAvatar

From 4d7a4be2c044ab18ab4eda266b6666aefe1804d5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 27 Aug 2024 09:54:21 +0200
Subject: [PATCH 29/40] fix: refs #7524 use limit entry Section wip

---
 src/pages/Entry/Card/EntryBasicData.vue | 22 ++++------------------
 src/pages/Entry/EntryFilter.vue         | 11 +----------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index e5d6f50d9..b81b1db22 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -19,8 +19,6 @@ const { t } = useI18n();
 const { hasAny } = useRole();
 const isAdministrative = () => hasAny(['administrative']);
 
-const suppliersOptions = ref([]);
-const travelsOptions = ref([]);
 const companiesOptions = ref([]);
 const currenciesOptions = ref([]);
 
@@ -29,20 +27,6 @@ const onFilterTravelSelected = (formData, id) => {
 };
 </script>
 <template>
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        order="nickname"
-        @on-fetch="(data) => (suppliersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Travels/filter"
-        :filter="{ fields: ['id', 'warehouseInName'] }"
-        order="id"
-        @on-fetch="(data) => (travelsOptions = data)"
-        auto-load
-    />
     <FetchData
         ref="companiesRef"
         url="Companies"
@@ -71,9 +55,10 @@ const onFilterTravelSelected = (formData, id) => {
                 <VnSelect
                     :label="t('entry.basicData.supplier')"
                     v-model="data.supplierFk"
-                    :options="suppliersOptions"
+                    url="Suppliers"
                     option-value="id"
                     option-label="nickname"
+                    :fields="['id', 'nickname']"
                     hide-selected
                     :required="true"
                     map-options
@@ -92,7 +77,8 @@ const onFilterTravelSelected = (formData, id) => {
                 <VnSelectDialog
                     :label="t('entry.basicData.travel')"
                     v-model="data.travelFk"
-                    :options="travelsOptions"
+                    url="Travels/filter"
+                    :fields="['id', 'warehouseInName']"
                     option-value="id"
                     option-label="warehouseInName"
                     map-options
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 194ce0a28..c4d821842 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -20,7 +20,6 @@ const props = defineProps({
 
 const currenciesOptions = ref([]);
 const companiesOptions = ref([]);
-const suppliersOptions = ref([]);
 
 const stateStore = useStateStore();
 onMounted(async () => {
@@ -45,14 +44,6 @@ onMounted(async () => {
         @on-fetch="(data) => (currenciesOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname', 'name'] }"
-        order="nickname"
-        @on-fetch="(data) => (suppliersOptions = data)"
-        auto-load
-    />
-
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -135,7 +126,7 @@ onMounted(async () => {
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
-                        :options="suppliersOptions"
+                        url="Suppliers"
                         option-value="id"
                         option-label="name"
                         hide-selected

From d8e3f9dfd996be92289f0fa22aeade744bf7676b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 16:11:25 +0200
Subject: [PATCH 30/40] feat: apply mixin

---
 src/boot/mainShortcutMixin.js | 29 +++++++++++++++++++++++++++++
 src/boot/quasar.js            |  2 ++
 src/router/modules/route.js   |  3 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/boot/mainShortcutMixin.js

diff --git a/src/boot/mainShortcutMixin.js b/src/boot/mainShortcutMixin.js
new file mode 100644
index 000000000..4f60050c4
--- /dev/null
+++ b/src/boot/mainShortcutMixin.js
@@ -0,0 +1,29 @@
+import routes from 'src/router/modules';
+
+import { useRouter } from 'vue-router';
+export default {
+    mounted: function () {
+        const router = useRouter();
+        const keyBindingMap = routes
+            .filter((route) => route.meta.keyBinding)
+            .reduce((map, route) => {
+                map[route.meta.keyBinding.toLowerCase()] = route.path;
+                return map;
+            }, {});
+        const handleKeyDown = (event) => {
+            const { ctrlKey, altKey, key } = event;
+            event.preventDefault();
+
+            const combination = `${ctrlKey ? 'Ctrl+' : ''}${
+                altKey ? 'Alt+' : ''
+            }${key.toLowerCase()}`;
+            console.log(ctrlKey, altKey, key, combination);
+
+            if (ctrlKey && altKey && keyBindingMap[key]) {
+                router.push(keyBindingMap[key]);
+            }
+        };
+
+        window.addEventListener('keydown', handleKeyDown);
+    },
+};
diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index a8d9b7ad9..caf573ac7 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -1,6 +1,8 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
+import mainShortcutMixin from './mainShortcutMixin';
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
+    app.mixin(mainShortcutMixin);
 });
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 3c5c860cf..148975761 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -5,8 +5,9 @@ export default {
     name: 'Route',
     meta: {
         title: 'routes',
-        icon: 'vn:delivery',
+        icon: 'vn:delivesry',
         moduleName: 'Route',
+        keyBinding: 'r',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },

From 3051b134781a819dfecb321a9f223017d66456a8 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 28 Aug 2024 17:31:39 +0200
Subject: [PATCH 31/40] warmFix fields with wrong name

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

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index b08e12b3e..9423c28f6 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -242,7 +242,7 @@ watchEffect(selectedRows);
             />
             <VnSelect
                 url="InvoiceOutSerials"
-                v-model="data.invoiceOutSerial"
+                v-model="data.serial"
                 :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
                 :options="invoiceOutSerialsOptions"
                 option-label="description"
@@ -254,7 +254,7 @@ watchEffect(selectedRows);
             />
             <VnSelect
                 url="TaxAreas"
-                v-model="data.area"
+                v-model="data.taxArea"
                 :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
                 :options="taxAreasOptions"
                 option-label="code"

From 77c93117609a31e0a1f653daf9f42b5766f5e63b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 28 Aug 2024 17:39:39 +0200
Subject: [PATCH 32/40] fix: refs #7524 use limit travels section

---
 src/pages/Travel/ExtraCommunityFilter.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index c51151451..a8bbde75b 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -20,7 +20,6 @@ const props = defineProps({
 const warehousesOptions = ref([]);
 const continentsOptions = ref([]);
 const agenciesOptions = ref([]);
-const suppliersOptions = ref([]);
 const warehousesByContinent = ref({});
 
 const add = (paramsObj, key) => {
@@ -76,12 +75,6 @@ warehouses();
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Suppliers"
-        @on-fetch="(data) => (suppliersOptions = data)"
-        auto-load
-    />
-
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -220,7 +213,7 @@ warehouses();
                     <VnSelect
                         :label="t('globals.pageTitles.supplier')"
                         v-model="params.cargoSupplierFk"
-                        :options="suppliersOptions"
+                        url="Suppliers"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 42e7629c4089b04f7867adb231628c8e666855da Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 29 Aug 2024 13:53:10 +0200
Subject: [PATCH 33/40] fix: refs #7524 use limit ticket section

---
 .../Ticket/Card/BasicData/TicketBasicDataForm.vue  | 14 +++-----------
 src/pages/Ticket/Card/TicketExpedition.vue         | 12 +++---------
 src/pages/Ticket/Card/TicketSale.vue               | 11 +++--------
 src/pages/Ticket/Card/TicketSaleTracking.vue       | 11 ++---------
 4 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 2d937346a..28c6fcf15 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -30,7 +30,6 @@ const { t } = useI18n();
 const agencyFetchRef = ref(null);
 const zonesFetchRef = ref(null);
 
-const clientsOptions = ref([]);
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
 const agenciesOptions = ref([]);
@@ -273,15 +272,6 @@ const redirectToCustomerAddress = () => {
 onMounted(() => onFormModelInit());
 </script>
 <template>
-    <FetchData
-        url="Clients"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'id',
-        }"
-        @on-fetch="(data) => (clientsOptions = data)"
-        auto-load
-    />
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
@@ -317,7 +307,9 @@ onMounted(() => onFormModelInit());
                 v-model="clientId"
                 option-value="id"
                 option-label="name"
-                :options="clientsOptions"
+                url="Clients"
+                :fields="['id', 'name']"
+                sort-by="id"
                 hide-selected
                 map-options
                 :required="true"
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index f344e4276..c4ab63b39 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -3,7 +3,6 @@ import { onMounted, ref, computed, onUnmounted, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketEditManaProxy from './TicketEditMana.vue';
@@ -35,7 +34,6 @@ const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
 const visibleColumns = ref([]);
 const newTicketWithRoute = ref(false);
-const itemsOptions = ref([]);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -139,7 +137,9 @@ const columns = computed(() => [
             filterValue: null,
             event: getInputEvents,
             attrs: {
-                options: itemsOptions.value,
+                url: 'Items',
+                fields: ['id', 'name'],
+                'sort-by': 'name ASC',
                 'option-value': 'id',
                 'option-label': 'name',
                 dense: true,
@@ -274,12 +274,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <FetchData
-        url="Items"
-        auto-load
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        @on-fetch="(data) => (itemsOptions = data)"
-    />
     <VnSubToolbar>
         <template #st-data>
             <TableVisibleColumns
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 5978dbf09..bd7297b56 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -38,7 +38,6 @@ const ticketConfig = ref(null);
 const isLocked = ref(false);
 const isTicketEditable = ref(false);
 const sales = ref([]);
-const itemsWithNameOptions = ref([]);
 const editableStatesOptions = ref([]);
 const selectedSales = ref([]);
 const mana = ref(null);
@@ -435,12 +434,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (isLocked = data)"
     />
-    <FetchData
-        url="Items/withName"
-        :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
-        auto-load
-        @on-fetch="(data) => (itemsWithNameOptions = data)"
-    />
     <FetchData
         url="States/editableStates"
         :filter="{ fields: ['code', 'name', 'id', 'alertLevel'], order: 'name ASC' }"
@@ -626,10 +619,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </div>
                 <VnSelect
                     v-else
-                    :options="itemsWithNameOptions"
                     hide-selected
                     option-label="name"
                     option-value="id"
+                    url="Items/withName"
+                    :fields="['id', 'name']"
+                    sort-by="id DESC"
                     @update:model-value="changeQuantity(row)"
                     v-model="row.itemFk"
                 >
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index d519bc2c6..b8e166e6a 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -26,7 +26,6 @@ const saleTrackingFetchDataRef = ref(null);
 const sales = ref([]);
 const saleTrackings = ref([]);
 const itemShelvignsSales = ref([]);
-const shelvingsOptions = ref([]);
 const parkingsOptions = ref([]);
 const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
 const oldQuantity = ref(null);
@@ -330,12 +329,6 @@ const qCheckBoxController = (sale, action) => {
         auto-load
         @on-fetch="(data) => (sales = data)"
     />
-    <FetchData
-        url="Shelvings"
-        auto-load
-        @on-fetch="(data) => (shelvingsOptions = data)"
-    />
-    <FetchData url="Parkings" auto-load @on-fetch="(data) => (parkingsOptions = data)" />
     <QTable
         :rows="sales"
         :columns="columns"
@@ -500,7 +493,7 @@ const qCheckBoxController = (sale, action) => {
             <template #body-cell-shelving="{ row }">
                 <QTd auto-width>
                     <VnSelect
-                        :options="shelvingsOptions"
+                        url="Shelvings"
                         hide-selected
                         option-label="code"
                         option-value="code"
@@ -513,7 +506,7 @@ const qCheckBoxController = (sale, action) => {
             <template #body-cell-parking="{ row }">
                 <QTd auto-width>
                     <VnSelect
-                        :options="parkingsOptions"
+                        url="Parkings"
                         hide-selected
                         option-label="code"
                         option-value="id"

From 7bac607746df61570dea888a54bc97b896264293 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 29 Aug 2024 14:20:52 +0200
Subject: [PATCH 34/40] fix: refs #7524 add sort-by

---
 src/pages/Entry/EntryFilter.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index c4d821842..3b88072fa 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -129,6 +129,8 @@ onMounted(async () => {
                         url="Suppliers"
                         option-value="id"
                         option-label="name"
+                        :fields="['id', 'name', 'nickname']"
+                        sort-by="nickname"
                         hide-selected
                         dense
                         outlined

From d3ab56184be889e4cae187bd1a60f0a65f199ce5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Sep 2024 09:34:33 +0200
Subject: [PATCH 35/40] perf: remove console.log

---
 src/boot/mainShortcutMixin.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/boot/mainShortcutMixin.js b/src/boot/mainShortcutMixin.js
index 4f60050c4..c4d37fd73 100644
--- a/src/boot/mainShortcutMixin.js
+++ b/src/boot/mainShortcutMixin.js
@@ -13,12 +13,6 @@ export default {
         const handleKeyDown = (event) => {
             const { ctrlKey, altKey, key } = event;
             event.preventDefault();
-
-            const combination = `${ctrlKey ? 'Ctrl+' : ''}${
-                altKey ? 'Alt+' : ''
-            }${key.toLowerCase()}`;
-            console.log(ctrlKey, altKey, key, combination);
-
             if (ctrlKey && altKey && keyBindingMap[key]) {
                 router.push(keyBindingMap[key]);
             }

From 56d226b36b7fbd5807dcf52a432cc56fa8aed0b2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 10:03:01 +0200
Subject: [PATCH 36/40] fix: refs #7524 dynamic fetching

---
 src/pages/Item/Card/ItemBotanical.vue          | 12 ------------
 src/pages/Ticket/Card/TicketCreateTracking.vue | 12 +++---------
 src/pages/Ticket/Card/TicketSaleTracking.vue   |  1 -
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 599cd2b32..e9f1f11ee 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -38,18 +38,6 @@ onMounted(async () => {
         }"
         @on-fetch="(data) => (itemBotanicals = data)"
     />
-    <FetchData
-        url="Genera"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        @on-fetch="(data) => (itemGenusOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Species"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        @on-fetch="(data) => (itemSpeciesOptions = data)"
-        auto-load
-    />
     <FormModel
         url-update="ItemBotanicals"
         model="entry"
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
index 87ca8dd3f..d692f550d 100644
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -17,9 +17,7 @@ const { t } = useI18n();
 const state = useState();
 const user = state.getUser();
 const stateFetchDataRef = ref(null);
-
 const statesOptions = ref([]);
-const workersOptions = ref([]);
 
 const onStateFkChange = (formData) => (formData.userFk = user.value.id);
 </script>
@@ -30,12 +28,6 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
         auto-load
         @on-fetch="(data) => (statesOptions = data)"
     />
-    <FetchData
-        url="Workers/search"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        auto-load
-        @on-fetch="(data) => (workersOptions = data)"
-    />
     <FormModelPopup
         :title="t('Create tracking')"
         url-create="Tickets/state"
@@ -57,7 +49,9 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
                 <VnSelect
                     :label="t('tracking.worker')"
                     v-model="data.userFk"
-                    :options="workersOptions"
+                    url="Workers/search"
+                    fields=" ['id', 'name']"
+                    sort-by="name ASC"
                     hide-selected
                     option-label="name"
                     option-value="id"
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index b8e166e6a..e699d2bfd 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -26,7 +26,6 @@ const saleTrackingFetchDataRef = ref(null);
 const sales = ref([]);
 const saleTrackings = ref([]);
 const itemShelvignsSales = ref([]);
-const parkingsOptions = ref([]);
 const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
 const oldQuantity = ref(null);
 

From 709f434e5defd110771ef11d978da1042f2a5996 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 12:49:15 +0200
Subject: [PATCH 37/40] refactor: refs #7354 changed icon color in table and
 notification when deleting a zone

---
 src/pages/Zone/Card/ZoneDescriptorMenuItems.vue | 5 -----
 src/pages/Zone/ZoneList.vue                     | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 3ce262c34..22d5bcd5e 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -30,11 +30,6 @@ const actions = {
             await axios.post(`Zones/${zoneId}/deleteZone`);
 
             notify({ message: t('Zone deleted'), type: 'positive' });
-            notify({
-                message: t('You can undo this action within the first hour'),
-                icon: 'info',
-            });
-
             push({ name: 'ZoneList' });
         } catch (e) {
             notify({ message: e.message, type: 'negative' });
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 53d246c03..d160ea6b5 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -106,6 +106,7 @@ const columns = computed(() => [
                 title: t('list.zoneSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, ZoneSummary),
+                isPrimary: true,
             },
             {
                 title: t('globals.clone'),

From ea1e82939afe15e03634b351c6ca7a4411e74723 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 13:44:25 +0200
Subject: [PATCH 38/40] fix: refs #7354 e2e tests

---
 test/cypress/integration/zone/zoneBasicData.spec.js | 2 +-
 test/cypress/integration/zone/zoneCreate.spec.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
index 18b1842a4..29f2dc01c 100644
--- a/test/cypress/integration/zone/zoneBasicData.spec.js
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -1,4 +1,4 @@
-describe('ZoneCreate', () => {
+describe('ZoneBasicData', () => {
     const notification = '.q-notification__message';
 
     beforeEach(() => {
diff --git a/test/cypress/integration/zone/zoneCreate.spec.js b/test/cypress/integration/zone/zoneCreate.spec.js
index ae59de8db..9618ea846 100644
--- a/test/cypress/integration/zone/zoneCreate.spec.js
+++ b/test/cypress/integration/zone/zoneCreate.spec.js
@@ -21,7 +21,7 @@ describe('ZoneCreate', () => {
         cy.fillInForm({
             ...data,
         });
-        cy.get('input[aria-label="Close"]').type('1000');
+        cy.get('input[aria-label="Close"]').type('10:00');
         cy.get('.q-mt-lg > .q-btn--standard').click();
         cy.get(notification).should('contains.text', 'Agency cannot be blank');
     });
@@ -31,7 +31,7 @@ describe('ZoneCreate', () => {
             ...data,
             Agency: { val: 'inhouse pickup', type: 'select' },
         });
-        cy.get('input[aria-label="Close"]').type('1000');
+        cy.get('input[aria-label="Close"]').type('10:00');
         cy.get('.q-mt-lg > .q-btn--standard').click();
         cy.get(notification).should('contains.text', 'Data created');
     });

From 8ffbe400d51bf42fd53be596784adc2a4eb42219 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 14:21:58 +0200
Subject: [PATCH 39/40] refactor: refs #7354 modified VnInputTime

---
 src/components/common/VnInputTime.vue               | 2 +-
 test/cypress/integration/zone/zoneBasicData.spec.js | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 0b4e72cb8..b3478bb23 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -14,7 +14,7 @@ const props = defineProps({
         default: false,
     },
 });
-const initialDate = ref(model.value);
+const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
index 29f2dc01c..c6151a49b 100644
--- a/test/cypress/integration/zone/zoneBasicData.spec.js
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -8,14 +8,12 @@ describe('ZoneBasicData', () => {
     });
 
     it('should throw an error if the name is empty', () => {
-        cy.get('.q-card > :nth-child(1)').click();
         cy.get('.q-card > :nth-child(1)').clear();
         cy.get('.q-btn-group > .q-btn--standard').click();
         cy.get(notification).should('contains.text', "can't be blank");
     });
 
     it("should edit the basicData's zone", () => {
-        cy.get('.q-card > :nth-child(1)').click();
         cy.get('.q-card > :nth-child(1)').type(' modified');
         cy.get('.q-btn-group > .q-btn--standard').click();
         cy.get(notification).should('contains.text', 'Data saved');

From c51af96ca7dd84aea3bf5c767deb45d0ebe21843 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Sep 2024 12:56:44 +0000
Subject: [PATCH 40/40] fix: module icon

---
 src/router/modules/route.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 148975761..955fc9098 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -5,7 +5,7 @@ export default {
     name: 'Route',
     meta: {
         title: 'routes',
-        icon: 'vn:delivesry',
+        icon: 'vn:delivery',
         moduleName: 'Route',
         keyBinding: 'r',
     },