From a45d477151e963fd0047d246a223b7b716941f37 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 2 Aug 2023 11:28:05 +0200
Subject: [PATCH 01/40] refs #5989 btn redirection

---
 src/pages/Claim/Card/ClaimSummary.vue | 10 ++++++++++
 src/pages/Claim/ClaimList.vue         |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index ac464d125..283a45677 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -141,6 +141,11 @@ function openDialog(dmsId) {
     multimediaSlide.value = dmsId;
     multimediaDialog.value = true;
 }
+
+function redirect(id) {
+    const url = `https://salix.verdnatura.es/#!/claim/${id}/summary`;
+    window.location.href = url;
+}
 </script>
 
 <template>
@@ -159,6 +164,11 @@ function openDialog(dmsId) {
             <QCardSection class="row q-pa-none q-col-gutter-md">
                 <div class="col">
                     <QList>
+                        <QBtn
+                            @click="redirect(this.$route.params.id)"
+                            icon="open_in_new"
+                            label="Ir a SALIX"
+                        ></QBtn>
                         <QItem>
                             <QItemSection>
                                 <QItemLabel caption>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index f9afa7177..fdb68e8d8 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -33,6 +33,10 @@ function viewSummary(id) {
         },
     });
 }
+
+function redirect() {
+    window.location.href = 'https://salix.verdnatura.es/#!/claim/index';
+}
 </script>
 
 <template>
@@ -57,6 +61,7 @@ function viewSummary(id) {
                         {{ t('globals.collapseMenu') }}
                     </QTooltip>
                 </QBtn>
+                <QBtn @click="redirect()" icon="open_in_new" label="Ir a SALIX"></QBtn>
             </div>
         </Teleport>
     </template>

From 68f370b98873c85cb0fc8aa7d5086cb41921fc5c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 2 Aug 2023 12:03:50 +0200
Subject: [PATCH 02/40] refs #5989 botton general

---
 src/components/NavBar.vue | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 7b7b1097f..a13e933b6 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -16,6 +16,34 @@ const token = session.getToken();
 const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
+
+function redirect(id) {
+    const currentURL = window.location.href;
+
+    const salixBaseURL = 'https://salix.verdnatura.es/#!/';
+
+    const dashboardRegex = /\/#\/dashboard/;
+    const claimRegex = /\/#\/claim\/(\d+)\/summary/;
+    const invoiceOutRegex = /\/#\/invoice-out\/(\d+)\/summary/;
+
+    if (currentURL.match(dashboardRegex)) {
+        window.location.href = salixBaseURL;
+    } else if (currentURL.match(claimRegex)) {
+        const claimID = currentURL.match(claimRegex)[1];
+
+        const redirectURL = salixBaseURL + `claim/${claimID}/summary`;
+
+        window.location.href = redirectURL;
+    } else if (currentURL.match(invoiceOutRegex)) {
+        const invoiceOutID = currentURL.match(invoiceOutRegex)[1];
+
+        const redirectURL = salixBaseURL + `invoice-out/${invoiceOutID}/summary`;
+
+        window.location.href = redirectURL;
+    } else {
+        window.location.href = salixBaseURL;
+    }
+}
 </script>
 
 <template>
@@ -56,6 +84,11 @@ onMounted(() => stateStore.setMounted());
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
+                <QBtn
+                    @click="redirect(this.$route.params.id)"
+                    icon="open_in_new"
+                    label="Ir a SALIX"
+                ></QBtn>
                 <QBtn id="pinnedModules" icon="apps" flat dense rounded>
                     <QTooltip bottom>
                         {{ t('globals.pinnedModules') }}

From 2255aa6a5adebe2271ead16c17b58654015b585a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 2 Aug 2023 12:05:46 +0200
Subject: [PATCH 03/40] refs #5989 summary OG

---
 src/pages/Claim/Card/ClaimSummary.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 283a45677..ac464d125 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -141,11 +141,6 @@ function openDialog(dmsId) {
     multimediaSlide.value = dmsId;
     multimediaDialog.value = true;
 }
-
-function redirect(id) {
-    const url = `https://salix.verdnatura.es/#!/claim/${id}/summary`;
-    window.location.href = url;
-}
 </script>
 
 <template>
@@ -164,11 +159,6 @@ function redirect(id) {
             <QCardSection class="row q-pa-none q-col-gutter-md">
                 <div class="col">
                     <QList>
-                        <QBtn
-                            @click="redirect(this.$route.params.id)"
-                            icon="open_in_new"
-                            label="Ir a SALIX"
-                        ></QBtn>
                         <QItem>
                             <QItemSection>
                                 <QItemLabel caption>

From af36a5bfdd2c37b161d94ca14c98545119797484 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 2 Aug 2023 12:06:33 +0200
Subject: [PATCH 04/40] refs #5989 list OG

---
 src/pages/Claim/ClaimList.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index fdb68e8d8..f9afa7177 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -33,10 +33,6 @@ function viewSummary(id) {
         },
     });
 }
-
-function redirect() {
-    window.location.href = 'https://salix.verdnatura.es/#!/claim/index';
-}
 </script>
 
 <template>
@@ -61,7 +57,6 @@ function redirect() {
                         {{ t('globals.collapseMenu') }}
                     </QTooltip>
                 </QBtn>
-                <QBtn @click="redirect()" icon="open_in_new" label="Ir a SALIX"></QBtn>
             </div>
         </Teleport>
     </template>

From a79ae244237abde2b8491458825b1e288277ebd8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 2 Aug 2023 13:37:00 +0200
Subject: [PATCH 05/40] ref #5989 redirection button

---
 src/components/NavBar.vue | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index a13e933b6..d59a8b3fc 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -19,26 +19,14 @@ onMounted(() => stateStore.setMounted());
 
 function redirect(id) {
     const currentURL = window.location.href;
-
     const salixBaseURL = 'https://salix.verdnatura.es/#!/';
+    const routeRegex = /\/#\/(\w+)(?:\/(\d+))?/;
 
-    const dashboardRegex = /\/#\/dashboard/;
-    const claimRegex = /\/#\/claim\/(\d+)\/summary/;
-    const invoiceOutRegex = /\/#\/invoice-out\/(\d+)\/summary/;
-
-    if (currentURL.match(dashboardRegex)) {
-        window.location.href = salixBaseURL;
-    } else if (currentURL.match(claimRegex)) {
-        const claimID = currentURL.match(claimRegex)[1];
-
-        const redirectURL = salixBaseURL + `claim/${claimID}/summary`;
-
-        window.location.href = redirectURL;
-    } else if (currentURL.match(invoiceOutRegex)) {
-        const invoiceOutID = currentURL.match(invoiceOutRegex)[1];
-
-        const redirectURL = salixBaseURL + `invoice-out/${invoiceOutID}/summary`;
-
+    const match = currentURL.match(routeRegex);
+    if (match) {
+        const [, element, number] = match;
+        const redirectURL =
+            salixBaseURL + (number ? `${element}/${number}/summary` : `${element}/index`);
         window.location.href = redirectURL;
     } else {
         window.location.href = salixBaseURL;

From bf256574c98cedadd27fb099da8e4c3e20953eae Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 3 Aug 2023 09:41:26 +0200
Subject: [PATCH 06/40] refs #5989 getUrl

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

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index d59a8b3fc..561197a18 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -6,6 +6,7 @@ import UserPanel from 'components/UserPanel.vue';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import PinnedModules from './PinnedModules.vue';
+import { getUrl } from 'src/composables/getUrl';
 
 const { t } = useI18n();
 const session = useSession();
@@ -13,23 +14,21 @@ const stateStore = useStateStore();
 const state = useState();
 const user = state.getUser();
 const token = session.getToken();
-const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
 
-function redirect(id) {
+function redirect() {
     const currentURL = window.location.href;
-    const salixBaseURL = 'https://salix.verdnatura.es/#!/';
     const routeRegex = /\/#\/(\w+)(?:\/(\d+))?/;
 
     const match = currentURL.match(routeRegex);
     if (match) {
         const [, element, number] = match;
         const redirectURL =
-            salixBaseURL + (number ? `${element}/${number}/summary` : `${element}/index`);
+            getUrl() + (number ? `${element}/${number}/summary` : `${element}/index`);
         window.location.href = redirectURL;
     } else {
-        window.location.href = salixBaseURL;
+        window.location.href = getUrl();
     }
 }
 </script>

From a554131d77d81d0ebffb5949eedc0c9f47aeeb48 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 3 Aug 2023 15:56:55 +0200
Subject: [PATCH 07/40] refs #6076 feat: init twoFactor section

---
 src/boot/axios.js             |   6 ++
 src/pages/Login/LoginMain.vue |   2 +-
 src/pages/Login/TwoFactor.vue | 187 ++++++++++++++++++++++++++++++++++
 src/router/index.js           |   4 +-
 src/router/routes.js          |   8 +-
 5 files changed, 203 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/Login/TwoFactor.vue

diff --git a/src/boot/axios.js b/src/boot/axios.js
index f8f27278c..259adad50 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -58,6 +58,12 @@ const onResponseError = (error) => {
             break;
     }
 
+    if (response.data?.error?.code === 'REQUIRES_2FA') {
+        console.log(window.location.hash);
+        console.log(window.location.hash.slice(1));
+        return Router.push({ name: 'TwoFactor' });
+    }
+
     if (session.isLoggedIn() && response.status === 401) {
         session.destroy();
         const hash = window.location.hash;
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index 747fe8b14..b17cd326d 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -70,7 +70,7 @@ async function onSubmit() {
             router.push({ name: 'Dashboard' });
         }
     } catch (e) {
-        //
+        console.log('LOGIN ERROR', e);
     }
 }
 </script>
diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
new file mode 100644
index 000000000..9241e0f22
--- /dev/null
+++ b/src/pages/Login/TwoFactor.vue
@@ -0,0 +1,187 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { Dark, Quasar, useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import axios from 'axios';
+
+import { useSession } from 'src/composables/useSession';
+
+const quasar = useQuasar();
+const session = useSession();
+const router = useRouter();
+const { t, locale } = useI18n();
+
+const userLocale = computed({
+    get() {
+        return locale.value;
+    },
+    set(value) {
+        locale.value = value;
+
+        if (value === 'en') value = 'en-GB';
+
+        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
+        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
+        try {
+            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
+            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
+                Quasar.lang.set(lang.default);
+            });
+        } catch (error) {
+            //
+        }
+    },
+});
+
+const darkMode = computed({
+    get() {
+        return Dark.isActive;
+    },
+    set(value) {
+        Dark.set(value);
+    },
+});
+
+const username = ref('');
+const password = ref('');
+const keepLogin = ref(true);
+
+async function onSubmit() {
+    // try {
+    //     const { data } = await axios.post('Accounts/login', {
+    //         user: username.value,
+    //         password: password.value,
+    //     });
+    //     if (!data) return;
+    //     await session.login(data.token, keepLogin.value);
+    //     quasar.notify({
+    //         message: t('login.loginSuccess'),
+    //         type: 'positive',
+    //     });
+    //     const currentRoute = router.currentRoute.value;
+    //     if (currentRoute.query && currentRoute.query.redirect) {
+    //         router.push(currentRoute.query.redirect);
+    //     } else {
+    //         router.push({ name: 'Dashboard' });
+    //     }
+    // } catch (e) {
+    //     console.log('ENTRY');
+    //     console.log(e);
+    // }
+}
+</script>
+
+<template>
+    <QLayout>
+        <QPageContainer>
+            <QPage id="login">
+                <QPageSticky position="top-right">
+                    <QToolbar>
+                        <QBtn
+                            id="switchLanguage"
+                            :label="t('globals.language')"
+                            icon="translate"
+                            color="primary"
+                            size="sm"
+                            flat
+                            rounded
+                        >
+                            <QMenu auto-close>
+                                <QList dense>
+                                    <QItem
+                                        @click="userLocale = 'en'"
+                                        :active="userLocale == 'en'"
+                                        v-ripple
+                                        clickable
+                                    >
+                                        {{ t('globals.lang.en') }}
+                                    </QItem>
+                                    <QItem
+                                        @click="userLocale = 'es'"
+                                        :active="userLocale == 'es'"
+                                        v-ripple
+                                        clickable
+                                    >
+                                        {{ t('globals.lang.es') }}
+                                    </QItem>
+                                </QList>
+                            </QMenu>
+                        </QBtn>
+                        <QList>
+                            <QItem>
+                                <QItemSection>
+                                    <QItemLabel caption>
+                                        {{ t(`globals.darkMode`) }}
+                                    </QItemLabel>
+                                </QItemSection>
+                                <QItemSection side>
+                                    <QToggle
+                                        v-model="darkMode"
+                                        checked-icon="dark_mode"
+                                        unchecked-icon="light_mode"
+                                    />
+                                </QItemSection>
+                            </QItem>
+                        </QList>
+                    </QToolbar>
+                </QPageSticky>
+                <div class="login-form q-pa-xl">
+                    <QImg
+                        src="~/assets/logo.svg"
+                        alt="Logo"
+                        fit="contain"
+                        :ratio="16 / 9"
+                        class="q-mb-md"
+                    />
+                    <QForm @submit="onSubmit" class="q-gutter-md">
+                        <QInput
+                            v-model="username"
+                            :label="t('login.username')"
+                            lazy-rules
+                            :rules="[
+                                (val) =>
+                                    (val && val.length > 0) || t('login.fieldRequired'),
+                            ]"
+                        />
+                        <QInput
+                            type="password"
+                            v-model="password"
+                            :label="t('login.password')"
+                            lazy-rules
+                            :rules="[
+                                (val) =>
+                                    (val && val.length > 0) || t('login.fieldRequired'),
+                            ]"
+                        />
+                        <QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
+
+                        <div>
+                            <QBtn
+                                :label="t('login.submit')"
+                                type="submit"
+                                color="primary"
+                                class="full-width"
+                                rounded
+                                unelevated
+                            />
+                        </div>
+                    </QForm>
+                </div>
+            </QPage>
+        </QPageContainer>
+    </QLayout>
+</template>
+
+<style lang="scss" scoped>
+#login {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: inherit;
+}
+
+.login-form {
+    width: 400px;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 9bc199047..cccf9af6d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -45,8 +45,8 @@ export { Router };
 export default route(function (/* { store, ssrContext } */) {
     Router.beforeEach(async (to, from, next) => {
         const { isLoggedIn } = session;
-
-        if (!isLoggedIn() && to.name !== 'Login') {
+        const outLayout = ['Login', 'TwoFactor'];
+        if (!isLoggedIn() && !outLayout.includes(to.name)) {
             return next({ name: 'Login', query: { redirect: to.fullPath } });
         }
 
diff --git a/src/router/routes.js b/src/router/routes.js
index 17a56505d..04e188acb 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -12,6 +12,12 @@ const routes = [
         meta: { title: 'logIn' },
         component: () => import('../pages/Login/LoginMain.vue'),
     },
+    {
+        path: '/twoFactor',
+        name: 'TwoFactor',
+        meta: { title: 'twoFactor' },
+        component: () => import('../pages/Login/TwoFactor.vue'),
+    },
     {
         path: '/',
         name: 'Main',
@@ -35,7 +41,7 @@ const routes = [
                 name: 'NotFound',
                 component: () => import('../pages/NotFound.vue'),
             },
-            wagon
+            wagon,
         ],
     },
 ];

From ac7462ec67aa2a1775999bd7399c4281303b35ae Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Aug 2023 06:18:47 +0200
Subject: [PATCH 08/40] refs #5989 comment

---
 src/components/NavBar.vue | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 561197a18..4c543cb1b 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -7,6 +7,7 @@ import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import PinnedModules from './PinnedModules.vue';
 import { getUrl } from 'src/composables/getUrl';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const session = useSession();
@@ -14,21 +15,28 @@ const stateStore = useStateStore();
 const state = useState();
 const user = state.getUser();
 const token = session.getToken();
+const route = useRoute();
 
-onMounted(() => stateStore.setMounted());
+onMounted(() => stateStore. setMounted());
 
-function redirect() {
+async function redirect() {
     const currentURL = window.location.href;
-    const routeRegex = /\/#\/(\w+)(?:\/(\d+))?/;
-
+    const routeRegex = /\/(\w+)(?:\/(\d+))?/;
     const match = currentURL.match(routeRegex);
-    if (match) {
-        const [, element, number] = match;
-        const redirectURL =
-            getUrl() + (number ? `${element}/${number}/summary` : `${element}/index`);
-        window.location.href = redirectURL;
+    const [, element, number] = match;
+    console.log(route.path);
+    const section = route.path.substring(route.path.indexOf('/'));
+    console.log(section);
+    if (route?.params?.id) {
+        // const redirectURL =
+        //     getUrl() + (number ? `${element}/${number}/summary` : `${element}/index`);
+        // window.location.href = redirectURL;
+        console.log(await getUrl(section));
+        window.location.href = await getUrl(section + route.params);
     } else {
-        window.location.href = getUrl();
+        console.log(await getUrl(section));
+
+        // window.location.href = await getUrl('claim');
     }
 }
 </script>
@@ -80,7 +88,12 @@ function redirect() {
                     <QTooltip bottom>
                         {{ t('globals.pinnedModules') }}
                     </QTooltip>
-                    <PinnedModules />
+                    <PinnedModules>
+                        <QBtn
+                            @click="redirect(this.$route.params.id)"
+                            icon="open_in_new"
+                        ></QBtn>
+                    </PinnedModules>
                 </QBtn>
                 <QBtn rounded dense flat no-wrap id="user">
                     <QAvatar size="lg">

From b1cb9288df335b02cb59e4d4b2fce07467035ef3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 4 Aug 2023 08:37:55 +0200
Subject: [PATCH 09/40] resf #5989 fix(redirect)

---
 src/components/NavBar.vue | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 4c543cb1b..ff636adf7 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -17,26 +17,16 @@ const user = state.getUser();
 const token = session.getToken();
 const route = useRoute();
 
-onMounted(() => stateStore. setMounted());
+onMounted(() => stateStore.setMounted());
 
 async function redirect() {
-    const currentURL = window.location.href;
-    const routeRegex = /\/(\w+)(?:\/(\d+))?/;
-    const match = currentURL.match(routeRegex);
-    const [, element, number] = match;
-    console.log(route.path);
-    const section = route.path.substring(route.path.indexOf('/'));
-    console.log(section);
+    let section = route.path.substring(1);
+    if (!route.path.includes('/')) return (window.location.href = await getUrl(section));
+    section = section.substring(0, section.indexOf('/'));
     if (route?.params?.id) {
-        // const redirectURL =
-        //     getUrl() + (number ? `${element}/${number}/summary` : `${element}/index`);
-        // window.location.href = redirectURL;
-        console.log(await getUrl(section));
-        window.location.href = await getUrl(section + route.params);
+        window.location.href = await getUrl(`${section}/${route.params.id}/summary`);
     } else {
-        console.log(await getUrl(section));
-
-        // window.location.href = await getUrl('claim');
+        window.location.href = await getUrl(section + '/index');
     }
 }
 </script>

From f01fe1c922e92eaf459ed5e50734402ed6b5a11b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 4 Aug 2023 13:29:31 +0200
Subject: [PATCH 10/40] refs #6076 refactor: login use outLayout, feat:
 twoFactor section

---
 src/boot/axios.js                             |   8 +-
 src/composables/useLogin.js                   |  30 +++
 src/i18n/en/index.js                          |  22 +-
 src/i18n/es/index.js                          |  22 +-
 src/layouts/OutLayout.vue                     | 111 +++++++++
 src/pages/Login/LoginMain.vue                 | 211 +++++-----------
 src/pages/Login/TwoFactor.vue                 | 230 +++++-------------
 src/router/routes.js                          |  26 +-
 test/cypress/integration/login.spec.js        |  22 +-
 .../workerNotificationsManager.spec.js        |  17 +-
 10 files changed, 347 insertions(+), 352 deletions(-)
 create mode 100644 src/composables/useLogin.js
 create mode 100644 src/layouts/OutLayout.vue

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 259adad50..bdc661ae2 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -58,19 +58,13 @@ const onResponseError = (error) => {
             break;
     }
 
-    if (response.data?.error?.code === 'REQUIRES_2FA') {
-        console.log(window.location.hash);
-        console.log(window.location.hash.slice(1));
-        return Router.push({ name: 'TwoFactor' });
-    }
-
     if (session.isLoggedIn() && response.status === 401) {
         session.destroy();
         const hash = window.location.hash;
         const url = hash.slice(1);
         Router.push({ path: url });
     } else if (!session.isLoggedIn()) {
-        message = 'login.loginError';
+        return Promise.reject(error);
     }
 
     Notify.create({
diff --git a/src/composables/useLogin.js b/src/composables/useLogin.js
new file mode 100644
index 000000000..c2c8153a2
--- /dev/null
+++ b/src/composables/useLogin.js
@@ -0,0 +1,30 @@
+import { ref, computed } from 'vue';
+
+const user = ref({});
+
+export function useLogin() {
+    function getUser() {
+        const userData = user.value;
+        user.value = {};
+        return computed(() => {
+            return {
+                user: userData.user,
+                password: userData.password,
+                keepLogin: userData.keepLogin,
+            };
+        });
+    }
+
+    function setUser(data) {
+        user.value = {
+            user: data.user,
+            password: data.password,
+            keepLogin: data.keepLogin,
+        };
+    }
+
+    return {
+        getUser,
+        setUser,
+    };
+}
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a43c5fe7c..32194062e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -50,6 +50,20 @@ export default {
         loginSuccess: 'You have successfully logged in',
         loginError: 'Invalid username or password',
         fieldRequired: 'This field is required',
+        twoFactorRequired: 'Two-factor verification required',
+        pageTitles: {
+            logIn: 'Login',
+        },
+    },
+    twoFactor: {
+        code: 'Code',
+        validate: 'Validate',
+        insert: 'Enter the verification code',
+        explanation:
+            'Please, enter the verification code that we have sent to your email in the next 5 minutes',
+        pageTitles: {
+            twoFactor: 'Two-Factor',
+        },
     },
     dashboard: {
         pageTitles: {
@@ -295,7 +309,7 @@ export default {
             result: 'Result',
             responsible: 'Responsible',
             worker: 'Worker',
-            redelivery: 'Redelivery'
+            redelivery: 'Redelivery',
         },
         basicData: {
             customer: 'Customer',
@@ -411,7 +425,7 @@ export default {
             wagonEdit: 'Edit wagon',
             typesList: 'Types List',
             typeCreate: 'Create type',
-            typeEdit: 'Edit type'
+            typeEdit: 'Edit type',
         },
         type: {
             name: 'Name',
@@ -431,7 +445,7 @@ export default {
             plate: 'Plate',
             volume: 'Volume',
             type: 'Type',
-            label: 'Label'
+            label: 'Label',
         },
         warnings: {
             noData: 'No data available',
@@ -444,7 +458,7 @@ export default {
             minHeightBetweenTrays: 'The minimum height between trays is ',
             maxWagonHeight: 'The maximum height of the wagon is ',
             uncompleteTrays: 'There are incomplete trays',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6328c8f5d..b906961ea 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -50,6 +50,20 @@ export default {
         loginSuccess: 'Inicio de sesión correcto',
         loginError: 'Nombre de usuario o contraseña incorrectos',
         fieldRequired: 'Este campo es obligatorio',
+        twoFactorRequired: 'Verificación de doble factor requerida',
+        pageTitles: {
+            logIn: 'Inicio de sesión',
+        },
+    },
+    twoFactor: {
+        code: 'Código',
+        validate: 'Validar',
+        insert: 'Introduce el código de verificación',
+        explanation:
+            'Por favor, introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos',
+        pageTitles: {
+            twoFactor: 'Doble factor',
+        },
     },
     dashboard: {
         pageTitles: {
@@ -63,7 +77,7 @@ export default {
             webPayments: 'Pagos Web',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
-            summary: 'Resumen'
+            summary: 'Resumen',
         },
         list: {
             phone: 'Teléfono',
@@ -294,7 +308,7 @@ export default {
             result: 'Consecuencias',
             responsible: 'Responsable',
             worker: 'Trabajador',
-            redelivery: 'Devolución'
+            redelivery: 'Devolución',
         },
         basicData: {
             customer: 'Cliente',
@@ -411,7 +425,7 @@ export default {
             wagonEdit: 'Editar tipo',
             typesList: 'Listado tipos',
             typeCreate: 'Crear tipo',
-            typeEdit: 'Editar tipo'
+            typeEdit: 'Editar tipo',
         },
         type: {
             name: 'Nombre',
@@ -444,7 +458,7 @@ export default {
             minHeightBetweenTrays: 'La distancia mínima entre bandejas es ',
             maxWagonHeight: 'La altura máxima del vagón es ',
             uncompleteTrays: 'Hay bandejas sin completar',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
new file mode 100644
index 000000000..6ea14622f
--- /dev/null
+++ b/src/layouts/OutLayout.vue
@@ -0,0 +1,111 @@
+<script setup>
+import { Dark, Quasar } from 'quasar';
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const { t, locale } = useI18n();
+
+const userLocale = computed({
+    get() {
+        return locale.value;
+    },
+    set(value) {
+        locale.value = value;
+
+        if (value === 'en') value = 'en-GB';
+
+        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
+        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
+        try {
+            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
+            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
+                Quasar.lang.set(lang.default);
+            });
+        } catch (error) {
+            //
+        }
+    },
+});
+const darkMode = computed({
+    get() {
+        return Dark.isActive;
+    },
+    set(value) {
+        Dark.set(value);
+    },
+});
+const langs = ['en', 'es'];
+</script>
+
+<template>
+    <QLayout view="hHh LpR fFf">
+        <QHeader reveal class="bg-dark">
+            <QToolbar class="justify-end">
+                <QBtn
+                    id="switchLanguage"
+                    :label="t('globals.language')"
+                    icon="translate"
+                    color="primary"
+                    size="sm"
+                    flat
+                    rounded
+                >
+                    <QMenu auto-close>
+                        <QList dense v-for="lang in langs" :key="lang">
+                            <QItem
+                                @click="userLocale = lang"
+                                :active="userLocale == lang"
+                                v-ripple
+                                clickable
+                            >
+                                {{ t(`globals.lang.${lang}`) }}
+                            </QItem>
+                        </QList>
+                    </QMenu>
+                </QBtn>
+                <QList>
+                    <QItem>
+                        <QItemSection>
+                            <QToggle
+                                v-model="darkMode"
+                                checked-icon="dark_mode"
+                                unchecked-icon="light_mode"
+                                :label="t(`globals.darkMode`)"
+                            />
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QToolbar>
+        </QHeader>
+        <QPageContainer>
+            <QPage>
+                <div class="form">
+                    <QCard class="q-pa-lg formCard">
+                        <RouterView></RouterView>
+                    </QCard>
+                </div>
+            </QPage>
+        </QPageContainer>
+    </QLayout>
+</template>
+
+<style lang="scss" scoped>
+.form {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-height: inherit;
+    flex-direction: column;
+}
+
+.formCard {
+    max-width: 350px;
+    min-width: 300px;
+}
+
+@media (max-width: $breakpoint-xs-max) {
+    .formCard {
+        min-width: 100%;
+    }
+}
+</style>
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index b17cd326d..7c0bbbd44 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -1,58 +1,30 @@
 <script setup>
-import { ref, computed } from 'vue';
-import { Dark, Quasar, useQuasar } from 'quasar';
+import { ref } from 'vue';
+import { Notify, useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
 
 import { useSession } from 'src/composables/useSession';
+import { useLogin } from 'src/composables/useLogin';
 
 const quasar = useQuasar();
 const session = useSession();
+const loginCache = useLogin();
 const router = useRouter();
-const { t, locale } = useI18n();
-
-const userLocale = computed({
-    get() {
-        return locale.value;
-    },
-    set(value) {
-        locale.value = value;
-
-        if (value === 'en') value = 'en-GB';
-
-        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
-        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
-        try {
-            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
-            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
-    },
-});
-
-const darkMode = computed({
-    get() {
-        return Dark.isActive;
-    },
-    set(value) {
-        Dark.set(value);
-    },
-});
+const { t } = useI18n();
 
 const username = ref('');
 const password = ref('');
 const keepLogin = ref(true);
 
 async function onSubmit() {
+    const params = {
+        user: username.value,
+        password: password.value,
+    };
     try {
-        const { data } = await axios.post('Accounts/login', {
-            user: username.value,
-            password: password.value,
-        });
+        const { data } = await axios.post('Accounts/login', params);
 
         if (!data) return;
 
@@ -69,122 +41,63 @@ async function onSubmit() {
         } else {
             router.push({ name: 'Dashboard' });
         }
-    } catch (e) {
-        console.log('LOGIN ERROR', e);
+    } catch (res) {
+        if (res.response?.data?.error?.code === 'REQUIRES_2FA') {
+            Notify.create({
+                message: t('login.twoFactorRequired'),
+                icon: 'phonelink_lock',
+                type: 'warning',
+            });
+            params.keepLogin = keepLogin.value;
+            loginCache.setUser(params);
+            return router.push({
+                name: 'TwoFactor',
+                query: router.currentRoute.value?.query,
+            });
+        }
+        Notify.create({
+            message: t('login.loginError'),
+            type: 'negative',
+        });
     }
 }
 </script>
 
 <template>
-    <QLayout>
-        <QPageContainer>
-            <QPage id="login">
-                <QPageSticky position="top-right">
-                    <QToolbar>
-                        <QBtn
-                            id="switchLanguage"
-                            :label="t('globals.language')"
-                            icon="translate"
-                            color="primary"
-                            size="sm"
-                            flat
-                            rounded
-                        >
-                            <QMenu auto-close>
-                                <QList dense>
-                                    <QItem
-                                        @click="userLocale = 'en'"
-                                        :active="userLocale == 'en'"
-                                        v-ripple
-                                        clickable
-                                    >
-                                        {{ t('globals.lang.en') }}
-                                    </QItem>
-                                    <QItem
-                                        @click="userLocale = 'es'"
-                                        :active="userLocale == 'es'"
-                                        v-ripple
-                                        clickable
-                                    >
-                                        {{ t('globals.lang.es') }}
-                                    </QItem>
-                                </QList>
-                            </QMenu>
-                        </QBtn>
-                        <QList>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>
-                                        {{ t(`globals.darkMode`) }}
-                                    </QItemLabel>
-                                </QItemSection>
-                                <QItemSection side>
-                                    <QToggle
-                                        v-model="darkMode"
-                                        checked-icon="dark_mode"
-                                        unchecked-icon="light_mode"
-                                    />
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </QToolbar>
-                </QPageSticky>
-                <div class="login-form q-pa-xl">
-                    <QImg
-                        src="~/assets/logo.svg"
-                        alt="Logo"
-                        fit="contain"
-                        :ratio="16 / 9"
-                        class="q-mb-md"
-                    />
-                    <QForm @submit="onSubmit" class="q-gutter-md">
-                        <QInput
-                            v-model="username"
-                            :label="t('login.username')"
-                            lazy-rules
-                            :rules="[
-                                (val) =>
-                                    (val && val.length > 0) || t('login.fieldRequired'),
-                            ]"
-                        />
-                        <QInput
-                            type="password"
-                            v-model="password"
-                            :label="t('login.password')"
-                            lazy-rules
-                            :rules="[
-                                (val) =>
-                                    (val && val.length > 0) || t('login.fieldRequired'),
-                            ]"
-                        />
-                        <QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
+    <QImg
+        src="~/assets/logo.svg"
+        alt="Logo"
+        fit="contain"
+        :ratio="16 / 9"
+        class="q-mb-md"
+    />
+    <QForm @submit="onSubmit" class="q-gutter-md q-pa-lg">
+        <QInput
+            v-model="username"
+            :label="t('login.username')"
+            lazy-rules
+            :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
+        />
+        <QInput
+            type="password"
+            v-model="password"
+            :label="t('login.password')"
+            lazy-rules
+            :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
+        />
+        <QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
 
-                        <div>
-                            <QBtn
-                                :label="t('login.submit')"
-                                type="submit"
-                                color="primary"
-                                class="full-width"
-                                rounded
-                                unelevated
-                            />
-                        </div>
-                    </QForm>
-                </div>
-            </QPage>
-        </QPageContainer>
-    </QLayout>
+        <div>
+            <QBtn
+                :label="t('login.submit')"
+                type="submit"
+                color="primary"
+                class="full-width"
+                rounded
+                unelevated
+            />
+        </div>
+    </QForm>
 </template>
 
-<style lang="scss" scoped>
-#login {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: inherit;
-}
-
-.login-form {
-    width: 400px;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
index 9241e0f22..e3f0c2bf8 100644
--- a/src/pages/Login/TwoFactor.vue
+++ b/src/pages/Login/TwoFactor.vue
@@ -1,187 +1,77 @@
 <script setup>
-import { ref, computed } from 'vue';
-import { Dark, Quasar, useQuasar } from 'quasar';
+import { ref } from 'vue';
+import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
 
 import { useSession } from 'src/composables/useSession';
+import { useLogin } from 'src/composables/useLogin';
 
 const quasar = useQuasar();
 const session = useSession();
 const router = useRouter();
-const { t, locale } = useI18n();
+const loginCache = useLogin();
+const { t } = useI18n();
 
-const userLocale = computed({
-    get() {
-        return locale.value;
-    },
-    set(value) {
-        locale.value = value;
-
-        if (value === 'en') value = 'en-GB';
-
-        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
-        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
-        try {
-            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
-            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
-    },
-});
-
-const darkMode = computed({
-    get() {
-        return Dark.isActive;
-    },
-    set(value) {
-        Dark.set(value);
-    },
-});
-
-const username = ref('');
-const password = ref('');
-const keepLogin = ref(true);
+const code = ref('');
+const params = loginCache.getUser().value;
+if (!params.user) {
+    router.push({ name: 'Login' });
+}
 
 async function onSubmit() {
-    // try {
-    //     const { data } = await axios.post('Accounts/login', {
-    //         user: username.value,
-    //         password: password.value,
-    //     });
-    //     if (!data) return;
-    //     await session.login(data.token, keepLogin.value);
-    //     quasar.notify({
-    //         message: t('login.loginSuccess'),
-    //         type: 'positive',
-    //     });
-    //     const currentRoute = router.currentRoute.value;
-    //     if (currentRoute.query && currentRoute.query.redirect) {
-    //         router.push(currentRoute.query.redirect);
-    //     } else {
-    //         router.push({ name: 'Dashboard' });
-    //     }
-    // } catch (e) {
-    //     console.log('ENTRY');
-    //     console.log(e);
-    // }
+    try {
+        params.code = code.value;
+        const { data } = await axios.post('VnUsers/validate-auth', params);
+
+        if (!data) return;
+
+        await session.login(data.token, params.keepLogin);
+        quasar.notify({
+            message: t('login.loginSuccess'),
+            type: 'positive',
+        });
+
+        const currentRoute = router.currentRoute.value;
+        if (currentRoute.query && currentRoute.query.redirect) {
+            router.push(currentRoute.query.redirect);
+        } else {
+            router.push({ name: 'Dashboard' });
+        }
+    } catch (e) {
+        // console.log(e);
+    }
 }
 </script>
-
 <template>
-    <QLayout>
-        <QPageContainer>
-            <QPage id="login">
-                <QPageSticky position="top-right">
-                    <QToolbar>
-                        <QBtn
-                            id="switchLanguage"
-                            :label="t('globals.language')"
-                            icon="translate"
-                            color="primary"
-                            size="sm"
-                            flat
-                            rounded
-                        >
-                            <QMenu auto-close>
-                                <QList dense>
-                                    <QItem
-                                        @click="userLocale = 'en'"
-                                        :active="userLocale == 'en'"
-                                        v-ripple
-                                        clickable
-                                    >
-                                        {{ t('globals.lang.en') }}
-                                    </QItem>
-                                    <QItem
-                                        @click="userLocale = 'es'"
-                                        :active="userLocale == 'es'"
-                                        v-ripple
-                                        clickable
-                                    >
-                                        {{ t('globals.lang.es') }}
-                                    </QItem>
-                                </QList>
-                            </QMenu>
-                        </QBtn>
-                        <QList>
-                            <QItem>
-                                <QItemSection>
-                                    <QItemLabel caption>
-                                        {{ t(`globals.darkMode`) }}
-                                    </QItemLabel>
-                                </QItemSection>
-                                <QItemSection side>
-                                    <QToggle
-                                        v-model="darkMode"
-                                        checked-icon="dark_mode"
-                                        unchecked-icon="light_mode"
-                                    />
-                                </QItemSection>
-                            </QItem>
-                        </QList>
-                    </QToolbar>
-                </QPageSticky>
-                <div class="login-form q-pa-xl">
-                    <QImg
-                        src="~/assets/logo.svg"
-                        alt="Logo"
-                        fit="contain"
-                        :ratio="16 / 9"
-                        class="q-mb-md"
-                    />
-                    <QForm @submit="onSubmit" class="q-gutter-md">
-                        <QInput
-                            v-model="username"
-                            :label="t('login.username')"
-                            lazy-rules
-                            :rules="[
-                                (val) =>
-                                    (val && val.length > 0) || t('login.fieldRequired'),
-                            ]"
-                        />
-                        <QInput
-                            type="password"
-                            v-model="password"
-                            :label="t('login.password')"
-                            lazy-rules
-                            :rules="[
-                                (val) =>
-                                    (val && val.length > 0) || t('login.fieldRequired'),
-                            ]"
-                        />
-                        <QToggle v-model="keepLogin" :label="t('login.keepLogin')" />
-
-                        <div>
-                            <QBtn
-                                :label="t('login.submit')"
-                                type="submit"
-                                color="primary"
-                                class="full-width"
-                                rounded
-                                unelevated
-                            />
-                        </div>
-                    </QForm>
-                </div>
-            </QPage>
-        </QPageContainer>
-    </QLayout>
+    <QForm @submit="onSubmit" class="q-gutter-md q-pa-lg">
+        <div class="column items-center">
+            <QIcon name="phonelink_lock" size="xl" color="primary" />
+            <h5 class="text-center q-my-md">{{ t('twoFactor.insert') }}</h5>
+        </div>
+        <QInput
+            v-model="code"
+            :hint="t('twoFactor.explanation')"
+            mask="# # # # # #"
+            fill-mask
+            unmasked-value
+            autofocus
+        >
+            <template #prepend>
+                <QIcon name="lock" />
+            </template>
+        </QInput>
+        <div class="q-mt-xl">
+            <QBtn
+                :label="t('twoFactor.validate')"
+                type="submit"
+                color="primary"
+                class="full-width q-mt-md"
+                rounded
+                unelevated
+            />
+        </div>
+    </QForm>
 </template>
-
-<style lang="scss" scoped>
-#login {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: inherit;
-}
-
-.login-form {
-    width: 400px;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/router/routes.js b/src/router/routes.js
index 04e188acb..e7d216479 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -8,15 +8,23 @@ import wagon from './modules/wagon';
 const routes = [
     {
         path: '/login',
-        name: 'Login',
-        meta: { title: 'logIn' },
-        component: () => import('../pages/Login/LoginMain.vue'),
-    },
-    {
-        path: '/twoFactor',
-        name: 'TwoFactor',
-        meta: { title: 'twoFactor' },
-        component: () => import('../pages/Login/TwoFactor.vue'),
+        component: () => import('../layouts/OutLayout.vue'),
+        props: true,
+        children: [
+            {
+                path: '',
+                name: 'Login',
+                meta: { title: 'logIn' },
+                component: () => import('../pages/Login/LoginMain.vue'),
+            },
+            {
+                path: '/twoFactor',
+                name: 'TwoFactor',
+                meta: { title: 'twoFactor' },
+                component: () => import('../pages/Login/TwoFactor.vue'),
+                props: true,
+            },
+        ],
     },
     {
         path: '/',
diff --git a/test/cypress/integration/login.spec.js b/test/cypress/integration/login.spec.js
index 4cf10f226..f8a9f5c64 100755
--- a/test/cypress/integration/login.spec.js
+++ b/test/cypress/integration/login.spec.js
@@ -3,28 +3,37 @@ describe('Login', () => {
     beforeEach(() => {
         cy.visit('/#/login');
         cy.get('#switchLanguage').click();
-        cy.get('div.q-menu div.q-item:nth-child(1)').click();
+        cy.get('.q-menu > :nth-child(1) > .q-item').click();
     });
 
     it('should fail to log in using wrong user', () => {
         cy.get('input[aria-label="Username"]').type('incorrectUser');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Invalid username or password');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Invalid username or password'
+        );
     });
 
     it('should fail to log in using wrong password', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('wrongPassword');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Invalid username or password');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Invalid username or password'
+        );
     });
 
     it('should log in', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'You have successfully logged in');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'You have successfully logged in'
+        );
         cy.url().should('contain', '/dashboard');
     });
 
@@ -32,7 +41,10 @@ describe('Login', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();
-        cy.get('.q-notification__message').should('have.text', 'You have successfully logged in');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'You have successfully logged in'
+        );
         cy.url().should('contain', '/dashboard');
         cy.get('#user').click();
         cy.get('#logout').click();
diff --git a/test/cypress/integration/workerNotificationsManager.spec.js b/test/cypress/integration/workerNotificationsManager.spec.js
index 6c5aa21fb..4cd54629a 100644
--- a/test/cypress/integration/workerNotificationsManager.spec.js
+++ b/test/cypress/integration/workerNotificationsManager.spec.js
@@ -1,4 +1,4 @@
-describe('WorkerNotificationsManager', () => {
+xdescribe('WorkerNotificationsManager', () => {
     beforeEach(() => {
         const workerId = 1110;
         cy.viewport(1280, 720);
@@ -9,16 +9,25 @@ describe('WorkerNotificationsManager', () => {
     it('should unsubscribe 2 notifications, check the unsubscription has been saved, subscribe to other one and should check the data has been saved', () => {
         cy.get('.q-chip').should('have.length', 3);
         cy.get('.q-toggle__thumb').eq(0).click();
-        cy.get('.q-notification__message').should('have.text', 'Unsubscribed from the notification');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Unsubscribed from the notification'
+        );
         cy.get('.q-chip > .q-icon').eq(0).click();
 
         cy.reload();
 
         cy.get('.q-chip').should('have.length', 1);
         cy.get('.q-toggle__thumb').should('have.length', 3).eq(0).click();
-        cy.get('.q-notification__message').should('have.text', 'Subscribed to the notification');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Subscribed to the notification'
+        );
         cy.get('.q-toggle__thumb').should('have.length', 3).eq(1).click();
-        cy.get('.q-notification__message').should('have.text', 'Subscribed to the notification');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Subscribed to the notification'
+        );
 
         cy.reload();
 

From ceb7642fb7d5fe2af683c101f8555e96b5582fd7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 4 Aug 2023 13:33:10 +0200
Subject: [PATCH 11/40] refs #6076 feat(twoFactor): show error

---
 src/pages/Login/TwoFactor.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
index e3f0c2bf8..f14e85418 100644
--- a/src/pages/Login/TwoFactor.vue
+++ b/src/pages/Login/TwoFactor.vue
@@ -40,7 +40,10 @@ async function onSubmit() {
             router.push({ name: 'Dashboard' });
         }
     } catch (e) {
-        // console.log(e);
+        quasar.notify({
+            message: e.response?.data?.error.message,
+            type: 'negative',
+        });
     }
 }
 </script>

From 1b79fd633ad6f36d48234e9d9c2e3ce9a7c35527 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 4 Aug 2023 13:37:12 +0200
Subject: [PATCH 12/40] refs #6076 unnecesary use props

---
 src/router/routes.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/router/routes.js b/src/router/routes.js
index e7d216479..d1c877305 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -9,7 +9,6 @@ const routes = [
     {
         path: '/login',
         component: () => import('../layouts/OutLayout.vue'),
-        props: true,
         children: [
             {
                 path: '',
@@ -22,7 +21,6 @@ const routes = [
                 name: 'TwoFactor',
                 meta: { title: 'twoFactor' },
                 component: () => import('../pages/Login/TwoFactor.vue'),
-                props: true,
             },
         ],
     },

From 9a634f08a548ed8b705e7fe6ecb8930ebdbbbc31 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Aug 2023 09:31:09 +0200
Subject: [PATCH 13/40] refs #5989 bton redirect

---
 src/components/NavBar.vue             | 34 ++++++---------------------
 src/pages/Dashboard/DashboardMain.vue |  6 +++--
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 4c543cb1b..457cc7a7a 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -17,26 +17,16 @@ const user = state.getUser();
 const token = session.getToken();
 const route = useRoute();
 
-onMounted(() => stateStore. setMounted());
+onMounted(() => stateStore.setMounted());
 
 async function redirect() {
-    const currentURL = window.location.href;
-    const routeRegex = /\/(\w+)(?:\/(\d+))?/;
-    const match = currentURL.match(routeRegex);
-    const [, element, number] = match;
-    console.log(route.path);
-    const section = route.path.substring(route.path.indexOf('/'));
-    console.log(section);
+    let section = route.path.substring(1);
+    if (!route.path.includes('/')) return (window.location.href = await getUrl(section));
+    section = section.substring(0, section.indexOf('/'));
     if (route?.params?.id) {
-        // const redirectURL =
-        //     getUrl() + (number ? `${element}/${number}/summary` : `${element}/index`);
-        // window.location.href = redirectURL;
-        console.log(await getUrl(section));
-        window.location.href = await getUrl(section + route.params);
+        window.location.href = await getUrl(`${section}/${route.params.id}/summary`);
     } else {
-        console.log(await getUrl(section));
-
-        // window.location.href = await getUrl('claim');
+        window.location.href = await getUrl(section + 'dashboard');
     }
 }
 </script>
@@ -79,21 +69,11 @@ async function redirect() {
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
-                <QBtn
-                    @click="redirect(this.$route.params.id)"
-                    icon="open_in_new"
-                    label="Ir a SALIX"
-                ></QBtn>
+                <QBtn @click="redirect($route.params.id)" icon="open_in_new"> </QBtn>
                 <QBtn id="pinnedModules" icon="apps" flat dense rounded>
                     <QTooltip bottom>
                         {{ t('globals.pinnedModules') }}
                     </QTooltip>
-                    <PinnedModules>
-                        <QBtn
-                            @click="redirect(this.$route.params.id)"
-                            icon="open_in_new"
-                        ></QBtn>
-                    </PinnedModules>
                 </QBtn>
                 <QBtn rounded dense flat no-wrap id="user">
                     <QAvatar size="lg">
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index 8db97c448..0cd869f1c 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -36,7 +36,9 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                         <div class="text-grey-5" v-if="pinnedModules.length === 0">
                             {{ t('pinnedInfo') }}
                         </div>
-                        <template v-if="pinnedModules.length">
+                        <QBtn @click="redirect($route.params.id)" icon="open_in_new">
+                        </QBtn>
+                        <template v-if="pinnedModules.length >= 0">
                             <div
                                 v-for="item of pinnedModules"
                                 :key="item.title"
@@ -90,7 +92,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
 
 <i18n>
 {
-    "en": { 
+    "en": {
         "pinnedInfo": "Your pinned modules will be shown here..."
     },
     "es": {

From b12ab288da105f9a5668345cf7e180122ba51d62 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Aug 2023 10:24:01 +0200
Subject: [PATCH 14/40] refs #5986 WIP descriptors replaced

---
 src/components/ui/CardDescriptor.vue          | 124 +++++++++++++++---
 src/components/ui/VnLv.vue                    |  63 +++++----
 src/composables/useCardDescription.js         |   8 ++
 src/css/quasar.variables.scss                 |  19 +++
 src/i18n/en/index.js                          |  11 +-
 src/i18n/es/index.js                          |  11 +-
 src/pages/Claim/Card/ClaimDescriptor.vue      | 120 ++++++++++-------
 .../Customer/Card/CustomerDescriptor.vue      | 102 +++++---------
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  |  66 ++++------
 src/pages/Ticket/Card/TicketDescriptor.vue    | 117 +++++++----------
 src/pages/Ticket/Card/TicketSummary.vue       |   2 +-
 src/pages/Ticket/TicketList.vue               |   6 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  70 +++-------
 13 files changed, 389 insertions(+), 330 deletions(-)
 create mode 100644 src/composables/useCardDescription.js

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 54123d087..afdc2d108 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 
-const props = defineProps({
+const $props = defineProps({
     url: {
         type: String,
         default: '',
@@ -17,6 +17,14 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: Number,
+        default: 0,
+    },
 });
 
 const slots = useSlots();
@@ -30,15 +38,15 @@ const entity = ref();
 async function fetch() {
     const params = {};
 
-    if (props.filter) params.filter = JSON.stringify(props.filter);
+    if ($props.filter) params.filter = JSON.stringify($props.filter);
 
-    const { data } = await axios.get(props.url, { params });
+    const { data } = await axios.get($props.url, { params });
     entity.value = data;
 
     emit('onFetch', data);
 }
 
-watch(props, async () => {
+watch($props, async () => {
     entity.value = null;
     await fetch();
 });
@@ -49,14 +57,30 @@ watch(props, async () => {
         <template v-if="entity">
             <div class="header bg-primary q-pa-sm">
                 <RouterLink :to="{ name: `${module}List` }">
-                    <QBtn round flat dense size="md" icon="view_list" color="white">
+                    <QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        icon="view_list"
+                        color="white"
+                        class="link"
+                    >
                         <QTooltip>
                             {{ t('components.cardDescriptor.mainList') }}
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
                 <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
-                    <QBtn round flat dense size="md" icon="launch" color="white">
+                    <QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        icon="launch"
+                        color="white"
+                        class="link"
+                    >
                         <QTooltip>
                             {{ t('components.cardDescriptor.summary') }}
                         </QTooltip>
@@ -86,20 +110,34 @@ watch(props, async () => {
             <div class="body q-py-sm">
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
-                        <slot name="description" :entity="entity">
-                            <span>
-                                {{ entity.name }}
-                                <QTooltip>{{ entity.name }}</QTooltip>
+                        <div class="title">
+                            <span v-if="$props.title">
+                                {{ $props.title }}
+                                <QTooltip>{{ $props.title }}</QTooltip>
                             </span>
-                        </slot>
+                            <slot v-else name="description" :entity="entity">
+                                <span>
+                                    {{ entity.name }}
+                                    <QTooltip>{{ entity.name }}</QTooltip>
+                                </span>
+                            </slot>
+                        </div>
                     </QItemLabel>
                     <QItem dense>
-                        <QItemLabel class="text-subtitle2" caption>
-                            #{{ entity.id }}
+                        <QItemLabel class="text-subtitle2 text-white" caption>
+                            #{{ $props.subtitle ? $props.subtitle : entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
-                <slot name="body" :entity="entity" />
+                <div class="list-box">
+                    <slot name="body" :entity="entity" />
+                </div>
+            </div>
+            <div class="icons">
+                <slot name="icons" :entity="entity" />
+            </div>
+            <div class="actions">
+                <slot name="actions" :entity="entity" />
             </div>
             <slot name="after" />
         </template>
@@ -110,24 +148,74 @@ watch(props, async () => {
 
 <style lang="scss">
 .body {
-    .q-card__actions {
-        justify-content: center;
-    }
     .text-h5 {
         padding-top: 5px;
         padding-bottom: 5px;
     }
+    .q-item {
+        min-height: 20px;
+
+        .link {
+            margin-left: 5px;
+        }
+    }
+    .vn-label-value {
+        display: flex;
+        padding: 2px 16px;
+        .label {
+            color: $label-color;
+            font-size: 12px;
+            width: 47%;
+        }
+        .value {
+            font-size: 14px;
+            margin-left: 12px;
+            width: 47%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .info {
+            margin-left: 5px;
+        }
+    }
 }
 </style>
 
 <style lang="scss" scoped>
+.title {
+    span {
+        color: $primary;
+        font-weight: bold;
+    }
+}
+.list-box {
+    width: 90%;
+    background-color: rgba(87, 86, 86, 0.2);
+    margin: 20px 10px 0 10px;
+    padding: 10px 5px 10px 0px;
+    border-radius: 8px;
+    .q-item__label {
+        color: $label-color;
+    }
+}
 .descriptor {
     width: 256px;
-
     .header {
         display: flex;
         justify-content: space-between;
         align-items: stretch;
     }
+    .icons {
+        margin: 0 10px;
+        display: flex;
+        justify-content: center;
+        .q-icon {
+            margin-right: 5px;
+        }
+    }
+    .actions {
+        margin: 0 5px;
+    }
 }
 </style>
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index b0b0316ad..21205e63b 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -1,36 +1,45 @@
 <script setup>
 import { computed } from 'vue';
 const $props = defineProps({
-  label: { type: String, default: null },
-  value: {
-    type: [String, Boolean],
-    default: null,
-  },
-  info: { type: String, default: null },
+    label: { type: String, default: null },
+    value: {
+        type: [String, Boolean],
+        default: null,
+    },
+    info: { type: String, default: null },
 });
 const isBooleanValue = computed(() => typeof $props.value === 'boolean');
-
 </script>
 <template>
-  <div class="vn-label-value">
-    <div v-if="$props.label || $slots.label" class="label">
-      <div v-if="!$slots.label">{{ $props.label }}</div>
-      <slot name="label"></slot>
+    <div class="vn-label-value">
+        <div v-if="$props.label || $slots.label" class="label">
+            <slot name="label">
+                {{ $props.label }}
+            </slot>
+        </div>
+        <div class="value" v-if="$props.value || $slots.value" :title="$props.value">
+            <span v-if="isBooleanValue">
+                <QIcon
+                    :name="$props.value ? `check` : `close`"
+                    :color="$props.value ? `positive` : `negative`"
+                />
+            </span>
+            <span v-else>
+                <slot name="value">
+                    {{ $props.value }}
+                </slot>
+                <span class="info" v-if="$props.info">
+                    <QIcon name="info">
+                        <QTooltip
+                            class="text-white shadow-4"
+                            color="primary"
+                            :offset="[10, 10]"
+                        >
+                            {{ $props.info }}
+                        </QTooltip>
+                    </QIcon>
+                </span>
+            </span>
+        </div>
     </div>
-    <div v-if="$props.value || $slots.value" class="value">
-      <span v-if="isBooleanValue">
-        <QIcon :name="$props.value ? `check` : `close`" :color="$props.value ? `positive` : `negative`" />
-      </span>
-      <span v-else>
-        <slot name="value"></slot>
-      </span>
-    </div>
-    <div class="info" v-if="$props.info">
-      <QIcon name="info">
-        <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
-          {{ $props.info }}
-        </QTooltip>
-      </QIcon>
-    </div>
-  </div>
 </template>
diff --git a/src/composables/useCardDescription.js b/src/composables/useCardDescription.js
new file mode 100644
index 000000000..d064da0d7
--- /dev/null
+++ b/src/composables/useCardDescription.js
@@ -0,0 +1,8 @@
+export default function useCardDescription(title, subtitle) {
+    const getTitle = (title) => title;
+    const getSubtitle = (subtitle) => subtitle;
+    return {
+        title: getTitle(title),
+        subtitle: getSubtitle(subtitle),
+    };
+}
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 6ebf7a7a7..14819f8dd 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -21,6 +21,23 @@ $negative: #c10015;
 $info: #31ccec;
 $warning: #f2c037;
 
+// Pendiente de cuadrar con la base de datos
+$success: $positive;
+$alert: $negative;
+
+.bg-success {
+    background-color: $positive;
+}
+.bg-notice {
+    background-color: $info;
+}
+.text-notice {
+    color: $info;
+}
+.bg-alert {
+    background-color: $negative;
+}
+
 $color-spacer-light: rgba(255, 255, 255, 0.12);
 $color-spacer: rgba(255, 255, 255, 0.3);
 $border-thin-light: 1px solid $color-spacer-light;
@@ -29,3 +46,5 @@ $dark-shadow-color: #000;
 $dark: #292929;
 $layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24);
 $spacing-md: 16px;
+
+$label-color: rgba(255, 255, 255, 0.6);
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a43c5fe7c..c6ef905c3 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -268,6 +268,9 @@ export default {
             ticketId: 'Ticket ID',
             customerSummary: 'Customer summary',
             claimedTicket: 'Claimed ticket',
+            commercial: 'Commercial',
+            province: 'Province',
+            zone: 'Zone',
         },
         summary: {
             customer: 'Customer',
@@ -295,7 +298,7 @@ export default {
             result: 'Result',
             responsible: 'Responsible',
             worker: 'Worker',
-            redelivery: 'Redelivery'
+            redelivery: 'Redelivery',
         },
         basicData: {
             customer: 'Customer',
@@ -411,7 +414,7 @@ export default {
             wagonEdit: 'Edit wagon',
             typesList: 'Types List',
             typeCreate: 'Create type',
-            typeEdit: 'Edit type'
+            typeEdit: 'Edit type',
         },
         type: {
             name: 'Name',
@@ -431,7 +434,7 @@ export default {
             plate: 'Plate',
             volume: 'Volume',
             type: 'Type',
-            label: 'Label'
+            label: 'Label',
         },
         warnings: {
             noData: 'No data available',
@@ -444,7 +447,7 @@ export default {
             minHeightBetweenTrays: 'The minimum height between trays is ',
             maxWagonHeight: 'The maximum height of the wagon is ',
             uncompleteTrays: 'There are incomplete trays',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6328c8f5d..4129acc76 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -63,7 +63,7 @@ export default {
             webPayments: 'Pagos Web',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
-            summary: 'Resumen'
+            summary: 'Resumen',
         },
         list: {
             phone: 'Teléfono',
@@ -267,6 +267,9 @@ export default {
             ticketId: 'ID ticket',
             customerSummary: 'Resumen del cliente',
             claimedTicket: 'Ticket reclamado',
+            commercial: 'Comercial',
+            province: 'Provincia',
+            zone: 'Zone',
         },
         summary: {
             customer: 'Cliente',
@@ -294,7 +297,7 @@ export default {
             result: 'Consecuencias',
             responsible: 'Responsable',
             worker: 'Trabajador',
-            redelivery: 'Devolución'
+            redelivery: 'Devolución',
         },
         basicData: {
             customer: 'Cliente',
@@ -411,7 +414,7 @@ export default {
             wagonEdit: 'Editar tipo',
             typesList: 'Listado tipos',
             typeCreate: 'Crear tipo',
-            typeEdit: 'Editar tipo'
+            typeEdit: 'Editar tipo',
         },
         type: {
             name: 'Nombre',
@@ -444,7 +447,7 @@ export default {
             minHeightBetweenTrays: 'La distancia mínima entre bandejas es ',
             maxWagonHeight: 'La altura máxima del vagón es ',
             uncompleteTrays: 'Hay bandejas sin completar',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index baba66e2a..bdb4cd557 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -1,12 +1,13 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
-
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 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: {
@@ -25,11 +26,29 @@ const entityId = computed(() => {
 
 const filter = {
     include: [
-        { relation: 'client' },
-        { relation: 'claimState' },
+        {
+            relation: 'client',
+            scope: {
+                include: { relation: 'salesPersonUser' },
+            },
+        },
         {
             relation: 'claimState',
         },
+        {
+            relation: 'ticket',
+            scope: {
+                include: [
+                    { relation: 'zone' },
+                    {
+                        relation: 'address',
+                        scope: {
+                            include: { relation: 'province' },
+                        },
+                    },
+                ],
+            },
+        },
         {
             relation: 'worker',
             scope: {
@@ -40,10 +59,15 @@ const filter = {
 };
 
 function stateColor(code) {
-    if (code === 'pending') return 'green';
-    if (code === 'managed') return 'orange';
-    if (code === 'resolved') return 'red';
+    if (code === 'pending') return 'positive';
+    if (code === 'managed') return 'warning';
+    if (code === 'resolved') return 'negative';
 }
+const data = ref(useCardDescription());
+const setData = (entity) => {
+    console.log(entity);
+    data.value = useCardDescription(entity.client.name, entity.id);
+};
 </script>
 
 <template>
@@ -52,54 +76,47 @@ function stateColor(code) {
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
     >
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity" />
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.client.name }}
-                <QTooltip>{{ entity.client.name }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>{{ t('claim.card.created') }}</QItemLabel>
-                        <QItemLabel>{{ toDate(entity.created) }}</QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.claimState">
-                        <QItemLabel caption>{{ t('claim.card.state') }}</QItemLabel>
-                        <QItemLabel>
-                            <QBadge :color="stateColor(entity.claimState.code)" dense>
-                                {{ entity.claimState.description }}
-                            </QBadge>
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('claim.card.ticketId') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            <span class="link">
-                                {{ entity.ticketFk }}
-
-                                <TicketDescriptorProxy :id="entity.ticketFk" />
-                            </span>
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.worker">
-                        <QItemLabel caption>
-                            {{ t('claim.card.assignedTo') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.worker.user.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
+            <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
+                <template #value>
+                    <QBadge :color="stateColor(entity.claimState.code)" dense>
+                        {{ entity.claimState.description }}
+                    </QBadge>
+                </template>
+            </VnLv>
+            <VnLv :label="t('claim.card.ticketId')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.ticketFk }}
 
+                        <TicketDescriptorProxy :id="entity.ticketFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.worker"
+                :label="t('claim.card.assignedTo')"
+                :value="entity.worker.user.name"
+            />
+            <VnLv
+                :label="t('claim.card.commercial')"
+                :value="entity.client.salesPersonUser.name"
+            />
+            <VnLv
+                :label="t('claim.card.province')"
+                :value="entity.ticket.address.province.name"
+            />
+            <VnLv :label="t('claim.card.zone')" :value="entity.ticket.zone.name" />
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
@@ -121,3 +138,8 @@ function stateColor(code) {
         </template>
     </CardDescriptor>
 </template>
+<style scoped>
+.q-item__label {
+    margin-top: 0;
+}
+</style>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 8463e0390..23e6228ee 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,10 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -20,57 +22,38 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
 </script>
 
 <template>
-    <CardDescriptor module="Customer" :url="`Clients/${entityId}/getCard`">
+    <CardDescriptor
+        module="Customer"
+        :url="`Clients/${entityId}/getCard`"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+    >
         <template #body="{ entity }">
-            <QList dense>
-                <QItem v-if="entity.salesPersonUser" class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.salesPerson') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        <span class="link">
-                            {{ entity.salesPersonUser.name }}
-                            <WorkerDescriptorProxy :id="entity.salesPersonFk" />
-                        </span>
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.credit') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.credit) }}
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.securedCredit') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.creditInsurance) }}
-                    </QItemLabel>
-                </QItem>
-                <QItem v-if="entity.payMethod" class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.payMethod') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ entity.payMethod.name }}
-                    </QItemLabel>
-                </QItem>
-                <QItem class="row">
-                    <QItemLabel class="col" caption>
-                        {{ t('customer.card.debt') }}
-                    </QItemLabel>
-                    <QItemLabel class="col q-ma-none">
-                        {{ toCurrency(entity.debt) }}
-                    </QItemLabel>
-                </QItem>
-            </QList>
-            <QCardActions class="q-gutter-md">
+            <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.salesPersonUser.name }}
+                        <WorkerDescriptorProxy :id="entity.salesPersonFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
+            <VnLv
+                :label="t('customer.card.securedCredit')"
+                :value="toCurrency(entity.creditInsurance)"
+            />
+            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
+            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
+        </template>
+        <template #icons="{ entity }">
+            <QCardActions>
                 <QIcon
                     v-if="entity.isActive == false"
                     name="vn:disabled"
@@ -103,15 +86,9 @@ const entityId = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="entity.account && entity.account.active == false"
-                    name="vn:noweb"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('customer.card.noWebAccess') }}</QTooltip>
-                </QIcon>
             </QCardActions>
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     :to="{
@@ -135,23 +112,10 @@ const entityId = computed(() => {
                 >
                     <QTooltip>{{ t('invoiceOutList') }}</QTooltip>
                 </QBtn>
-                <!-- 
-                <QBtn size="md" icon="vn:basketadd" color="primary">
-                    <QTooltip>Order list</QTooltip>
-                </QBtn>
-
-                <QBtn size="md" icon="face" color="primary">
-                    <QTooltip>View user</QTooltip>
-                </QBtn>
-
-                <QBtn size="md" icon="expand_more" color="primary">
-                    <QTooltip>More options</QTooltip>
-                </QBtn> -->
             </QCardActions>
         </template>
     </CardDescriptor>
 </template>
-
 <i18n>
 {
     "en": {
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index fb7cf5c98..f6abd77e0 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -5,6 +5,8 @@ import { useI18n } from 'vue-i18n';
 import { toCurrency, toDate } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -42,6 +44,8 @@ const filter = {
 function ticketFilter(invoice) {
     return JSON.stringify({ refFk: invoice.ref });
 }
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
@@ -50,47 +54,31 @@ function ticketFilter(invoice) {
         module="InvoiceOut"
         :url="`InvoiceOuts/${entityId}`"
         :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
     >
-        <template #description="{ entity }">
-            <span>
-                {{ entity.ref }}
-                <QTooltip>{{ entity.ref }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.issued') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toDate(entity.issued) }}</QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.amount') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toCurrency(entity.amount) }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="entity.client">
-                        <QItemLabel caption>
-                            {{ t('invoiceOut.card.client') }}
-                        </QItemLabel>
-                        <QItemLabel class="link">
-                            {{ entity.client.name }}
-                            <CustomerDescriptorProxy :id="entity.client.id" />
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.company">
-                        <QItemLabel caption>{{
-                            t('invoiceOut.card.company')
-                        }}</QItemLabel>
-                        <QItemLabel>{{ entity.company.code }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
+            <VnLv
+                :label="t('invoiceOut.card.amount')"
+                :value="toCurrency(entity.amount)"
+            />
+            <VnLv v-if="entity.client" :label="t('invoiceOut.card.client')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.client.name }}
+                        <CustomerDescriptorProxy :id="entity.client.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.company"
+                :label="t('invoiceOut.card.company')"
+                :value="entity.company.code"
+            />
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     v-if="entity.client"
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 845e5f465..4ae20b70c 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -1,11 +1,13 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
@@ -66,78 +68,58 @@ const filter = {
     ],
 };
 
-function stateColor(state) {
-    if (state.code === 'OK') return 'text-green';
-    if (state.code === 'FREE') return 'text-blue-3';
-    if (state.alertLevel === 1) return 'text-primary';
-    if (state.alertLevel === 0) return 'text-red';
-}
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.client.name, entity.id));
 </script>
 
 <template>
-    <CardDescriptor module="Ticket" :url="`Tickets/${entityId}`" :filter="filter">
+    <CardDescriptor
+        module="Ticket"
+        :url="`Tickets/${entityId}`"
+        :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+    >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.client.name }}
-                <QTooltip>{{ entity.client.name }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection v-if="entity.ticketState">
-                        <QItemLabel caption>{{ t('ticket.card.state') }}</QItemLabel>
-                        <QItemLabel :class="stateColor(entity.ticketState.state)">
-                            {{ entity.ticketState.state.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('ticket.card.shipped') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ toDate(entity.shipped) }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('ticket.card.customerId') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            <span class="link">
-                                {{ entity.clientFk }}
-                                <CustomerDescriptorProxy :id="entity.client.id" />
-                            </span>
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection v-if="entity.client && entity.client.salesPersonUser">
-                        <QItemLabel caption>
-                            {{ t('ticket.card.salesPerson') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            {{ entity.client.salesPersonUser.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="entity.warehouse">
-                        <QItemLabel caption>
-                            {{ t('ticket.card.warehouse') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.warehouse.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="entity.agencyMode">
-                    <QItemSection>
-                        <QItemLabel caption>{{ t('ticket.card.agency') }}</QItemLabel>
-                        <QItemLabel>{{ entity.agencyMode.name }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
-            <QCardActions class="q-gutter-md">
+            <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
+                <template #value>
+                    <QChip square size="sm" :color="entity.ticketState.state.classColor">
+                        {{ entity.ticketState.state.name }}
+                    </QChip>
+                </template>
+            </VnLv>
+            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
+            <VnLv :label="t('ticket.card.customerId')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.clientFk }}
+                        <CustomerDescriptorProxy :id="entity.client.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv
+                v-if="entity.client && entity.client.salesPersonUser"
+                :label="t('ticket.card.salesPerson')"
+                :value="entity.client.salesPersonUser.name"
+            />
+            <VnLv
+                v-if="entity.warehouse"
+                :label="t('ticket.card.warehouse')"
+                :value="entity.warehouse.name"
+            />
+            <VnLv
+                v-if="entity.agencyMode"
+                :label="t('ticket.card.agency')"
+                :value="entity.agencyMode.name"
+            />
+        </template>
+        <template #icons="{ entity }">
+            <QCardActions>
                 <QIcon
                     v-if="entity.isDeleted == true"
                     name="vn:deletedTicket"
@@ -147,7 +129,8 @@ function stateColor(state) {
                     <QTooltip>{{ t('This ticket is deleted') }}</QTooltip>
                 </QIcon>
             </QCardActions>
-
+        </template>
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 945a98925..ba8180714 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -136,7 +136,7 @@ async function changeState(value) {
                                         {{ t('ticket.summary.state') }}
                                     </QItemLabel>
                                     <QItemLabel
-                                        :class="stateColor(ticket.ticketState.state)"
+                                        :class="`text-${ticket.ticketState.state.classColor}`"
                                     >
                                         {{ ticket.ticketState.state.name }}
                                     </QItemLabel>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index afa504e8c..d03cc8d16 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -142,13 +142,15 @@ function viewSummary(id) {
                                                 {{ t('ticket.list.state') }}
                                             </QItemLabel>
                                             <QItemLabel>
-                                                <QBadge
+                                                <QChip
+                                                    square
+                                                    size="sm"
                                                     :color="stateColor(row)"
                                                     class="q-ma-none"
                                                     dense
                                                 >
                                                     {{ row.state }}
-                                                </QBadge>
+                                                </QChip>
                                             </QItemLabel>
                                         </QItemSection>
                                     </QItem>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 3b34d8b6f..917682faf 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -4,7 +4,8 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
-
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 const $props = defineProps({
     id: {
         type: Number,
@@ -52,13 +53,22 @@ function getWorkerAvatar() {
     const token = getToken();
     return `/api/Images/user/160x160/${route.params.id}/download?access_token=${token}`;
 }
+const data = ref(useCardDescription());
+const setData = (entity) =>
+    (data.value = useCardDescription(entity.user.nickname, entity.id));
 </script>
 <template>
     <CardDescriptor
         module="Worker"
         :url="`Workers/${entityId}`"
         :filter="filter"
-        @on-fetch="(data) => (worker = data)"
+        :title="data.title"
+        @on-fetch="
+            (data) => {
+                worker = data;
+                setData(data);
+            }
+        "
     >
         <template #before>
             <QImg :src="getWorkerAvatar()" class="photo">
@@ -78,55 +88,15 @@ function getWorkerAvatar() {
                 </template>
             </QImg>
         </template>
-        <template #description="{ entity }">
-            <span>
-                {{ entity.user.nickname }}
-                <QTooltip>{{ entity.user.nickname }}</QTooltip>
-            </span>
-        </template>
         <template #body="{ entity }">
-            <QList>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption> {{ t('worker.card.name') }} </QItemLabel>
-                        <QItemLabel>{{ entity.user.nickname }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.card.email') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.user.email }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.list.department') }}
-                        </QItemLabel>
-                        <QItemLabel>
-                            {{ entity.department.department.name }}
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption>
-                            {{ t('worker.card.phone') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ entity.phone }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QItemLabel caption
-                            >{{ t('worker.summary.sipExtension') }}
-                        </QItemLabel>
-                        <QItemLabel>{{ sip }}</QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <VnLv :label="t('worker.card.name')" :value="entity.user.nickname" />
+            <VnLv :label="t('worker.card.email')" :value="entity.user.email"> </VnLv>
+            <VnLv
+                :label="t('worker.list.department')"
+                :value="entity.department ? entity.department.department.name : null"
+            />
+            <VnLv :label="t('worker.card.phone')" :value="entity.phone" />
+            <VnLv :label="t('worker.summary.sipExtension')" :value="sip" />
         </template>
     </CardDescriptor>
 </template>

From 8ba7615aee27b89e75ede244b26e4a3e6972da3c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Aug 2023 11:35:35 +0200
Subject: [PATCH 15/40] refs #5986 fix state color

---
 src/pages/Ticket/Card/TicketDescriptor.vue | 11 ++++++++---
 src/pages/Ticket/Card/TicketSummary.vue    |  2 +-
 src/pages/Ticket/TicketList.vue            |  6 ++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 4ae20b70c..c76c437c2 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -67,7 +67,12 @@ const filter = {
         },
     ],
 };
-
+function stateColor(state) {
+    if (state.code === 'OK') return 'text-green';
+    if (state.code === 'FREE') return 'text-blue-3';
+    if (state.alertLevel === 1) return 'text-primary';
+    if (state.alertLevel === 0) return 'text-red';
+}
 const data = ref(useCardDescription());
 const setData = (entity) =>
     (data.value = useCardDescription(entity.client.name, entity.id));
@@ -88,9 +93,9 @@ const setData = (entity) =>
         <template #body="{ entity }">
             <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
                 <template #value>
-                    <QChip square size="sm" :color="entity.ticketState.state.classColor">
+                    <span :class="stateColor(entity.ticketState.state)">
                         {{ entity.ticketState.state.name }}
-                    </QChip>
+                    </span>
                 </template>
             </VnLv>
             <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ba8180714..945a98925 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -136,7 +136,7 @@ async function changeState(value) {
                                         {{ t('ticket.summary.state') }}
                                     </QItemLabel>
                                     <QItemLabel
-                                        :class="`text-${ticket.ticketState.state.classColor}`"
+                                        :class="stateColor(ticket.ticketState.state)"
                                     >
                                         {{ ticket.ticketState.state.name }}
                                     </QItemLabel>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index d03cc8d16..afa504e8c 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -142,15 +142,13 @@ function viewSummary(id) {
                                                 {{ t('ticket.list.state') }}
                                             </QItemLabel>
                                             <QItemLabel>
-                                                <QChip
-                                                    square
-                                                    size="sm"
+                                                <QBadge
                                                     :color="stateColor(row)"
                                                     class="q-ma-none"
                                                     dense
                                                 >
                                                     {{ row.state }}
-                                                </QChip>
+                                                </QBadge>
                                             </QItemLabel>
                                         </QItemSection>
                                     </QItem>

From d7bc166df738d4e46172fb70bef9d4835b1c5887 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Aug 2023 12:11:27 +0200
Subject: [PATCH 16/40] refs #5989 redirect and home

---
 src/components/NavBar.vue             | 30 +++++------
 src/components/PinnedModules.vue      | 72 +++++++++++++++++----------
 src/pages/Dashboard/DashboardMain.vue |  4 +-
 3 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 60c5dedbd..ee6768724 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -1,34 +1,23 @@
 <script setup>
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
-import UserPanel from 'components/UserPanel.vue';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
+import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
-import { getUrl } from 'src/composables/getUrl';
-import { useRoute } from 'vue-router';
+import UserPanel from 'components/UserPanel.vue';
 
 const { t } = useI18n();
 const session = useSession();
 const stateStore = useStateStore();
+const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
 const token = session.getToken();
-const route = useRoute();
-
 onMounted(() => stateStore.setMounted());
 
-async function redirect() {
-    let section = route.path.substring(1);
-    if (!route.path.includes('/')) return (window.location.href = await getUrl(section));
-    section = section.substring(0, section.indexOf('/'));
-    if (route?.params?.id) {
-        window.location.href = await getUrl(`${section}/${route.params.id}/summary`);
-    } else {
-        window.location.href = await getUrl(section + '/index');
-    }
-}
+const pinnedModulesRef = ref();
 </script>
 
 <template>
@@ -69,11 +58,18 @@ async function redirect() {
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
-                <QBtn @click="redirect($route.params.id)" icon="open_in_new"> </QBtn>
+                <QBtn
+                    flat
+                    v-if="!quasar.platform.is.mobile"
+                    @click="pinnedModulesRef.redirect($route.params.id)"
+                    icon="launch"
+                >
+                </QBtn>
                 <QBtn id="pinnedModules" icon="apps" flat dense rounded>
                     <QTooltip bottom>
                         {{ t('globals.pinnedModules') }}
                     </QTooltip>
+                    <PinnedModules ref="pinnedModulesRef" />
                 </QBtn>
                 <QBtn rounded dense flat no-wrap id="user">
                     <QAvatar size="lg">
diff --git a/src/components/PinnedModules.vue b/src/components/PinnedModules.vue
index 2df7db390..c9aecff60 100644
--- a/src/components/PinnedModules.vue
+++ b/src/components/PinnedModules.vue
@@ -2,69 +2,91 @@
 import { onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useNavigationStore } from 'src/stores/useNavigationStore';
+import { getUrl } from 'src/composables/getUrl';
+import { useRoute } from 'vue-router';
 
 const navigation = useNavigationStore();
 const { t } = useI18n();
+const route = useRoute();
 
 onMounted(() => {
     navigation.fetchPinned();
 });
 
+defineExpose({
+    redirect,
+});
+
 const pinnedModules = computed(() => navigation.getPinnedModules());
+console.log(pinnedModules.value);
+
+async function redirect() {
+    let section = route.path.substring(1);
+    if (!route.path.includes('/')) return (window.location.href = await getUrl(section));
+    section = section.substring(0, section.indexOf('/'));
+    if (route?.params?.id) {
+        window.location.href = await getUrl(`${section}/${route.params.id}/summary`);
+    } else {
+        window.location.href = await getUrl(section + 'dashboard');
+    }
+}
 </script>
 
 <template>
-    <QMenu
-        anchor="bottom left"
-        class="row q-pa-md q-col-gutter-lg"
-        max-width="350px"
-        max-height="400px"
-    >
-        <template v-if="pinnedModules.length">
-            <div
-                v-for="item of pinnedModules"
-                :key="item.title"
-                class="row no-wrap q-pa-xs flex-item"
+    <QMenu anchor="bottom left" max-width="300px" max-height="400px">
+        <div v-if="pinnedModules.length" class="row justify-around q-pa-md">
+            <QBtn
+                flat
+                stack
+                size="lg"
+                icon="more_up"
+                class="col-5"
+                @click="redirect($route.params.id)"
             >
+                <div class="text-center button-text">Salix</div>
+            </QBtn>
+            <QBtn flat stack size="lg" icon="home" class="col-5" to="/">
+                <div class="text-center button-text">{{ t('Home') }}</div>
+            </QBtn>
+            <div class="row col-12 justify-around q-mt-md">
                 <QBtn
-                    align="evenly"
-                    padding="16px"
                     flat
                     stack
                     size="lg"
                     :icon="item.icon"
                     color="primary"
-                    class="col-4 button"
+                    class="col-5"
                     :to="{ name: item.name }"
+                    v-for="item of pinnedModules"
+                    :key="item.title"
                 >
                     <div class="text-center text-primary button-text">
                         {{ t(item.title) }}
                     </div>
                 </QBtn>
             </div>
-        </template>
-        <template v-else>
+        </div>
+        <div v-else>
             <div
                 class="row no-wrap q-pa-xs flex-item text-center text-grey-5"
                 style="min-width: 200px"
             >
                 {{ t('globals.noPinnedModules') }}
             </div>
-        </template>
+        </div>
     </QMenu>
 </template>
 
 <style lang="scss" scoped>
-.flex-item {
-    width: 100px;
-}
-.button {
-    width: 100%;
-    line-height: normal;
-    align-items: center;
-}
 .button-text {
     font-size: 10px;
     margin-top: 5px;
 }
 </style>
+
+<i18n>
+en:
+    Home: Home
+es:
+    Home: Inicio
+</i18n>
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index 0cd869f1c..da6a2cb7d 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -36,9 +36,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                         <div class="text-grey-5" v-if="pinnedModules.length === 0">
                             {{ t('pinnedInfo') }}
                         </div>
-                        <QBtn @click="redirect($route.params.id)" icon="open_in_new">
-                        </QBtn>
-                        <template v-if="pinnedModules.length >= 0">
+                        <template v-if="pinnedModules.length">
                             <div
                                 v-for="item of pinnedModules"
                                 :key="item.title"

From 05b9f7c84ea15352fd5e6704e5202bd59097230f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Aug 2023 12:54:18 +0200
Subject: [PATCH 17/40] refs #5989 change icon

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

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index ee6768724..6a8f916ea 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -62,7 +62,7 @@ const pinnedModulesRef = ref();
                     flat
                     v-if="!quasar.platform.is.mobile"
                     @click="pinnedModulesRef.redirect($route.params.id)"
-                    icon="launch"
+                    icon="more_up"
                 >
                 </QBtn>
                 <QBtn id="pinnedModules" icon="apps" flat dense rounded>

From eb95ff18ecd29e7ea83f19835eb1ea38caa0eb62 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Aug 2023 13:48:36 +0200
Subject: [PATCH 18/40] refs #5986 refactored ticket stateColor

---
 src/pages/Ticket/Card/TicketDescriptor.vue | 17 +++++++++--------
 src/pages/Ticket/Card/TicketSummary.vue    | 14 ++++++++++----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index c76c437c2..31662e343 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -67,12 +67,7 @@ const filter = {
         },
     ],
 };
-function stateColor(state) {
-    if (state.code === 'OK') return 'text-green';
-    if (state.code === 'FREE') return 'text-blue-3';
-    if (state.alertLevel === 1) return 'text-primary';
-    if (state.alertLevel === 0) return 'text-red';
-}
+
 const data = ref(useCardDescription());
 const setData = (entity) =>
     (data.value = useCardDescription(entity.client.name, entity.id));
@@ -93,9 +88,15 @@ const setData = (entity) =>
         <template #body="{ entity }">
             <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
                 <template #value>
-                    <span :class="stateColor(entity.ticketState.state)">
+                    <QBadge
+                        :color="
+                            entity.ticketState.state.classColor
+                                ? entity.ticketState.state.classColor
+                                : 'dark'
+                        "
+                    >
                         {{ entity.ticketState.state.name }}
-                    </span>
+                    </QBadge>
                 </template>
             </VnLv>
             <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 945a98925..00a46e4ad 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -135,10 +135,16 @@ async function changeState(value) {
                                     <QItemLabel caption>
                                         {{ t('ticket.summary.state') }}
                                     </QItemLabel>
-                                    <QItemLabel
-                                        :class="stateColor(ticket.ticketState.state)"
-                                    >
-                                        {{ ticket.ticketState.state.name }}
+                                    <QItemLabel>
+                                        <QBadge
+                                            :color="
+                                                ticket.ticketState.state.classColor
+                                                    ? ticket.ticketState.state.classColor
+                                                    : 'dark'
+                                            "
+                                        >
+                                            {{ ticket.ticketState.state.name }}
+                                        </QBadge>
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>

From fa120ffa17672d1d9f54ade3a7059e7aa50c0de4 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 8 Aug 2023 14:24:51 +0200
Subject: [PATCH 19/40] refs #5995 Added module route and external cmrs

---
 src/i18n/en/index.js              |  18 +++++
 src/i18n/es/index.js              |  20 ++++-
 src/pages/Route/Cmr/CmrFilter.vue | 127 +++++++++++++++++++++++++++++
 src/pages/Route/Cmr/CmrList.vue   | 130 ++++++++++++++++++++++++++++++
 src/pages/Route/RouteMain.vue     |  17 ++++
 src/router/modules/index.js       |   4 +-
 src/router/modules/route.js       |  35 ++++++++
 src/router/routes.js              |   4 +-
 src/stores/useNavigationStore.js  |   2 +-
 9 files changed, 353 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/Route/Cmr/CmrFilter.vue
 create mode 100644 src/pages/Route/Cmr/CmrList.vue
 create mode 100644 src/pages/Route/RouteMain.vue
 create mode 100644 src/router/modules/route.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a43c5fe7c..3241d155d 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -446,6 +446,24 @@ export default {
             uncompleteTrays: 'There are incomplete trays',
         }
     },
+    route: {
+        pageTitles: {
+            routes: 'Routes',
+            cmrsList: 'External CMRs list',
+        },
+        cmr: {
+            list: {
+                cmrFk: 'Cmr id',
+                hasCmrDms: `Attached in gestdoc`,
+                true: 'Yes',
+                false: 'No',
+                ticketFk: 'Ticketd id',
+                country: 'Country',
+                clientFk: 'Client id',
+                shipped: 'Preparation date',
+            },
+        },
+    },
     components: {
         topbar: {},
         userPanel: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6328c8f5d..6ac3a28ea 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -444,7 +444,25 @@ export default {
             minHeightBetweenTrays: 'La distancia mínima entre bandejas es ',
             maxWagonHeight: 'La altura máxima del vagón es ',
             uncompleteTrays: 'Hay bandejas sin completar',
-        }
+        },
+    },
+    route: {
+        pageTitles: {
+            routes: 'Rutas',
+            cmrsList: 'Listado de CMRs externos',
+        },
+        cmr: {
+            list: {
+                cmrFk: 'Id cmr',
+                hasCmrDms: 'Adjuntado en gestdoc',
+                true: 'Sí',
+                false: 'No',
+                ticketFk: 'Id ticket',
+                country: 'País',
+                clientFk: 'Id cliente',
+                shipped: 'Fecha preparación',
+            },
+        },
     },
     components: {
         topbar: {},
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
new file mode 100644
index 000000000..3bf7c6791
--- /dev/null
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -0,0 +1,127 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const countries = ref();
+</script>
+
+<template>
+    <FetchData url="Countries" @on-fetch="(data) => (countries = data)" auto-load />
+    <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 }">
+            <QList dense>
+                <QItem>
+                    <QItemSection>
+                        <QInput :label="t('route.cmr.list.cmrFk')" v-model="params.cmrFk" lazy-rules>
+                            <template #prepend>
+                                <QIcon name="article" size="sm"></QIcon>
+                            </template>
+                        </QInput>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QCheckbox :label="t('route.cmr.list.hasCmrDms')" v-model="params.hasCmrDms" lazy-rules>
+                            <template #prepend>
+                                <QIcon name="picture_as_pdf" size="sm"></QIcon>
+                            </template>
+                        </QCheckbox>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QInput :label="t('route.cmr.list.ticketFk')" v-model="params.ticketFk" lazy-rules>
+                            <template #prepend>
+                                <QIcon name="vn:ticket" size="sm"></QIcon>
+                            </template>
+                        </QInput>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QInput :label="t('route.cmr.list.clientFk')" v-model="params.clientFk" lazy-rules>
+                            <template #prepend>
+                                <QIcon name="vn:client" size="sm"></QIcon>
+                            </template>
+                        </QInput>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection v-if="!countries">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="countries">
+                        <QSelect
+                            :label="t('route.cmr.list.country')"
+                            v-model="params.country"
+                            :options="countries"
+                            option-value="country"
+                            option-label="country"
+                            emit-value
+                            map-options
+                        >
+                        <template #prepend>
+                            <QIcon name="flag" size="sm"></QIcon>
+                        </template>
+                        </QSelect>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <QInput
+                            :label="t('route.cmr.list.shipped')"
+                            v-model="params.shipped"
+                            mask="date"
+                        >
+                            <template #append>
+                                <QIcon name="event" class="cursor-pointer">
+                                    <QPopupProxy
+                                        cover
+                                        transition-show="scale"
+                                        transition-hide="scale"
+                                    >
+                                        <QDate v-model="params.shipped" landscape>
+                                            <div
+                                                class="row items-center justify-end q-gutter-sm"
+                                            >
+                                                <QBtn
+                                                    :label="t('globals.cancel')"
+                                                    color="primary"
+                                                    flat
+                                                    v-close-popup
+                                                />
+                                                <QBtn
+                                                    :label="t('globals.confirm')"
+                                                    color="primary"
+                                                    flat
+                                                    @click="save"
+                                                    v-close-popup
+                                                />
+                                            </div>
+                                        </QDate>
+                                    </QPopupProxy>
+                                </QIcon>
+                            </template>
+                        </QInput>
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
\ No newline at end of file
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
new file mode 100644
index 000000000..04166c010
--- /dev/null
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -0,0 +1,130 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import { useSession } from 'src/composables/useSession';
+import { toDate } from 'filters/index';
+import { getUrl } from 'composables/getUrl';
+import CmrFilter from './CmrFilter.vue';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const session = useSession();
+
+const columns = computed(() => [
+    {
+        name: 'cmrFk',
+        label: t('route.cmr.list.cmrFk'),
+        field: (row) => row.cmrFk,
+        sortable: true,
+    },
+    {
+        name: 'hasCmrDms',
+        label: t('route.cmr.list.hasCmrDms'),
+        field: (row) => row.hasCmrDms,
+        sortable: true,
+    },
+    {
+        name: 'ticketFk',
+        label: t('route.cmr.list.ticketFk'),
+        field: (row) => row.ticketFk,
+        sortable: true,
+    },
+    {
+        name: 'clientFk',
+        label: t('route.cmr.list.clientFk'),
+        field: (row) => row.clientFk,
+        sortable: true,
+    },
+    {
+        name: 'country',
+        label: t('route.cmr.list.country'),
+        field: (row) => row.country,
+        sortable: true,
+    },
+    {
+        name: 'shipped',
+        label: t('route.cmr.list.shipped'),
+        field: (row) => toDate(row.shipped),
+        sortable: true,
+    },
+]);
+async function openCmr(cmrFk) {
+    const salixUrl = (await getUrl(`Routes/${cmrFk}/cmr`)).replace('#!/', 'api/')
+    window.open(`${salixUrl.replace('#!/', 'api/')}?access_token=${session.getToken()}`);
+};
+</script>
+<template>
+    <div class="column items-center">
+        <div class="list">
+            <VnPaginate
+                data-key="CmrList"
+                :url="`Routes/getExternalCmrs`"
+                order="cmrFk DESC"
+                limit="null"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QTable
+                    :columns="columns"
+                    :rows="rows"
+                    :dense="$q.screen.lt.md"
+                    :pagination="{ rowsPerPage: null }"
+                    hide-pagination
+                    :grid="$q.screen.lt.md"
+                    auto-load
+                    >
+                    <template #body-cell-cmrFk="{ value }">
+                        <QTd align="right" class="text-primary">
+                            <span id="cmr" @click="openCmr(value)">{{ value }}</span>
+                        </QTd>
+                    </template>
+                    <template #body-cell-hasCmrDms="{ value }">
+                        <QTd align="right">
+                            <QBadge :id="(value) ? 'true' : 'false'" :label="(value) ? t('route.cmr.list.true') : t('route.cmr.list.false')"/>
+                        </QTd>
+                    </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+                <QScrollArea class="fit text-grey-8">
+                    <CmrFilter data-key="CmrList" />
+                </QScrollArea>
+        </QDrawer>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.list {
+    padding-top: 15px;
+    padding-bottom: 15px;
+    max-width: 900px;
+    width: 100%;
+}
+.grid-style-transition {
+    transition: transform 0.28s, background-color 0.28s;
+}
+#cmr {
+    cursor: pointer;
+}
+#cmr:hover {
+    text-decoration: underline;
+}
+.header-cell {
+    background-color: #ff9800;
+}
+#true {
+    background-color: #c8e484;
+    color: black;
+}
+#false {
+    background-color: #fb5252;
+    color: black;
+}
+.text-center {
+    margin: 0 auto;
+}
+</style>
diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue
new file mode 100644
index 000000000..66ce78f23
--- /dev/null
+++ b/src/pages/Route/RouteMain.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 30c51939d..2916b98ef 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -4,6 +4,7 @@ import Claim from './claim';
 import InvoiceOut from './invoiceOut';
 import Worker from './worker';
 import Wagon from './wagon';
+import Route from './route';
 
 export default [
     Customer,
@@ -11,5 +12,6 @@ export default [
     Claim,
     InvoiceOut,
     Worker,
-    Wagon
+    Wagon,
+    Route
 ]
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
new file mode 100644
index 000000000..a3550885c
--- /dev/null
+++ b/src/router/modules/route.js
@@ -0,0 +1,35 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/route',
+    name: 'Route',
+    meta: {
+        title: 'routes',
+        icon: 'vn:delivery',
+    },
+    component: RouterView,
+    redirect: { name: 'RouteMain' },
+    menus: {
+        main: ['CmrList'],
+        card: [],
+    },
+    children: [
+        {
+            path: '/route',
+            name: 'RouteMain',
+            component: () => import('src/pages/Route/RouteMain.vue'),
+            redirect: { name: 'CmrList' },
+            children: [
+                {
+                    path: 'cmr/list',
+                    name: 'CmrList',
+                    meta: {
+                        title: 'cmrsList',
+                        icon: 'fact_check',
+                    },
+                    component: () => import('src/pages/Route/Cmr/CmrList.vue')
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 17a56505d..08491e475 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -4,6 +4,7 @@ import claim from './modules/claim';
 import worker from './modules/worker';
 import invoiceOut from './modules/invoiceOut';
 import wagon from './modules/wagon';
+import route from './modules/route';
 
 const routes = [
     {
@@ -35,7 +36,8 @@ const routes = [
                 name: 'NotFound',
                 component: () => import('../pages/NotFound.vue'),
             },
-            wagon
+            wagon,
+            route
         ],
     },
 ];
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index bcaeeb953..168c1f9dc 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -6,7 +6,7 @@ import { useRole } from 'src/composables/useRole';
 import routes from 'src/router/modules';
 
 export const useNavigationStore = defineStore('navigationStore', () => {
-    const modules = ['customer', 'claim', 'ticket', 'invoiceOut', 'worker', 'wagon'];
+    const modules = ['customer', 'claim', 'ticket', 'invoiceOut', 'worker', 'wagon', 'route'];
     const pinnedModules = ref([]);
     const role = useRole();
 

From 8d4faa270b3fa48565f238cb504be78d71aa8bfa Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 07:23:28 +0200
Subject: [PATCH 20/40] refs #5995 Added left space to subsection

---
 src/css/app.scss              | 13 +++++++++++++
 src/css/quasar.variables.scss |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 29e5bb600..480a4d64b 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -30,3 +30,16 @@ body.body--light {
         color: #555;
     }
 }
+
+// Added left space to subsection
+.q-expansion-item__content {
+    padding-left: 15px;
+}
+.q-expansion-item--standard {
+    max-width: 256px;
+}
+
+// Reduced the space between the icon and the label in the left sidebar
+.q-item__section.column.q-item__section--side.justify-center.q-item__section--avatar {
+    margin-right: -15px;
+}
\ No newline at end of file
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 6ebf7a7a7..f0d2d4e06 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -12,7 +12,7 @@
 // to match your app's branding.
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 
-$primary: #ff9800;
+$primary: #ec8916;
 $secondary: #26a69a;
 $accent: #9c27b0;
 

From d16c2159366681b9768bd4d25404c72168398247 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 09:43:24 +0200
Subject: [PATCH 21/40] refs #5995 Added left space to subsection

---
 src/components/LeftMenu.vue | 52 ++++++-------------------------------
 src/i18n/en/index.js        |  4 +--
 src/i18n/es/index.js        |  4 +--
 3 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 8839bd030..5f6cb5a27 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -55,10 +55,6 @@ function addChildren(module, route, parent) {
     }
 }
 
-const pinnedItems = computed(() => {
-    return items.value.filter((item) => item.isPinned);
-});
-
 const items = ref([]);
 function getRoutes() {
     if (props.source === 'main') {
@@ -117,46 +113,14 @@ async function togglePinned(item, event) {
 <template>
     <QList padding>
         <template v-if="$props.source === 'main'">
-            <QItemLabel header>
-                {{ t('globals.pinnedModules') }}
-            </QItemLabel>
-            <template v-for="item in pinnedItems" :key="item.name">
-                <template v-if="item.children">
-                    <LeftMenuItemGroup :item="item" group="pinnedModules" class="pinned">
-                        <template #side>
-                            <QBtn
-                                v-if="item.isPinned === true"
-                                @click="togglePinned(item, $event)"
-                                icon="remove_circle"
-                                size="xs"
-                                flat
-                                round
-                            >
-                                <QTooltip>{{
-                                    t('components.leftMenu.removeFromPinned')
-                                }}</QTooltip>
-                            </QBtn>
-                            <QBtn
-                                v-if="item.isPinned === false"
-                                @click="togglePinned(item, $event)"
-                                icon="push_pin"
-                                size="xs"
-                                flat
-                                round
-                            >
-                                <QTooltip>{{
-                                    t('components.leftMenu.addToPinned')
-                                }}</QTooltip>
-                            </QBtn>
-                        </template>
-                    </LeftMenuItemGroup>
-                </template>
-
-                <LeftMenuItem v-if="!item.children" :item="item" />
+            <template v-if="this.$route.matched[1].name === 'Dashboard'">
+                <QItemLabel header>
+                    {{ t('globals.modules') }}
+                </QItemLabel>
+                <QSeparator />
             </template>
-            <QSeparator />
-            <QExpansionItem :label="t('moduleIndex.allModules')">
-                <template v-for="item in items" :key="item.name">
+            <template v-for="item in items" :key="item.name">
+                <template v-if="item.name === this.$route.matched[1].name || this.$route.matched[1].name === 'Dashboard'">
                     <template v-if="item.children">
                         <LeftMenuItemGroup :item="item" group="modules">
                             <template #side>
@@ -188,7 +152,7 @@ async function togglePinned(item, event) {
                         </LeftMenuItemGroup>
                     </template>
                 </template>
-            </QExpansionItem>
+            </template>
             <QSeparator />
         </template>
         <template v-if="$props.source === 'card'">
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 0bd924608..f52f8559c 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -9,6 +9,7 @@ export default {
         backToDashboard: 'Return to dashboard',
         notifications: 'Notifications',
         userPanel: 'User panel',
+        modules: 'Modules',
         pinnedModules: 'Pinned modules',
         darkMode: 'Dark mode',
         logOut: 'Log out',
@@ -32,9 +33,6 @@ export default {
         pleaseWait: 'Please wait...',
         noPinnedModules: 'You have dont have any pinned modules',
     },
-    moduleIndex: {
-        allModules: 'All modules',
-    },
     errors: {
         statusUnauthorized: 'Access denied',
         statusInternalServerError: 'An internal server error has ocurred',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 1edfcc020..6f5777530 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -9,6 +9,7 @@ export default {
         backToDashboard: 'Volver al tablón',
         notifications: 'Notificaciones',
         userPanel: 'Panel de usuario',
+        modules: 'Módulos',
         pinnedModules: 'Módulos fijados',
         darkMode: 'Modo oscuro',
         logOut: 'Cerrar sesión',
@@ -32,9 +33,6 @@ export default {
         pleaseWait: 'Por favor, espera...',
         noPinnedModules: 'No has fijado ningún módulo',
     },
-    moduleIndex: {
-        allModules: 'Todos los módulos',
-    },
     errors: {
         statusUnauthorized: 'Acceso denegado',
         statusInternalServerError: 'Ha ocurrido un error interno del servidor',

From 566f7df2d0bd63faa421b245b3dc6b0f8073c429 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 9 Aug 2023 10:02:48 +0200
Subject: [PATCH 22/40] refs #5989 tooltip, refact function,

---
 src/components/NavBar.vue        | 10 ++++++++++
 src/components/PinnedModules.vue | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 6a8f916ea..ae4c4ceb5 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -64,6 +64,9 @@ const pinnedModulesRef = ref();
                     @click="pinnedModulesRef.redirect($route.params.id)"
                     icon="more_up"
                 >
+                    <QTooltip>
+                        {{ t('Go to Salix') }}
+                    </QTooltip>
                 </QBtn>
                 <QBtn id="pinnedModules" icon="apps" flat dense rounded>
                     <QTooltip bottom>
@@ -89,3 +92,10 @@ const pinnedModulesRef = ref();
         </QToolbar>
     </QHeader>
 </template>
+
+<i18n>
+en:
+    Go to Salix: Go to Salix
+es:
+    Go to Salix: Ir a Salix
+</i18n>
diff --git a/src/components/PinnedModules.vue b/src/components/PinnedModules.vue
index c9aecff60..52fe29d2c 100644
--- a/src/components/PinnedModules.vue
+++ b/src/components/PinnedModules.vue
@@ -24,17 +24,17 @@ async function redirect() {
     let section = route.path.substring(1);
     if (!route.path.includes('/')) return (window.location.href = await getUrl(section));
     section = section.substring(0, section.indexOf('/'));
-    if (route?.params?.id) {
-        window.location.href = await getUrl(`${section}/${route.params.id}/summary`);
-    } else {
-        window.location.href = await getUrl(section + 'dashboard');
-    }
+    if (route?.params?.id)
+        return (window.location.href = await getUrl(
+            `${section}/${route.params.id}/summary`
+        ));
+    return (window.location.href = await getUrl(section + 'dashboard'));
 }
 </script>
 
 <template>
     <QMenu anchor="bottom left" max-width="300px" max-height="400px">
-        <div v-if="pinnedModules.length" class="row justify-around q-pa-md">
+        <div v-if="pinnedModules.length >= 0" class="row justify-around q-pa-md">
             <QBtn
                 flat
                 stack

From 6d2436c9f717854bc705d179008b69d4816b9bbc Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 10:09:37 +0200
Subject: [PATCH 23/40] refs #5988 Improved identation

---
 src/components/LeftMenu.vue     |  5 ++++-
 src/components/LeftMenuItem.vue |  2 +-
 src/css/app.scss                | 13 -------------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 8839bd030..a9604eb45 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -115,7 +115,7 @@ async function togglePinned(item, event) {
 </script>
 
 <template>
-    <QList padding>
+    <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
             <QItemLabel header>
                 {{ t('globals.pinnedModules') }}
@@ -207,4 +207,7 @@ async function togglePinned(item, event) {
 .pinned:hover .q-btn {
     visibility: visible;
 }
+.column-max-width {
+    max-width: 256px;
+}
 </style>
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index c889ac619..509dc9107 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
+    <QItem active-class="text-primary" :to="{ name: item.name }" clickable class="q-ml-md" v-ripple>
         <QItemSection avatar v-if="item.icon">
             <QIcon :name="item.icon" />
         </QItemSection>
diff --git a/src/css/app.scss b/src/css/app.scss
index 480a4d64b..7e39780a1 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -29,17 +29,4 @@ body.body--light {
         background-color: white;
         color: #555;
     }
-}
-
-// Added left space to subsection
-.q-expansion-item__content {
-    padding-left: 15px;
-}
-.q-expansion-item--standard {
-    max-width: 256px;
-}
-
-// Reduced the space between the icon and the label in the left sidebar
-.q-item__section.column.q-item__section--side.justify-center.q-item__section--avatar {
-    margin-right: -15px;
 }
\ No newline at end of file

From 7940d1702b65b82806121b72a573a24aa1a00a48 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 9 Aug 2023 10:39:37 +0200
Subject: [PATCH 24/40] refs #5987 refactor descriptors and VnLv

---
 src/components/ui/CardDescriptor.vue       |  2 +-
 src/components/ui/VnLv.vue                 | 10 ++++++----
 src/pages/Ticket/Card/TicketDescriptor.vue |  8 +-------
 src/pages/Ticket/TicketList.vue            |  6 +-----
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index afdc2d108..70109c15d 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -125,7 +125,7 @@ watch($props, async () => {
                     </QItemLabel>
                     <QItem dense>
                         <QItemLabel class="text-subtitle2 text-white" caption>
-                            #{{ $props.subtitle ? $props.subtitle : entity.id }}
+                            #{{ $props.subtitle ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 83234b658..1eea26252 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -13,7 +13,9 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
 <template>
     <div class="vn-label-value">
         <div v-if="$props.label || $slots.label" class="label">
-            <slot name="label"> {{ $props.label }}</slot>
+            <slot name="label">
+                <span>{{ $props.label }}</span>
+            </slot>
         </div>
         <div v-if="$props.value || $slots.value" class="value">
             <span v-if="isBooleanValue">
@@ -22,9 +24,9 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
                     :color="$props.value ? `positive` : `negative`"
                 />
             </span>
-            <span v-else>
-                <slot name="value">{{ $props.value }}</slot>
-            </span>
+            <slot v-else name="value">
+                <span :title="$props.value">{{ $props.value }}</span>
+            </slot>
         </div>
         <div class="info" v-if="$props.info">
             <QIcon name="info">
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 31662e343..9cd62d621 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -88,13 +88,7 @@ const setData = (entity) =>
         <template #body="{ entity }">
             <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
                 <template #value>
-                    <QBadge
-                        :color="
-                            entity.ticketState.state.classColor
-                                ? entity.ticketState.state.classColor
-                                : 'dark'
-                        "
-                    >
+                    <QBadge :color="entity.ticketState.state.classColor ?? 'dark'">
                         {{ entity.ticketState.state.name }}
                     </QBadge>
                 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 03a652017..711811b00 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -106,11 +106,7 @@ function viewSummary(id) {
                                             </QItemLabel>
                                             <QItemLabel>
                                                 <QBadge
-                                                    :color="
-                                                        row.classColor
-                                                            ? row.classColor
-                                                            : 'dark'
-                                                    "
+                                                    :color="row.classColor ?? 'dark'"
                                                     class="q-ma-none"
                                                     dense
                                                 >

From 4a41ba124748e3d9a4768b1c058b28f092ae9d05 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 12:02:15 +0200
Subject: [PATCH 25/40] refs #5995 Changes

---
 src/i18n/es/index.js              |  1 +
 src/pages/Route/Cmr/CmrFilter.vue | 10 +++++-----
 src/pages/Route/Cmr/CmrList.vue   | 27 +++++++++------------------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6ac3a28ea..5ceb10140 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -453,6 +453,7 @@ export default {
         },
         cmr: {
             list: {
+                total: 'Total {0} registros',
                 cmrFk: 'Id cmr',
                 hasCmrDms: 'Adjuntado en gestdoc',
                 true: 'Sí',
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index 3bf7c6791..cf8b0a90c 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -37,11 +37,11 @@ const countries = ref();
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QCheckbox :label="t('route.cmr.list.hasCmrDms')" v-model="params.hasCmrDms" lazy-rules>
-                            <template #prepend>
-                                <QIcon name="picture_as_pdf" size="sm"></QIcon>
-                            </template>
-                        </QCheckbox>
+                        <QCheckbox
+                            :label="t('route.cmr.list.hasCmrDms')"
+                            v-model="params.hasCmrDms"
+                            lazy-rules
+                        />
                     </QItemSection>
                 </QItem>
                 <QItem>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 04166c010..81fad647a 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -75,13 +75,16 @@ async function openCmr(cmrFk) {
                     :grid="$q.screen.lt.md"
                     auto-load
                     >
+                    <template v-slot:top>
+                        {{ t('route.cmr.list.total', [rows.length]) }}
+                    </template>
                     <template #body-cell-cmrFk="{ value }">
                         <QTd align="right" class="text-primary">
-                            <span id="cmr" @click="openCmr(value)">{{ value }}</span>
+                            <span class="cursor-pointer" @click="openCmr(value)">{{ value }}</span>
                         </QTd>
                     </template>
                     <template #body-cell-hasCmrDms="{ value }">
-                        <QTd align="right">
+                        <QTd align="center">
                             <QBadge :id="(value) ? 'true' : 'false'" :label="(value) ? t('route.cmr.list.true') : t('route.cmr.list.false')"/>
                         </QTd>
                     </template>
@@ -107,24 +110,12 @@ async function openCmr(cmrFk) {
 .grid-style-transition {
     transition: transform 0.28s, background-color 0.28s;
 }
-#cmr {
-    cursor: pointer;
-}
-#cmr:hover {
-    text-decoration: underline;
-}
-.header-cell {
-    background-color: #ff9800;
-}
 #true {
-    background-color: #c8e484;
-    color: black;
+    background-color: $positive;
 }
 #false {
-    background-color: #fb5252;
-    color: black;
-}
-.text-center {
-    margin: 0 auto;
+    background-color: $negative;
 }
 </style>
+
+

From a034d135c20b2f5c2723bf65375a08930c7ca38e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 9 Aug 2023 12:06:24 +0200
Subject: [PATCH 26/40] refs #5989 remove console logs

---
 src/components/PinnedModules.vue      | 1 -
 src/pages/Customer/CustomerCreate.vue | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/PinnedModules.vue b/src/components/PinnedModules.vue
index 52fe29d2c..1193c951a 100644
--- a/src/components/PinnedModules.vue
+++ b/src/components/PinnedModules.vue
@@ -18,7 +18,6 @@ defineExpose({
 });
 
 const pinnedModules = computed(() => navigation.getPinnedModules());
-console.log(pinnedModules.value);
 
 async function redirect() {
     let section = route.path.substring(1);
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 7cf260a73..d87af6cab 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -5,12 +5,7 @@ const customer = reactive({
     name: '',
 });
 
-watch(
-    () => customer.name,
-    () => {
-        console.log('customer.name changed');
-    }
-);
+watch(() => customer.name);
 </script>
 
 <template>

From 32ca81ebade0f0d88c90dbbc449cf465a82b53cb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 9 Aug 2023 12:16:08 +0200
Subject: [PATCH 27/40] refs #5986 WorkerDescriptorProxy added

---
 src/components/ui/CardDescriptor.vue     |  5 ++++-
 src/i18n/es/index.js                     |  2 +-
 src/pages/Claim/Card/ClaimDescriptor.vue | 22 +++++++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 70109c15d..025a8a2e2 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -124,7 +124,7 @@ watch($props, async () => {
                         </div>
                     </QItemLabel>
                     <QItem dense>
-                        <QItemLabel class="text-subtitle2 text-white" caption>
+                        <QItemLabel class="subtitle text-white" caption>
                             #{{ $props.subtitle ?? entity.id }}
                         </QItemLabel>
                     </QItem>
@@ -189,6 +189,9 @@ watch($props, async () => {
         font-weight: bold;
     }
 }
+.subtitle {
+    font-size: 16px;
+}
 .list-box {
     width: 90%;
     background-color: rgba(87, 86, 86, 0.2);
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 012c18136..ff2955fba 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -270,7 +270,7 @@ export default {
             claimedTicket: 'Ticket reclamado',
             commercial: 'Comercial',
             province: 'Provincia',
-            zone: 'Zone',
+            zone: 'Zona',
         },
         summary: {
             customer: 'Cliente',
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index bdb4cd557..e52f3fba5 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -105,11 +106,22 @@ const setData = (entity) => {
                 v-if="entity.worker"
                 :label="t('claim.card.assignedTo')"
                 :value="entity.worker.user.name"
-            />
-            <VnLv
-                :label="t('claim.card.commercial')"
-                :value="entity.client.salesPersonUser.name"
-            />
+            >
+                <template #value>
+                    <span class="link">
+                        {{ entity.worker.user.name }}
+                        <WorkerDescriptorProxy :id="entity.worker.userFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('claim.card.commercial')">
+                <template #value>
+                    <span class="link">
+                        {{ entity.client.salesPersonUser.name }}
+                        <WorkerDescriptorProxy :id="entity.client.salesPersonFk" />
+                    </span>
+                </template>
+            </VnLv>
             <VnLv
                 :label="t('claim.card.province')"
                 :value="entity.ticket.address.province.name"

From 38173286619c67b99bb0b5ae14ef08be137f6f2f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 9 Aug 2023 12:20:04 +0200
Subject: [PATCH 28/40] refs #5986  console log removed

---
 src/pages/Claim/Card/ClaimDescriptor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index e52f3fba5..914de2eb2 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -66,7 +66,6 @@ function stateColor(code) {
 }
 const data = ref(useCardDescription());
 const setData = (entity) => {
-    console.log(entity);
     data.value = useCardDescription(entity.client.name, entity.id);
 };
 </script>

From 20c15020a0a65392f0c546ff7547de14a30548f2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 9 Aug 2023 12:57:35 +0200
Subject: [PATCH 29/40] refs #5989 fix: correct redirect

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

diff --git a/src/components/PinnedModules.vue b/src/components/PinnedModules.vue
index 1193c951a..c85b6b2fa 100644
--- a/src/components/PinnedModules.vue
+++ b/src/components/PinnedModules.vue
@@ -20,14 +20,15 @@ defineExpose({
 const pinnedModules = computed(() => navigation.getPinnedModules());
 
 async function redirect() {
+    if (route.path == '/dashboard') return (window.location.href = await getUrl(''));
     let section = route.path.substring(1);
-    if (!route.path.includes('/')) return (window.location.href = await getUrl(section));
     section = section.substring(0, section.indexOf('/'));
+
     if (route?.params?.id)
         return (window.location.href = await getUrl(
             `${section}/${route.params.id}/summary`
         ));
-    return (window.location.href = await getUrl(section + 'dashboard'));
+    return (window.location.href = await getUrl(section + '/index'));
 }
 </script>
 

From 0b066062eade39e3fa6ab2d9690907010e03bfb6 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 13:29:00 +0200
Subject: [PATCH 30/40] refs #6080 Changes in components

---
 src/components/LeftMenu.vue          | 66 +++++++++++++++++++++++++---
 src/components/LeftMenuItem.vue      |  3 ++
 src/components/LeftMenuItemGroup.vue | 35 ++-------------
 3 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 5f6cb5a27..d075c7543 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -107,20 +107,72 @@ async function togglePinned(item, event) {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-}
+};
+function firstLower(str) {
+    return str[0].toLowerCase() + str.slice(1);
+};
 </script>
 
 <template>
     <QList padding>
         <template v-if="$props.source === 'main'">
             <template v-if="this.$route.matched[1].name === 'Dashboard'">
-                <QItemLabel header>
-                    {{ t('globals.modules') }}
-                </QItemLabel>
+                <QItem class="header">
+                    <QItemSection avatar>
+                        <QIcon name="view_module" />
+                    </QItemSection>
+                    <QItemSection> {{ t('globals.modules') }}</QItemSection>
+                </QItem>
                 <QSeparator />
+                <template v-for="item in items" :key="item.name">
+                    <template v-if="item.children">
+                        <LeftMenuItem :item="item" group="modules">
+                            <template #side>
+                                <QBtn
+                                    v-if="item.isPinned === true"
+                                    @click="togglePinned(item, $event)"
+                                    icon="remove_circle"
+                                    size="xs"
+                                    flat
+                                    round
+                                >
+                                    <QTooltip>
+                                        {{ t('components.leftMenu.removeFromPinned') }}
+                                    </QTooltip>
+                                </QBtn>
+                                <QBtn
+                                    v-if="item.isPinned === false"
+                                    @click="togglePinned(item, $event)"
+                                    icon="push_pin"
+                                    size="xs"
+                                    flat
+                                    round
+                                >
+                                    <QTooltip>
+                                        {{ t('components.leftMenu.addToPinned') }}
+                                    </QTooltip>
+                                </QBtn>
+                            </template>
+                        </LeftMenuItem>
+                    </template>
+                </template>
             </template>
+
             <template v-for="item in items" :key="item.name">
-                <template v-if="item.name === this.$route.matched[1].name || this.$route.matched[1].name === 'Dashboard'">
+                <template v-if="item.name === this.$route.matched[1].name">
+                    <QItem class="header">
+                        <QItemSection avatar v-if="item.icon">
+                            <QIcon :name="item.icon" />
+                        </QItemSection>
+                        <QItemSection avatar v-if="!item.icon">
+                            <QIcon name="disabled_by_default" />
+                        </QItemSection>
+                        <QItemSection>{{ t(item.title) }}</QItemSection>
+                        <QItemSection side>
+                            <slot name="side" :item="item" />
+                        </QItemSection>
+                    </QItem>
+                    <QSeparator />
                     <template v-if="item.children">
                         <LeftMenuItemGroup :item="item" group="modules">
                             <template #side>
@@ -153,7 +205,6 @@ async function togglePinned(item, event) {
                     </template>
                 </template>
             </template>
-            <QSeparator />
         </template>
         <template v-if="$props.source === 'card'">
             <template v-for="item in items" :key="item.name">
@@ -171,4 +222,7 @@ async function togglePinned(item, event) {
 .pinned:hover .q-btn {
     visibility: visible;
 }
+.header {
+    color: #999999;
+}
 </style>
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index c889ac619..976136394 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -22,5 +22,8 @@ const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
             <QIcon name="disabled_by_default" />
         </QItemSection>
         <QItemSection>{{ t(item.title) }}</QItemSection>
+        <QItemSection side>
+            <slot name="side" :item="item" />
+        </QItemSection>
     </QItem>
 </template>
diff --git a/src/components/LeftMenuItemGroup.vue b/src/components/LeftMenuItemGroup.vue
index 06850b9d3..1fdb41e7c 100644
--- a/src/components/LeftMenuItemGroup.vue
+++ b/src/components/LeftMenuItemGroup.vue
@@ -1,12 +1,7 @@
 <script setup>
 import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import LeftMenuItem from './LeftMenuItem.vue';
 
-const route = useRoute();
-const { t } = useI18n();
-
 const props = defineProps({
     item: {
         type: Object,
@@ -19,33 +14,9 @@ const props = defineProps({
 });
 
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
-const isOpened = computed(() => {
-    const { matched } = route;
-    const { name } = item.value;
-
-    return matched.some((item) => item.name === name);
-});
 </script>
 <template>
-    <QExpansionItem
-        :group="props.group"
-        active-class="text-primary"
-        :label="item.title"
-        :to="{ name: item.name }"
-        expand-separator
-        :default-opened="isOpened"
-    >
-        <template #header>
-            <QItemSection avatar>
-                <QIcon :name="item.icon"></QIcon>
-            </QItemSection>
-            <QItemSection>{{ t(item.title) }}</QItemSection>
-            <QItemSection side>
-                <slot name="side" :item="item" />
-            </QItemSection>
-        </template>
-        <template v-for="section in item.children" :key="section.name">
-            <LeftMenuItem :item="section" />
-        </template>
-    </QExpansionItem>
+    <template v-for="section in item.children" :key="section.name">
+        <LeftMenuItem :item="section" />
+    </template>
 </template>

From 446cebc53db48ed0631e50db83ca3a9502e032e7 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 14:26:13 +0200
Subject: [PATCH 31/40] refs #5995 Changes

---
 src/pages/Route/Cmr/CmrList.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 81fad647a..b3854ada0 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -11,6 +11,7 @@ import CmrFilter from './CmrFilter.vue';
 const stateStore = useStateStore();
 const { t } = useI18n();
 const session = useSession();
+const token = session.getToken();
 
 const columns = computed(() => [
     {
@@ -23,6 +24,7 @@ const columns = computed(() => [
         name: 'hasCmrDms',
         label: t('route.cmr.list.hasCmrDms'),
         field: (row) => row.hasCmrDms,
+        align: 'center',
         sortable: true,
     },
     {
@@ -41,12 +43,14 @@ const columns = computed(() => [
         name: 'country',
         label: t('route.cmr.list.country'),
         field: (row) => row.country,
+        align: 'left',
         sortable: true,
     },
     {
         name: 'shipped',
         label: t('route.cmr.list.shipped'),
         field: (row) => toDate(row.shipped),
+        align: 'center',
         sortable: true,
     },
 ]);
@@ -57,6 +61,7 @@ async function openCmr(cmrFk) {
 </script>
 <template>
     <div class="column items-center">
+        {{ console.log(location) }}
         <div class="list">
             <VnPaginate
                 data-key="CmrList"
@@ -75,12 +80,14 @@ async function openCmr(cmrFk) {
                     :grid="$q.screen.lt.md"
                     auto-load
                     >
-                    <template v-slot:top>
+                    <template #top>
                         {{ t('route.cmr.list.total', [rows.length]) }}
                     </template>
                     <template #body-cell-cmrFk="{ value }">
                         <QTd align="right" class="text-primary">
-                            <span class="cursor-pointer" @click="openCmr(value)">{{ value }}</span>
+                            <RouterLink class="text-primary" :to="`${window.location}/api/Routes/${value}/cmr?access_token=${token}`">
+                                <span>{{ value }}</span>
+                            </RouterLink>
                         </QTd>
                     </template>
                     <template #body-cell-hasCmrDms="{ value }">

From df66903e492ed1e3ace362137605be26263d05ca Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 14:34:43 +0200
Subject: [PATCH 32/40] refs #6080 Deleted unused function

---
 src/components/LeftMenu.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 442687b2d..4616e2d33 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -108,9 +108,6 @@ async function togglePinned(item, event) {
         type: 'positive',
     });
 };
-function firstLower(str) {
-    return str[0].toLowerCase() + str.slice(1);
-};
 </script>
 
 <template>

From df7366195a09bfeb886da84d2bdca0c796fe4266 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 9 Aug 2023 14:42:37 +0200
Subject: [PATCH 33/40] refs #5989 fix: revert appName

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

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index ae4c4ceb5..79189b3f1 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -15,6 +15,8 @@ const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
 const token = session.getToken();
+const appName = 'Lilium';
+
 onMounted(() => stateStore.setMounted());
 
 const pinnedModulesRef = ref();

From fbb347f719398f01573185ae82f19cf75c4aecd2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 9 Aug 2023 14:54:32 +0200
Subject: [PATCH 34/40] refs #6080 test: skip Leftmenu

---
 src/components/LeftMenu.vue                       | 5 +----
 src/components/LeftMenuItem.vue                   | 2 +-
 test/vitest/__tests__/components/Leftmenu.spec.js | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 442687b2d..a627f9058 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -107,10 +107,7 @@ async function togglePinned(item, event) {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-};
-function firstLower(str) {
-    return str[0].toLowerCase() + str.slice(1);
-};
+}
 </script>
 
 <template>
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index d625bd31a..976136394 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable class="q-ml-md" v-ripple>
+    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
         <QItemSection avatar v-if="item.icon">
             <QIcon :name="item.icon" />
         </QItemSection>
diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js
index ffdaebe7b..87caa2413 100644
--- a/test/vitest/__tests__/components/Leftmenu.spec.js
+++ b/test/vitest/__tests__/components/Leftmenu.spec.js
@@ -45,7 +45,7 @@ vi.mock('src/router/modules', () => ({
     ],
 }));
 
-describe('Leftmenu', () => {
+describe.skip('Leftmenu', () => {
     let vm;
     let navigation;
     beforeAll(() => {

From 45cfdc5edb3c5258fdf826fe12de5f0ccac9a4b2 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 10 Aug 2023 07:06:35 +0200
Subject: [PATCH 35/40] refs #6080 Fixed tests

---
 src/components/LeftMenu.vue     | 6 +++---
 src/components/LeftMenuItem.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 4616e2d33..0601fa7f3 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -113,7 +113,7 @@ async function togglePinned(item, event) {
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
-            <template v-if="this.$route.matched[1].name === 'Dashboard'">
+            <template v-if="this.$route?.matched[1]?.name === 'Dashboard'">
                 <QItem class="header">
                     <QItemSection avatar>
                         <QIcon name="view_module" />
@@ -156,7 +156,7 @@ async function togglePinned(item, event) {
             </template>
 
             <template v-for="item in items" :key="item.name">
-                <template v-if="item.name === this.$route.matched[1].name">
+                <template v-if="item.name === this.$route?.matched[1]?.name">
                     <QItem class="header">
                         <QItemSection avatar v-if="item.icon">
                             <QIcon :name="item.icon" />
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index d625bd31a..976136394 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable class="q-ml-md" v-ripple>
+    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
         <QItemSection avatar v-if="item.icon">
             <QIcon :name="item.icon" />
         </QItemSection>

From cab607f600b291d953bc4d1dc7066a2c95d21b37 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 10 Aug 2023 07:26:50 +0200
Subject: [PATCH 36/40] refs #6080 test(LeftMenu): undo skip

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

diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js
index 87caa2413..ffdaebe7b 100644
--- a/test/vitest/__tests__/components/Leftmenu.spec.js
+++ b/test/vitest/__tests__/components/Leftmenu.spec.js
@@ -45,7 +45,7 @@ vi.mock('src/router/modules', () => ({
     ],
 }));
 
-describe.skip('Leftmenu', () => {
+describe('Leftmenu', () => {
     let vm;
     let navigation;
     beforeAll(() => {

From 58372ef9e83643f3e0d7db0471f59e5e04719f1e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 10 Aug 2023 07:49:57 +0200
Subject: [PATCH 37/40] refs #5995 Href to lilium api link

---
 src/i18n/en/index.js              |  1 +
 src/pages/Route/Cmr/CmrFilter.vue | 22 ++++++++++++++++-
 src/pages/Route/Cmr/CmrList.vue   | 40 ++++++++++++++++---------------
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 3241d155d..2a1391e7e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -453,6 +453,7 @@ export default {
         },
         cmr: {
             list: {
+                total: 'Total {0} records',
                 cmrFk: 'Cmr id',
                 hasCmrDms: `Attached in gestdoc`,
                 true: 'Yes',
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index cf8b0a90c..9488d31d6 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -124,4 +124,24 @@ const countries = ref();
             </QList>
         </template>
     </VnFilterPanel>
-</template>
\ No newline at end of file
+</template>
+
+<i18n>
+    en:
+        params:
+            cmrFk: Cmr id,
+            hasCmrDms: Attached in gestdoc,
+            ticketFk: Ticketd id,
+            country: Country,
+            clientFk: Client id,
+            shipped: Preparation date,
+    
+    es:
+        params:
+            cmrFk: Id cmr,
+            hasCmrDms: Adjuntado en gestdoc,
+            ticketFk: Id ticket,
+            country: País,
+            clientFk: Id cliente,
+            shipped: Fecha preparación,
+</i18n>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index b3854ada0..761d79fa2 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -5,7 +5,6 @@ import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
 import { toDate } from 'filters/index';
-import { getUrl } from 'composables/getUrl';
 import CmrFilter from './CmrFilter.vue';
 
 const stateStore = useStateStore();
@@ -26,6 +25,7 @@ const columns = computed(() => [
         field: (row) => row.hasCmrDms,
         align: 'center',
         sortable: true,
+        headerStyle: 'padding-left: 35px',
     },
     {
         name: 'ticketFk',
@@ -52,16 +52,15 @@ const columns = computed(() => [
         field: (row) => toDate(row.shipped),
         align: 'center',
         sortable: true,
+        headerStyle: 'padding-left: 33px',
     },
 ]);
-async function openCmr(cmrFk) {
-    const salixUrl = (await getUrl(`Routes/${cmrFk}/cmr`)).replace('#!/', 'api/')
-    window.open(`${salixUrl.replace('#!/', 'api/')}?access_token=${session.getToken()}`);
+function getProjectUrl() {
+    return ((new URL(window.location)).origin);
 };
 </script>
 <template>
     <div class="column items-center">
-        {{ console.log(location) }}
         <div class="list">
             <VnPaginate
                 data-key="CmrList"
@@ -72,27 +71,32 @@ async function openCmr(cmrFk) {
             >
                 <template #body="{ rows }">
                     <QTable
-                    :columns="columns"
-                    :rows="rows"
-                    :dense="$q.screen.lt.md"
-                    :pagination="{ rowsPerPage: null }"
-                    hide-pagination
-                    :grid="$q.screen.lt.md"
-                    auto-load
+                        :columns="columns"
+                        :rows="rows"
+                        :dense="$q.screen.lt.md"
+                        :pagination="{ rowsPerPage: null }"
+                        hide-pagination
+                        :grid="$q.screen.lt.md"
+                        auto-load
                     >
                     <template #top>
                         {{ t('route.cmr.list.total', [rows.length]) }}
                     </template>
                     <template #body-cell-cmrFk="{ value }">
                         <QTd align="right" class="text-primary">
-                            <RouterLink class="text-primary" :to="`${window.location}/api/Routes/${value}/cmr?access_token=${token}`">
-                                <span>{{ value }}</span>
-                            </RouterLink>
+                                <a :href="`${getProjectUrl()}/api/Routes/${value}/cmr?access_token=${token}`" target="_blank">
+                                    <span class="text-primary">{{ value }}</span>
+                                </a>
                         </QTd>
                     </template>
                     <template #body-cell-hasCmrDms="{ value }">
                         <QTd align="center">
-                            <QBadge :id="(value) ? 'true' : 'false'" :label="(value) ? t('route.cmr.list.true') : t('route.cmr.list.false')"/>
+                            <QBadge
+                                :id="(value) ? 'true' : 'false'" 
+                                :label="(value)
+                                    ? t('route.cmr.list.true')
+                                    : t('route.cmr.list.false')"
+                            />
                         </QTd>
                     </template>
                     </QTable>
@@ -123,6 +127,4 @@ async function openCmr(cmrFk) {
 #false {
     background-color: $negative;
 }
-</style>
-
-
+</style>
\ No newline at end of file

From 9f29a64d4ad5464d77b89b80038f52a8a57fe209 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 10 Aug 2023 08:37:15 +0200
Subject: [PATCH 38/40] refs #5995 Changed transitions

---
 src/i18n/en/index.js              |  1 +
 src/i18n/es/index.js              |  1 +
 src/pages/Route/Cmr/CmrFilter.vue | 20 +++++++-------------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 2a1391e7e..2e8d9c0be 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -19,6 +19,7 @@ export default {
         save: 'Save',
         remove: 'Remove',
         reset: 'Reset',
+        close: 'Close',
         cancel: 'Cancel',
         confirm: 'Confirm',
         back: 'Back',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 5ceb10140..8c23c84f4 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -19,6 +19,7 @@ export default {
         save: 'Guardar',
         remove: 'Eliminar',
         reset: 'Restaurar',
+        close: 'Cerrar',
         cancel: 'Cancelar',
         confirm: 'Confirmar',
         back: 'Volver',
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index 9488d31d6..9059e0195 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -73,6 +73,8 @@ const countries = ref();
                             :options="countries"
                             option-value="country"
                             option-label="country"
+                            transition-show="jump-down"
+                            transition-hide="jump-up"
                             emit-value
                             map-options
                         >
@@ -93,21 +95,13 @@ const countries = ref();
                                 <QIcon name="event" class="cursor-pointer">
                                     <QPopupProxy
                                         cover
-                                        transition-show="scale"
-                                        transition-hide="scale"
+                                        transition-show="rotate"
+                                        transition-hide="rotate"
                                     >
-                                        <QDate v-model="params.shipped" landscape>
-                                            <div
-                                                class="row items-center justify-end q-gutter-sm"
-                                            >
+                                        <QDate v-model="params.shipped" minimal>
+                                            <div class="row items-center justify-end q-gutter-sm">
                                                 <QBtn
-                                                    :label="t('globals.cancel')"
-                                                    color="primary"
-                                                    flat
-                                                    v-close-popup
-                                                />
-                                                <QBtn
-                                                    :label="t('globals.confirm')"
+                                                    :label="t('globals.close')"
                                                     color="primary"
                                                     flat
                                                     @click="save"

From efc672a183e292d4f24999c5c0a6328037060e18 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 10 Aug 2023 10:52:34 +0200
Subject: [PATCH 39/40] refs #6080 fix: header summary color

---
 src/components/LeftMenu.vue | 4 ++--
 src/css/app.scss            | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 0601fa7f3..6196c636a 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -107,7 +107,7 @@ async function togglePinned(item, event) {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-};
+}
 </script>
 
 <template>
@@ -211,7 +211,7 @@ async function togglePinned(item, event) {
     </QList>
 </template>
 
-<style>
+<style scoped>
 .pinned .q-btn {
     visibility: hidden;
 }
diff --git a/src/css/app.scss b/src/css/app.scss
index 7e39780a1..466219906 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -29,4 +29,10 @@ body.body--light {
         background-color: white;
         color: #555;
     }
-}
\ No newline at end of file
+
+    .summary {
+        .header {
+            color: white;
+        }
+    }
+}

From 6097fb2516bc67033d7af123b6d0ca27fcf81e13 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 10 Aug 2023 11:01:27 +0200
Subject: [PATCH 40/40] refs #6054 package correct version

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4fe3c0cdc..afcf4b291 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "0.0.1",
+    "version": "23.32.01",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/package.json b/package.json
index d9702c895..85e0cd72b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "23.30.01",
+    "version": "23.32.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",