Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta

.eslintrc.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
     // This option interrupts the configuration hierarchy at this file
     // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
@@ -58,7 +58,7 @@ module.exports = {
     rules: {
         'prefer-promise-reject-errors': 'off',
         'no-unused-vars': 'warn',
-        "vue/no-multiple-template-root": "off" ,
+        'vue/no-multiple-template-root': 'off',
         // allow debugger during development only
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     },

.gitignore

@@ -29,5 +29,5 @@ yarn-error.log*
 *.sln
 
 # Cypress directories and files
-/tests/cypress/videos
+/test/cypress/videos
-/tests/cypress/screenshots
+/test/cypress/screenshots

.husky/addReferenceTag.js

@@ -1,23 +1,24 @@
-const fs = require('fs');
+import { existsSync, readFileSync, writeFileSync } from 'fs';
-const path = require('path');
+import { join, resolve } from 'path';
 
 function getCurrentBranchName(p = process.cwd()) {
-    if (!fs.existsSync(p)) return false;
+    if (!existsSync(p)) return false;
 
-    const gitHeadPath = path.join(p, '.git', 'HEAD');
+    const gitHeadPath = join(p, '.git', 'HEAD');
 
-    if (!fs.existsSync(gitHeadPath))
+    if (!existsSync(gitHeadPath)) {
-        return getCurrentBranchName(path.resolve(p, '..'));
+        return getCurrentBranchName(resolve(p, '..'));
+    }
 
-    const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
+    const headContent = readFileSync(gitHeadPath, 'utf-8');
     return headContent.trim().split('/')[2];
 }
 
 const branchName = getCurrentBranchName();
 
 if (branchName) {
-    const msgPath = `.git/COMMIT_EDITMSG`;
+    const msgPath = '.git/COMMIT_EDITMSG';
-    const msg = fs.readFileSync(msgPath, 'utf-8');
+    const msg = readFileSync(msgPath, 'utf-8');
     const reference = branchName.match(/^\d+/);
 
     const referenceTag = `refs #${reference}`;
@@ -26,8 +27,7 @@ if (branchName) {
 
         if (splitedMsg.length > 1) {
             const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
-            fs.writeFileSync(msgPath, finalMsg);
+            writeFileSync(msgPath, finalMsg);
         }
     }
 }
-

.prettierrc.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     singleQuote: true,
     printWidth: 90,
     tabWidth: 4,

commitlint.config.js

@@ -1 +1 @@
-module.exports = { extends: ['@commitlint/config-conventional'] };
+export default { extends: ['@commitlint/config-conventional'] };

cypress.config.js

@@ -1,9 +1,9 @@
-const { defineConfig } = require('cypress');
+import { defineConfig } from 'cypress';
 // https://docs.cypress.io/app/tooling/reporters
 // https://docs.cypress.io/app/references/configuration
 // https://www.npmjs.com/package/cypress-mochawesome-reporter
 
-module.exports = defineConfig({
+export default defineConfig({
     e2e: {
         baseUrl: 'http://localhost:9000/',
         experimentalStudio: true,
@@ -31,8 +31,10 @@ module.exports = defineConfig({
             supportFile: 'test/cypress/support/unit.js',
         },
         setupNodeEvents(on, config) {
-            require('cypress-mochawesome-reporter/plugin')(on);
+            import('cypress-mochawesome-reporter/plugin').then((plugin) => plugin.default(on));
             // implement node event listeners here
         },
+        viewportWidth: 1280,
+        viewportHeight: 720,
     },
 });

package.json

@@ -1,11 +1,12 @@
 {
     "name": "salix-front",
-    "version": "25.04.0",
+    "version": "25.06.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
     "private": true,
     "packageManager": "pnpm@8.15.1",
+    "type": "module",
     "scripts": {
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
@@ -20,39 +21,40 @@
         "addReferenceTag": "node .husky/addReferenceTag.js"
     },
     "dependencies": {
-        "@quasar/cli": "^2.3.0",
+        "@quasar/cli": "^2.4.1",
-        "@quasar/extras": "^1.16.9",
+        "@quasar/extras": "^1.16.16",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
         "moment": "^2.30.1",
         "pinia": "^2.1.3",
-        "quasar": "^2.14.5",
+        "quasar": "^2.17.7",
         "validator": "^13.9.0",
-        "vue": "^3.3.4",
+        "vue": "^3.5.13",
-        "vue-i18n": "^9.2.2",
+        "vue-i18n": "^9.3.0",
-        "vue-router": "^4.2.1"
+        "vue-router": "^4.2.5"
     },
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@intlify/unplugin-vue-i18n": "^0.8.1",
+        "@intlify/unplugin-vue-i18n": "^0.8.2",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^1.7.3",
+        "@quasar/app-vite": "^2.0.8",
-        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
+        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^13.6.6",
         "cypress-mochawesome-reporter": "^3.8.2",
-        "eslint": "^8.41.0",
+        "eslint": "^9.18.0",
-        "eslint-config-prettier": "^8.8.0",
+        "eslint-config-prettier": "^10.0.1",
-        "eslint-plugin-cypress": "^2.13.3",
+        "eslint-plugin-cypress": "^4.1.0",
-        "eslint-plugin-vue": "^9.14.1",
+        "eslint-plugin-vue": "^9.32.0",
         "husky": "^8.0.0",
         "postcss": "^8.4.23",
-        "prettier": "^2.8.8",
+        "prettier": "^3.4.2",
-        "vitest": "^0.31.1"
+        "sass": "^1.83.4",
+        "vitest": "^0.34.0"
     },
     "engines": {
         "node": "^20 || ^18 || ^16",
@@ -61,8 +63,8 @@
         "bun": ">= 1.0.25"
     },
     "overrides": {
-        "@vitejs/plugin-vue": "^5.0.4",
+        "@vitejs/plugin-vue": "^5.2.1",
-        "vite": "^5.1.4",
+        "vite": "^6.0.11",
         "vitest": "^0.31.1"
     }
 }

postcss.config.js

@@ -1,10 +1,14 @@
 /* eslint-disable */
 // https://github.com/michael-ciniawsky/postcss-load-config
 
-module.exports = {
+import autoprefixer from 'autoprefixer';
+// Uncomment the following line if you want to support RTL CSS
+// import rtlcss from 'postcss-rtlcss';
+
+export default {
     plugins: [
         // https://github.com/postcss/autoprefixer
-        require('autoprefixer')({
+        autoprefixer({
             overrideBrowserslist: [
                 'last 4 Chrome versions',
                 'last 4 Firefox versions',
@@ -18,10 +22,7 @@ module.exports = {
         }),
 
         // https://github.com/elchininet/postcss-rtlcss
-        // If you want to support RTL css, then
+        // If you want to support RTL CSS, uncomment the following line:
-        // 1. yarn/npm install postcss-rtlcss
+        // rtlcss(),
-        // 2. optionally set quasar.config.js > framework > lang to an RTL language
-        // 3. uncomment the following line:
-        // require('postcss-rtlcss')
     ],
 };

quasar.config.js

@@ -8,11 +8,11 @@
 // Configuration for your app
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
-const { configure } = require('quasar/wrappers');
+import { configure } from 'quasar/wrappers';
-const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
+import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
-const path = require('path');
+import path from 'path';
 
-module.exports = configure(function (/* ctx */) {
+export default configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,

quasar.extensions.json

@@ -1,6 +1,8 @@
 {
     "@quasar/testing-unit-vitest": {
-        "options": ["scripts"]
+        "options": [
+            "scripts"
+        ]
     },
     "@quasar/qcalendar": {}
 }

src/boot/__tests__/axios.spec.js

@@ -20,7 +20,7 @@ describe('Axios boot', () => {
     describe('onRequest()', async () => {
         it('should set the "Authorization" property on the headers', async () => {
             const config = { headers: {} };
-
+            localStorage.setItem('token', 'DEFAULT_TOKEN');
             const resultConfig = onRequest(config);
 
             expect(resultConfig).toEqual(

src/boot/axios.js

@@ -3,9 +3,9 @@ import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
+import { getToken, isLoggedIn } from 'src/utils/session';
 import { i18n } from 'src/boot/i18n';
 
-const session = useSession();
 const { notify } = useNotify();
 const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
@@ -13,7 +13,7 @@ axios.defaults.baseURL = baseUrl;
 const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
-    const token = session.getToken();
+    const token = getToken();
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
         config.headers['Accept-Language'] = i18n.global.locale.value;
@@ -37,15 +37,15 @@ const onResponse = (response) => {
     return response;
 };
 
-const onResponseError = (error) => {
+const onResponseError = async (error) => {
     stateQuery.remove(error.config);
 
-    if (session.isLoggedIn() && error.response?.status === 401) {
+    if (isLoggedIn() && error.response?.status === 401) {
-        session.destroy(false);
+        await useSession().destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
         Router.push(`/login?redirect=${url}`);
-    } else if (!session.isLoggedIn()) {
+    } else if (!isLoggedIn()) {
         return Promise.reject(error);
     }
 

src/components/NavBar.vue

@@ -61,6 +61,7 @@ onMounted(() => stateStore.setMounted());
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>
+            <div id="searchbar-after"></div>
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>

src/components/UserPanel.vue

@@ -1,6 +1,9 @@
 <script setup>
+import quasarLang from 'src/utils/quasarLang';
+
 import { onMounted, computed, ref } from 'vue';
-import { Dark, Quasar } from 'quasar';
+
+import { Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
@@ -31,14 +34,7 @@ const userLocale = computed({
 
         value = localeEquivalence[value] ?? value;
 
-        try {
+        quasarLang(value);
-            /* @vite-ignore */
-            import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
     },
 });
 

src/components/VnTable/VnTable.vue

@@ -181,7 +181,7 @@ onMounted(() => {
 watch(
     () => $props.columns,
     (value) => splitColumns(value),
-    { immediate: true }
+    { immediate: true },
 );
 
 const isTableMode = computed(() => mode.value == TABLE_MODE);
@@ -212,7 +212,7 @@ function splitColumns(columns) {
     // Status column
     if (splittedColumns.value.chips.length) {
         splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
-            (c) => !c.isId
+            (c) => !c.isId,
         );
         if (splittedColumns.value.columnChips.length)
             splittedColumns.value.columns.unshift({
@@ -314,7 +314,19 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
+            <VnTableFilter
+                :data-key="$attrs['data-key']"
+                :columns="columns"
+                :redirect="redirect"
+            >
+                <template
+                    v-for="(_, slotName) in $slots"
+                    #[slotName]="slotData"
+                    :key="slotName"
+                >
+                    <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+                </template>
+            </VnTableFilter>
         </QScrollArea>
     </QDrawer>
     <CrudModel
@@ -472,7 +484,9 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                 btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                             "
                             :style="`visibility: ${
-                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
+                                ((btn.show && btn.show(row)) ?? true)
+                                    ? 'visible'
+                                    : 'hidden'
                             }`"
                             @click="btn.action(row)"
                         />

src/components/VnTable/VnTableFilter.vue

@@ -62,5 +62,8 @@ function columnName(col) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
     </VnFilterPanel>
 </template>

src/components/VnTable/__tests__/VnVisibleColumns.spec.js

@@ -0,0 +1,121 @@
+import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnVisibleColumn from '../VnVisibleColumn.vue';
+import { axios } from 'app/test/vitest/helper';
+
+describe('VnVisibleColumns', () => {
+    let wrapper;
+    let vm;
+
+    beforeEach(() => {
+        wrapper = createWrapper(VnVisibleColumn, {
+            propsData: {
+                tableCode: 'testTable',
+                skip: ['skippedColumn'],
+            },
+        });
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('setUserConfigViewData()', () => {
+        it('should initialize localColumns with visible configuration', () => {
+            vm.columns = [
+                { name: 'columnMockName', label: undefined },
+                { name: 'columnMockAddress', label: undefined },
+                { name: 'columnMockId', label: undefined },
+            ];
+            const configuration = {
+                columnMockName: true,
+                columnMockAddress: false,
+                columnMockId: true,
+            };
+            const expectedColumns = [
+                { name: 'columnMockName', label: undefined, visible: true },
+                { name: 'columnMockAddress', label: undefined, visible: false },
+                { name: 'columnMockId', label: undefined, visible: true },
+            ];
+
+            vm.setUserConfigViewData(configuration, false);
+
+            expect(vm.localColumns).toEqual(expectedColumns);
+        });
+
+        it('should skip columns based on props', () => {
+            vm.columns = [
+                { name: 'columnMockName', label: undefined },
+                { name: 'columnMockId', label: undefined },
+                { name: 'skippedColumn', label: 'Skipped Column' },
+            ];
+            const configuration = {
+                columnMockName: true,
+                skippedColumn: false,
+                columnMockId: true,
+            };
+            const expectedColumns = [
+                { name: 'columnMockName', label: undefined, visible: true },
+                { name: 'columnMockId', label: undefined, visible: true },
+            ];
+
+            vm.setUserConfigViewData(configuration, false);
+
+            expect(vm.localColumns).toEqual(expectedColumns);
+        });
+    });
+
+    describe('toggleMarkAll()', () => {
+        it('should set all localColumns to visible=true', () => {
+            vm.localColumns = [
+                { name: 'columnMockName', visible: false },
+                { name: 'columnMockId', visible: false },
+            ];
+
+            vm.toggleMarkAll(true);
+
+            expect(vm.localColumns.every((col) => col.visible)).toBe(true);
+        });
+
+        it('should set all localColumns to visible=false', () => {
+            vm.localColumns = [
+                { name: 'columnMockName', visible: true },
+                { name: 'columnMockId', visible: true },
+            ];
+
+            vm.toggleMarkAll(false);
+
+            expect(vm.localColumns.every((col) => col.visible)).toBe(false);
+        });
+    });
+
+    describe('saveConfig()', () => {
+        it('should call setUserConfigViewData and axios.post with correct params', async () => {
+            const mockAxiosPost = vi.spyOn(axios, 'post').mockResolvedValue({
+                data: [{ id: 1 }],
+            });
+
+            vm.localColumns = [
+                { name: 'columnMockName', visible: true },
+                { name: 'columnMockId', visible: false },
+            ];
+
+            await vm.saveConfig();
+
+            expect(mockAxiosPost).toHaveBeenCalledWith('UserConfigViews/crud', {
+                creates: [
+                    {
+                        userFk: vm.user.id,
+                        tableCode: vm.tableCode,
+                        tableConfig: vm.tableCode,
+                        configuration: {
+                            columnMockName: true,
+                            columnMockId: false,
+                        },
+                    },
+                ],
+            });
+        });
+    });
+});

src/components/common/RightAdvancedMenu.vue

@@ -0,0 +1,53 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useHasContent } from 'src/composables/useHasContent';
+import { watch } from 'vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const hasContent = useHasContent('#advanced-menu');
+
+const $props = defineProps({
+    isMainSection: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+watch(
+    () => $props.isMainSection,
+    (val) => {
+        if (stateStore) stateStore.rightAdvancedDrawer = val;
+    },
+    { immediate: true }
+);
+</script>
+<template>
+    <Teleport to="#searchbar-after" v-if="stateStore.isHeaderMounted()">
+        <QBtn
+            v-if="hasContent || $slots['advanced-menu']"
+            flat
+            @click="stateStore.toggleRightAdvancedDrawer()"
+            round
+            dense
+            icon="tune"
+        >
+            <QTooltip bottom anchor="bottom right">
+                {{ t('globals.advancedMenu') }}
+            </QTooltip>
+        </QBtn>
+    </Teleport>
+    <QDrawer
+        v-model="stateStore.rightAdvancedDrawer"
+        side="right"
+        :width="256"
+        :overlay="!isMainSection"
+        v-bind="$attrs"
+    >
+        <QScrollArea class="fit">
+            <div id="advanced-menu"></div>
+            <slot v-if="!hasContent" name="advanced-menu" />
+        </QScrollArea>
+    </QDrawer>
+</template>

src/components/common/RightMenu.vue

@@ -17,7 +17,7 @@ onMounted(() => {
 });
 </script>
 <template>
-    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
+    <Teleport to="#actions-prepend" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"

src/components/common/VnCardBeta.vue

@@ -12,6 +12,7 @@ const props = defineProps({
     baseUrl: { type: String, default: undefined },
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
+    userFilter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
@@ -32,6 +33,7 @@ const url = computed(() => {
 const arrayData = useArrayData(props.dataKey, {
     url: url.value,
     filter: props.filter,
+    userFilter: props.userFilter,
 });
 
 onBeforeMount(async () => {

src/components/common/VnDmsList.vue

@@ -102,7 +102,7 @@ const columns = computed(() => [
                 storage: 'dms',
                 collection: null,
                 resolution: null,
-                id: prop.row.file.split('.')[0],
+                id: Number(prop.row.file.split('.')[0]),
                 token: token,
                 class: 'rounded',
                 ratio: 1,
@@ -299,11 +299,12 @@ defineExpose({
         :url="$props.model"
         :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
-        :auto-load="true"
+        auto-load
         @on-fetch="setData"
     >
         <template #body>
             <QTable
+                v-if="rows"
                 :columns="columns"
                 :rows="rows"
                 class="full-width q-mt-md"

src/components/common/VnInput.vue

@@ -42,10 +42,13 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    uppercase: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const vnInputRef = ref(null);
-const showPassword = ref(false);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -117,6 +120,10 @@ const handleInsertMode = (e) => {
         input.setSelectionRange(cursorPos + 1, cursorPos + 1);
     });
 };
+
+const handleUppercase = () => {
+    value.value = value.value?.toUpperCase() || '';
+};
 </script>
 
 <template>
@@ -159,7 +166,16 @@ const handleInsertMode = (e) => {
                             emit('remove');
                         }
                     "
+                ></QIcon>
+                
+                <QIcon
+                    name="match_case"
+                    size="xs"
+                    v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
+                    @click="handleUppercase"
+                    class="uppercase-icon"
                 />
+                
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
@@ -170,3 +186,14 @@ const handleInsertMode = (e) => {
         </QInput>
     </div>
 </template>
+
+<i18n>
+    en:
+        inputMin: Must be more than {value}
+        maxLength: The value exceeds {value} characters
+        inputMax: Must be less than {value}
+    es:
+        inputMin: Debe ser mayor a {value}
+        maxLength: El valor excede los {value} carácteres
+        inputMax: Debe ser menor a {value}
+</i18n>

src/components/common/VnInputDate.vue

@@ -105,6 +105,7 @@ const manageDate = (date) => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             hide-bottom-space
         >
             <template #append>

src/components/common/VnInputTime.vue

@@ -79,6 +79,7 @@ function dateToTime(newDate) {
             style="min-width: 100px"
             :rules="mixinRules"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             type="time"
             hide-bottom-space
         >

src/components/common/VnLog.vue

@@ -15,6 +15,7 @@ import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 import VnPaginate from '../ui/VnPaginate.vue';
+import RightMenu from './RightMenu.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -130,7 +131,7 @@ const actionsIcon = {
 };
 const validDate = new RegExp(
     /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source +
-        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
+        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source,
 );
 
 function castJsonValue(value) {
@@ -192,7 +193,7 @@ function getLogTree(data) {
                     user: log.user,
                     userFk: log.userFk,
                     logs: [],
-                })
+                }),
             );
         }
         // Model
@@ -210,7 +211,7 @@ function getLogTree(data) {
                     id: log.changedModelId,
                     showValue: log.changedModelValue,
                     logs: [],
-                })
+                }),
             );
             nLogs = 0;
         }
@@ -282,7 +283,7 @@ function setDate(type) {
     to = date.adjustDate(
         to,
         { hour: 21, minute: 59, second: 59, millisecond: 999 },
-        true
+        true,
     );
 
     switch (type) {
@@ -365,7 +366,7 @@ async function clearFilter() {
     dateTo.value = undefined;
     userRadio.value = undefined;
     Object.keys(checkboxOptions.value).forEach(
-        (opt) => (checkboxOptions.value[opt].selected = false)
+        (opt) => (checkboxOptions.value[opt].selected = false),
     );
     await applyFilter();
 }
@@ -378,7 +379,7 @@ watch(
     () => router.currentRoute.value.params.id,
     () => {
         applyFilter();
-    }
+    },
 );
 </script>
 <template>
@@ -391,7 +392,7 @@ watch(
                     const changedModel = item.changedModel;
                     return {
                         locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel
+                            validations[changedModel]?.locale?.name ?? changedModel,
                         ),
                         value: changedModel,
                     };
@@ -507,7 +508,7 @@ watch(
                                                 :title="
                                                     date.formatDate(
                                                         log.creationDate,
-                                                        'DD/MM/YYYY hh:mm:ss'
+                                                        'DD/MM/YYYY hh:mm:ss',
                                                     ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
                                                 "
                                             >
@@ -577,7 +578,7 @@ watch(
                                                         t(
                                                             `actions.${
                                                                 actionsText[log.action]
-                                                            }`
+                                                            }`,
                                                         )
                                                     "
                                                 />
@@ -677,139 +678,144 @@ watch(
             </div>
         </template>
     </VnPaginate>
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <QList dense>
+        <template #right-panel>
-            <QSeparator />
+            <QList dense>
-            <QItem class="q-mt-sm">
+                <QSeparator />
-                <QInput
+                <QItem class="q-mt-sm">
-                    :label="t('globals.search')"
+                    <QInput
-                    v-model="searchInput"
+                        :label="t('globals.search')"
-                    class="full-width"
+                        v-model="searchInput"
-                    clearable
+                        class="full-width"
-                    clear-icon="close"
+                        clearable
-                    @keyup.enter="() => selectFilter('search')"
+                        clear-icon="close"
-                    @focusout="() => selectFilter('search')"
+                        @keyup.enter="() => selectFilter('search')"
-                    @clear="() => selectFilter('search')"
+                        @focusout="() => selectFilter('search')"
-                >
+                        @clear="() => selectFilter('search')"
-                    <template #append>
+                    >
-                        <QIcon name="info" class="cursor-pointer">
+                        <template #append>
-                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                            <QIcon name="info" class="cursor-pointer">
-                        </QIcon>
+                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                    </template>
+                            </QIcon>
-                </QInput>
+                        </template>
-            </QItem>
+                    </QInput>
-            <QItem>
+                </QItem>
-                <VnSelect
+                <QItem>
-                    class="full-width"
-                    :label="t('globals.entity')"
-                    v-model="selectedFilters.changedModel"
-                    option-label="locale"
-                    option-value="value"
-                    :options="actions"
-                    @update:model-value="selectFilter('action')"
-                    hide-selected
-                />
-            </QItem>
-            <QItem class="q-mt-sm">
-                <QOptionGroup
-                    size="sm"
-                    v-model="userRadio"
-                    :options="userTypes"
-                    color="primary"
-                    @update:model-value="selectFilter('userRadio')"
-                    right-label
-                >
-                    <template #label="{ label }">
-                        {{ t(`Users.${label}`) }}
-                    </template>
-                </QOptionGroup>
-            </QItem>
-            <QItem class="q-mt-sm">
-                <QItemSection v-if="userRadio !== null">
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.user')"
+                        :label="t('globals.entity')"
-                        v-model="userSelect"
+                        v-model="selectedFilters.changedModel"
-                        option-label="name"
+                        option-label="locale"
-                        option-value="id"
+                        option-value="value"
-                        :url="`${model}Logs/${$route.params.id}/editors`"
+                        :options="actions"
-                        :fields="['id', 'nickname', 'name', 'image']"
+                        @update:model-value="selectFilter('action')"
-                        sort-by="nickname"
-                        @update:model-value="selectFilter('userSelect')"
                         hide-selected
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QOptionGroup
+                        size="sm"
+                        v-model="userRadio"
+                        :options="userTypes"
+                        color="primary"
+                        @update:model-value="selectFilter('userRadio')"
+                        right-label
                     >
-                        <template #option="{ opt, itemProps }">
+                        <template #label="{ label }">
-                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                            {{ t(`Users.${label}`) }}
-                                <QItemSection class="col-3 items-center">
-                                    <VnAvatar :worker-id="opt.id" />
-                                </QItemSection>
-                                <QItemSection class="col-9 justify-center">
-                                    <span>{{ opt.name }}</span>
-                                    <span class="text-grey">{{ opt.nickname }}</span>
-                                </QItemSection>
-                            </QItem>
                         </template>
-                    </VnSelect>
+                    </QOptionGroup>
-                </QItemSection>
+                </QItem>
-            </QItem>
+                <QItem class="q-mt-sm">
-            <QItem class="q-mt-sm">
+                    <QItemSection v-if="userRadio !== null">
-                <QInput
+                        <VnSelect
-                    :label="t('globals.changes')"
+                            class="full-width"
-                    v-model="changeInput"
+                            :label="t('globals.user')"
-                    class="full-width"
+                            v-model="userSelect"
-                    clearable
+                            option-label="name"
-                    clear-icon="close"
+                            option-value="id"
-                    @keyup.enter="selectFilter('change')"
+                            :url="`${model}Logs/${route.params.id}/editors`"
-                    @focusout="selectFilter('change')"
+                            :fields="['id', 'nickname', 'name', 'image']"
-                    @clear="selectFilter('change')"
+                            sort-by="nickname"
+                            @update:model-value="selectFilter('userSelect')"
+                            hide-selected
+                        >
+                            <template #option="{ opt, itemProps }">
+                                <QItem
+                                    v-bind="itemProps"
+                                    class="q-pa-xs row items-center"
+                                >
+                                    <QItemSection class="col-3 items-center">
+                                        <VnAvatar :worker-id="opt.id" />
+                                    </QItemSection>
+                                    <QItemSection class="col-9 justify-center">
+                                        <span>{{ opt.name }}</span>
+                                        <span class="text-grey">{{ opt.nickname }}</span>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.changes')"
+                        v-model="changeInput"
+                        class="full-width"
+                        clearable
+                        clear-icon="close"
+                        @keyup.enter="selectFilter('change')"
+                        @focusout="selectFilter('change')"
+                        @clear="selectFilter('change')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip max-width="250px">{{
+                                    t('tooltips.changes')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItem>
+                <QItem
+                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                    v-for="(checkboxOption, index) in checkboxOptions"
+                    :key="index"
                 >
-                    <template #append>
+                    <QCheckbox
-                        <QIcon name="info" class="cursor-pointer">
+                        size="sm"
-                            <QTooltip max-width="250px">{{
+                        v-model="checkboxOption.selected"
-                                t('tooltips.changes')
+                        :label="t(`actions.${checkboxOption.label}`)"
-                            }}</QTooltip>
+                        @update:model-value="selectFilter"
-                        </QIcon>
+                    />
-                    </template>
+                </QItem>
-                </QInput>
+                <QItem class="q-mt-sm">
-            </QItem>
+                    <QInput
-            <QItem
+                        class="full-width"
-                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                        :label="t('globals.date')"
-                v-for="(checkboxOption, index) in checkboxOptions"
+                        @click="dateFromDialog = true"
-                :key="index"
+                        @focus="(evt) => evt.target.blur()"
-            >
+                        @clear="selectFilter('date', 'to')"
-                <QCheckbox
+                        v-model="dateFrom"
-                    size="sm"
+                        clearable
-                    v-model="checkboxOption.selected"
+                        clear-icon="close"
-                    :label="t(`actions.${checkboxOption.label}`)"
+                    />
-                    @update:model-value="selectFilter"
+                </QItem>
-                />
+                <QItem class="q-mt-sm">
-            </QItem>
+                    <QInput
-            <QItem class="q-mt-sm">
+                        class="full-width"
-                <QInput
+                        :label="t('to')"
-                    class="full-width"
+                        @click="dateToDialog = true"
-                    :label="t('globals.date')"
+                        @focus="(evt) => evt.target.blur()"
-                    @click="dateFromDialog = true"
+                        @clear="selectFilter('date', 'from')"
-                    @focus="(evt) => evt.target.blur()"
+                        v-model="dateTo"
-                    @clear="selectFilter('date', 'to')"
+                        clearable
-                    v-model="dateFrom"
+                        clear-icon="close"
-                    clearable
+                    />
-                    clear-icon="close"
+                </QItem>
-                />
+            </QList>
-            </QItem>
+        </template>
-            <QItem class="q-mt-sm">
+    </RightMenu>
-                <QInput
-                    class="full-width"
-                    :label="t('to')"
-                    @click="dateToDialog = true"
-                    @focus="(evt) => evt.target.blur()"
-                    @clear="selectFilter('date', 'from')"
-                    v-model="dateTo"
-                    clearable
-                    clear-icon="close"
-                />
-            </QItem>
-        </QList>
-    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"

src/components/common/VnSection.vue

@@ -1,10 +1,10 @@
 <script setup>
-import RightMenu from './RightMenu.vue';
+import RightAdvancedMenu from './RightAdvancedMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, computed, ref } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
 
 const $props = defineProps({
@@ -47,16 +47,14 @@ const $props = defineProps({
 });
 
 const route = useRoute();
+const router = useRouter();
+
 let arrayData;
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
-const isMainSection = computed(() => {
+const isMainSection = ref(false);
-    const isSame = sectionValue.value == route.name;
+
-    if (!isSame && arrayData) {
-        arrayData.reset(['userParams', 'userFilter']);
-    }
-    return isSame;
-});
 const searchbarId = 'section-searchbar';
+const advancedMenuSlot = 'advanced-menu';
 const hasContent = useHasContent(`#${searchbarId}`);
 
 onBeforeMount(() => {
@@ -67,7 +65,23 @@ onBeforeMount(() => {
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });
+    checkIsMain();
 });
+
+onMounted(() => {
+    const unsubscribe = router.afterEach(() => {
+        checkIsMain();
+    });
+    onUnmounted(unsubscribe);
+});
+
+function checkIsMain() {
+    isMainSection.value = sectionValue.value == route.name;
+    if (!isMainSection.value && arrayData) {
+        arrayData.reset(['userParams', 'filter']);
+        arrayData.setCurrentFilter();
+    }
+}
 </script>
 <template>
     <slot name="searchbar">
@@ -80,9 +94,9 @@ onBeforeMount(() => {
         />
         <div :id="searchbarId"></div>
     </slot>
-    <RightMenu>
+    <RightAdvancedMenu :is-main-section="isMainSection">
-        <template #right-panel v-if="$slots['rightMenu'] || rightFilter">
+        <template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
-            <slot name="rightMenu">
+            <slot :name="advancedMenuSlot">
                 <VnTableFilter
                     v-if="rightFilter && columns"
                     :data-key="dataKey"
@@ -91,7 +105,7 @@ onBeforeMount(() => {
                 />
             </slot>
         </template>
-    </RightMenu>
+    </RightAdvancedMenu>
     <slot name="body" v-if="isMainSection" />
     <RouterView v-else />
 </template>

src/components/common/VnSelect.vue

@@ -27,7 +27,7 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String],
+        type: [String, Function],
         default: 'name',
     },
     optionValue: {
@@ -232,12 +232,15 @@ async function fetchFilter(val) {
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
     $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
-    const fetchOptions = { where, include, limit };
+    const filterOptions = { where, include, limit };
-    if (fields) fetchOptions.fields = fields;
+    if (fields) filterOptions.fields = fields;
-    if (sortBy) fetchOptions.order = sortBy;
+    if (sortBy) filterOptions.order = sortBy;
     arrayData.resetPagination();
 
-    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
+    const { data } = await arrayData.applyFilter(
+        { filter: filterOptions },
+        { updateRouter: false }
+    );
     setOptions(data);
     return data;
 }
@@ -294,7 +297,7 @@ async function onScroll({ to, direction, from, index }) {
     }
 }
 
-defineExpose({ opts: myOptions });
+defineExpose({ opts: myOptions, vnSelectRef });
 
 function handleKeyDown(event) {
     if (event.key === 'Tab' && !event.shiftKey) {

src/components/common/VnSelectDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -7,6 +7,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
 
 const value = defineModel({ type: [String, Number, Object] });
+const select = ref(null);
 const $props = defineProps({
     rolesAllowedToCreate: {
         type: Array,
@@ -33,10 +34,13 @@ const isAllowedToCreate = computed(() => {
     if ($props.acls.length) return acl.hasAny($props.acls);
     return role.hasAny($props.rolesAllowedToCreate);
 });
+
+defineExpose({ vnSelectDialogRef: select });
 </script>
 
 <template>
     <VnSelect
+        ref="select"
         v-model="value"
         v-bind="$attrs"
         @update:model-value="(...args) => emit('update:modelValue', ...args)"

src/components/common/VnSelectWorker.vue

@@ -55,7 +55,7 @@ const url = computed(() => {
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
-            <VnAvatar :worker-id="value" color="primary" :title="title" />
+            <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
         </template>
         <template #append v-if="$props.hasInfo">
             <QIcon name="info" class="cursor-pointer">
@@ -72,7 +72,8 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }},
+                        {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

src/components/common/__tests__/VnDms.spec.js

@@ -0,0 +1,146 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
+import VnDms from 'src/components/common/VnDms.vue';
+
+class MockFormData {
+    constructor() {
+        this.entries = {};
+    }
+
+    append(key, value) {
+        if (!key) {
+            throw new Error('Key is required for FormData.append');
+        }
+        this.entries[key] = value;
+    }
+
+    get(key) {
+        return this.entries[key] || null;
+    }
+
+    getAll() {
+        return this.entries;
+    }
+}
+
+global.FormData = MockFormData;
+
+describe('VnDms', () => {
+    let wrapper;
+    let vm;
+    let postMock;
+
+    const postResponseMock = { data: { success: true } };
+
+    const data = {
+        hasFile: true,
+        hasFileAttached: true,
+        reference: 'DMS-test',
+        warehouseFk: 1,
+        companyFk: 2,
+        dmsTypeFk: 3,
+        description: 'This is a test description',
+        files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
+    };
+
+    const expectedBody = {
+        hasFile: true,
+        hasFileAttached: true,
+        reference: 'DMS-test',
+        warehouseId: 1,
+        companyId: 2,
+        dmsTypeId: 3,
+        description: 'This is a test description',
+    };
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnDms, {
+            propsData: {
+                url: '/test',
+                formInitialData: { id: 1, reference: 'test' },
+                model: 'Worker',
+            }
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+        vi.spyOn(vm, '$emit');
+    });
+
+    beforeEach(() => {
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue(postResponseMock);
+        vm.dms = data;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('mapperDms', () => {
+        it('should map DMS data correctly and add file to FormData', () => {
+            const [formData, params] = vm.mapperDms(data);
+
+            expect(formData.get('example.txt')).toBe(data.files);
+            expect(expectedBody).toEqual(params.params);
+        });
+
+        it('should map DMS data correctly without file', () => {
+            delete data.files;
+
+            const [formData, params] = vm.mapperDms(data);
+
+            expect(formData.getAll()).toEqual({});
+            expect(expectedBody).toEqual(params.params);
+        });
+    });
+
+    describe('getUrl', () => {
+        it('should returns prop url when is set', async () => {
+            expect(vm.getUrl()).toBe('/test');
+        });
+
+        it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {            
+            await wrapper.setProps({ url: null });
+            expect(vm.getUrl()).toBe('dms/1/updateFile');
+        });
+
+        it('should returns url "props.model"/"route.params.id"/uploadFile when formInitialData is null', async () => {
+            await wrapper.setProps({ formInitialData: null });
+            vm.route.params.id = '123';
+            expect(vm.getUrl()).toBe('Worker/123/uploadFile');
+        });
+    });
+
+    describe('save', () => {
+        it('should save data correctly', async () => {
+            await vm.save();
+            expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
+            expect(wrapper.emitted('onDataSaved')).toBeTruthy();
+        });
+    });
+
+    describe('defaultData', () => {
+        it('should set dms with formInitialData', async () => {
+            const testData = {
+                hasFile: false,
+                hasFileAttached: false,
+                reference: 'defaultData-test',
+                warehouseFk: 2,
+                companyFk: 3,
+                dmsTypeFk: 2,
+                description: 'This is a test description'
+            }
+            await wrapper.setProps({ formInitialData: testData });
+            vm.defaultData();
+
+            expect(vm.dms).toEqual(testData);
+        });
+
+        it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
+            await wrapper.setProps({ formInitialData: null });
+            vm.route.params.id= '111';
+            vm.defaultData();
+
+            expect(vm.dms.reference).toBe('111');
+        });
+    });
+});

src/components/common/__tests__/VnInput.spec.js

@@ -0,0 +1,91 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import { vi, describe, expect, it } from 'vitest';
+import VnInput from 'src/components/common/VnInput.vue';
+
+
+describe('VnInput', () => {
+    let vm;
+    let wrapper;
+    let input;
+
+    function generateWrapper(value, isOutlined, emptyToNull, insertable) {
+        wrapper = createWrapper(VnInput, {
+            props: {
+                modelValue: value,                
+                isOutlined,  emptyToNull,  insertable,
+                maxlength: 101
+            },
+            attrs: {
+                label: 'test',
+                required: true,
+                maxlength: 101,
+                maxLength: 10,
+                'max-length':20
+            },
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+        input = wrapper.find('[data-cy="test_input"]');
+    };
+
+    describe('value', () => {
+        it('should emit update:modelValue when value changes', async () => {
+            generateWrapper('12345', false, false, true)
+            await input.setValue('123');
+            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
+        });
+
+        it('should emit update:modelValue with null when input is empty', async () => {
+            generateWrapper('12345', false, true, true);
+            await input.setValue('');
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([null]);
+        });
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('123', false, false, false);
+            expect(vm.styleAttrs).toEqual({}); 
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {        
+            generateWrapper('123', true, false, false);
+            expect(vm.styleAttrs.outlined).toBe(true);
+        });
+    });
+
+    describe('handleKeydown', () => { 
+        it('should do nothing when "Backspace" key is pressed', async () => {
+            generateWrapper('12345', false, false, true);
+            await input.trigger('keydown', { key: 'Backspace' });
+            expect(wrapper.emitted('update:modelValue')).toBeUndefined();
+            const spyhandler = vi.spyOn(vm, 'handleInsertMode');
+            expect(spyhandler).not.toHaveBeenCalled();
+            
+        });
+        
+        /*
+        TODO: #8399 REDMINE
+        */
+        it.skip('handleKeydown respects insertable behavior', async () => {
+            const expectedValue = '12345';
+            generateWrapper('1234', false, false, true);
+            vm.focus()
+            await input.trigger('keydown', { key: '5' });
+            await vm.$nextTick();
+            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
+            expect(vm.value).toBe( expectedValue);
+        });
+    });
+
+    describe('focus', () => {
+        it('should call focus method when input is focused', async () => {
+            generateWrapper('123', false, false, true);
+            const focusSpy = vi.spyOn(input.element, 'focus');
+            vm.focus();
+            expect(focusSpy).toHaveBeenCalled();
+        }); 
+    });
+});

src/components/ui/CardSummary.vue

@@ -175,7 +175,7 @@ async function fetch() {
                 display: inline-block;
             }
             .header.link:hover {
-                color: lighten($primary, 20%);
+                color: rgba(var(--q-primary), 0.8);
             }
             .q-checkbox {
                 & .q-checkbox__label {

src/components/ui/CatalogItem.vue

@@ -41,7 +41,7 @@ const card = toRef(props, 'item');
                 </div>
             </div>
             <div class="content">
-                <span class="link">
+                <span class="link" @click.stop>
                     {{ card.name }}
                     <ItemDescriptorProxy :id="card.id" />
                 </span>

src/components/ui/QCalendarMonthWrapper.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useQuasar } from 'quasar';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
 
 const $props = defineProps({
     bordered: {

src/components/ui/VnFilterPanel.vue

@@ -190,7 +190,10 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
+    else {
+        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
+        return t(`${camelCaseModuleName}.params.${param}`);
+    }
 };
 </script>
 

src/components/ui/VnSearchbar.vue

@@ -113,23 +113,20 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.keys(store.userParams ?? {}).length
-        ? store.userParams
-        : store.defaultParams;
     arrayData.resetPagination();
 
-    const filter = {
+    let filter = { params: { search: searchText.value } };
-        params: {
-            search: searchText.value,
-        },
-        filter: props.filter,
-    };
 
     if (!props.searchRemoveParams || !searchText.value) {
-        filter.params = {
+        filter = {
-            ...staticParams,
+            params: {
-            search: searchText.value,
+                ...store.userParams,
+                search: searchText.value,
+            },
+            filter: store.filter,
         };
+    } else {
+        arrayData.reset(['currentFilter', 'userParams']);
     }
 
     if (props.whereFilter) {

src/components/ui/VnUsesMana.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { defineProps, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();

src/components/ui/__tests__/VnImg.spec.js

@@ -0,0 +1,89 @@
+import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnImg from 'src/components/ui/VnImg.vue';
+
+let wrapper;
+let vm;
+const isEmployeeMock = vi.fn();
+
+function generateWrapper(storage = 'images') {
+    wrapper = createWrapper(VnImg, {
+        props: {
+            id: 123, 
+            zoomResolution: '400x400',
+            storage, 
+        }
+    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm; 
+    vm.timeStamp = 'timestamp';   
+};
+
+vi.mock('src/composables/useSession', () => ({
+    useSession: () => ({
+      getTokenMultimedia: () => 'token',
+    }),
+}));
+  
+vi.mock('src/composables/useRole', () => ({
+    useRole: () => ({
+        isEmployee: isEmployeeMock,
+    }),
+}));
+
+
+describe('VnImg', () => {    
+    beforeEach(() => {
+        isEmployeeMock.mockReset();
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('getUrl', () => {
+        it('should return /api/{storage}/{id}/downloadFile?access_token={token} when storage is dms', async () => {
+            isEmployeeMock.mockReturnValue(false);
+            generateWrapper('dms');
+            await vm.$nextTick();
+            const url = vm.getUrl();
+            expect(url).toBe('/api/dms/123/downloadFile?access_token=token');    
+        });
+
+        it('should return /no-user.png when role is not employee and storage is not dms', async () => {
+            isEmployeeMock.mockReturnValue(false);
+            generateWrapper();
+            await vm.$nextTick();   
+            const url = vm.getUrl();
+            expect(url).toBe('/no-user.png');
+        });
+
+        it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is false and role is employee and storage is not dms', async () => {
+            isEmployeeMock.mockReturnValue(true);
+            generateWrapper();
+            await vm.$nextTick();
+            const url = vm.getUrl();
+            expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp');
+        });
+
+        it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
+            isEmployeeMock.mockReturnValue(true);
+            generateWrapper();
+            await vm.$nextTick();
+            const url = vm.getUrl(true);
+            expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp');
+        });
+    });
+
+    describe('reload', () => {
+        it('should update the timestamp', async () => {
+            generateWrapper();
+            const initialTimestamp = wrapper.vm.timeStamp;
+
+            wrapper.vm.reload();
+            const newTimestamp = wrapper.vm.timeStamp;
+       
+            expect(initialTimestamp).not.toEqual(newTimestamp);
+        });
+    });
+});

src/components/ui/__tests__/VnSearchbar.spec.js

@@ -0,0 +1,71 @@
+import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+describe('VnSearchbar', () => {
+    let vm;
+    let wrapper;
+    let applyFilterSpy;
+    const searchText = 'Bolas de madera';
+    const userParams = {staticKey: 'staticValue'};
+
+    beforeEach(async () => {
+        wrapper = createWrapper(VnSearchbar, {
+            propsData: {
+                dataKey: 'testKey',
+                filter: null,
+                whereFilter: null,
+                searchRemoveParams: true,
+            },
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+
+        vm.searchText = searchText;
+        vm.arrayData.store.userParams = userParams;
+        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
+        
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('search resets pagination and applies filter', async () => {
+        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
+        await vm.search();
+
+        expect(resetPaginationSpy).toHaveBeenCalled();
+        expect(applyFilterSpy).toHaveBeenCalledWith({
+            params: { search: searchText },
+        });
+    });
+
+    it('search includes static params if searchRemoveParams is false', async () => {
+        wrapper.setProps({ searchRemoveParams: false });
+        await vm.$nextTick();
+        await vm.search();
+
+        expect(applyFilterSpy).toHaveBeenCalledWith({
+            params: { staticKey: 'staticValue', search: searchText },
+            filter: {skip: 0},
+        });
+    });
+
+    it('updates store when dataKey changes', async () => {
+        expect(vm.store.userParams).toEqual(userParams);
+        wrapper.setProps({ dataKey: 'newTestKey' });
+        await vm.$nextTick();
+        expect(vm.store.userParams).toEqual({});
+    });
+
+    it('computes the "to" property correctly for redirection', () => {
+        vm.arrayData.store.searchUrl = 'searchParam';
+        vm.arrayData.store.currentFilter = { category: 'plants' };
+        const expectedQuery = JSON.stringify({
+            ...vm.arrayData.store.currentFilter,
+            search: searchText,
+        });
+        expect(vm.to.query.searchParam).toBe(expectedQuery);
+    });
+});

src/composables/useArrayData.js

@@ -7,7 +7,9 @@ import { isDialogOpened } from 'src/filters';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
+export function useArrayData(key, userOptions) {
+    key ??= useRoute().meta.moduleName;
+
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@@ -31,10 +33,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                     : JSON.parse(params?.filter ?? '{}');
             delete params.filter;
 
-            store.userParams = { ...store.userParams, ...params };
+            store.userParams = params;
             store.filter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }
+        setCurrentFilter();
     });
 
     if (key && userOptions) setOptions();
@@ -76,11 +79,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         cancelRequest();
         canceller = new AbortController();
-        const { params, limit } = getCurrentFilter();
+        const { params, limit } = setCurrentFilter();
-
-        store.currentFilter = JSON.parse(JSON.stringify(params));
-        delete store.currentFilter.filter.include;
-        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
 
         let exprFilter;
         if (store?.exprBuilder) {
@@ -105,7 +104,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect) return;
+            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
         }
         store.isLoading = false;
         canceller = null;
@@ -140,12 +139,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
     }
 
-    async function applyFilter({ filter, params }) {
+    async function applyFilter({ filter, params }, fetchOptions = {}) {
         if (filter) store.userFilter = filter;
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch({});
+        const response = await fetch(fetchOptions);
         return response;
     }
 
@@ -171,10 +170,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
     async function addOrder(field, direction = 'ASC') {
         const newOrder = field + ' ' + direction;
-        let order = store.order || [];
+        const order = toArray(store.order);
-        if (typeof order == 'string') order = [order];
 
-        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        let index = getOrderIndex(order, field);
         if (index > -1) {
             order[index] = newOrder;
         } else {
@@ -191,16 +189,23 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function deleteOrder(field) {
-        let order = store.order ?? [];
+        const order = toArray(store.order);
-        if (typeof order == 'string') order = [order];
+        const index = getOrderIndex(order, field);
-
-        const index = order.findIndex((o) => o.split(' ')[0] === field);
         if (index > -1) order.splice(index, 1);
 
         store.order = order;
         fetch({});
     }
 
+    function getOrderIndex(order, field) {
+        return order.findIndex((o) => o.split(' ')[0] === field);
+    }
+
+    function toArray(str = []) {
+        if (Array.isArray(str)) return str;
+        if (typeof str === 'string') return str.split(',').map((item) => item.trim());
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -274,14 +279,14 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     function getCurrentFilter() {
+        if (!Object.keys(store.userParams).length)
+            store.userParams = store.defaultParams ?? {};
+
         const filter = {
             limit: store.limit,
+            ...store.userFilter,
         };
 
-        let userParams = { ...store.userParams };
-
-        Object.assign(filter, store.userFilter);
-
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -289,15 +294,22 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         filter.where = where;
         const params = { filter };
 
-        Object.assign(params, userParams);
+        Object.assign(params, store.userParams);
         if (params.filter) params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order) params.filter.order = toArray(store.order);
-        if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
         return { filter, params, limit: filter.limit };
     }
 
+    function setCurrentFilter() {
+        const { params, limit } = getCurrentFilter();
+        store.currentFilter = JSON.parse(JSON.stringify(params));
+        delete store.currentFilter.filter.include;
+        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
+        return { params, limit };
+    }
+
     function processData(data, { map = true, append = true }) {
         if (!append) {
             store.data = [];
@@ -331,6 +343,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         applyFilter,
         addFilter,
         getCurrentFilter,
+        setCurrentFilter,
         addFilterWhere,
         addOrder,
         deleteOrder,

src/composables/useFilterParams.js

@@ -29,8 +29,12 @@ export function useFilterParams(key) {
         orders.value = orderObject;
     }
 
-    function setUserParams(watchedParams) {
+    function setUserParams(watchedParams = {}) {
-        if (!watchedParams || Object.keys(watchedParams).length == 0) return;
+        if (Object.keys(watchedParams).length == 0) {
+            params.value = {};
+            orders.value = {};
+            return;
+        }
 
         if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
         if (typeof watchedParams?.filter == 'string')

src/composables/useHasContent.js

@@ -5,7 +5,7 @@ export function useHasContent(selector) {
     const hasContent = ref();
 
     onMounted(() => {
-        container.value = document.querySelector(selector);
+        container.value = document?.querySelector(selector);
         if (!container.value) return;
 
         const observer = new MutationObserver(() => {

src/composables/useSession.js

@@ -6,6 +6,7 @@ import axios from 'axios';
 import { useRouter } from 'vue-router';
 import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
+import { getToken, getTokenMultimedia } from 'src/utils/session';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
@@ -15,19 +16,6 @@ export function useSession() {
     let isCheckingToken = false;
     let intervalId = null;
 
-    function getToken() {
-        const localToken = localStorage.getItem(TOKEN);
-        const sessionToken = sessionStorage.getItem(TOKEN);
-
-        return localToken || sessionToken || '';
-    }
-    function getTokenMultimedia() {
-        const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
-        const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
-
-        return localTokenMultimedia || sessionTokenMultimedia || '';
-    }
-
     function setSession(data) {
         let keepLogin = data.keepLogin;
         const storage = keepLogin ? localStorage : sessionStorage;

src/css/app.scss

@@ -1,6 +1,6 @@
 // app global css in SCSS form
 @import './icons.scss';
-@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
+@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.scss';
 
 body.body--light {
     --vn-header-color: #cecece;
@@ -310,6 +310,14 @@ input::-webkit-inner-spin-button {
 .no-visible {
     visibility: hidden;
 }
+
+.q-item > .q-item__section:has(.q-checkbox) {
+    max-width: fit-content;
+}
+
+.row > .column:has(.q-checkbox) {
+    max-width: fit-content;
+}
 .q-field__inner {
     .q-field__control {
         min-height: auto !important;

src/filters/index.js

@@ -16,6 +16,7 @@ import getUpdatedValues from './getUpdatedValues';
 import getParamWhere from './getParamWhere';
 import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
+import toCelsius from './toCelsius';
 
 export {
     getUpdatedValues,
@@ -36,4 +37,5 @@ export {
     dashIfEmpty,
     dateRange,
     getParamWhere,
+    toCelsius,
 };

src/filters/toCelsius.js

@@ -0,0 +1,3 @@
+export default function toCelsius(value) {
+    return value ? `${value}°C` : '';
+}

src/i18n/locale/en.yml

@@ -5,9 +5,11 @@ globals:
     language: Language
     quantity: Quantity
     entity: Entity
+    preview: Preview
     user: User
     details: Details
-    collapseMenu: Collapse left menu
+    collapseMenu: Collapse lateral menu
+    advancedMenu: Advanced menu
     backToDashboard: Return to dashboard
     notifications: Notifications
     userPanel: User panel
@@ -495,21 +497,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: CSV download failed
-shelving:
-    list:
-        parking: Parking
-        priority: Priority
-        newShelving: New Shelving
-    summary:
-        recyclable: Recyclable
-parking:
-    pickingOrder: Picking order
-    sector: Sector
-    row: Row
-    column: Column
-    searchBar:
-        info: You can search by parking code
-        label: Search parking...
 department:
     chat: Chat
     bossDepartment: Boss Department
@@ -701,6 +688,9 @@ supplier:
     consumption:
         entry: Entry
 travel:
+    search: Search travel
+    searchInfo: You can search by travel id or name
+    id: Id
     travelList:
         tableVisibleColumns:
             ref: Reference
@@ -709,6 +699,7 @@ travel:
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
+            awb: AWB
     summary:
         entryId: Entry Id
         freight: Freight
@@ -730,62 +721,6 @@ travel:
         destination: Destination
         thermograph: Thermograph
         travelFileDescription: 'Travel id { travelId }'
-item:
-    descriptor:
-        buyer: Buyer
-        color: Color
-        category: Category
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-    list:
-        id: Identifier
-        stems: Stems
-        category: Category
-        typeName: Type
-        isActive: Active
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-    create:
-        priority: Priority
-    buyRequest:
-        requester: Requester
-        requested: Requested
-        attender: Atender
-        achieved: Achieved
-        concept: Concept
-    summary:
-        otherData: Other data
-        tax: Tax
-        botanical: Botanical
-        barcode: Barcode
-        completeName: Complete name
-        family: Familiy
-        stems: Stems
-        multiplier: Multiplier
-        buyer: Buyer
-        doPhoto: Do photo
-        intrastatCode: Intrastat code
-        ref: Reference
-        relevance: Relevance
-        weight: Weight (gram)/stem
-        units: Units/box
-        expense: Expense
-        generic: Generic
-        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: Min sales quantity
-        genus: Genus
-        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -5,9 +5,11 @@ globals:
     language: Idioma
     quantity: Cantidad
     entity: Entidad
+    preview: Vista previa
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
+    advancedMenu: Menú avanzado
     backToDashboard: Volver al tablón
     notifications: Notificaciones
     userPanel: Panel de usuario
@@ -458,34 +460,15 @@ order:
     list:
         newOrder: Nuevo Pedido
     summary:
-        basket: Cesta
+        issued: Fecha
-        notConfirmed: No confirmada
+        dued: Fecha límite
-        created: Creado
+        booked: Contabilizada
-        createdFrom: Creado desde
+        taxBreakdown: Desglose impositivo
-        address: Dirección
+        taxableBase: Base imp.
-        total: Total
+        rate: Tarifa
-        vat: IVA
+        fee: Cuota
-        state: Estado
+        tickets: Tickets
-        alias: Alias
+        totalWithVat: Importe
-        items: Artículos
-        orderTicketList: Tickets del pedido
-        amount: Monto
-        confirm: Confirmar
-        confirmLines: Confirmar lineas
-shelving:
-    list:
-        parking: Parking
-        priority: Prioridad
-        newShelving: Nuevo Carro
-    summary:
-        recyclable: Reciclable
-parking:
-    pickingOrder: Orden de recogida
-    row: Fila
-    column: Columna
-    searchBar:
-        info: Puedes buscar por código de parking
-        label: Buscar parking...
 department:
     chat: Chat
     bossDepartment: Jefe de departamento
@@ -675,6 +658,9 @@ supplier:
     consumption:
         entry: Entrada
 travel:
+    search: Buscar envío
+    searchInfo: Buscar envío por id o nombre
+    id: Id
     travelList:
         tableVisibleColumns:
             ref: Referencia
@@ -683,6 +669,7 @@ travel:
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
+            awb: AWB
     summary:
         entryId: Id entrada
         freight: Porte
@@ -704,62 +691,6 @@ travel:
         destination: Destino
         thermograph: Termógrafo
         travelFileDescription: 'Id envío { travelId }'
-item:
-    descriptor:
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-    list:
-        id: Identificador
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        isActive: Activo
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-    create:
-        priority: Prioridad
-    summary:
-        otherData: Otros datos
-        tax: IVA
-        botanical: Botánico
-        barcode: Código de barras
-        completeName: Nombre completo
-        family: Familia
-        stems: Tallos
-        multiplier: Multiplicador
-        buyer: Comprador
-        doPhoto: Hacer foto
-        intrastatCode: Código intrastat
-        ref: Referencia
-        relevance: Relevancia
-        weight: Peso (gramos)/tallo
-        units: Unidades/caja
-        expense: Gasto
-        generic: Genérico
-        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: Cantidad mínima de venta
-        genus: Genus
-        specie: Specie
-    buyRequest:
-        requester: Solicitante
-        requested: Solicitado
-        attender: Comprador
-        achieved: Conseguido
-        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:

src/layouts/OutLayout.vue

@@ -2,6 +2,8 @@
 import { Dark, Quasar } from 'quasar';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { localeEquivalence } from 'src/i18n/index';
+import quasarLang from 'src/utils/quasarLang';
 
 const { t, locale } = useI18n();
 
@@ -12,18 +14,9 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        if (value === 'en') value = 'en-GB';
+        value = localeEquivalence[value] ?? value;
 
-        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
+        quasarLang(value);
-        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
-        try {
-            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
-            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
     },
 });
 

src/pages/Claim/Card/ClaimAction.vue

@@ -4,7 +4,6 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useStateStore } from 'src/stores/useStateStore';
 import { toDate, toPercentage, toCurrency } from 'filters/index';
 import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
@@ -13,11 +12,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
-const stateStore = computed(() => useStateStore());
 const claim = ref(null);
 const claimRef = ref();
 const claimId = route.params.id;
@@ -201,58 +200,62 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
+    <RightMenu v-if="claim">
-        <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
+        <template #right-panel>
-            {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
+            <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
-        </QCard>
+                {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
-        <QCard class="q-mb-md q-pa-sm no-box-shadow">
+            </QCard>
-            <QItem class="justify-between">
+            <QCard class="q-mb-md q-pa-sm no-box-shadow">
-                <QItemLabel class="slider-container">
+                <QItem class="justify-between">
-                    <p class="text-primary">
+                    <QItemLabel class="slider-container">
-                        {{ t('claim.actions') }}
+                        <p class="text-primary">
-                    </p>
+                            {{ t('claim.actions') }}
-                    <QSlider
+                        </p>
-                        class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
+                        <QSlider
-                        v-model="claim.responsibility"
+                            class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
-                        :label-value="t('claim.responsibility')"
+                            v-model="claim.responsibility"
-                        @change="(value) => save({ responsibility: value })"
+                            :label-value="t('claim.responsibility')"
-                        label-always
+                            @change="(value) => save({ responsibility: value })"
-                        color="primary"
+                            label-always
-                        markers
+                            color="primary"
-                        :marker-labels="marker_labels"
+                            markers
-                        :min="DEFAULT_MIN_RESPONSABILITY"
+                            :marker-labels="marker_labels"
-                        :max="DEFAULT_MAX_RESPONSABILITY"
+                            :min="DEFAULT_MIN_RESPONSABILITY"
+                            :max="DEFAULT_MAX_RESPONSABILITY"
+                        />
+                    </QItemLabel>
+                </QItem>
+            </QCard>
+            <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
+                <QItemLabel class="mana q-mb-md">
+                    <QCheckbox
+                        v-model="claim.isChargedToMana"
+                        @update:model-value="(value) => save({ isChargedToMana: value })"
                     />
+                    <span>{{ t('mana') }}</span>
                 </QItemLabel>
-            </QItem>
+            </QCard>
-        </QCard>
+            <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
-        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
+                <QInput
-            <QItemLabel class="mana q-mb-md">
+                    :disable="
-                <QCheckbox
+                        !(
-                    v-model="claim.isChargedToMana"
+                            claim.responsibility >=
-                    @update:model-value="(value) => save({ isChargedToMana: value })"
+                            Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
+                        )
+                    "
+                    :label="t('confirmGreuges')"
+                    class="q-field__native text-grey-2"
+                    type="number"
+                    placeholder="0"
+                    id="multiplicatorValue"
+                    name="multiplicatorValue"
+                    min="0"
+                    max="50"
+                    v-model="multiplicatorValue"
                 />
-                <span>{{ t('mana') }}</span>
+            </QCard>
-            </QItemLabel>
+        </template>
-        </QCard>
+    </RightMenu>
-        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
-            <QInput
-                :disable="
-                    !(claim.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2)
-                "
-                :label="t('confirmGreuges')"
-                class="q-field__native text-grey-2"
-                type="number"
-                placeholder="0"
-                id="multiplicatorValue"
-                name="multiplicatorValue"
-                min="0"
-                max="50"
-                v-model="multiplicatorValue"
-            />
-        </QCard>
-    </Teleport>
-    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
         v-if="claim"
         data-key="ClaimEnds"

src/pages/Claim/ClaimList.vue

@@ -134,7 +134,7 @@ const STATE_COLOR = {
             order: ['cs.priority ASC', 'created ASC'],
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
         </template>
         <template #body>

src/pages/Customer/Card/CustomerBillingData.vue

@@ -38,7 +38,7 @@ const getBankEntities = (data, formData) => {
                     hide-selected
                     option-label="name"
                     option-value="id"
-                    v-model="data.payMethod"
+                    v-model="data.payMethodFk"
                 />
                 <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>

src/pages/Customer/Card/CustomerCard.vue

@@ -1,25 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
-import { useRoute } from 'vue-router';
-
-import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
-import CustomerFilter from '../CustomerFilter.vue';
-const route = useRoute();
-
-const routeName = computed(() => route.name);
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
-        search-data-key="CustomerList"
-        :searchbar-props="{
-            url: 'Clients/filter',
-            label: 'Search customer',
-            info: 'You can search by customer id or name',
-        }"
     />
 </template>

src/pages/Customer/Card/CustomerConsumption.vue

@@ -152,7 +152,8 @@ const updateDateParams = (value, params) => {
         v-if="campaignList"
         data-key="CustomerConsumption"
         url="Clients/consumption"
-        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"        
+        :filter="{ where: { clientFk: route.params.id } }"
         :columns="columns"
         search-url="consumption"
         :user-params="userParams"

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -1,177 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import { QItem } from 'quasar';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { QItemSection } from 'quasar';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import { toDate } from 'src/filters';
-
-const { t } = useI18n();
-defineProps({ dataKey: { type: String, required: true } });
-</script>
-<template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.item')"
-                        v-model="params.itemId"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.buyerId"
-                        url="TicketRequests/getItemTypeWorker"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname ASC"
-                        :label="t('params.buyer')"
-                        option-value="id"
-                        option-label="nickname"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.typeId"
-                        url="ItemTypes"
-                        :include="['category']"
-                        :fields="['id', 'name', 'categoryFk']"
-                        sort-by="name ASC"
-                        :label="t('params.typeId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.category?.name
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.categoryId"
-                        url="ItemCategories"
-                        :fields="['id', 'name']"
-                        sort-by="name ASC"
-                        :label="t('params.categoryId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.campaignId"
-                        url="Campaigns/latest"
-                        sort-by="dated DESC"
-                        :label="t('params.campaignId')"
-                        option-label="code"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.code}`)
-                                    }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        toDate(scope.opt.dated)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.from')"
-                        v-model="params.from"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.to')"
-                        v-model="params.to"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-en:
-    params:
-        item: Item id
-        buyer: Buyer
-        type: Type
-        category: Category
-        itemId: Item id
-        buyerId: Buyer
-        typeId: Type
-        categoryId: Category
-        from: From
-        to: To
-        campaignId: Campaña
-        valentinesDay: Valentine's Day
-        mothersDay: Mother's Day
-        allSaints: All Saints' Day
-es:
-    params:
-        item: Id artículo
-        buyer: Comprador
-        type: Tipo
-        category: Categoría
-        itemId: Id Artículo
-        buyerId: Comprador
-        typeId: Tipo
-        categoryId: Reino
-        from: Desde
-        to: Hasta
-        campaignId: Campaña
-        valentinesDay: Día de San Valentín
-        mothersDay: Día de la Madre
-        allSaints: Día de Todos los Santos
-</i18n>

src/pages/Customer/Card/CustomerCredits.vue

@@ -59,6 +59,7 @@ const columns = computed(() => [
 </script>
 <template>
     <VnTable
+        :user-filter="{ include: filter.include }"
         ref="tableRef"
         data-key="ClientCredit"
         url="ClientCredits"

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -187,14 +187,18 @@ const debtWarning = computed(() => {
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'AccountSummary',
+                        name: 'OrderList',
-                        params: { id: entity.id },
+                        query: {
+                            createForm: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
-                    icon="face"
+                    icon="vn:basketadd"
                     color="primary"
                 >
-                    <QTooltip>{{ t('Go to user') }}</QTooltip>
+                    <QTooltip>{{ t('globals.pageTitles.createOrder') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="entity.supplier"
@@ -218,14 +222,9 @@ en:
     unpaidDated: 'Date {dated}'
     unpaidAmount: 'Amount {amount}'
 es:
-    Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
-    New ticket: Nuevo ticket
-    Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
-    Customer unpaid: Cliente impago
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'
     unpaidAmount: 'Importe {amount}'

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -51,7 +51,6 @@ const openCreateForm = (type) => {
     };
     const clientFk = {
         ticket: 'clientId',
-        order: 'clientFk',
     };
     const key = clientFk[type];
     if (!key) return;
@@ -70,11 +69,6 @@ const openCreateForm = (type) => {
             {{ t('globals.pageTitles.createTicket') }}
         </QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="openCreateForm('order')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createOrder') }}
-        </QItemSection>
-    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -44,6 +44,7 @@ function handleLocation(data, location) {
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
+                    uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>

src/pages/Customer/Card/CustomerGreuges.vue

@@ -84,6 +84,7 @@ const columns = computed(() => [
             component: 'number',
             autofocus: true,
             required: true,
+            positive: false,
         },
         format: ({ amount }) => toCurrency(amount),
         create: true,

src/pages/Customer/CustomerList.vue

@@ -5,18 +5,19 @@ import { useRouter } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDate } from 'src/filters';
 
-import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const tableRef = ref();
+const dataKey = 'CustomerList';
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -50,6 +51,14 @@ const columns = computed(() => [
         isTitle: true,
         create: true,
         columnClass: 'expand',
+        attrs: {
+            uppercase: true,
+        },
+        columnFilter: {
+            attrs: {
+                uppercase: false,
+            },
+        },
     },
     {
         align: 'left',
@@ -390,82 +399,91 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <VnSearchbar
+    <VnSection
-        :info="t('You can search by customer id or name')"
+        :data-key="dataKey"
-        :label="t('Search customer')"
+        :columns="columns"
-        data-key="CustomerList"
+        prefix="customer"
-    />
+        :array-data-props="{
-    <RightMenu>
+            url: 'Clients/filter',
-        <template #right-panel>
+            order: ['id DESC'],
+        }"
+    >
+        <template #advanced-menu>
             <CustomerFilter data-key="CustomerList" />
         </template>
-    </RightMenu>
+        <template #body>
-    <VnTable
+            <VnTable
-        ref="tableRef"
+                ref="tableRef"
-        data-key="CustomerList"
+                :data-key="dataKey"
-        url="Clients/filter"
+                url="Clients/filter"
-        order="id DESC"
+                :create="{
-        :create="{
+                    urlCreate: 'Clients/createWithUser',
-            urlCreate: 'Clients/createWithUser',
+                    title: t('globals.pageTitles.customerCreate'),
-            title: t('globals.pageTitles.customerCreate'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {
-            formInitialData: {
+                        active: true,
-                active: true,
+                        isEqualizated: false,
-                isEqualizated: false,
+                    },
-            },
-        }"
-        :columns="columns"
-        :right-search="false"
-        redirect="customer"
-    >
-        <template #more-create-dialog="{ data }">
-            <VnSelectWorker
-                :label="t('customer.summary.salesPerson')"
-                v-model="data.salesPersonFk"
-                :params="{
-                    departmentCodes: ['VT', 'shopping'],
                 }"
-                :has-avatar="true"
+                :columns="columns"
-                :id-value="data.salesPersonFk"
+                :right-search="false"
-                emit-value
+                redirect="customer"
-                auto-load
             >
-                <template #prepend>
+                <template #more-create-dialog="{ data }">
-                    <VnAvatar
+                    <VnSelectWorker
-                        :worker-id="data.salesPersonFk"
+                        :label="t('customer.summary.salesPerson')"
-                        color="primary"
+                        v-model="data.salesPersonFk"
-                        :title="title"
+                        :params="{
+                            departmentCodes: ['VT', 'shopping'],
+                        }"
+                        :has-avatar="true"
+                        :id-value="data.salesPersonFk"
+                        emit-value
+                        auto-load
+                    >
+                        <template #prepend>
+                            <VnAvatar
+                                :worker-id="data.salesPersonFk"
+                                color="primary"
+                                :title="title"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectWorker>
+                    <VnLocation
+                        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
+                        v-model="data.location"
+                        @update:model-value="(location) => handleLocation(data, location)"
                     />
+                    <QInput v-model="data.userName" :label="t('Web user')" />
+                    <QInput
+                        :label="t('Email')"
+                        clearable
+                        type="email"
+                        v-model="data.email"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip max-width="400px">{{
+                                    t('customer.basicData.youCanSaveMultipleEmails')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
                 </template>
-                <template #option="scope">
+            </VnTable>
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ scope.opt?.nickname }},
-                                {{ scope.opt?.code }}</QItemLabel
-                            >
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelectWorker>
-            <VnLocation
-                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
-                v-model="data.location"
-                @update:model-value="(location) => handleLocation(data, location)"
-            />
-            <QInput v-model="data.userName" :label="t('Web user')" />
-            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
-                <template #append>
-                    <QIcon name="info" class="cursor-info">
-                        <QTooltip max-width="400px">{{
-                            t('customer.basicData.youCanSaveMultipleEmails')
-                        }}</QTooltip>
-                    </QIcon>
-                </template>
-            </QInput>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 <i18n>
 es:

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -214,7 +214,7 @@ const toCustomerSamples = () => {
             <template #custom-buttons>
                 <QBtn
                     :disabled="isLoading || !sampleType?.hasPreview"
-                    :label="t('Preview')"
+                    :label="t('globals.preview')"
                     :loading="isLoading"
                     @click.stop="getPreview()"
                     color="primary"
@@ -353,7 +353,6 @@ es:
     Its only used when sample is sent: Se utiliza únicamente cuando se envía la plantilla
     To who should the recipient replay?: ¿A quien debería responder el destinatario?
     Edit address: Editar dirección
-    Preview: Vista previa
     Email cannot be blank: Debes introducir un email
     Choose a sample: Selecciona una plantilla
     Choose a company: Selecciona una empresa

src/pages/Customer/locale/en.yml

@@ -94,6 +94,8 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
+    search: Search customer
+    searchInfo: You can search by customer ID
     params:
         id: Id
         isWorker: Is Worker

src/pages/Customer/locale/es.yml

@@ -1,5 +1,3 @@
-Search customer: Buscar cliente
-You can search by customer id or name: Puedes buscar por id o nombre del cliente
 customer:
     card:
         debt: Riesgo
@@ -96,6 +94,8 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
+    search: Buscar cliente
+    searchInfo: Puedes buscar por id o nombre del cliente
     params:
         id: ID
         isWorker: Es trabajador

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -106,7 +106,7 @@ const { openConfirmationModal } = useVnConfirm();
                     :to="{
                         name: 'WorkerList',
                         query: {
-                            params: JSON.stringify({ departmentFk: entityId }),
+                            table: JSON.stringify({ departmentFk: entityId }),
                         },
                     }"
                 >

src/pages/Entry/Card/EntryBasicData.vue

@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -11,7 +10,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
 
 const route = useRoute();
@@ -26,6 +25,7 @@ const onFilterTravelSelected = (formData, id) => {
     formData.travelFk = id;
 };
 </script>
+
 <template>
     <FetchData
         ref="companiesRef"
@@ -93,14 +93,13 @@ const onFilterTravelSelected = (formData, id) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection>
-                                <QItemLabel
+                                <QItemLabel>
-                                    >{{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.agencyModeName }} -
-                                    {{ scope.opt?.warehouseInName }} ({{
+                                    {{ scope.opt?.warehouseInName }}
-                                        toDate(scope.opt?.shipped)
+                                    ({{ toDate(scope.opt?.shipped) }}) →
-                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                    {{ scope.opt?.warehouseOutName }}
-                                        toDate(scope.opt?.landed)
+                                    ({{ toDate(scope.opt?.landed) }})
-                                    }})</QItemLabel
+                                </QItemLabel>
-                                >
                             </QItemSection>
                         </QItem>
                     </template>
@@ -126,6 +125,13 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
+                <VnInputNumber
+                    :label="t('entry.summary.commission')"
+                    v-model="data.commission"
+                    step="1"
+                    autofocus
+                    :positive="false"
+                />
                 <VnSelect
                     :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
@@ -133,12 +139,23 @@ const onFilterTravelSelected = (formData, id) => {
                     option-value="id"
                     option-label="code"
                 />
-                <QInput
+            </VnRow>
-                    :label="t('entry.summary.commission')"
+            <VnRow>
-                    v-model="data.commission"
+                <VnInputNumber
-                    type="number"
+                    v-model="data.initialTemperature"
-                    autofocus
+                    name="initialTemperature"
-                    min="0"
+                    :label="t('entry.basicData.initialTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    v-model="data.finalTemperature"
+                    name="finalTemperature"
+                    :label="t('entry.basicData.finalTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
                 />
             </VnRow>
             <VnRow>

src/pages/Entry/Card/EntryDescriptor.vue

@@ -147,7 +147,7 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Go to module index: Ir al índice del modulo
+    Show entry report: Ver informe del pedido
     Inventory entry: Es inventario
     Virtual entry: Es una redada
 </i18n>

src/pages/Entry/Card/EntrySummary.vue

@@ -7,7 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
@@ -193,6 +193,14 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
                 />
+                <VnLv
+                    :label="t('entry.basicData.initialTemperature')"
+                    :value="toCelsius(entry.initialTemperature)"
+                />
+                <VnLv
+                    :label="t('entry.basicData.finalTemperature')"
+                    :value="toCelsius(entry.finalTemperature)"
+                />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle

src/pages/Entry/EntryList.vue

@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { toDate } from 'src/filters';
+import { toCelsius, toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
@@ -157,6 +157,20 @@ const columns = computed(() => [
         name: 'invoiceAmount',
         cardVisible: true,
     },
+    {
+        align: 'left',
+        name: 'initialTemperature',
+        label: t('entry.basicData.initialTemperature'),
+        field: 'initialTemperature',
+        format: (row) => toCelsius(row.initialTemperature),
+    },
+    {
+        align: 'left',
+        name: 'finalTemperature',
+        label: t('entry.basicData.finalTemperature'),
+        field: 'finalTemperature',
+        format: (row) => toCelsius(row.finalTemperature),
+    },
     {
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
         name: 'isExcludedFromAvailable',
@@ -188,10 +202,10 @@ const columns = computed(() => [
         :array-data-props="{
             url: 'Entries/filter',
             order: 'id DESC',
-            userFilter: 'entryFilter',
+            userFilter: entryFilter,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <EntryFilter data-key="EntryList" />
         </template>
         <template #body>
@@ -217,7 +231,7 @@ const columns = computed(() => [
                         >
                             <QTooltip>{{
                                 t(
-                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable',
                                 )
                             }}</QTooltip>
                         </QIcon>

src/pages/Entry/locale/en.yml

@@ -40,6 +40,8 @@ entry:
         observation: Observation
         booked: Booked
         excludedFromAvailable: Inventory
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observations
         packagingFk: Box

src/pages/Entry/locale/es.yml

@@ -41,6 +41,8 @@ entry:
         commission: Comisión
         booked: Asentado
         excludedFromAvailable: Inventario
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observaciónes
         packagingFk: Embalaje

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -6,24 +6,16 @@ import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const $props = defineProps({ id: { type: Number, default: null } });
-const { push, currentRoute } = useRouter();
+const { currentRoute } = useRouter();
 const { t } = useI18n();
 
 const cardDescriptorRef = ref();
-const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
-const config = ref();
-const cplusRectificationTypes = ref([]);
-const siiTypeInvoiceIns = ref([]);
-const invoiceCorrectionTypes = ref([]);
 
 const filter = {
     include: [
@@ -85,12 +77,6 @@ const routes = reactive({
         return { name: 'EntryCard', params: { id } };
     },
 });
-const correctionFormData = reactive({
-    invoiceReason: 2,
-    invoiceType: 2,
-    invoiceClass: 6,
-});
-const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
 onBeforeMount(async () => {
     await setInvoiceCorrection(entityId.value);
@@ -122,38 +108,8 @@ async function setInvoiceCorrection(id) {
         (corrected) => corrected.correctingFk
     );
 }
-
-const createInvoiceInCorrection = async () => {
-    const { data: correctingId } = await axios.post(
-        'InvoiceIns/corrective',
-        Object.assign(correctionFormData, { id: entityId.value })
-    );
-    push({ path: `/invoice-in/${correctingId}/summary` });
-};
 </script>
 <template>
-    <FetchData
-        url="InvoiceInConfigs"
-        :where="{ fields: ['sageWithholdingFk'] }"
-        auto-load
-        @on-fetch="(data) => (config = data)"
-    />
-    <FetchData
-        url="CplusRectificationTypes"
-        @on-fetch="(data) => (cplusRectificationTypes = data)"
-        auto-load
-    />
-    <FetchData
-        url="SiiTypeInvoiceIns"
-        :where="{ code: { like: 'R%' } }"
-        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
-        auto-load
-    />
-    <FetchData
-        url="InvoiceCorrectionTypes"
-        @on-fetch="(data) => (invoiceCorrectionTypes = data)"
-        auto-load
-    />
     <CardDescriptor
         ref="cardDescriptorRef"
         module="InvoiceIn"
@@ -167,7 +123,10 @@ const createInvoiceInCorrection = async () => {
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
+            <VnLv
+                :label="t('invoicein.summary.bookedDate')"
+                :value="toDate(entity.booked)"
+            />
             <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
             <VnLv :label="t('invoicein.list.supplier')">
                 <template #value>
@@ -227,65 +186,6 @@ const createInvoiceInCorrection = async () => {
             </QCardActions>
         </template>
     </CardDescriptor>
-    <QDialog ref="correctionDialogRef">
-        <QCard>
-            <QCardSection>
-                <QItem class="q-px-none">
-                    <span class="text-primary text-h6 full-width">
-                        {{ t('Create rectificative invoice') }}
-                    </span>
-                    <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
-            </QCardSection>
-            <QCardSection>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            :label="t('Original invoice')"
-                            v-model="entityId"
-                            readonly
-                        />
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.class'))}`"
-                            v-model="correctionFormData.invoiceClass"
-                            :options="siiTypeInvoiceIns"
-                            option-value="id"
-                            option-label="code"
-                            :required="true"
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.type'))}`"
-                            v-model="correctionFormData.invoiceType"
-                            :options="cplusRectificationTypes"
-                            option-value="id"
-                            option-label="description"
-                            :required="true"
-                        />
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.reason'))}`"
-                            v-model="correctionFormData.invoiceReason"
-                            :options="invoiceCorrectionTypes"
-                            option-value="id"
-                            option-label="description"
-                            :required="true"
-                        />
-                    </QItemSection>
-                </QItem>
-            </QCardSection>
-            <QCardActions class="justify-end q-mr-sm">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn
-                    :label="t('globals.save')"
-                    color="primary"
-                    v-close-popup
-                    @click="createInvoiceInCorrection"
-                    :disable="isNotFilled"
-                />
-            </QCardActions>
-        </QCard>
-    </QDialog>
 </template>
 <style lang="scss" scoped>
 .q-dialog {

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -8,9 +8,12 @@ import { useAcl } from 'src/composables/useAcl';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
+import { useCapitalize } from 'src/composables/useCapitalize';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { hasAny } = useAcl();
 const { t } = useI18n();
@@ -31,6 +34,10 @@ const correctionDialogRef = ref();
 const invoiceInCorrection = reactive({ correcting: [], corrected: null });
 const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.id);
 const invoiceIn = computed(() => arrayData.store.data);
+const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
+const invoiceCorrectionTypes = ref([]);
+const cplusRectificationTypes = ref([]);
+const siiTypeInvoiceIns = ref([]);
 const actions = {
     unbook: {
         title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
@@ -48,6 +55,11 @@ const actions = {
     sendPdf: { cb: sendPdfInvoiceConfirmation },
     correct: { cb: () => correctionDialogRef.value.show() },
 };
+const correctionFormData = reactive({
+    invoiceReason: 2,
+    invoiceType: 2,
+    invoiceClass: 8,
+});
 const canEditProp = (props) =>
     hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
 
@@ -133,9 +145,39 @@ function sendPdfInvoice({ address }) {
             recipient: address,
         });
 }
+
+const createInvoiceInCorrection = async () => {
+    const { data: correctingId } = await axios.post(
+        'InvoiceIns/corrective',
+        Object.assign(correctionFormData, { id: entityId.value })
+    );
+    push({ path: `/invoice-in/${correctingId}/summary` });
+};
 </script>
 
 <template>
+    <FetchData
+        url="InvoiceCorrectionTypes"
+        @on-fetch="(data) => (invoiceCorrectionTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="CplusRectificationTypes"
+        @on-fetch="(data) => (cplusRectificationTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="SiiTypeInvoiceIns"
+        :where="{ code: { like: 'R%' } }"
+        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
+        auto-load
+    />
+    <FetchData
+        url="InvoiceInConfigs"
+        :where="{ fields: ['sageWithholdingFk'] }"
+        auto-load
+        @on-fetch="(data) => (config = data)"
+    />
     <InvoiceInToBook>
         <template #content="{ book }">
             <QItem
@@ -162,7 +204,7 @@ function sendPdfInvoice({ address }) {
         v-if="canEditProp('deleteById')"
         v-ripple
         clickable
-        @click="triggerMenu('invoicein.descriptorMenu.delete')"
+        @click="triggerMenu('delete')"
     >
         <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
     </QItem>
@@ -192,6 +234,79 @@ function sendPdfInvoice({ address }) {
     <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
         <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
     </QItem>
+    <QDialog ref="correctionDialogRef">
+        <QCard>
+            <QCardSection>
+                <QItem class="q-px-none">
+                    <span class="text-primary text-h6 full-width">
+                        {{ t('Create rectificative invoice') }}
+                    </span>
+                    <QBtn icon="close" flat round dense v-close-popup />
+                </QItem>
+            </QCardSection>
+            <QCardSection>
+                <QItem>
+                    <QItemSection>
+                        <QInput
+                            :label="t('Original invoice')"
+                            v-model="entityId"
+                            readonly
+                        />
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.class'))}`"
+                            v-model="correctionFormData.invoiceClass"
+                            :options="siiTypeInvoiceIns"
+                            option-value="id"
+                            option-label="code"
+                            :required="true"
+                        />
+                    </QItemSection>
+                    <QItemSection>
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.type'))}`"
+                            v-model="correctionFormData.invoiceType"
+                            :options="cplusRectificationTypes"
+                            option-value="id"
+                            option-label="description"
+                            :required="true"
+                        >
+                            <template #option="{ itemProps, opt }">
+                                <QItem v-bind="itemProps">
+                                    {{ console.log('opt: ', opt) }}
+                                    <QItemSection>
+                                        <QItemLabel
+                                            >{{ opt.id }} -
+                                            {{ opt.description }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                                <div></div>
+                            </template>
+                        </VnSelect>
+
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.reason'))}`"
+                            v-model="correctionFormData.invoiceReason"
+                            :options="invoiceCorrectionTypes"
+                            option-value="id"
+                            option-label="description"
+                            :required="true"
+                        />
+                    </QItemSection>
+                </QItem>
+            </QCardSection>
+            <QCardActions class="justify-end q-mr-sm">
+                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
+                <QBtn
+                    :label="t('globals.save')"
+                    color="primary"
+                    v-close-popup
+                    @click="createInvoiceInCorrection"
+                    :disable="isNotFilled"
+                />
+            </QCardActions>
+        </QCard>
+    </QDialog>
 </template>
 
 <i18n>

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -25,6 +25,7 @@ const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
 const invoiceInFormRef = ref();
+const expenseRef = ref();
 
 defineProps({
     actionIcon: {
@@ -89,6 +90,11 @@ const columns = computed(() => [
         field: (row) => row.foreignValue,
         align: 'left',
     },
+    {
+        name: 'total',
+        label: 'Total',
+        align: 'left',
+    },
 ]);
 
 const filter = {
@@ -128,8 +134,26 @@ function autocompleteExpense(evt, row, col) {
         ({ id }) => id == useAccountShortToStandard(param)
     );
 
-    if (lookup) row[col.model] = lookup;
+    expenseRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
 }
+
+const taxableBaseTotal = computed(() => {   
+    return getTotal(invoiceInFormRef.value.formData, 'taxableBase', );
+});
+
+const taxRateTotal = computed(() => {
+    return getTotal(invoiceInFormRef.value.formData, null, {
+        cb: taxRate,
+    });
+});
+
+
+const combinedTotal = computed(() => {
+    return +taxableBaseTotal.value + +taxRateTotal.value;
+});
+
+
+
 </script>
 <template>
     <FetchData
@@ -167,6 +191,7 @@ function autocompleteExpense(evt, row, col) {
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
                         <VnSelectDialog
+                            ref="expenseRef"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -270,26 +295,20 @@ function autocompleteExpense(evt, row, col) {
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{ getTotal(rows, 'taxableBase', { currency: 'default' }) }}
+                            {{ toCurrency(taxableBaseTotal) }}
                         </QTd>
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{
+                            {{ toCurrency(taxRateTotal) }}
-                                getTotal(rows, null, { cb: taxRate, currency: 'default' })
+                        </QTd>
-                            }}</QTd
+                        <QTd />
-                        >
                         <QTd>
-                            <template v-if="isNotEuro(invoiceIn.currency.code)">
+                            {{ toCurrency(combinedTotal) }}
-                                {{
-                                    getTotal(rows, 'foreignValue', {
-                                        currency: invoiceIn.currency.code,
-                                    })
-                                }}
-                            </template>
                         </QTd>
                     </QTr>
                 </template>
+
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                         <QCard bordered flat class="q-my-xs">

src/pages/Item/Card/ItemCard.vue

@@ -1,19 +1,11 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
-import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Item"
         base-url="Items"
         :descriptor="ItemDescriptor"
-        :filter-panel="ItemListFilter"
-        search-data-key="ItemList"
-        :searchbar-props="{
-            url: 'Items/filter',
-            label: 'searchbar.label',
-            info: 'searchbar.info',
-        }"
     />
 </template>

src/pages/Item/Card/ItemDiary.vue

@@ -1,7 +1,7 @@
 <script setup>
-import { onMounted, computed, reactive, ref, nextTick, watch } from 'vue';
+import { onMounted, computed, ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
@@ -22,19 +22,16 @@ import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const today = ref(Date.vnNew());
+const today = Date.vnNew();
+today.setHours(0, 0, 0, 0);
 const warehousesOptions = ref([]);
-const itemBalancesRef = ref(null);
+const itemBalances = computed(() => arrayDataItemBalances.store.data);
-const itemsBalanceFilter = reactive({
+const where = computed(() => arrayDataItemBalances.store.filter.where || {});
-    where: { itemFk: route.params.id, warehouseFk: null, date: null },
+const showWhatsBeforeInventory = ref(false);
-});
-const itemBalances = ref([]);
-const warehouseFk = ref(null);
-const _showWhatsBeforeInventory = ref(false);
 const inventoriedDate = ref(null);
+let arrayDataItemBalances = useArrayData('ItemBalances');
 
 const originTypeMap = {
     entry: {
@@ -122,36 +119,28 @@ const columns = computed(() => [
     },
 ]);
 
-const showWhatsBeforeInventory = computed({
-    get: () => _showWhatsBeforeInventory.value,
-    set: (val) => {
-        _showWhatsBeforeInventory.value = val;
-        if (!val) itemsBalanceFilter.where.date = null;
-        else itemsBalanceFilter.where.date = inventoriedDate.value ?? new Date();
-    },
-});
-
 onMounted(async () => {
-    today.value.setHours(0, 0, 0, 0);
+    const ref = where.value;
-    if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
+    const query = route.query;
-    else if (user.value) warehouseFk.value = user.value.warehouseFk;
+    inventoriedDate.value =
-    itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
+        (await axios.get('Configs/findOne')).data?.inventoried || today;
-    const { data } = await axios.get('Configs/findOne');
+
-    inventoriedDate.value = data.inventoried;
+    if (query.warehouseFk) ref.warehouseFk = query.warehouseFk;
+    else if (!ref.warehouseFk && user.value) ref.warehouseFk = user.value.warehouseFk;
+    if (ref.date) showWhatsBeforeInventory.value = true;
+    ref.itemFk = route.params.id;
+
+    arrayDataItemBalances = useArrayData('ItemBalances', {
+        url: 'Items/getBalance',
+        filter: { where: ref },
+    });
+
     await fetchItemBalances();
     await scrollToToday();
-    await updateWarehouse(warehouseFk.value);
+    await updateWarehouse(ref.warehouseFk);
 });
 
-watch(
+const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
-    () => router.currentRoute.value.params.id,
-    (newId) => {
-        itemsBalanceFilter.where.itemFk = newId;
-        itemBalancesRef.value.fetch();
-    }
-);
-
-const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
 
 const getBadgeAttrs = (_date) => {
     const isSameDate = date.isSameDate(today.value, _date);
@@ -178,23 +167,13 @@ const formatDateForAttribute = (dateValue) => {
 };
 
 async function updateWarehouse(warehouseFk) {
-    const stock = useArrayData('descriptorStock', {
+    const stock = useArrayData('descriptorStock', { userParams: { warehouseFk } });
-        userParams: {
-            warehouseFk,
-        },
-    });
     await stock.fetch({});
     stock.store.data.itemFk = route.params.id;
 }
 </script>
 
 <template>
-    <FetchData
-        ref="itemBalancesRef"
-        url="Items/getBalance"
-        :filter="itemsBalanceFilter"
-        @on-fetch="(data) => (itemBalances = data)"
-    />
     <FetchData
         url="Warehouses"
         :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
@@ -207,27 +186,30 @@ async function updateWarehouse(warehouseFk) {
                 <VnSelect
                     :label="t('itemDiary.warehouse')"
                     :options="warehousesOptions"
-                    hide-selected
+                    v-model="where.warehouseFk"
-                    option-label="name"
-                    option-value="id"
-                    dense
-                    v-model="itemsBalanceFilter.where.warehouseFk"
                     @update:model-value="
-                        (value) => fetchItemBalances() && updateWarehouse(value)
+                        (val) => fetchItemBalances() && updateWarehouse(val)
                     "
                     class="q-mr-lg"
+                    :is-clearable="false"
                 />
                 <QCheckbox
                     :label="t('itemDiary.showBefore')"
                     v-model="showWhatsBeforeInventory"
-                    @update:model-value="fetchItemBalances"
+                    @update:model-value="
+                        async (val) => {
+                            if (!val) where.date = null;
+                            else where.date = inventoriedDate;
+                            await fetchItemBalances();
+                        }
+                    "
                     class="q-mr-lg"
                 />
                 <VnInputDate
                     v-if="showWhatsBeforeInventory"
                     :label="t('itemDiary.since')"
                     dense
-                    v-model="itemsBalanceFilter.where.date"
+                    v-model="where.date"
                     @update:model-value="fetchItemBalances"
                 />
             </div>

src/pages/Item/Card/ItemLastEntries.vue

@@ -36,18 +36,7 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const where = {
+let arrayData = useArrayData('ItemLastEntries');
-    itemFk: route.params.id,
-};
-
-const arrayData = useArrayData('ItemLastEntries', {
-    url: 'Items/lastEntriesFilter',
-    order: ['landed DESC', 'buyFk DESC'],
-    exprBuilder: exprBuilder,
-    userFilter: {
-        where: where,
-    },
-});
 const itemLastEntries = ref([]);
 
 const columns = computed(() => [
@@ -161,25 +150,51 @@ const getDate = (date, type) => {
 };
 
 const updateFilter = async () => {
-    let filter;
+    let landed;
-    if (!from.value && to.value) filter = { lte: to.value };
+    if (!from.value && to.value) landed = { lte: to.value };
-    else if (from.value && !to.value) filter = { gte: from.value };
+    else if (from.value && !to.value) landed = { gte: from.value };
-    else if (from.value && to.value) filter = { between: [from.value, to.value] };
+    else if (from.value && to.value) landed = { between: [from.value, to.value] };
-
-    const userFilter = arrayData.store.userFilter.where;
-
-    userFilter.landed = filter;
 
+    arrayData.store.filter.where.landed = landed;
     await fetchItemLastEntries();
 };
 
 onMounted(async () => {
-    const _from = Date.vnNew();
+    const landed = arrayData.store.filter.where?.landed;
-    _from.setDate(_from.getDate() - 75);
+    arrayData = useArrayData('ItemLastEntries', {
-    from.value = getDate(_from, 'from');
+        url: 'Items/lastEntriesFilter',
-    const _to = Date.vnNew();
+        order: ['landed DESC', 'buyFk DESC'],
-    _to.setDate(_to.getDate() + 10);
+        exprBuilder: exprBuilder,
-    to.value = getDate(_to, 'to');
+        filter: {
+            where: {
+                itemFk: route.params.id,
+                landed,
+            },
+        },
+    });
+
+    if (landed) {
+        const key = Object.keys(landed)[0];
+        switch (key) {
+            case 'gte':
+                from.value = landed.gte;
+                break;
+            case 'lte':
+                to.value = landed.lte;
+                break;
+            case 'between':
+                from.value = landed.between[0];
+                to.value = landed.between[1];
+                break;
+        }
+    } else {
+        const _from = Date.vnNew();
+        _from.setDate(_from.getDate() - 75);
+        from.value = getDate(_from, 'from');
+        const _to = Date.vnNew();
+        _to.setDate(_to.getDate() + 10);
+        to.value = getDate(_to, 'to');
+    }
 
     updateFilter();
 

src/pages/Item/ItemList.vue

@@ -6,18 +6,17 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { toDate } from 'src/filters';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import ItemSummary from '../Item/Card/ItemSummary.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
 import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue';
 import { cloneItem } from 'src/pages/Item/composables/cloneItem';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemListFilter from './ItemListFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import axios from 'axios';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const entityId = computed(() => route.params.id);
 const { openCloneDialog } = cloneItem();
@@ -25,9 +24,11 @@ const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const tableRef = ref();
 const route = useRoute();
+const dataKey = 'ItemList';
 const validPriorities = ref([]);
 const defaultTag = ref();
 const defaultPriority = ref();
+
 const itemFilter = {
     include: [
         {
@@ -324,166 +325,174 @@ onBeforeMount(async () => {
     });
 });
 </script>
+
 <template>
-    <VnSearchbar
+    <VnSection
-        data-key="ItemList"
+        :data-key="dataKey"
-        :label="t('item.searchbar.label')"
+        :columns="columns"
-        :info="t('item.searchbar.info')"
+        prefix="item"
-    />
+        :array-data-props="{
-    <RightMenu>
+            url: 'Items/filter',
-        <template #right-panel>
+            order: ['isActive DESC', 'name', 'id'],
+            userFilter: itemFilter,
+        }"
+    >
+        <template #advanced-menu>
             <ItemListFilter data-key="ItemList" />
         </template>
-    </RightMenu>
+        <template #body>
-    <VnTable
+            <VnTable
-        v-if="defaultTag"
+                v-if="defaultTag"
-        ref="tableRef"
+                ref="tableRef"
-        data-key="ItemList"
+                :data-key="dataKey"
-        url="Items/filter"
+                :columns="columns"
-        :create="{
+                :right-search="false"
-            urlCreate: 'Items/new',
+                redirect="Item"
-            title: t('item.list.newItem'),
+                :create="{
-            onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
+                    urlCreate: 'Items/new',
-            formInitialData: {
+                    title: t('item.list.newItem'),
-                editorFk: entityId,
+                    onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
-                tag: defaultTag,
+                    formInitialData: {
-                priority: defaultPriority,
+                        editorFk: entityId,
-            },
+                        tag: defaultTag,
-        }"
+                        priority: defaultPriority,
-        :order="['isActive DESC', 'name', 'id']"
+                    },
-        :columns="columns"
+                }"
-        redirect="Item"
+                :is-editable="false"
-        :is-editable="false"
-        :right-search="false"
-        :filter="itemFilter"
-    >
-        <template #column-image="{ row }">
-            <VnImg
-                :id="row?.id"
-                zoom-resolution="1600x900"
-                :zoom="true"
-                class="rounded"
-            />
-        </template>
-        <template #column-id="{ row }">
-            <span class="link" @click.stop>
-                {{ row.id }}
-                <ItemDescriptorProxy :id="row.id" />
-            </span>
-        </template>
-        <template #column-typeName="{ row }">
-            <span class="link" @click.stop>
-                {{ row.typeName }}
-                {{ row.typeFk }}
-                <ItemTypeDescriptorProxy :id="row.typeFk" />
-            </span>
-        </template>
-        <template #column-userName="{ row }">
-            <span class="link" @click.stop>
-                {{ row.userName }}
-                <WorkerDescriptorProxy :id="row.buyerFk" />
-            </span>
-        </template>
-        <template #column-description="{ row }">
-            <div class="row column full-width justify-between items-start">
-                {{ row?.name }}
-                <div v-if="row?.subName" class="subName">
-                    {{ row?.subName.toUpperCase() }}
-                </div>
-            </div>
-            <FetchedTags :item="row" />
-        </template>
-        <template #more-create-dialog="{ data }">
-            <VnInput
-                v-model="data.provisionalName"
-                :label="t('globals.description')"
-                :is-required="true"
-            />
-            <VnSelect
-                url="Tags"
-                v-model="data.tag"
-                :label="t('globals.tag')"
-                :fields="['id', 'name']"
-                option-label="name"
-                option-value="id"
-                :is-required="true"
-                :sort-by="['name ASC']"
             >
-                <template #option="scope">
+                <template #column-image="{ row }">
-                    <QItem v-bind="scope.itemProps">
+                    <VnImg
-                        <QItemSection>
+                        :id="row?.id"
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                        zoom-resolution="1600x900"
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                        :zoom="true"
-                        </QItemSection>
+                        class="rounded"
-                    </QItem>
+                    />
                 </template>
-            </VnSelect>
+                <template #column-id="{ row }">
-            <VnSelect
+                    <span class="link" @click.stop>
-                :options="validPriorities"
+                        {{ row.id }}
-                v-model="data.priority"
+                        <ItemDescriptorProxy :id="row.id" />
-                :label="t('item.create.priority')"
+                    </span>
-                :is-required="true"
-            />
-            <VnSelect
-                url="ItemTypes"
-                v-model="data.typeFk"
-                :label="t('item.list.typeName')"
-                :fields="['id', 'code', 'name']"
-                option-label="name"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption>
-                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
                 </template>
-            </VnSelect>
+                <template #column-typeName="{ row }">
-            <VnSelect
+                    <span class="link" @click.stop>
-                url="Intrastats"
+                        {{ row.typeName }}
-                v-model="data.intrastatFk"
+                        {{ row.typeFk }}
-                :label="t('globals.intrastat')"
+                        <ItemTypeDescriptorProxy :id="row.typeFk" />
-                :fields="['id', 'description']"
+                    </span>
-                option-label="description"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
                 </template>
-            </VnSelect>
+                <template #column-userName="{ row }">
-            <VnSelect
+                    <span class="link" @click.stop>
-                url="Origins"
+                        {{ row.userName }}
-                v-model="data.originFk"
+                        <WorkerDescriptorProxy :id="row.buyerFk" />
-                :label="t('globals.origin')"
+                    </span>
-                :fields="['id', 'code', 'name']"
-                option-label="code"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption>
-                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
                 </template>
-            </VnSelect>
+                <template #column-description="{ row }">
+                    <div class="row column full-width justify-between items-start">
+                        {{ row?.name }}
+                        <div v-if="row?.subName" class="subName">
+                            {{ row?.subName.toUpperCase() }}
+                        </div>
+                    </div>
+                    <FetchedTags :item="row" :columns="3" />
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <VnInput
+                        v-model="data.provisionalName"
+                        :label="t('globals.description')"
+                        :is-required="true"
+                    />
+                    <VnSelect
+                        url="Tags"
+                        v-model="data.tag"
+                        :label="t('globals.tag')"
+                        :fields="['id', 'name']"
+                        option-label="name"
+                        option-value="id"
+                        :is-required="true"
+                        :sort-by="['name ASC']"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :options="validPriorities"
+                        v-model="data.priority"
+                        :label="t('item.create.priority')"
+                        :is-required="true"
+                    />
+                    <VnSelect
+                        url="ItemTypes"
+                        v-model="data.typeFk"
+                        :label="t('item.list.typeName')"
+                        :fields="['id', 'code', 'name']"
+                        option-label="name"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        url="Intrastats"
+                        v-model="data.intrastatFk"
+                        :label="t('globals.intrastat')"
+                        :fields="['id', 'description']"
+                        option-label="description"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        url="Origins"
+                        v-model="data.originFk"
+                        :label="t('globals.origin')"
+                        :fields="['id', 'code', 'name']"
+                        option-label="code"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 <style lang="scss" scoped>
 .subName {
@@ -497,5 +506,4 @@ es:
     New item: Nuevo artículo
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
-    Preview: Vista previa
 </i18n>

src/pages/Item/ItemListFilter.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
@@ -233,7 +232,7 @@ onMounted(async () => {
                 <QItemSection>
                     <VnSelect
                         :label="t('params.buyerFk')"
-                        v-model="params.buyerFk"
+                        v-model="params.workerFk"
                         @update:model-value="searchFn()"
                         :options="buyersOptions"
                         option-value="id"
@@ -266,10 +265,10 @@ onMounted(async () => {
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
                                     <QItemLabel>
-                                        {{ scope.opt?.name}}
+                                        {{ scope.opt?.name }}
                                     </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                        {{ `#${scope.opt?.id} , ${scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
@@ -369,7 +368,7 @@ onMounted(async () => {
                         :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
-                        option-value="label"                        
+                        option-value="label"
                         dense
                         outlined
                         rounded

src/pages/Item/ItemType/Card/ItemTypeCard.vue

@@ -1,20 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
-import ItemTypeFilter from 'src/pages/Item/ItemType/ItemTypeFilter.vue';
-import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
-        :filter-panel="ItemTypeFilter"
+    />
-        search-data-key="ItemTypeList"
-        search-url="ItemTypes"
-    >
-        <template #searchbar>
-            <ItemTypeSearchbar />
-        </template>
-    </VnCard>
 </template>

src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue

@@ -63,7 +63,3 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
     </CardDescriptor>
 </template>
 
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>

src/pages/Item/ItemType/ItemTypeFilter.vue

@@ -1,90 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-const { t } = useI18n();
-
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const emit = defineEmits(['search']);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        or: [
-                            {
-                                name: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                            {
-                                code: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                        ],
-                    };
-                }
-            }
-    }
-};
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        @search="emit('search')"
-        search-url="table"
-        :expr-builder="exprBuilder"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        name: Name
-        code: Code
-es:
-    params:
-        name: Nombre
-        code: Código
-    Name: Nombre
-    Code: Código
-</i18n>

src/pages/Item/ItemType/ItemTypeSearchbar.vue

@@ -1,19 +0,0 @@
-<script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import { useI18n } from 'vue-i18n';
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="ItemTypeList"
-        url="ItemTypes"
-        :label="t('Search item type')"
-        :info="t('Search itemType by id, name or code')"
-    />
-</template>
-<i18n>
-es:
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>

src/pages/Item/ItemType/locale/en.yml

@@ -15,3 +15,5 @@ itemType:
         promo: Promo
         itemPackingType: Item packing type
         isUnconventionalSize: Is unconventional size
+    search: Search item type
+    searchInfo: Search item type by id, name or code

src/pages/Item/ItemType/locale/es.yml

@@ -15,3 +15,5 @@ itemType:
         promo: Promoción
         itemPackingType: Tipo de embalaje
         isUnconventionalSize: Es de tamaño poco convencional
+    search: Buscar familia
+    searchInfo: Buscar familia por id, nombre o código

src/pages/Item/ItemTypeList.vue

@@ -1,17 +1,50 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import ItemTypeSearchbar from 'src/pages/Item/ItemType/ItemTypeSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import ItemTypeFilter from './ItemType/ItemTypeFilter.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
 const itemCategoriesOptions = ref([]);
 const temperatureOptions = ref([]);
+const dataKey = 'ItemTypeList';
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 
 const columns = computed(() => [
     {
@@ -103,49 +136,53 @@ const columns = computed(() => [
         @on-fetch="(data) => (temperatureOptions = data)"
         auto-load
     />
-    <RightMenu>
+    <VnSection
-        <template #right-panel>
+        :data-key="dataKey"
-            <ItemTypeFilter data-key="ItemTypeList" />
+        :columns="columns"
-        </template>
+        prefix="itemType"
-    </RightMenu>
+        :array-data-props="{
-    <ItemTypeSearchbar />
+            url: 'ItemTypes',
-    <VnTable
+            order: 'name ASC',
-        ref="tableRef"
+            exprBuilder,
-        data-key="ItemTypeList"
+            userFilter: {
-        url="ItemTypes"
+                include: {
-        :create="{
+                    relation: 'worker',
-            urlCreate: 'ItemTypes',
+                    scope: {
-            title: t('Create ItemTypes'),
+                        fields: ['id'],
-            onDataSaved: () => tableRef.reload(),
+                        include: {
-            formInitialData: {},
+                            relation: 'user',
-        }"
+                            scope: {
-        :user-filter="{
+                                fields: ['id', 'name'],
-            include: {
+                            },
-                relation: 'worker',
-                scope: {
-                    fields: ['id'],
-                    include: {
-                        relation: 'user',
-                        scope: {
-                            fields: ['id', 'name'],
                         },
                     },
                 },
             },
         }"
-        order="name ASC"
-        :columns="columns"
-        auto-load
-        :right-search="false"
-        redirect="item/item-type"
     >
-        <template #column-workerFk="{ row }">
+        <template #body>
-            <span class="link" @click.stop>
+            <VnTable
-                {{ row.worker?.user?.name }}
+                ref="tableRef"
-                <WorkerDescriptorProxy :id="row.workerFk" />
+                :data-key="dataKey"
-            </span>
+                :create="{
+                    urlCreate: 'ItemTypes',
+                    title: t('Create ItemTypes'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {},
+                }"
+                :columns="columns"
+                auto-load
+                redirect="item/item-type"
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </span>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 
 <i18n>

src/pages/Item/locale/en.yml

@@ -180,44 +180,46 @@ item:
         intrastat: Intrastat
         origin: Origin
     buyRequest:
-        ticketId: 'Ticket ID'
+        ticketId: Ticket ID
-        shipped: 'Shipped'
+        shipped: Shipped
-        requester: 'Requester'
+        requester: Requester
-        requested: 'Requested'
+        requested: Requested
-        price: 'Price'
+        price: Price
-        attender: 'Attender'
+        attender: Attender
-        item: 'Item'
+        item: Item
-        achieved: 'Achieved'
+        achieved: Achieved
-        concept: 'Concept'
+        concept: Concept
-        state: 'State'
+        state: State
     summary:
-        basicData: 'Basic data'
+        basicData: Basic data
-        otherData: 'Other data'
+        otherData: Other data
-        description: 'Description'
+        description: Description
-        tax: 'Tax'
+        tax: Tax
-        tags: 'Tags'
+        tags: Tags
-        botanical: 'Botanical'
+        botanical: Botanical
-        barcode: 'Barcode'
+        barcode: Barcode
-        name: 'Nombre'
+        name: Name
-        completeName: 'Nombre completo'
+        completeName: Complete name
-        family: 'Familia'
+        family: Family
-        size: 'Medida'
+        size: Size
-        origin: 'Origen'
+        origin: Origin
-        stems: 'Tallos'
+        stems: Stems
-        multiplier: 'Multiplicador'
+        multiplier: Multiplier
-        buyer: 'Comprador'
+        buyer: Buyer
-        doPhoto: 'Do photo'
+        doPhoto: Do photo
-        intrastatCode: 'Código intrastat'
+        intrastatCode: Intrastat code
         intrastat: 'Intrastat'
-        ref: 'Referencia'
+        ref: Reference
-        relevance: 'Relevancia'
+        relevance: Relevance
-        weight: 'Peso (gramos)/tallo'
+        weight: Weight (gram)/stem
-        units: 'Unidades/caja'
+        units: Units/box
-        expense: 'Gasto'
+        expense: Expense
-        generic: 'Genérico'
+        generic: Generic
-        recycledPlastic: 'Plástico reciclado'
+        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: 'Plástico no reciclado'
+        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: 'Cantidad mínima de venta'
+        minSalesQuantity: Min sales quantity
-        genus: 'Genus'
+        genus: Genus
-        specie: 'Specie'
+        specie: Specie
-    regularizeStock: Regularize stock
+    search: 'Search item'
+    searchInfo: 'You can search by id'
+    regularizeStock: Regularize stock

src/pages/Item/locale/es.yml

@@ -73,9 +73,6 @@ itemTags:
     addTag: Añadir etiqueta
     tag: Etiqueta
     value: Valor
-searchbar:
-    label: Buscar artículo
-    info: Buscar por id de artículo
 itemType:
     shared:
         code: Código
@@ -108,9 +105,6 @@ item:
         concept: Concepto
         denyOptions: Denegado
         scopeDays: Días en adelante
-    searchbar:
-        label: Buscar artículo
-        info: Puedes buscar por id
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -182,35 +176,35 @@ item:
         intrastat: Intrastat
         origin: Origen
     summary:
-        basicData: 'Datos básicos'
+        basicData: Datos básicos
-        otherData: 'Otros datos'
+        otherData: Otros datos
-        description: 'Descripción'
+        description: Descripción
-        tax: 'IVA'
+        tax: IVA
-        tags: 'Etiquetas'
+        tags: Etiquetas
-        botanical: 'Botánico'
+        botanical: Botánico
-        barcode: 'Código de barras'
+        barcode: Código de barras
-        name: 'Nombre'
+        name: Nombre
-        completeName: 'Nombre completo'
+        completeName: Nombre completo
-        family: 'Familia'
+        family: Familia
-        size: 'Medida'
+        size: Medida
-        origin: 'Origen'
+        origin: Origen
-        stems: 'Tallos'
+        stems: Tallos
-        multiplier: 'Multiplicador'
+        multiplier: Multiplicador
-        buyer: 'Comprador'
+        buyer: Comprador
-        doPhoto: 'Hacer foto'
+        doPhoto: Hacer foto
-        intrastatCode: 'Código intrastat'
+        intrastatCode: Código intrastat
-        intrastat: 'Intrastat'
+        intrastat: Intrastat
-        ref: 'Referencia'
+        ref: Referencia
-        relevance: 'Relevancia'
+        relevance: Relevancia
-        weight: 'Peso (gramos)/tallo'
+        weight: Peso (gramos)/tallo
-        units: 'Unidades/caja'
+        units: Unidades/caja
-        expense: 'Gasto'
+        expense: Gasto
-        generic: 'Genérico'
+        generic: Genérico
-        recycledPlastic: 'Plástico reciclado'
+        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: 'Plástico no reciclado'
+        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: 'Cantidad mínima de venta'
+        minSalesQuantity: Cantidad mínima de venta
-        genus: 'Genus'
+        genus: Genus
-        specie: 'Specie'
+        specie: Specie
     regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
@@ -222,4 +216,6 @@ item:
         item: 'Artículo'
         achieved: 'Conseguido'
         concept: 'Concepto'
-        state: 'Estado'
+        state: 'Estado'       
+    search: 'Buscar artículo'
+    searchInfo: 'Puedes buscar por id'

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -290,7 +290,7 @@ const columns = computed(() => [
                 },
             },
             {
-                title: t('salesTicketsTable.preview'),
+                title: t('globals.preview'),
                 icon: 'preview',
                 color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),

src/pages/Monitor/locale/en.yml

@@ -33,7 +33,6 @@ salesTicketsTable:
     isFragile: Is fragile
     zone: Zone
     goToLines: Go to lines
-    preview: Preview
     total: Total
     preparation: H.Prep
     payMethod: Pay method

src/pages/Order/Card/OrderCatalog.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -9,6 +9,7 @@ import CatalogItem from 'src/components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -89,14 +90,16 @@ watch(
             :search-remove-params="false"
         />
     </Teleport>
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <OrderCatalogFilter
+        <template #right-panel>
-            :data-key="dataKey"
+            <OrderCatalogFilter
-            :tag-value="tagValue"
+                :data-key="dataKey"
-            :tags="tags"
+                :tag-value="tagValue"
-            :initial-catalog-params="catalogParams"
+                :tags="tags"
-        />
+                :initial-catalog-params="catalogParams"
-    </Teleport>
+            />
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md" data-cy="orderCatalogPage">
         <div class="full-width">
             <VnPaginate :data-key="dataKey">
@@ -141,5 +144,5 @@ watch(
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
-    Search items: Buscar items
+    Search items: Buscar artículos
 </i18n>

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -115,6 +115,7 @@ const removeTagGroupParam = (params, search, valIndex) => {
     } else {
         params.tagGroups.splice(valIndex, 1);
     }
+    search();
 };
 
 const setCategoryList = (data) => {

src/pages/Order/Card/OrderLines.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { ref, computed, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
-import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import { confirm } from 'src/pages/Order/composables/confirmOrder';
 import { toCurrency, toDate } from 'src/filters';
@@ -16,9 +15,9 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const router = useRouter();
-const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -228,9 +227,8 @@ async function handleConfirm() {
         });
         router.push({
             name: 'TicketSale',
-            query: {
+            params: { id: ticket.data[0].ticketFk },
-                table: JSON.stringify({ id: ticket.data[0].ticketFk }),
+            query: { table: JSON.stringify({ filter: { limit: 20, skip: 0 } }) },
-            },
         });
     }
 }
@@ -265,23 +263,27 @@ watch(
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <QCard
+        <template #right-panel>
-            class="order-lines-summary q-pa-lg"
+            <QCard
-            v-if="orderSummary.vat && orderSummary.total"
+                class="order-lines-summary q-pa-lg"
-        >
+                v-if="orderSummary.vat && orderSummary.total"
-            <p class="header text-right block">
+            >
-                {{ t('summary') }}
+                <p class="header text-right block">
-            </p>
+                    {{ t('summary') }}
-            <VnLv
+                </p>
-                :label="t('subtotal') + ': '"
+                <VnLv
-                :value="toCurrency(orderSummary.total - orderSummary.vat)"
+                    :label="t('subtotal') + ': '"
-            />
+                    :value="toCurrency(orderSummary.total - orderSummary.vat)"
-            <VnLv :label="t('VAT') + ': '" :value="toCurrency(orderSummary?.vat)" />
+                />
-            <VnLv :label="t('total') + ': '" :value="toCurrency(orderSummary?.total)" />
+                <VnLv :label="t('VAT') + ': '" :value="toCurrency(orderSummary?.vat)" />
-        </QCard>
+                <VnLv
-    </Teleport>
+                    :label="t('total') + ': '"
-
+                    :value="toCurrency(orderSummary?.total)"
+                />
+            </QCard>
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableLinesRef"
         data-key="OrderLines"

src/pages/Order/OrderList.vue

@@ -190,7 +190,7 @@ const getDateColor = (date) => {
             order: ['landed DESC', 'clientFk ASC', 'id DESC'],
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <OrderFilter data-key="OrderList" />
         </template>
         <template #body>

src/pages/Parking/Card/ParkingCard.vue

@@ -1,19 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
-import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Parking"
         base-url="Parkings"
         :descriptor="ParkingDescriptor"
-        :filter-panel="ParkingFilter"
-        search-data-key="ParkingList"
-        :searchbar-props="{
-            url: 'Parkings',
-            label: 'parking.searchBar.label',
-            info: 'parking.searchBar.info',
-        }"
     />
 </template>

src/pages/Parking/ParkingList.vue

@@ -5,17 +5,17 @@ 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';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const stateStore = useStateStore();
 const { push } = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ParkingList';
 
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -37,58 +37,55 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <template>
+    <VnSection
-        <VnSearchbar
+        :data-key="dataKey"
-            data-key="ParkingList"
+        prefix="parking"
-            :label="t('Search parking')"
+        :array-data-props="{
-            :info="t('You can search by parking code')"
+            url: 'Parkings',
-        />
+            order: ['code'],
-    </template>
+            userFilter: filter,
-    <RightMenu>
+            exprBuilder,
-        <template #right-panel>
+        }"
+    >
+        <template #advanced-menu>
             <ParkingFilter data-key="ParkingList" />
         </template>
-    </RightMenu>
+        <template #body>
-    <QPage class="column items-center q-pa-md">
+            <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
+                <div class="vn-card-list">
-            <VnPaginate
+                    <VnPaginate :data-key="dataKey">
-                data-key="ParkingList"
+                        <template #body="{ rows }">
-                url="Parkings"
+                            <CardList
-                :user-filter="filter"
+                                v-for="row of rows"
-                :expr-builder="exprBuilder"
+                                :key="row.id"
-                :limit="20"
+                                :id="row.id"
-                order="code"
+                                :title="row.code"
-            >
+                                @click="
-                <template #body="{ rows }">
+                                    push({ path: `/shelving/parking/${row.id}/summary` })
-                    <CardList
+                                "
-                        v-for="row of rows"
+                            >
-                        :key="row.id"
+                                <template #list-items>
-                        :id="row.id"
+                                    <VnLv
-                        :title="row.code"
+                                        label="Sector"
-                        @click="push({ path: `/parking/${row.id}` })"
+                                        :value="row.sector?.description"
-                    >
+                                    />
-                        <template #list-items>
+                                    <VnLv
-                            <VnLv label="Sector" :value="row.sector?.description" />
+                                        :label="t('parking.pickingOrder')"
-                            <VnLv
+                                        :value="row.pickingOrder"
-                                :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>
-                        <template #actions>
+                    </VnPaginate>
-                            <QBtn
+                </div>
-                                :label="t('components.smartCard.openSummary')"
+            </QPage>
-                                @click.stop="viewSummary(row.id, ParkingSummary)"
+        </template>
-                                color="primary"
+    </VnSection>
-                            />
-                        </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/Parking/locale/en.yml

@@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Picking order
+    sector: Sector
+    row: Row
+    column: Column
+    search: Search parking
+    searchInfo: You can search by parking code

src/pages/Parking/locale/es.yml

@@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Orden de recogida
+    row: Fila
+    sector: Sector
+    column: Columna
+    search: Buscar parking
+    searchInfo: Puedes buscar por código de parking

src/pages/Route/RouteAutonomous.vue

@@ -142,7 +142,7 @@ const total = computed(() => {
 const openDmsUploadDialog = async () => {
     dmsDialog.value.rowsToCreateInvoiceIn = selectedRows.value
         .filter(
-            (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk
+            (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk,
         )
         .map((agencyTerm) => ({
             routeFk: agencyTerm.routeFk,
@@ -277,5 +277,4 @@ es:
     Price: Precio
     Received: Recibida
     Autonomous: Autónomos
-    Preview: Vista previa
 </i18n>