From d444a8721dab9dc9e1ea22c842cb180bae099b4c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 14:05:58 +0200
Subject: [PATCH 01/46] feat: refs #6891 create composable & update searchbar

---
 src/components/ui/VnSearchbar.vue | 31 ++++++-------------------------
 src/composables/useRedirect.js    | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 src/composables/useRedirect.js

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 344267ef7..ae8ac05dd 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
+import useRedirect from 'src/composables/useRedirect';
 
 const quasar = useQuasar();
 
@@ -65,10 +65,10 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
 const arrayData = useArrayData(props.dataKey, { ...props });
 const { store } = arrayData;
 const searchText = ref('');
+const { navigate } = useRedirect();
 
 onMounted(() => {
     const params = store.userParams;
@@ -81,37 +81,18 @@ async function search() {
     const staticParams = Object.entries(store.userParams).filter(
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
-    // const filter =props?.where? { where: JSON.parse(props.where) }: {}
     await arrayData.applyFilter({
         params: {
-            // filter ,
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
     });
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName)
-        return router.push({
-            name: props.customRouteRedirectName,
-            params: { id: searchText.value },
-        });
-
-    const { matched: matches } = router.currentRoute.value;
-    const { path } = matches.at(-1);
-    const [, moduleName] = path.split('/');
-
-    if (!store.data.length || store.data.length > 1)
-        return router.push({ path: `/${moduleName}/list` });
-
-    const targetId = store.data[0].id;
-    let targetUrl;
-
-    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
-    if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
-    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
-
-    await router.push({ path: targetUrl });
+    navigate(store.data, {
+        customRouteRedirectName: props.customRouteRedirectName,
+        searchText: searchText.value,
+    });
 }
 </script>
 
diff --git a/src/composables/useRedirect.js b/src/composables/useRedirect.js
new file mode 100644
index 000000000..786e1378b
--- /dev/null
+++ b/src/composables/useRedirect.js
@@ -0,0 +1,28 @@
+import { useRouter } from 'vue-router';
+
+export default function useRedirect() {
+    const router = useRouter();
+
+    const navigate = (data, { customRouteRedirectName, searchText }) => {
+        if (customRouteRedirectName)
+            return router.push({
+                name: customRouteRedirectName,
+                params: { id: searchText },
+            });
+
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+        const [, moduleName] = path.split('/');
+
+        if (!data.length || data.length > 1)
+            return router.push({ path: `/${moduleName}/list` });
+
+        const targetId = data[0].id;
+
+        if (/\/list|-list/.test(path))
+            router.push({ path: `/${moduleName}/${targetId}/summary` });
+        else router.push({ path: path.replace(/:id/, targetId) });
+    };
+
+    return { navigate };
+}

From b487ff4adc96b9e845994ef21de4e0e5e0e29a68 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 14:25:39 +0200
Subject: [PATCH 02/46] feat: refs #6891 create rightMenu

---
 src/components/common/RightMenu.vue | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/components/common/RightMenu.vue

diff --git a/src/components/common/RightMenu.vue b/src/components/common/RightMenu.vue
new file mode 100644
index 000000000..a83ebc390
--- /dev/null
+++ b/src/components/common/RightMenu.vue
@@ -0,0 +1,27 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+
+defineProps({
+    dataKey: { type: String, required: true },
+});
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+</script>
+<template>
+    <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>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <slot name="right-panel" />
+        </QScrollArea>
+    </QDrawer>
+</template>

From 15b080f7bd9b485169e8d1b3c81fa9fff373800b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 14:27:04 +0200
Subject: [PATCH 03/46] feat: refs #6891 add redirection on VnfilterPanel

---
 src/components/common/VnCard.vue    | 46 ++++++++++++++++++-----------
 src/components/ui/VnFilterPanel.vue |  5 +++-
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 6d0badffb..97c681b79 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -8,6 +8,7 @@ import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import LeftMenu from 'components/LeftMenu.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const props = defineProps({
     dataKey: { type: String, required: true },
@@ -15,6 +16,7 @@ const props = defineProps({
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
+    filterPanel: { type: Object, default: undefined },
     searchbarDataKey: { type: String, default: undefined },
     searchbarUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
@@ -49,24 +51,32 @@ if (props.baseUrl) {
 }
 </script>
 <template>
-    <Teleport
-        to="#searchbar"
-        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
-    >
-        <VnSearchbar
-            :data-key="props.searchbarDataKey"
-            :url="props.searchbarUrl"
-            :label="t(props.searchbarLabel)"
-            :info="t(props.searchbarInfo)"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <component :is="descriptor" />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar" v-if="props.searchbarDataKey">
+            <VnSearchbar
+                :data-key="props.searchbarDataKey"
+                :url="props.searchbarUrl"
+                :label="t(props.searchbarLabel)"
+                :info="t(props.searchbarInfo)"
+            />
+        </Teleport>
+        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+            <QScrollArea class="fit">
+                <component :is="descriptor" />
+                <QSeparator />
+                <LeftMenu source="card" />
+            </QScrollArea>
+        </QDrawer>
+        <RightMenu>
+            <template #right-panel>
+                <component
+                    v-if="props.filterPanel"
+                    :is="props.filterPanel"
+                    :data-key="props.searchbarDataKey"
+                />
+            </template>
+        </RightMenu>
+    </template>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index eb0bbbe66..bc6c313b2 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
-
+import useRedirect from 'src/composables/useRedirect';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
@@ -56,6 +56,7 @@ const arrayData = useArrayData(props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
+const { navigate } = useRedirect();
 
 onMounted(() => {
     if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
@@ -92,6 +93,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
+    navigate(store.data, {});
 }
 
 async function reload() {
@@ -102,6 +104,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
+    navigate(store.data, {});
 }
 
 async function clearFilters() {

From b1147f00d351bf5eddf5d39c15407503edd08303 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 16:16:00 +0200
Subject: [PATCH 04/46] refactor: refs #6891 use Teleport | slot

---
 src/components/common/RightMenu.vue  | 23 ++++++++++++++++++++---
 src/pages/Claim/Card/ClaimAction.vue | 27 ++-------------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/components/common/RightMenu.vue b/src/components/common/RightMenu.vue
index a83ebc390..71f6c1642 100644
--- a/src/components/common/RightMenu.vue
+++ b/src/components/common/RightMenu.vue
@@ -1,9 +1,25 @@
 <script setup>
+import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 
-defineProps({
-    dataKey: { type: String, required: true },
+const hasContent = ref(false);
+const rightPanel = ref(null);
+onMounted(() => {
+    rightPanel.value = document.querySelector('#right-panel');
+    if (rightPanel.value.childNodes.length) return (hasContent.value = true);
+
+    // Check if there's content to display
+    const observer = new MutationObserver(() => {
+        hasContent.value = rightPanel.value.childNodes.length;
+    });
+
+    if (rightPanel.value)
+        observer.observe(rightPanel.value, {
+            subtree: true,
+            childList: true,
+            attributes: true,
+        });
 });
 
 const { t } = useI18n();
@@ -21,7 +37,8 @@ const stateStore = useStateStore();
     </Teleport>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <slot name="right-panel" />
+            <div id="right-panel"></div>
+            <slot v-if="!hasContent" name="right-panel" />
         </QScrollArea>
     </QDrawer>
 </template>
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index b0650b610..a24a2a15e 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -201,30 +201,7 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <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="300"
-        show-if-above
-        v-if="claim"
-    >
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
         <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
             {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
         </QCard>
@@ -274,7 +251,7 @@ async function post(query, params) {
                 v-model="multiplicatorValue"
             />
         </QCard>
-    </QDrawer>
+    </Teleport>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
         v-if="claim"

From 7b6841afc616c182723cb04ee8f479bc4913e64e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 16:44:48 +0200
Subject: [PATCH 05/46] feat: refs #6891 hide if no content

---
 src/components/common/RightMenu.vue | 17 ++++++++++++++---
 src/components/common/VnCard.vue    |  8 ++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/common/RightMenu.vue b/src/components/common/RightMenu.vue
index 71f6c1642..e288fbc87 100644
--- a/src/components/common/RightMenu.vue
+++ b/src/components/common/RightMenu.vue
@@ -1,13 +1,15 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, useSlots } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 
+const slots = useSlots();
 const hasContent = ref(false);
 const rightPanel = ref(null);
+
 onMounted(() => {
     rightPanel.value = document.querySelector('#right-panel');
-    if (rightPanel.value.childNodes.length) return (hasContent.value = true);
+    if (rightPanel.value.childNodes.length) hasContent.value = true;
 
     // Check if there's content to display
     const observer = new MutationObserver(() => {
@@ -20,6 +22,8 @@ onMounted(() => {
             childList: true,
             attributes: true,
         });
+
+    if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
 });
 
 const { t } = useI18n();
@@ -28,7 +32,14 @@ const stateStore = useStateStore();
 <template>
     <Teleport to="#actions-append">
         <div class="row q-gutter-x-sm">
-            <QBtn flat @click="stateStore.toggleRightDrawer()" round dense icon="menu">
+            <QBtn
+                v-if="hasContent || $slots['right-panel']"
+                flat
+                @click="stateStore.toggleRightDrawer()"
+                round
+                dense
+                icon="menu"
+            >
                 <QTooltip bottom anchor="bottom right">
                     {{ t('globals.collapseMenu') }}
                 </QTooltip>
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 97c681b79..93b6c2f06 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -68,12 +68,8 @@ if (props.baseUrl) {
             </QScrollArea>
         </QDrawer>
         <RightMenu>
-            <template #right-panel>
-                <component
-                    v-if="props.filterPanel"
-                    :is="props.filterPanel"
-                    :data-key="props.searchbarDataKey"
-                />
+            <template #right-panel v-if="props.filterPanel">
+                <component :is="props.filterPanel" :data-key="props.searchbarDataKey" />
             </template>
         </RightMenu>
     </template>

From fe11164ae9c2a282846750c82f1fb9ae8593800d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 16:45:10 +0200
Subject: [PATCH 06/46] fix: refs #6891reactivity on agency module

---
 src/pages/Agency/Card/AgencyCard.vue       | 20 --------------------
 src/pages/Agency/Card/AgencyDescriptor.vue |  4 ++--
 src/pages/Agency/Card/AgencySummary.vue    |  6 ++----
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index e78d1cc55..5be43248e 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -1,26 +1,6 @@
 <script setup>
-import { onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-
 import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
-
-const route = useRoute();
-const arrayData = useArrayData('Agency', {
-    url: `Agencies/${route.params.id}`,
-});
-const { store } = arrayData;
-onMounted(async () => await arrayData.fetch({ append: false }));
-watch(
-    () => route.params.id,
-    async (newId) => {
-        if (newId) {
-            store.url = `Agencies/${newId}`;
-            await arrayData.fetch({ append: false });
-        }
-    }
-);
 </script>
 <template>
     <VnCard
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 0fa89d07d..b9772037c 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -15,8 +15,8 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const { params } = useRoute();
-const entityId = computed(() => props.id || params.id);
+const route = useRoute();
+const entityId = computed(() => props.id || route.params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
 </script>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index a4a6a2a18..1a506b154 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -3,11 +3,9 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const $props = defineProps({
     id: {
@@ -15,9 +13,9 @@ const $props = defineProps({
         default: 0,
     },
 });
-const { params } = useRoute();
+const route = useRoute();
 const { t } = useI18n();
-const entityId = computed(() => $props.id || params.id);
+const entityId = computed(() => $props.id || route.params.id);
 
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],

From 036ef7259335797d91acc1150df1c80d9428ab2f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 17:27:30 +0200
Subject: [PATCH 07/46] fix: refs #6891 showFilterPanel

---
 src/pages/Claim/Card/ClaimCard.vue           |  2 ++
 src/pages/Customer/Card/CustomerCard.vue     |  2 ++
 src/pages/Entry/Card/EntryCard.vue           |  2 ++
 src/pages/InvoiceIn/Card/InvoiceInCard.vue   |  2 ++
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue |  2 ++
 src/pages/Item/Card/ItemCard.vue             | 10 +++++++++-
 src/pages/ItemType/Card/ItemTypeCard.vue     |  5 ++++-
 7 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index b2f9c4d2e..80ebe55a0 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,12 +1,14 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
+import ClaimFilter from '../ClaimFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Claim"
         base-url="Claims"
         :descriptor="ClaimDescriptor"
+        :filter-panel="ClaimFilter"
         searchbar-data-key="ClaimList"
         searchbar-url="Claims/filter"
         searchbar-label="Search claim"
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 872bd7da7..7bec1f9f7 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,12 +1,14 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
+import CustomerFilter from '../CustomerFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
+        :filter-panel="CustomerFilter"
         searchbar-data-key="CustomerList"
         searchbar-url="Clients/filter"
         searchbar-label="Search customer"
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 3eb4bd776..08ddf2a4c 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,12 +1,14 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
+import EntryFilter from '../EntryFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Entry"
         base-url="Entries"
         :descriptor="EntryDescriptor"
+        :filter-panel="EntryFilter"
         searchbar-data-key="EntryList"
         searchbar-url="Entries/filter"
         searchbar-label="Search entries"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index ceec5042d..1ed4829c1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
+import InvoiceInFilter from '../InvoiceInFilter.vue';
 
 const filter = {
     include: [
@@ -25,6 +26,7 @@ const filter = {
         base-url="InvoiceIns"
         :filter="filter"
         :descriptor="InvoiceInDescriptor"
+        :filter-panel="InvoiceInFilter"
         searchbar-data-key="InvoiceInList"
         searchbar-url="InvoiceIns/filter"
         searchbar-label="Search invoice"
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 218e01d83..3dbe2ad0c 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -1,12 +1,14 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
+import InvoiceOutFilter from '../InvoiceOutFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="InvoiceOut"
         base-url="InvoiceOuts"
         :descriptor="InvoiceOutDescriptor"
+        :filter-panel="InvoiceOutFilter"
         searchbar-data-key="InvoiceOutList"
         searchbar-url="InvoiceOuts/filter"
         searchbar-label="Search invoice"
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 4eca6137c..ad5a5b831 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -1,7 +1,15 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
+import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard data-key="Item" base-url="Items" :descriptor="ItemDescriptor" />
+    <VnCard
+        data-key="Item"
+        base-url="Items"
+        :descriptor="ItemDescriptor"
+        :filter-panel="ItemListFilter"
+        searchbar-data-key="ItemList"
+        url="Items/filter"
+    />
 </template>
diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
index cb8adf7f6..824018ebd 100644
--- a/src/pages/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -1,12 +1,15 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
-
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
+        :filter-panel="ItemTypeFilter"
+        searchbar-data-key="ItemTypeList"
+        searchbar-url="ItemTypes"
     />
 </template>

From 48bba65baf2d7210731559d269c207a39a00acb3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 09:30:59 +0200
Subject: [PATCH 08/46] fix: refs #6891 use vnCard searchbar

---
 src/pages/Order/Card/OrderCard.vue      | 12 +++++++++++-
 src/pages/Order/Card/OrderSearchbar.vue | 22 ----------------------
 src/pages/Order/Card/OrderSummary.vue   | 11 +----------
 src/pages/Order/OrderList.vue           |  8 ++++++--
 src/pages/Order/locale/es.yml           |  2 ++
 5 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 src/pages/Order/Card/OrderSearchbar.vue
 create mode 100644 src/pages/Order/locale/es.yml

diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index ef7b30d86..2721979d5 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -1,7 +1,17 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import OrderFilter from './OrderFilter.vue';
 </script>
 <template>
-    <VnCard data-key="Order" base-url="Orders" :descriptor="OrderDescriptor" />
+    <VnCard
+        data-key="Order"
+        base-url="Orders"
+        :descriptor="OrderDescriptor"
+        :filter-panel="OrderFilter"
+        searchbar-data-key="OrderList"
+        searchbar-url="Orders/filter"
+        searchbar-label="Search order"
+        searchbar-info="You can search order by reference"
+    />
 </template>
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
deleted file mode 100644
index a768768a5..000000000
--- a/src/pages/Order/Card/OrderSearchbar.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="OrderList"
-        url="Orders/filter"
-        :label="t('Search order')"
-        :info="t('You can search orders by reference')"
-    />
-</template>
-
-<style scoped lang="scss"></style>
-<i18n>
-es:
-    Search order: Buscar orden
-    You can search orders by reference: Puedes buscar por referencia de la orden
-</i18n>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 6e06be9bf..a674a20d0 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -7,7 +7,6 @@ import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 
 const { t } = useI18n();
@@ -53,10 +52,6 @@ const detailsColumns = ref([
 </script>
 
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <OrderSearchbar />
-    </Teleport>
-
     <div class="q-pa-md">
         <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
             <template #header="{ entity }">
@@ -158,11 +153,7 @@ const detailsColumns = ref([
                     <p class="header">
                         {{ t('order.summary.details') }}
                     </p>
-                    <QTable
-                        :columns="detailsColumns"
-                        :rows="entity?.rows"
-                        flat
-                    >
+                    <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
                         <template #header="props">
                             <QTr :props="props">
                                 <QTh auto-width>{{ t('order.summary.item') }}</QTh>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 203eaccd1..0904de71a 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -30,7 +30,11 @@ function navigate(id) {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <OrderSearchbar />
+            <VnSearchbar
+                data-key="OrderList"
+                :label="t('Search order')"
+                :info="t('You can search orders by reference')"
+            />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
new file mode 100644
index 000000000..5fcfd0f5d
--- /dev/null
+++ b/src/pages/Order/locale/es.yml
@@ -0,0 +1,2 @@
+Search order: Buscar orden
+You can search orders by reference: Puedes buscar por referencia de la orden

From 111333a6cfe54bbf4de46e42cc4c81516ffb94e3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 09:46:52 +0200
Subject: [PATCH 09/46] fix: refs #6891 reactivity & show filter panel

---
 src/pages/Parking/Card/ParkingCard.vue       |  2 ++
 src/pages/Parking/Card/ParkingDescriptor.vue | 13 +++++++------
 src/pages/Parking/Card/ParkingSummary.vue    | 15 +++++++++++----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 5a0b552d6..180228148 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
+import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
 
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
@@ -13,6 +14,7 @@ const filter = {
         base-url="Parkings"
         :filter="filter"
         :descriptor="ParkingDescriptor"
+        :filter-panel="ParkingFilter"
         searchbar-data-key="ParkingList"
         searchbar-url="Parkings"
         searchbar-label="parking.searchBar.label"
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index 3ff0a5d17..b5c8820ed 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -15,10 +15,10 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const { params } = useRoute();
-const entityId = computed(() => props.id || params.id);
+const route = useRoute();
+const entityId = computed(() => props.id || route.params.id);
 const { store } = useArrayData('Parking');
-const card = computed(() => store.data);
+const parking = computed(() => store.data);
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -29,11 +29,12 @@ const filter = {
         module="Parking"
         data-key="Parking"
         :url="`Parkings/${entityId}`"
-        :title="card?.code"
-        :subtitle="card?.id"
+        :title="parking?.code"
+        :subtitle="parking?.id"
         :filter="filter"
+        @on-fetch="(data) => (parking = data)"
     >
-        <template #body="{ entity: parking }">
+        <template #body>
             <VnLv :label="t('globals.code')" :value="parking.code" />
             <VnLv :label="t('parking.pickingOrder')" :value="parking.pickingOrder" />
             <VnLv :label="t('parking.sector')" :value="parking.sector?.description" />
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index 9a79f428b..ebc3a996b 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -1,9 +1,10 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     id: {
@@ -14,7 +15,9 @@ const $props = defineProps({
 const router = useRoute();
 const { t } = useI18n();
 const entityId = computed(() => $props.id || router.params.id);
+const { store } = useArrayData('Parking');
 
+const parking = ref(store.data);
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -23,9 +26,13 @@ const filter = {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary :url="`Parkings/${entityId}`" :filter="filter">
-            <template #header="{ entity: parking }">{{ parking.code }}</template>
-            <template #body="{ entity: parking }">
+        <CardSummary
+            :url="`Parkings/${entityId}`"
+            :filter="filter"
+            @on-fetch="(data) => (parking = data)"
+        >
+            <template #header>{{ parking.code }}</template>
+            <template #body>
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
                         <a

From e9f5c0cc8dca3fde32eeb794efa457368baab207 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 10:12:35 +0200
Subject: [PATCH 10/46] feat: refs #6891 add custom url

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

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 93b6c2f06..f6ecc25ab 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -21,6 +21,7 @@ const props = defineProps({
     searchbarUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
+    customRouteRedirectName: { type: String, default: undefined },
 });
 
 const { t } = useI18n();
@@ -58,6 +59,7 @@ if (props.baseUrl) {
                 :url="props.searchbarUrl"
                 :label="t(props.searchbarLabel)"
                 :info="t(props.searchbarInfo)"
+                :custom-route-redirect-name="props.customRouteRedirectName"
             />
         </Teleport>
         <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">

From 777ee0895ed6b13d1af12f80ccd37cf0b042fb58 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 10:15:47 +0200
Subject: [PATCH 11/46] feat: refs #6891 route & drop searchbar

---
 src/pages/Route/Card/RouteCard.vue      | 12 +++++++++++-
 src/pages/Route/Card/RouteSearchbar.vue | 21 ---------------------
 src/pages/Route/Card/RouteSummary.vue   |  6 ------
 src/pages/Route/RouteList.vue           |  9 +++++++--
 src/pages/Route/locale/en.yml           |  2 ++
 src/pages/Route/locale/es.yml           |  3 +++
 6 files changed, 23 insertions(+), 30 deletions(-)
 delete mode 100644 src/pages/Route/Card/RouteSearchbar.vue
 create mode 100644 src/pages/Route/locale/en.yml
 create mode 100644 src/pages/Route/locale/es.yml

diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index fd0a8a507..0da79acf6 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -1,7 +1,17 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
+import RouteFilter from './RouteFilter.vue';
 </script>
 <template>
-    <VnCard data-key="Route" base-url="Routes" :descriptor="RouteDescriptor" />
+    <VnCard
+        data-key="Route"
+        base-url="Routes"
+        :descriptor="RouteDescriptor"
+        :filter-panel="RouteFilter"
+        searchbar-data-key="RouteList"
+        searchbar-label="searchLabel"
+        searchbar-info="searchInfo"
+        custom-route-redirect-name="RouteList"
+    />
 </template>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
deleted file mode 100644
index e3833d13c..000000000
--- a/src/pages/Route/Card/RouteSearchbar.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import {useI18n} from "vue-i18n";
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="RouteList"
-        :label="t('Search route')"
-        :info="t('You can search by route reference')"
-        custom-route-redirect-name="RouteList"
-    />
-</template>
-
-<style scoped lang="scss"></style>
-<i18n>
-es:
-    Search route: Buscar rutas
-    You can search by route reference: Puedes buscar por referencia de la ruta
-</i18n>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 220f93f30..ac03a8231 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -10,7 +10,6 @@ import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import { openBuscaman } from 'src/utils/buscaman';
 
 const $props = defineProps({
@@ -118,11 +117,6 @@ const ticketColumns = ref([
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
     <div class="q-pa-md full-width">
         <CardSummary
             ref="summary"
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index c0888a225..9ebac4bee 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -11,7 +11,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import axios from 'axios';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -179,7 +179,12 @@ const openTicketsDialog = (id) => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <RouteSearchbar />
+            <VnSearchbar
+                data-key="RouteList"
+                :label="t('Search route')"
+                :info="t('You can search by route reference')"
+                custom-route-redirect-name="RouteList"
+            />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
new file mode 100644
index 000000000..427abec1c
--- /dev/null
+++ b/src/pages/Route/locale/en.yml
@@ -0,0 +1,2 @@
+searchLabel: Search route
+searchInfo: You can search by route reference
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
new file mode 100644
index 000000000..cc75dbbc4
--- /dev/null
+++ b/src/pages/Route/locale/es.yml
@@ -0,0 +1,3 @@
+route:
+    searchLabel: Buscar rutas
+    searchInfo: Puedes buscar por referencia de la ruta

From 097e25a0b8072f9a47602bc8bd40b1efac3d2019 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 11:22:35 +0200
Subject: [PATCH 12/46] feat: refs #6891 shelving

---
 src/components/common/VnCard.vue         | 29 +++++++++++++-----------
 src/pages/Shelving/Card/ShelvingCard.vue | 14 +++++++++++-
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index f6ecc25ab..1ad852656 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -17,10 +17,10 @@ const props = defineProps({
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
-    searchbarDataKey: { type: String, default: undefined },
-    searchbarUrl: { type: String, default: undefined },
-    searchbarLabel: { type: String, default: '' },
-    searchbarInfo: { type: String, default: '' },
+    searchDataKey: { type: String, default: undefined },
+    searchUrl: { type: String, default: undefined },
+    searchbarLabel: { type: String, default: undefined },
+    searchbarInfo: { type: String, default: undefined },
     customRouteRedirectName: { type: String, default: undefined },
 });
 
@@ -53,15 +53,18 @@ if (props.baseUrl) {
 </script>
 <template>
     <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar" v-if="props.searchbarDataKey">
-            <VnSearchbar
-                :data-key="props.searchbarDataKey"
-                :url="props.searchbarUrl"
-                :label="t(props.searchbarLabel)"
-                :info="t(props.searchbarInfo)"
-                :custom-route-redirect-name="props.customRouteRedirectName"
-            />
+        <Teleport to="#searchbar" v-if="props.searchDataKey">
+            <slot name="searchbar">
+                <VnSearchbar
+                    :data-key="props.searchDataKey"
+                    :url="props.searchUrl"
+                    :label="t(props.searchbarLabel)"
+                    :info="t(props.searchbarInfo)"
+                    :custom-route-redirect-name="props.customRouteRedirectName"
+                />
+            </slot>
         </Teleport>
+        <slot v-else name="searchbar" />
         <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
             <QScrollArea class="fit">
                 <component :is="descriptor" />
@@ -71,7 +74,7 @@ if (props.baseUrl) {
         </QDrawer>
         <RightMenu>
             <template #right-panel v-if="props.filterPanel">
-                <component :is="props.filterPanel" :data-key="props.searchbarDataKey" />
+                <component :is="props.filterPanel" :data-key="props.searchDataKey" />
             </template>
         </RightMenu>
     </template>
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index f4a2fcf60..a501a7a99 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
+import ShelvingFilter from './ShelvingFilter.vue';
+import ShelvingSearchbar from './ShelvingSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Shelving" base-url="Shelvings" :descriptor="ShelvingDescriptor" />
+    <VnCard
+        data-key="Shelving"
+        base-url="Shelvings"
+        :descriptor="ShelvingDescriptor"
+        :filter-panel="ShelvingFilter"
+        search-data-key="ShelvingList"
+    >
+        <template #searchbar>
+            <ShelvingSearchbar />
+        </template>
+    </VnCard>
 </template>

From 0703de350c18663a8a4c77d2bcf80db520146293 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 13:04:27 +0200
Subject: [PATCH 13/46] fix: refs #6891 rollback order & route searchbar

---
 src/pages/Order/Card/OrderCard.vue      | 12 +++++++-----
 src/pages/Order/Card/OrderSearchbar.vue | 22 ++++++++++++++++++++++
 src/pages/Order/OrderList.vue           |  8 ++------
 src/pages/Order/locale/es.yml           |  2 --
 src/pages/Route/Card/RouteCard.vue      | 12 +++++++-----
 src/pages/Route/Card/RouteSearchbar.vue | 21 +++++++++++++++++++++
 src/pages/Route/RouteList.vue           |  9 ++-------
 src/pages/Route/locale/en.yml           |  2 --
 src/pages/Route/locale/es.yml           |  3 ---
 9 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 src/pages/Order/Card/OrderSearchbar.vue
 delete mode 100644 src/pages/Order/locale/es.yml
 create mode 100644 src/pages/Route/Card/RouteSearchbar.vue
 delete mode 100644 src/pages/Route/locale/en.yml
 delete mode 100644 src/pages/Route/locale/es.yml

diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 2721979d5..5b6896656 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import OrderFilter from './OrderFilter.vue';
+import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -9,9 +10,10 @@ import OrderFilter from './OrderFilter.vue';
         base-url="Orders"
         :descriptor="OrderDescriptor"
         :filter-panel="OrderFilter"
-        searchbar-data-key="OrderList"
-        searchbar-url="Orders/filter"
-        searchbar-label="Search order"
-        searchbar-info="You can search order by reference"
-    />
+        search-data-key="OrderList"
+    >
+        <template #searchbar>
+            <OrderSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
new file mode 100644
index 000000000..a768768a5
--- /dev/null
+++ b/src/pages/Order/Card/OrderSearchbar.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="OrderList"
+        url="Orders/filter"
+        :label="t('Search order')"
+        :info="t('You can search orders by reference')"
+    />
+</template>
+
+<style scoped lang="scss"></style>
+<i18n>
+es:
+    Search order: Buscar orden
+    You can search orders by reference: Puedes buscar por referencia de la orden
+</i18n>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 0904de71a..203eaccd1 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -30,11 +30,7 @@ function navigate(id) {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="OrderList"
-                :label="t('Search order')"
-                :info="t('You can search orders by reference')"
-            />
+            <OrderSearchbar />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
deleted file mode 100644
index 5fcfd0f5d..000000000
--- a/src/pages/Order/locale/es.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Search order: Buscar orden
-You can search orders by reference: Puedes buscar por referencia de la orden
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index 0da79acf6..461f2d95e 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
 import RouteFilter from './RouteFilter.vue';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -9,9 +10,10 @@ import RouteFilter from './RouteFilter.vue';
         base-url="Routes"
         :descriptor="RouteDescriptor"
         :filter-panel="RouteFilter"
-        searchbar-data-key="RouteList"
-        searchbar-label="searchLabel"
-        searchbar-info="searchInfo"
-        custom-route-redirect-name="RouteList"
-    />
+        search-data-key="RouteList"
+    >
+        <template #searchbar>
+            <RouteSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
new file mode 100644
index 000000000..924280580
--- /dev/null
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -0,0 +1,21 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="RouteList"
+        :label="t('Search route')"
+        :info="t('You can search by route reference')"
+        custom-route-redirect-name="RouteList"
+    />
+</template>
+
+<style scoped lang="scss"></style>
+<i18n>
+es:
+    Search route: Buscar rutas
+    You can search by route reference: Puedes buscar por referencia de la ruta
+</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 9ebac4bee..c0888a225 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -11,7 +11,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import axios from 'axios';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -179,12 +179,7 @@ const openTicketsDialog = (id) => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="RouteList"
-                :label="t('Search route')"
-                :info="t('You can search by route reference')"
-                custom-route-redirect-name="RouteList"
-            />
+            <RouteSearchbar />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
deleted file mode 100644
index 427abec1c..000000000
--- a/src/pages/Route/locale/en.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-searchLabel: Search route
-searchInfo: You can search by route reference
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
deleted file mode 100644
index cc75dbbc4..000000000
--- a/src/pages/Route/locale/es.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-route:
-    searchLabel: Buscar rutas
-    searchInfo: Puedes buscar por referencia de la ruta

From 014ec60e473624057e823177ab8b53d43d5f10c3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 15:10:36 +0200
Subject: [PATCH 14/46] feat: refs #6891 worker & supplier

---
 src/components/common/VnCard.vue         | 10 ++++------
 src/components/ui/VnSearchbar.vue        |  6 ++++--
 src/pages/Supplier/Card/SupplierCard.vue |  6 ++++--
 src/pages/Worker/Card/WorkerCard.vue     | 11 +++++------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 1ad852656..49da99a46 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@@ -19,12 +18,11 @@ const props = defineProps({
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
     searchUrl: { type: String, default: undefined },
-    searchbarLabel: { type: String, default: undefined },
-    searchbarInfo: { type: String, default: undefined },
+    searchbarLabel: { type: String, default: '' },
+    searchbarInfo: { type: String, default: '' },
     customRouteRedirectName: { type: String, default: undefined },
 });
 
-const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
 const url = computed(() => {
@@ -58,8 +56,8 @@ if (props.baseUrl) {
                 <VnSearchbar
                     :data-key="props.searchDataKey"
                     :url="props.searchUrl"
-                    :label="t(props.searchbarLabel)"
-                    :info="t(props.searchbarInfo)"
+                    :label="props.searchbarLabel"
+                    :info="props.searchbarInfo"
                     :custom-route-redirect-name="props.customRouteRedirectName"
                 />
             </slot>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index ae8ac05dd..99c9d1cd7 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -4,8 +4,10 @@ import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
 import useRedirect from 'src/composables/useRedirect';
+import { useI18n } from 'vue-i18n';
 
 const quasar = useQuasar();
+const { t } = useI18n();
 
 const props = defineProps({
     dataKey: {
@@ -101,7 +103,7 @@ async function search() {
         <VnInput
             id="searchbar"
             v-model="searchText"
-            :placeholder="props.label"
+            :placeholder="t(props.label)"
             dense
             standout
             autofocus
@@ -120,7 +122,7 @@ async function search() {
                     name="info"
                     class="cursor-info"
                 >
-                    <QTooltip>{{ props.info }}</QTooltip>
+                    <QTooltip>{{ t(props.info) }}</QTooltip>
                 </QIcon>
             </template>
         </VnInput>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index c8c503056..adf0315da 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
+import SupplierListFilter from '../SupplierListFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Supplier"
         base-url="Suppliers"
         :descriptor="SupplierDescriptor"
-        searchbar-data-key="SupplierList"
-        searchbar-url="Suppliers/filter"
+        :filter-panel="SupplierListFilter"
+        search-data-key="SupplierList"
+        search-url="Suppliers/filter"
         searchbar-label="Search suppliers"
     />
 </template>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index e0047bf9e..fb9ab9666 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,17 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
-
-const filter = { where: {} };
+import WorkerFilter from '../WorkerFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Worker"
-        custom-url="Workers/Summary"
+        base-url="Workers"
         :descriptor="WorkerDescriptor"
-        :filter="filter"
-        searchbar-data-key="WorkerList"
-        searchbar-url="Workers/filter"
+        :filter-panel="WorkerFilter"
+        search-data-key="WorkerList"
+        search-url="Workers/filter"
         searchbar-label="Search worker"
         searchbar-info="You can search by worker id or name"
     />

From 29e567d405f39ab1273f533d6ec8f6a6da9d8a74 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 16:42:09 +0200
Subject: [PATCH 15/46] fix: refs #6891 use new props

---
 src/pages/Agency/Card/AgencyCard.vue         | 4 ++--
 src/pages/Claim/Card/ClaimCard.vue           | 4 ++--
 src/pages/Customer/Card/CustomerCard.vue     | 4 ++--
 src/pages/Entry/Card/EntryCard.vue           | 4 ++--
 src/pages/InvoiceIn/Card/InvoiceInCard.vue   | 4 ++--
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue | 4 ++--
 src/pages/Item/Card/ItemCard.vue             | 2 +-
 src/pages/ItemType/Card/ItemTypeCard.vue     | 4 ++--
 src/pages/Parking/Card/ParkingCard.vue       | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index 5be43248e..6b2296df3 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -7,8 +7,8 @@ import VnCard from 'components/common/VnCard.vue';
         data-key="Agency"
         base-url="Agencies"
         :descriptor="AgencyDescriptor"
-        searchbar-data-key="AgencyList"
-        searchbar-url="Agencies"
+        search-data-key="AgencyList"
+        search-url="Agencies"
         searchbar-label="agency.searchBar.label"
         searchbar-info="agency.searchBar.info"
     />
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 80ebe55a0..f38ab5484 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -9,8 +9,8 @@ import ClaimFilter from '../ClaimFilter.vue';
         base-url="Claims"
         :descriptor="ClaimDescriptor"
         :filter-panel="ClaimFilter"
-        searchbar-data-key="ClaimList"
-        searchbar-url="Claims/filter"
+        search-data-key="ClaimList"
+        search-url="Claims/filter"
         searchbar-label="Search claim"
         searchbar-info="You can search by claim id or customer name"
     />
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 7bec1f9f7..98842a0c7 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -9,8 +9,8 @@ import CustomerFilter from '../CustomerFilter.vue';
         base-url="Clients"
         :descriptor="CustomerDescriptor"
         :filter-panel="CustomerFilter"
-        searchbar-data-key="CustomerList"
-        searchbar-url="Clients/filter"
+        search-data-key="CustomerList"
+        search-url="Clients/filter"
         searchbar-label="Search customer"
         searchbar-info="You can search by customer id or name"
     />
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 08ddf2a4c..9fadd2d06 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -9,8 +9,8 @@ import EntryFilter from '../EntryFilter.vue';
         base-url="Entries"
         :descriptor="EntryDescriptor"
         :filter-panel="EntryFilter"
-        searchbar-data-key="EntryList"
-        searchbar-url="Entries/filter"
+        search-data-key="EntryList"
+        search-url="Entries/filter"
         searchbar-label="Search entries"
         searchbar-info="You can search by entry reference"
     />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 1ed4829c1..912713f23 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -27,8 +27,8 @@ const filter = {
         :filter="filter"
         :descriptor="InvoiceInDescriptor"
         :filter-panel="InvoiceInFilter"
-        searchbar-data-key="InvoiceInList"
-        searchbar-url="InvoiceIns/filter"
+        search-data-key="InvoiceInList"
+        search-url="InvoiceIns/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 3dbe2ad0c..e187a2df2 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -9,8 +9,8 @@ import InvoiceOutFilter from '../InvoiceOutFilter.vue';
         base-url="InvoiceOuts"
         :descriptor="InvoiceOutDescriptor"
         :filter-panel="InvoiceOutFilter"
-        searchbar-data-key="InvoiceOutList"
-        searchbar-url="InvoiceOuts/filter"
+        search-data-key="InvoiceOutList"
+        search-url="InvoiceOuts/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index ad5a5b831..e83728b4e 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -9,7 +9,7 @@ import ItemListFilter from '../ItemListFilter.vue';
         base-url="Items"
         :descriptor="ItemDescriptor"
         :filter-panel="ItemListFilter"
-        searchbar-data-key="ItemList"
+        search-data-key="ItemList"
         url="Items/filter"
     />
 </template>
diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
index 824018ebd..cdcd5b693 100644
--- a/src/pages/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -9,7 +9,7 @@ import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
         :filter-panel="ItemTypeFilter"
-        searchbar-data-key="ItemTypeList"
-        searchbar-url="ItemTypes"
+        search-data-key="ItemTypeList"
+        search-url="ItemTypes"
     />
 </template>
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 180228148..620f4bb2d 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -15,8 +15,8 @@ const filter = {
         :filter="filter"
         :descriptor="ParkingDescriptor"
         :filter-panel="ParkingFilter"
-        searchbar-data-key="ParkingList"
-        searchbar-url="Parkings"
+        search-data-key="ParkingList"
+        search-url="Parkings"
         searchbar-label="parking.searchBar.label"
         searchbar-info="parking.searchBar.info"
     />

From ff0e290963c3c9d4161dadc0a52dcc4b17cbad1f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 17:11:51 +0200
Subject: [PATCH 16/46] feat: refs #6891 ticket

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

diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 471bfe490..04363b506 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
+import TicketFilter from '../TicketFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Ticket"
         base-url="Tickets"
         :descriptor="TicketDescriptor"
-        searchbar-data-key="TicketList"
-        searchbar-url="Tickets/filter"
+        :filter-panel="TicketFilter"
+        search-data-key="TicketList"
+        search-url="Tickets/filter"
         searchbar-label="Search ticket"
         searchbar-info="You can search by ticket id or alias"
     />

From 0a281b2b73f387948697674c4afb104d1db0a3ee Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 17:33:12 +0200
Subject: [PATCH 17/46] fix: refs #6891 rollback customUrl

---
 src/components/common/VnCard.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 49da99a46..cd70be28a 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -20,7 +20,6 @@ const props = defineProps({
     searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
-    customRouteRedirectName: { type: String, default: undefined },
 });
 
 const stateStore = useStateStore();
@@ -58,7 +57,6 @@ if (props.baseUrl) {
                     :url="props.searchUrl"
                     :label="props.searchbarLabel"
                     :info="props.searchbarInfo"
-                    :custom-route-redirect-name="props.customRouteRedirectName"
                 />
             </slot>
         </Teleport>

From 05f7c4f2d3cbf599138f65530eb70b6d9a24cc20 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 17:34:55 +0200
Subject: [PATCH 18/46] fix: refs #6891 fix prop

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

diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index e83728b4e..c110c6458 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -10,6 +10,6 @@ import ItemListFilter from '../ItemListFilter.vue';
         :descriptor="ItemDescriptor"
         :filter-panel="ItemListFilter"
         search-data-key="ItemList"
-        url="Items/filter"
+        search-url="Items/filter"
     />
 </template>

From 4d1cef7f685852eae9c223436a9149c4be40a200 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 12:06:31 +0200
Subject: [PATCH 19/46] feat: refs #6891 improve useRedirect

---
 src/composables/useRedirect.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/composables/useRedirect.js b/src/composables/useRedirect.js
index 786e1378b..ed9cc2c44 100644
--- a/src/composables/useRedirect.js
+++ b/src/composables/useRedirect.js
@@ -12,16 +12,11 @@ export default function useRedirect() {
 
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
-        const [, moduleName] = path.split('/');
 
         if (!data.length || data.length > 1)
-            return router.push({ path: `/${moduleName}/list` });
+            return router.push({ path: path.replace(/:id.*/, '') });
 
-        const targetId = data[0].id;
-
-        if (/\/list|-list/.test(path))
-            router.push({ path: `/${moduleName}/${targetId}/summary` });
-        else router.push({ path: path.replace(/:id/, targetId) });
+        router.push({ path: path.replace(/\/(list|-list|:id)/, `/${data[0].id}`) });
     };
 
     return { navigate };

From b5a599c8e7f2d6f193155fe21ece481f8a5418e4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 12:09:16 +0200
Subject: [PATCH 20/46] feat: refs #6891 set text searchbar item

---
 src/pages/Item/Card/ItemCard.vue | 2 ++
 src/pages/Item/locale/en.yml     | 3 +++
 src/pages/Item/locale/es.yml     | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index c110c6458..66d46f576 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -11,5 +11,7 @@ import ItemListFilter from '../ItemListFilter.vue';
         :filter-panel="ItemListFilter"
         search-data-key="ItemList"
         search-url="Items/filter"
+        searchbar-label="searchbar.label"
+        searchbar-info="searchbar.info"
     />
 </template>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index c08c71f48..99dbeb9fd 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -78,3 +78,6 @@ itemTags:
     tag: Tag
     value: Value
     relevancy: Relevancy
+searchbar:
+    label: Search item
+    info: Search by item id
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 9b6a51b8a..60e589932 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -78,3 +78,6 @@ itemTags:
     tag: Etiqueta
     value: Valor
     relevancy: Relevancia
+searchbar:
+    label: Buscar artículo
+    info: Buscar por id de artículo

From 07c67b0df2d2a4edaa27bf5004b64ada27c2ac45 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 12:30:44 +0200
Subject: [PATCH 21/46] feat: refs #6891 keep arrayData opts

---
 src/components/ui/VnPaginate.vue | 5 +++++
 src/composables/useArrayData.js  | 5 ++++-
 src/pages/Item/ItemList.vue      | 1 +
 src/pages/Order/OrderList.vue    | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c00849512..190393d2f 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -42,6 +42,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    keepOpts: {
+        type: Array,
+        default: () => [],
+    },
     offset: {
         type: Number,
         default: 0,
@@ -76,6 +80,7 @@ const arrayData = useArrayData(props.dataKey, {
     order: props.order,
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
+    keepOpts: props.keepOpts,
 });
 const store = arrayData.store;
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 525cf6e6b..326ddff5d 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -47,7 +47,10 @@ export function useArrayData(key, userOptions) {
                 if (isEmpty || !allowedOptions.includes(option)) continue;
 
                 if (Object.prototype.hasOwnProperty.call(store, option)) {
-                    store[option] = userOptions[option];
+                    const defaultOpts = userOptions[option];
+                    store[option] = userOptions.keepOpts?.includes(option)
+                        ? Object.assign(defaultOpts, store[option])
+                        : defaultOpts;
                 }
             }
         }
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 39e190147..27acf3fdd 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -457,6 +457,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             :limit="12"
             :expr-builder="exprBuilder"
             :user-params="params"
+            :keep-opts="['userParams']"
             :offset="50"
             auto-load
         >
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 203eaccd1..6d36d8b31 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -61,6 +61,7 @@ function navigate(id) {
                 :limit="20"
                 :order="['landed DESC', 'clientFk', 'id DESC']"
                 :user-params="{ showEmpty: false }"
+                :keep-opts="['userParams']"
                 auto-load
             >
                 <template #body="{ rows }">

From 7b370e6b93dd9f5311986df60df036d53a68e677 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 12:39:48 +0200
Subject: [PATCH 22/46] feat: refs #6891 improve useRedirect

---
 src/composables/useRedirect.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/composables/useRedirect.js b/src/composables/useRedirect.js
index ed9cc2c44..94ca5d0cb 100644
--- a/src/composables/useRedirect.js
+++ b/src/composables/useRedirect.js
@@ -13,10 +13,12 @@ export default function useRedirect() {
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
 
-        if (!data.length || data.length > 1)
-            return router.push({ path: path.replace(/:id.*/, '') });
+        if (data.length === 1)
+            return router.push({
+                path: path.replace(/\/(list|-list|:id)/, `/${data[0].id}`),
+            });
 
-        router.push({ path: path.replace(/\/(list|-list|:id)/, `/${data[0].id}`) });
+        router.push({ path: path.replace(/:id.*/, '') });
     };
 
     return { navigate };

From 80336868dc5863ff2d946a2a50319f77651ecfc4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 12:52:42 +0200
Subject: [PATCH 23/46] feat: refs #6891 improve useRedirect

---
 src/composables/useRedirect.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/composables/useRedirect.js b/src/composables/useRedirect.js
index 94ca5d0cb..0666a245f 100644
--- a/src/composables/useRedirect.js
+++ b/src/composables/useRedirect.js
@@ -13,12 +13,11 @@ export default function useRedirect() {
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
 
-        if (data.length === 1)
-            return router.push({
-                path: path.replace(/\/(list|-list|:id)/, `/${data[0].id}`),
-            });
+        let to = path.replace(/:id.*/, '');
 
-        router.push({ path: path.replace(/:id.*/, '') });
+        if (data.length === 1) to = path.replace(/\/(list|-list|:id)/, `/${data[0].id}`);
+
+        router.push({ path: to });
     };
 
     return { navigate };

From f7b6f3b9e1baebe2bd9c549f2a238db0626ae5e1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 12:59:56 +0200
Subject: [PATCH 24/46] fix: refs #6891 parking basicData

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

diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index c1a9dcee8..8e3433a5b 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
@@ -10,7 +10,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const parkingId = route.params?.id || null;
+const parkingId = computed(() => route.params?.id || null);
 const sectors = ref([]);
 const sectorFilter = { fields: ['id', 'description'] };
 

From 54de10144278e07115801a9d9ab51d7a3deb88d5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 13:00:54 +0200
Subject: [PATCH 25/46] feat: refs #6891 improve useRedirect

---
 src/composables/useRedirect.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/composables/useRedirect.js b/src/composables/useRedirect.js
index 0666a245f..57233bea0 100644
--- a/src/composables/useRedirect.js
+++ b/src/composables/useRedirect.js
@@ -13,9 +13,10 @@ export default function useRedirect() {
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
 
-        let to = path.replace(/:id.*/, '');
-
-        if (data.length === 1) to = path.replace(/\/(list|-list|:id)/, `/${data[0].id}`);
+        const to =
+            data.length === 1
+                ? path.replace(/\/(list|-list|:id)/, `/${data[0].id}`)
+                : path.replace(/:id.*/, '');
 
         router.push({ path: to });
     };

From c02dcf622a617fbca7f697b28684ac611c013d89 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 13:22:21 +0200
Subject: [PATCH 26/46] fix: refs #6891 correct redirection

---
 src/composables/useRedirect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/composables/useRedirect.js b/src/composables/useRedirect.js
index 57233bea0..c1470718b 100644
--- a/src/composables/useRedirect.js
+++ b/src/composables/useRedirect.js
@@ -15,7 +15,7 @@ export default function useRedirect() {
 
         const to =
             data.length === 1
-                ? path.replace(/\/(list|-list|:id)/, `/${data[0].id}`)
+                ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
                 : path.replace(/:id.*/, '');
 
         router.push({ path: to });

From e52cb99a8075e43c05eb6f8cf495fbe0b8a87e6a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 May 2024 13:23:41 +0200
Subject: [PATCH 27/46] feat: refs #6891 itemTypeSearchbar

---
 src/pages/Item/ItemTypeList.vue          | 19 ++-----------------
 src/pages/ItemType/Card/ItemTypeCard.vue |  7 ++++++-
 src/pages/ItemType/ItemTypeSearchbar.vue | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 src/pages/ItemType/ItemTypeSearchbar.vue

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 9d826655f..dd023f94b 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -7,8 +7,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
 import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
+import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
@@ -63,13 +62,7 @@ const exprBuilder = (param, value) => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ItemTypeList"
-                url="ItemTypes"
-                :label="t('Search item type')"
-                :info="t('Search itemType by id, name or code')"
-                :expr-builder="exprBuilder"
-            />
+            <ItemTypeSearchbar />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
@@ -132,11 +125,3 @@ const exprBuilder = (param, value) => {
         </QTooltip>
     </QPageSticky>
 </template>
-
-<i18n>
-es:
-    New item type: Nueva familia
-    Name: Nombre
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>
diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
index cdcd5b693..9daec7921 100644
--- a/src/pages/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
 import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
+import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -11,5 +12,9 @@ import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
         :filter-panel="ItemTypeFilter"
         search-data-key="ItemTypeList"
         search-url="ItemTypes"
-    />
+    >
+        <template #searchbar>
+            <ItemTypeSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/ItemType/ItemTypeSearchbar.vue b/src/pages/ItemType/ItemTypeSearchbar.vue
new file mode 100644
index 000000000..749033d43
--- /dev/null
+++ b/src/pages/ItemType/ItemTypeSearchbar.vue
@@ -0,0 +1,19 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="ItemTypeList"
+        url="ItemTypes"
+        :label="t('Search item type')"
+        :info="t('Search itemType by id, name or code')"
+    />
+</template>
+<i18n>
+es:
+    Search item type: Buscar familia
+    Search itemType by id, name or code: Buscar familia por id, nombre o código
+</i18n>

From d227d4b09b687888589d9458af0fa2952abf6312 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 9 May 2024 11:32:04 -0300
Subject: [PATCH 28/46] Zone create

---
 src/i18n/locale/en.yml                       |   2 +
 src/i18n/locale/es.yml                       |   2 +
 src/pages/Zone/Card/ZoneSummary.vue          |   4 +-
 src/pages/Zone/Delivery/ZoneDeliveryList.vue |   2 +-
 src/pages/Zone/Upcoming/ZoneUpcomingList.vue |   2 +-
 src/pages/Zone/ZoneCreate.vue                | 269 +++++++------------
 src/pages/Zone/ZoneList.vue                  |  20 +-
 src/pages/Zone/locale/en.yml                 |  41 +--
 src/pages/Zone/locale/es.yml                 |  41 +--
 src/router/modules/zone.js                   | 106 ++++----
 10 files changed, 217 insertions(+), 272 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d8fb231f0..b8ddbef3d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1238,6 +1238,8 @@ zone:
     pageTitles:
         zones: Zone
         zonesList: Zones
+        zoneCreate: New zone
+        locations: Locations
         deliveryList: Delivery days
         upcomingList: Upcoming deliveries
 components:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 67e075935..7489a4747 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1237,6 +1237,8 @@ zone:
     pageTitles:
         zones: Zona
         zonesList: Zonas
+        zoneCreate: Nueva zona
+        locations: Localizaciones
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
 components:
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index 00df03cb0..7e49da7cc 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -50,10 +50,10 @@ const filter = computed(() => {
                 />
                 <VnLv :label="t('zone.card.name')" :value="zone.user?.nickname" />
                 <VnLv
-                    :label="t('zone.list.department')"
+                    :label="t('list.department')"
                     :value="zone.department?.department?.name"
                 />
-                <VnLv :label="t('zone.list.email')" :value="zone.user.email" copy />
+                <VnLv :label="t('list.email')" :value="zone.user.email" copy />
                 <VnLv :label="t('zone.summary.boss')" link>
                     <template #value>
                         <VnUserLink
diff --git a/src/pages/Zone/Delivery/ZoneDeliveryList.vue b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
index 695388a9b..ca87dbd84 100644
--- a/src/pages/Zone/Delivery/ZoneDeliveryList.vue
+++ b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
@@ -63,7 +63,7 @@ async function remove(row) {
                                 outline
                             />
                             <QBtn
-                                :label="t('zone.list.remove')"
+                                :label="t('list.remove')"
                                 @click.stop="remove(row)"
                                 color="primary"
                                 style="margin-top: 15px"
diff --git a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
index 2d3016f25..89e53132e 100644
--- a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
+++ b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
@@ -63,7 +63,7 @@ async function remove(row) {
                                 outline
                             />
                             <QBtn
-                                :label="t('zone.list.remove')"
+                                :label="t('list.remove')"
                                 @click.stop="remove(row)"
                                 color="primary"
                                 style="margin-top: 15px"
diff --git a/src/pages/Zone/ZoneCreate.vue b/src/pages/Zone/ZoneCreate.vue
index 93ea9589b..8aa72f0d1 100644
--- a/src/pages/Zone/ZoneCreate.vue
+++ b/src/pages/Zone/ZoneCreate.vue
@@ -1,184 +1,113 @@
 <script setup>
-import { computed, onMounted, onUpdated, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QIcon, QInput, QItem, QItemSection, QSelect } from 'quasar';
+import { useRouter } from 'vue-router';
 
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
-import { useRoute, useRouter } from 'vue-router';
-import axios from 'axios';
-
-onMounted(() => fetch());
-onUpdated(() => fetch());
+import VnInputTime from 'components/common/VnInputTime.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const router = useRouter();
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
+
+const newZoneForm = reactive({
+    travelingDays: 0,
+    price: 0.2,
+    bonus: 0.2,
+    hour: Date.vnNew(),
 });
-const entityId = computed(() => $props.id || route.params.id);
+const warehousesOptions = ref([]);
+const agencyOptions = ref([]);
 
-let zoneTypes = [];
-let originalData = {};
-const zone = ref({});
-const filteredZoneTypes = ref(zoneTypes);
-
-async function onSubmit() {
-    try {
-        const params = {
-            id: entityId.value,
-            label: zone.value.label,
-            plate: zone.value.plate,
-            volume: zone.value.volume,
-            typeFk: zone.value.typeFk,
-        };
-        await axios.patch('Zones', params).then((res) => {
-            if (res.status == 200) router.push({ path: `/zone/list` });
-        });
-    } catch (error) {
-        //
-    }
-}
-
-async function onReset() {
-    if (entityId.value) {
-        zone.value = { ...originalData };
-    } else {
-        zone.value = {};
-    }
-}
-
-async function fetch() {
-    try {
-        await axios.get('ZoneTypes').then(async (res) => {
-            if (res.data) {
-                filteredZoneTypes.value = zoneTypes = res.data;
-            }
-        });
-        if (entityId.value) {
-            await axios.get(`Zones/${entityId.value}`).then(async (res) => {
-                const data = res.data;
-                if (data) {
-                    zone.value.label = data.label;
-                    zone.value.plate = data.plate;
-                    zone.value.volume = data.volume;
-                    zone.value.typeFk = data.typeFk;
-                    originalData = { ...zone.value };
-                }
-            });
-        }
-    } catch (e) {
-        //
-    }
-}
-
-function filterType(val, update) {
-    update(() => {
-        const needle = val.toLowerCase();
-        filteredZoneTypes.value = zoneTypes.filter(
-            (v) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    });
-}
+const redirectToZoneLocations = (_, { id }) => {
+    router.push({ name: 'ZoneLocations', params: { id } });
+};
 </script>
 
 <template>
-    <QPage class="q-pa-sm q-mx-xl">
-        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
-            <QCard class="q-pa-md">
-                <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="zone.label"
-                            :label="t('zone.create.name')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('zone.warnings.labelNotEmpty')]"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            filled
-                            v-model="zone.plate"
-                            :label="t('zone.create.agency')"
-                            :rules="[(val) => !!val || t('zone.warnings.plateNotEmpty')]"
-                        />
-                    </div>
-                </div>
-                <div class="row q-col-gutter-md">
-                    <div class="col">
-                        <QInput
-                            filled
-                            v-model="zone.volume"
-                            :label="t('zone.create.close')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('zone.warnings.volumeNotEmpty')]"
-                        />
-                    </div>
-                    <div class="col">
-                        <QSelect
-                            filled
-                            v-model="zone.typeFk"
-                            use-input
-                            fill-input
-                            hide-selected
-                            input-debounce="0"
-                            option-label="name"
-                            option-value="id"
-                            emit-value
-                            map-options
-                            :label="t('zone.create.price')"
-                            :options="filteredZoneTypes"
-                            :rules="[(val) => !!val || t('zone.warnings.typeNotEmpty')]"
-                            @filter="filterType"
-                        >
-                            <template v-if="zone.typeFk" #append>
-                                <QIcon
-                                    name="cancel"
-                                    @click.stop.prevent="zone.typeFk = null"
-                                    class="cursor-pointer"
-                                />
-                            </template>
-                            <template #no-option>
-                                <QItem>
-                                    <QItemSection class="text-grey">
-                                        {{ t('zone.warnings.noData') }}
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </QSelect>
-                    </div>
-                </div>
-            </QCard>
-            <div class="q-mt-md">
-                <QBtn :label="t('zone.type.submit')" type="submit" color="primary" />
-                <QBtn
-                    :label="t('zone.type.reset')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                />
-            </div>
-        </QForm>
+    <FetchData
+        url="Warehouses"
+        :filter="{ order: ['name'] }"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="AgencyModes/isActive"
+        :filter="{ order: ['name'] }"
+        @on-fetch="(data) => (agencyOptions = data)"
+        auto-load
+    />
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="Zones"
+            model="Zones"
+            :form-initial-data="newZoneForm"
+            @on-data-saved="redirectToZoneLocations"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('create.name')"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('create.warehouse')"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.warehouseFk"
+                    />
+                    <VnSelect
+                        :label="t('create.agency')"
+                        :options="agencyOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.agencyModeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.travelingDays"
+                        :label="t('create.travelingDays')"
+                        type="number"
+                        min="0"
+                    />
+
+                    <VnInputTime v-model="data.hour" :label="t('create.closingHour')" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.price"
+                        :label="t('create.price')"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInput
+                        v-model="data.bonus"
+                        :label="t('create.bonus')"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <QCheckbox
+                        :label="t('create.volumetric')"
+                        v-model="data.isVolumetric"
+                        :toggle-indeterminate="false"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.q-page {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-}
-
-.q-form {
-    width: 70%;
-}
-</style>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index f260eb134..79273b198 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -30,7 +30,7 @@ async function remove(row) {
     try {
         await axios.delete(`Zones/${row.id}`).then(async () => {
             quasar.notify({
-                message: t('zone.list.removeItem'),
+                message: t('list.removeItem'),
                 type: 'positive',
             });
             store.data.splice(store.data.indexOf(row), 1);
@@ -61,23 +61,23 @@ async function remove(row) {
                     >
                         <template #list-items>
                             <VnLv
-                                :label="t('zone.list.id')"
-                                :title-label="t('zone.list.id')"
+                                :label="t('list.id')"
+                                :title-label="t('list.id')"
                                 :value="row.id"
                             />
-                            <VnLv :label="t('zone.list.name')" :value="row?.name" />
+                            <VnLv :label="t('list.name')" :value="row?.name" />
                             <VnLv
-                                :label="t('zone.list.agency')"
+                                :label="t('list.agency')"
                                 :options="agencyOptions"
                                 option-value="id"
                                 option-label="name"
                                 :value="row?.agencyFk"
                             />
                             <VnLv
-                                :label="t('zone.list.close')"
+                                :label="t('list.close')"
                                 :value="toTimeFormat(row?.hour)"
                             />
-                            <VnLv :label="t('zone.list.price')" :value="row?.price" />
+                            <VnLv :label="t('list.price')" :value="row?.price" />
                         </template>
                         <template #actions>
                             <QBtn
@@ -86,14 +86,14 @@ async function remove(row) {
                                 outline
                             />
                             <QBtn
-                                :label="t('zone.list.openSummary')"
+                                :label="t('list.openSummary')"
                                 @click.stop="viewSummary(row.id, ZoneSummary)"
                                 color="primary"
                                 style="margin-top: 15px"
                             />
                             <!--AQUI PONER BOTÓN CLONAR-->
                             <QBtn
-                                :label="t('zone.list.clone')"
+                                :label="t('list.clone')"
                                 @click.stop="remove(row)"
                                 color="primary"
                                 style="margin-top: 15px"
@@ -105,7 +105,7 @@ async function remove(row) {
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
             <QBtn @click="create" fab icon="add" color="primary">
-                <QTooltip>{{ t('zone.list.create') }}</QTooltip>
+                <QTooltip>{{ t('list.create') }}</QTooltip>
             </QBtn>
         </QPageSticky>
     </QPage>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index e62111d57..68227253c 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -1,19 +1,22 @@
-zone:
-    list:
-        volume: Volume
-        clone: Clone
-        id: Id
-        name: Name
-        agency: Agency
-        close: Close
-        price: Price
-        create: Create zone
-        openSummary: Details
-    create:
-        name: Name
-        agency: Agency
-        close: Close
-        price: Price
-    type:
-        submit: Save
-        reset: Reset
+list:
+    volume: Volume
+    clone: Clone
+    id: Id
+    name: Name
+    agency: Agency
+    close: Close
+    price: Price
+    create: Create zone
+    openSummary: Details
+create:
+    name: Name
+    warehouse: Warehouse
+    agency: Agency
+    travelingDays: Traveling days
+    closingHour: Closing hour
+    price: Price
+    bonus: Bonus
+    volumetric: Volumetric
+type:
+    submit: Save
+    reset: Reset
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 5d7a265bf..6db837145 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -1,19 +1,22 @@
-zone:
-    list:
-        volume: Volumen
-        clone: Clonar
-        id: Id
-        name: Nombre
-        agency: Agencia
-        close: Cierre
-        price: Precio
-        create: Crear zona
-        openSummary: Detalles
-    create:
-        name: Nombre
-        agency: Agencia
-        close: Cierre
-        price: Precio
-    type:
-        submit: Guardar
-        reset: Reiniciar
+list:
+    volume: Volumen
+    clone: Clonar
+    id: Id
+    name: Nombre
+    agency: Agencia
+    close: Cierre
+    price: Precio
+    create: Crear zona
+    openSummary: Detalles
+create:
+    name: Nombre
+    warehouse: Almacén
+    agency: Agencia
+    travelingDays: Días de viaje
+    closingHour: Hora de cierre
+    price: Precio
+    bonus: Bonificación
+    volumetric: Volumétrico
+type:
+    submit: Guardar
+    reset: Reiniciar
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 079dfaa84..ecf750bdc 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -11,58 +11,54 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: [
-            /*'ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'*/
-        ],
-        card: [
-            //
-        ],
+        main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
+        card: ['ZoneLocations'],
     },
     children: [
-        // {
-        // path: '/zone',
-        // name: 'ZoneMain',
-        // component: () => import('src/pages/Zone/ZoneMain.vue'),
-        // redirect: { name: 'ZoneList' },
-        // children: [
-        //     {
-        //         path: 'list',
-        //         name: 'ZoneList',
-        //         meta: {
-        //             title: 'zonesList',
-        //             icon: 'vn:zone',
-        //         },
-        //         component: () => import('src/pages/Zone/ZoneList.vue'),
-        //     },
-        // {
-        //     path: 'create',
-        //     name: 'ZoneCreate',
-        //     meta: {
-        //         title: 'zoneCreate',
-        //         icon: 'create',
-        //     },
-        //     component: () => import('src/pages/Zone/ZoneCreate.vue'),
-        // },
-        // {
-        //     path: ':id/edit',
-        //     name: 'ZoneEdit',
-        //     meta: {
-        //         title: 'zoneEdit',
-        //         icon: 'edit',
-        //     },
-        //     component: () => import('src/pages/Zone/ZoneCreate.vue'),
-        // },
-        // {
-        //     path: 'counter',
-        //     name: 'ZoneCounter',
-        //     meta: {
-        //         title: 'zoneCounter',
-        //         icon: 'add_circle',
-        //     },
-        //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
-        // },
-        // ],
-        // },
+        {
+            path: '/zone',
+            name: 'ZoneMain',
+            component: () => import('src/pages/Zone/ZoneMain.vue'),
+            redirect: { name: 'ZoneList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'ZoneList',
+                    meta: {
+                        title: 'zonesList',
+                        icon: 'vn:zone',
+                    },
+                    component: () => import('src/pages/Zone/ZoneList.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'ZoneCreate',
+                    meta: {
+                        title: 'zoneCreate',
+                        icon: 'create',
+                    },
+                    component: () => import('src/pages/Zone/ZoneCreate.vue'),
+                },
+                {
+                    path: ':id/edit',
+                    name: 'ZoneEdit',
+                    meta: {
+                        title: 'zoneEdit',
+                        icon: 'edit',
+                    },
+                    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: 'ZoneCard',
             path: ':id',
@@ -78,6 +74,16 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
                 },
+                {
+                    name: 'ZoneLocations',
+                    path: 'location',
+                    meta: {
+                        title: 'locations',
+                        icon: 'vn:greuge',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
+                },
+
                 // {
                 //     path: '/zone/delivery',
                 //     name: 'ZoneDeliveryMain',

From 14910c5899f437b32295cd9ba3bbbbc5edb6d255 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 13 May 2024 12:46:25 +0200
Subject: [PATCH 29/46] feat: refs #7271 basicData and Log

---
 src/pages/Zone/Card/ZoneBasicData.vue  | 58 +++++++-------------------
 src/pages/Zone/Card/ZoneDescriptor.vue |  6 +--
 src/router/modules/zone.js             | 11 ++++-
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 5d57b920e..00f34b431 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -1,34 +1,23 @@
 <script setup>
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const zoneFilter = {
-    include: [
-        {
-            relation: 'agency',
-            scope: {
-                fields: ['name'],
-                include: { relation: 'agencyModeFk', scope: { fields: ['id'] } },
-            },
-        },
-        { relation: 'sip', scope: { fields: ['extension', 'secret'] } },
-        { relation: 'department', scope: { include: { relation: 'department' } } },
-        { relation: 'client', scope: { fields: ['phone'] } },
-    ],
-};
+
 const agencyFilter = {
     fields: ['id', 'name'],
     order: 'name ASC',
     limit: 30,
 };
+const agencyOptions = ref([]);
 </script>
 
 <template>
@@ -36,53 +25,38 @@ const agencyFilter = {
         :filter="agencyFilter"
         @on-fetch="(data) => (agencyOptions = data)"
         auto-load
-        url="agencies"
-    />
-    <FetchData
-        :filter="zoneFilter"
-        @on-fetch="(data) => (zoneOptions = data)"
-        auto-load
-        url="zones"
+        url="AgencyModes"
     />
 
-    <FormModel
-        :filter="zoneFilter"
-        :url="`zone/${route.params.id}/basic-data`"
-        auto-load
-        model="Zone"
-    >
+    <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput :label="t('Name')" clearable v-model="data.zone.name" />
+                <VnInput :label="t('Name')" clearable v-model="data.name" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.agency.name" :label="t('Agency')" clearable />
-                <VnInput v-model="data.zone.itemMaxSize" :label="t('Max m³')" clearable />
-                <VnInput v-model="data.zone.m3Max" :label="t('Maximum m³')" clearable />
+                <VnInput v-model="data.agencyModeFk" :label="t('Agency')" clearable />
+                <VnInput v-model="data.itemMaxSize" :label="t('Max m³')" clearable />
+                <VnInput v-model="data.m3Max" :label="t('Maximum m³')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
-                    v-model="data.zone.travelingDays"
+                    v-model="data.travelingDays"
                     :label="t('Traveling days')"
                     clearable
                 />
-                <VnInput v-model="data.zone.hour" :label="t('Closing')" clearable />
+                <VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.zone.price" :label="t('Price')" clearable />
-                <VnInput v-model="data.zone.bonus" :label="t('Bonus')" clearable />
+                <VnInput v-model="data.price" :label="t('Price')" clearable />
+                <VnInput v-model="data.bonus" :label="t('Bonus')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput
-                    v-model="data.zone.inflation"
-                    :label="t('Inflation')"
-                    clearable
-                />
-                <QCheckbox v-model="data.zone.isVolumetric" :label="t('Volumetric')" />
+                <VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
+                <QCheckbox v-model="data.isVolumetric" :label="t('Volumetric')" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 8f0aa9e07..f257a3159 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -9,6 +9,7 @@ import { toTimeFormat } from 'src/filters/date';
 import { toCurrency } from 'filters/index';
 
 import useCardDescription from 'src/composables/useCardDescription';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 const $props = defineProps({
     id: {
@@ -69,11 +70,10 @@ const setData = (entity) => {
                 </QTooltip>
             </QBtn>
         </template>
-        <!-- <template #menu="{ entity }">
+        <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
-        </template> -->
+        </template>
         <template #body="{ entity }">
-            {{ console.log('entity', entity) }}
             <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
             <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
             <VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index d39ed82d0..01c23c499 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'ZoneMain' },
     menus: {
         main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
-        card: ['ZoneBasicData'],
+        card: ['ZoneBasicData', 'ZoneHistory'],
     },
     children: [
         {
@@ -83,6 +83,15 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
                 },
+                {
+                    name: 'ZoneHistory',
+                    path: 'history',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
+                },
                 // {
                 //     path: '/zone/delivery',
                 //     name: 'ZoneDeliveryMain',

From a94c1a32e10ff80484b4884ef7e0f591e5335a30 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 13 May 2024 14:13:41 +0200
Subject: [PATCH 30/46] fix: show label agency instead id

---
 src/pages/Zone/Card/ZoneBasicData.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 00f34b431..819fec7e3 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -8,6 +8,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -29,13 +30,21 @@ const agencyOptions = ref([]);
     />
 
     <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
-        <template #form="{ data }">
+        <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput :label="t('Name')" clearable v-model="data.name" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.agencyModeFk" :label="t('Agency')" clearable />
+                <VnSelect
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.agencyModeFk"
+                    :rules="validate('zone.agencyModeFk')"
+                    :options="agencyOptions"
+                    :label="t('Agency')"
+                    clearable
+                />
                 <VnInput v-model="data.itemMaxSize" :label="t('Max m³')" clearable />
                 <VnInput v-model="data.m3Max" :label="t('Maximum m³')" clearable />
             </VnRow>

From 7b99d2f38b89f5767443fd534c1e281a3306b3b6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 13 May 2024 10:31:11 -0300
Subject: [PATCH 31/46] re order translation

---
 src/pages/Zone/locale/en.yml | 7 ++-----
 src/pages/Zone/locale/es.yml | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index b619def8f..746d3f2e7 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -16,6 +16,8 @@ list:
     openSummary: Details
     searchZone: Search zones
     searchInfo: Search zone by id or name
+    confirmCloneTitle: All it's properties will be copied
+    confirmCloneSubtitle: Do you want to clone this zone?
 create:
     name: Name
     warehouse: Warehouse
@@ -25,11 +27,6 @@ create:
     price: Price
     bonus: Bonus
     volumetric: Volumetric
-type:
-    submit: Save
-    reset: Reset
-    confirmCloneTitle: All it's properties will be copied
-    confirmCloneSubtitle: Do you want to clone this zone?
 summary:
     agency: Agency
     price: Price
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 066e0c174..d9266b150 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -16,6 +16,8 @@ list:
     openSummary: Detalles
     searchZone: Buscar zonas
     searchInfo: Buscar zonas por identificador o nombre
+    confirmCloneTitle: Todas sus propiedades serán copiadas
+    confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
 create:
     name: Nombre
     warehouse: Almacén
@@ -25,11 +27,6 @@ create:
     price: Precio
     bonus: Bonificación
     volumetric: Volumétrico
-type:
-    submit: Guardar
-    reset: Reiniciar
-    confirmCloneTitle: Todas sus propiedades serán copiadas
-    confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
 summary:
     agency: Agencia
     price: Precio

From 07b91febb672f7cc00eb947bbb02bbca0047cb67 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 May 2024 15:41:35 +0200
Subject: [PATCH 32/46] feat: refs #6891 unit test

---
 .../components/common/VnSearchBar.spec.js     | 62 -------------------
 .../__tests__/composables/useRedirect.spec.js | 52 ++++++++++++++++
 2 files changed, 52 insertions(+), 62 deletions(-)
 delete mode 100644 test/vitest/__tests__/components/common/VnSearchBar.spec.js
 create mode 100644 test/vitest/__tests__/composables/useRedirect.spec.js

diff --git a/test/vitest/__tests__/components/common/VnSearchBar.spec.js b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
deleted file mode 100644
index 0938ae9c0..000000000
--- a/test/vitest/__tests__/components/common/VnSearchBar.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-// Probar a importar como plugin vue-router en archivo helper
-describe('VnSearchBar', () => {
-    let vm;
-    let wrapper;
-    let pushSpy;
-
-    beforeAll(() => {
-        wrapper = createWrapper(VnSearchbar, {
-            propsData: {
-                dataKey: 'CustomerList',
-                label: 'Search customer',
-                info: 'Info customer',
-            },
-        });
-        vm = wrapper.vm;
-        vm.router.currentRoute.value.matched = [
-            {
-                path: '/',
-            },
-            {
-                path: '/customer',
-            },
-            {
-                path: '/customer/:id',
-            },
-            {
-                path: '/customer/:id/basic-data',
-            },
-        ];
-
-        pushSpy = vi.spyOn(vm.router, 'push');
-        vi.spyOn(vm.arrayData, 'applyFilter');
-    });
-
-    beforeEach(() => (vm.store.data = [{ id: 1112, name: 'Trash' }]));
-    afterEach(() => vi.clearAllMocks());
-
-    it('should be defined', async () => {
-        expect(vm.searchText).toBeDefined();
-        expect(vm.searchText).toEqual('');
-    });
-
-    it('should redirect to list page if there are several results', async () => {
-        vm.store.data.push({ id: 1, name: 'employee' });
-        await vm.search();
-        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
-    });
-
-    it('should redirect to list page if there is no results', async () => {
-        vm.store.data.pop();
-        await vm.search();
-        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
-    });
-
-    it('should redirect to basic-data page if there is only one result', async () => {
-        await vm.search();
-        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/1112/basic-data' });
-    });
-});
diff --git a/test/vitest/__tests__/composables/useRedirect.spec.js b/test/vitest/__tests__/composables/useRedirect.spec.js
new file mode 100644
index 000000000..ce56189b9
--- /dev/null
+++ b/test/vitest/__tests__/composables/useRedirect.spec.js
@@ -0,0 +1,52 @@
+import { vi, describe, expect, it, beforeEach, beforeAll } from 'vitest';
+import useRedirect from 'src/composables/useRedirect';
+import { useRouter } from 'vue-router';
+
+vi.mock('vue-router');
+
+describe('useRedirect', () => {
+    useRouter.mockReturnValue({
+        push: vi.fn(),
+        currentRoute: {
+            value: {
+                matched: [
+                    { path: '/' },
+                    { path: '/customer' },
+                    { path: '/customer/:id' },
+                    { path: '/customer/:id/basic-data' },
+                ],
+            },
+        },
+    });
+    const data = [];
+    let navigate;
+    let spy;
+
+    beforeAll(() => {
+        const { navigate: navigateFn } = useRedirect();
+        navigate = navigateFn;
+        spy = useRouter().push;
+    });
+
+    beforeEach(() => {
+        data.length = 0;
+        spy.mockReset();
+    });
+
+    it('should redirect to list page if there are several results', async () => {
+        data.push({ id: 1, name: 'employee' }, { id: 2, name: 'boss' });
+        navigate(data, {});
+        expect(spy).toHaveBeenCalledWith({ path: '/customer/' });
+    });
+
+    it('should redirect to list page if there is no results', async () => {
+        navigate(data, {});
+        expect(spy).toHaveBeenCalledWith({ path: '/customer/' });
+    });
+
+    it('should redirect to basic-data page if there is only one result', async () => {
+        data.push({ id: 1, name: 'employee' });
+        navigate(data, {});
+        expect(spy).toHaveBeenCalledWith({ path: '/customer/1/basic-data' });
+    });
+});

From fdd3c41c96f4644213bf2f8aa1716f721f5d19ac Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 May 2024 15:46:48 +0200
Subject: [PATCH 33/46] feat: refs #6891 update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd8a900b6..b72bc2c8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Worker) => Se crea la sección Taquilla
+-   (General) => Se mantiene el filtro lateral en cualquier parte de la seccíon.
 
 ### Fixed
 

From a878ad23b9d81721ce54818d90907b56ce3f65d0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 May 2024 16:01:18 +0200
Subject: [PATCH 34/46] fix: refs #6891 fix invoiceInform design

---
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index bdba33500..a963f1792 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -3,14 +3,13 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
+import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
 import { downloadFile } from 'src/composables/downloadFile';
-
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
-
-import axios from 'axios';
+import VnRow from 'src/components/ui/VnRow.vue';
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -181,7 +180,7 @@ async function upsert() {
         :auto-load="true"
     >
         <template #form="{ data }">
-            <div class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('supplierFk')"
                     v-model="data.supplierFk"
@@ -208,8 +207,8 @@ async function upsert() {
                     :label="t('Supplier ref')"
                     v-model="data.supplierRef"
                 />
-            </div>
-            <div class="row q-gutter-md q-mb-md">
+            </VnRow>
+            <VnRow>
                 <QInput
                     :label="t('Expedition date')"
                     v-model="data.issued"
@@ -264,8 +263,8 @@ async function upsert() {
                         </QIcon>
                     </template>
                 </QInput>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
+            </VnRow>
+            <VnRow>
                 <QInput
                     :label="t('Undeductible VAT')"
                     v-model="data.deductibleExpenseFk"
@@ -318,8 +317,8 @@ async function upsert() {
                         </QBtn>
                     </template>
                 </QInput>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
+            </VnRow>
+            <VnRow>
                 <QInput
                     :label="t('Entry date')"
                     v-model="data.bookEntried"
@@ -378,8 +377,8 @@ async function upsert() {
                         </QIcon>
                     </template>
                 </QInput>
-            </div>
-            <div class="row q-gutter-md q-mb-md">
+            </VnRow>
+            <VnRow>
                 <VnSelect
                     :label="t('Currency')"
                     v-model="data.currencyFk"
@@ -395,13 +394,8 @@ async function upsert() {
                     option-value="id"
                     option-label="code"
                 />
-            </div>
-            <div class="row q-gutter-md q-mb-md">
-                <QCheckbox
-                    :label="t('invoiceIn.summary.booked')"
-                    v-model="data.isBooked"
-                />
-            </div>
+            </VnRow>
+            <QCheckbox :label="t('invoiceIn.summary.booked')" v-model="data.isBooked" />
         </template>
     </FormModel>
     <QDialog ref="editDmsRef">

From 6a6d5b6d23be3e0c9d431fb28faa992d0413b0fd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 May 2024 16:22:12 +0200
Subject: [PATCH 35/46] fix: refs #6891 fix workerLocker test

---
 test/cypress/integration/worker/workerLocker.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
index 8c1886438..01e74760b 100644
--- a/test/cypress/integration/worker/workerLocker.spec.js
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -1,6 +1,6 @@
 describe('WorkerList', () => {
-    const workerId = 1110;
-    const lockerCode = '200A';
+    const workerId = 1109;
+    const lockerCode = '201A';
     const input = '.q-card input';
     const firstOpt = '[role="listbox"] .q-item:nth-child(1)';
     beforeEach(() => {

From 364367d2f110e5691b32a16ede9ca68346965c75 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 May 2024 16:46:28 +0200
Subject: [PATCH 36/46] fix: refs #6891 fix invoiceInBasicData test test

---
 .../invoiceIn/invoiceInBasicData.spec.js           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index fc989d6c5..963dda3e2 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -1,7 +1,8 @@
 /// <reference types="cypress" />
 describe('InvoiceInBasicData', () => {
-    const selects = '.q-form .q-card>:nth-child(1) > :nth-child(1) > .q-field';
-    const appendBtns = 'label button';
+    const formInputs = '.q-form > .q-card input';
+    const firstFormSelect = '.q-card > .vn-row:nth-child(1) > .q-select';
+    const appendBtns = '.q-form label button';
     const dialogAppendBtns = '.q-dialog label button';
     const dialogInputs = '.q-dialog input';
     const dialogActionBtns = '.q-card__actions button';
@@ -12,15 +13,14 @@ describe('InvoiceInBasicData', () => {
     });
 
     it('should edit the provideer and supplier ref', () => {
-        cy.selectOption(selects, 'Bros');
-
+        cy.selectOption(firstFormSelect, 'Bros');
         cy.get('[title="Reset"]').click();
         cy.get(appendBtns).eq(0).click();
-        cy.get('input').eq(2).type(4739);
+        cy.get(formInputs).eq(1).type(4739);
         cy.saveCard();
 
-        cy.get(`${selects} input`).eq(0).invoke('val').should('eq', 'Plants nick');
-        cy.get('input').eq(2).invoke('val').should('eq', '4739');
+        cy.get(`${firstFormSelect} input`).invoke('val').should('eq', 'Plants nick');
+        cy.get(formInputs).eq(1).invoke('val').should('eq', '4739');
     });
 
     it('should edit the dms data', () => {

From 5b3ee220d46d68c195581df3b6cebe061b30c675 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 May 2024 17:07:59 +0200
Subject: [PATCH 37/46] fix: refs #6891 fix ticketDescriptor test

---
 test/cypress/integration/ticket/ticketDescriptor.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 22401f0b4..fc920f346 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '.q-list > :nth-child(5)';
+    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
 

From b062474f91f164303151bfc40e5c1992336c612c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 May 2024 17:20:50 +0200
Subject: [PATCH 38/46] fix: refs #6891 fix invoiceInDueDay test

---
 test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js b/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
index f39c80809..124b60c34 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 describe('InvoiceInDueDay', () => {
-    const inputs = 'label input';
+    const amountInput = 'tbody > tr:nth-child(1) td:nth-child(4)';
     const addBtn = '.q-page-sticky > div > .q-btn > .q-btn__content';
 
     beforeEach(() => {
@@ -9,7 +9,7 @@ describe('InvoiceInDueDay', () => {
     });
 
     it('should update the amount', () => {
-        cy.get(inputs).eq(3).type(23);
+        cy.get(amountInput).type('{selectall}{backspace}23');
         cy.saveCard();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });

From 289bdeecae0645252b5c811b5117429c3861ee58 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 10:41:07 +0200
Subject: [PATCH 39/46] fix: Workers/isActive

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

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 819fec7e3..19fbe49d3 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -26,7 +26,7 @@ const agencyOptions = ref([]);
         :filter="agencyFilter"
         @on-fetch="(data) => (agencyOptions = data)"
         auto-load
-        url="AgencyModes"
+        url="AgencyModes/isActive"
     />
 
     <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">

From fa82efe5d25a4f7a2dce4c94b0f044511c1e07af Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 10:41:28 +0200
Subject: [PATCH 40/46] fix: limit width some fields

---
 quasar.config.js                      |  2 +-
 src/pages/Zone/Card/ZoneBasicData.vue | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/quasar.config.js b/quasar.config.js
index dd7a91002..b59c62eeb 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 19fbe49d3..d5b727112 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -43,10 +43,23 @@ const agencyOptions = ref([]);
                     :rules="validate('zone.agencyModeFk')"
                     :options="agencyOptions"
                     :label="t('Agency')"
+                    emit-value
+                    map-options
+                    use-input
+                    hide-bottom-space
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.itemMaxSize"
+                    :label="t('Max m³')"
+                    clearable
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.m3Max"
+                    :label="t('Maximum m³')"
                     clearable
                 />
-                <VnInput v-model="data.itemMaxSize" :label="t('Max m³')" clearable />
-                <VnInput v-model="data.m3Max" :label="t('Maximum m³')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
@@ -70,7 +83,11 @@ const agencyOptions = ref([]);
         </template>
     </FormModel>
 </template>
-
+<style lang="scss" scoped>
+.mw-10 {
+    max-width: 10vw;
+}
+</style>
 <i18n>
 es:
     Name: Nombre

From c443b0a00f29c870323a3ba475ac4bed9ae3afae Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 10:50:29 +0200
Subject: [PATCH 41/46] feat: input validations

---
 src/pages/Zone/Card/ZoneBasicData.vue | 28 ++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index d5b727112..7a2c505fa 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -53,12 +53,16 @@ const agencyOptions = ref([]);
                     v-model="data.itemMaxSize"
                     :label="t('Max m³')"
                     clearable
+                    type="number"
+                    min="0"
                 />
                 <VnInput
                     class="mw-10"
                     v-model="data.m3Max"
                     :label="t('Maximum m³')"
                     clearable
+                    type="number"
+                    min="0"
                 />
             </VnRow>
 
@@ -67,18 +71,36 @@ const agencyOptions = ref([]);
                     v-model="data.travelingDays"
                     :label="t('Traveling days')"
                     clearable
+                    type="number"
+                    min="0"
                 />
                 <VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.price" :label="t('Price')" clearable />
-                <VnInput v-model="data.bonus" :label="t('Bonus')" clearable />
+                <VnInput
+                    v-model="data.price"
+                    :label="t('Price')"
+                    type="number"
+                    min="0"
+                    clearable
+                />
+                <VnInput
+                    v-model="data.bonus"
+                    :label="t('Bonus')"
+                    type="number"
+                    min="0"
+                    clearable
+                />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
-                <QCheckbox v-model="data.isVolumetric" :label="t('Volumetric')" />
+                <QCheckbox
+                    v-model="data.isVolumetric"
+                    :label="t('Volumetric')"
+                    :toggle-indeterminate="false"
+                />
             </VnRow>
         </template>
     </FormModel>

From cb40505f82c90be4d29a742bc6d939e55d957a7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 11:11:28 +0200
Subject: [PATCH 42/46] fix: VnLocation > workercreate

---
 test/cypress/integration/VnLocation.spec.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index f373bad8a..008594642 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -1,13 +1,13 @@
 const locationOptions = '[role="listbox"] > div.q-virtual-scroll__content > .q-item';
 describe('VnLocation', () => {
     const dialogInputs = '.q-dialog label input';
-    describe('Create', () => {
+    describe('Worker Create', () => {
         const inputLocation =
-            '.q-form .q-card> :nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+            '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/worker/create');
+            cy.visit('/#/worker/create', { timeout: 5000 });
             cy.waitForElement('.q-card');
         });
         it('Show all options', function () {
@@ -25,8 +25,9 @@ describe('VnLocation', () => {
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
-            cy.get(`${locationOptions}:nth-child(1)`).click();
-            cy.get(inputLocation + '> :nth-child(2) > .q-icon').click();
+            cy.get(
+                '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+            ).click();
         });
     });
     describe('Fiscal-data', () => {

From f4dd9b84fd5c4be44ae856aaa8f645beb9b402ae Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 14 May 2024 11:42:34 +0200
Subject: [PATCH 43/46] fix: VnLocation > fiscal-data

---
 src/components/CreateNewPostcodeForm.vue    |  7 ++++---
 test/cypress/integration/VnLocation.spec.js | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index fd8570176..064ad1631 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -127,9 +127,10 @@ const onProvinceCreated = async ({ name }, formData) => {
                         <CreateNewProvinceForm
                             @on-data-saved="onProvinceCreated($event, data)"
                         />
-                    </template>
-                </VnSelectDialog>
-                <VnSelect
+                    </template> </VnSelectDialog
+            ></VnRow>
+            <VnRow class="row q-gutter-md q-mb-xl"
+                ><VnSelect
                     :label="t('Country')"
                     :options="countriesOptions"
                     hide-selected
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 008594642..d1cddd0e7 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -34,26 +34,26 @@ describe('VnLocation', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/supplier/567/fiscal-data', { timeout: 2000 });
-            cy.waitForElement('.q-card');
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
+            cy.waitForElement('.q-form');
         });
         it('Create postCode', function () {
             cy.get(
-                ':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
             ).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear('12');
             cy.get(dialogInputs).eq(0).type('1234453');
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4)   > .q-select > .q-field__inner > .q-field__control ',
                 'Valencia'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5)   > .q-select > .q-field__inner > .q-field__control ',
                 'Province one'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(6)  > .q-select > .q-field__inner > .q-field__control ',
                 'España'
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();

From 189c3e0218c3d76a401cc46f14d5af0803b0a679 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 14 May 2024 13:00:03 +0200
Subject: [PATCH 44/46] fix: refs #6891 fix invoiceInVat test

---
 test/cypress/integration/invoiceIn/invoiceInVat.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index ff891399b..389be671c 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -29,7 +29,7 @@ describe('InvoiceInVat', () => {
     });
 
     it('should remove the first line', () => {
-        cy.removeRow(1);
+        cy.removeRow(2);
     });
 
     it('should throw an error if there are fields undefined', () => {

From 90a9a7dcc73d6f4903055458b8a09401010eef39 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 14 May 2024 13:07:29 +0200
Subject: [PATCH 45/46] fix: refs #6891 fix invoiceIntrastat test

---
 .../integration/invoiceIn/invoiceInIntrastat.spec.js       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
index 306c0b8c0..c87fd4315 100644
--- a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
@@ -17,10 +17,7 @@ describe('InvoiceInIntrastat', () => {
         cy.saveCard();
         cy.visit(`/#/invoice-in/1/intrastat`);
 
-        cy.getValue(firstLineCode).should(
-            'equal',
-            'Plantas vivas: Esqueje/injerto, Vid'
-        );
+        cy.getValue(firstLineCode).should('equal', 'Plantas vivas: Esqueje/injerto, Vid');
     });
 
     it('should add a new row', () => {
@@ -33,6 +30,6 @@ describe('InvoiceInIntrastat', () => {
     });
 
     it('should remove the first line', () => {
-        cy.removeRow(1);
+        cy.removeRow(2);
     });
 });

From 2b27e39d7206a46a51416105fcd4c98bc377e70e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 15 May 2024 09:37:33 +0200
Subject: [PATCH 46/46] fix: zone icon and isVolumetric default false

---
 src/pages/Zone/Card/ZoneDescriptor.vue |  2 +-
 src/pages/Zone/ZoneCreate.vue          |  1 +
 src/router/modules/zone.js             | 18 +++++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index f257a3159..b3a55bbe0 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -60,7 +60,7 @@ const setData = (entity) => {
                 flat
                 dense
                 size="md"
-                icon="preview"
+                icon="vn:zone"
                 color="white"
                 class="link"
                 :to="{ name: 'ZoneList' }"
diff --git a/src/pages/Zone/ZoneCreate.vue b/src/pages/Zone/ZoneCreate.vue
index 8aa72f0d1..e25ccae3a 100644
--- a/src/pages/Zone/ZoneCreate.vue
+++ b/src/pages/Zone/ZoneCreate.vue
@@ -19,6 +19,7 @@ const newZoneForm = reactive({
     price: 0.2,
     bonus: 0.2,
     hour: Date.vnNew(),
+    isVolumetric: false,
 });
 const warehousesOptions = ref([]);
 const agencyOptions = ref([]);
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 4b0ce0a5b..9c917c301 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -48,15 +48,15 @@ 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'),
-                },
+                // {
+                //     path: 'counter',
+                //     name: 'ZoneCounter',
+                //     meta: {
+                //         title: 'zoneCounter',
+                //         icon: 'add_circle',
+                //     },
+                //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
+                // },
             ],
         },
         {