Merge branch 'dev' into 7130-addFieldInRoutes

CHANGELOG.md

@@ -5,11 +5,16 @@ 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
 
 -   (Tickets) => Se añade la opción de clonar ticket. #6951
+-   (Parking) => Se añade la sección Parking. #5186
 
 -   (Rutas) => Se añade el campo "servida" a la tabla y se añade también a los filtros. #7130
 
@@ -17,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.14.0",
+    "version": "24.16.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

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,19 +11,30 @@ const props = defineProps({
     },
 });
 
-const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
+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;
+});
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
+    <QItem
-        <QItemSection avatar v-if="item.icon">
+        active-class="text-primary"
-            <QIcon :name="item.icon" />
+        :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>

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 { currentRoute } = useRouter();
-const quasar = useQuasar();
+const { screen } = useQuasar();
-const { t } = useI18n();
+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;
@@ -34,13 +34,17 @@ function getBreadcrumb(param) {
         icon: param.meta.icon,
         path: param.path,
         root: root.value,
+        locale: t(`globals.pageTitles.${param.meta.title}`),
     };
 
-    if (quasar.screen.gt.sm) {
+    if (screen.gt.sm) {
         breadcrumb.name = param.name;
         breadcrumb.title = useCamelCase(param.meta.title);
     }
 
+    const moduleLocale = `${breadcrumb.root}.pageTitles.${breadcrumb.title}`;
+    if (te(moduleLocale)) breadcrumb.locale = t(moduleLocale);
+
     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>

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>

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"
     >

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,29 +41,28 @@ const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const entity = computed(() => useArrayData($props.dataKey).store.data);
+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);
 
 defineExpose({
     getData,
 });
-onMounted(async () => {
+onBeforeMount(async () => {
     await getData();
     watch(
         () => $props.url,
-        async (newUrl, lastUrl) => {
+        async () => await getData()
-            if (newUrl == lastUrl) return;
-            await getData();
-        }
     );
 });
 
 async function getData() {
-    const arrayData = useArrayData($props.dataKey, {
+    store.url = $props.url;
-        url: $props.url,
-        filter: $props.filter,
-        skip: 0,
-    });
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });

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 = {};
+    store.url = props.url;
-
+    isLoading.value = true;
-    if (props.filter) params.filter = JSON.stringify(props.filter);
+    const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-
-    const { data } = await axios.get(props.url, { params });
-    entity.value = data;
-
     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" />
+            <SkeletonSummary v-if="!entity || isLoading" />
-            <template v-if="entity">
+            <template v-if="entity && !isLoading">
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link

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();
 
@@ -68,9 +66,8 @@ const props = defineProps({
 });
 
 const router = useRouter();
-const route = useRoute();
 const arrayData = useArrayData(props.dataKey, { ...props });
-const store = arrayData.store;
+const { store } = arrayData;
 const searchText = ref('');
 
 onMounted(() => {
@@ -92,18 +89,26 @@ async function search() {
     });
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName) {
+    if (props.customRouteRedirectName)
-        router.push({
+        return router.push({
             name: props.customRouteRedirectName,
             params: { id: searchText.value },
         });
-        return;
-    }
 
-    const { matched: matches } = route;
+    const { matched: matches } = router.currentRoute.value;
-    const { path } = matches[matches.length - 1];
+    const { path } = matches.at(-1);
-    const newRoute = path.replace(':id', searchText.value);
+    const [, moduleName] = path.split('/');
-    await router.push(newRoute);
+
+    if (!store.data.length || store.data.length > 1)
+        return router.push({ path: `/${moduleName}/list` });
+
+    const targetId = store.data[0].id;
+    let targetUrl;
+
+    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
+    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
+
+    await router.push({ path: targetUrl });
 }
 </script>
 

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
         );

src/i18n/en/index.js

@@ -85,6 +85,13 @@ export default {
         selectFile: 'Select a file',
         copyClipboard: 'Copy on clipboard',
         salesPerson: 'SalesPerson',
+        code: 'Code',
+        pageTitles: {
+            summary: 'Summary',
+            basicData: 'Basic data',
+            log: 'Logs',
+            parkingList: 'Parkings list',
+        },
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -492,6 +499,7 @@ export default {
             request: 'Request',
             weight: 'Weight',
             goTo: 'Go to',
+            summaryAmount: 'Summary',
         },
     },
     claim: {
@@ -686,6 +694,19 @@ export default {
             recyclable: 'Recyclable',
         },
     },
+    parking: {
+        pickingOrder: 'Picking order',
+        sector: 'Sector',
+        row: 'Row',
+        column: 'Column',
+        pageTitles: {
+            parking: 'Parking',
+        },
+        searchBar: {
+            info: 'You can search by parking code',
+            label: 'Search parking...',
+        },
+    },
     invoiceIn: {
         pageTitles: {
             invoiceIns: 'Invoices In',
@@ -1018,6 +1039,7 @@ export default {
             addresses: 'Addresses',
             consumption: 'Consumption',
             agencyTerm: 'Agency agreement',
+            dms: 'File management',
         },
         list: {
             payMethod: 'Pay method',

src/i18n/es/index.js

@@ -85,6 +85,13 @@ export default {
         selectFile: 'Seleccione un fichero',
         copyClipboard: 'Copiar en portapapeles',
         salesPerson: 'Comercial',
+        code: 'Código',
+        pageTitles: {
+            summary: 'Resumen',
+            basicData: 'Datos básicos',
+            log: 'Historial',
+            parkingList: 'Listado de parkings',
+        },
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -491,6 +498,7 @@ export default {
             request: 'Petición de compra',
             weight: 'Peso',
             goTo: 'Ir a',
+            summaryAmount: 'Resumen',
         },
     },
     claim: {
@@ -744,6 +752,18 @@ export default {
             recyclable: 'Reciclable',
         },
     },
+    parking: {
+        pickingOrder: 'Orden de recogida',
+        row: 'Fila',
+        column: 'Columna',
+        pageTitles: {
+            parking: 'Parking',
+        },
+        searchBar: {
+            info: 'Puedes buscar por código de parking',
+            label: 'Buscar parking...',
+        },
+    },
     invoiceIn: {
         pageTitles: {
             invoiceIns: 'Fact. recibidas',
@@ -1018,6 +1038,7 @@ export default {
             addresses: 'Direcciones',
             consumption: 'Consumo',
             agencyTerm: 'Acuerdo agencia',
+            dms: 'Gestión documental',
         },
         list: {
             payMethod: 'Método de pago',

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)"
     >

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,
             });
 

src/pages/Parking/Card/ParkingBasicData.vue

@@ -0,0 +1,56 @@
+<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 sectorFilter = { fields: ['id', 'description'] };
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: sectorFilter }],
+};
+</script>
+<template>
+    <FetchData
+        url="Sectors"
+        :filter="sectorFilter"
+        sort-by="description"
+        @on-fetch="(data) => (sectors = data)"
+        auto-load
+    />
+    <VnSubToolbar />
+    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
+        <template #form="{ data }">
+            <VnRow>
+                <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.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.sector')"
+                    :options="sectors"
+                    use-input
+                    input-debounce="0"
+                    :is-clearable="false"
+                />
+            </VnRow>
+        </template>
+    </FormModel>
+</template>

src/pages/Parking/Card/ParkingCard.vue

@@ -0,0 +1,57 @@
+<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/Parking/Card/ParkingDescriptor.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+
+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) {
+            store.url = `Parkings/${newId}`;
+            store.filter = filter;
+            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>

src/pages/Parking/Card/ParkingDescriptor.vue

@@ -0,0 +1,42 @@
+<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';
+
+const props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+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" />
+            <VnLv :label="t('parking.pickingOrder')" :value="parking.pickingOrder" />
+            <VnLv :label="t('parking.sector')" :value="parking.sector?.description" />
+        </template>
+    </CardDescriptor>
+</template>

src/pages/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>

src/pages/Parking/Card/ParkingSummary.vue

@@ -0,0 +1,54 @@
+<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 { params } = useRoute();
+const { t } = useI18n();
+const entityId = computed(() => $props.id || params.id);
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+
+<template>
+    <div class="q-pa-md">
+        <CardSummary :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 header-link"
+                            :href="`#/parking/${entityId}/basic-data`"
+                        >
+                            {{ t('globals.pageTitles.basicData') }}
+                            <QIcon name="open_in_new" />
+                        </a>
+                    </QCardSection>
+                    <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"
+                    />
+                    <VnLv :label="t('parking.row')" :value="parking.row" />
+                    <VnLv :label="t('parking.column')" :value="parking.column" />
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>

src/pages/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>

src/pages/Parking/ParkingList.vue

@@ -0,0 +1,112 @@
+<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 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';
+import ParkingSummary from './Card/ParkingSummary.vue';
+
+const stateStore = useStateStore();
+const { push } = 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">
+            <VnSearchbar
+                data-key="ParkingList"
+                :label="t('Search parking')"
+                :info="t('You can search by parking code')"
+            />
+        </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <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="push({ path: `/parking/${row.id}` })"
+                    >
+                        <template #list-items>
+                            <VnLv label="Sector" :value="row.sector?.description" />
+                            <VnLv
+                                :label="t('parking.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>
+<i18n>
+es:
+    Search parking: Buscar parking
+    You can search by parking code: Puede buscar por el código del parking
+</i18n>

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>

src/pages/Ticket/Card/TicketSummary.vue

@@ -131,22 +131,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">
                 <VnTitle
                     :url="ticketUrl + 'basic-data/step-one'"
@@ -236,7 +220,7 @@ async function changeState(value) {
                     :value="formattedAddress()"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="ticket.notes.length">
                 <VnTitle
                     :url="ticketUrl + 'observation'"
                     :text="t('ticket.pageTitles.notes')"
@@ -258,6 +242,23 @@ async function changeState(value) {
                     </template>
                 </VnLv>
             </QCard>
+            <QCard class="vn-one">
+                <VnTitle :text="t('ticket.summary.summaryAmount')" />
+                <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">
                 <VnTitle
                     :url="ticketUrl + 'sale'"
@@ -448,21 +449,10 @@ async function changeState(value) {
 .notes {
     width: max-content;
 }
-.cardSummary .summaryBody > .q-card > .taxes {
+
-    border: 2px solid gray;
+.q-card.q-card--dark.q-dark.vn-one {
-    padding: 0;
+    & > .bodyCard {
-    > .vn-label-value {
+        padding: 1%;
-        text-align: right;
-        display: flex;
-        flex-direction: row;
-        margin-top: 5px;
-        justify-content: flex-end;
-        padding-right: 20px;
     }
 }
-
-.cardSummary .summaryBody > .q-card:has(.taxes) {
-    margin-top: 2px;
-    padding: 0;
-}
 </style>

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;

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',

src/router/modules/index.js

@@ -13,7 +13,8 @@ import Travel from './travel';
 import Order from './order';
 import Department from './department';
 import Entry from './entry';
-import roadmap from "./roadmap";
+import roadmap from './roadmap';
+import Parking from './parking';
 
 export default [
     Item,
@@ -31,5 +32,6 @@ export default [
     invoiceIn,
     Department,
     Entry,
-    roadmap
+    roadmap,
+    Parking,
 ];

src/router/modules/parking.js

@@ -0,0 +1,54 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/parking',
+    name: 'Parking',
+    meta: {
+        title: 'parking',
+        icon: 'garage_home',
+        moduleName: 'Parking',
+    },
+    component: RouterView,
+    redirect: { name: 'ParkingCard' },
+    menus: {
+        main: [],
+        card: ['ParkingBasicData', 'ParkingLog'],
+    },
+    children: [
+        {
+            path: '/parking/:id',
+            name: 'ParkingCard',
+            component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
+            redirect: { name: 'ParkingSummary' },
+            children: [
+                {
+                    name: 'ParkingSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
+                },
+                {
+                    name: 'ParkingBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('pages/Parking/Card/ParkingBasicData.vue'),
+                },
+                {
+                    name: 'ParkingLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
+                },
+            ],
+        },
+    ],
+};

src/router/modules/shelving.js

@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
-        main: ['ShelvingList'],
+        main: ['ShelvingList', 'ParkingList'],
         card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
@@ -38,6 +38,21 @@ export default {
                     },
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
+                {
+                    path: '/parking',
+                    redirect: { name: 'ParkingList' },
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'ParkingList',
+                            meta: {
+                                title: 'parkingList',
+                                icon: 'view_list',
+                            },
+                            component: () => import('src/pages/Parking/ParkingList.vue'),
+                        },
+                    ],
+                },
             ],
         },
         {

src/router/routes.js

@@ -13,7 +13,8 @@ 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 roadmap from "src/router/modules/roadmap";
+import roadmap from 'src/router/modules/roadmap';
+import parking from 'src/router/modules/parking';
 
 const routes = [
     {
@@ -69,6 +70,7 @@ const routes = [
             department,
             roadmap,
             entry,
+            parking,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

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);
+    });
+});

test/cypress/integration/parking/parkingList.spec.js

@@ -0,0 +1,30 @@
+/// <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';
+
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/parking/list`);
+        cy.closeSideMenu();
+    });
+
+    it('should redirect on clicking a parking', () => {
+        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');
+    });
+});

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', () => {
+    it('should redirect to customer summary page', () => {
-            cy.visit('#/customer/1112/basic-data')
+        searchAndCheck('1', employeeId);
-            cy.openLeftMenu();
+        searchAndCheck('salesPerson', salesPersonId);
-            cy.get('.q-item > .q-item__label').should('have.text',' #1112')
+    });
-            cy.closeLeftMenu();
+
-            cy.clearSearchbar();
+    it('should stay on the list page if there are several results or none', () => {
-            cy.writeSearchbar('1{enter}');
+        cy.writeSearchbar('salesA{enter}');
-            cy.openLeftMenu();
+        checkCardListAndUrl(2);
-            cy.get('.q-item > .q-item__label').should('have.text',' #1')
+
-            cy.closeLeftMenu();
+        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));
         });
+    };
 });

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(
+            return cy
-                selector +
+                .get(
-                    '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
+                    selector +
-            ).invoke('val')
+                        '> .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(
+            return cy.get(selector + ' span').then(($span) => {
-                selector + ' span'
+                return $span[0].innerText;
-            ).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) => {

test/vitest/__tests__/components/common/VnSearchBar.spec.js

@@ -1,11 +1,11 @@
-import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+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(() => {
+    beforeEach(() => (vm.store.data = [{ id: 1112, name: 'Trash' }]));
-        vi.clearAllMocks();
+    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');
+    it('should redirect to list page if there are several results', async () => {
-        vm.searchText = '1';
+        vm.store.data.push({ id: 1, name: 'employee' });
         await vm.search();
-        expect(vm.router.push).toHaveBeenCalledWith('/customer/1/basic-data');
+        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
-        vm.searchText = '1112';
+    });
-        expect(vm.searchText).toEqual('1112');
+
-        vi.spyOn(vm.router,'push');
+    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' });
+    });
 });