From f60670cb87958d2c9012ad156a8ae40e45eb526a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 8 Apr 2024 10:49:53 +0200
Subject: [PATCH 01/62] refs #7172 change vnselectfilter

---
 src/pages/Claim/Card/ClaimBasicData.vue | 36 ++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index c7c5ab8a2..aad003031 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -40,11 +40,7 @@ const workers = ref([]);
 const workersCopy = ref([]);
 const claimStates = ref([]);
 const claimStatesCopy = ref([]);
-
-function setWorkers(data) {
-    workers.value = data;
-    workersCopy.value = data;
-}
+const workersOptions = ref([]);
 
 function setClaimStates(data) {
     claimStates.value = data;
@@ -89,8 +85,9 @@ const statesFilter = {
     <FetchData
         url="Workers/activeWithInheritedRole"
         :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="setWorkers"
+        @on-fetch="(data) => (workersOptions = data)"
         auto-load
+        limit="30"
     />
     <FetchData url="ClaimStates" @on-fetch="setClaimStates" auto-load />
     <FormModel
@@ -118,7 +115,7 @@ const statesFilter = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QSelect
+                    <!-- <QSelect
                         v-model="data.workerFk"
                         :options="workers"
                         option-value="id"
@@ -140,7 +137,28 @@ const statesFilter = {
                                 />
                             </QAvatar>
                         </template>
-                    </QSelect>
+                    </QSelect> -->
+                    <VnSelectFilter
+                        :label="t('claim.basicData.assignedTo')"
+                        v-model="data.workerFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        auto-load
+                        @filter="(value, update) => filter(value, update, workerFilter)"
+                        :rules="validate('claim.claimStateFk')"
+                    >
+                        <template #before>
+                            <QAvatar color="orange">
+                                <QImg
+                                    v-if="data.workerFk"
+                                    :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
+                                    spinner-color="white"
+                                />
+                            </QAvatar>
+                        </template>
+                    </VnSelectFilter>
                 </div>
                 <div class="col">
                     <QSelect

From 904f647a5b6dd7f2a533b3c5eb41f2aa9d50fbff Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 10 Apr 2024 14:16:20 +0200
Subject: [PATCH 02/62] refs #7172 fix vnSelectFilter

---
 src/pages/Claim/Card/ClaimBasicData.vue | 47 +------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index aad003031..26175dab9 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -36,8 +36,6 @@ const claimFilter = {
     ],
 };
 
-const workers = ref([]);
-const workersCopy = ref([]);
 const claimStates = ref([]);
 const claimStatesCopy = ref([]);
 const workersOptions = ref([]);
@@ -47,25 +45,6 @@ function setClaimStates(data) {
     claimStatesCopy.value = data;
 }
 
-const workerFilter = {
-    options: workers,
-    filterFn: (options, value) => {
-        const search = value.toLowerCase();
-
-        if (value === '') return workersCopy.value;
-
-        return options.value.filter((row) => {
-            const id = row.id;
-            const name = row.name.toLowerCase();
-
-            const idMatches = id == search;
-            const nameMatches = name.indexOf(search) > -1;
-
-            return idMatches || nameMatches;
-        });
-    },
-};
-
 const statesFilter = {
     options: claimStates,
     filterFn: (options, value) => {
@@ -87,7 +66,6 @@ const statesFilter = {
         :filter="{ where: { role: 'salesPerson' } }"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
-        limit="30"
     />
     <FetchData url="ClaimStates" @on-fetch="setClaimStates" auto-load />
     <FormModel
@@ -115,29 +93,6 @@ const statesFilter = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <!-- <QSelect
-                        v-model="data.workerFk"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        :label="t('claim.basicData.assignedTo')"
-                        map-options
-                        use-input
-                        @filter="(value, update) => filter(value, update, workerFilter)"
-                        :rules="validate('claim.claimStateFk')"
-                        :input-debounce="0"
-                    >
-                        <template #before>
-                            <QAvatar color="orange">
-                                <QImg
-                                    v-if="data.workerFk"
-                                    :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
-                                    spinner-color="white"
-                                />
-                            </QAvatar>
-                        </template>
-                    </QSelect> -->
                     <VnSelectFilter
                         :label="t('claim.basicData.assignedTo')"
                         v-model="data.workerFk"
@@ -146,7 +101,7 @@ const statesFilter = {
                         option-label="name"
                         emit-value
                         auto-load
-                        @filter="(value, update) => filter(value, update, workerFilter)"
+                        :virtual-scroll-slice-size="workersOptions.length"
                         :rules="validate('claim.claimStateFk')"
                     >
                         <template #before>

From fb26219354a5767fa11141c8fa5bda5fc42dded8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 19 Apr 2024 12:09:04 +0200
Subject: [PATCH 03/62] refs #7190 feat: useTokenConfig

---
 src/composables/useState.js       | 12 ++++++++++++
 src/composables/useTokenConfig.js | 26 ++++++++++++++++++++++++++
 src/i18n/locale/en.yml            |  1 +
 src/i18n/locale/es.yml            |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 src/composables/useTokenConfig.js

diff --git a/src/composables/useState.js b/src/composables/useState.js
index e0b742a73..e671d41bd 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -13,6 +13,7 @@ const user = ref({
 });
 
 const roles = ref([]);
+const tokenConfig = ref({});
 const drawer = ref(true);
 const headerMounted = ref(false);
 
@@ -52,6 +53,15 @@ export function useState() {
     function setRoles(data) {
         roles.value = data;
     }
+    function getTokenConfig() {
+        return computed(() => {
+            return tokenConfig.value;
+        });
+    }
+
+    function setTokenConfig(data) {
+        tokenConfig.value = data;
+    }
 
     function set(name, data) {
         state.value[name] = ref(data);
@@ -70,6 +80,8 @@ export function useState() {
         setUser,
         getRoles,
         setRoles,
+        getTokenConfig,
+        setTokenConfig,
         set,
         get,
         unset,
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
new file mode 100644
index 000000000..3119a6aa6
--- /dev/null
+++ b/src/composables/useTokenConfig.js
@@ -0,0 +1,26 @@
+import axios from 'axios';
+import { useState } from './useState';
+import useNotify from './useNotify';
+
+export function useTokenConfig() {
+    const state = useState();
+    const { notify } = useNotify();
+
+    async function fetch() {
+        try {
+            const tokenConfig = await axios.get('AccessTokenConfigs/findOne', {
+                filter: { fields: ['renewInterval', 'renewPeriod'] },
+            });
+            if (!tokenConfig) return;
+            state.setTokenConfig(tokenConfig);
+            return tokenConfig;
+        } catch (error) {
+            notify('errors.tokenConfig', 'negative');
+            console.error('Error fetching token config:', error);
+        }
+    }
+
+    return {
+        fetch,
+    };
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index db34b393c..bcdc6dca1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -96,6 +96,7 @@ errors:
     statusBadGateway: It seems that the server has fall down
     statusGatewayTimeout: Could not contact the server
     userConfig: Error fetching user config
+    tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
 login:
     title: Login
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index cb5876dd3..73eb70e60 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -96,6 +96,7 @@ errors:
     statusBadGateway: Parece ser que el servidor ha caído
     statusGatewayTimeout: No se ha podido contactar con el servidor
     userConfig: Error al obtener configuración de usuario
+    tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
 login:
     title: Inicio de sesión

From aecea5f273110c90d820c728d402b9b911f71836 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 19 Apr 2024 12:26:43 +0200
Subject: [PATCH 04/62] refs #7190 feat: renewToken

---
 src/composables/useSession.js     | 48 ++++++++++++++++++++++++++++++-
 src/composables/useTokenConfig.js |  3 ++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 8583e10d4..b4c5e4abb 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -3,11 +3,13 @@ import { useRole } from './useRole';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
+import { useTokenConfig } from './useTokenConfig';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
 export function useSession() {
     const { notify } = useNotify();
+    let isCheckingToken = false;
 
     function getToken() {
         const localToken = localStorage.getItem(TOKEN);
@@ -23,9 +25,12 @@ export function useSession() {
     }
 
     function setToken(data) {
-        const storage = data.keepLogin ? localStorage : sessionStorage;
+        let keepLogin = data.keepLogin ?? sessionStorage.getItem('keepLogin');
+        if (!keepLogin) keepLogin = false;
+        const storage = keepLogin ? localStorage : sessionStorage;
         storage.setItem(TOKEN, data.token);
         storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
+        sessionStorage.setItem('keepLogin', keepLogin);
     }
     async function destroyToken(url, storage, key) {
         if (storage.getItem(key)) {
@@ -59,6 +64,8 @@ export function useSession() {
             lang: '',
             darkMode: null,
         });
+
+        stopRenewer();
     }
 
     async function login(token, tokenMultimedia, keepLogin) {
@@ -66,6 +73,9 @@ export function useSession() {
 
         await useRole().fetch();
         await useUserConfig().fetch();
+        await useTokenConfig().fetch();
+
+        await checkValidity();
     }
 
     function isLoggedIn() {
@@ -75,6 +85,42 @@ export function useSession() {
         return !!(localToken || sessionToken);
     }
 
+    function stopRenewer() {
+        clearInterval(this.intervalId);
+    }
+
+    async function renewToken() {
+        const _token = getToken();
+        const token = await axios.post('VnUsers/renewToken', {
+            headers: { Authorization: _token },
+        });
+        const _tokenMultimedia = getTokenMultimedia();
+        const tokenMultimedia = await axios.post('VnUsers/renewToken', {
+            headers: { Authorization: _tokenMultimedia },
+        });
+        setToken({ token, tokenMultimedia });
+    }
+
+    async function checkValidity() {
+        const { getTokenConfig } = useState();
+
+        const tokenConfig = getTokenConfig();
+        const created = +localStorage.getItem('created');
+        const ttl = localStorage.getItem('ttl');
+
+        if (isCheckingToken || !created) return;
+        isCheckingToken = true;
+
+        const renewPeriodInSeconds = Math.min(ttl, tokenConfig.value.renewPeriod) * 1000;
+        const maxDate = created + renewPeriodInSeconds;
+        const now = new Date();
+
+        if (now.getTime() <= maxDate) return (isCheckingToken = false);
+
+        await renewToken();
+        isCheckingToken = false;
+    }
+
     return {
         getToken,
         getTokenMultimedia,
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
index 3119a6aa6..afe7a5272 100644
--- a/src/composables/useTokenConfig.js
+++ b/src/composables/useTokenConfig.js
@@ -8,6 +8,9 @@ export function useTokenConfig() {
 
     async function fetch() {
         try {
+            let tokenConfigState = state.getTokenConfig();
+            if (tokenConfigState) return tokenConfigState;
+
             const tokenConfig = await axios.get('AccessTokenConfigs/findOne', {
                 filter: { fields: ['renewInterval', 'renewPeriod'] },
             });

From 2b24e18f755c135ae7f94e284fcf58d0cdba1b98 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 22 Apr 2024 07:37:35 +0200
Subject: [PATCH 05/62] FEAT: SETiNTERVAL WITH RENEWpERIOD

---
 src/composables/useSession.js     | 68 +++++++++++++++++++++++--------
 src/composables/useTokenConfig.js | 12 +++---
 src/pages/Login/LoginMain.vue     |  8 +++-
 src/router/index.js               |  2 +
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index b4c5e4abb..f308bf3e2 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -10,6 +10,7 @@ const TOKEN = 'token';
 export function useSession() {
     const { notify } = useNotify();
     let isCheckingToken = false;
+    let intervalId = null;
 
     function getToken() {
         const localToken = localStorage.getItem(TOKEN);
@@ -24,14 +25,25 @@ export function useSession() {
         return localTokenMultimedia || sessionTokenMultimedia || '';
     }
 
-    function setToken(data) {
-        let keepLogin = data.keepLogin ?? sessionStorage.getItem('keepLogin');
-        if (!keepLogin) keepLogin = false;
+    function setSession(data) {
+        let keepLogin = data.keepLogin;
         const storage = keepLogin ? localStorage : sessionStorage;
         storage.setItem(TOKEN, data.token);
         storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
+        storage.setItem('created', data.created);
+        storage.setItem('ttl', data.ttl);
         sessionStorage.setItem('keepLogin', keepLogin);
     }
+
+    function keepLogin() {
+        return sessionStorage.getItem('keepLogin');
+    }
+
+    function setToken({ token, tokenMultimedia }) {
+        const storage = keepLogin() ? localStorage : sessionStorage;
+        storage.setItem(TOKEN, token);
+        storage.setItem(TOKEN_MULTIMEDIA, tokenMultimedia);
+    }
     async function destroyToken(url, storage, key) {
         if (storage.getItem(key)) {
             try {
@@ -50,11 +62,15 @@ export function useSession() {
             tokenMultimedia: 'Accounts/logout',
             token: 'VnUsers/logout',
         };
+        const storage = keepLogin() ? localStorage : sessionStorage;
+
         for (const [key, url] of Object.entries(tokens)) {
-            await destroyToken(url, localStorage, key);
-            await destroyToken(url, sessionStorage, key);
+            await destroyToken(url, storage, key);
         }
 
+        localStorage.clear();
+        sessionStorage.clear();
+
         const { setUser } = useState();
 
         setUser({
@@ -68,25 +84,33 @@ export function useSession() {
         stopRenewer();
     }
 
-    async function login(token, tokenMultimedia, keepLogin) {
-        setToken({ token, tokenMultimedia, keepLogin });
+    async function login(data) {
+        setSession(data);
 
         await useRole().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
-
-        await checkValidity();
+        startInterval();
     }
 
     function isLoggedIn() {
         const localToken = localStorage.getItem(TOKEN);
         const sessionToken = sessionStorage.getItem(TOKEN);
-
+        startInterval();
         return !!(localToken || sessionToken);
     }
 
+    function startInterval() {
+        stopRenewer();
+        const renewPeriod = +sessionStorage.getItem('renewPeriod');
+        if (!renewPeriod) return;
+        intervalId = setInterval(() => checkValidity(), renewPeriod * 1000);
+        // JUST FOR TEST
+        // checkValidity();
+    }
+
     function stopRenewer() {
-        clearInterval(this.intervalId);
+        clearInterval(intervalId);
     }
 
     async function renewToken() {
@@ -98,24 +122,32 @@ export function useSession() {
         const tokenMultimedia = await axios.post('VnUsers/renewToken', {
             headers: { Authorization: _tokenMultimedia },
         });
-        setToken({ token, tokenMultimedia });
+        setToken({ token: token.data.id, tokenMultimedia: tokenMultimedia.data.id });
     }
 
     async function checkValidity() {
         const { getTokenConfig } = useState();
 
-        const tokenConfig = getTokenConfig();
-        const created = +localStorage.getItem('created');
-        const ttl = localStorage.getItem('ttl');
+        const tokenConfig = getTokenConfig() ?? sessionStorage.getItem('tokenConfig');
+        const storage = keepLogin() ? localStorage : sessionStorage;
+
+        const created = +storage.getItem('created');
+        const ttl = +storage.getItem('ttl');
 
         if (isCheckingToken || !created) return;
         isCheckingToken = true;
 
         const renewPeriodInSeconds = Math.min(ttl, tokenConfig.value.renewPeriod) * 1000;
-        const maxDate = created + renewPeriodInSeconds;
-        const now = new Date();
 
-        if (now.getTime() <= maxDate) return (isCheckingToken = false);
+        const maxDate = created + renewPeriodInSeconds;
+        const now = new Date().getTime();
+
+        //COMMENT THIS IF JUST FOR TEST
+        if (isNaN(renewPeriodInSeconds) || now <= maxDate) {
+            console.error('Token not renewed');
+            return (isCheckingToken = false);
+        }
+        console.error('Token renewed');
 
         await renewToken();
         isCheckingToken = false;
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
index afe7a5272..600122199 100644
--- a/src/composables/useTokenConfig.js
+++ b/src/composables/useTokenConfig.js
@@ -8,15 +8,13 @@ export function useTokenConfig() {
 
     async function fetch() {
         try {
-            let tokenConfigState = state.getTokenConfig();
-            if (tokenConfigState) return tokenConfigState;
-
-            const tokenConfig = await axios.get('AccessTokenConfigs/findOne', {
+            const { data } = await axios.get('AccessTokenConfigs/findOne', {
                 filter: { fields: ['renewInterval', 'renewPeriod'] },
             });
-            if (!tokenConfig) return;
-            state.setTokenConfig(tokenConfig);
-            return tokenConfig;
+            if (!data) return;
+            state.setTokenConfig(data);
+            sessionStorage.setItem('renewPeriod', data.renewPeriod);
+            return data;
         } catch (error) {
             notify('errors.tokenConfig', 'negative');
             console.error('Error fetching token config:', error);
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index fcde51edf..5a3490f50 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -38,7 +38,13 @@ async function onSubmit() {
 
         if (!multimediaToken) return;
 
-        await session.login(data.token, multimediaToken.id, keepLogin.value);
+        const login = {
+            ...data,
+            created: Date.now(),
+            tokenMultimedia: multimediaToken.id,
+            keepLogin: keepLogin.value,
+        };
+        await session.login(login);
 
         quasar.notify({
             message: t('login.loginSuccess'),
diff --git a/src/router/index.js b/src/router/index.js
index 3e442f0e6..7a0aedcae 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,6 +12,7 @@ import { useSession } from 'src/composables/useSession';
 import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import { toLowerCamel } from 'src/filters';
+import { useTokenConfig } from 'src/composables/useTokenConfig';
 
 const state = useState();
 const session = useSession();
@@ -55,6 +56,7 @@ export default route(function (/* { store, ssrContext } */) {
             if (stateRoles.length === 0) {
                 await useRole().fetch();
                 await useUserConfig().fetch();
+                await useTokenConfig().fetch();
             }
             const matches = to.matched;
             const hasRequiredRoles = matches.every((route) => {

From 78561c5f42e1660333c28a85618fbc199f2390b8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Apr 2024 08:34:38 -0300
Subject: [PATCH 06/62] Item types

---
 src/i18n/locale/en.yml                        |  19 ++++
 src/i18n/locale/es.yml                        |  24 +++++
 src/pages/Item/ItemTypeCreate.vue             |  91 ++++++++++++++++
 src/pages/Item/ItemTypeList.vue               |  86 +++++++++++++++
 src/pages/ItemType/Card/ItemTypeBasicData.vue |  79 ++++++++++++++
 src/pages/ItemType/Card/ItemTypeCard.vue      |  26 +++++
 .../ItemType/Card/ItemTypeDescriptor.vue      |  82 ++++++++++++++
 src/pages/ItemType/Card/ItemTypeSummary.vue   | 102 ++++++++++++++++++
 src/router/modules/index.js                   |   2 +
 src/router/modules/item.js                    |  21 +++-
 src/router/modules/itemType.js                |  45 ++++++++
 src/router/routes.js                          |   2 +
 12 files changed, 577 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Item/ItemTypeCreate.vue
 create mode 100644 src/pages/Item/ItemTypeList.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeBasicData.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeCard.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeDescriptor.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeSummary.vue
 create mode 100644 src/router/modules/itemType.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..2962bbe44 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1119,6 +1119,8 @@ item:
         tags: Tags
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        itemTypeCreate: New item type
+        family: Item Type
     descriptor:
         item: Item
         buyer: Buyer
@@ -1153,6 +1155,23 @@ item:
         type: Type
         intrastat: Intrastat
         origin: Origin
+itemType:
+    pageTitles:
+        itemType: Item type
+        basicData: Basic data
+        summary: Summary
+    shared:
+        code: Code
+        name: Name
+        worker: Worker
+        category: Category
+        temperature: Temperature
+    summary:
+        id: id
+        life: Life
+        promo: Promo
+        itemPackingType: Item packing type
+        isUnconventionalSize: Is unconventional size
 components:
     topbar: {}
     userPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..d52240bf4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1118,6 +1118,8 @@ item:
         tags: Etiquetas
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        itemTypeCreate: Nueva familia
+        family: Familia
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -1152,6 +1154,28 @@ item:
         type: Tipo
         intrastat: Intrastat
         origin: Origen
+itemType:
+    pageTitles:
+        itemType: Familia
+        basicData: Datos básicos
+        summary: Resumen
+    shared:
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+    summary:
+        id: id
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+        life: Vida
+        promo: Promoción
+        itemPackingType: Tipo de embalaje
+        isUnconventionalSize: Es de tamaño no convencional
 components:
     topbar: {}
     userPanel:
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
new file mode 100644
index 000000000..3540fc5af
--- /dev/null
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -0,0 +1,91 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+
+const newItemTypeForm = reactive({});
+
+const workersOptions = ref([]);
+const categoriesOptions = ref([]);
+const temperaturesOptions = ref([]);
+
+const redirectToItemTypeBasicData = (_, { id }) => {
+    router.push({ name: 'ItemTypeBasicData', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Workers"
+        @on-fetch="(data) => (workersOptions = data)"
+        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
+        auto-load
+    />
+    <FetchData
+        url="ItemCategories"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['id', 'name'] }"
+        auto-load
+    />
+    <FetchData
+        url="Temperatures"
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
+        auto-load
+    />
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="ItemTypes"
+            model="itemTypeCreate"
+            :form-initial-data="newItemTypeForm"
+            observe-form-changes
+            @on-data-saved="redirectToItemTypeBasicData"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
+                    <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        v-model="data.workerFk"
+                        :label="t('itemType.shared.worker')"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="firstName"
+                        hide-selected
+                    />
+                    <VnSelectFilter
+                        v-model="data.categoryFk"
+                        :label="t('itemType.shared.category')"
+                        :options="categoriesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        v-model="data.temperatureFk"
+                        :label="t('itemType.shared.temperature')"
+                        :options="temperaturesOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
new file mode 100644
index 000000000..b0b4de540
--- /dev/null
+++ b/src/pages/Item/ItemTypeList.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+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 VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+
+const redirectToItemTypeSummary = (id) => {
+    router.push({ name: 'ItemTypeSummary', params: { id } });
+};
+
+const redirectToCreateView = () => {
+    router.push({ name: 'ItemTypeCreate' });
+};
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ItemTypeList"
+                url="ItemTypes"
+                custom-route-redirect-name="ItemTypeSummary"
+                :label="t('Search item type')"
+                :info="t('Search itemType by id, name or code')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="ItemTypeList"
+                url="ItemTypes"
+                :order="['name']"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.code"
+                        @click="redirectToItemTypeSummary(row.id)"
+                        :id="row.id"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('Name')" :value="row.name" />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, ItemTypeSummary)"
+                                color="primary"
+                                type="submit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('New item type') }}
+        </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/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
new file mode 100644
index 000000000..ff2719896
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+const categoriesOptions = ref([]);
+const temperaturesOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Workers"
+        @on-fetch="(data) => (workersOptions = data)"
+        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
+        auto-load
+    />
+    <FetchData
+        url="ItemCategories"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['id', 'name'] }"
+        auto-load
+    />
+    <FetchData
+        url="Temperatures"
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
+        auto-load
+    />
+    <FormModel
+        :url="`ItemTypes/${route.params.id}`"
+        :url-update="`ItemTypes/${route.params.id}`"
+        model="itemTypeBasicData"
+        auto-load
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
+                <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectFilter
+                    v-model="data.workerFk"
+                    :label="t('itemType.shared.worker')"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="firstName"
+                    hide-selected
+                />
+                <VnSelectFilter
+                    v-model="data.categoryFk"
+                    :label="t('itemType.shared.category')"
+                    :options="categoriesOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectFilter
+                    v-model="data.temperatureFk"
+                    :label="t('itemType.shared.temperature')"
+                    :options="temperaturesOptions"
+                    option-value="code"
+                    option-label="name"
+                    hide-selected
+                />
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
new file mode 100644
index 000000000..bff91de06
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -0,0 +1,26 @@
+<script setup>
+import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <ItemTypeDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div class="q-pa-md column items-center">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
new file mode 100644
index 000000000..cb0cb333b
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemTypeFilter = {
+    include: [
+        { relation: 'worker' },
+        { relation: 'category' },
+        { relation: 'itemPackingType' },
+        { relation: 'temperature' },
+    ],
+};
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="ItemType"
+        :url="`ItemTypes/${entityId}`"
+        :filter="itemTypeFilter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+        data-key="entry"
+    >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                size="sm"
+                icon="vn:item"
+                color="white"
+                :to="{ name: 'ItemTypeList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('itemType.shared.code')" :value="entity.code" />
+            <VnLv :label="t('itemType.shared.name')" :value="entity.name" />
+            <VnLv
+                :label="t('itemType.shared.worker')"
+                :value="entity.worker?.firstName"
+            />
+            <VnLv :label="t('itemType.shared.category')" :value="entity.category?.name" />
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+</i18n>
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
new file mode 100644
index 000000000..b71b2acf5
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -0,0 +1,102 @@
+<script setup>
+import { ref, computed, onUpdated } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+onUpdated(() => summaryRef.value.fetch());
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const itemTypeFilter = {
+    include: [
+        { relation: 'worker' },
+        { relation: 'category' },
+        { relation: 'itemPackingType' },
+        { relation: 'temperature' },
+    ],
+};
+
+const entityId = computed(() => $props.id || route.params.id);
+const summaryRef = ref();
+const itemType = ref();
+
+async function setItemTypeData(data) {
+    if (data) itemType.value = data;
+}
+</script>
+
+<template>
+    <CardSummary
+        ref="summaryRef"
+        :url="`ItemTypes/${entityId}`"
+        data-key="ItemTypeSummary"
+        :filter="itemTypeFilter"
+        @on-fetch="(data) => setItemTypeData(data)"
+        class="full-width"
+    >
+        <template #header-left>
+            <router-link
+                v-if="route.name !== 'ItemTypeSummary'"
+                :to="{ name: 'ItemTypeSummary', params: { id: entityId } }"
+                class="header link"
+            >
+                <QIcon name="open_in_new" color="white" size="sm" />
+            </router-link>
+        </template>
+        <template #header>
+            <span>
+                {{ itemType.id }} - {{ itemType.name }} -
+                {{ itemType.worker?.firstName }}
+                {{ itemType.worker?.lastName }}
+            </span>
+        </template>
+        <template #body>
+            <QCard class="vn-one">
+                <router-link
+                    :to="{ name: 'ItemTypeBasicData', params: { id: entityId } }"
+                    class="header header-link"
+                >
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" />
+                </router-link>
+                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
+                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
+                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv
+                    :label="t('itemType.shared.worker')"
+                    :value="itemType.worker?.firstName"
+                />
+                <VnLv
+                    :label="t('itemType.shared.category')"
+                    :value="itemType.category?.name"
+                />
+                <VnLv
+                    :label="t('itemType.shared.temperature')"
+                    :value="itemType.temperature?.name"
+                />
+                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
+                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
+                <VnLv
+                    :label="t('itemType.summary.itemPackingType')"
+                    :value="itemType.itemPackingType?.description"
+                />
+                <VnLv
+                    :label="t('itemType.summary.isUnconventionalSize')"
+                    :value="itemType.isUnconventionalSize"
+                />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 302ba7fe0..0b9d10d98 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -15,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
+import ItemType from './itemType';
 
 export default [
     Item,
@@ -34,4 +35,5 @@ export default [
     Entry,
     roadmap,
     Parking,
+    ItemType,
 ];
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..17e9b7673 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
-        main: ['ItemList', 'WasteBreakdown'],
+        main: ['ItemList', 'WasteBreakdown', 'ItemTypeList'],
         card: ['ItemBasicData'],
     },
     children: [
@@ -33,7 +33,7 @@ export default {
                     path: 'create',
                     name: 'ItemCreate',
                     meta: {
-                        title: 'create',
+                        title: 'itemCreate',
                     },
                     component: () => import('src/pages/Item/ItemCreate.vue'),
                 },
@@ -50,6 +50,23 @@ export default {
                             'https://grafana.verdnatura.es/d/TTNXQAxVk';
                     },
                 },
+                {
+                    path: 'item-type-list',
+                    name: 'ItemTypeList',
+                    meta: {
+                        title: 'family',
+                        icon: 'contact_support',
+                    },
+                    component: () => import('src/pages/Item/ItemTypeList.vue'),
+                },
+                {
+                    path: 'item-type-list/create',
+                    name: 'ItemTypeCreate',
+                    meta: {
+                        title: 'itemTypeCreate',
+                    },
+                    component: () => import('src/pages/Item/ItemTypeCreate.vue'),
+                },
             ],
         },
         {
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
new file mode 100644
index 000000000..0d966c32c
--- /dev/null
+++ b/src/router/modules/itemType.js
@@ -0,0 +1,45 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/item-type',
+    name: 'ItemType',
+    meta: {
+        title: 'itemType',
+        icon: 'contact_support',
+    },
+    component: RouterView,
+    redirect: { name: 'ItemTypeCard' },
+    menus: {
+        main: [],
+        card: ['ItemTypeBasicData'],
+    },
+    children: [
+        {
+            name: 'ItemTypeCard',
+            path: ':id',
+            component: () => import('src/pages/ItemType/Card/ItemTypeCard.vue'),
+            redirect: { name: 'ItemTypeSummary' },
+            children: [
+                {
+                    name: 'ItemTypeSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                    },
+                    component: () =>
+                        import('src/pages/ItemType/Card/ItemTypeSummary.vue'),
+                },
+                {
+                    name: 'ItemTypeBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/ItemType/Card/ItemTypeBasicData.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 51e726a62..198f1d8f2 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -10,6 +10,7 @@ import supplier from './modules/Supplier';
 import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
+import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
@@ -71,6 +72,7 @@ const routes = [
             roadmap,
             entry,
             parking,
+            ItemType,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From 6018d51642165a13e97ab9bb480d8686bcb62872 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Apr 2024 07:56:07 +0200
Subject: [PATCH 07/62] perf: #7190 remove comments

---
 src/composables/useSession.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index f308bf3e2..bd3532816 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -90,6 +90,7 @@ export function useSession() {
         await useRole().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
+
         startInterval();
     }
 
@@ -105,8 +106,6 @@ export function useSession() {
         const renewPeriod = +sessionStorage.getItem('renewPeriod');
         if (!renewPeriod) return;
         intervalId = setInterval(() => checkValidity(), renewPeriod * 1000);
-        // JUST FOR TEST
-        // checkValidity();
     }
 
     function stopRenewer() {
@@ -144,10 +143,8 @@ export function useSession() {
 
         //COMMENT THIS IF JUST FOR TEST
         if (isNaN(renewPeriodInSeconds) || now <= maxDate) {
-            console.error('Token not renewed');
             return (isCheckingToken = false);
         }
-        console.error('Token renewed');
 
         await renewToken();
         isCheckingToken = false;

From 04fe9330d45e97a4ec470abaf088245657ee1840 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Apr 2024 08:03:09 +0200
Subject: [PATCH 08/62] fix: #7190 tests

---
 .../__tests__/composables/useSession.spec.js       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index f9f3dcb80..8feb5e571 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -96,7 +96,11 @@ describe('session', () => {
             const expectedTokenMultimedia = 'mySessionTokenMultimedia';
             const keepLogin = false;
 
-            await session.login(expectedToken,expectedTokenMultimedia, keepLogin);
+            await session.login({
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin,
+            });
 
             const roles = state.getRoles();
             const localToken = localStorage.getItem('token');
@@ -106,7 +110,7 @@ describe('session', () => {
             expect(localToken).toBeNull();
             expect(sessionToken).toEqual(expectedToken);
 
-           await session.destroy(); // this clears token and user for any other test
+            await session.destroy(); // this clears token and user for any other test
         });
 
         it('should fetch the user roles and then set token in the localStorage', async () => {
@@ -119,7 +123,11 @@ describe('session', () => {
             const expectedTokenMultimedia = 'myLocalTokenMultimedia';
             const keepLogin = true;
 
-            await session.login(expectedToken, expectedTokenMultimedia, keepLogin);
+            await session.login({
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin,
+            });
 
             const roles = state.getRoles();
             const localToken = localStorage.getItem('token');

From c621ccb5a6e35552a25bc203575554c852d9f8d2 Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Tue, 23 Apr 2024 13:19:21 +0200
Subject: [PATCH 09/62] refs #7113 fix test

---
 test/cypress/support/commands.js | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index f075d500f..13103950c 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -38,6 +38,15 @@ Cypress.Commands.add('login', (user) => {
         },
     }).then((response) => {
         window.localStorage.setItem('token', response.body.token);
+        cy.request({
+            method: 'GET',
+            url: '/api/VnUsers/ShareToken',
+            headers: {
+                Authorization: window.localStorage.getItem('token'),
+            },
+        }).then(({ body }) => {
+            window.localStorage.setItem('tokenMultimedia', body.multimediaToken.id);
+        });
     });
 });
 
@@ -52,16 +61,18 @@ Cypress.Commands.add('getValue', (selector) => {
         }
         // Si es un QSelect
         if ($el.find('.q-select__dropdown-icon').length) {
-            return cy.get(
-                selector +
-                    '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
-            ).invoke('val')
+            return cy
+                .get(
+                    selector +
+                        '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
+                )
+                .invoke('val');
         }
         // Si es un QSelect
         if ($el.find('span').length) {
-            return cy.get(
-                selector + ' span'
-            ).then(($span) => { return $span[0].innerText })
+            return cy.get(selector + ' span').then(($span) => {
+                return $span[0].innerText;
+            });
         }
         // Puedes añadir un log o lanzar un error si el elemento no es reconocido
         cy.log('Elemento no soportado');
@@ -132,13 +143,13 @@ Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
     cy.get(rowSelector).within(() => {
         for (const [index, value] of expectedValues.entries()) {
             cy.log('CHECKING ', index, value);
-            if(value === undefined) continue
+            if (value === undefined) continue;
             if (typeof value == 'boolean') {
                 const prefix = value ? '' : 'not.';
                 cy.getValue(`:nth-child(${index + 1})`).should(`${prefix}be.checked`);
                 continue;
             }
-            cy.getValue(`:nth-child(${index + 1})`).should('equal', value)
+            cy.getValue(`:nth-child(${index + 1})`).should('equal', value);
         }
     });
 });

From 42fe189e9f6b222cb6a1c81d916dfd82cbec5601 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Apr 2024 16:45:28 -0300
Subject: [PATCH 10/62] Add module name in Item router file

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

diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 17e9b7673..70d49c56c 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },

From 82300fd292307a89a5397397db44add3f1ca6b17 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 24 Apr 2024 11:31:37 +0200
Subject: [PATCH 11/62] refactor: refs #7239 changed french translations

---
 src/components/common/VnSmsDialog.vue | 39 ++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 59021cef4..4306beb4c 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -21,7 +21,8 @@ const props = defineProps({
     },
     template: {
         type: String,
-        required: true,
+        required: false,
+        default: '',
     },
     locale: {
         type: String,
@@ -49,7 +50,7 @@ updateMessage();
 
 function updateMessage() {
     const params = props.data;
-    const key = `templates['${props.template}']`;
+    const key = props.template ? `templates['${props.template}']` : '';
 
     message.value = t(key, params, { locale: locale.value });
 }
@@ -104,15 +105,14 @@ async function send() {
                     map-options
                     :input-debounce="0"
                     rounded
-                    outlined
                     dense
                 />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput :label="t('Phone')" v-model="phone" is-outlined />
+                <VnInput :label="t('Phone')" v-model="phone" />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput v-model="subject" :label="t('Subject')" is-outlined />
+                <VnInput v-model="subject" :label="t('Subject')" />
             </QCardSection>
             <QCardSection class="q-mb-md" q-input>
                 <QInput
@@ -125,7 +125,6 @@ async function send() {
                     :bottom-slots="true"
                     :rules="[(value) => value.length < maxLength || 'Error!']"
                     stack-label
-                    outlined
                     autofocus
                 >
                     <template #append>
@@ -135,6 +134,11 @@ async function send() {
                             @click="message = ''"
                             class="cursor-pointer"
                         />
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>
+                                {{ t('messageTooltip') }}
+                            </QTooltip>
+                        </QIcon>
                     </template>
                     <template #counter>
                         <QChip :color="color" dense>
@@ -184,18 +188,20 @@ en:
     es: Spanish
     fr: French
     pt: Portuguese
+    messageTooltip: Special characters like accents counts as multiple
 es:
     Send SMS: Enviar SMS
     Language: Idioma
     Phone: Móvil
     Subject: Asunto
     Message: Mensaje
+    messageTooltip: Carácteres especiales como acentos cuentan como varios
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            { orderId } del día { shipped } para recibirlo sin portes adicionales.'
-        orderChanges: 'Pedido {orderId} día { shipped }: { changes }'
+            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+        orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés
     es: Español
     fr: Francés
@@ -207,12 +213,14 @@ fr:
     Phone: Mobile
     Subject: Affaire
     Message: Message
+    messageTooltip: Les caractères spéciaux comme les accents comptent comme plusieurs
     templates:
-        pendingPayment: 'Votre commande est en attente de paiement.
-            Veuillez vous connecter sur le site web et effectuer le paiement par carte. Merci beaucoup.'
-        minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande
-            { orderId } du { shipped } afin de la recevoir sans frais de port supplémentaires.'
-        orderChanges: 'Commande { orderId } du { shipped }: { changes }'
+        pendingPayment: 'Verdnatura : Commande en attente de règlement. Veuillez régler votre commande avant 9h.
+            Sinon elle sera décalée en fonction de vos jours de livraison . Merci'
+        minAmount: 'Verdnatura vous rappelle :
+            Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
+            Merci.'
+        orderChanges: 'Commande {orderId} livraison {landing} indisponible/s. Désolés pour le dérangement.'
     en: Anglais
     es: Espagnol
     fr: Français
@@ -224,12 +232,13 @@ pt:
     Phone: Móvel
     Subject: Assunto
     Message: Mensagem
+    messageTooltip: Caracteres especiais como acentos contam como vários
     templates:
         pendingPayment: 'Seu pedido está pendente de pagamento.
             Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.'
         minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido
-            { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.'
-        orderChanges: 'Pedido { orderId } dia { shipped }: { changes }'
+            { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
+        orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
     en: Inglês
     es: Espanhol
     fr: Francês

From a555d11663650f94f64a0619fbdb458f3a2b480e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 12:15:12 +0200
Subject: [PATCH 12/62] fix: #7190 test

---
 src/composables/useSession.js                 |   3 +
 src/composables/useTokenConfig.js             |   1 +
 .../__tests__/composables/useSession.spec.js  | 197 ++++++++++++------
 .../composables/useTokenConfig.spec.js        |  31 +++
 4 files changed, 167 insertions(+), 65 deletions(-)
 create mode 100644 test/vitest/__tests__/composables/useTokenConfig.spec.js

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index bd3532816..3b38cdad6 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -157,5 +157,8 @@ export function useSession() {
         destroy,
         login,
         isLoggedIn,
+        checkValidity,
+        setSession,
+        renewToken,
     };
 }
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
index 600122199..5cf1b34ee 100644
--- a/src/composables/useTokenConfig.js
+++ b/src/composables/useTokenConfig.js
@@ -23,5 +23,6 @@ export function useTokenConfig() {
 
     return {
         fetch,
+        state,
     };
 }
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 8feb5e571..2292859a9 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -1,5 +1,5 @@
-import { vi, describe, expect, it } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
 import { useSession } from 'composables/useSession';
 import { useState } from 'composables/useState';
 
@@ -63,81 +63,148 @@ describe('session', () => {
         });
     });
 
-    describe('login', () => {
-        const expectedUser = {
-            id: 999,
-            name: `T'Challa`,
-            nickname: 'Black Panther',
-            lang: 'en',
-            userConfig: {
-                darkMode: false,
-            },
-        };
-        const rolesData = [
-            {
-                role: {
-                    name: 'salesPerson',
+    describe(
+        'login',
+        () => {
+            const expectedUser = {
+                id: 999,
+                name: `T'Challa`,
+                nickname: 'Black Panther',
+                lang: 'en',
+                userConfig: {
+                    darkMode: false,
                 },
-            },
-            {
-                role: {
-                    name: 'admin',
+            };
+            const rolesData = [
+                {
+                    role: {
+                        name: 'salesPerson',
+                    },
                 },
-            },
-        ];
+                {
+                    role: {
+                        name: 'admin',
+                    },
+                },
+            ];
 
-        it('should fetch the user roles and then set token in the sessionStorage', async () => {
-            const expectedRoles = ['salesPerson', 'admin'];
-            vi.spyOn(axios, 'get').mockResolvedValue({
-                data: { roles: rolesData, user: expectedUser },
+            it('should fetch the user roles and then set token in the sessionStorage', async () => {
+                const expectedRoles = ['salesPerson', 'admin'];
+                vi.spyOn(axios, 'get').mockResolvedValue({
+                    data: { roles: rolesData, user: expectedUser },
+                });
+
+                const expectedToken = 'mySessionToken';
+                const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+                const keepLogin = false;
+
+                await session.login({
+                    token: expectedToken,
+                    tokenMultimedia: expectedTokenMultimedia,
+                    keepLogin,
+                });
+
+                const roles = state.getRoles();
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
+
+                expect(roles.value).toEqual(expectedRoles);
+                expect(localToken).toBeNull();
+                expect(sessionToken).toEqual(expectedToken);
+
+                await session.destroy(); // this clears token and user for any other test
             });
 
-            const expectedToken = 'mySessionToken';
-            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
-            const keepLogin = false;
+            it('should fetch the user roles and then set token in the localStorage', async () => {
+                const expectedRoles = ['salesPerson', 'admin'];
+                vi.spyOn(axios, 'get').mockResolvedValue({
+                    data: { roles: rolesData, user: expectedUser },
+                });
 
-            await session.login({
-                token: expectedToken,
-                tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
+                const expectedToken = 'myLocalToken';
+                const expectedTokenMultimedia = 'myLocalTokenMultimedia';
+                const keepLogin = true;
+
+                await session.login({
+                    token: expectedToken,
+                    tokenMultimedia: expectedTokenMultimedia,
+                    keepLogin,
+                });
+
+                const roles = state.getRoles();
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
+
+                expect(roles.value).toEqual(expectedRoles);
+                expect(localToken).toEqual(expectedToken);
+                expect(sessionToken).toBeNull();
+
+                await session.destroy(); // this clears token and user for any other test
             });
+        },
+        {}
+    );
 
-            const roles = state.getRoles();
-            const localToken = localStorage.getItem('token');
-            const sessionToken = sessionStorage.getItem('token');
-
-            expect(roles.value).toEqual(expectedRoles);
-            expect(localToken).toBeNull();
-            expect(sessionToken).toEqual(expectedToken);
-
-            await session.destroy(); // this clears token and user for any other test
+    describe('RenewToken', () => {
+        const expectedToken = 'myToken';
+        const expectedTokenMultimedia = 'myTokenMultimedia';
+        const currentDate = new Date();
+        beforeAll(() => {
+            const tokenConfig = {
+                id: 1,
+                renewPeriod: 21600,
+                courtesyTime: 60,
+                renewInterval: 300,
+            };
+            state.setTokenConfig(tokenConfig);
+            sessionStorage.setItem('renewPeriod', 1);
         });
-
-        it('should fetch the user roles and then set token in the localStorage', async () => {
-            const expectedRoles = ['salesPerson', 'admin'];
-            vi.spyOn(axios, 'get').mockResolvedValue({
-                data: { roles: rolesData, user: expectedUser },
-            });
-
-            const expectedToken = 'myLocalToken';
-            const expectedTokenMultimedia = 'myLocalTokenMultimedia';
-            const keepLogin = true;
-
-            await session.login({
+        it('NOT Should renewToken', async () => {
+            const data = {
                 token: expectedToken,
                 tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
-            });
+                keepLogin: false,
+                ttl: 1,
+                created: Date.now(),
+            };
+            session.setSession(data);
+            expect(sessionStorage.getItem('keepLogin')).toBeFalsy();
+            expect(sessionStorage.getItem('created')).toBeDefined();
+            expect(sessionStorage.getItem('ttl')).toEqual(1);
+            await session.checkValidity();
+            expect(sessionStorage.getItem('token')).toEqual(expectedToken);
+            expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
+                expectedTokenMultimedia
+            );
+        });
+        it('Should renewToken', async () => {
+            currentDate.setMinutes(currentDate.getMinutes() - 100);
+            const data = {
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin: false,
+                ttl: 1,
+                created: currentDate,
+            };
+            session.setSession(data);
 
-            const roles = state.getRoles();
-            const localToken = localStorage.getItem('token');
-            const sessionToken = sessionStorage.getItem('token');
-
-            expect(roles.value).toEqual(expectedRoles);
-            expect(localToken).toEqual(expectedToken);
-            expect(sessionToken).toBeNull();
-
-            await session.destroy(); // this clears token and user for any other test
+            vi.spyOn(axios, 'post')
+                .mockResolvedValueOnce({
+                    data: { id: '' },
+                })
+                .mockResolvedValueOnce({
+                    data: {
+                        id: '',
+                    },
+                });
+            expect(sessionStorage.getItem('keepLogin')).toBeFalsy();
+            expect(sessionStorage.getItem('created')).toBeDefined();
+            expect(sessionStorage.getItem('ttl')).toEqual(1);
+            await session.checkValidity();
+            expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
+            expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
+                expectedTokenMultimedia
+            );
         });
     });
 });
diff --git a/test/vitest/__tests__/composables/useTokenConfig.spec.js b/test/vitest/__tests__/composables/useTokenConfig.spec.js
new file mode 100644
index 000000000..a25a4abb1
--- /dev/null
+++ b/test/vitest/__tests__/composables/useTokenConfig.spec.js
@@ -0,0 +1,31 @@
+import { vi, describe, expect, it } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
+import { useTokenConfig } from 'composables/useTokenConfig';
+const tokenConfig = useTokenConfig();
+
+describe('useTokenConfig', () => {
+    describe('fetch', () => {
+        it('should call setTokenConfig of the state with the expected data', async () => {
+            const data = {
+                id: 1,
+                renewPeriod: 21600,
+                courtesyTime: 60,
+                renewInterval: 300,
+            };
+            vi.spyOn(axios, 'get').mockResolvedValueOnce({
+                data,
+            });
+
+            vi.spyOn(tokenConfig.state, 'setTokenConfig');
+
+            tokenConfig.fetch();
+
+            await flushPromises();
+
+            expect(tokenConfig.state.setTokenConfig).toHaveBeenCalledWith(data);
+
+            const renewPeriod = sessionStorage.getItem('renewPeriod');
+            expect(renewPeriod).toEqual(data.renewPeriod);
+        });
+    });
+});

From e6c9a692f54b610016d32b68db20e1c42185bf6c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 14:33:10 +0200
Subject: [PATCH 13/62] feat moduleName

---
 src/router/modules/department.js | 1 +
 src/router/modules/itemType.js   | 1 +
 src/router/modules/roadmap.js    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/router/modules/department.js b/src/router/modules/department.js
index aaffc3460..dfd5e64ba 100644
--- a/src/router/modules/department.js
+++ b/src/router/modules/department.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'department',
         icon: 'vn:greuge',
+        moduleName: 'Department',
     },
     component: RouterView,
     redirect: { name: 'DepartmentCard' },
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 0d966c32c..32bd63690 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'itemType',
         icon: 'contact_support',
+        moduleName: 'ItemType',
     },
     component: RouterView,
     redirect: { name: 'ItemTypeCard' },
diff --git a/src/router/modules/roadmap.js b/src/router/modules/roadmap.js
index 02edf94be..6b2aa6a13 100644
--- a/src/router/modules/roadmap.js
+++ b/src/router/modules/roadmap.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'roadmap',
         icon: 'vn:troncales',
+        moduleName: 'Roadmap',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },

From e1f50f5daf3d017c6b8a04470822f061368b1340 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 15:05:10 +0200
Subject: [PATCH 14/62] fix: minorchanges

---
 src/i18n/locale/es.yml                      | 2 +-
 src/pages/ItemType/Card/ItemTypeSummary.vue | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6d2e5c8c2..6634b6f07 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1234,7 +1234,7 @@ itemType:
         life: Vida
         promo: Promoción
         itemPackingType: Tipo de embalaje
-        isUnconventionalSize: Es de tamaño no convencional
+        isUnconventionalSize: Es de tamaño poco convencional
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
index b71b2acf5..393675a30 100644
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -93,6 +93,7 @@ async function setItemTypeData(data) {
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
+                    class="large-label"
                     :label="t('itemType.summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
@@ -100,3 +101,9 @@ async function setItemTypeData(data) {
         </template>
     </CardSummary>
 </template>
+
+<style lang="scss">
+.large-label > div.label {
+    width: 15em !important;
+}
+</style>

From ccc68851728ab8cea17699c581ff7442924419c9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Apr 2024 04:41:44 +0000
Subject: [PATCH 15/62] Fix: minor bugs, layout & vnlocation

---
 .../components/CustomerAddressEdit.vue        | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 8f4be1342..c3c5c82ae 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -169,21 +169,9 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
                 </div>
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    ></VnLocation>
-                </div>
                 <div class="col">
                     <VnSelectFilter
                         :label="t('Agency')"
@@ -195,25 +183,6 @@ function handleLocation(data, location) {
                         v-model="data.agencyModeFk"
                     />
                 </div>
-                <div class="col">
-                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
-                </div>
-            </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Incoterms')"
-                        :options="incoterms"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        v-model="data.incotermsFk"
-                    />
-                </div>
                 <div class="col">
                     <VnSelectDialog
                         :label="t('Customs agent')"
@@ -230,6 +199,40 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.postalCode"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                    ></VnLocation>
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Street')" clearable v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Incoterms')"
+                        :options="incoterms"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="data.incotermsFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
+                </div>
+            </VnRow>
+
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
             <VnRow
                 :key="index"

From 6e5ac0eeb9088e8765c267c4d9dc848728515d43 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Apr 2024 14:44:32 +0200
Subject: [PATCH 16/62] fix: CustomerAdress layout

---
 .../components/CustomerAddressEdit.vue        | 68 +++++++++----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index c3c5c82ae..dd2717694 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -169,6 +169,21 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
                 </div>
+                <div class="col">
+                    <VnInput :label="t('Street')" clearable v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.postalCode"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                    ></VnLocation>
+                </div>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
@@ -183,6 +198,24 @@ function handleLocation(data, location) {
                         v-model="data.agencyModeFk"
                     />
                 </div>
+                <div class="col">
+                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Incoterms')"
+                        :options="incoterms"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="data.incotermsFk"
+                    />
+                </div>
                 <div class="col">
                     <VnSelectDialog
                         :label="t('Customs agent')"
@@ -198,41 +231,6 @@ function handleLocation(data, location) {
                     </VnSelectDialog>
                 </div>
             </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.postalCode"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    ></VnLocation>
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
-            </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Incoterms')"
-                        :options="incoterms"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        v-model="data.incotermsFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
-                </div>
-            </VnRow>
-
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
             <VnRow
                 :key="index"

From 443f4a4443c5a452264313eda5293650ab0a67d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Apr 2024 07:49:28 +0200
Subject: [PATCH 17/62] refactor: refs #7239 changed spanish translations

---
 src/components/common/VnSmsDialog.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 4306beb4c..833f54942 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -199,8 +199,9 @@ es:
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
-        minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+        minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
+            Te recomendamos amplíes para no generar costes extra provocarán un incremento de tu tarifa.
+            ¡Un saludo!'
         orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés
     es: Español

From c56b6b2dbc5a2b6983cab7461836de2bd530d8cd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Apr 2024 08:22:08 +0200
Subject: [PATCH 18/62] refactor: better syntax

---
 src/components/common/VnSmsDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 833f54942..5b192f95d 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -200,7 +200,7 @@ es:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
-            Te recomendamos amplíes para no generar costes extra provocarán un incremento de tu tarifa.
+            Te recomendamos amplíes para no generar costes extra, provocarán un incremento de tu tarifa.
             ¡Un saludo!'
         orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés

From cf193b07c58649168bf8f4aeae619768b90ace5b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 08:02:17 -0300
Subject: [PATCH 19/62] Item tax

---
 src/components/CrudModel.vue    |   8 ++-
 src/i18n/locale/en.yml          |   3 +
 src/pages/Item/Card/ItemTax.vue | 103 +++++++++++++++++++++++++++++++-
 3 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index fb3ac10c3..24d848f3b 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -124,11 +124,15 @@ async function onSubmit() {
         });
     }
     isLoading.value = true;
-    await saveChanges();
+    await saveChanges($props.saveFn ? formData.value : null);
 }
 
 async function saveChanges(data) {
-    if ($props.saveFn) return $props.saveFn(data, getChanges);
+    if ($props.saveFn) {
+        $props.saveFn(data, getChanges);
+        isLoading.value = false;
+        return;
+    }
     const changes = data || getChanges();
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 04c278abe..d3b18dfe2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1123,6 +1123,9 @@ item:
         fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        botanical: Botanical
+        barcode: Barcodes
+        tax: Tax
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/pages/Item/Card/ItemTax.vue b/src/pages/Item/Card/ItemTax.vue
index 76663932c..b966eede9 100644
--- a/src/pages/Item/Card/ItemTax.vue
+++ b/src/pages/Item/Card/ItemTax.vue
@@ -1 +1,102 @@
-<template>Item tax</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import CrudModel from 'components/CrudModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const route = useRoute();
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const taxesFilter = {
+    fields: ['id', 'countryFk', 'taxClassFk'],
+    include: [
+        {
+            relation: 'country',
+            scope: {
+                fields: ['country'],
+            },
+        },
+    ],
+};
+
+const ItemTaxRef = ref(null);
+const taxesOptions = ref([]);
+
+const submitTaxes = async (data) => {
+    try {
+        let payload = data.map((tax) => ({
+            id: tax.id,
+            taxClassFk: tax.taxClassFk,
+        }));
+
+        await axios.post(`Items/updateTaxes`, payload);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error saving taxes', err);
+    }
+};
+
+onMounted(async () => {
+    if (ItemTaxRef.value) ItemTaxRef.value.reload();
+});
+</script>
+<template>
+    <FetchData
+        url="TaxClasses"
+        :filter="{
+            fields: ['id', 'description', 'code'],
+        }"
+        @on-fetch="(data) => (taxesOptions = data)"
+        auto-load
+    />
+    <CrudModel
+        :url="`items/${route.params.id}/taxes`"
+        :save-fn="submitTaxes"
+        :filter="taxesFilter"
+        :default-remove="false"
+        data-key="ItemTax"
+        model="ItemTax"
+        ref="ItemTaxRef"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pl-lg q-py-md">
+                <VnRow
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="row q-gutter-md q-mb-md"
+                >
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <VnInput
+                            :label="t('Country')"
+                            v-model="row.country.country"
+                            disable
+                        />
+                        <VnSelectFilter
+                            :label="t('Class')"
+                            v-model="row.taxClassFk"
+                            :options="taxesOptions"
+                            option-label="description"
+                            option-value="id"
+                            hide-selected
+                        />
+                    </VnRow>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
+
+<i18n>
+es:
+    Country: País
+    Class: Clase
+</i18n>

From 88e1e577c4f7970a80fee568142539b839b918a6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 26 Apr 2024 13:10:29 +0200
Subject: [PATCH 20/62] hotFix: refs #6636 fix ref optionsList

---
 src/pages/Claim/Card/ClaimBasicData.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 56717c628..47d1ac1c6 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -41,6 +41,7 @@ const workers = ref([]);
 const workersCopy = ref([]);
 const claimStates = ref([]);
 const claimStatesCopy = ref([]);
+const optionsList = ref([]);
 
 function setWorkers(data) {
     workers.value = data;
@@ -51,9 +52,9 @@ function setClaimStates(data) {
     claimStates.value = data;
     claimStatesCopy.value = data;
 }
-let optionsList;
+
 async function getEnumValues() {
-    optionsList = [{ id: null, description: t('claim.basicData.null') }];
+    optionsList.value = [{ id: null, description: t('claim.basicData.null') }];
     const { data } = await axios.get(`Applications/get-enum-values`, {
         params: {
             schema: 'vn',
@@ -62,8 +63,9 @@ async function getEnumValues() {
         },
     });
     for (let value of data)
-        optionsList.push({ id: value, description: t(`claim.basicData.${value}`) });
+        optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) });
 }
+
 getEnumValues();
 
 const workerFilter = {

From 127567898da40f416db6d3fcc3da7231dba59a3d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 13:27:58 +0200
Subject: [PATCH 21/62] fix: add filter panel

---
 src/pages/Item/ItemTypeList.vue       | 22 +++++++++++-
 src/pages/ItemType/ItemTypeFilter.vue | 49 +++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/ItemType/ItemTypeFilter.vue

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index b0b4de540..5b106916d 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -6,6 +6,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 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 { useStateStore } from 'stores/useStateStore';
@@ -31,12 +32,31 @@ const redirectToCreateView = () => {
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                custom-route-redirect-name="ItemTypeSummary"
                 :label="t('Search item type')"
                 :info="t('Search itemType by id, name or code')"
             />
         </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
     </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ItemTypeFilter data-key="ItemTypes" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
new file mode 100644
index 000000000..33238545f
--- /dev/null
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+const { t } = useI18n();
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        name: Name
+        code: Code
+es:
+    params:
+        name: Nombre
+        code: Código
+    Name: Nombre
+    Code: Código
+</i18n>

From 76cd79173cabe0996c03a982b8773c5bd8df107e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Apr 2024 13:50:11 +0200
Subject: [PATCH 22/62] refs #7172 fix select

---
 src/pages/Claim/Card/ClaimBasicData.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index f6feae4ba..adb9b4c08 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -108,7 +108,7 @@ const statesFilter = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('claim.basicData.assignedTo')"
                         v-model="data.workerFk"
                         :options="workersOptions"
@@ -128,7 +128,7 @@ const statesFilter = {
                                 />
                             </QAvatar>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
                     <QSelect

From c1ed4ab03280b8125c92e8587e9a8bd4ca626abd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 14:49:54 +0200
Subject: [PATCH 23/62] fix: add exprBuilder

---
 src/components/ui/VnFilterPanel.vue   |  3 ++-
 src/components/ui/VnSearchbar.vue     |  2 ++
 src/pages/Item/ItemTypeList.vue       | 17 +++++++++++++++--
 src/pages/ItemType/ItemTypeFilter.vue |  8 +++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 96d097191..cde48e9b3 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -145,7 +145,8 @@ const customTags = computed(() =>
 );
 
 async function remove(key) {
-    userParams.value[key] = null;
+    // userParams.value[key] = null;
+    if (userParams.value[key]) delete userParams.value[key];
     await search();
     emit('remove', key);
 }
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index fc8475ace..da8d43c95 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -81,8 +81,10 @@ 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,
         },
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 5b106916d..1e21c1719 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,6 +24,17 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+        case 'code':
+        case 'search':
+            return {
+                name: { like: `%${value}%` },
+                code: { like: `%${value}%` },
+            };
+    }
+};
 </script>
 
 <template>
@@ -32,8 +43,10 @@ const redirectToCreateView = () => {
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                :label="t('Search item type')"
+                :label="t('Search item  type')"
+                :redirect="false"
                 :info="t('Search itemType by id, name or code')"
+                :expr-builder="exprBuilder"
             />
         </Teleport>
         <Teleport to="#actions-append">
@@ -54,7 +67,7 @@ const redirectToCreateView = () => {
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <ItemTypeFilter data-key="ItemTypes" />
+            <ItemTypeFilter data-key="ItemTypeList" :expr-builder="exprBuilder" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 33238545f..2a86795c2 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -10,10 +10,16 @@ const props = defineProps({
         required: true,
     },
 });
+
+const emit = defineEmits(['search']);
 </script>
 
 <template>
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @search="emit('search')"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

From 0d50944c2d9b79da840deac5621e70dc1b64d29a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 15:24:44 +0200
Subject: [PATCH 24/62] fix: add exprBuilder

---
 src/components/ui/VnFilterPanel.vue   | 20 +++++++++++++++++++-
 src/pages/ItemType/ItemTypeFilter.vue | 14 ++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cde48e9b3..cd5a3caf1 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -81,6 +81,8 @@ const isLoading = ref(false);
 async function search() {
     isLoading.value = true;
     const params = { ...userParams.value };
+    if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
+
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -144,9 +146,25 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
+watch(tags, (now, before) => {
+    if (now.length < before.length) {
+        const beforeMap = before.map(({ label }) => label);
+        const nowMap = now.map(({ label }) => label);
+        const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
+        remove(key ?? beforeMap[0]);
+    }
+    console.error('');
+});
+
 async function remove(key) {
     // userParams.value[key] = null;
-    if (userParams.value[key]) delete userParams.value[key];
+    delete userParams.value[key];
+    if (Object.entries(userParams.value).length === 0) {
+        store.exprBuilder = null;
+        delete store.filter.where;
+    } else {
+        store.exprBuilder = props.exprBuilder;
+    }
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 2a86795c2..176fca22a 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -29,12 +29,22 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                    <VnInput
+                        @update:model-value="emit('search')"
+                        :label="t('Name')"
+                        v-model="params.name"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
+                    <VnInput
+                        @update:model-value="emit('search')"
+                        v-model="params.code"
+                        :label="t('Code')"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
         </template>

From a03049a721a580afd127be354b47e6aa3addb25f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 17:26:18 +0200
Subject: [PATCH 25/62] fix: poc

---
 src/components/ui/VnFilterPanel.vue   | 47 +++++++++++++++++----------
 src/pages/Item/ItemTypeList.vue       | 15 +++------
 src/pages/ItemType/ItemTypeFilter.vue | 14 ++------
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cd5a3caf1..94b64c0db 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -78,11 +78,23 @@ watch(
 );
 
 const isLoading = ref(false);
+function eliminarPropiedadesNull(objeto) {
+    for (let clave in objeto) {
+        if (objeto[clave] === null) {
+            delete objeto[clave];
+        }
+    }
+    return objeto;
+}
+
 async function search() {
     isLoading.value = true;
+    const objetoSinNull = eliminarPropiedadesNull(userParams.value);
+    userParams.value = objetoSinNull;
     const params = { ...userParams.value };
     if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
-
+    else delete store.filter.where;
+    store.userParams = userParams.value;
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -146,25 +158,26 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-watch(tags, (now, before) => {
-    if (now.length < before.length) {
-        const beforeMap = before.map(({ label }) => label);
-        const nowMap = now.map(({ label }) => label);
-        const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
-        remove(key ?? beforeMap[0]);
-    }
-    console.error('');
-});
+// watch(tags, (now, before) => {
+//     if (now.length < before.length) {
+//         const beforeMap = before.map(({ label }) => label);
+//         const nowMap = now.map(({ label }) => label);
+//         const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
+//         remove(key ?? beforeMap[0]);
+//     }
+//     console.error('');
+// });
 
 async function remove(key) {
     // userParams.value[key] = null;
-    delete userParams.value[key];
-    if (Object.entries(userParams.value).length === 0) {
-        store.exprBuilder = null;
-        delete store.filter.where;
-    } else {
-        store.exprBuilder = props.exprBuilder;
-    }
+    if (userParams.value[key]) delete userParams.value[key];
+    // if (Object.entries(userParams.value).length === 0) {
+    //     store.exprBuilder = null;
+    //     delete store.filter.where;
+    // }
+    // else {
+    //     store.exprBuilder = props.exprBuilder;
+    // }
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 1e21c1719..6e31cdd25 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,17 +24,10 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-        case 'code':
-        case 'search':
-            return {
-                name: { like: `%${value}%` },
-                code: { like: `%${value}%` },
-            };
-    }
-};
+const exprBuilder = (param, value) => ({
+    name: { like: `%${value}%` },
+    code: { like: `%${value}%` },
+});
 </script>
 
 <template>
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 176fca22a..2a86795c2 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -29,22 +29,12 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        @update:model-value="emit('search')"
-                        :label="t('Name')"
-                        v-model="params.name"
-                        is-outlined
-                    />
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        @update:model-value="emit('search')"
-                        v-model="params.code"
-                        :label="t('Code')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
                 </QItemSection>
             </QItem>
         </template>

From 955e196882d536d1a245a46716b6e11571d2a67e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 17:43:57 +0200
Subject: [PATCH 26/62] fix: filterPanelbug

---
 src/components/ui/VnFilterPanel.vue | 35 ++---------------------------
 src/pages/Item/ItemTypeList.vue     |  3 ++-
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 94b64c0db..eb0bbbe66 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -78,23 +78,10 @@ watch(
 );
 
 const isLoading = ref(false);
-function eliminarPropiedadesNull(objeto) {
-    for (let clave in objeto) {
-        if (objeto[clave] === null) {
-            delete objeto[clave];
-        }
-    }
-    return objeto;
-}
-
 async function search() {
+    store.filter.where = {};
     isLoading.value = true;
-    const objetoSinNull = eliminarPropiedadesNull(userParams.value);
-    userParams.value = objetoSinNull;
     const params = { ...userParams.value };
-    if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
-    else delete store.filter.where;
-    store.userParams = userParams.value;
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -158,26 +145,8 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-// watch(tags, (now, before) => {
-//     if (now.length < before.length) {
-//         const beforeMap = before.map(({ label }) => label);
-//         const nowMap = now.map(({ label }) => label);
-//         const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
-//         remove(key ?? beforeMap[0]);
-//     }
-//     console.error('');
-// });
-
 async function remove(key) {
-    // userParams.value[key] = null;
-    if (userParams.value[key]) delete userParams.value[key];
-    // if (Object.entries(userParams.value).length === 0) {
-    //     store.exprBuilder = null;
-    //     delete store.filter.where;
-    // }
-    // else {
-    //     store.exprBuilder = props.exprBuilder;
-    // }
+    userParams.value[key] = null;
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 6e31cdd25..17d1c0044 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -60,7 +60,7 @@ const exprBuilder = (param, value) => ({
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <ItemTypeFilter data-key="ItemTypeList" :expr-builder="exprBuilder" />
+            <ItemTypeFilter data-key="ItemTypeList" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
@@ -70,6 +70,7 @@ const exprBuilder = (param, value) => ({
                 url="ItemTypes"
                 :order="['name']"
                 auto-load
+                :expr-builder="exprBuilder"
             >
                 <template #body="{ rows }">
                     <CardList

From 322ad816b9b5387c3a11c86ea55dbbe1dcbb2269 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 28 Apr 2024 19:37:44 -0300
Subject: [PATCH 27/62] item diary

---
 src/pages/Item/Card/ItemDiary.vue | 291 +++++++++++++++++++++++++++++-
 src/router/modules/item.js        |   6 +-
 2 files changed, 293 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 21249349f..ef4c7b993 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -1 +1,290 @@
-<template>Item diary (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)</template>
+<script setup>
+import { onMounted, computed, onUnmounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toDateFormat } from 'src/filters/date.js';
+import { dashIfEmpty } from 'src/filters';
+import { date } from 'quasar';
+import { useState } from 'src/composables/useState';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+const state = useState();
+
+const user = state.getUser();
+const today = ref(Date.vnNew());
+const warehousesOptions = ref([]);
+const itemBalancesRef = ref(null);
+const itemsBalanceFilter = reactive({
+    where: { itemFk: route.params.id, warehouseFk: null, date: null },
+});
+const itemBalances = ref([]);
+const warehouseFk = ref(null);
+const _showWhatsBeforeInventory = ref(false);
+
+const columns = computed(() => [
+    {
+        name: 'claim',
+        align: 'left',
+        field: 'itemFk',
+    },
+    {
+        label: t('Date'),
+        name: 'date',
+        field: 'shipped',
+        align: 'left',
+    },
+    {
+        label: t('Id'),
+        name: 'id',
+        align: 'left',
+    },
+    {
+        label: t('State'),
+        field: 'stateName',
+        name: 'state',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('Reference'),
+        field: 'reference',
+        name: 'reference',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+
+    {
+        label: t('Client'),
+        name: 'client',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('In'),
+        field: 'invalue',
+        name: 'in',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('Out'),
+        field: 'out',
+        name: 'out',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('Balance'),
+        name: 'balance',
+        align: 'left',
+    },
+]);
+
+const showWhatsBeforeInventory = computed({
+    get: () => _showWhatsBeforeInventory.value,
+    set: (val) => {
+        _showWhatsBeforeInventory.value = val;
+        if (!val) itemsBalanceFilter.where.date = null;
+        else itemsBalanceFilter.where.date = new Date();
+    },
+});
+
+const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
+
+const getBadgeAttrs = (_date) => {
+    const isSameDate = date.isSameDate(today.value, _date);
+    const attrs = {
+        'text-color': isSameDate ? 'black' : 'white',
+        color: isSameDate ? 'warning' : 'transparent',
+    };
+    return attrs;
+};
+
+const getIdDescriptor = (row) => {
+    let descriptor = EntryDescriptorProxy;
+    if (row.isTicket) descriptor = TicketDescriptorProxy;
+    return descriptor;
+};
+
+onMounted(async () => {
+    today.value.setHours(0, 0, 0, 0);
+    if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
+    else if (user.value) warehouseFk.value = user.value.warehouseFk;
+    itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
+    await fetchItemBalances();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        ref="itemBalancesRef"
+        url="Items/getBalance"
+        :filter="itemsBalanceFilter"
+        @on-fetch="(data) => (itemBalances = data)"
+    />
+    <FetchData
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (warehousesOptions = data)"
+    />
+    <QToolbar class="justify-end">
+        <div id="st-data" class="row">
+            <VnSelect
+                :label="t('Warehouse')"
+                :options="warehousesOptions"
+                hide-selected
+                option-label="name"
+                option-value="id"
+                dense
+                v-model="itemsBalanceFilter.where.warehouseFk"
+                @update:model-value="fetchItemBalances"
+                class="q-mr-lg"
+            />
+            <QCheckbox
+                :label="t(`Show what's before the inventory`)"
+                v-model="showWhatsBeforeInventory"
+                @update:model-value="fetchItemBalances"
+                class="q-mr-lg"
+            />
+            <VnInputDate
+                v-if="showWhatsBeforeInventory"
+                :label="t('Since')"
+                dense
+                v-model="itemsBalanceFilter.where.date"
+                @update:model-value="fetchItemBalances"
+            />
+        </div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="itemBalances"
+            :columns="columns"
+            class="full-width q-mt-md"
+            :no-data-label="t('globals.noResults')"
+        >
+            <template #body-cell-claim="{ row }">
+                <QTd @click.stop>
+                    <QBtn
+                        v-show="row.claimFk"
+                        flat
+                        color="primary"
+                        :to="{ name: 'ClaimSummary', params: { id: row.claimFk } }"
+                        icon="vn:claims"
+                        dense
+                    >
+                        <QTooltip> {{ t('Claim') }}: {{ row.claimFk }} </QTooltip>
+                    </QBtn>
+                </QTd>
+            </template>
+            <template #body-cell-date="{ row }">
+                <QTd @click.stop>
+                    <QBadge
+                        v-bind="getBadgeAttrs(row.shipped)"
+                        class="q-ma-none"
+                        dense
+                        style="font-size: 14px"
+                    >
+                        {{ toDateFormat(row.shipped) }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-id="{ row }">
+                <QTd @click.stop>
+                    <component
+                        :is="getIdDescriptor(row)"
+                        :id="row.origin"
+                        class="q-ma-none"
+                        dense
+                        style="font-size: 14px"
+                    >
+                        {{ row.origin }}
+                    </component>
+                    <span class="link">{{ row.origin }}</span>
+                </QTd>
+            </template>
+            <template #body-cell-client="{ row }">
+                <QTd @click.stop>
+                    <QBadge
+                        :color="row.highlighted ? 'warning' : 'transparent'"
+                        :text-color="row.highlighted ? 'black' : 'white'"
+                        dense
+                        style="font-size: 14px"
+                    >
+                        <span v-if="row.isTicket" class="link">
+                            {{ dashIfEmpty(row.name) }}
+                            <CustomerDescriptorProxy :id="row.clientFk" />
+                        </span>
+                        <span v-else>{{ dashIfEmpty(row.name) }}</span>
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-in="{ row }">
+                <QTd @click.stop>
+                    <span :class="{ 'is-in': row.invalue }">
+                        {{ dashIfEmpty(row.invalue) }}
+                    </span>
+                </QTd>
+            </template>
+            <template #body-cell-balance="{ row }">
+                <QTd @click.stop>
+                    <QBadge
+                        class="balance-negative"
+                        :color="
+                            row.lineFk == row.lastPreparedLineFk
+                                ? 'grey-13'
+                                : 'transparent'
+                        "
+                        :text-color="
+                            row.lineFk == row.lastPreparedLineFk
+                                ? 'black'
+                                : row.balance < 0
+                                ? 'negative'
+                                : ''
+                        "
+                        dense
+                        style="font-size: 14px"
+                    >
+                        <span>{{ dashIfEmpty(row.balance) }}</span>
+                    </QBadge>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.is-in {
+    color: $positive;
+}
+</style>
+
+<i18n>
+es:
+    Date: Fecha
+    Id: Id
+    State: Estado
+    Reference: Referencia
+    Client: Cliente
+    In: Entrada
+    Out: Salida
+    Balance: Balance
+    Claim: Reclamación
+    Show what's before the inventory: Mostrar lo anterior al inventario
+    Since: Desde
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index bc1e72a94..729cfd30c 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -134,8 +134,8 @@ export default {
                     path: 'diary',
                     name: 'ItemDiary',
                     meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
+                        title: 'diary',
+                        icon: 'vn:transaction',
                     },
                     component: () => import('src/pages/Item/Card/ItemDiary.vue'),
                 },
@@ -144,7 +144,7 @@ export default {
                     name: 'ItemLog',
                     meta: {
                         title: 'log',
-                        icon: 'history',
+                        icon: 'vn:History',
                     },
                     component: () => import('src/pages/Item/Card/ItemLog.vue'),
                 },

From 8b55044891bec8bc074a9d175e4ad2ea6a64bc68 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 29 Apr 2024 08:56:35 +0200
Subject: [PATCH 28/62] feat: refs #6336 add ItemDescriptor

---
 src/pages/Claim/Card/ClaimAction.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 13cc211fe..367b5249c 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -2,7 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useStateStore } from 'src/stores/useStateStore';
 import { toDate, toPercentage, toCurrency } from 'filters/index';
@@ -10,14 +10,13 @@ import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
-const router = useRouter();
 const stateStore = computed(() => useStateStore());
 const claim = ref(null);
 const claimRef = ref();
@@ -41,7 +40,7 @@ const multiplicatorValue = ref();
 
 const columns = computed(() => [
     {
-        name: 'Id',
+        name: 'id',
         label: t('Id item'),
         field: (row) => row.itemFk,
     },
@@ -292,6 +291,14 @@ async function importToNewRefundTicket() {
                 v-model:selected="selectedRows"
                 :grid="$q.screen.lt.md"
             >
+                <template #body-cell-id="{ value }">
+                    <QTd align="center">
+                        <span class="link">
+                            {{ value }}
+                            <ItemDescriptorProxy :id="value" />
+                        </span>
+                    </QTd>
+                </template>
                 <template #body-cell-ticket="{ value }">
                     <QTd align="center">
                         <span class="link">

From e3237ee4f1f3747cf4288e045bbc8d73526099be Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Apr 2024 09:35:57 +0200
Subject: [PATCH 29/62] refs #7172 refact VnSelect

---
 src/components/common/VnSelect.vue      | 1 +
 src/pages/Claim/Card/ClaimBasicData.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 480d36e4f..76e7cd81f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -169,6 +169,7 @@ watch(modelValue, (newValue) => {
         ref="vnSelectRef"
         :class="{ required: $attrs.required }"
         :rules="$attrs.required ? [requiredFieldRule] : null"
+        virtual-scroll-slice-size
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index adb9b4c08..2cd8aa260 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -116,7 +116,7 @@ const statesFilter = {
                         option-label="name"
                         emit-value
                         auto-load
-                        :virtual-scroll-slice-size="workersOptions.length"
+                        virtual-scroll-slice-size="workersOptions.length"
                         :rules="validate('claim.claimStateFk')"
                     >
                         <template #before>

From 6ae38d26119baf867d039ee29682ed26f360072f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 29 Apr 2024 09:49:06 +0200
Subject: [PATCH 30/62] refactor: refs #6887 pending claim changes

---
 src/i18n/locale/en.yml                        |   3 +-
 src/i18n/locale/es.yml                        |   3 +-
 src/pages/Claim/Card/ClaimDescriptor.vue      |  14 +-
 src/pages/Claim/Card/ClaimSummary.vue         |  45 ++++++-
 src/pages/Zone/Card/ZoneDescriptor.vue        | 127 ++++++++++++++++++
 .../Zone/Card/ZoneDescriptorMenuItems.vue     | 108 +++++++++++++++
 src/pages/Zone/Card/ZoneDescriptorProxy.vue   |  16 +++
 7 files changed, 309 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Zone/Card/ZoneDescriptor.vue
 create mode 100644 src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
 create mode 100644 src/pages/Zone/Card/ZoneDescriptorProxy.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ff57bf968..942018b84 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -513,7 +513,7 @@ claim:
         records: records
     card:
         claimId: Claim ID
-        assignedTo: Assigned
+        attendedBy: Attended by
         created: Created
         state: State
         ticketId: Ticket ID
@@ -551,6 +551,7 @@ claim:
         responsible: Responsible
         worker: Worker
         redelivery: Redelivery
+        changeState: Change state
     basicData:
         customer: Customer
         assignedTo: Assigned
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f9278a9b0..3de5af50c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -511,7 +511,7 @@ claim:
         records: registros
     card:
         claimId: ID reclamación
-        assignedTo: Asignada a
+        attendedBy: Atendida por
         created: Creada
         state: Estado
         ticketId: ID ticket
@@ -549,6 +549,7 @@ claim:
         responsible: Responsable
         worker: Trabajador
         redelivery: Devolución
+        changeState: Cambiar estado
     basicData:
         customer: Cliente
         assignedTo: Asignada a
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 968f1e294..3b5dd82b8 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -11,6 +11,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { getUrl } from 'src/composables/getUrl';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 
 const $props = defineProps({
     id: {
@@ -127,17 +128,24 @@ onMounted(async () => {
             </VnLv>
             <VnLv
                 v-if="entity.worker"
-                :label="t('claim.card.assignedTo')"
+                :label="t('claim.card.attendedBy')"
                 :value="entity.worker.user.name"
             >
                 <template #value>
                     <VnUserLink
-                        :name="entity.worker.user.name"
+                        :name="entity.worker.user.nickname"
                         :worker-id="entity.worker.id"
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
+            <VnLv :label="t('claim.card.zone')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.ticket?.zone?.name }}
+                        <ZoneDescriptorProxy :id="entity.ticket?.zoneFk" />
+                    </span>
+                </template>
+            </VnLv>
             <VnLv
                 :label="t('claim.card.province')"
                 :value="entity.ticket?.address?.province?.name"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index f45d5765d..c4c2785d5 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
@@ -13,8 +13,10 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import axios from 'axios';
 
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
@@ -27,7 +29,7 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
-
+const ClaimStates = ref([]);
 const claimUrl = ref();
 const salixUrl = ref();
 const claimDmsRef = ref();
@@ -162,6 +164,10 @@ function openDialog(dmsId) {
     multimediaSlide.value = dmsId;
     multimediaDialog.value = true;
 }
+async function changeState(value) {
+    await axios.patch(`Claims/updateClaim/${entityId.value}`, { claimStateFk: value });
+    router.go(route.fullPath);
+}
 </script>
 
 <template>
@@ -171,6 +177,7 @@ function openDialog(dmsId) {
         @on-fetch="(data) => setClaimDms(data)"
         ref="claimDmsRef"
     />
+    <FetchData url="ClaimStates" @on-fetch="(data) => (ClaimStates = data)" auto-load />
     <CardSummary
         ref="summary"
         :url="`Claims/${entityId}/getSummary`"
@@ -180,6 +187,36 @@ function openDialog(dmsId) {
         <template #header="{ entity: { claim } }">
             {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
         </template>
+        <template #header-right>
+            <QBtnDropdown
+                side
+                top
+                color="black"
+                text-color="white"
+                :label="t('ticket.summary.changeState')"
+            >
+                <QList>
+                    <QVirtualScroll
+                        style="max-height: 300px"
+                        :items="ClaimStates"
+                        separator
+                        v-slot="{ item, index }"
+                    >
+                        <QItem
+                            :key="index"
+                            dense
+                            clickable
+                            v-close-popup
+                            @click="changeState(item.id)"
+                        >
+                            <QItemSection>
+                                <QItemLabel>{{ item.description }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QVirtualScroll>
+                </QList>
+            </QBtnDropdown>
+        </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
             <QCard class="vn-one">
                 <VnTitle
@@ -447,4 +484,8 @@ function openDialog(dmsId) {
 .zindex {
     z-index: 1;
 }
+
+.change-state {
+    width: 10%;
+}
 </style>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
new file mode 100644
index 000000000..665cb6f0e
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -0,0 +1,127 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+import { toDate } from 'src/filters';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const filter = {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+
+const setData = (entity) => {
+    data.value = useCardDescription(entity.ref, entity.id);
+};
+</script>
+
+<template>
+    <CardDescriptor
+        module="Zone"
+        :url="`Zones/${entityId}`"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        :filter="filter"
+        @on-fetch="setData"
+        data-key="travelData"
+    >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="local_airport"
+                color="white"
+                class="link"
+                :to="{ name: 'ZoneList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
+        <template #menu="{ entity }">
+            <ZoneDescriptorMenuItems :travel="entity" />
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('globals.wareHouseIn')" :value="entity.warehouseIn.name" />
+            <VnLv :label="t('globals.wareHouseOut')" :value="entity.warehouseOut.name" />
+            <VnLv :label="t('globals.shipped')" :value="toDate(entity.shipped)" />
+            <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
+            <VnLv :label="t('globals.totalEntries')" :value="entity.totalEntries" />
+        </template>
+        <template #actions="{ entity }">
+            <QCardActions>
+                <QBtn
+                    :to="{
+                        name: 'ZoneList',
+                        query: {
+                            params: JSON.stringify({
+                                agencyModeFk: entity.agencyModeFk,
+                            }),
+                        },
+                    }"
+                    size="md"
+                    icon="local_airport"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('All travels with current agency') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+    The travel will be deleted: El envío será eliminado
+    Do you want to delete this travel?: ¿Quieres eliminar este envío?
+    All travels with current agency: Todos los envíos con la agencia actual
+</i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
new file mode 100644
index 000000000..920d83dfe
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -0,0 +1,108 @@
+<script setup>
+import { computed } from 'vue';
+import { useQuasar } from 'quasar';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useRole } from 'src/composables/useRole';
+
+const $props = defineProps({
+    travel: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const { t } = useI18n();
+const router = useRouter();
+const quasar = useQuasar();
+const { notify } = useNotify();
+const role = useRole();
+
+const redirectToCreateView = (queryParams) => {
+    router.push({ name: 'ZoneCreate', query: { travelData: queryParams } });
+};
+
+const cloneZone = () => {
+    const stringifiedZoneData = JSON.stringify($props.travel);
+    redirectToCreateView(stringifiedZoneData);
+};
+
+const cloneZoneWithEntries = () => {
+    try {
+        axios.post(`Zones/${$props.travel.id}/cloneWithEntries`);
+        notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.err('Error cloning travel with entries');
+    }
+};
+
+const isBuyer = computed(() => {
+    return role.hasAny(['buyer']);
+});
+
+const openDeleteEntryDialog = (id) => {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('The travel will be deleted'),
+                message: t('Do you want to delete this travel?'),
+            },
+        })
+        .onOk(async () => {
+            await deleteZone(id);
+        });
+};
+
+const deleteZone = async (id) => {
+    try {
+        await axios.delete(`Zones/${id}`);
+        router.push({ name: 'ZoneList' });
+        notify('globals.dataDeleted', 'positive');
+    } catch (err) {
+        console.error('Error deleting travel');
+    }
+};
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="cloneZone(travel)">
+        <QItemSection>{{ t('travel.summary.cloneShipping') }}</QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="cloneZoneWithEntries()">
+        <QItemSection>
+            {{ t('travel.summary.CloneZoneAndEntries') }}
+        </QItemSection>
+    </QItem>
+    <QItem
+        v-if="isBuyer && travel.totalEntries === 0"
+        v-ripple
+        clickable
+        @click="openDeleteEntryDialog(travel.id)"
+    >
+        <QItemSection>
+            {{ t('travel.summary.deleteZone') }}
+        </QItemSection>
+    </QItem>
+    <QItem v-ripple clickable>
+        <QItemSection>
+            <RouterLink
+                :to="{ name: 'EntryCreate', query: { travelFk: travel.id } }"
+                class="color-vn-text"
+            >
+                {{ t('travel.summary.AddEntry') }}
+            </RouterLink>
+        </QItemSection>
+    </QItem>
+</template>
+
+<i18n>
+es:
+    The travel will be deleted: El envío será eliminado
+    Do you want to delete this travel?: ¿Quieres eliminar este envío?
+</i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptorProxy.vue b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
new file mode 100644
index 000000000..15c5fb0e5
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
@@ -0,0 +1,16 @@
+<script setup>
+import ZoneDescriptor from './ZoneDescriptor.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <ZoneDescriptor v-if="$props.id" :id="$props.id" />
+    </QPopupProxy>
+</template>

From a78c920ec8a6aa5765fb38080e20a4b055a81610 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Apr 2024 09:49:29 +0200
Subject: [PATCH 31/62] refs #7172 fix VnSelect

---
 src/components/common/VnSelect.vue      | 2 +-
 src/pages/Claim/Card/ClaimBasicData.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 76e7cd81f..05c74f00a 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -169,7 +169,7 @@ watch(modelValue, (newValue) => {
         ref="vnSelectRef"
         :class="{ required: $attrs.required }"
         :rules="$attrs.required ? [requiredFieldRule] : null"
-        virtual-scroll-slice-size
+        virtual-scroll-slice-size="options.length"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 2cd8aa260..99ea30fda 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -116,7 +116,6 @@ const statesFilter = {
                         option-label="name"
                         emit-value
                         auto-load
-                        virtual-scroll-slice-size="workersOptions.length"
                         :rules="validate('claim.claimStateFk')"
                     >
                         <template #before>

From 19fcacebc9969bdec3107bffcd2cc78a0bdad4bc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:19 +0200
Subject: [PATCH 32/62] perf: VnSearchbar

---
 src/components/ui/VnSearchbar.vue | 1 +
 src/router/modules/itemType.js    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index da8d43c95..344267ef7 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -108,6 +108,7 @@ async function search() {
     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 });
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 32bd63690..3609b6688 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -1,7 +1,7 @@
 import { RouterView } from 'vue-router';
 
 export default {
-    path: '/item-type',
+    path: '/item/item-type',
     name: 'ItemType',
     meta: {
         title: 'itemType',

From bdc5d7210f460909c6d3162732e49fe7ec6e28c8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:37 +0200
Subject: [PATCH 33/62] fix: remove redirect

---
 src/pages/Item/ItemTypeList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 17d1c0044..e362c6726 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -37,7 +37,6 @@ const exprBuilder = (param, value) => ({
                 data-key="ItemTypeList"
                 url="ItemTypes"
                 :label="t('Search item  type')"
-                :redirect="false"
                 :info="t('Search itemType by id, name or code')"
                 :expr-builder="exprBuilder"
             />

From 8c3d32ec8621a939f70cff216bfac81650cbfcd5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:50 +0200
Subject: [PATCH 34/62] fix: remove VnFilterPanel inside Summary

---
 src/pages/Shelving/Card/ShelvingSummary.vue | 47 ++++-----------------
 1 file changed, 8 insertions(+), 39 deletions(-)

diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 49470719e..649799b00 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -20,14 +20,14 @@ const router = useRouter();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-const isDialog = Boolean($props.id);
-const hideRightDrawer = () => {
-    if (!isDialog) {
-        stateStore.rightDrawer = false;
-    }
-};
-onMounted(hideRightDrawer);
-onUnmounted(hideRightDrawer);
+const isDialog = false;
+// const hideRightDrawer = () => {
+//     if (!isDialog) {
+//         stateStore.rightDrawer = false;
+//     }
+// };
+// onMounted(hideRightDrawer);
+// onUnmounted(hideRightDrawer);
 const filter = {
     include: [
         {
@@ -46,23 +46,6 @@ const filter = {
 </script>
 
 <template>
-    <template v-if="!isDialog && 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>
     <div class="q-pa-md">
         <CardSummary ref="summary" :url="`Shelvings/${entityId}`" :filter="filter">
             <template #header="{ entity }">
@@ -102,18 +85,4 @@ const filter = {
             </template>
         </CardSummary>
     </div>
-    <QDrawer
-        v-if="!isDialog"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-    >
-        <QScrollArea class="fit text-grey-8">
-            <ShelvingFilter
-                data-key="ShelvingList"
-                @search="router.push({ name: 'ShelvingList' })"
-            />
-        </QScrollArea>
-    </QDrawer>
 </template>

From 34c8874468fbb062117c5ee2ce1c7eaf0628cb3a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:17:18 +0200
Subject: [PATCH 35/62] fix: i18n

---
 src/i18n/locale/es.yml          | 2 +-
 src/pages/Item/ItemTypeList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 9bafd7067..fc96adbf8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1220,7 +1220,7 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
-itemType:
+item/itemType:
     pageTitles:
         itemType: Familia
         basicData: Datos básicos
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index e362c6726..c92385295 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -36,7 +36,7 @@ const exprBuilder = (param, value) => ({
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                :label="t('Search item  type')"
+                :label="t('Search item type')"
                 :info="t('Search itemType by id, name or code')"
                 :expr-builder="exprBuilder"
             />

From 806f3a13d57782b75970cce0f866c904f9a31425 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 29 Apr 2024 10:33:32 +0200
Subject: [PATCH 36/62] fix(claimLines): refs #6336 fix total calc

---
 src/pages/Claim/Card/ClaimLines.vue | 39 ++++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index c4a7db201..52fbfca98 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -45,20 +45,25 @@ async function onFetchClaim(data) {
 
 const amount = ref();
 const amountClaimed = ref();
-async function onFetch(rows) {
+async function onFetch(rows, newRows) {
+    if (newRows) rows = newRows;
     amount.value = 0;
     amountClaimed.value = 0;
     if (!rows || !rows.length) return;
 
-    amount.value = rows.reduce(
-        (accumulator, { sale }) => accumulator + sale.price * sale.quantity,
-        0
-    );
+    for (const row of rows) {
+        const { sale } = row;
+        amount.value = amount.value + totalRow(sale);
+        const price = row.quantity * sale.price;
+        const discount = (sale.discount * price) / 100;
+        amountClaimed.value = amountClaimed.value + (price - discount);
+    }
+}
 
-    amountClaimed.value = rows.reduce(
-        (accumulator, line) => accumulator + line.sale.price * line.quantity,
-        0
-    );
+function totalRow({ price, quantity, discount }) {
+    const amount = price * quantity;
+    const appliedDiscount = (discount * amount) / 100;
+    return amount - appliedDiscount;
 }
 
 const columns = computed(() => [
@@ -102,12 +107,7 @@ const columns = computed(() => [
     {
         name: 'total',
         label: t('Total'),
-        field: ({ sale }) => {
-            const amount = sale.price * sale.quantity;
-            const appliedDiscount = (sale.discount * amount) / 100;
-
-            return amount - appliedDiscount;
-        },
+        field: ({ sale }) => totalRow(sale),
         format: (value) => toCurrency(value),
         sortable: true,
     },
@@ -129,6 +129,7 @@ async function updateDiscount({ saleFk, discount, canceller }) {
     await axios.post(query, body, {
         signal: canceller.signal,
     });
+    await claimLinesForm.value.reload();
 }
 
 function onUpdateDiscount(response) {
@@ -151,8 +152,11 @@ function showImportDialog() {
         .onOk(() => claimLinesForm.value.reload());
 }
 
-function saveWhenHasChanges() {
-    claimLinesForm.value.getChanges().updates && claimLinesForm.value.onSubmit();
+async function saveWhenHasChanges() {
+    if (claimLinesForm.value.getChanges().updates) {
+        await claimLinesForm.value.onSubmit();
+        await claimLinesForm.value.reload();
+    }
 }
 </script>
 <template>
@@ -188,7 +192,6 @@ function saveWhenHasChanges() {
             save-url="ClaimBeginnings/crud"
             :filter="linesFilter"
             @on-fetch="onFetch"
-            @save-changes="onFetch"
             v-model:selected="selected"
             :default-save="false"
             :default-reset="false"

From 6c69c44dfdbf93c4b1527599136f9e5a2a4ebf25 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 08:33:38 +0000
Subject: [PATCH 37/62] remove comment

---
 src/composables/useSession.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 3b38cdad6..56bce0279 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -141,7 +141,6 @@ export function useSession() {
         const maxDate = created + renewPeriodInSeconds;
         const now = new Date().getTime();
 
-        //COMMENT THIS IF JUST FOR TEST
         if (isNaN(renewPeriodInSeconds) || now <= maxDate) {
             return (isCheckingToken = false);
         }

From 2f55272df77a8a0fe949d2f8588eb635b36f469c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:23:50 +0200
Subject: [PATCH 38/62] fix: WorkerDescriptor

---
 src/i18n/locale/en.yml                        | 14 +-------
 src/i18n/locale/es.yml                        | 17 ----------
 src/pages/Item/ItemTypeCreate.vue             |  8 ++---
 src/pages/ItemType/Card/ItemTypeBasicData.vue | 18 +++++------
 .../ItemType/Card/ItemTypeDescriptor.vue      | 17 ++++++----
 src/pages/ItemType/Card/ItemTypeSummary.vue   | 32 +++++++++----------
 src/pages/ItemType/locale/en.yml              | 12 +++++++
 src/pages/ItemType/locale/es.yml              | 17 ++++++++++
 8 files changed, 69 insertions(+), 66 deletions(-)
 create mode 100644 src/pages/ItemType/locale/en.yml
 create mode 100644 src/pages/ItemType/locale/es.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 482c0dc7d..2b71195d1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1221,23 +1221,11 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
-itemType:
+item/itemType:
     pageTitles:
         itemType: Item type
         basicData: Basic data
         summary: Summary
-    shared:
-        code: Code
-        name: Name
-        worker: Worker
-        category: Category
-        temperature: Temperature
-    summary:
-        id: id
-        life: Life
-        promo: Promo
-        itemPackingType: Item packing type
-        isUnconventionalSize: Is unconventional size
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fc96adbf8..d1823b387 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1225,23 +1225,6 @@ item/itemType:
         itemType: Familia
         basicData: Datos básicos
         summary: Resumen
-    shared:
-        code: Código
-        name: Nombre
-        worker: Trabajador
-        category: Reino
-        temperature: Temperatura
-    summary:
-        id: id
-        code: Código
-        name: Nombre
-        worker: Trabajador
-        category: Reino
-        temperature: Temperatura
-        life: Vida
-        promo: Promoción
-        itemPackingType: Tipo de embalaje
-        isUnconventionalSize: Es de tamaño poco convencional
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
index 3540fc5af..af3dc34ea 100644
--- a/src/pages/Item/ItemTypeCreate.vue
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -58,7 +58,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.workerFk"
                         :label="t('itemType.shared.worker')"
                         :options="workersOptions"
@@ -66,7 +66,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                         option-label="firstName"
                         hide-selected
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.categoryFk"
                         :label="t('itemType.shared.category')"
                         :options="categoriesOptions"
@@ -76,7 +76,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.temperatureFk"
                         :label="t('itemType.shared.temperature')"
                         :options="temperaturesOptions"
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index ff2719896..0bdfab951 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -43,21 +43,21 @@ const temperaturesOptions = ref([]);
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
-                <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+                <VnInput v-model="data.code" :label="t('shared.code')" />
+                <VnInput v-model="data.name" :label="t('shared.name')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.workerFk"
-                    :label="t('itemType.shared.worker')"
+                    :label="t('shared.worker')"
                     :options="workersOptions"
                     option-value="id"
                     option-label="firstName"
                     hide-selected
                 />
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.categoryFk"
-                    :label="t('itemType.shared.category')"
+                    :label="t('shared.category')"
                     :options="categoriesOptions"
                     option-value="id"
                     option-label="name"
@@ -65,9 +65,9 @@ const temperaturesOptions = ref([]);
                 />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.temperatureFk"
-                    :label="t('itemType.shared.temperature')"
+                    :label="t('shared.temperature')"
                     :options="temperaturesOptions"
                     option-value="code"
                     option-label="name"
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
index cb0cb333b..e565a791b 100644
--- a/src/pages/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
@@ -65,13 +66,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
             </QBtn>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('itemType.shared.code')" :value="entity.code" />
-            <VnLv :label="t('itemType.shared.name')" :value="entity.name" />
-            <VnLv
-                :label="t('itemType.shared.worker')"
-                :value="entity.worker?.firstName"
-            />
-            <VnLv :label="t('itemType.shared.category')" :value="entity.category?.name" />
+            <VnLv :label="t('shared.code')" :value="entity.code" />
+            <VnLv :label="t('shared.name')" :value="entity.name" />
+            <VnLv :label="t('shared.worker')">
+                <template #value>
+                    <span class="link">{{ entity.worker?.firstName }}</span>
+                    <WorkerDescriptorProxy :id="entity.worker?.id" />
+                </template>
+            </VnLv>
+            <VnLv :label="t('shared.category')" :value="entity.category?.name" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
index 393675a30..62d1c74ab 100644
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -2,6 +2,7 @@
 import { ref, computed, onUpdated } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -71,30 +72,29 @@ async function setItemTypeData(data) {
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" />
                 </router-link>
-                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
-                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
-                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv :label="t('summary.id')" :value="itemType.id" />
+                <VnLv :label="t('shared.code')" :value="itemType.code" />
+                <VnLv :label="t('shared.name')" :value="itemType.name" />
+                <VnLv :label="t('shared.worker')">
+                    <template #value>
+                        <span class="link">{{ itemType.worker?.firstName }}</span>
+                        <WorkerDescriptorProxy :id="itemType.worker?.id" />
+                    </template>
+                </VnLv>
+                <VnLv :label="t('shared.category')" :value="itemType.category?.name" />
                 <VnLv
-                    :label="t('itemType.shared.worker')"
-                    :value="itemType.worker?.firstName"
-                />
-                <VnLv
-                    :label="t('itemType.shared.category')"
-                    :value="itemType.category?.name"
-                />
-                <VnLv
-                    :label="t('itemType.shared.temperature')"
+                    :label="t('shared.temperature')"
                     :value="itemType.temperature?.name"
                 />
-                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
-                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
+                <VnLv :label="t('summary.life')" :value="itemType.life" />
+                <VnLv :label="t('summary.promo')" :value="itemType.promo" />
                 <VnLv
-                    :label="t('itemType.summary.itemPackingType')"
+                    :label="t('summary.itemPackingType')"
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
                     class="large-label"
-                    :label="t('itemType.summary.isUnconventionalSize')"
+                    :label="t('summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
             </QCard>
diff --git a/src/pages/ItemType/locale/en.yml b/src/pages/ItemType/locale/en.yml
new file mode 100644
index 000000000..7889418ea
--- /dev/null
+++ b/src/pages/ItemType/locale/en.yml
@@ -0,0 +1,12 @@
+shared:
+    code: Code
+    name: Name
+    worker: Worker
+    category: Category
+    temperature: Temperature
+summary:
+    id: id
+    life: Life
+    promo: Promo
+    itemPackingType: Item packing type
+    isUnconventionalSize: Is unconventional size
diff --git a/src/pages/ItemType/locale/es.yml b/src/pages/ItemType/locale/es.yml
new file mode 100644
index 000000000..9a94dceb6
--- /dev/null
+++ b/src/pages/ItemType/locale/es.yml
@@ -0,0 +1,17 @@
+shared:
+    code: Código
+    name: Nombre
+    worker: Trabajador
+    category: Reino
+    temperature: Temperatura
+summary:
+    id: id
+    code: Código
+    name: Nombre
+    worker: Trabajador
+    category: Reino
+    temperature: Temperatura
+    life: Vida
+    promo: Promoción
+    itemPackingType: Tipo de embalaje
+    isUnconventionalSize: Es de tamaño poco convencional

From 7e2ec588c5e0eef9f435fb5f43e8db1cdedc89f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:24:20 +0200
Subject: [PATCH 39/62] fix: remove Warning

---
 src/components/ui/VnUserLink.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index 47287c12b..33836550a 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,6 +1,5 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { useI18n } from 'vue-i18n';
 
 const $props = defineProps({

From 0fff6cd446f22d4410b830d21c8f13399f71822a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:46:33 +0200
Subject: [PATCH 40/62] perf: VnCard

---
 src/pages/ItemType/Card/ItemTypeCard.vue | 28 ++++++------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
index bff91de06..cb8adf7f6 100644
--- a/src/pages/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -1,26 +1,12 @@
 <script setup>
+import VnCard from 'components/common/VnCard.vue';
+
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ItemTypeDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div class="q-pa-md column items-center">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="ItemTypeSummary"
+        base-url="ItemTypes"
+        :descriptor="ItemTypeDescriptor"
+    />
 </template>

From 761bc7724f3eba14137f3e51fc979f5eea8eeb20 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:46:40 +0200
Subject: [PATCH 41/62] fix: redirect

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

diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 3609b6688..8064c41ff 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -9,7 +9,7 @@ export default {
         moduleName: 'ItemType',
     },
     component: RouterView,
-    redirect: { name: 'ItemTypeCard' },
+    redirect: { name: 'ItemTypeList' },
     menus: {
         main: [],
         card: ['ItemTypeBasicData'],

From a5d6ca447bb37092b259aab3cc32ffa729eed0e2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 12:12:20 +0200
Subject: [PATCH 42/62] fix: TicketSummary.packages label

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

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 364ae04a6..af501240b 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -188,7 +188,7 @@ async function changeState(value) {
                     :label="t('ticket.summary.landed')"
                     :value="toDate(ticket.landed)"
                 />
-                <VnLv :label="t('global.packages')" :value="ticket.packages" />
+                <VnLv :label="t('globals.packages')" :value="ticket.packages" />
                 <VnLv :value="ticket.address.phone">
                     <template #label>
                         {{ t('ticket.summary.consigneePhone') }}

From 6276c433d13b9afea9e3e2726bd0dda469bdc14e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Apr 2024 08:23:29 -0300
Subject: [PATCH 43/62] Fix exprBuilder

---
 src/pages/Item/ItemTypeList.vue | 38 +++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 17d1c0044..c6557dc79 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,10 +24,40 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
-const exprBuilder = (param, value) => ({
-    name: { like: `%${value}%` },
-    code: { like: `%${value}%` },
-});
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 </script>
 
 <template>

From 4be559bbe8ce672f2348b86407a2ba32624404f7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 15:16:37 +0200
Subject: [PATCH 44/62] fix: hansChanges to false

---
 src/components/CrudModel.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 24d848f3b..de4724e55 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -131,6 +131,7 @@ async function saveChanges(data) {
     if ($props.saveFn) {
         $props.saveFn(data, getChanges);
         isLoading.value = false;
+        hasChanges.value = false;
         return;
     }
     const changes = data || getChanges();

From ac9063e1666d51056ebac551c775ea4de260fa49 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Apr 2024 17:01:26 -0300
Subject: [PATCH 45/62] Item Last entries

---
 src/components/common/VnInputDate.vue   |   9 +-
 src/i18n/locale/en.yml                  |   1 +
 src/i18n/locale/es.yml                  |   1 +
 src/pages/Item/Card/ItemLastEntries.vue | 291 ++++++++++++++++++++++++
 src/pages/Item/locale/en.yml            |  20 ++
 src/pages/Item/locale/es.yml            |  20 ++
 src/router/modules/item.js              |  10 +
 7 files changed, 351 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Item/Card/ItemLastEntries.vue
 create mode 100644 src/pages/Item/locale/en.yml
 create mode 100644 src/pages/Item/locale/es.yml

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 2053eceb1..72d9bb2bc 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -15,6 +15,10 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+    emitDate: {
+        type: Boolean,
+        default: false,
+    },
 });
 const hover = ref(false);
 
@@ -37,7 +41,10 @@ const value = computed({
         return props.modelValue;
     },
     set(value) {
-        emit('update:modelValue', joinDateAndTime(value, time.value));
+        emit(
+            'update:modelValue',
+            props.emitDate ? new Date(value) : joinDateAndTime(value, time.value)
+        );
     },
 });
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index abe59fe18..a898f4d53 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1135,6 +1135,7 @@ item:
         tax: Tax
         barcode: Barcode
         botanical: Botanical
+        lastEntries: Last entries
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 06aa057e3..dd176e235 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1134,6 +1134,7 @@ item:
         botanical: 'Botánico'
         barcode: 'Código de barras'
         log: Historial
+        lastEntries: Últimas entradas
     descriptor:
         item: Artículo
         buyer: Comprador
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
new file mode 100644
index 000000000..2a2d84dfe
--- /dev/null
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -0,0 +1,291 @@
+<script setup>
+import { onMounted, computed, onUnmounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toDateTimeFormat } from 'src/filters/date.js';
+import { dashIfEmpty } from 'src/filters';
+import { toCurrency } from 'filters/index';
+import { useArrayData } from 'composables/useArrayData';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'id':
+        case 'quantity':
+        case 'packagingFk':
+            return { [`b.${param}`]: value };
+        case 'supplierFk':
+            return { [`s.id`]: value };
+        case 'warehouseFk':
+            return { 'tr.warehouseInFk': value };
+        case 'landed':
+            return {
+                'tr.landed': {
+                    between: getDateRange(value),
+                },
+            };
+    }
+};
+
+const dateRange = reactive({
+    from: null,
+    to: null,
+});
+
+const getDateRange = (val) => {
+    const minHour = new Date(val);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(val);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+};
+
+const from = computed({
+    get: () => dateRange.from,
+    set: (val) => {
+        updateFrom(val);
+        updateFilter();
+    },
+});
+
+const to = computed({
+    get: () => dateRange.to,
+    set: (val) => {
+        updateTo(val);
+        updateFilter();
+    },
+});
+
+const arrayData = useArrayData('ItemLastEntries', {
+    url: 'Items/lastEntriesFilter',
+    order: ['landed DESC', 'buyFk DESC'],
+    exprBuilder: exprBuilder,
+    userFilter: {
+        where: {
+            itemFk: route.params.id,
+        },
+    },
+});
+
+const itemLastEntries = ref([]);
+
+const columns = computed(() => [
+    {
+        label: t('lastEntries.ig'),
+        name: 'ig',
+        align: 'center',
+    },
+    {
+        label: t('lastEntries.warehouse'),
+        name: 'warehouse',
+        field: 'warehouse',
+        align: 'left',
+    },
+    {
+        label: t('lastEntries.landed'),
+        name: 'id',
+        field: 'landed',
+        align: 'left',
+        format: (val) => toDateTimeFormat(val),
+    },
+    {
+        label: t('lastEntries.entry'),
+        name: 'entry',
+        field: 'stateName',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('lastEntries.pvp'),
+        name: 'pvp',
+        field: 'reference',
+        align: 'left',
+        format: (_, row) => toCurrency(row.price2) + ' / ' + toCurrency(row.price3),
+    },
+
+    {
+        label: t('lastEntries.label'),
+        name: 'label',
+        field: 'stickers',
+        align: 'center',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('lastEntries.packing'),
+        name: 'packing',
+        align: 'center',
+    },
+    {
+        label: t('lastEntries.grouping'),
+        name: 'grouping',
+        align: 'center',
+    },
+    {
+        label: t('lastEntries.stems'),
+        name: 'stems',
+        field: 'stems',
+        align: 'center',
+    },
+    {
+        label: t('lastEntries.quantity'),
+        name: 'stems',
+        field: 'quantity',
+        align: 'center',
+    },
+    {
+        label: t('lastEntries.cost'),
+        name: 'cost',
+        align: 'left',
+    },
+    {
+        label: t('lastEntries.kg'),
+        name: 'stems',
+        field: 'weight',
+        align: 'center',
+    },
+    {
+        label: t('lastEntries.cube'),
+        name: 'cube',
+        field: 'packagingFk',
+        align: 'center',
+    },
+    {
+        label: t('lastEntries.supplier'),
+        name: 'stems',
+        field: 'supplier',
+        align: 'left',
+    },
+]);
+
+const fetchItemLastEntries = async () => {
+    const { data } = await arrayData.fetch({ append: false });
+    itemLastEntries.value = data;
+};
+
+const updateFrom = async (date) => {
+    date.setHours(0, 0, 0, 0);
+    dateRange.from = date.toISOString();
+};
+
+const updateTo = async (date) => {
+    date.setHours(23, 59, 59, 59);
+    dateRange.to = date.toISOString();
+};
+
+const updateFilter = async () => {
+    arrayData.store.userFilter.where.landed = {
+        between: [dateRange.from, dateRange.to],
+    };
+    await fetchItemLastEntries();
+};
+
+onMounted(async () => {
+    const _from = Date.vnNew();
+    _from.setDate(_from.getDate() - 75);
+    updateFrom(_from);
+
+    const _to = Date.vnNew();
+    _to.setDate(_to.getDate() + 10);
+    updateTo(_to);
+
+    updateFilter();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <QToolbar class="justify-end">
+        <div id="st-data" class="row">
+            <VnInputDate
+                :label="t('lastEntries.since')"
+                dense
+                emit-date
+                v-model="from"
+                class="q-mr-lg"
+            />
+            <VnInputDate :label="t('lastEntries.to')" dense emit-date v-model="to" />
+        </div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="itemLastEntries"
+            :columns="columns"
+            class="full-width q-mt-md"
+            :no-data-label="t('globals.noResults')"
+        >
+            <template #body-cell-ig="{ row }">
+                <QTd @click.stop>
+                    <QCheckbox
+                        v-model="row.isIgnored"
+                        :disable="true"
+                        :false-value="0"
+                        :true-value="1"
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-entry="{ row }">
+                <QTd @click.stop>
+                    <div class="full-width flex justify-center">
+                        <EntryDescriptorProxy :id="row.entryFk" class="q-ma-none" dense />
+                        <span class="link">{{ row.entryFk }}</span>
+                    </div>
+                </QTd>
+            </template>
+            <template #body-cell-packing="{ row }">
+                <QTd @click.stop>
+                    <QBadge class="center-content" rounded color="grey-13">
+                        {{ dashIfEmpty(row.packing) }}
+                        <QTooltip>{{ t('lastEntries.packing') }}</QTooltip>
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-grouping="{ row }">
+                <QTd @click.stop>
+                    <QBadge class="center-content" rounded color="black">
+                        {{ dashIfEmpty(row.grouping) }}
+                        <QTooltip>{{ t('lastEntries.grouping') }}</QTooltip>
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-cost="{ row }">
+                <QTd @click.stop>
+                    <span>
+                        {{ toCurrency(row.cost, 'EUR', 3) }}
+                        <QTooltip>
+                            {{ t('lastEntries.cost') }}:
+                            {{ toCurrency(dashIfEmpty(row.buyingValue), 'EUR', 3) }}<br />
+                            {{ t('lastEntries.package') }}:
+                            {{ toCurrency(dashIfEmpty(row.packageValue), 'EUR', 3)
+                            }}<br />
+                            {{ $t('lastEntries.freight') }}:
+                            {{ toCurrency(dashIfEmpty(row.freightValue), 'EUR', 3)
+                            }}<br />
+                            {{ t('lastEntries.comission') }}:
+                            {{ toCurrency(dashIfEmpty(row.comissionValue), 'EUR', 3) }}
+                        </QTooltip>
+                    </span>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.center-content {
+    display: flex;
+    max-width: max-content;
+    margin: auto;
+}
+</style>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
new file mode 100644
index 000000000..b7909bdf9
--- /dev/null
+++ b/src/pages/Item/locale/en.yml
@@ -0,0 +1,20 @@
+lastEntries:
+    since: Since
+    to: To
+    ig: Ig
+    warehouse: Warehouse
+    landed: Landed
+    entry: Entry
+    pvp: PVP
+    label: Label
+    packing: Packing
+    grouping: Grouping
+    stems: Stems
+    quantity: Quantity
+    cost: Cost
+    kg: Kg.
+    cube: Cube
+    supplier: Supplier
+    package: Package
+    freight: Freight
+    comission: Comission
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
new file mode 100644
index 000000000..052ba1981
--- /dev/null
+++ b/src/pages/Item/locale/es.yml
@@ -0,0 +1,20 @@
+lastEntries:
+    since: Desde
+    to: Hasta
+    ig: Ig
+    warehouse: Almacén
+    landed: F. Entrega
+    entry: Entrada
+    pvp: PVP
+    label: Etiquetas
+    packing: Packing
+    grouping: Grouping
+    stems: Tallos
+    quantity: Cantidad
+    cost: Coste
+    kg: Kg.
+    cube: Cubo
+    supplier: Proveedor
+    package: Embalaje
+    freight: Porte
+    comission: Comisión
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index bc1e72a94..91c43a540 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -20,6 +20,7 @@ export default {
             'ItemTax',
             'ItemBotanical',
             'ItemBarcode',
+            'ItemLastEntries',
         ],
     },
     children: [
@@ -157,6 +158,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
                 },
+                {
+                    path: 'last-entries',
+                    name: 'ItemLastEntries',
+                    meta: {
+                        title: 'lastEntries',
+                        icon: 'vn:botanical',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
+                },
             ],
         },
     ],

From ccac3a54f96fff7f88f13ece50774bd1428d6f98 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Apr 2024 17:39:37 -0300
Subject: [PATCH 46/62] move translations

---
 src/pages/Item/Card/ItemDiary.vue | 41 +++++++++++--------------------
 src/pages/Item/locale/en.yml      | 13 ++++++++++
 src/pages/Item/locale/es.yml      | 13 ++++++++++
 3 files changed, 40 insertions(+), 27 deletions(-)
 create mode 100644 src/pages/Item/locale/en.yml
 create mode 100644 src/pages/Item/locale/es.yml

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index ef4c7b993..c2687e0fd 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -39,25 +39,25 @@ const columns = computed(() => [
         field: 'itemFk',
     },
     {
-        label: t('Date'),
+        label: t('itemDiary.date'),
         name: 'date',
         field: 'shipped',
         align: 'left',
     },
     {
-        label: t('Id'),
+        label: t('itemDiary.id'),
         name: 'id',
         align: 'left',
     },
     {
-        label: t('State'),
+        label: t('itemDiary.state'),
         field: 'stateName',
         name: 'state',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('Reference'),
+        label: t('itemDiary.reference'),
         field: 'reference',
         name: 'reference',
         align: 'left',
@@ -65,27 +65,27 @@ const columns = computed(() => [
     },
 
     {
-        label: t('Client'),
+        label: t('itemDiary.client'),
         name: 'client',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('In'),
+        label: t('itemDiary.in'),
         field: 'invalue',
         name: 'in',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('Out'),
+        label: t('itemDiary.out'),
         field: 'out',
         name: 'out',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('Balance'),
+        label: t('itemDiary.balance'),
         name: 'balance',
         align: 'left',
     },
@@ -144,7 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <QToolbar class="justify-end">
         <div id="st-data" class="row">
             <VnSelect
-                :label="t('Warehouse')"
+                :label="t('itemDiary.warehouse')"
                 :options="warehousesOptions"
                 hide-selected
                 option-label="name"
@@ -155,14 +155,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 class="q-mr-lg"
             />
             <QCheckbox
-                :label="t(`Show what's before the inventory`)"
+                :label="t('itemDiary.showBefore')"
                 v-model="showWhatsBeforeInventory"
                 @update:model-value="fetchItemBalances"
                 class="q-mr-lg"
             />
             <VnInputDate
                 v-if="showWhatsBeforeInventory"
-                :label="t('Since')"
+                :label="t('itemDiary.since')"
                 dense
                 v-model="itemsBalanceFilter.where.date"
                 @update:model-value="fetchItemBalances"
@@ -188,7 +188,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         icon="vn:claims"
                         dense
                     >
-                        <QTooltip> {{ t('Claim') }}: {{ row.claimFk }} </QTooltip>
+                        <QTooltip>
+                            {{ t('itemDiary.claim') }}: {{ row.claimFk }}
+                        </QTooltip>
                     </QBtn>
                 </QTd>
             </template>
@@ -273,18 +275,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     color: $positive;
 }
 </style>
-
-<i18n>
-es:
-    Date: Fecha
-    Id: Id
-    State: Estado
-    Reference: Referencia
-    Client: Cliente
-    In: Entrada
-    Out: Salida
-    Balance: Balance
-    Claim: Reclamación
-    Show what's before the inventory: Mostrar lo anterior al inventario
-    Since: Desde
-</i18n>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
new file mode 100644
index 000000000..ec3b134e8
--- /dev/null
+++ b/src/pages/Item/locale/en.yml
@@ -0,0 +1,13 @@
+itemDiary:
+    date: Date
+    id: Id
+    state: State
+    reference: Reference
+    client: Client
+    in: In
+    out: Out
+    balance: Balance
+    claim: Claim
+    showBefore: Show what's before the inventory
+    since: Since
+    warehouse: Warehouse
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
new file mode 100644
index 000000000..4f76313fa
--- /dev/null
+++ b/src/pages/Item/locale/es.yml
@@ -0,0 +1,13 @@
+itemDiary:
+    date: Fecha
+    id: Id
+    state: Estado
+    reference: Referencia
+    client: Cliente
+    in: Entrada
+    out: Salida
+    balance: Balance
+    claim: Reclamación
+    showBefore: Mostrar lo anterior al inventario
+    since: Desde
+    warehouse: Almacén

From 2dfb2300a2c5ace6c98450b7dc22ddb49132cfda Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 30 Apr 2024 07:51:22 +0200
Subject: [PATCH 47/62] hotFix: refs #6336 fix vnLog user?.id

---
 src/components/common/VnLog.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index c1cc78f54..f2cef8f84 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -421,12 +421,13 @@ setLogTree();
         >
             <div class="timeline">
                 <div class="user-avatar">
-                    <VnUserLink :worker-id="userLog.user.id">
+                    <VnUserLink :worker-id="userLog?.user?.id">
                         <template #link>
                             <VnAvatar
-                                :class="{ 'cursor-pointer': userLog.user.id }"
-                                :worker-id="userLog.user.id"
-                                :title="userLog.user.nickname"
+                                :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                :worker-id="userLog?.user?.id"
+                                :title="userLog?.user?.nickname"
+                                :show-letter="!userLog?.user"
                                 size="lg"
                             />
                         </template>

From 5b15558dbf4dd017c0588ffd64cf2f64307799a4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 30 Apr 2024 10:32:32 +0200
Subject: [PATCH 48/62] refactor: refs #6887 fixed errors

---
 src/css/app.scss                         |   9 --
 src/i18n/locale/en.yml                   |   6 +
 src/i18n/locale/es.yml                   |   6 +
 src/pages/Claim/Card/ClaimDescriptor.vue |   5 +-
 src/pages/Claim/Card/ClaimSummary.vue    |   6 +-
 src/pages/Zone/Card/ZoneCard.vue         |   6 +
 src/pages/Zone/Card/ZoneDescriptor.vue   |  72 ++++-------
 src/router/modules/index.js              |   2 +
 src/router/modules/zone.js               | 158 +++++++++++++++++++++++
 src/router/routes.js                     |   2 +
 src/stores/useNavigationStore.js         |   1 +
 11 files changed, 212 insertions(+), 61 deletions(-)
 create mode 100644 src/pages/Zone/Card/ZoneCard.vue
 create mode 100644 src/router/modules/zone.js

diff --git a/src/css/app.scss b/src/css/app.scss
index 770df8e01..2e524e693 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -141,15 +141,6 @@ select:-webkit-autofill {
     background-color: var(--vn-section-color);
 }
 
-.q-checkbox {
-    & .q-checkbox__label {
-        color: var(--vn-text-color);
-    }
-    & .q-checkbox__inner {
-        color: var(--vn-label-color);
-    }
-}
-
 .tr-header {
     color: var(--vn-label-color);
 }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 942018b84..7a341dded 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1166,6 +1166,12 @@ item:
         type: Type
         intrastat: Intrastat
         origin: Origin
+zone:
+    pageTitles:
+        zones: Zone
+        zonesList: Zones
+        deliveryList: Delivery days
+        upcomingList: Upcoming deliveries
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3de5af50c..9286cbccb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1165,6 +1165,12 @@ item:
         type: Tipo
         intrastat: Intrastat
         origin: Origen
+zone:
+    pageTitles:
+        zones: Zona
+        zonesList: Zonas
+        deliveryList: Días de entrega
+        upcomingList: Próximos repartos
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 3b5dd82b8..aae999117 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -74,8 +74,9 @@ const filter = {
 
 const STATE_COLOR = {
     pending: 'warning',
-    managed: 'info',
+    incomplete: 'info',
     resolved: 'positive',
+    canceled: 'negative',
 };
 function stateColor(code) {
     return STATE_COLOR[code];
@@ -142,7 +143,7 @@ onMounted(async () => {
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
-                        <ZoneDescriptorProxy :id="entity.ticket?.zoneFk" />
+                        <ZoneDescriptorProxy :id="entity.ticket?.zone?.id" />
                     </span>
                 </template>
             </VnLv>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index c4c2785d5..36a26008e 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -14,6 +14,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import axios from 'axios';
+import dashIfEmpty from 'src/filters/dashIfEmpty';
 
 const route = useRoute();
 const router = useRouter();
@@ -101,8 +102,9 @@ const detailsColumns = ref([
 
 const STATE_COLOR = {
     pending: 'warning',
-    managed: 'info',
+    incomplete: 'info',
     resolved: 'positive',
+    canceled: 'negative',
 };
 function stateColor(code) {
     return STATE_COLOR[code];
@@ -260,7 +262,7 @@ async function changeState(value) {
                 </VnLv>
                 <VnLv
                     :label="t('claim.basicData.pickup')"
-                    :value="t(`claim.basicData.${claim.pickup}`)"
+                    :value="`${dashIfEmpty(claim.pickup)}`"
                 />
             </QCard>
             <QCard class="vn-three">
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
new file mode 100644
index 000000000..948636c55
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnCard from 'components/common/VnCard.vue';
+</script>
+<template>
+    <VnCard data-key="Zone" base-url="Zones" />
+</template>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 665cb6f0e..b56443c84 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -8,7 +8,6 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 import useCardDescription from 'src/composables/useCardDescription';
-import { toDate } from 'src/filters';
 
 const $props = defineProps({
     id: {
@@ -22,28 +21,11 @@ const route = useRoute();
 const { t } = useI18n();
 
 const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-    ],
     include: [
         {
-            relation: 'warehouseIn',
+            relation: 'agencyMode',
             scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
+                fields: ['name', 'id'],
             },
         },
     ],
@@ -58,6 +40,13 @@ const data = ref(useCardDescription());
 const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
+
+function extractHour(dateTime) {
+    const date = new Date(dateTime);
+    const hours = date.getHours().toString().padStart(2, '0');
+    const minutes = date.getMinutes().toString().padStart(2, '0');
+    return `${hours}:${minutes}`;
+}
 </script>
 
 <template>
@@ -76,52 +65,39 @@ const setData = (entity) => {
                 flat
                 dense
                 size="md"
-                icon="local_airport"
+                icon="preview"
                 color="white"
                 class="link"
                 :to="{ name: 'ZoneList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('Summary') }}
                 </QTooltip>
             </QBtn>
         </template>
         <template #menu="{ entity }">
-            <ZoneDescriptorMenuItems :travel="entity" />
+            <ZoneDescriptorMenuItems :zone="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('globals.wareHouseIn')" :value="entity.warehouseIn.name" />
-            <VnLv :label="t('globals.wareHouseOut')" :value="entity.warehouseOut.name" />
-            <VnLv :label="t('globals.shipped')" :value="toDate(entity.shipped)" />
-            <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
-            <VnLv :label="t('globals.totalEntries')" :value="entity.totalEntries" />
-        </template>
-        <template #actions="{ entity }">
-            <QCardActions>
-                <QBtn
-                    :to="{
-                        name: 'ZoneList',
-                        query: {
-                            params: JSON.stringify({
-                                agencyModeFk: entity.agencyModeFk,
-                            }),
-                        },
-                    }"
-                    size="md"
-                    icon="local_airport"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('All travels with current agency') }}</QTooltip>
-                </QBtn>
-            </QCardActions>
+            {{ console.log('entity', entity) }}
+            <VnLv :label="t('Agency')" :value="entity.agencyMode.name" />
+            <VnLv :label="t('Closing hour')" :value="extractHour(entity.hour)" />
+            <VnLv :label="t('traveling days')" :value="entity.travelingDays" />
+            <VnLv :label="t('Price')" :value="entity.price" />
+            <VnLv :label="t('Bonus')" :value="entity.bonus" />
         </template>
     </CardDescriptor>
 </template>
 
 <i18n>
 es:
-    Go to module index: Ir al índice del módulo
+    Summary: Detalles
     The travel will be deleted: El envío será eliminado
     Do you want to delete this travel?: ¿Quieres eliminar este envío?
     All travels with current agency: Todos los envíos con la agencia actual
+    Agency: Agencia
+    Closing hour: Hora de cierre
+    traveling days: Días de viaje
+    Price: Precio
+    Bonus: Bonificación
 </i18n>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 302ba7fe0..2fe40038f 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -15,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
+import Zone from './zone';
 
 export default [
     Item,
@@ -34,4 +35,5 @@ export default [
     Entry,
     roadmap,
     Parking,
+    Zone,
 ];
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
new file mode 100644
index 000000000..bd74a76f3
--- /dev/null
+++ b/src/router/modules/zone.js
@@ -0,0 +1,158 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/zone',
+    name: 'Zone',
+    meta: {
+        title: 'zones',
+        icon: 'vn:zone',
+        moduleName: 'Zone',
+    },
+    component: RouterView,
+    redirect: { name: 'ZoneMain' },
+    menus: {
+        main: ['ZoneList' /*'ZoneDeliveryList', 'ZoneUpcomingList'*/],
+        card: [
+            //
+        ],
+    },
+    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'),
+                // },
+            ],
+        },
+        {
+            name: 'ZoneCard',
+            path: ':id',
+            component: () => import('src/pages/Zone/Card/ZoneCard.vue'),
+            redirect: { name: 'ZoneSummary' },
+            children: [
+                {
+                    name: 'ZoneSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
+                },
+                // {
+                //     path: '/zone/delivery',
+                //     name: 'ZoneDeliveryMain',
+                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
+                //     redirect: { name: 'ZoneDeliveryList' },
+                //     children: [
+                //         {
+                //             path: 'list',
+                //             name: 'ZoneDeliveryList',
+                //             meta: {
+                //                 title: 'deliveryList',
+                //                 icon: 'today',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Delivery/ZoneDeliveryList.vue'),
+                //         },
+                //         {
+                //             path: 'create',
+                //             name: 'ZoneDeliveryCreate',
+                //             meta: {
+                //                 title: 'deliveryCreate',
+                //                 icon: 'create',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
+                //         },
+                //         {
+                //             path: ':id/edit',
+                //             name: 'ZoneDeliveryEdit',
+                //             meta: {
+                //                 title: 'deliveryEdit',
+                //                 icon: 'edit',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
+                //         },
+                //     ],
+                // },
+                // {
+                //     path: '/zone/upcoming',
+                //     name: 'ZoneUpcomingMain',
+                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
+                //     redirect: { name: 'ZoneUpcomingList' },
+                //     children: [
+                //         {
+                //             path: 'list',
+                //             name: 'ZoneUpcomingList',
+                //             meta: {
+                //                 title: 'upcomingList',
+                //                 icon: 'today',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingList.vue'),
+                //         },
+                //         {
+                //             path: 'create',
+                //             name: 'ZoneUpcomingCreate',
+                //             meta: {
+                //                 title: 'upcomingCreate',
+                //                 icon: 'create',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
+                //         },
+                //         {
+                //             path: ':id/edit',
+                //             name: 'ZoneUpcomingEdit',
+                //             meta: {
+                //                 title: 'upcomingEdit',
+                //                 icon: 'edit',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
+                //         },
+                //     ],
+                // },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 51e726a62..14bf6665f 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -15,6 +15,7 @@ import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
 import roadmap from 'src/router/modules/roadmap';
 import parking from 'src/router/modules/parking';
+import zone from 'src/router/modules/zone';
 
 const routes = [
     {
@@ -71,6 +72,7 @@ const routes = [
             roadmap,
             entry,
             parking,
+            zone,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index f075301f6..ee1e04e9b 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -21,6 +21,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'ticket',
         'worker',
         'wagon',
+        'zone',
     ];
     const pinnedModules = ref([]);
     const role = useRole();

From a512f094d6950375135b4d0d5d9e7d337c497a5f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 30 Apr 2024 12:06:24 +0200
Subject: [PATCH 49/62] perf: ZoneDescriptor

---
 src/pages/Zone/Card/ZoneDescriptor.vue        |  16 +-
 .../Zone/Card/ZoneDescriptorMenuItems.vue     | 143 ++++++++----------
 2 files changed, 72 insertions(+), 87 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index b56443c84..486e4f063 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -57,7 +57,7 @@ function extractHour(dateTime) {
         :subtitle="data.subtitle"
         :filter="filter"
         @on-fetch="setData"
-        data-key="travelData"
+        data-key="zoneData"
     >
         <template #header-extra-action>
             <QBtn
@@ -75,14 +75,14 @@ function extractHour(dateTime) {
                 </QTooltip>
             </QBtn>
         </template>
-        <template #menu="{ entity }">
+        <!-- <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
-        </template>
+        </template> -->
         <template #body="{ entity }">
             {{ console.log('entity', entity) }}
             <VnLv :label="t('Agency')" :value="entity.agencyMode.name" />
             <VnLv :label="t('Closing hour')" :value="extractHour(entity.hour)" />
-            <VnLv :label="t('traveling days')" :value="entity.travelingDays" />
+            <VnLv :label="t('zoneing days')" :value="entity.zoneingDays" />
             <VnLv :label="t('Price')" :value="entity.price" />
             <VnLv :label="t('Bonus')" :value="entity.bonus" />
         </template>
@@ -92,12 +92,12 @@ function extractHour(dateTime) {
 <i18n>
 es:
     Summary: Detalles
-    The travel will be deleted: El envío será eliminado
-    Do you want to delete this travel?: ¿Quieres eliminar este envío?
-    All travels with current agency: Todos los envíos con la agencia actual
+    The zone will be deleted: El envío será eliminado
+    Do you want to delete this zone?: ¿Quieres eliminar este envío?
+    All zones with current agency: Todos los envíos con la agencia actual
     Agency: Agencia
     Closing hour: Hora de cierre
-    traveling days: Días de viaje
+    zoneing days: Días de viaje
     Price: Precio
     Bonus: Bonificación
 </i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 920d83dfe..b6c7f28b3 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -1,108 +1,93 @@
 <script setup>
-import { computed } from 'vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+const { dialog, notify } = useQuasar();
 
 import VnConfirm from 'components/ui/VnConfirm.vue';
 
 import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-import { useRole } from 'src/composables/useRole';
 
 const $props = defineProps({
-    travel: {
+    zone: {
         type: Object,
         default: () => {},
     },
 });
 
 const { t } = useI18n();
-const router = useRouter();
-const quasar = useQuasar();
-const { notify } = useNotify();
-const role = useRole();
+const { push, currentRoute } = useRouter();
+const zoneId = currentRoute.value.params.id;
 
-const redirectToCreateView = (queryParams) => {
-    router.push({ name: 'ZoneCreate', query: { travelData: queryParams } });
-};
-
-const cloneZone = () => {
-    const stringifiedZoneData = JSON.stringify($props.travel);
-    redirectToCreateView(stringifiedZoneData);
-};
-
-const cloneZoneWithEntries = () => {
-    try {
-        axios.post(`Zones/${$props.travel.id}/cloneWithEntries`);
-        notify('globals.dataSaved', 'positive');
-    } catch (err) {
-        console.err('Error cloning travel with entries');
-    }
-};
-
-const isBuyer = computed(() => {
-    return role.hasAny(['buyer']);
-});
-
-const openDeleteEntryDialog = (id) => {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('The travel will be deleted'),
-                message: t('Do you want to delete this travel?'),
-            },
-        })
-        .onOk(async () => {
-            await deleteZone(id);
-        });
-};
-
-const deleteZone = async (id) => {
-    try {
-        await axios.delete(`Zones/${id}`);
-        router.push({ name: 'ZoneList' });
-        notify('globals.dataDeleted', 'positive');
-    } catch (err) {
-        console.error('Error deleting travel');
-    }
+const actions = {
+    clone: async () => {
+        const opts = { message: t('Zone cloned'), type: 'positive' };
+        let clonedZoneId;
+
+        try {
+            const { data } = await axios.post(`Zones/${zoneId}/clone`, {
+                shipped: $props.zone.value.shipped,
+            });
+            clonedZoneId = data;
+        } catch (e) {
+            opts.message = t('It was not able to clone the zone');
+            opts.type = 'negative';
+        } finally {
+            notify(opts);
+
+            if (clonedZoneId) push({ name: 'ZoneSummary', params: { id: clonedZoneId } });
+        }
+    },
+    remove: async () => {
+        try {
+            await axios.post(`Zones/${zoneId}/setDeleted`);
+
+            notify({ message: t('Zone deleted'), type: 'positive' });
+            notify({
+                message: t('You can undo this action within the first hour'),
+                icon: 'info',
+            });
+
+            push({ name: 'ZoneList' });
+        } catch (e) {
+            notify({ message: e.message, type: 'negative' });
+        }
+    },
 };
+function openConfirmDialog(callback) {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            promise: actions[callback],
+        },
+    });
+}
 </script>
-
 <template>
-    <QItem v-ripple clickable @click="cloneZone(travel)">
-        <QItemSection>{{ t('travel.summary.cloneShipping') }}</QItemSection>
-    </QItem>
-    <QItem v-ripple clickable @click="cloneZoneWithEntries()">
-        <QItemSection>
-            {{ t('travel.summary.CloneZoneAndEntries') }}
+    <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_copy" />
         </QItemSection>
+        <QItemSection>{{ t('To clone zone') }}</QItemSection>
     </QItem>
-    <QItem
-        v-if="isBuyer && travel.totalEntries === 0"
-        v-ripple
-        clickable
-        @click="openDeleteEntryDialog(travel.id)"
-    >
-        <QItemSection>
-            {{ t('travel.summary.deleteZone') }}
-        </QItemSection>
-    </QItem>
-    <QItem v-ripple clickable>
-        <QItemSection>
-            <RouterLink
-                :to="{ name: 'EntryCreate', query: { travelFk: travel.id } }"
-                class="color-vn-text"
-            >
-                {{ t('travel.summary.AddEntry') }}
-            </RouterLink>
+    <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="delete" />
         </QItemSection>
+        <QItemSection>{{ t('deleteOrder') }}</QItemSection>
     </QItem>
 </template>
 
 <i18n>
+en:
+    deleteOrder: Delete order
+    confirmDeletion: Confirm deletion
+    confirmDeletionMessage: Are you sure you want to delete this order?
+
 es:
-    The travel will be deleted: El envío será eliminado
-    Do you want to delete this travel?: ¿Quieres eliminar este envío?
+    To clone zone: Clonar zone
+    deleteOrder: Eliminar pedido
+    confirmDeletion: Confirmar eliminación
+    confirmDeletionMessage: Seguro que quieres eliminar este pedido?
+
 </i18n>

From 38cd54a7f040436ce51a78069cad20dbe59c67db Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 30 Apr 2024 12:10:30 +0200
Subject: [PATCH 50/62] refs #6895 remove autoload

---
 src/pages/Shelving/ShelvingList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index a5a24e84d..4584248bf 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -72,7 +72,6 @@ function exprBuilder(param, value) {
                 :filter="filter"
                 :expr-builder="exprBuilder"
                 :limit="20"
-                auto-load
             >
                 <template #body="{ rows }">
                     <CardList

From f3387cf120efcd327cd1fd6c5d501884e2909dfa Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 30 Apr 2024 12:39:50 +0200
Subject: [PATCH 51/62] fix: refs #6336 fix reload and disable button when is
 loading

---
 src/components/ui/VnPaginate.vue     |  2 ++
 src/pages/Claim/Card/ClaimAction.vue | 25 +++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 4dae312ce..c00849512 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -95,6 +95,8 @@ const addFilter = async (filter, params) => {
 };
 
 async function fetch() {
+    store.filter.skip = 0;
+    store.skip = 0;
     await arrayData.fetch({ append: false });
     if (!store.hasMoreData) {
         isLoading.value = false;
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 367b5249c..b0650b610 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -37,6 +37,7 @@ const marker_labels = [
     { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
 ];
 const multiplicatorValue = ref();
+const loading = ref(false);
 
 const columns = computed(() => [
     {
@@ -118,7 +119,7 @@ async function updateDestinations(claimDestinationFk) {
 
 async function updateDestination(claimDestinationFk, row, options = {}) {
     if (claimDestinationFk) {
-        await axios.post('Claims/updateClaimDestination', {
+        await post('Claims/updateClaimDestination', {
             claimDestinationFk,
             rows: Array.isArray(row) ? row : [row],
         });
@@ -127,7 +128,7 @@ async function updateDestination(claimDestinationFk, row, options = {}) {
 }
 
 async function regularizeClaim() {
-    await axios.post(`Claims/${claimId}/regularizeClaim`);
+    await post(`Claims/${claimId}/regularizeClaim`);
     await claimRef.value.fetch();
     await arrayData.fetch({ append: false });
     quasar.notify({
@@ -146,7 +147,7 @@ async function onUpdateGreugeAccept() {
     const freightPickUpPrice =
         (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
         multiplicatorValue.value;
-    await axios.post(`Greuges`, {
+    await post(`Greuges`, {
         clientFk: claim.value.clientFk,
         description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),
         amount: freightPickUpPrice,
@@ -165,14 +166,22 @@ async function save(data) {
 }
 
 async function importToNewRefundTicket() {
-    const query = `ClaimBeginnings/${claimId}/importToNewRefundTicket`;
-    await axios.post(query);
-    claimActionsForm.value.reload();
+    await post(`ClaimBeginnings/${claimId}/importToNewRefundTicket`);
+    await claimActionsForm.value.reload();
     quasar.notify({
         message: t('globals.dataSaved'),
         type: 'positive',
     });
 }
+
+async function post(query, params) {
+    loading.value = true;
+    try {
+        await axios.post(query, params);
+    } finally {
+        loading.value = false;
+    }
+}
 </script>
 <template>
     <FetchData
@@ -279,6 +288,7 @@ async function importToNewRefundTicket() {
         :default-save="false"
         :default-reset="false"
         @on-fetch="setData"
+        :limit="0"
         auto-load
     >
         <template #body>
@@ -390,6 +400,7 @@ async function importToNewRefundTicket() {
                 icon="check"
                 @click="regularizeClaim"
                 :disable="claim.claimStateFk == resolvedStateId"
+                :loading="loading"
             />
 
             <QBtn
@@ -401,6 +412,7 @@ async function importToNewRefundTicket() {
                 :title="t('Change destination')"
                 icon="swap_horiz"
                 @click="dialogDestination = !dialogDestination"
+                :loading="loading"
             />
             <QBtn
                 color="primary"
@@ -411,6 +423,7 @@ async function importToNewRefundTicket() {
                 icon="Upload"
                 @click="importToNewRefundTicket"
                 :disable="claim.claimStateFk == resolvedStateId"
+                :loading="loading"
             />
         </template>
     </CrudModel>

From 0890de37714f0859caba92087bfd196a509fa003 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Apr 2024 16:21:06 -0300
Subject: [PATCH 52/62] change prop name

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

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 72d9bb2bc..fe0866292 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -15,7 +15,7 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
-    emitDate: {
+    emitDateFormat: {
         type: Boolean,
         default: false,
     },
@@ -43,7 +43,7 @@ const value = computed({
     set(value) {
         emit(
             'update:modelValue',
-            props.emitDate ? new Date(value) : joinDateAndTime(value, time.value)
+            props.emitDateFormat ? new Date(value) : joinDateAndTime(value, time.value)
         );
     },
 });

From 72ad524c6807b2d1c42af13dc7ea2fd241a7f6d2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Apr 2024 16:23:19 -0300
Subject: [PATCH 53/62] change prop names

---
 src/pages/Item/Card/ItemLastEntries.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index 2a2d84dfe..af14e06c2 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -209,11 +209,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <VnInputDate
                 :label="t('lastEntries.since')"
                 dense
-                emit-date
+                emit-date-format
                 v-model="from"
                 class="q-mr-lg"
             />
-            <VnInputDate :label="t('lastEntries.to')" dense emit-date v-model="to" />
+            <VnInputDate
+                :label="t('lastEntries.to')"
+                dense
+                emit-date-format
+                v-model="to"
+            />
         </div>
         <QSpace />
         <div id="st-actions"></div>

From d2531efdd62ff510f8fe1930de5f913949d63a9b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 1 May 2024 13:27:40 +0200
Subject: [PATCH 54/62] fix: Botanical icon

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

diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 91c43a540..ff07a37d2 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -154,7 +154,7 @@ export default {
                     name: 'ItemBotanical',
                     meta: {
                         title: 'botanical',
-                        icon: 'vn:botanical',
+                        icon: 'local_florist',
                     },
                     component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
                 },

From 4ef7b0e17cacf33f4daa75dd5ebe5b1c6dfb2a8d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 1 May 2024 13:31:32 +0200
Subject: [PATCH 55/62] fix: item routes order

---
 src/router/modules/item.js | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index ff07a37d2..51d9138db 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -113,6 +113,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemTags.vue'),
                 },
+                {
+                    path: 'last-entries',
+                    name: 'ItemLastEntries',
+                    meta: {
+                        title: 'lastEntries',
+                        icon: 'vn:regentry',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
+                },
                 {
                     path: 'tax',
                     name: 'ItemTax',
@@ -122,6 +131,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemTax.vue'),
                 },
+                {
+                    path: 'botanical',
+                    name: 'ItemBotanical',
+                    meta: {
+                        title: 'botanical',
+                        icon: 'local_florist',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
+                },
                 {
                     path: 'barcode',
                     name: 'ItemBarcode',
@@ -135,8 +153,8 @@ export default {
                     path: 'diary',
                     name: 'ItemDiary',
                     meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
+                        title: 'diary',
+                        icon: 'vn:transaction',
                     },
                     component: () => import('src/pages/Item/Card/ItemDiary.vue'),
                 },
@@ -149,24 +167,6 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemLog.vue'),
                 },
-                {
-                    path: 'botanical',
-                    name: 'ItemBotanical',
-                    meta: {
-                        title: 'botanical',
-                        icon: 'local_florist',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
-                },
-                {
-                    path: 'last-entries',
-                    name: 'ItemLastEntries',
-                    meta: {
-                        title: 'lastEntries',
-                        icon: 'vn:botanical',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
-                },
             ],
         },
     ],

From 4fdf2bacf877fb8871ff16c20c579748c3e1521b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 1 May 2024 13:52:45 +0200
Subject: [PATCH 56/62] fix: pvp tooltip

---
 src/pages/Item/Card/ItemLastEntries.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index af14e06c2..297cb6330 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -256,6 +256,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QBadge>
                 </QTd>
             </template>
+            <template #body-cell-pvp="{ value }">
+                <QTd @click.stop
+                    ><span> {{ value }}</span>
+                    <QTooltip>
+                        {{ t('lastEntries.grouping') }}/{{ t('lastEntries.packing') }}
+                    </QTooltip></QTd
+                >
+            </template>
             <template #body-cell-grouping="{ row }">
                 <QTd @click.stop>
                     <QBadge class="center-content" rounded color="black">
@@ -288,9 +296,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </template>
 
 <style lang="scss" scoped>
+.q-badge--rounded {
+    border-radius: 50%;
+}
 .center-content {
     display: flex;
     max-width: max-content;
     margin: auto;
+    padding: 0 11px;
+    height: 28px;
 }
 </style>

From f46b78131c07489886b8a89bf95bbbe35770755c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 10:24:07 +0200
Subject: [PATCH 57/62] perf: remove onMounted and reload

---
 src/pages/Customer/Card/CustomerContacts.vue   |  7 ++-----
 src/pages/Entry/Card/EntryNotes.vue            |  7 ++-----
 src/pages/Item/Card/ItemBarcode.vue            |  7 ++-----
 src/pages/Item/Card/ItemTax.vue                |  7 ++-----
 src/pages/Route/Roadmap/RoadmapStops.vue       | 14 +++++++-------
 src/pages/Supplier/Card/SupplierAccounts.vue   |  7 ++-----
 src/pages/Supplier/Card/SupplierAgencyTerm.vue |  7 ++-----
 src/pages/Supplier/Card/SupplierContacts.vue   |  7 ++-----
 8 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerContacts.vue b/src/pages/Customer/Card/CustomerContacts.vue
index 6fb891dff..cd4d553df 100644
--- a/src/pages/Customer/Card/CustomerContacts.vue
+++ b/src/pages/Customer/Card/CustomerContacts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,10 +11,6 @@ const route = useRoute();
 const { t } = useI18n();
 
 const customerContactsRef = ref(null);
-
-onMounted(() => {
-    if (customerContactsRef.value) customerContactsRef.value.reload();
-});
 </script>
 <template>
     <div class="full-width flex justify-center">
@@ -30,6 +26,7 @@ onMounted(() => {
                 model="CustomerContacts"
                 ref="customerContactsRef"
                 url="ClientContacts"
+                auto-load
             >
                 <template #body="{ rows }">
                     <QCard class="q-pl-lg q-py-md">
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index b9683578c..f07d0b233 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -21,10 +21,6 @@ const sortEntryObservationOptions = (data) => {
     );
 };
 
-onMounted(() => {
-    if (entryObservationsRef.value) entryObservationsRef.value.reload();
-});
-
 const columns = computed(() => [
     {
         name: 'observationType',
@@ -65,6 +61,7 @@ const columns = computed(() => [
         ref="entryObservationsRef"
         :data-required="{ entryFk: params.id }"
         v-model:selected="selected"
+        auto-load
     >
         <template #body="{ rows, validate }">
             <QTable
diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
index 26254ba84..b353d67c7 100644
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, nextTick } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -23,10 +23,6 @@ const focusLastInput = () => {
         if (lastInput) lastInput.focus();
     });
 };
-
-onMounted(async () => {
-    if (itemBarcodeRef.value) itemBarcodeRef.value.reload();
-});
 </script>
 <template>
     <div class="full-width flex justify-center">
@@ -42,6 +38,7 @@ onMounted(async () => {
                 model="ItemBarcodes"
                 ref="itemBarcodeRef"
                 url="ItemBarcodes"
+                auto-load
             >
                 <template #body="{ rows }">
                     <QCard class="q-px-lg q-py-md">
diff --git a/src/pages/Item/Card/ItemTax.vue b/src/pages/Item/Card/ItemTax.vue
index 0942493f3..489a2c7b2 100644
--- a/src/pages/Item/Card/ItemTax.vue
+++ b/src/pages/Item/Card/ItemTax.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -44,10 +44,6 @@ const submitTaxes = async (data) => {
         console.error('Error saving taxes', err);
     }
 };
-
-onMounted(async () => {
-    if (ItemTaxRef.value) ItemTaxRef.value.reload();
-});
 </script>
 <template>
     <FetchData
@@ -66,6 +62,7 @@ onMounted(async () => {
         data-key="ItemTax"
         model="ItemTax"
         ref="ItemTaxRef"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-px-lg q-py-md">
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 10d6e6066..5c3bd51e7 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -3,9 +3,9 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 import CrudModel from 'components/CrudModel.vue';
-import RoadmapAddStopForm from "pages/Route/Roadmap/RoadmapAddStopForm.vue";
+import RoadmapAddStopForm from 'pages/Route/Roadmap/RoadmapAddStopForm.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -21,10 +21,6 @@ const updateDefaultStop = (data) => {
     eta.setDate(eta.getDate() + 1);
     defaultStop.value.eta = eta.toISOString();
 };
-
-onMounted(() => {
-    if (roadmapStopsCrudRef.value) roadmapStopsCrudRef.value.reload();
-});
 </script>
 <template>
     <VnSubToolbar />
@@ -43,6 +39,7 @@ onMounted(() => {
             :filter="{ where: { roadmapFk: route.params?.id } }"
             :default-remove="false"
             :data-required="defaultStop"
+            auto-load
         >
             <template #body="{ rows }">
                 <QCard class="q-pa-md">
@@ -51,7 +48,10 @@ onMounted(() => {
                         :key="index"
                         class="row no-wrap"
                     >
-                        <RoadmapAddStopForm :roadmap-fk="route.params?.id" :form-data="row" />
+                        <RoadmapAddStopForm
+                            :roadmap-fk="route.params?.id"
+                            :form-data="row"
+                        />
                         <div class="col-1 row justify-center items-center">
                             <QIcon
                                 name="delete"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 41df6adb9..d95b6c30c 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -59,10 +59,6 @@ const setWireTransfer = async () => {
         console.error('Error setting wire transfer', err);
     }
 };
-
-onMounted(() => {
-    if (supplierAccountRef.value) supplierAccountRef.value.reload();
-});
 </script>
 <template>
     <FetchData
@@ -94,6 +90,7 @@ onMounted(() => {
         :default-remove="false"
         :data-required="{ supplierFk: route.params.id }"
         @save-changes="onChangesSaved()"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-pa-md">
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 769ff4dad..50a4f7adc 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -26,10 +26,6 @@ const supplierAgencyFilter = {
 const redirectToCreateView = () => {
     router.push({ name: 'SupplierAgencyTermCreate' });
 };
-
-onMounted(() => {
-    if (supplierAgencyTermRef.value) supplierAgencyTermRef.value.reload();
-});
 </script>
 <template>
     <FetchData
@@ -49,6 +45,7 @@ onMounted(() => {
         :data-required="{
             supplierFk: route.params.id,
         }"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-pa-md">
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index a78c376a9..92ba1c1fc 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, nextTick } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -19,10 +19,6 @@ const insertRow = () => {
         if (lastInput) lastInput.focus();
     });
 };
-
-onMounted(() => {
-    if (supplierContactRef.value) supplierContactRef.value.reload();
-});
 </script>
 
 <template>
@@ -36,6 +32,7 @@ onMounted(() => {
         ref="supplierContactRef"
         :default-remove="false"
         :data-required="{ supplierFk: route.params.id }"
+        auto-load
     >
         <template #body="{ rows }">
             <QCard class="q-pa-md">

From cd5389fb919519f8b950ada4d5a8bf46257a9ff3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 10:25:46 +0200
Subject: [PATCH 58/62] fix: i18n

---
 src/i18n/locale/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ecb85bd1a..d14b3aae7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -989,7 +989,7 @@ supplier:
         billingData: Billing data
         payMethod: Pay method
         payDeadline: Pay deadline
-        payDay: Día de pago
+        payDay: Pay day
         account: Account
         fiscalData: Fiscal data
         sageTaxType: Sage tax type

From 6a958a08072be38eb1f9e4124f01af4048d5352d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 08:32:39 +0000
Subject: [PATCH 59/62] Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 476a0f31e..0e68b740f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -70,7 +70,7 @@ const columns = computed(() => [
 const isNotEuro = (code) => code != 'EUR';
 
 async function insert() {
-    await axios.post('/InvoiceInDueDays/new ', { id: +invoiceId });
+    await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
     await invoiceInFormRef.value.reload();
 }
 </script>

From 120e84f43952799a0e89d80d06a472f11375b6f0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 2 May 2024 09:16:24 -0300
Subject: [PATCH 60/62] Add condition to packing and grouping badge colors

---
 src/pages/Item/Card/ItemLastEntries.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index af14e06c2..62c154de2 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -250,7 +250,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-packing="{ row }">
                 <QTd @click.stop>
-                    <QBadge class="center-content" rounded color="grey-13">
+                    <QBadge
+                        class="center-content"
+                        rounded
+                        :color="row.groupingMode == 'packing' ? 'grey-13' : 'black'"
+                    >
                         {{ dashIfEmpty(row.packing) }}
                         <QTooltip>{{ t('lastEntries.packing') }}</QTooltip>
                     </QBadge>
@@ -258,7 +262,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-grouping="{ row }">
                 <QTd @click.stop>
-                    <QBadge class="center-content" rounded color="black">
+                    <QBadge
+                        class="center-content"
+                        rounded
+                        :color="row.groupingMode == 'grouping' ? 'grey-13' : 'black'"
+                    >
                         {{ dashIfEmpty(row.grouping) }}
                         <QTooltip>{{ t('lastEntries.grouping') }}</QTooltip>
                     </QBadge>

From 167591980108fda44d1d7b1272d21e707b05c05a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 14:33:24 +0200
Subject: [PATCH 61/62] fix: minor build bugs

---
 src/pages/Claim/Card/ClaimBasicData.vue |  4 --
 src/router/modules/zone.js              | 92 +++++++++++++------------
 2 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index be2efa31a..e2450a5e5 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -41,10 +41,6 @@ const claimStates = ref([]);
 const claimStatesCopy = ref([]);
 const optionsList = ref([]);
 
-function setWorkers(data) {
-    workers.value = data;
-    workersCopy.value = data;
-}
 const workersOptions = ref([]);
 
 function setClaimStates(data) {
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index bd74a76f3..079dfaa84 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -11,56 +11,58 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: ['ZoneList' /*'ZoneDeliveryList', 'ZoneUpcomingList'*/],
+        main: [
+            /*'ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'*/
+        ],
         card: [
             //
         ],
     },
     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',

From 1a79bd6fb8a30637b49680dcf83b8b45006308db Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 May 2024 14:40:56 +0200
Subject: [PATCH 62/62] feat: zoneSummary

---
 src/pages/Zone/Card/ZoneSummary.vue | 94 +++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 src/pages/Zone/Card/ZoneSummary.vue

diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
new file mode 100644
index 000000000..00df03cb0
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -0,0 +1,94 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { dashIfEmpty } from 'src/filters';
+import { getUrl } from 'src/composables/getUrl';
+import VnLv from 'src/components/ui/VnLv.vue';
+import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+const zoneUrl = ref();
+
+onMounted(async () => {
+    zoneUrl.value = (await getUrl('')) + `zone/${entityId.value}/`;
+});
+
+const filter = computed(() => {
+    return { where: { id: entityId.value } };
+});
+</script>
+
+<template>
+    <CardSummary
+        data-key="zoneData"
+        ref="summary"
+        :url="`Zones/summary`"
+        :filter="filter"
+    >
+        <template #header="{ entity }">
+            <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
+        </template>
+        <template #body="{ entity: zone }">
+            <QCard class="vn-one">
+                <VnTitle
+                    :url="zoneUrl + `basic-data`"
+                    :text="t('zone.summary.basicData')"
+                />
+                <VnLv :label="t('zone.card.name')" :value="zone.user?.nickname" />
+                <VnLv
+                    :label="t('zone.list.department')"
+                    :value="zone.department?.department?.name"
+                />
+                <VnLv :label="t('zone.list.email')" :value="zone.user.email" copy />
+                <VnLv :label="t('zone.summary.boss')" link>
+                    <template #value>
+                        <VnUserLink
+                            v-if="zone.boss"
+                            :name="dashIfEmpty(zone.boss?.name)"
+                            :zone-id="zone.bossFk"
+                        />
+                    </template>
+                </VnLv>
+                <VnLv :value="zone.mobileExtension">
+                    <template #label>
+                        {{ t('zone.summary.phoneExtension') }}
+                        <VnLinkPhone :phone-number="zone.mobileExtension" />
+                    </template>
+                </VnLv>
+                <VnLv :value="zone.phone">
+                    <template #label>
+                        {{ t('zone.summary.entPhone') }}
+                        <VnLinkPhone :phone-number="zone.phone" />
+                    </template>
+                </VnLv>
+                <VnLv :label="t('zone.summary.locker')" :value="zone.locker" />
+            </QCard>
+            <QCard class="vn-one">
+                <VnTitle :text="t('zone.summary.userData')" />
+                <VnLv :label="t('zone.summary.userId')" :value="zone.user.id" />
+                <VnLv :label="t('zone.card.name')" :value="zone.user.nickname" />
+                <VnLv :label="t('zone.summary.role')" :value="zone.user.role.name" />
+                <VnLv :value="zone?.sip?.extension">
+                    <template #label>
+                        {{ t('zone.summary.sipExtension') }}
+                        <VnLinkPhone :phone-number="zone?.sip?.extension" />
+                    </template>
+                </VnLv>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>