feat: refs #8450 added new version

.eslintrc.cjs

@@ -1,4 +1,4 @@
-export default {
+module.exports = {
     // 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 @@ export default {
     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',
     },

.husky/addReferenceTag.js

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

.prettierrc.js

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

commitlint.config.js

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

cypress.config.js

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

package.json

@@ -6,7 +6,6 @@
     "author": "Verdnatura",
     "private": true,
     "packageManager": "pnpm@8.15.1",
-    "type": "module",
     "scripts": {
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
@@ -21,14 +20,14 @@
         "addReferenceTag": "node .husky/addReferenceTag.js"
     },
     "dependencies": {
-        "@quasar/cli": "^2.4.1",
-        "@quasar/extras": "^1.16.16",
+        "@quasar/cli": "^2.3.0",
+        "@quasar/extras": "^1.16.14",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
         "moment": "^2.30.1",
         "pinia": "^2.1.3",
-        "quasar": "^2.17.7",
+        "quasar": "^2.17.4",
         "validator": "^13.9.0",
         "vue": "^3.5.13",
         "vue-i18n": "^9.3.0",
@@ -37,23 +36,22 @@
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^2.0.8",
-        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/app-vite": "^1.11.0",
+        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
         "@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": "^9.18.0",
-        "eslint-config-prettier": "^10.0.1",
-        "eslint-plugin-cypress": "^4.1.0",
-        "eslint-plugin-vue": "^9.32.0",
+        "eslint": "^8.41.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-cypress": "^2.13.3",
+        "eslint-plugin-vue": "^9.14.1",
         "husky": "^8.0.0",
         "postcss": "^8.4.23",
-        "prettier": "^3.4.2",
-        "sass": "^1.83.4",
+        "prettier": "^2.8.8",
         "vitest": "^0.34.0"
     },
     "engines": {
@@ -63,8 +61,8 @@
         "bun": ">= 1.0.25"
     },
     "overrides": {
-        "@vitejs/plugin-vue": "^5.2.1",
-        "vite": "^6.0.11",
+        "@vitejs/plugin-vue": "^5.0.4",
+        "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
 }

postcss.config.js

@@ -1,14 +1,10 @@
 /* eslint-disable */
 // https://github.com/michael-ciniawsky/postcss-load-config
 
-import autoprefixer from 'autoprefixer';
-// Uncomment the following line if you want to support RTL CSS
-// import rtlcss from 'postcss-rtlcss';
-
-export default {
+module.exports = {
     plugins: [
         // https://github.com/postcss/autoprefixer
-        autoprefixer({
+        require('autoprefixer')({
             overrideBrowserslist: [
                 'last 4 Chrome versions',
                 'last 4 Firefox versions',
@@ -22,7 +18,10 @@ export default {
         }),
 
         // https://github.com/elchininet/postcss-rtlcss
-        // If you want to support RTL CSS, uncomment the following line:
-        // rtlcss(),
+        // If you want to support RTL css, then
+        // 1. yarn/npm install postcss-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
 
-import { configure } from 'quasar/wrappers';
-import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
-import path from 'path';
+const { configure } = require('quasar/wrappers');
+const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
+const path = require('path');
 
-export default configure(function (/* ctx */) {
+module.exports = configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,

quasar.extensions.json

@@ -1,8 +1,6 @@
 {
     "@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 = getToken();
+    const token = session.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 = async (error) => {
+const onResponseError = (error) => {
     stateQuery.remove(error.config);
 
-    if (isLoggedIn() && error.response?.status === 401) {
-        await useSession().destroy(false);
+    if (session.isLoggedIn() && error.response?.status === 401) {
+        session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
         Router.push(`/login?redirect=${url}`);
-    } else if (!isLoggedIn()) {
+    } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }
 

src/components/VnTable/VnTable.vue

@@ -314,19 +314,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <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>
+            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
         </QScrollArea>
     </QDrawer>
     <CrudModel

src/components/VnTable/VnTableFilter.vue

@@ -62,8 +62,5 @@ 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/common/VnDmsList.vue

@@ -102,7 +102,7 @@ const columns = computed(() => [
                 storage: 'dms',
                 collection: null,
                 resolution: null,
-                id: Number(prop.row.file.split('.')[0]),
+                id: prop.row.file.split('.')[0],
                 token: token,
                 class: 'rounded',
                 ratio: 1,

src/components/common/VnLocation.vue

@@ -70,9 +70,6 @@ const handleModelValue = (data) => {
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"
-        :option-label="
-            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
-        "
         url="Postcodes/filter"
         @update:model-value="handleModelValue"
         :use-like="false"

src/components/common/VnSection.vue

@@ -2,9 +2,9 @@
 import RightMenu from './RightMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
+import { onBeforeMount, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
 
 const $props = defineProps({
@@ -47,12 +47,16 @@ const $props = defineProps({
 });
 
 const route = useRoute();
-const router = useRouter();
-
 let arrayData;
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
-const isMainSection = ref(false);
-
+const isMainSection = computed(() => {
+    const isSame = sectionValue.value == route.name;
+    if (!isSame && arrayData) {
+        arrayData.reset(['userParams', 'filter']);
+        arrayData.setCurrentFilter();
+    }
+    return isSame;
+});
 const searchbarId = 'section-searchbar';
 const hasContent = useHasContent(`#${searchbarId}`);
 
@@ -64,23 +68,7 @@ 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">

src/components/common/VnSelect.vue

@@ -27,7 +27,7 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String, Function],
+        type: [String],
         default: 'name',
     },
     optionValue: {

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

@@ -1,91 +0,0 @@
-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/QCalendarMonthWrapper.vue

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

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

@@ -1,71 +0,0 @@
-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

@@ -9,7 +9,7 @@ const arrayDataStore = useArrayDataStore();
 
 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);

src/composables/useSession.js

@@ -6,7 +6,6 @@ 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';
 
@@ -16,6 +15,19 @@ 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.scss';
+@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
 
 body.body--light {
     --vn-header-color: #cecece;

src/css/icons.scss

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icon';
-  src:  url('fonts/icon.eot?y0x93o');
-  src:  url('fonts/icon.eot?y0x93o#iefix') format('embedded-opentype'),
-    url('fonts/icon.ttf?y0x93o') format('truetype'),
-    url('fonts/icon.woff?y0x93o') format('woff'),
-    url('fonts/icon.svg?y0x93o#icon') format('svg');
+  src:  url('fonts/icon.eot?7j3xju');
+  src:  url('fonts/icon.eot?7j3xju#iefix') format('embedded-opentype'),
+    url('fonts/icon.ttf?7j3xju') format('truetype'),
+    url('fonts/icon.woff?7j3xju') format('woff'),
+    url('fonts/icon.svg?7j3xju#icon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -25,8 +25,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-entry_lastbuys:before {
-  content: "\e91a";
+.icon-hasItemLost:before {
+  content: "\e957";
+}
+.icon-hasItemDelay:before {
+  content: "\e96d";
+}
+.icon-add_entries:before {
+  content: "\e953";
 }
 .icon-100:before {
   content: "\e901";
@@ -52,6 +58,9 @@
 .icon-addperson:before {
   content: "\e908";
 }
+.icon-agencia_tributaria:before {
+  content: "\e948";
+}
 .icon-agency:before {
   content: "\e92a";
 }
@@ -189,6 +198,9 @@
 .icon-entry:before {
   content: "\e937";
 }
+.icon-entry_lastbuys:before {
+  content: "\e91a";
+}
 .icon-exit:before {
   content: "\e938";
 }

src/pages/Customer/Card/CustomerCard.vue

@@ -1,12 +1,25 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
-import CustomerDescriptor from './CustomerDescriptor.vue';
-</script>
+import { computed } from '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>
-    <VnCardBeta
+    <VnCard
         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/CustomerConsumptionFilter.vue

@@ -0,0 +1,177 @@
+<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/CustomerList.vue

@@ -5,19 +5,18 @@ 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',
@@ -399,91 +398,82 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <VnSection
-        :data-key="dataKey"
-        :columns="columns"
-        prefix="customer"
-        :array-data-props="{
-            url: 'Clients/filter',
-            order: ['id DESC'],
-        }"
-    >
-        <template #rightMenu>
+    <VnSearchbar
+        :info="t('You can search by customer id or name')"
+        :label="t('Search customer')"
+        data-key="CustomerList"
+    />
+    <RightMenu>
+        <template #right-panel>
             <CustomerFilter data-key="CustomerList" />
         </template>
-        <template #body>
-            <VnTable
-                ref="tableRef"
-                :data-key="dataKey"
-                url="Clients/filter"
-                :create="{
-                    urlCreate: 'Clients/createWithUser',
-                    title: t('globals.pageTitles.customerCreate'),
-                    onDataSaved: ({ id }) => tableRef.redirect(id),
-                    formInitialData: {
-                        active: true,
-                        isEqualizated: false,
-                    },
+    </RightMenu>
+    <VnTable
+        ref="tableRef"
+        data-key="CustomerList"
+        url="Clients/filter"
+        order="id DESC"
+        :create="{
+            urlCreate: 'Clients/createWithUser',
+            title: t('globals.pageTitles.customerCreate'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {
+                active: true,
+                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'],
                 }"
-                :columns="columns"
-                :right-search="false"
-                redirect="customer"
+                :has-avatar="true"
+                :id-value="data.salesPersonFk"
+                emit-value
+                auto-load
             >
-                <template #more-create-dialog="{ data }">
-                    <VnSelectWorker
-                        :label="t('customer.summary.salesPerson')"
-                        v-model="data.salesPersonFk"
-                        :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)"
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
                     />
-                    <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>
+                <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>
-    </VnSection>
+    </VnTable>
 </template>
 <i18n>
 es:

src/pages/Customer/locale/en.yml

@@ -94,8 +94,6 @@ 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,3 +1,5 @@
+Search customer: Buscar cliente
+You can search by customer id or name: Puedes buscar por id o nombre del cliente
 customer:
     card:
         debt: Riesgo
@@ -94,8 +96,6 @@ 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/Worker/Card/WorkerCalendarItem.vue

@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 
 import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
 import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
 
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import useNotify from 'src/composables/useNotify.js';

src/pages/Worker/WorkerList.vue

@@ -196,7 +196,7 @@ async function autofillBic(worker) {
         prefix="workerSearch"
         :array-data-props="{
             url: 'Workers/filter',
-            order: 'id DESC',
+            order: ['id DESC'],
         }"
     >
         <template #rightMenu>

src/pages/Zone/ZoneCalendar.vue

@@ -7,7 +7,7 @@ import { useRoute } from 'vue-router';
 import ZoneClosingTable from './ZoneClosingTable.vue';
 import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
 import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
 
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import axios from 'axios';

src/router/index.js

@@ -1,4 +1,4 @@
-import { route as defineRouter } from 'quasar/wrappers';
+import { route } from 'quasar/wrappers';
 import {
     createRouter,
     createMemoryHistory,
@@ -8,14 +8,14 @@ import {
 import routes from './routes';
 import { i18n } from 'src/boot/i18n';
 import { useState } from 'src/composables/useState';
+import { useSession } from 'src/composables/useSession';
 import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
 import { useAcl } from 'src/composables/useAcl';
-import { isLoggedIn } from 'src/utils/session';
-import { useSession } from 'src/composables/useSession';
 
-let session = null;
+const state = useState();
+const session = useSession();
 const { t, te } = i18n.global;
 
 const createHistory = process.env.SERVER
@@ -43,12 +43,11 @@ const Router = createRouter({
  * with the Router instance.
  */
 export { Router };
-export default defineRouter(function (/* { store, ssrContext } */) {
-    const state = useState();
+export default route(function (/* { store, ssrContext } */) {
     Router.beforeEach(async (to, from, next) => {
-        if (!session) session = useSession();
+        const { isLoggedIn } = session;
         const outLayout = Router.options.routes[0].children.map((r) => r.name);
-        if (!session.isLoggedIn() && !outLayout.includes(to.name)) {
+        if (!isLoggedIn() && !outLayout.includes(to.name)) {
             return next({ name: 'Login', query: { redirect: to.fullPath } });
         }
 

src/router/modules/customer.js

@@ -1,12 +1,24 @@
 import { RouterView } from 'vue-router';
 
-const customerCard = {
-    name: 'CustomerCard',
-    path: ':id',
-    component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
-    redirect: { name: 'CustomerSummary' },                                           
-    meta: { 
-        menu: [
+export default {
+    path: '/customer',
+    name: 'Customer',
+    meta: {
+        title: 'customers',
+        icon: 'vn:client',
+        moduleName: 'Customer',
+        keyBinding: 'c',
+    },
+    component: RouterView,
+    redirect: { name: 'CustomerMain' },
+    menus: {
+        main: [
+            'CustomerList',
+            'CustomerPayments',
+            'CustomerNotifications',
+            'CustomerDefaulter',
+        ],
+        card: [
             'CustomerBasicData',
             'CustomerFiscalData',
             'CustomerBillingData',
@@ -25,449 +37,19 @@ const customerCard = {
     },
     children: [
         {
-            name: 'CustomerSummary',
-            path: 'summary',
-            meta: {
-                title: 'summary',
-                icon: 'launch',
-            },
-            component: () => import('src/pages/Customer/Card/CustomerSummary.vue'),
-        },
-        {
-            path: 'basic-data',
-            name: 'CustomerBasicData',
-            meta: {
-                title: 'basicData',
-                icon: 'vn:settings',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerBasicData.vue'),
-        },
-        {
-            path: 'fiscal-data',
-            name: 'CustomerFiscalData',
-            meta: {
-                title: 'fiscalData',
-                icon: 'vn:dfiscales',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerFiscalData.vue'),
-        },
-        {
-            path: 'billing-data',
-            name: 'CustomerBillingData',
-            meta: {
-                title: 'billingData',
-                icon: 'vn:payment',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerBillingData.vue'),
-        },
-        {
-            path: 'address',
-            name: 'AddressCard',
-            redirect: { name: 'CustomerAddress' },
-            children: [
-                {
-                    path: '',
-                    name: 'CustomerAddress',
-                    meta: {
-                        icon: 'vn:delivery',
-                        title: 'consignees',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerAddress.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'CustomerAddressCreate',
-                    meta: {
-                        title: 'address-create',
-                    },
-                    component: () =>
-                        import(
-                            'src/pages/Customer/components/CustomerAddressCreate.vue'
-                        ),
-                },
-                {
-                    path: ':addressId',
-                    name: 'CustomerAddressEditCard',
-                    redirect: { name: 'CustomerAddressEdit' },
-                    children: [
-                        {
-                            path: 'edit',
-                            name: 'CustomerAddressEdit',
-                            meta: {
-                                title: 'addressEdit',
-                            },
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/components/CustomerAddressEdit.vue'
-                                ),
-                        },
-                    ],
-                },
-            ],
-        },
-        {
-            path: 'notes',
-            name: 'CustomerNotes',
-            meta: {
-                title: 'notes',
-                icon: 'vn:notes',
-            },
-            component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
-        },
-        {
-            path: 'credits',
-            name: 'CustomerCredits',
-            meta: {
-                title: 'credits',
-                icon: 'vn:credit',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerCredits.vue'),
-        },
-        {
-            path: 'greuges',
-            name: 'CustomerGreuges',
-            meta: {
-                title: 'greuges',
-                icon: 'vn:greuge',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerGreuges.vue'),
-        },
-        {
-            path: 'balance',
-            name: 'CustomerBalance',
-            meta: {
-                title: 'balance',
-                icon: 'balance',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerBalance.vue'),
-        },
-        {
-            path: 'recoveries',
-            name: 'CustomerRecoveries',
-            meta: {
-                title: 'recoveries',
-                icon: 'vn:recovery',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerRecoveries.vue'),
-        },
-        {
-            path: 'web-access',
-            name: 'CustomerWebAccess',
-            meta: {
-                title: 'webAccess',
-                icon: 'vn:web',
-            },
-            component: () =>
-                import('src/pages/Customer/Card/CustomerWebAccess.vue'),
-        },
-        {
-            path: 'log',
-            name: 'CustomerLog',
-            meta: {
-                title: 'log',
-                icon: 'vn:History',
-            },
-            component: () => import('src/pages/Customer/Card/CustomerLog.vue'),
-        },
-        {
-            path: 'sms',
-            name: 'CustomerSms',
-            meta: {
-                title: 'sms',
-                icon: 'sms',
-            },
-            component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
-        },
-        {
-            path: 'credit-management',
-            name: 'CustomerCreditManagement',
-            meta: {
-                title: 'creditManagement',
-                icon: 'paid',
-                menuChildren: [
-                    {
-                        name: 'CustomerCreditContracts',
-                        title: 'creditContracts',
-                        icon: 'vn:solunion',
-                    },
-                    {
-                        name: 'CustomerCreditOpinion',
-                        title: 'creditOpinion',
-                        icon: 'vn:linesprepaired',
-                    },
-                ],
-            },
-            children: [
-                {
-                    path: 'credit-contracts',
-                    name: 'CreditContractsCard',
-                    redirect: { name: 'CustomerCreditContracts' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'CustomerCreditContracts',
-                            meta: {
-                                title: 'creditContracts',
-                            },
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/Card/CustomerCreditContracts.vue'
-                                ),
-                        },
-                        {
-                            path: 'create',
-                            name: 'CustomerCreditContractsCreate',
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/components/CustomerCreditContractsCreate.vue'
-                                ),
-                        },
-                        {
-                            path: 'insurance/:creditId',
-                            name: 'CustomerCreditContractsInsurance',
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/components/CustomerCreditContractsInsurance.vue'
-                                ),
-                        },
-                    ],
-                },
-                {
-                    path: 'credit-opinion',
-                    name: 'CustomerCreditOpinion',
-                    meta: {
-                        title: 'creditOpinion',
-                    },
-                    component: () =>
-                        import(
-                            'src/pages/Customer/Card/CustomerCreditOpinion.vue'
-                        ),
-                },
-            ],
-        },
-        {
-            path: 'others',
-            name: 'CustomerOthers',
-            meta: {
-                title: 'others',
-                icon: 'pending',
-                menuChildren: [
-                    {
-                        name: 'CustomerSamples',
-                        title: 'samples',
-                        icon: 'vn:notes',
-                    },
-                    {
-                        name: 'CustomerConsumption',
-                        title: 'consumption',
-                        icon: 'show_chart',
-                    },
-                    {
-                        name: 'CustomerMandates',
-                        title: 'mandates',
-                        icon: 'vn:mandatory',
-                    },
-                    {
-                        name: 'CustomerContacts',
-                        title: 'contacts',
-                        icon: 'contact_phone',
-                    },
-                    {
-                        name: 'CustomerWebPayment',
-                        title: 'webPayment',
-                        icon: 'vn:onlinepayment',
-                    },
-                    {
-                        name: 'CustomerFileManagement',
-                        title: 'fileManagement',
-                        icon: 'Upload',
-                    },
-                    {
-                        name: 'CustomerUnpaid',
-                        title: 'unpaid',
-                        icon: 'vn:defaulter',
-                    },
-                ],
-            },
-            children: [
-                {
-                    path: 'samples',
-                    name: 'CustomerSamples',
-                    meta: {
-                        title: 'samples',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerSamples.vue'),
-                },
-                {
-                    path: 'samples',
-                    name: 'CustomerSamplesCard',
-                    redirect: { name: 'CustomerSamples' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'CustomerSamples',
-                            meta: {
-                                title: 'samples',
-                            },
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/Card/CustomerSamples.vue'
-                                ),
-                        },
-                        {
-                            path: 'create',
-                            name: 'CustomerSamplesCreate',
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/components/CustomerSamplesCreate.vue'
-                                ),
-                        },
-                    ],
-                },
-                {
-                    path: 'consumption',
-                    name: 'CustomerConsumption',
-                    meta: {
-                        title: 'consumption',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerConsumption.vue'),
-                },
-                {
-                    path: 'mandates',
-                    name: 'CustomerMandates',
-                    meta: {
-                        title: 'mandates',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerMandates.vue'),
-                },
-                {
-                    path: 'contacts',
-                    name: 'CustomerContacts',
-                    meta: {
-                        title: 'contacts',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerContacts.vue'),
-                },
-                {
-                    path: 'web-payment',
-                    name: 'CustomerWebPayment',
-                    meta: {
-                        title: 'webPayment',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerWebPayment.vue'),
-                },
-                {
-                    path: 'file-management',
-                    name: 'CustomerFileManagement',
-                    meta: {
-                        title: 'fileManagement',
-                    },
-                    component: () =>
-                        import(
-                            'src/pages/Customer/Card/CustomerFileManagement.vue'
-                        ),
-                },
-                {
-                    path: 'file-management',
-                    name: 'CustomerFileManagementCard',
-                    redirect: { name: 'CustomerFileManagement' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'CustomerFileManagement',
-                            meta: {
-                                title: 'fileManagement',
-                            },
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/Card/CustomerFileManagement.vue'
-                                ),
-                        },
-                        {
-                            path: 'create',
-                            name: 'CustomerFileManagementCreate',
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/components/CustomerFileManagementCreate.vue'
-                                ),
-                        },
-                        {
-                            path: ':dmsId/edit',
-                            name: 'CustomerFileManagementEdit',
-                            component: () =>
-                                import(
-                                    'src/pages/Customer/components/CustomerFileManagementEdit.vue'
-                                ),
-                        },
-                    ],
-                },
-                {
-                    path: 'unpaid',
-                    name: 'CustomerUnpaid',
-                    meta: {
-                        title: 'unpaid',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerUnpaid.vue'),
-                },
-            ],
-        },
-    ],
-};
-
-export default {
-    name: 'Customer',    
-    path: '/customer',
-    meta: {
-        title: 'customers',
-        icon: 'vn:client',
-        moduleName: 'Customer',
-        keyBinding: 'c',
-        menu: [
-            'CustomerList',
-            'CustomerPayments',
-            'CustomerNotifications',
-            'CustomerDefaulter',
-        ],
-    },
-    component: RouterView,
-    redirect: { name: 'CustomerMain' },
-    children: [
-        {
-            name: 'CustomerMain',
             path: '',
+            name: 'CustomerMain',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'CustomerIndexMain' },
+            redirect: { name: 'CustomerList' },
             children: [
                 {
-                    path: '',
-                    name: 'CustomerIndexMain',
-                    redirect: { name: 'CustomerList' },
+                    path: 'list',
+                    name: 'CustomerList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
                     component: () => import('src/pages/Customer/CustomerList.vue'),
-                    children: [
-                        {
-                            name: 'CustomerList',
-                            path: 'list',
-                            meta: {
-                                title: 'list',
-                                icon: 'view_list',
-                            },
-                        },
-                        customerCard,
-                    ],
                 },
                 {
                     path: 'create',
@@ -512,5 +94,415 @@ export default {
                 },
             ],
         },
+        {
+            name: 'CustomerCard',
+            path: ':id',
+            component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
+            redirect: { name: 'CustomerSummary' },
+            children: [
+                {
+                    name: 'CustomerSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerSummary.vue'),
+                },
+                {
+                    path: 'basic-data',
+                    name: 'CustomerBasicData',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBasicData.vue'),
+                },
+                {
+                    path: 'fiscal-data',
+                    name: 'CustomerFiscalData',
+                    meta: {
+                        title: 'fiscalData',
+                        icon: 'vn:dfiscales',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerFiscalData.vue'),
+                },
+                {
+                    path: 'billing-data',
+                    name: 'CustomerBillingData',
+                    meta: {
+                        title: 'billingData',
+                        icon: 'vn:payment',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBillingData.vue'),
+                },
+                {
+                    path: 'address',
+                    name: 'AddressCard',
+                    redirect: { name: 'CustomerAddress' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'CustomerAddress',
+                            meta: {
+                                icon: 'vn:delivery',
+                                title: 'consignees',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerAddress.vue'),
+                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerAddressCreate',
+                            meta: {
+                                title: 'address-create',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/components/CustomerAddressCreate.vue'
+                                ),
+                        },
+                        {
+                            path: ':addressId',
+                            name: 'CustomerAddressEditCard',
+                            redirect: { name: 'CustomerAddressEdit' },
+                            children: [
+                                {
+                                    path: 'edit',
+                                    name: 'CustomerAddressEdit',
+                                    meta: {
+                                        title: 'addressEdit',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/components/CustomerAddressEdit.vue'
+                                        ),
+                                },
+                            ],
+                        },
+                    ],
+                },
+                {
+                    path: 'notes',
+                    name: 'CustomerNotes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'vn:notes',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
+                },
+                {
+                    path: 'credits',
+                    name: 'CustomerCredits',
+                    meta: {
+                        title: 'credits',
+                        icon: 'vn:credit',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerCredits.vue'),
+                },
+                {
+                    path: 'greuges',
+                    name: 'CustomerGreuges',
+                    meta: {
+                        title: 'greuges',
+                        icon: 'vn:greuge',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerGreuges.vue'),
+                },
+                {
+                    path: 'balance',
+                    name: 'CustomerBalance',
+                    meta: {
+                        title: 'balance',
+                        icon: 'balance',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBalance.vue'),
+                },
+                {
+                    path: 'recoveries',
+                    name: 'CustomerRecoveries',
+                    meta: {
+                        title: 'recoveries',
+                        icon: 'vn:recovery',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerRecoveries.vue'),
+                },
+                {
+                    path: 'web-access',
+                    name: 'CustomerWebAccess',
+                    meta: {
+                        title: 'webAccess',
+                        icon: 'vn:web',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerWebAccess.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'CustomerLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerLog.vue'),
+                },
+                {
+                    path: 'sms',
+                    name: 'CustomerSms',
+                    meta: {
+                        title: 'sms',
+                        icon: 'sms',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
+                },
+                {
+                    path: 'credit-management',
+                    name: 'CustomerCreditManagement',
+                    meta: {
+                        title: 'creditManagement',
+                        icon: 'paid',
+                        menuChildren: [
+                            {
+                                name: 'CustomerCreditContracts',
+                                title: 'creditContracts',
+                                icon: 'vn:solunion',
+                            },
+                            {
+                                name: 'CustomerCreditOpinion',
+                                title: 'creditOpinion',
+                                icon: 'vn:linesprepaired',
+                            },
+                        ],
+                    },
+                    children: [
+                        {
+                            path: 'credit-contracts',
+                            name: 'CreditContractsCard',
+                            redirect: { name: 'CustomerCreditContracts' },
+                            children: [
+                                {
+                                    path: '',
+                                    name: 'CustomerCreditContracts',
+                                    meta: {
+                                        title: 'creditContracts',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/Card/CustomerCreditContracts.vue'
+                                        ),
+                                },
+                                {
+                                    path: 'create',
+                                    name: 'CustomerCreditContractsCreate',
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/components/CustomerCreditContractsCreate.vue'
+                                        ),
+                                },
+                                {
+                                    path: 'insurance/:creditId',
+                                    name: 'CustomerCreditContractsInsurance',
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/components/CustomerCreditContractsInsurance.vue'
+                                        ),
+                                },
+                            ],
+                        },
+                        {
+                            path: 'credit-opinion',
+                            name: 'CustomerCreditOpinion',
+                            meta: {
+                                title: 'creditOpinion',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerCreditOpinion.vue'
+                                ),
+                        },
+                    ],
+                },
+                {
+                    path: 'others',
+                    name: 'CustomerOthers',
+                    meta: {
+                        title: 'others',
+                        icon: 'pending',
+                        menuChildren: [
+                            {
+                                name: 'CustomerSamples',
+                                title: 'samples',
+                                icon: 'vn:notes',
+                            },
+                            {
+                                name: 'CustomerConsumption',
+                                title: 'consumption',
+                                icon: 'show_chart',
+                            },
+                            {
+                                name: 'CustomerMandates',
+                                title: 'mandates',
+                                icon: 'vn:mandatory',
+                            },
+                            {
+                                name: 'CustomerContacts',
+                                title: 'contacts',
+                                icon: 'contact_phone',
+                            },
+                            {
+                                name: 'CustomerWebPayment',
+                                title: 'webPayment',
+                                icon: 'vn:onlinepayment',
+                            },
+                            {
+                                name: 'CustomerFileManagement',
+                                title: 'fileManagement',
+                                icon: 'Upload',
+                            },
+                            {
+                                name: 'CustomerUnpaid',
+                                title: 'unpaid',
+                                icon: 'vn:defaulter',
+                            },
+                        ],
+                    },
+                    children: [
+                        {
+                            path: 'samples',
+                            name: 'CustomerSamples',
+                            meta: {
+                                title: 'samples',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerSamples.vue'),
+                        },
+                        {
+                            path: 'samples',
+                            name: 'CustomerSamplesCard',
+                            redirect: { name: 'CustomerSamples' },
+                            children: [
+                                {
+                                    path: '',
+                                    name: 'CustomerSamples',
+                                    meta: {
+                                        title: 'samples',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/Card/CustomerSamples.vue'
+                                        ),
+                                },
+                                {
+                                    path: 'create',
+                                    name: 'CustomerSamplesCreate',
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/components/CustomerSamplesCreate.vue'
+                                        ),
+                                },
+                            ],
+                        },
+                        {
+                            path: 'consumption',
+                            name: 'CustomerConsumption',
+                            meta: {
+                                title: 'consumption',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerConsumption.vue'),
+                        },
+                        {
+                            path: 'mandates',
+                            name: 'CustomerMandates',
+                            meta: {
+                                title: 'mandates',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerMandates.vue'),
+                        },
+                        {
+                            path: 'contacts',
+                            name: 'CustomerContacts',
+                            meta: {
+                                title: 'contacts',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerContacts.vue'),
+                        },
+                        {
+                            path: 'web-payment',
+                            name: 'CustomerWebPayment',
+                            meta: {
+                                title: 'webPayment',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerWebPayment.vue'),
+                        },
+                        {
+                            path: 'file-management',
+                            name: 'CustomerFileManagement',
+                            meta: {
+                                title: 'fileManagement',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerFileManagement.vue'
+                                ),
+                        },
+                        {
+                            path: 'file-management',
+                            name: 'CustomerFileManagementCard',
+                            redirect: { name: 'CustomerFileManagement' },
+                            children: [
+                                {
+                                    path: '',
+                                    name: 'CustomerFileManagement',
+                                    meta: {
+                                        title: 'fileManagement',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/Card/CustomerFileManagement.vue'
+                                        ),
+                                },
+                                {
+                                    path: 'create',
+                                    name: 'CustomerFileManagementCreate',
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/components/CustomerFileManagementCreate.vue'
+                                        ),
+                                },
+                                {
+                                    path: ':dmsId/edit',
+                                    name: 'CustomerFileManagementEdit',
+                                    component: () =>
+                                        import(
+                                            'src/pages/Customer/components/CustomerFileManagementEdit.vue'
+                                        ),
+                                },
+                            ],
+                        },
+                        {
+                            path: 'unpaid',
+                            name: 'CustomerUnpaid',
+                            meta: {
+                                title: 'unpaid',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerUnpaid.vue'),
+                        },
+                    ],
+                },
+            ],
+        },
     ],
 };

src/utils/session.js

@@ -1,23 +0,0 @@
-const TOKEN_MULTIMEDIA = 'tokenMultimedia';
-const TOKEN = 'token';
-
-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 isLoggedIn() {
-    const localToken = localStorage.getItem(TOKEN);
-    const sessionToken = sessionStorage.getItem(TOKEN);
-
-    return !!(localToken || sessionToken);
-}
-
-export { getToken, getTokenMultimedia, isLoggedIn };