From 1af5b270a0d1669297509223d17836e3b9941f9f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Feb 2024 10:26:20 +0100
Subject: [PATCH 01/25] fear: refs #5186 WIP parking section

---
 src/i18n/en/index.js                          |  27 +++++
 src/i18n/es/index.js                          |  25 +++++
 .../Parking/Card/ParkingBasicData.vue         |  59 +++++++++++
 .../Shelving/Parking/Card/ParkingCard.vue     |  56 ++++++++++
 .../Parking/Card/ParkingDescriptor.vue        |  52 +++++++++
 .../Shelving/Parking/Card/ParkingLog.vue      |   6 ++
 .../Shelving/Parking/Card/ParkingSummary.vue  |  50 +++++++++
 src/pages/Shelving/Parking/ParkingFilter.vue  |  77 ++++++++++++++
 src/pages/Shelving/Parking/ParkingList.vue    | 100 ++++++++++++++++++
 src/pages/Shelving/Parking/ParkingMain.vue    |  17 +++
 src/router/modules/index.js                   |   2 +
 src/router/modules/parking.js                 |  63 +++++++++++
 src/router/modules/shelving.js                |  23 ++--
 src/router/routes.js                          |   2 +
 14 files changed, 551 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingBasicData.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingCard.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingLog.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingSummary.vue
 create mode 100644 src/pages/Shelving/Parking/ParkingFilter.vue
 create mode 100644 src/pages/Shelving/Parking/ParkingList.vue
 create mode 100644 src/pages/Shelving/Parking/ParkingMain.vue
 create mode 100644 src/router/modules/parking.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9e0ad7c9b..f79c3c157 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -656,6 +656,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             log: 'Logs',
+            parkingList: 'Parking list',
         },
         list: {
             parking: 'Parking',
@@ -676,6 +677,32 @@ export default {
             recyclable: 'Recyclable',
         },
     },
+    parking: {
+        pageTitles: {
+            parking: 'Parking',
+            parkingList: 'Parkings list',
+            summary: 'Summary',
+            basicData: 'Basic data',
+            log: 'Logs',
+        },
+        list: {
+            pickingOrder: 'Picking order',
+        },
+        searchBar: {
+            info: 'You can search by parking code',
+            label: 'Search parking...',
+        },
+        summary: {
+            code: 'Code',
+            pickingOrder: 'Picking order',
+            sector: 'Sector',
+        },
+        basicData: {
+            code: 'Code',
+            pickingOrder: 'Picking order',
+            sector: 'Sector',
+        },
+    },
     invoiceIn: {
         pageTitles: {
             invoiceIns: 'Invoices In',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6083dfad7..fd9aafef6 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -715,6 +715,7 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             log: 'Registros de auditoría',
+            parkingList: 'Listado de parkings',
         },
         list: {
             parking: 'Parking',
@@ -735,6 +736,30 @@ export default {
             recyclable: 'Reciclable',
         },
     },
+    parking: {
+        pageTitles: {
+            parking: 'Parking',
+            parkingList: 'Listado de parkings',
+            summary: 'Resumen',
+            basicData: 'Datos básicos',
+            log: 'Registros de auditoría',
+        },
+        list: {
+            pickingOrder: 'Orden de recogida',
+        },
+        searchBar: {
+            info: 'Puedes buscar por código de parking',
+            label: 'Buscar parking...',
+        },
+        summary: {
+            code: 'Código',
+            pickingOrder: 'Orden de recogida',
+        },
+        basicData: {
+            code: 'Código',
+            pickingOrder: 'Orden de recogida',
+        },
+    },
     invoiceIn: {
         pageTitles: {
             invoiceIns: 'Fact. recibidas',
diff --git a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue b/src/pages/Shelving/Parking/Card/ParkingBasicData.vue
new file mode 100644
index 000000000..e5b886eff
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingBasicData.vue
@@ -0,0 +1,59 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const parkingId = route.params?.id || null;
+const sectors = ref([]);
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+<template>
+    <FetchData
+        url="Sectors"
+        :filter="{ fields: ['id', 'description'] }"
+        sort-by="description"
+        @on-fetch="(data) => (sectors = data)"
+        auto-load
+    />
+    <VnSubToolbar />
+    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter">
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.pickingOrder"
+                        :label="t('parking.basicData.pickingOrder')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelectFilter
+                        v-model="data.sectorFk"
+                        option-value="id"
+                        option-label="description"
+                        :label="t('parking.basicData.sector')"
+                        :options="sectors"
+                        use-input
+                        input-debounce="0"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Shelving/Parking/Card/ParkingCard.vue
new file mode 100644
index 000000000..1dfc51173
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingCard.vue
@@ -0,0 +1,56 @@
+<script setup>
+import { onMounted, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useArrayData } from 'src/composables/useArrayData';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+
+const route = useRoute();
+const arrayData = useArrayData('Parking', {
+    url: `Parkings/${route.params.id}`,
+    filter,
+});
+
+onMounted(async () => await arrayData.fetch({ append: false }));
+watch(
+    () => route.params.id,
+    async (newId) => {
+        if (newId) {
+            arrayData.store.url = `Parkings/${newId}`;
+            await arrayData.fetch({ append: false });
+        }
+    }
+);
+</script>
+<template>
+    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
+        <VnSearchbar
+            :info="t('parking.searchBar.info')"
+            :label="t('parking.searchBar.label')"
+            data-key="Parking"
+        />
+    </Teleport>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <ParkingDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <RouterView></RouterView>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
new file mode 100644
index 000000000..1805b5af0
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
@@ -0,0 +1,52 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import useCardDescription from 'composables/useCardDescription';
+
+const props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const entityId = computed(() => props.id || route.params.id);
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+const header = ref(useCardDescription());
+const setHeader = (entity) => (header.value = useCardDescription(entity.code, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="Parking"
+        :url="`Parkings/${entityId}`"
+        :filter="filter"
+        :title="header.title"
+        :subtitle="header.subtitle"
+        data-key="ParkingData"
+        @on-fetch="setHeader"
+    >
+        <template #body="{ entity: parking }">
+            <VnLv :label="t('parking.summary.code')" :value="parking.code" />
+            <VnLv
+                :label="t('parking.summary.pickingOrder')"
+                :value="parking.pickingOrder"
+            />
+            <VnLv
+                :label="t('parking.summary.sector')"
+                :value="parking.sector?.description"
+            />
+        </template>
+    </CardDescriptor>
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingLog.vue b/src/pages/Shelving/Parking/Card/ParkingLog.vue
new file mode 100644
index 000000000..f25abd2e4
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Parking" url="/ParkingLogs" />
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Shelving/Parking/Card/ParkingSummary.vue
new file mode 100644
index 000000000..e94fa8d9e
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingSummary.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const route = useRoute();
+const { t } = useI18n();
+
+const entityId = computed(() => $props.id || route.params.id);
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+
+<template>
+    <div class="q-pa-md">
+        <CardSummary ref="summary" :url="`Parkings/${entityId}`" :filter="filter">
+            <template #header="{ entity: parking }">{{ parking.code }}</template>
+            <template #body="{ entity: parking }">
+                <QCard class="vn-one">
+                    <QCardSection class="q-pa-none">
+                        <a class="header" :href="`#/parking/${entityId}/basic-data`">
+                            {{ t('parking.pageTitles.basicData') }}
+                            <QIcon name="open_in_new" color="primary" />
+                        </a>
+                    </QCardSection>
+                    <VnLv :label="t('parking.summary.code')" :value="parking.code" />
+                    <VnLv
+                        :label="t('parking.summary.pickingOrder')"
+                        :value="parking.pickingOrder"
+                    />
+                    <VnLv
+                        :label="t('parking.summary.sector')"
+                        :value="parking.sector?.description"
+                    />
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>
diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Shelving/Parking/ParkingFilter.vue
new file mode 100644
index 000000000..2e559a879
--- /dev/null
+++ b/src/pages/Shelving/Parking/ParkingFilter.vue
@@ -0,0 +1,77 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const sectors = ref([]);
+const emit = defineEmits(['search']);
+</script>
+
+<template>
+    <FetchData
+        url="Sectors"
+        :filter="{ fields: ['id', 'description'] }"
+        sort-by="description"
+        @on-fetch="(data) => (sectors = data)"
+        auto-load
+    />
+    <VnFilterPanel :data-key="dataKey" :search-button="true" @search="emit('search')">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.code')"
+                        v-model="params.code"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        v-model="params.sectorFk"
+                        option-value="id"
+                        option-label="description"
+                        :label="t('params.sectorFk')"
+                        dense
+                        outlined
+                        rounded
+                        :options="sectors"
+                        use-input
+                        input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        code: Code
+        sectorFk: Sector
+        search: General Search
+es:
+    params:
+        code: Código
+        search: Búsqueda general
+
+</i18n>
diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue
new file mode 100644
index 000000000..4fff9b3cb
--- /dev/null
+++ b/src/pages/Shelving/Parking/ParkingList.vue
@@ -0,0 +1,100 @@
+<script setup>
+import { onMounted, onUnmounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import CardList from 'components/ui/CardList.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import ParkingFilter from './ParkingFilter.vue';
+import ParkingSummary from './Card/ParkingSummary.vue';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'code':
+            return { [param]: { like: `%${value}%` } };
+        case 'sectorFk':
+            return { [param]: value };
+        case 'search':
+            return { or: [{ code: { like: `%${value}%` } }, { id: value }] };
+    }
+}
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar" />
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ParkingFilter data-key="ParkingList" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="ParkingList"
+                url="Parkings"
+                :filter="filter"
+                :expr-builder="exprBuilder"
+                :limit="20"
+                auto-load
+                order="code"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :id="row.id"
+                        :title="row.code"
+                        @click="router.push({ path: `/parking/${row.id}` })"
+                    >
+                        <template #list-items>
+                            <VnLv label="Sector" :value="row.sector?.description" />
+                            <VnLv
+                                :label="t('parking.list.pickingOrder')"
+                                :value="row.pickingOrder"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, ParkingSummary)"
+                                color="primary"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
diff --git a/src/pages/Shelving/Parking/ParkingMain.vue b/src/pages/Shelving/Parking/ParkingMain.vue
new file mode 100644
index 000000000..66ce78f23
--- /dev/null
+++ b/src/pages/Shelving/Parking/ParkingMain.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 84a26798d..770941b23 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -13,6 +13,7 @@ import Travel from './travel';
 import Order from './order';
 import Department from './department';
 import Entry from './entry';
+import Parking from './parking';
 
 export default [
     Item,
@@ -30,4 +31,5 @@ export default [
     invoiceIn,
     Department,
     Entry,
+    Parking,
 ];
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
new file mode 100644
index 000000000..b6868cc22
--- /dev/null
+++ b/src/router/modules/parking.js
@@ -0,0 +1,63 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/parking',
+    name: 'Parking',
+    meta: {
+        title: 'parking',
+        icon: 'garage_home',
+    },
+    component: RouterView,
+    redirect: { name: 'ParkingMain' },
+    menus: {
+        main: ['ParkingList'],
+        card: ['ParkingBasicData', 'ParkingLog'],
+    },
+    children: [
+        {
+            path: '',
+            name: 'ParkingMain',
+            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
+            redirect: { name: 'ParkingList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'ParkingList',
+                    meta: {
+                        title: 'parkingList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Shelving/Parking/ParkingList.vue'),
+                },
+            ],
+        },
+        {
+            path: ':id',
+            name: 'ParkingCard',
+            component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'),
+            redirect: { name: 'ParkingSummary' },
+            children: [
+                {
+                    name: 'ParkingSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'view_list',
+                    },
+                    component: () =>
+                        import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
+                },
+                {
+                    name: 'ShelvingBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                        roles: ['salesPerson'],
+                    },
+                    component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 494f286c3..92e479f27 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -1,17 +1,17 @@
-import {RouterView} from "vue-router";
+import { RouterView } from 'vue-router';
 
 export default {
     path: '/shelving',
     name: 'Shelving',
     meta: {
         title: 'shelving',
-        icon: 'vn:inventory'
+        icon: 'vn:inventory',
     },
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
-        main: ['ShelvingList'],
-        card: ['ShelvingBasicData', 'ShelvingLog']
+        main: ['ShelvingList', 'ParkingList'],
+        card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
         {
@@ -51,8 +51,7 @@ export default {
                     meta: {
                         title: 'summary',
                     },
-                    component: () =>
-                        import('pages/Shelving/Card/ShelvingSummary.vue'),
+                    component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
                 },
                 {
                     name: 'ShelvingBasicData',
@@ -75,6 +74,14 @@ export default {
                 },
             ],
         },
-    ]
+        {
+            path: 'parking',
+            name: 'ParkingList',
+            meta: {
+                title: 'parkingList',
+                icon: 'view_list',
+            },
+            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
+        },
+    ],
 };
-
diff --git a/src/router/routes.js b/src/router/routes.js
index d1027955f..a8ca03377 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -13,6 +13,7 @@ import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
+import parking from 'src/router/modules/parking';
 
 const routes = [
     {
@@ -67,6 +68,7 @@ const routes = [
             travel,
             department,
             entry,
+            parking,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From ddb6bdeb47e1fdf69dc89e27310a391f757249e4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Feb 2024 11:31:25 +0100
Subject: [PATCH 02/25] fix: refs #5186 parking routes

---
 src/router/modules/parking.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
index b6868cc22..565a9eec6 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -48,14 +48,24 @@ export default {
                         import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
                 },
                 {
-                    name: 'ShelvingBasicData',
+                    name: 'ParkingBasicData',
                     path: 'basic-data',
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
-                    component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
+                    component: () =>
+                        import('pages/Shelving/Parking/Card/ParkingBasicData.vue'),
+                },
+                {
+                    name: 'ParkingLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () =>
+                        import('src/pages/Shelving/Parking/Card/ParkingLog.vue'),
                 },
             ],
         },

From 46bcba99bcb6e085b8696a4ac6b8f7d715979fd1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 09:59:32 +0100
Subject: [PATCH 03/25] fix: refs #5186 margin top

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

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 6368a3e52..4ecefb92d 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -403,7 +403,7 @@ setLogTree();
         auto-load
     />
     <div
-        class="column items-center logs origin-log"
+        class="column items-center logs origin-log q-mt-md"
         v-for="(originLog, originLogIndex) in logTree"
         :key="originLogIndex"
     >

From ebbe38a14e02d5d089cdb2e064a41d6e406f2018 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 11:05:34 +0100
Subject: [PATCH 04/25] fix: refs #5186 parking routes

---
 .../Parking/Card/ParkingBasicData.vue         | 36 ++++++++-----------
 .../Parking/Card/ParkingCard.vue              |  2 +-
 .../Parking/Card/ParkingDescriptor.vue        |  0
 .../Parking/Card/ParkingLog.vue               |  0
 .../Parking/Card/ParkingSummary.vue           |  0
 .../{Shelving => }/Parking/ParkingFilter.vue  |  0
 .../{Shelving => }/Parking/ParkingList.vue    |  0
 src/pages/Shelving/Parking/ParkingMain.vue    | 17 ---------
 src/router/modules/parking.js                 | 34 ++++--------------
 src/router/modules/shelving.js                | 18 +++++-----
 10 files changed, 32 insertions(+), 75 deletions(-)
 rename src/pages/{Shelving => }/Parking/Card/ParkingBasicData.vue (57%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingCard.vue (95%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingDescriptor.vue (100%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingLog.vue (100%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingSummary.vue (100%)
 rename src/pages/{Shelving => }/Parking/ParkingFilter.vue (100%)
 rename src/pages/{Shelving => }/Parking/ParkingList.vue (100%)
 delete mode 100644 src/pages/Shelving/Parking/ParkingMain.vue

diff --git a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
similarity index 57%
rename from src/pages/Shelving/Parking/Card/ParkingBasicData.vue
rename to src/pages/Parking/Card/ParkingBasicData.vue
index e5b886eff..5f3e824e1 100644
--- a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -30,29 +30,23 @@ const filter = {
     <VnSubToolbar />
     <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter">
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.pickingOrder"
-                        :label="t('parking.basicData.pickingOrder')"
-                    />
-                </div>
+            <VnRow>
+                <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
+                <VnInput
+                    v-model="data.pickingOrder"
+                    :label="t('parking.basicData.pickingOrder')"
+                />
             </VnRow>
             <VnRow>
-                <div class="col">
-                    <VnSelectFilter
-                        v-model="data.sectorFk"
-                        option-value="id"
-                        option-label="description"
-                        :label="t('parking.basicData.sector')"
-                        :options="sectors"
-                        use-input
-                        input-debounce="0"
-                    />
-                </div>
+                <VnSelectFilter
+                    v-model="data.sectorFk"
+                    option-value="id"
+                    option-label="description"
+                    :label="t('parking.basicData.sector')"
+                    :options="sectors"
+                    use-input
+                    input-debounce="0"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
similarity index 95%
rename from src/pages/Shelving/Parking/Card/ParkingCard.vue
rename to src/pages/Parking/Card/ParkingCard.vue
index 1dfc51173..74d021fff 100644
--- a/src/pages/Shelving/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'src/composables/useArrayData';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue';
+import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
similarity index 100%
rename from src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
rename to src/pages/Parking/Card/ParkingDescriptor.vue
diff --git a/src/pages/Shelving/Parking/Card/ParkingLog.vue b/src/pages/Parking/Card/ParkingLog.vue
similarity index 100%
rename from src/pages/Shelving/Parking/Card/ParkingLog.vue
rename to src/pages/Parking/Card/ParkingLog.vue
diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
similarity index 100%
rename from src/pages/Shelving/Parking/Card/ParkingSummary.vue
rename to src/pages/Parking/Card/ParkingSummary.vue
diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Parking/ParkingFilter.vue
similarity index 100%
rename from src/pages/Shelving/Parking/ParkingFilter.vue
rename to src/pages/Parking/ParkingFilter.vue
diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
similarity index 100%
rename from src/pages/Shelving/Parking/ParkingList.vue
rename to src/pages/Parking/ParkingList.vue
diff --git a/src/pages/Shelving/Parking/ParkingMain.vue b/src/pages/Shelving/Parking/ParkingMain.vue
deleted file mode 100644
index 66ce78f23..000000000
--- a/src/pages/Shelving/Parking/ParkingMain.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<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/parking.js b/src/router/modules/parking.js
index 565a9eec6..993400f75 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -8,33 +8,16 @@ export default {
         icon: 'garage_home',
     },
     component: RouterView,
-    redirect: { name: 'ParkingMain' },
+    redirect: { name: 'ParkingCard' },
     menus: {
-        main: ['ParkingList'],
+        main: [],
         card: ['ParkingBasicData', 'ParkingLog'],
     },
     children: [
         {
-            path: '',
-            name: 'ParkingMain',
-            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
-            redirect: { name: 'ParkingList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'ParkingList',
-                    meta: {
-                        title: 'parkingList',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Shelving/Parking/ParkingList.vue'),
-                },
-            ],
-        },
-        {
-            path: ':id',
+            path: '/parking/:id',
             name: 'ParkingCard',
-            component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'),
+            component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
             redirect: { name: 'ParkingSummary' },
             children: [
                 {
@@ -44,8 +27,7 @@ export default {
                         title: 'summary',
                         icon: 'view_list',
                     },
-                    component: () =>
-                        import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
+                    component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
                 },
                 {
                     name: 'ParkingBasicData',
@@ -54,8 +36,7 @@ export default {
                         title: 'basicData',
                         icon: 'vn:settings',
                     },
-                    component: () =>
-                        import('pages/Shelving/Parking/Card/ParkingBasicData.vue'),
+                    component: () => import('pages/Parking/Card/ParkingBasicData.vue'),
                 },
                 {
                     name: 'ParkingLog',
@@ -64,8 +45,7 @@ export default {
                         title: 'log',
                         icon: 'history',
                     },
-                    component: () =>
-                        import('src/pages/Shelving/Parking/Card/ParkingLog.vue'),
+                    component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
                 },
             ],
         },
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 92e479f27..af2605c93 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -37,6 +37,15 @@ export default {
                     },
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
+                {
+                    path: '/parking',
+                    name: 'ParkingList',
+                    meta: {
+                        title: 'parkingList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Parking/ParkingList.vue'),
+                },
             ],
         },
         {
@@ -74,14 +83,5 @@ export default {
                 },
             ],
         },
-        {
-            path: 'parking',
-            name: 'ParkingList',
-            meta: {
-                title: 'parkingList',
-                icon: 'view_list',
-            },
-            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
-        },
     ],
 };

From 67d97eef8f03fccdfab8e15163b0e1af7f3ef5e0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 11:19:40 +0100
Subject: [PATCH 05/25] fix: refs #5186 add searchbar

---
 src/pages/Parking/ParkingList.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 4fff9b3cb..0830ef175 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ParkingFilter from './ParkingFilter.vue';
@@ -37,7 +38,13 @@ function exprBuilder(param, value) {
 
 <template>
     <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar" />
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ParkingList"
+                :label="t('Search parking')"
+                :info="t('You can search by code')"
+            />
+        </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
                 <QBtn

From 37985d853bd3d750eaa238b20b320817c1a6cc99 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 11:55:25 +0100
Subject: [PATCH 06/25] fix: refs #5186 add locale

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

diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 0830ef175..1615e99ed 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -42,7 +42,7 @@ function exprBuilder(param, value) {
             <VnSearchbar
                 data-key="ParkingList"
                 :label="t('Search parking')"
-                :info="t('You can search by code')"
+                :info="t('You can search by parking code')"
             />
         </Teleport>
         <Teleport to="#actions-append">
@@ -105,3 +105,8 @@ function exprBuilder(param, value) {
         </div>
     </QPage>
 </template>
+<i18n>
+es:
+    Search parking: Buscar parking
+    You can search by parking code: Puede buscar por el código del parking
+</i18n>

From b5edc987325856f12339e8d4706f192b80ff22db Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 12:12:44 +0100
Subject: [PATCH 07/25] fix: refs #5186 add all fields basic data & summary

---
 src/i18n/en/index.js                        | 4 ++++
 src/i18n/es/index.js                        | 4 ++++
 src/pages/Parking/Card/ParkingBasicData.vue | 8 ++++++--
 src/pages/Parking/Card/ParkingSummary.vue   | 4 +++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 8b514ca89..5dfeb3d6b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -706,11 +706,15 @@ export default {
             code: 'Code',
             pickingOrder: 'Picking order',
             sector: 'Sector',
+            row: 'Row',
+            column: 'Column',
         },
         basicData: {
             code: 'Code',
             pickingOrder: 'Picking order',
             sector: 'Sector',
+            row: 'Row',
+            column: 'Column',
         },
     },
     invoiceIn: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4dcdff1..928965792 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -763,10 +763,14 @@ export default {
         summary: {
             code: 'Código',
             pickingOrder: 'Orden de recogida',
+            row: 'Fila',
+            column: 'Columna',
         },
         basicData: {
             code: 'Código',
             pickingOrder: 'Orden de recogida',
+            row: 'Fila',
+            column: 'Columna',
         },
     },
     invoiceIn: {
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 5f3e824e1..e945f9f93 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -15,7 +15,7 @@ const parkingId = route.params?.id || null;
 const sectors = ref([]);
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder'],
+    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 </script>
@@ -28,7 +28,7 @@ const filter = {
         auto-load
     />
     <VnSubToolbar />
-    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter">
+    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
@@ -37,6 +37,10 @@ const filter = {
                     :label="t('parking.basicData.pickingOrder')"
                 />
             </VnRow>
+            <VnRow>
+                <VnInput v-model="data.row" :label="t('parking.basicData.row')" />
+                <VnInput v-model="data.column" :label="t('parking.basicData.column')" />
+            </VnRow>
             <VnRow>
                 <VnSelectFilter
                     v-model="data.sectorFk"
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index e94fa8d9e..3322ba9ba 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -17,7 +17,7 @@ const { t } = useI18n();
 const entityId = computed(() => $props.id || route.params.id);
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder'],
+    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 </script>
@@ -43,6 +43,8 @@ const filter = {
                         :label="t('parking.summary.sector')"
                         :value="parking.sector?.description"
                     />
+                    <VnLv :label="t('parking.summary.row')" :value="parking.row" />
+                    <VnLv :label="t('parking.summary.column')" :value="parking.column" />
                 </QCard>
             </template>
         </CardSummary>

From 300e384f750ae21b28bb84cbac599f3e2d2ae48b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 8 Mar 2024 10:32:41 +0100
Subject: [PATCH 08/25] feat: refs #5186 add e2e

---
 src/router/modules/shelving.js                |  2 +-
 .../parking/parkingBasicData.spec.js          | 23 ++++++++++++++
 .../integration/parking/parkingList.spec.js   | 31 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/parking/parkingBasicData.spec.js
 create mode 100644 test/cypress/integration/parking/parkingList.spec.js

diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index af2605c93..826629064 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -38,7 +38,7 @@ export default {
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
                 {
-                    path: '/parking',
+                    path: '/parking/list',
                     name: 'ParkingList',
                     meta: {
                         title: 'parkingList',
diff --git a/test/cypress/integration/parking/parkingBasicData.spec.js b/test/cypress/integration/parking/parkingBasicData.spec.js
new file mode 100644
index 000000000..b5633992c
--- /dev/null
+++ b/test/cypress/integration/parking/parkingBasicData.spec.js
@@ -0,0 +1,23 @@
+/// <reference types="cypress" />
+describe('ParkingBasicData', () => {
+    const codeInput = 'form .q-card .q-input input';
+    const sectorSelect = 'form .q-card .q-select input';
+    const sectorOpt = '.q-menu .q-item';
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/parking/1/basic-data`);
+    });
+
+    it('should edit the code and sector', () => {
+        cy.get(sectorSelect).type('Second');
+        cy.get(sectorOpt).click();
+
+        cy.get(codeInput).eq(0).clear();
+        cy.get(codeInput).eq(0).type(123);
+
+        cy.saveCard();
+
+        cy.get(sectorSelect).should('have.value', 'Second sector');
+        cy.get(codeInput).should('have.value', 123);
+    });
+});
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
new file mode 100644
index 000000000..37164dc77
--- /dev/null
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -0,0 +1,31 @@
+/// <reference types="cypress" />
+describe('ParkingList', () => {
+    const firstCard = '.q-card:nth-child(1)';
+    const firstChipId =
+        ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
+    const firstDetailBtn =
+        ':nth-child(1) > :nth-child(1) > .card-list-body > .actions > .q-btn';
+    const summaryHeader = '.summaryBody .header';
+    const screen = '.q-page-container > .q-drawer-container > .fullscreen';
+
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/parking/list`);
+        cy.get(screen).click();
+    });
+
+    it('should redirect on clicking a invoice', () => {
+        cy.get(firstChipId)
+            .invoke('text')
+            .then((content) => {
+                const id = content.substring(4);
+                cy.get(firstCard).click();
+                cy.url().should('include', `/parking/${id}/summary`);
+            });
+    });
+
+    it('should open the details', () => {
+        cy.get(firstDetailBtn).click();
+        cy.get(summaryHeader).contains('Basic data');
+    });
+});

From 37f155aa859e2b426de877c633c61968dc4d2b10 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 11 Mar 2024 10:06:11 +0100
Subject: [PATCH 09/25] fix: refs #5186 css, required files & routes

---
 src/pages/Parking/Card/ParkingBasicData.vue |  1 +
 src/pages/Parking/Card/ParkingSummary.vue   |  7 +++++--
 src/router/modules/shelving.js              | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index e945f9f93..d7d9f4002 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -50,6 +50,7 @@ const filter = {
                     :options="sectors"
                     use-input
                     input-debounce="0"
+                    :is-clearable="false"
                 />
             </VnRow>
         </template>
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index 3322ba9ba..f72fc7d2c 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -29,9 +29,12 @@ const filter = {
             <template #body="{ entity: parking }">
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
-                        <a class="header" :href="`#/parking/${entityId}/basic-data`">
+                        <a
+                            class="header header-link"
+                            :href="`#/parking/${entityId}/basic-data`"
+                        >
                             {{ t('parking.pageTitles.basicData') }}
-                            <QIcon name="open_in_new" color="primary" />
+                            <QIcon name="open_in_new" />
                         </a>
                     </QCardSection>
                     <VnLv :label="t('parking.summary.code')" :value="parking.code" />
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 826629064..8cd7d9a85 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -38,13 +38,19 @@ export default {
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
                 {
-                    path: '/parking/list',
-                    name: 'ParkingList',
-                    meta: {
-                        title: 'parkingList',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Parking/ParkingList.vue'),
+                    path: '/parking',
+                    redirect: { name: 'ParkingList' },
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'ParkingList',
+                            meta: {
+                                title: 'parkingList',
+                                icon: 'view_list',
+                            },
+                            component: () => import('src/pages/Parking/ParkingList.vue'),
+                        },
+                    ],
                 },
             ],
         },

From b44dcdb28af1c42c8eb152e2fc667341efe2a7f6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 11 Mar 2024 15:17:49 +0100
Subject: [PATCH 10/25] fix: refs #5186 tests

---
 src/pages/Parking/Card/ParkingBasicData.vue   |  5 ++--
 .../integration/parking/parkingList.spec.js   |  3 +--
 test/cypress/integration/vnSearchBar.spec.js  | 22 ++++++++---------
 test/cypress/support/commands.js              | 24 ++++++++++---------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index d7d9f4002..72f19a5e7 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -13,16 +13,17 @@ const { t } = useI18n();
 const route = useRoute();
 const parkingId = route.params?.id || null;
 const sectors = ref([]);
+const sectorFilter = { fields: ['id', 'description'] };
 
 const filter = {
     fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+    include: [{ relation: 'sector', scope: sectorFilter }],
 };
 </script>
 <template>
     <FetchData
         url="Sectors"
-        :filter="{ fields: ['id', 'description'] }"
+        :filter="sectorFilter"
         sort-by="description"
         @on-fetch="(data) => (sectors = data)"
         auto-load
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
index 37164dc77..b4e706736 100644
--- a/test/cypress/integration/parking/parkingList.spec.js
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -6,12 +6,11 @@ describe('ParkingList', () => {
     const firstDetailBtn =
         ':nth-child(1) > :nth-child(1) > .card-list-body > .actions > .q-btn';
     const summaryHeader = '.summaryBody .header';
-    const screen = '.q-page-container > .q-drawer-container > .fullscreen';
 
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/parking/list`);
-        cy.get(screen).click();
+        cy.closeSideMenu();
     });
 
     it('should redirect on clicking a invoice', () => {
diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
index d6dea0780..803b111f2 100644
--- a/test/cypress/integration/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -5,15 +5,15 @@ describe('VnSearchBar', () => {
         cy.visit('/');
     });
 
-        it('should redirect to new customer', () => {
-            cy.visit('#/customer/1112/basic-data')
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1112')
-            cy.closeLeftMenu();
-            cy.clearSearchbar();
-            cy.writeSearchbar('1{enter}');
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1')
-            cy.closeLeftMenu();
-        });
+    it('should redirect to new customer', () => {
+        cy.visit('#/customer/1112/basic-data');
+        cy.openLeftMenu();
+        cy.get('.q-item > .q-item__label').should('have.text', ' #1112');
+        cy.closeSideMenu();
+        cy.clearSearchbar();
+        cy.writeSearchbar('1{enter}');
+        cy.openLeftMenu();
+        cy.get('.q-item > .q-item__label').should('have.text', ' #1');
+        cy.closeSideMenu();
+    });
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index f075d500f..544e7e6b5 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -52,16 +52,18 @@ Cypress.Commands.add('getValue', (selector) => {
         }
         // Si es un QSelect
         if ($el.find('.q-select__dropdown-icon').length) {
-            return cy.get(
-                selector +
-                    '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
-            ).invoke('val')
+            return cy
+                .get(
+                    selector +
+                        '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
+                )
+                .invoke('val');
         }
         // Si es un QSelect
         if ($el.find('span').length) {
-            return cy.get(
-                selector + ' span'
-            ).then(($span) => { return $span[0].innerText })
+            return cy.get(selector + ' span').then(($span) => {
+                return $span[0].innerText;
+            });
         }
         // Puedes añadir un log o lanzar un error si el elemento no es reconocido
         cy.log('Elemento no soportado');
@@ -132,13 +134,13 @@ Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
     cy.get(rowSelector).within(() => {
         for (const [index, value] of expectedValues.entries()) {
             cy.log('CHECKING ', index, value);
-            if(value === undefined) continue
+            if (value === undefined) continue;
             if (typeof value == 'boolean') {
                 const prefix = value ? '' : 'not.';
                 cy.getValue(`:nth-child(${index + 1})`).should(`${prefix}be.checked`);
                 continue;
             }
-            cy.getValue(`:nth-child(${index + 1})`).should('equal', value)
+            cy.getValue(`:nth-child(${index + 1})`).should('equal', value);
         }
     });
 });
@@ -174,9 +176,9 @@ Cypress.Commands.add('openLeftMenu', (element) => {
     if (element) cy.waitForElement(element);
     cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
 });
-Cypress.Commands.add('closeLeftMenu', (element) => {
+Cypress.Commands.add('closeSideMenu', (element) => {
     if (element) cy.waitForElement(element);
-    cy.get('.fullscreen').click();
+    cy.get('.fullscreen.q-drawer__backdrop:not(.hidden)').click();
 });
 
 Cypress.Commands.add('clearSearchbar', (element) => {

From 31ac61b01f183a652add0b6e2fdd3cbd7d638fe4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 13 Mar 2024 11:33:10 +0100
Subject: [PATCH 11/25] refactor: #6988 changed ticket summary view and fixed
 notes functionality

---
 src/css/app.scss                        |  2 +-
 src/pages/Ticket/Card/TicketSummary.vue | 64 ++++++++++++++++---------
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 38dd642a3..741dbe332 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -110,4 +110,4 @@ input::-webkit-inner-spin-button {
     appearance: none;
     -webkit-appearance: none;
     -moz-appearance: none;
-}
+}
\ No newline at end of file
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index fbca21086..72bfe4a67 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -130,22 +130,6 @@ async function changeState(value) {
             </QBtnDropdown>
         </template>
         <template #body>
-            <QCard class="vn-max">
-                <div class="taxes">
-                    <VnLv
-                        :label="t('ticket.summary.subtotal')"
-                        :value="toCurrency(ticket.totalWithoutVat)"
-                    />
-                    <VnLv
-                        :label="t('ticket.summary.vat')"
-                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
-                    />
-                    <VnLv
-                        :label="t('ticket.summary.total')"
-                        :value="toCurrency(ticket.totalWithVat)"
-                    />
-                </div>
-            </QCard>
             <QCard class="vn-one">
                 <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
                     {{ t('globals.summary.basicData') }}
@@ -235,7 +219,7 @@ async function changeState(value) {
                     :value="formattedAddress()"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="ticket.notes.length">
                 <a class="header header-link" :href="ticketUrl + 'observation'">
                     {{ t('ticket.pageTitles.notes') }}
                     <QIcon name="open_in_new" />
@@ -254,9 +238,31 @@ async function changeState(value) {
                             class="notes"
                             readonly
                         />
+                        
                     </template>
                 </VnLv>
             </QCard>
+            <QCard class="vn-one ">
+                <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
+                    {{t('Summary')}}
+                    <QIcon name="open_in_new" />
+                </a>
+                <div class="bodyCard">
+                    <VnLv
+                        :label="t('ticket.summary.subtotal')"
+                        :value="toCurrency(ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.vat')"
+                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.total')"
+                        :value="toCurrency(ticket.totalWithVat)"
+                    />
+                </div>
+                    
+            </QCard>
             <QCard class="vn-max">
                 <a class="header header-link" :href="ticketUrl + 'sale'">
                     {{ t('ticket.summary.saleLines') }}
@@ -452,20 +458,32 @@ async function changeState(value) {
     width: max-content;
 }
 .cardSummary .summaryBody > .q-card > .taxes {
-    border: 2px solid gray;
+    margin-right: 90px;
     padding: 0;
-    > .vn-label-value {
-        text-align: right;
+    & > .vn-label-value {
+        text-align: left;
         display: flex;
         flex-direction: row;
         margin-top: 5px;
-        justify-content: flex-end;
-        padding-right: 20px;
+        justify-content: flex-start;
+        padding-left: 10px;
+    }
+}
+
+.q-card.q-card--dark.q-dark.vn-one {
+    & > .bodyCard{
+        padding: 1%;
+        margin-right: 40%;
     }
 }
 
 .cardSummary .summaryBody > .q-card:has(.taxes) {
     margin-top: 2px;
-    padding: 0;
+    padding: 0%;
 }
 </style>
+
+<i18n>
+    es:
+        Summary: Resumen
+</i18n>

From e793b3dd93c58f4cebab2f3226f4392bd15f568f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 13 Mar 2024 15:06:02 +0100
Subject: [PATCH 12/25] feat: refs #5186 use global locales

---
 src/components/LeftMenuItem.vue              | 10 +++++--
 src/components/common/VnBreadcrumbs.vue      | 16 +++++++----
 src/i18n/en/index.js                         | 30 +++++++-------------
 src/i18n/es/index.js                         | 27 ++++++------------
 src/pages/Parking/Card/ParkingBasicData.vue  | 13 ++++-----
 src/pages/Parking/Card/ParkingDescriptor.vue | 12 ++------
 src/pages/Parking/Card/ParkingSummary.vue    | 12 ++++----
 src/pages/Parking/ParkingList.vue            |  2 +-
 8 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 976136394..7e7a7fe72 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 
 const props = defineProps({
     item: {
@@ -11,7 +11,13 @@ const props = defineProps({
     },
 });
 
-const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
+const item = computed(() => {
+    const item = JSON.parse(JSON.stringify(props.item));
+    const [, , section] = item.title.split('.');
+
+    if (!te(item.title)) item.title = t(`globals.pageTitles.${section}`);
+    return item;
+}); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
     <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 666f14c72..5002c5a9a 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -5,16 +5,16 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useCamelCase } from 'src/composables/useCamelCase';
 
-const router = useRouter();
-const quasar = useQuasar();
-const { t } = useI18n();
+const { currentRoute } = useRouter();
+const { screen } = useQuasar();
+const { t, te } = useI18n();
 
 let matched = ref([]);
 let breadcrumbs = ref([]);
 let root = ref(null);
 
 watchEffect(() => {
-    matched.value = router.currentRoute.value.matched.filter(
+    matched.value = currentRoute.value.matched.filter(
         (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
@@ -36,11 +36,15 @@ function getBreadcrumb(param) {
         root: root.value,
     };
 
-    if (quasar.screen.gt.sm) {
+    if (screen.gt.sm) {
         breadcrumb.name = param.name;
         breadcrumb.title = useCamelCase(param.meta.title);
     }
 
+    breadcrumb.locale = te(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
+        ? t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
+        : t(`globals.pageTitles.${breadcrumb.title}`);
+
     return breadcrumb;
 }
 </script>
@@ -50,7 +54,7 @@ function getBreadcrumb(param) {
             v-for="(breadcrumb, index) of breadcrumbs"
             :key="index"
             :icon="breadcrumb.icon"
-            :label="t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)"
+            :label="breadcrumb.locale"
             :to="breadcrumb.path"
         />
     </QBreadcrumbs>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4cbcba102..6096fb404 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -83,6 +83,12 @@ export default {
         selectFile: 'Select a file',
         copyClipboard: 'Copy on clipboard',
         salesPerson: 'SalesPerson',
+        code: 'Code',
+        pageTitles: {
+            summary: 'Summary',
+            basicData: 'Basic data',
+            log: 'Logs',
+        },
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -685,34 +691,18 @@ export default {
         },
     },
     parking: {
+        pickingOrder: 'Picking order',
+        sector: 'Sector',
+        row: 'Row',
+        column: 'Column',
         pageTitles: {
             parking: 'Parking',
             parkingList: 'Parkings list',
-            summary: 'Summary',
-            basicData: 'Basic data',
-            log: 'Logs',
-        },
-        list: {
-            pickingOrder: 'Picking order',
         },
         searchBar: {
             info: 'You can search by parking code',
             label: 'Search parking...',
         },
-        summary: {
-            code: 'Code',
-            pickingOrder: 'Picking order',
-            sector: 'Sector',
-            row: 'Row',
-            column: 'Column',
-        },
-        basicData: {
-            code: 'Code',
-            pickingOrder: 'Picking order',
-            sector: 'Sector',
-            row: 'Row',
-            column: 'Column',
-        },
     },
     invoiceIn: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 02647f581..ab14e0e82 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -83,6 +83,12 @@ export default {
         selectFile: 'Seleccione un fichero',
         copyClipboard: 'Copiar en portapapeles',
         salesPerson: 'Comercial',
+        code: 'Código',
+        pageTitles: {
+            summary: 'Resumen',
+            basicData: 'Datos básicos',
+            log: 'Historial',
+        },
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -743,32 +749,17 @@ export default {
         },
     },
     parking: {
+        pickingOrder: 'Orden de recogida',
+        row: 'Fila',
+        column: 'Columna',
         pageTitles: {
             parking: 'Parking',
             parkingList: 'Listado de parkings',
-            summary: 'Resumen',
-            basicData: 'Datos básicos',
-            log: 'Registros de auditoría',
-        },
-        list: {
-            pickingOrder: 'Orden de recogida',
         },
         searchBar: {
             info: 'Puedes buscar por código de parking',
             label: 'Buscar parking...',
         },
-        summary: {
-            code: 'Código',
-            pickingOrder: 'Orden de recogida',
-            row: 'Fila',
-            column: 'Columna',
-        },
-        basicData: {
-            code: 'Código',
-            pickingOrder: 'Orden de recogida',
-            row: 'Fila',
-            column: 'Columna',
-        },
     },
     invoiceIn: {
         pageTitles: {
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 72f19a5e7..26a1ed8be 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -32,22 +32,19 @@ const filter = {
     <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
         <template #form="{ data }">
             <VnRow>
-                <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
-                <VnInput
-                    v-model="data.pickingOrder"
-                    :label="t('parking.basicData.pickingOrder')"
-                />
+                <VnInput v-model="data.code" :label="t('globals.code')" />
+                <VnInput v-model="data.pickingOrder" :label="t('parking.pickingOrder')" />
             </VnRow>
             <VnRow>
-                <VnInput v-model="data.row" :label="t('parking.basicData.row')" />
-                <VnInput v-model="data.column" :label="t('parking.basicData.column')" />
+                <VnInput v-model="data.row" :label="t('parking.row')" />
+                <VnInput v-model="data.column" :label="t('parking.column')" />
             </VnRow>
             <VnRow>
                 <VnSelectFilter
                     v-model="data.sectorFk"
                     option-value="id"
                     option-label="description"
-                    :label="t('parking.basicData.sector')"
+                    :label="t('parking.sector')"
                     :options="sectors"
                     use-input
                     input-debounce="0"
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index 1805b5af0..e130fbd06 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -38,15 +38,9 @@ const setHeader = (entity) => (header.value = useCardDescription(entity.code, en
         @on-fetch="setHeader"
     >
         <template #body="{ entity: parking }">
-            <VnLv :label="t('parking.summary.code')" :value="parking.code" />
-            <VnLv
-                :label="t('parking.summary.pickingOrder')"
-                :value="parking.pickingOrder"
-            />
-            <VnLv
-                :label="t('parking.summary.sector')"
-                :value="parking.sector?.description"
-            />
+            <VnLv :label="t('globals.code')" :value="parking.code" />
+            <VnLv :label="t('parking.pickingOrder')" :value="parking.pickingOrder" />
+            <VnLv :label="t('parking.sector')" :value="parking.sector?.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index f72fc7d2c..fe733f56c 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -33,21 +33,21 @@ const filter = {
                             class="header header-link"
                             :href="`#/parking/${entityId}/basic-data`"
                         >
-                            {{ t('parking.pageTitles.basicData') }}
+                            {{ t('globals.pageTitles.basicData') }}
                             <QIcon name="open_in_new" />
                         </a>
                     </QCardSection>
-                    <VnLv :label="t('parking.summary.code')" :value="parking.code" />
+                    <VnLv :label="t('globals.code')" :value="parking.code" />
                     <VnLv
-                        :label="t('parking.summary.pickingOrder')"
+                        :label="t('parking.pickingOrder')"
                         :value="parking.pickingOrder"
                     />
                     <VnLv
-                        :label="t('parking.summary.sector')"
+                        :label="t('parking.sector')"
                         :value="parking.sector?.description"
                     />
-                    <VnLv :label="t('parking.summary.row')" :value="parking.row" />
-                    <VnLv :label="t('parking.summary.column')" :value="parking.column" />
+                    <VnLv :label="t('parking.row')" :value="parking.row" />
+                    <VnLv :label="t('parking.column')" :value="parking.column" />
                 </QCard>
             </template>
         </CardSummary>
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 1615e99ed..2a1873d5a 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -88,7 +88,7 @@ function exprBuilder(param, value) {
                         <template #list-items>
                             <VnLv label="Sector" :value="row.sector?.description" />
                             <VnLv
-                                :label="t('parking.list.pickingOrder')"
+                                :label="t('parking.pickingOrder')"
                                 :value="row.pickingOrder"
                             />
                         </template>

From dd91449818231343ab2b804d077a1c87786b1706 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Mar 2024 15:16:50 +0100
Subject: [PATCH 13/25] feat: refs #5186 use global locales

---
 src/components/common/VnBreadcrumbs.vue | 5 +++--
 src/router/index.js                     | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 5002c5a9a..e711b8541 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -41,8 +41,9 @@ function getBreadcrumb(param) {
         breadcrumb.title = useCamelCase(param.meta.title);
     }
 
-    breadcrumb.locale = te(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
-        ? t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
+    const moduleLocale = `${breadcrumb.root}.pageTitles.${breadcrumb.title}`;
+    breadcrumb.locale = te(moduleLocale)
+        ? t(moduleLocale)
         : t(`globals.pageTitles.${breadcrumb.title}`);
 
     return breadcrumb;
diff --git a/src/router/index.js b/src/router/index.js
index ca560e9c9..3e442f0e6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,7 +15,7 @@ import { toLowerCamel } from 'src/filters';
 
 const state = useState();
 const session = useSession();
-const { t } = i18n.global;
+const { t, te } = i18n.global;
 
 const createHistory = process.env.SERVER
     ? createMemoryHistory
@@ -90,7 +90,10 @@ export default route(function (/* { store, ssrContext } */) {
         if (childPageTitle && matches.length > 2) {
             if (title != '') title += ': ';
 
-            const pageTitle = t(`${moduleName}.pageTitles.${childPageTitle}`);
+            const moduleLocale = `${moduleName}.pageTitles.${childPageTitle}`;
+            const pageTitle = te(moduleLocale)
+                ? t(moduleLocale)
+                : t(`globals.pageTitles.${childPageTitle}`);
             const idParam = to.params && to.params.id;
             const idPageTitle = `${idParam} - ${pageTitle}`;
             const builtTitle = idParam ? idPageTitle : pageTitle;

From f86c331afaf408a63f36e29616e0f7e1ee17f07e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 21 Mar 2024 16:38:49 +0100
Subject: [PATCH 14/25] feat: refs #5186 use arrayData in descriptor

---
 src/components/LeftMenuItem.vue              | 21 +++++++++------
 src/components/common/VnBreadcrumbs.vue      |  5 ++--
 src/components/ui/CardDescriptor.vue         | 25 +++++++++--------
 src/pages/Parking/Card/ParkingCard.vue       | 10 ++++---
 src/pages/Parking/Card/ParkingDescriptor.vue | 28 ++++++--------------
 5 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 7e7a7fe72..cf12157e1 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -11,25 +11,30 @@ const props = defineProps({
     },
 });
 
-const item = computed(() => {
+const itemComputed = computed(() => {
     const item = JSON.parse(JSON.stringify(props.item));
     const [, , section] = item.title.split('.');
 
     if (!te(item.title)) item.title = t(`globals.pageTitles.${section}`);
     return item;
-}); // eslint-disable-line vue/no-dupe-keys
+});
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
-        <QItemSection avatar v-if="item.icon">
-            <QIcon :name="item.icon" />
+    <QItem
+        active-class="text-primary"
+        :to="{ name: itemComputed.name }"
+        clickable
+        v-ripple
+    >
+        <QItemSection avatar v-if="itemComputed.icon">
+            <QIcon :name="itemComputed.icon" />
         </QItemSection>
-        <QItemSection avatar v-if="!item.icon">
+        <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>{{ t(item.title) }}</QItemSection>
+        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
         <QItemSection side>
-            <slot name="side" :item="item" />
+            <slot name="side" :item="itemComputed" />
         </QItemSection>
     </QItem>
 </template>
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 82a534cc8..337507233 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -34,6 +34,7 @@ function getBreadcrumb(param) {
         icon: param.meta.icon,
         path: param.path,
         root: root.value,
+        locale: t(`globals.pageTitles.${param.meta.title}`),
     };
 
     if (screen.gt.sm) {
@@ -42,9 +43,7 @@ function getBreadcrumb(param) {
     }
 
     const moduleLocale = `${breadcrumb.root}.pageTitles.${breadcrumb.title}`;
-    breadcrumb.locale = te(moduleLocale)
-        ? t(moduleLocale)
-        : t(`globals.pageTitles.${breadcrumb.title}`);
+    if (te(moduleLocale)) breadcrumb.locale = t(moduleLocale);
 
     return breadcrumb;
 }
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 85e0a7857..4a08daaf5 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, useSlots, watch, computed, ref } from 'vue';
+import { onBeforeMount, useSlots, watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -41,21 +41,24 @@ const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const entity = computed(() => useArrayData($props.dataKey).store.data);
+const { store } = useArrayData($props.dataKey);
+const entity = computed(() => store.data);
 const isLoading = ref(false);
 
 defineExpose({
     getData,
 });
-onMounted(async () => {
-    await getData();
-    watch(
-        () => $props.url,
-        async (newUrl, lastUrl) => {
-            if (newUrl == lastUrl) return;
-            await getData();
-        }
-    );
+onBeforeMount(async () => {
+    if ($props.url) {
+        await getData();
+        watch(
+            () => $props.url,
+            async (newUrl, lastUrl) => {
+                if (newUrl == lastUrl) return;
+                await getData();
+            }
+        );
+    }
 });
 
 async function getData() {
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 74d021fff..1c428591b 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -8,26 +8,28 @@ import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder'],
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 
-const route = useRoute();
 const arrayData = useArrayData('Parking', {
     url: `Parkings/${route.params.id}`,
     filter,
 });
+const { store } = arrayData;
 
 onMounted(async () => await arrayData.fetch({ append: false }));
 watch(
     () => route.params.id,
     async (newId) => {
         if (newId) {
-            arrayData.store.url = `Parkings/${newId}`;
+            store.url = `Parkings/${newId}`;
+            store.filter = filter;
             await arrayData.fetch({ append: false });
         }
     }
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index e130fbd06..5558af360 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { ref, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import useCardDescription from 'composables/useCardDescription';
 
-const props = defineProps({
+defineProps({
     id: {
         type: Number,
         required: false,
@@ -14,28 +13,17 @@ const props = defineProps({
     },
 });
 
-const route = useRoute();
 const { t } = useI18n();
-
-const entityId = computed(() => props.id || route.params.id);
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
-const header = ref(useCardDescription());
-const setHeader = (entity) => (header.value = useCardDescription(entity.code, entity.id));
+const { store } = useArrayData('Parking');
+const card = computed(() => store.data);
 </script>
 
 <template>
     <CardDescriptor
         module="Parking"
-        :url="`Parkings/${entityId}`"
-        :filter="filter"
-        :title="header.title"
-        :subtitle="header.subtitle"
-        data-key="ParkingData"
-        @on-fetch="setHeader"
+        data-key="Parking"
+        :title="card?.code"
+        :subtitle="card?.id"
     >
         <template #body="{ entity: parking }">
             <VnLv :label="t('globals.code')" :value="parking.code" />

From 17145b7fe8d33f12ad06aa4b471a1343b3cb510b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 22 Mar 2024 13:36:31 +0100
Subject: [PATCH 15/25] fix: refs #6988 fix style

---
 src/pages/Ticket/Card/TicketSummary.vue | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index c0c271bfc..93c9fa081 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,10 +243,7 @@ async function changeState(value) {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
-                    {{ t('Summary') }}
-                    <QIcon name="open_in_new" />
-                </a>
+                <VnTitle :text="t('Summary')" />
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
@@ -452,30 +449,12 @@ async function changeState(value) {
 .notes {
     width: max-content;
 }
-.cardSummary .summaryBody > .q-card > .taxes {
-    margin-right: 90px;
-    padding: 0;
-    & > .vn-label-value {
-        text-align: left;
-        display: flex;
-        flex-direction: row;
-        margin-top: 5px;
-        justify-content: flex-start;
-        padding-left: 10px;
-    }
-}
 
 .q-card.q-card--dark.q-dark.vn-one {
     & > .bodyCard {
         padding: 1%;
-        margin-right: 40%;
     }
 }
-
-.cardSummary .summaryBody > .q-card:has(.taxes) {
-    margin-top: 2px;
-    padding: 0%;
-}
 </style>
 
 <i18n>

From d2efbb204ff5d3397c10cc4a54b4daefb05d3c66 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 22 Mar 2024 14:57:36 +0100
Subject: [PATCH 16/25] feat: refs #5186 use arrayData in summary

---
 src/components/ui/CardDescriptor.vue          | 28 ++++++-------
 src/components/ui/CardSummary.vue             | 42 ++++++++++---------
 src/i18n/en/index.js                          |  7 ++--
 src/i18n/es/index.js                          |  7 ++--
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue |  2 +-
 src/pages/Parking/Card/ParkingCard.vue        |  3 +-
 src/pages/Parking/Card/ParkingDescriptor.vue  | 12 +++++-
 src/pages/Parking/Card/ParkingSummary.vue     |  9 ++--
 src/pages/Parking/ParkingList.vue             |  4 +-
 src/router/modules/parking.js                 |  1 +
 .../integration/parking/parkingList.spec.js   |  2 +-
 11 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 4a08daaf5..97aa91728 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -41,7 +41,12 @@ const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const { store } = useArrayData($props.dataKey);
+const arrayData = useArrayData($props.dataKey || $props.module, {
+    url: $props.url,
+    filter: $props.filter,
+    skip: 0,
+});
+const { store } = arrayData;
 const entity = computed(() => store.data);
 const isLoading = ref(false);
 
@@ -49,24 +54,15 @@ defineExpose({
     getData,
 });
 onBeforeMount(async () => {
-    if ($props.url) {
-        await getData();
-        watch(
-            () => $props.url,
-            async (newUrl, lastUrl) => {
-                if (newUrl == lastUrl) return;
-                await getData();
-            }
-        );
-    }
+    await getData();
+    watch(
+        () => $props.url,
+        async () => await getData()
+    );
 });
 
 async function getData() {
-    const arrayData = useArrayData($props.dataKey, {
-        url: $props.url,
-        filter: $props.filter,
-        skip: 0,
-    });
+    store.url = $props.url;
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index f5f61155c..cdf19d492 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -1,11 +1,10 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { ref, computed, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
-import axios from 'axios';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
-const entity = ref();
 const props = defineProps({
     url: {
         type: String,
@@ -19,43 +18,48 @@ const props = defineProps({
         type: Number,
         default: null,
     },
+    dataKey: {
+        type: String,
+        default: '',
+    },
 });
 const emit = defineEmits(['onFetch']);
 const route = useRoute();
 const isSummary = ref();
+const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
+    url: props.url,
+    filter: props.filter,
+    skip: 0,
+});
+const { store } = arrayData;
+const entity = computed(() => store.data);
+const isLoading = ref(false);
 
 defineExpose({
     entity,
     fetch,
 });
 
-onMounted(() => {
+onBeforeMount(async () => {
     isSummary.value = String(route.path).endsWith('/summary');
-    fetch();
+    await fetch();
+    watch(props, async () => await fetch());
 });
 
 async function fetch() {
-    const params = {};
-
-    if (props.filter) params.filter = JSON.stringify(props.filter);
-
-    const { data } = await axios.get(props.url, { params });
-    entity.value = data;
-
+    store.url = props.url;
+    isLoading.value = true;
+    const { data } = await arrayData.fetch({ append: false, updateRouter: false });
     emit('onFetch', data);
+    isLoading.value = false;
 }
-
-watch(props, async () => {
-    entity.value = null;
-    fetch();
-});
 </script>
 
 <template>
     <div class="summary container">
         <QCard class="cardSummary">
-            <SkeletonSummary v-if="!entity" />
-            <template v-if="entity">
+            <SkeletonSummary v-if="!entity || isLoading" />
+            <template v-if="entity && !isLoading">
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 3c54b3f78..c92ceb230 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -90,6 +90,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic data',
             log: 'Logs',
+            parkingList: 'Parkings list',
         },
     },
     errors: {
@@ -672,7 +673,6 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             log: 'Logs',
-            parkingList: 'Parking list',
         },
         list: {
             parking: 'Parking',
@@ -700,7 +700,6 @@ export default {
         column: 'Column',
         pageTitles: {
             parking: 'Parking',
-            parkingList: 'Parkings list',
         },
         searchBar: {
             info: 'You can search by parking code',
@@ -976,7 +975,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
-            stops: 'Stops'
+            stops: 'Stops',
         },
     },
     roadmap: {
@@ -984,7 +983,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
-            stops: 'Stops'
+            stops: 'Stops',
         },
     },
     route: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index a7a49bcd3..47efc4adf 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -90,6 +90,7 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             log: 'Historial',
+            parkingList: 'Listado de parkings',
         },
     },
     errors: {
@@ -730,7 +731,6 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             log: 'Historial',
-            parkingList: 'Listado de parkings',
         },
         list: {
             parking: 'Parking',
@@ -757,7 +757,6 @@ export default {
         column: 'Columna',
         pageTitles: {
             parking: 'Parking',
-            parkingList: 'Listado de parkings',
         },
         searchBar: {
             info: 'Puedes buscar por código de parking',
@@ -975,7 +974,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
-            stops: 'Paradas'
+            stops: 'Paradas',
         },
     },
     roadmap: {
@@ -983,7 +982,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
-            stops: 'Paradas'
+            stops: 'Paradas',
         },
     },
     route: {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index fc15d3bd9..f30552d71 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -199,7 +199,7 @@ function getLink(param) {
 
 <template>
     <CardSummary
-        ref="summary"
+        data-key="InvoiceInSummary"
         :url="`InvoiceIns/${entityId}/summary`"
         @on-fetch="(data) => setData(data)"
     >
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 1c428591b..621680985 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -13,7 +13,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 
 const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 
@@ -22,7 +22,6 @@ const arrayData = useArrayData('Parking', {
     filter,
 });
 const { store } = arrayData;
-
 onMounted(async () => await arrayData.fetch({ append: false }));
 watch(
     () => route.params.id,
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index 5558af360..3ff0a5d17 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -1,11 +1,12 @@
 <script setup>
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 
-defineProps({
+const props = defineProps({
     id: {
         type: Number,
         required: false,
@@ -14,16 +15,23 @@ defineProps({
 });
 
 const { t } = useI18n();
+const { params } = useRoute();
+const entityId = computed(() => props.id || params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
 </script>
-
 <template>
     <CardDescriptor
         module="Parking"
         data-key="Parking"
+        :url="`Parkings/${entityId}`"
         :title="card?.code"
         :subtitle="card?.id"
+        :filter="filter"
     >
         <template #body="{ entity: parking }">
             <VnLv :label="t('globals.code')" :value="parking.code" />
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index fe733f56c..a30705068 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -11,20 +11,19 @@ const $props = defineProps({
         default: 0,
     },
 });
-const route = useRoute();
+const { params } = useRoute();
 const { t } = useI18n();
-
-const entityId = computed(() => $props.id || route.params.id);
+const entityId = computed(() => $props.id || params.id);
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 </script>
 
 <template>
     <div class="q-pa-md">
-        <CardSummary ref="summary" :url="`Parkings/${entityId}`" :filter="filter">
+        <CardSummary :url="`Parkings/${entityId}`" :filter="filter">
             <template #header="{ entity: parking }">{{ parking.code }}</template>
             <template #body="{ entity: parking }">
                 <QCard class="vn-one">
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 2a1873d5a..7bf6cfdab 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -12,7 +12,7 @@ import ParkingFilter from './ParkingFilter.vue';
 import ParkingSummary from './Card/ParkingSummary.vue';
 
 const stateStore = useStateStore();
-const router = useRouter();
+const { push } = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 
@@ -83,7 +83,7 @@ function exprBuilder(param, value) {
                         :key="row.id"
                         :id="row.id"
                         :title="row.code"
-                        @click="router.push({ path: `/parking/${row.id}` })"
+                        @click="push({ path: `/parking/${row.id}` })"
                     >
                         <template #list-items>
                             <VnLv label="Sector" :value="row.sector?.description" />
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
index 993400f75..51ea200c6 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'parking',
         icon: 'garage_home',
+        moduleName: 'Parking',
     },
     component: RouterView,
     redirect: { name: 'ParkingCard' },
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
index b4e706736..3ac46f8cd 100644
--- a/test/cypress/integration/parking/parkingList.spec.js
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -13,7 +13,7 @@ describe('ParkingList', () => {
         cy.closeSideMenu();
     });
 
-    it('should redirect on clicking a invoice', () => {
+    it('should redirect on clicking a parking', () => {
         cy.get(firstChipId)
             .invoke('text')
             .then((content) => {

From 84a25acf22db975eeaae12435952a0b60260bb0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 11:42:29 +0100
Subject: [PATCH 17/25] refactor: refs #6988 used global translations

---
 src/i18n/en/index.js                    | 1 +
 src/i18n/es/index.js                    | 1 +
 src/pages/Ticket/Card/TicketSummary.vue | 7 +------
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a9ce1a6ed..1365d4c17 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -492,6 +492,7 @@ export default {
             request: 'Request',
             weight: 'Weight',
             goTo: 'Go to',
+            summaryAmount: 'Resumen',
         },
     },
     claim: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0977448fb..f5f07f543 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -491,6 +491,7 @@ export default {
             request: 'Petición de compra',
             weight: 'Peso',
             goTo: 'Ir a',
+            summaryAmount: 'Resumen',
         },
     },
     claim: {
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 93c9fa081..5d2b62944 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,7 +243,7 @@ async function changeState(value) {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :text="t('Summary')" />
+                <VnTitle :text="t('ticket.summary.summaryAmount')" />
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
@@ -456,8 +456,3 @@ async function changeState(value) {
     }
 }
 </style>
-
-<i18n>
-    es:
-        Summary: Resumen
-</i18n>

From 3e0f1515703a8deedad200aee1a48dcee17880eb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 12:36:50 +0100
Subject: [PATCH 18/25] refactor: refs #6988 fixed error

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

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1365d4c17..839d768b4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -492,7 +492,7 @@ export default {
             request: 'Request',
             weight: 'Weight',
             goTo: 'Go to',
-            summaryAmount: 'Resumen',
+            summaryAmount: 'Summary',
         },
     },
     claim: {

From b46760116fcfafc7c422e72493e29801a28dd415 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Mar 2024 08:34:15 +0100
Subject: [PATCH 19/25] Merge branch 'dev' of
 https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

---
 src/components/ui/VnSearchbar.vue | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index d86b02166..25560cee0 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,11 +1,9 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useArrayData } from 'composables/useArrayData';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
 
@@ -67,8 +65,7 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
-const route = useRoute();
+const { currentRoute, push } = useRouter();
 const arrayData = useArrayData(props.dataKey, { ...props });
 const store = arrayData.store;
 const searchText = ref('');
@@ -92,18 +89,20 @@ async function search() {
     });
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName) {
-        router.push({
+    if (props.customRouteRedirectName)
+        return push({
             name: props.customRouteRedirectName,
             params: { id: searchText.value },
         });
-        return;
-    }
 
-    const { matched: matches } = route;
-    const { path } = matches[matches.length - 1];
-    const newRoute = path.replace(':id', searchText.value);
-    await router.push(newRoute);
+    const { matched: matches } = currentRoute.value;
+    const { path } = matches.at(-1);
+
+    let targetUrl = path.replace(':id', searchText.value);
+    if (path.endsWith('/list') && store.data.length === 1)
+        targetUrl = targetUrl.replace('/list', `/${store.data[0].id}/summary`);
+
+    await push(targetUrl);
 }
 </script>
 

From 1ec54d7664b7e3c9c068010a58af3d9d10b4e8ff Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 26 Mar 2024 08:55:01 +0100
Subject: [PATCH 20/25] feat: #6514 create supplierDms lilium

---
 src/i18n/en/index.js                    |  1 +
 src/i18n/es/index.js                    |  1 +
 src/pages/Supplier/Card/SupplierDms.vue | 11 +++++++++++
 src/router/modules/Supplier.js          | 10 ++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 src/pages/Supplier/Card/SupplierDms.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a0dea0555..e2c3e9547 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1014,6 +1014,7 @@ export default {
             addresses: 'Addresses',
             consumption: 'Consumption',
             agencyTerm: 'Agency agreement',
+            dms: 'File management',
         },
         list: {
             payMethod: 'Pay method',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index be16bc2f8..8f28bc984 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1014,6 +1014,7 @@ export default {
             addresses: 'Direcciones',
             consumption: 'Consumo',
             agencyTerm: 'Acuerdo agencia',
+            dms: 'Gestión documental',
         },
         list: {
             payMethod: 'Método de pago',
diff --git a/src/pages/Supplier/Card/SupplierDms.vue b/src/pages/Supplier/Card/SupplierDms.vue
new file mode 100644
index 000000000..2848f858d
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierDms.vue
@@ -0,0 +1,11 @@
+<script setup>
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+</script>
+<template>
+    <VnDmsList
+        model="SupplierDms"
+        update-model="SupplierDms"
+        default-dms-code="supplier"
+        filter="supplierFk"
+    />
+</template>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 379a2c2c2..64c48146b 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -22,6 +22,7 @@ export default {
             'SupplierAddresses',
             'SupplierConsumption',
             'SupplierAgencyTerm',
+            'SupplierDms',
         ],
     },
     children: [
@@ -161,6 +162,15 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAgencyTerm.vue'),
                 },
+                {
+                    path: 'dms',
+                    name: 'SupplierDms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'smb_share',
+                    },
+                    component: () => import('src/pages/Supplier/Card/SupplierDms.vue'),
+                },
                 {
                     path: 'agency-term/create',
                     name: 'SupplierAgencyTermCreate',

From a0dcd6aee165a70e5412e7341c2ee6dd46dd1da0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Mar 2024 09:11:53 +0100
Subject: [PATCH 21/25] feat: refs #6893 replace id & redirect to Card or list

---
 src/components/ui/VnSearchbar.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 25560cee0..34da7cbf5 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -97,12 +97,18 @@ async function search() {
 
     const { matched: matches } = currentRoute.value;
     const { path } = matches.at(-1);
+    const [, moduleName] = path.split('/');
 
-    let targetUrl = path.replace(':id', searchText.value);
-    if (path.endsWith('/list') && store.data.length === 1)
-        targetUrl = targetUrl.replace('/list', `/${store.data[0].id}/summary`);
+    if (!store.data.length || store.data.length > 1)
+        return push({ path: `/${moduleName}/list` });
 
-    await push(targetUrl);
+    const targetId = store.data[0].id;
+    let targetUrl;
+
+    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
+    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
+
+    await push({ path: targetUrl });
 }
 </script>
 

From 20102a89abbe03649e617d180255276e5519b434 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Mar 2024 11:14:54 +0100
Subject: [PATCH 22/25] feat: refs #6893 improve VnSearchbar & create tests

---
 CHANGELOG.md                                  |  3 ++
 src/components/ui/VnSearchbar.vue             | 12 ++---
 test/cypress/integration/vnSearchBar.spec.js  | 45 ++++++++++++++-----
 .../components/common/VnSearchBar.spec.js     | 43 +++++++++++-------
 4 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51dd2010c..d15ad787d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Tickets) => Se añade la opción de clonar ticket. #6951
+-   (Parking) => Se añade la sección Parking. #5186
 
 ### Changed
 
 ### Fixed
 
+-   (General) => Se corrige la redirección cuando hay 1 solo registro y cuando se aplica un filtro diferente al id al hacer una búsqueda general. #6893
+
 ## [2400.01] - 2024-01-04
 
 ### Added
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 34da7cbf5..ddf520d0f 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -65,9 +65,9 @@ const props = defineProps({
     },
 });
 
-const { currentRoute, push } = useRouter();
+const router = useRouter();
 const arrayData = useArrayData(props.dataKey, { ...props });
-const store = arrayData.store;
+const { store } = arrayData;
 const searchText = ref('');
 
 onMounted(() => {
@@ -90,17 +90,17 @@ async function search() {
     if (!props.redirect) return;
 
     if (props.customRouteRedirectName)
-        return push({
+        return router.push({
             name: props.customRouteRedirectName,
             params: { id: searchText.value },
         });
 
-    const { matched: matches } = currentRoute.value;
+    const { matched: matches } = router.currentRoute.value;
     const { path } = matches.at(-1);
     const [, moduleName] = path.split('/');
 
     if (!store.data.length || store.data.length > 1)
-        return push({ path: `/${moduleName}/list` });
+        return router.push({ path: `/${moduleName}/list` });
 
     const targetId = store.data[0].id;
     let targetUrl;
@@ -108,7 +108,7 @@ async function search() {
     if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
     else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
 
-    await push({ path: targetUrl });
+    await router.push({ path: targetUrl });
 }
 </script>
 
diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
index d6dea0780..3db789773 100644
--- a/test/cypress/integration/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -1,19 +1,42 @@
 /// <reference types="cypress" />
 describe('VnSearchBar', () => {
+    const employeeId = ' #1';
+    const salesPersonId = ' #18';
+    const idGap = '.q-item > .q-item__label';
+    const cardList = '.vn-card-list';
+
+    let url;
     beforeEach(() => {
         cy.login('developer');
-        cy.visit('/');
+        cy.visit('#/customer/list');
+        cy.url().then((currentUrl) => (url = currentUrl));
     });
 
-        it('should redirect to new customer', () => {
-            cy.visit('#/customer/1112/basic-data')
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1112')
-            cy.closeLeftMenu();
-            cy.clearSearchbar();
-            cy.writeSearchbar('1{enter}');
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1')
-            cy.closeLeftMenu();
+    it('should redirect to customer summary page', () => {
+        searchAndCheck('1', employeeId);
+        searchAndCheck('salesPerson', salesPersonId);
+    });
+
+    it('should stay on the list page if there are several results or none', () => {
+        cy.writeSearchbar('salesA{enter}');
+        checkCardListAndUrl(2);
+
+        cy.clearSearchbar();
+
+        cy.writeSearchbar('0{enter}');
+        checkCardListAndUrl(0);
+    });
+
+    const searchAndCheck = (searchTerm, expectedText) => {
+        cy.clearSearchbar();
+        cy.writeSearchbar(`${searchTerm}{enter}`);
+        cy.get(idGap).should('have.text', expectedText);
+    };
+
+    const checkCardListAndUrl = (expectedLength) => {
+        cy.get(cardList).then(($cardList) => {
+            expect($cardList.find('.q-card').length).to.equal(expectedLength);
+            cy.url().then((currentUrl) => expect(currentUrl).to.equal(url));
         });
+    };
 });
diff --git a/test/vitest/__tests__/components/common/VnSearchBar.spec.js b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
index fd0a026ef..0938ae9c0 100644
--- a/test/vitest/__tests__/components/common/VnSearchBar.spec.js
+++ b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
@@ -1,11 +1,11 @@
-import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-
-
+// Probar a importar como plugin vue-router en archivo helper
 describe('VnSearchBar', () => {
     let vm;
     let wrapper;
+    let pushSpy;
 
     beforeAll(() => {
         wrapper = createWrapper(VnSearchbar, {
@@ -16,7 +16,7 @@ describe('VnSearchBar', () => {
             },
         });
         vm = wrapper.vm;
-        vm.route.matched = [
+        vm.router.currentRoute.value.matched = [
             {
                 path: '/',
             },
@@ -30,24 +30,33 @@ describe('VnSearchBar', () => {
                 path: '/customer/:id/basic-data',
             },
         ];
+
+        pushSpy = vi.spyOn(vm.router, 'push');
+        vi.spyOn(vm.arrayData, 'applyFilter');
     });
 
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
+    beforeEach(() => (vm.store.data = [{ id: 1112, name: 'Trash' }]));
+    afterEach(() => vi.clearAllMocks());
+
     it('should be defined', async () => {
         expect(vm.searchText).toBeDefined();
         expect(vm.searchText).toEqual('');
     });
-    it('should redirect', async () => {
-        vi.spyOn(vm.router,'push');
-        vm.searchText = '1';
+
+    it('should redirect to list page if there are several results', async () => {
+        vm.store.data.push({ id: 1, name: 'employee' });
         await vm.search();
-        expect(vm.router.push).toHaveBeenCalledWith('/customer/1/basic-data');
-        vm.searchText = '1112';
-        expect(vm.searchText).toEqual('1112');
-        vi.spyOn(vm.router,'push');
+        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
+    });
+
+    it('should redirect to list page if there is no results', async () => {
+        vm.store.data.pop();
         await vm.search();
-        expect(vm.router.push).toHaveBeenCalledWith('/customer/1112/basic-data');
-     });
+        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
+    });
+
+    it('should redirect to basic-data page if there is only one result', async () => {
+        await vm.search();
+        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/1112/basic-data' });
+    });
 });

From da93b9cca84110ed741be04de609d6509616be98 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 28 Mar 2024 07:20:54 +0100
Subject: [PATCH 23/25] updates

---
 src/composables/usePrintService.js      | 4 ++--
 src/pages/InvoiceOut/InvoiceOutList.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index 110e4d864..edf9598b2 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -4,7 +4,7 @@ import { useQuasar } from 'quasar';
 
 export function usePrintService() {
     const quasar = useQuasar();
-    const { getToken } = useSession();
+    const { getTokenMultimedia } = useSession();
 
     function sendEmail(path, params) {
         return axios.post(path, params).then(() =>
@@ -19,7 +19,7 @@ export function usePrintService() {
     function openReport(path, params) {
         params = Object.assign(
             {
-                access_token: getToken(),
+                access_token: getTokenMultimedia(),
             },
             params
         );
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 266dac26e..c77502af5 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -22,7 +22,7 @@ const { t } = useI18n();
 const router = useRouter();
 const stateStore = useStateStore();
 const session = useSession();
-const token = session.getToken();
+const tokenMultimedia = session.getTokenMultimedia();
 const { viewSummary } = useSummaryDialog();
 
 const manualInvoiceDialogRef = ref(null);
@@ -66,7 +66,7 @@ const openPdf = () => {
 
         if (selectedCards.value.size === 1) {
             const [invoiceOut] = selectedCardsArray;
-            const url = `api/InvoiceOuts/${invoiceOut.id}/download?access_token=${token}`;
+            const url = `api/InvoiceOuts/${invoiceOut.id}/download?access_token=${tokenMultimedia}`;
             window.open(url, '_blank');
         } else {
             const invoiceOutIdsArray = selectedCardsArray.map(
@@ -75,7 +75,7 @@ const openPdf = () => {
             const invoiceOutIds = invoiceOutIdsArray.join(',');
 
             const params = new URLSearchParams({
-                access_token: token,
+                access_token: tokenMultimedia,
                 ids: invoiceOutIds,
             });
 

From b2691a35e113660c66562f054dd5ffef64953dc3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 28 Mar 2024 08:31:56 +0100
Subject: [PATCH 24/25] refactor: refs #6514 fixed tranlation

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

diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index 08255f8a5..bf3f4d384 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -198,9 +198,11 @@ function addDefaultData(data) {
 en:
     contentTypesInfo: Allowed file types {allowedContentTypes}
     EntryDmsDescription: Reference {reference}
+    SupplierDmsDescription: Reference {reference}
 es:
     Generate identifier for original file: Generar identificador para archivo original
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     EntryDmsDescription: Referencia {reference}
+    SupplierDmsDescription: Referencia {reference}
 
 </i18n>

From 87825daa8e2be8fcf0e1afc02a6728aaea44c2fc Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 28 Mar 2024 09:23:12 +0100
Subject: [PATCH 25/25] refs #7152 deploy: init version 24.16

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d15ad787d..555b4f0ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2416.01] - 2024-04-18
+
+### Added
+
 ## [2414.01] - 2024-04-04
 
 ### Added
diff --git a/package.json b/package.json
index a35020b66..82f21efe6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.14.0",
+    "version": "24.16.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",