Merge branch 'master' into hotfix_hasDocuware_call

.eslintignore

@@ -1,6 +0,0 @@
-/dist
-/src-capacitor
-/src-cordova
-/.quasar
-/node_modules
-.eslintrc.js

.eslintrc.js

@@ -1,75 +0,0 @@
-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)
-    root: true,
-
-    parserOptions: {
-        ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features
-    },
-
-    env: {
-        node: true,
-        browser: true,
-        'vue/setup-compiler-macros': true,
-    },
-
-    // Rules order is important, please avoid shuffling them
-    extends: [
-        // Base ESLint recommended rules
-        'eslint:recommended',
-
-        // Uncomment any of the lines below to choose desired strictness,
-        // but leave only one uncommented!
-        // See https://eslint.vuejs.org/rules/#available-rules
-        // 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
-        'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
-        // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
-
-        // https://github.com/prettier/eslint-config-prettier#installation
-        // usage with Prettier, provided by 'eslint-config-prettier'.
-        'prettier',
-    ],
-
-    plugins: [
-        // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
-        // required to lint *.vue files
-        'vue',
-
-        // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
-        // Prettier has not been included as plugin to avoid performance impact
-        // add it as an extension for your IDE
-    ],
-
-    globals: {
-        ga: 'readonly', // Google Analytics
-        cordova: 'readonly',
-        __statics: 'readonly',
-        __QUASAR_SSR__: 'readonly',
-        __QUASAR_SSR_SERVER__: 'readonly',
-        __QUASAR_SSR_CLIENT__: 'readonly',
-        __QUASAR_SSR_PWA__: 'readonly',
-        process: 'readonly',
-        Capacitor: 'readonly',
-        chrome: 'readonly',
-    },
-
-    // add your custom rules here
-    rules: {
-        'prefer-promise-reject-errors': 'off',
-        'no-unused-vars': 'warn',
-        'vue/no-multiple-template-root': 'off',
-        // allow debugger during development only
-        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    },
-    overrides: [
-        {
-            files: ['test/cypress/**/*.*'],
-            extends: [
-                // Add Cypress-specific lint rules, globals and Cypress plugin
-                // See https://github.com/cypress-io/eslint-plugin-cypress#rules
-                'plugin:cypress/recommended',
-            ],
-        },
-    ],
-};

.eslintrc.json

@@ -0,0 +1,3 @@
+{
+    "extends": ["plugin:cypress/recommended"]
+}

Jenkinsfile

@@ -125,8 +125,10 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
+                            def modules = sh(script: "node test/cypress/docker/find/find.js ${env.COMPOSE_TAG}", returnStdout: true).trim()
+                            echo "E2E MODULES: ${modules}"
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 1'
+                                sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
                             }
                         }
                     }
@@ -183,3 +185,4 @@ pipeline {
         }
     }
 }
+

eslint.config.js

@@ -0,0 +1,87 @@
+import cypress from 'eslint-plugin-cypress';
+import eslint from 'eslint-plugin-import';
+import globals from 'globals';
+import js from '@eslint/js';
+import vue from 'eslint-plugin-vue';
+export default {
+    plugins: { vue, eslint, cypress },
+    languageOptions: {
+        globals: {
+            ...globals.node,
+            ...globals.browser,
+            ...vue.configs['vue3-strongly-recommended'].globals,
+            ...cypress.environments.globals.globals,
+            ga: 'readonly',
+            cordova: 'readonly',
+            __statics: 'readonly',
+            __QUASAR_SSR__: 'readonly',
+            __QUASAR_SSR_SERVER__: 'readonly',
+            __QUASAR_SSR_CLIENT__: 'readonly',
+            __QUASAR_SSR_PWA__: 'readonly',
+            process: 'readonly',
+            Capacitor: 'readonly',
+            chrome: 'readonly',
+        },
+
+        ecmaVersion: 2020,
+        sourceType: 'module',
+
+        parserOptions: {
+            parser: '@babel/eslint-parser',
+        },
+    },
+    rules: {
+        ...vue.rules['flat/strongly-recommended'],
+        ...js.configs.recommended.rules,
+        semi: 'off',
+        'generator-star-spacing': 'warn',
+        'arrow-parens': 'warn',
+        'no-var': 'error',
+        'prefer-const': 'error',
+        'prefer-template': 'warn',
+        'prefer-destructuring': 'off',
+        'prefer-spread': 'warn',
+        'prefer-rest-params': 'warn',
+        'prefer-object-spread': 'warn',
+        'prefer-arrow-callback': 'warn',
+        'prefer-numeric-literals': 'warn',
+        'prefer-exponentiation-operator': 'warn',
+        'prefer-regex-literals': 'warn',
+        'one-var': [
+            'error',
+            {
+                let: 'never',
+                const: 'never',
+            },
+        ],
+        'no-void': 'off',
+        'prefer-promise-reject-errors': 'error',
+        'multiline-ternary': 'warn',
+        'no-restricted-imports': 'warn',
+        'no-import-assign': 'warn',
+        'no-duplicate-imports': 'warn',
+        'no-useless-rename': 'warn',
+        'eslint/no-named-as-default': 'warn',
+        'eslint/no-named-as-default-member': 'warn',
+        'no-unsafe-optional-chaining': 'warn',
+        'no-undef': 'error',
+        'no-unused-vars': 'error',
+        'no-console': 'error',
+        'no-debugger': 'error',
+        'no-useless-escape': 'error',
+        'no-prototype-builtins': 'error',
+        'no-async-promise-executor': 'error',
+        'no-irregular-whitespace': 'error',
+        'no-constant-condition': 'error',
+        'no-unsafe-finally': 'error',
+        'no-extend-native': 'error',
+    },
+    ignores: [
+        '/dist',
+        '/src-capacitor',
+        '/src-cordova',
+        '/.quasar',
+        '/node_modules',
+        '.eslintrc.js',
+    ],
+};

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.14.0",
+    "version": "25.16.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -9,7 +9,8 @@
     "type": "module",
     "scripts": {
         "resetDatabase": "cd ../salix && gulp docker",
-        "lint": "eslint --ext .js,.vue ./",
+        "lint": "eslint \"**/*.{vue,js}\" ",
+        "lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
         "test:e2e": "cypress open",
         "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
@@ -17,6 +18,8 @@
         "test:e2e:summary": "bash ./test/cypress/summary.sh",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:front": "vitest",
+        "test:ui": "vitest --ui",
+        "test:coverage": "vitest run --coverage",
         "test:front:ci": "vitest run",
         "commitlint": "commitlint --edit",
         "prepare": "npx husky install",
@@ -26,43 +29,53 @@
         "docs:preview": "vitepress preview docs"
     },
     "dependencies": {
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.20.0",
         "@quasar/cli": "^2.4.1",
         "@quasar/extras": "^1.16.16",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
+        "es-module-lexer": "^1.6.0",
+        "fast-glob": "^3.3.3",
         "moment": "^2.30.1",
         "pinia": "^2.1.3",
         "quasar": "^2.17.7",
         "validator": "^13.9.0",
         "vue": "^3.5.13",
-        "vue-i18n": "^9.3.0",
+        "vue-i18n": "^9.4.0",
         "vue-router": "^4.2.5"
     },
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.20.0",
+        "@intlify/unplugin-vue-i18n": "^4.0.0",
         "@pinia/testing": "^0.1.2",
         "@quasar/app-vite": "^2.0.8",
         "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@vitest/ui": "3.1.1",
+        "@vue/compiler-sfc": "^3.5.13",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^14.1.0",
         "cypress-mochawesome-reporter": "^3.8.2",
         "eslint": "^9.18.0",
         "eslint-config-prettier": "^10.0.1",
+        "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-vue": "^9.32.0",
+        "globals": "^16.0.0",
         "husky": "^8.0.0",
         "junit-merge": "^2.0.0",
         "mocha": "^11.1.0",
         "postcss": "^8.4.23",
         "prettier": "^3.4.2",
         "sass": "^1.83.4",
-        "vitepress": "^1.6.3",
+        "vitest": "^3.0.3",
-        "vitest": "^0.34.0",
         "xunit-viewer": "^10.6.1"
     },
     "engines": {

quasar.config.js

@@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
         build: {
             target: {
                 browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
-                node: 'node18',
+                node: 'node20',
             },
 
             vueRouterMode: 'hash', // available values: 'hash', 'history'
@@ -92,6 +92,7 @@ export default configure(function (/* ctx */) {
             vitePlugins: [
                 [
                     VueI18nPlugin({
+                        strictMessage: false,
                         runtimeOnly: false,
                         include: [
                             path.resolve(__dirname, './src/i18n/locale/**'),

quasar.config.js.temporary.compiled.1744020058024.mjs

@@ -0,0 +1,227 @@
+/* eslint-disable */
+/**
+ * THIS FILE IS GENERATED AUTOMATICALLY.
+ * 1. DO NOT edit this file directly as it won't do anything.
+ * 2. EDIT the original quasar.config file INSTEAD.
+ * 3. DO NOT git commit this file. It should be ignored.
+ *
+ * This file is still here because there was an error in
+ * the original quasar.config file and this allows you to
+ * investigate the Node.js stack error.
+ *
+ * After you fix the original file, this file will be
+ * deleted automatically.
+ **/
+
+
+// quasar.config.js
+import { configure } from "quasar/wrappers";
+import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
+import path from "path";
+var __quasar_inject_dirname__ = "/home/jsegarra/Projects/salix-front";
+var target = `http://${process.env.CI ? "back" : "localhost"}:3000`;
+var quasar_config_default = configure(function() {
+  return {
+    eslint: {
+      // fix: true,
+      // include = [],
+      // exclude = [],
+      // rawOptions = {},
+      warnings: true,
+      errors: true
+    },
+    // https://v2.quasar.dev/quasar-cli/prefetch-feature
+    // preFetch: true,
+    // app boot file (/src/boot)
+    // --> boot files are part of "main.js"
+    // https://v2.quasar.dev/quasar-cli/boot-files
+    boot: ["i18n", "axios", "vnDate", "validations", "quasar", "quasar.defaults"],
+    // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
+    css: ["app.scss"],
+    // https://github.com/quasarframework/quasar/tree/dev/extras
+    extras: [
+      // 'ionicons-v4',
+      // 'mdi-v5',
+      // 'fontawesome-v6',
+      // 'eva-icons',
+      // 'themify',
+      // 'line-awesome',
+      // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
+      "roboto-font",
+      "material-icons-outlined",
+      "material-symbols-outlined"
+    ],
+    // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
+    build: {
+      target: {
+        browser: ["es2022", "edge88", "firefox78", "chrome87", "safari13.1"],
+        node: "node20"
+      },
+      vueRouterMode: "hash",
+      // available values: 'hash', 'history'
+      // vueRouterBase,
+      // vueDevtools,
+      // vueOptionsAPI: false,
+      // rebuildCache: true, // rebuilds Vite/linter/etc cache on startup
+      // publicPath: '/',
+      // analyze: true,
+      // env: {},
+      rawDefine: {
+        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
+      },
+      // ignorePublicFolder: true,
+      // minify: false,
+      // polyfillModulePreload: true,
+      // distDir
+      extendViteConf(viteConf) {
+        delete viteConf.build.polyfillModulePreload;
+        viteConf.build.modulePreload = {
+          polyfill: false
+        };
+      },
+      // viteVuePluginOptions: {},
+      alias: {
+        composables: path.join(__quasar_inject_dirname__, "./src/composables"),
+        filters: path.join(__quasar_inject_dirname__, "./src/filters")
+      },
+      vitePlugins: [
+        [
+          VueI18nPlugin({
+            strictMessage: false,
+            runtimeOnly: false,
+            include: [
+              path.resolve(__quasar_inject_dirname__, "./src/i18n/locale/**"),
+              path.resolve(__quasar_inject_dirname__, "./src/pages/**/locale/**")
+            ]
+          })
+        ]
+      ]
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
+    devServer: {
+      server: {
+        type: "http"
+      },
+      proxy: {
+        "/api": {
+          target,
+          logLevel: "debug",
+          changeOrigin: true,
+          secure: false
+        }
+      },
+      open: false,
+      allowedHosts: [
+        "front",
+        // Agrega este nombre de host
+        "localhost"
+        // Opcional, para pruebas locales
+      ]
+    },
+    // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
+    framework: {
+      config: {
+        config: {
+          dark: "auto"
+        }
+      },
+      lang: "en-GB",
+      // iconSet: 'material-icons', // Quasar icon set
+      // lang: 'en-US', // Quasar language pack
+      // For special cases outside of where the auto-import strategy can have an impact
+      // (like functional components as one of the examples),
+      // you can manually specify Quasar components/directives to be available everywhere:
+      //
+      // components: [],
+      // directives: [],
+      // Quasar plugins
+      plugins: ["Notify", "Dialog"],
+      all: "auto",
+      autoImportComponentCase: "pascal"
+    },
+    // animations: 'all', // --- includes all animations
+    // https://v2.quasar.dev/options/animations
+    animations: [],
+    // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#property-sourcefiles
+    // sourceFiles: {
+    //   rootComponent: 'src/App.vue',
+    //   router: 'src/router/index',
+    //   store: 'src/store/index',
+    //   registerServiceWorker: 'src-pwa/register-service-worker',
+    //   serviceWorker: 'src-pwa/custom-service-worker',
+    //   pwaManifestFile: 'src-pwa/manifest.json',
+    //   electronMain: 'src-electron/electron-main',
+    //   electronPreload: 'src-electron/electron-preload'
+    // },
+    // https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
+    ssr: {
+      // ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
+      // will mess up SSR
+      // extendSSRWebserverConf (esbuildConf) {},
+      // extendPackageJson (json) {},
+      pwa: false,
+      // manualStoreHydration: true,
+      // manualPostHydrationTrigger: true,
+      prodPort: 3e3,
+      // The default port that the production server should use
+      // (gets superseded if process.env.PORT is specified at runtime)
+      middlewares: [
+        "render"
+        // keep this as last one
+      ]
+    },
+    // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
+    pwa: {
+      workboxMode: "generateSW",
+      // or 'injectManifest'
+      injectPwaMetaTags: true,
+      swFilename: "sw.js",
+      manifestFilename: "manifest.json",
+      useCredentialsForManifestTag: false
+      // useFilenameHashes: true,
+      // extendGenerateSWOptions (cfg) {}
+      // extendInjectManifestOptions (cfg) {},
+      // extendManifestJson (json) {}
+      // extendPWACustomSWConf (esbuildConf) {}
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
+    cordova: {
+      // noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
+    capacitor: {
+      hideSplashscreen: true
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
+    electron: {
+      // extendElectronMainConf (esbuildConf)
+      // extendElectronPreloadConf (esbuildConf)
+      inspectPort: 5858,
+      bundler: "packager",
+      // 'packager' or 'builder'
+      packager: {
+        // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
+        // OS X / Mac App Store
+        // appBundleId: '',
+        // appCategoryType: '',
+        // osxSign: '',
+        // protocol: 'myapp://path',
+        // Windows only
+        // win32metadata: { ... }
+      },
+      builder: {
+        // https://www.electron.build/configuration/configuration
+        appId: "salix-frontend"
+      }
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
+    bex: {
+      contentScripts: ["my-content-script"]
+      // extendBexScriptsConf (esbuildConf) {}
+      // extendBexManifestJson (json) {}
+    }
+  };
+});
+export {
+  quasar_config_default as default
+};

src/boot/__tests__/axios.spec.js

@@ -9,6 +9,30 @@ vi.mock('src/composables/useSession', () => ({
     }),
 }));
 
+// Mock axios
+vi.mock('axios', () => ({
+    default: {
+        create: vi.fn(() => ({
+            interceptors: {
+                request: { use: vi.fn() },
+                response: { use: vi.fn() },
+            },
+        })),
+        interceptors: {
+            request: { use: vi.fn() },
+            response: { use: vi.fn() },
+        },
+        defaults: {
+            baseURL: '',
+        },
+    },
+}));
+
+vi.mock('src/router', () => ({
+    Router: {
+        push: vi.fn(),
+    },
+}));
 vi.mock('src/stores/useStateQueryStore', () => ({
     useStateQueryStore: () => ({
         add: () => vi.fn(),
@@ -29,7 +53,7 @@ describe('Axios boot', () => {
                         'Accept-Language': 'en-US',
                         Authorization: 'DEFAULT_TOKEN',
                     },
-                })
+                }),
             );
         });
     });

src/boot/quasar.defaults.js

@@ -1,3 +1,4 @@
+/* eslint-disable eslint/export */
 export * from './defaults/qTable';
 export * from './defaults/qInput';
 export * from './defaults/qSelect';

src/boot/vnDate.js

@@ -1,4 +1,6 @@
 import { boot } from 'quasar/wrappers';
+import { date as quasarDate } from 'quasar';
+const { formatDate } = quasarDate;
 
 export default boot(() => {
     Date.vnUTC = () => {
@@ -25,4 +27,34 @@ export default boot(() => {
         const date = new Date(Date.vnUTC());
         return new Date(date.getFullYear(), date.getMonth() + 1, 0);
     };
+
+    Date.getCurrentDateTimeFormatted = (
+        options = {
+            startOfDay: false,
+            endOfDay: true,
+            iso: true,
+            mask: 'DD-MM-YYYY HH:mm',
+        },
+    ) => {
+        const date = Date.vnUTC();
+        if (options.startOfDay) {
+            date.setHours(0, 0, 0);
+        }
+        if (options.endOfDay) {
+            date.setHours(23, 59, 0);
+        }
+        if (options.iso) {
+            return date.toISOString();
+        }
+        return formatDate(date, options.mask);
+    };
+
+    Date.convertToISODateTime = (dateTimeStr) => {
+        const [datePart, timePart] = dateTimeStr.split(' ');
+        const [day, month, year] = datePart.split('-');
+        const [hours, minutes] = timePart.split(':');
+
+        const isoDate = new Date(year, month - 1, day, hours, minutes);
+        return isoDate.toISOString();
+    };
 });

src/components/CrudModel.vue

@@ -83,7 +83,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref([]);
+const formData = ref();
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
@@ -298,6 +298,10 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
+    <SkeletonTable
+        v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
+        :columns="$attrs.columns?.length"
+    />
     <VnPaginate
         :url="url"
         :limit="limit"
@@ -316,10 +320,6 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable
-        v-if="!formData && $attrs.autoLoad"
-        :columns="$attrs.columns?.length"
-    />
     <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
@@ -332,6 +332,7 @@ watch(formUrl, async () => {
                 :disable="!selected?.length"
                 :title="t('globals.remove')"
                 v-if="$props.defaultRemove"
+                data-cy="crudModelDefaultRemoveBtn"
             />
             <QBtn
                 :label="tMobile('globals.reset')"

src/components/EditPictureForm.vue

@@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
             img.onerror = () => {
                 notify(
                     t("This photo provider doesn't allow remote downloads"),
-                    'negative'
+                    'negative',
                 );
             };
         }
@@ -219,11 +219,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateLeft()"
-                    >
+                    />
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate left') }}
-                        </QTooltip> -->
-                    </QIcon>
                     <div>
                         <div ref="photoContainerRef" />
                     </div>
@@ -233,11 +229,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateRight()"
-                    >
+                    />
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate right') }}
-                        </QTooltip> -->
-                    </QIcon>
                 </div>
 
                 <div class="column">
@@ -265,7 +257,6 @@ const makeRequest = async () => {
                                     class="cursor-pointer q-mr-sm"
                                     @click="openInputFile()"
                                 >
-                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
                                 </QIcon>
                                 <QIcon name="info" class="cursor-pointer">
                                     <QTooltip>{{

src/components/FormModel.vue

@@ -13,13 +13,12 @@ import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getDifferences, getUpdatedValues } from 'src/filters';
-
 const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { validate } = useValidator();
+const { validate, validations } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
@@ -119,7 +118,7 @@ const defaultButtons = computed(() => ({
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: async () => await save(),
+        click: async (evt) => submitForm(evt),
         type: 'submit',
     },
     reset: {
@@ -132,6 +131,13 @@ const defaultButtons = computed(() => ({
     ...$props.defaultButtons,
 }));
 
+const submitForm = async (evt) => {
+    const isFormValid = await myForm.value.validate();
+    if (isFormValid) {
+        await save(evt);
+    }
+};
+
 onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
 
@@ -227,10 +233,9 @@ async function save() {
         const method = $props.urlCreate ? 'post' : 'patch';
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
-        let response;
+        const response = await Promise.resolve(
-
+            $props.saveFn ? $props.saveFn(body) : axios[method](url, body),
-        if ($props.saveFn) response = await $props.saveFn(body);
+        );
-        else response = await axios[method](url, body);
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
@@ -279,7 +284,7 @@ function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: nul
     state.set(modelValue, val);
     if (!$props.url) arrayData.store.data = val;
 
-    emit(evt, state.get(modelValue), res, old);
+    emit(evt, state.get(modelValue), res, old, formData);
 }
 
 function trimData(data) {
@@ -307,11 +312,13 @@ async function onKeyup(evt) {
             selectionStart = selectionEnd = selectionStart + 1;
             return;
         }
-        await save();
+        await myForm.value.submit(evt);
     }
 }
 
 defineExpose({
+    submitForm,
+    myForm,
     save,
     isLoading,
     hasChanges,
@@ -325,7 +332,7 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit.prevent
+            @submit.prevent="save"
             @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
@@ -339,6 +346,7 @@ defineExpose({
                     name="form"
                     :data="formData"
                     :validate="validate"
+                    :validations="validations()"
                     :filter="filter"
                 />
                 <SkeletonForm v-else />

src/components/FormModelPopup.vue

@@ -41,9 +41,12 @@ const onDataSaved = async (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
 };
 
-const onClick = async (saveAndContinue) => {
+const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
+    await formModelRef.value.myForm.validate(true);
     isSaveAndContinue.value = saveAndContinue;
-    await formModelRef.value.save();
+    if (formModelRef.value) {
+        await formModelRef.value.submitForm();
+    }
 };
 
 defineExpose({
@@ -59,16 +62,23 @@ defineExpose({
         ref="formModelRef"
         :observe-form-changes="false"
         :default-actions="false"
+        @submit="onClick"
         v-bind="$attrs"
         @on-data-saved="onDataSaved"
+        :prevent-submit="false"
     >
-        <template #form="{ data, validate }">
+        <template #form="{ data, validate, validations }">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ title }}</h1>
             <p>{{ subtitle }}</p>
-            <slot name="form-inputs" :data="data" :validate="validate" />
+            <slot
+                name="form-inputs"
+                :data="data"
+                :validate="validate"
+                :validations="validations"
+            />
             <div class="q-mt-lg row justify-end">
                 <QBtn
                     :label="t('globals.cancel')"
@@ -87,12 +97,13 @@ defineExpose({
                     :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    @click="onClick(false)"
+                    :type="!showSaveAndContinueBtn ? 'submit' : 'button'"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_save"
+                    @click="showSaveAndContinueBtn ? onClick(false) : null"
                     z-max
                 />
                 <QBtn
@@ -100,12 +111,13 @@ defineExpose({
                     :label="t('globals.isSaveAndContinue')"
                     :title="t('globals.isSaveAndContinue')"
                     color="primary"
+                    :type="showSaveAndContinueBtn ? 'submit' : 'button'"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_isSaveAndContinue"
+                    @click="showSaveAndContinueBtn ? onClick(true) : null"
                     z-max
-                    @click="onClick(true)"
                 />
             </div>
         </template>

src/components/TicketProblems.vue

@@ -1,12 +1,22 @@
 <script setup>
 import { toCurrency } from 'src/filters';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
-defineProps({ row: { type: Object, required: true } });
+const { row, visibleProblems = null } = defineProps({
+    row: { type: Object, required: true },
+    visibleProblems: { type: Array },
+});
+
+function showProblem(problem) {
+    const val = getValueFromPath(row, problem);
+    if (!visibleProblems) return val;
+    return !!(visibleProblems?.includes(problem) && val);
+}
 </script>
 <template>
     <span class="q-gutter-x-xs">
         <router-link
-            v-if="row.claim?.claimFk"
+            v-if="showProblem('claim.claimFk')"
             :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
             class="link"
         >
@@ -18,7 +28,7 @@ defineProps({ row: { type: Object, required: true } });
             </QIcon>
         </router-link>
         <QIcon
-            v-if="row?.isDeleted"
+            v-if="showProblem('isDeleted')"
             color="primary"
             name="vn:deletedTicket"
             size="xs"
@@ -29,7 +39,7 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasRisk"
+            v-if="showProblem('hasRisk')"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -40,51 +50,76 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasComponentLack"
+            v-if="showProblem('hasComponentLack')"
             name="vn:components"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+        <QIcon
+            v-if="showProblem('hasItemDelay')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemDelay"
+        >
             <QTooltip>
                 {{ $t('ticket.summary.hasItemDelay') }}
             </QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+        <QIcon
+            v-if="showProblem('hasItemLost')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemLost"
+        >
             <QTooltip>
                 {{ $t('salesTicketsTable.hasItemLost') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasItemShortage"
+            v-if="showProblem('hasItemShortage')"
             name="vn:unavailable"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+        <QIcon
+            v-if="showProblem('hasRounding')"
+            color="primary"
+            name="sync_problem"
+            size="xs"
+        >
             <QTooltip>
                 {{ $t('ticketList.rounding') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasTicketRequest"
+            v-if="showProblem('hasTicketRequest')"
             name="vn:buyrequest"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTaxDataChecked')"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
+        <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTooLittle')"
+            name="vn:isTooLittle"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/VnTable/VnTable.vue

@@ -19,6 +19,7 @@ import { useQuasar, date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { useFilterParams } from 'src/composables/useFilterParams';
 import { dashIfEmpty, toDate } from 'src/filters';
+import { useTableHeight } from './filters/useTableHeight';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
@@ -117,7 +118,7 @@ const $props = defineProps({
     },
     tableHeight: {
         type: String,
-        default: '90vh',
+        default: undefined,
     },
     footer: {
         type: Boolean,
@@ -166,6 +167,7 @@ const tableRef = ref();
 const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
 const app = inject('app');
+const tableHeight = useTableHeight();
 
 const editingRow = ref(null);
 const editingField = ref(null);
@@ -227,6 +229,7 @@ watch(
 
 defineExpose({
     create: createForm,
+    showForm,
     reload,
     redirect: redirectFn,
     selected,
@@ -678,7 +681,7 @@ const rowCtrlClickFunction = computed(() => {
                 table-header-class="bg-header"
                 card-container-class="grid-three"
                 flat
-                :style="isTableMode && `max-height: ${tableHeight}`"
+                :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
                 :virtual-scroll="isTableMode"
                 @virtual-scroll="handleScroll"
                 @row-click="(event, row) => handleRowClick(event, row)"
@@ -1042,7 +1045,7 @@ const rowCtrlClickFunction = computed(() => {
             :model="$attrs['data-key'] + 'Create'"
             @on-data-saved="(_, res) => createForm.onDataSaved(res)"
         >
-            <template #form-inputs="{ data }">
+            <template #form-inputs="{ data, validations }">
                 <slot name="alter-create" :data="data">
                     <div :style="createComplement?.containerStyle">
                         <div
@@ -1060,6 +1063,7 @@ const rowCtrlClickFunction = computed(() => {
                                 :key="column.name"
                                 :name="`column-create-${column.name}`"
                                 :data="data"
+                                :validations="validations"
                                 :column-name="column.name"
                                 :label="column.label"
                             >

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

@@ -1,8 +1,7 @@
 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';
+import { default as axios } from 'axios';
-
 describe('VnVisibleColumns', () => {
     let wrapper;
     let vm;

src/components/VnTable/filters/useTableHeight.js

@@ -0,0 +1,18 @@
+import { onMounted, nextTick, ref } from 'vue';
+
+export function useTableHeight() {
+    const tableHeight = ref('90vh');
+
+    onMounted(async () => {
+        await nextTick();
+        let height = 100;
+        Array.from(document.querySelectorAll('[role="toolbar"]'))
+            .filter((element) => window.getComputedStyle(element).display !== 'none')
+            .forEach(() => {
+                height -= 10;
+            });
+        tableHeight.value = `${height}vh`;
+    });
+
+    return tableHeight;
+}

src/components/__tests__/CrudModel.spec.js

@@ -1,4 +1,6 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 

src/components/__tests__/EditTableCellValueForm.spec.js

@@ -1,56 +0,0 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import EditForm from 'components/EditTableCellValueForm.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
-
-const fieldA = 'fieldA';
-const fieldB = 'fieldB';
-
-describe('EditForm', () => {
-    let vm;
-    const mockRows = [
-        { id: 1, itemFk: 101 },
-        { id: 2, itemFk: 102 },
-    ];
-    const mockFieldsOptions = [
-        { label: 'Field A', field: fieldA, component: 'input', attrs: {} },
-        { label: 'Field B', field: fieldB, component: 'date', attrs: {} },
-    ];
-    const editUrl = '/api/edit';
-
-    beforeAll(() => {
-        vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
-        vm = createWrapper(EditForm, {
-            props: {
-                rows: mockRows,
-                fieldsOptions: mockFieldsOptions,
-                editUrl,
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('onSubmit()', () => {
-        it('should call axios.post with the correct parameters in the payload', async () => {
-            const selectedField = { field: fieldA, component: 'input', attrs: {} };
-            const newValue = 'Test Value';
-
-            vm.selectedField = selectedField;
-            vm.newValue = newValue;
-
-            await vm.onSubmit();
-
-            const payload = axios.post.mock.calls[0][1];
-
-            expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
-            expect(payload.field).toEqual(fieldA);
-            expect(payload.newValue).toEqual(newValue);
-
-            expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
-
-            expect(vm.isLoading).toEqual(false);
-        });
-    });
-});

src/components/__tests__/FilterItemForm.spec.js

@@ -1,4 +1,6 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import FilterItemForm from 'src/components/FilterItemForm.vue';
 import { vi, beforeAll, describe, expect, it } from 'vitest';
 
@@ -38,7 +40,7 @@ describe('FilterItemForm', () => {
                 { relation: 'producer', scope: { fields: ['name'] } },
                 { relation: 'ink', scope: { fields: ['name'] } },
             ],
-            where: {"name":{"like":"%bolas de madera%"}},
+            where: { name: { like: '%bolas de madera%' } },
         };
 
         expect(axios.get).toHaveBeenCalledWith('Items/withName', {

src/components/__tests__/FormModel.spec.js

@@ -1,5 +1,7 @@
 import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import FormModel from 'src/components/FormModel.vue';
 
 describe('FormModel', () => {

src/components/__tests__/Leftmenu.spec.js

@@ -1,6 +1,7 @@
-import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
-import Leftmenu from 'components/LeftMenu.vue';
+import { createWrapper } from 'app/test/vitest/helper';
+import LeftMenu from 'components/LeftMenu.vue';
 import * as vueRouter from 'vue-router';
 import { useNavigationStore } from 'src/stores/useNavigationStore';
 
@@ -101,7 +102,7 @@ function mount(source = 'main') {
     vi.spyOn(axios, 'get').mockResolvedValue({
         data: [],
     });
-    const wrapper = createWrapper(Leftmenu, {
+    const wrapper = createWrapper(LeftMenu, {
         propsData: {
             source,
         },
@@ -164,7 +165,7 @@ describe('getRoutes', () => {
     });
 });
 
-describe('Leftmenu as card', () => {
+describe('LeftMenu as card', () => {
     beforeAll(() => {
         vm = mount('card').vm;
     });
@@ -173,7 +174,7 @@ describe('Leftmenu as card', () => {
         vm.getRoutes();
     });
 });
-describe('Leftmenu as main', () => {
+describe('LeftMenu as main', () => {
     beforeEach(() => {
         vm = mount().vm;
     });

src/components/__tests__/UserPanel.spec.js

@@ -1,13 +1,9 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 
-vi.mock('src/utils/quasarLang', () => ({
-  default: vi.fn(),
-}));
-
 describe('UserPanel', () => {
     let wrapper;
     let vm;
@@ -43,7 +39,7 @@ describe('UserPanel', () => {
         await vm.saveDarkMode(true);
         expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
         expect(vm.user.darkMode).toBe(true);
-    await vm.updatePreferences();
+        vm.updatePreferences();
         expect(vm.darkMode).toBe(true);
     });
 
@@ -52,7 +48,7 @@ describe('UserPanel', () => {
         await vm.saveLanguage(userLanguage);
         expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
         expect(vm.user.lang).toBe(userLanguage);
-    await vm.updatePreferences();
+        vm.updatePreferences();
         expect(vm.locale).toBe(userLanguage);
     });
 
@@ -60,6 +56,8 @@ describe('UserPanel', () => {
         const key = 'name';
         const value = 'itboss';
         await vm.saveUserData(key, value);
-    expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
+            [key]: value,
+        });
     });
 });

src/components/common/VnAccountNumber.vue

@@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
+        @keydown.tab="$refs.inputRef.vnInputRef.blur()"
+        @blur="model = useAccountShortToStandard(model) ?? model"
         @input="model = $event.target.value.replace(/[^\d.]/g, '')"
     />
 </template>

src/components/common/VnCard.vue

@@ -33,7 +33,7 @@ onBeforeRouteLeave(() => {
 });
 
 onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
+    if (props.visual) stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
 
     const route = router.currentRoute.value;
     try {

src/components/common/VnColor.vue

@@ -1,4 +1,6 @@
 <script setup>
+import { computed } from 'vue';
+
 const $props = defineProps({
     colors: {
         type: String,
@@ -6,9 +8,9 @@ const $props = defineProps({
     },
 });
 
-const colorArray = JSON.parse($props.colors)?.value;
+const colorArray = computed(() => JSON.parse($props.colors)?.value);
 const maxHeight = 30;
-const colorHeight = maxHeight / colorArray?.length;
+const colorHeight = maxHeight / colorArray.value?.length;
 </script>
 <template>
     <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">

src/components/common/VnDmsList.vue

@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
+import { usePrintService } from 'composables/usePrintService';
 
 import VnUserLink from '../ui/VnUserLink.vue';
 import { downloadFile } from 'src/composables/downloadFile';
@@ -21,6 +22,7 @@ const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
 const token = useSession().getTokenMultimedia();
+const { openReport } = usePrintService();
 
 const $props = defineProps({
     model: {
@@ -198,12 +200,7 @@ const columns = computed(() => [
                     color: 'primary',
                 }),
                 click: (prop) =>
-                    downloadFile(
+                    openReport(`dms/${prop.row.id}/downloadFile`, {}, '_blank'),
-                        prop.row.id,
-                        $props.downloadModel,
-                        undefined,
-                        prop.row.download,
-                    ),
             },
             {
                 component: QBtn,

src/components/common/VnInputBic.vue

@@ -0,0 +1,44 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const model = defineModel({ type: [Number, String] });
+const emit = defineEmits(['updateBic']);
+
+const getIbanCountry = (bank) => {
+    return bank.substr(0, 2);
+};
+
+const autofillBic = async (iban) => {
+    if (!iban) return;
+
+    const bankEntityId = parseInt(iban.substr(4, 4));
+    const ibanCountry = getIbanCountry(iban);
+
+    if (ibanCountry != 'ES') return;
+
+    const filter = { where: { id: bankEntityId } };
+    const params = { filter: JSON.stringify(filter) };
+
+    const { data } = await axios.get(`BankEntities`, { params });
+
+    emit('updateBic', data[0]?.id);
+};
+</script>
+<template>
+    <VnInput
+        :label="t('IBAN')"
+        clearable
+        v-model="model"
+        @update:model-value="autofillBic($event)"
+    >
+        <template #append>
+            <QIcon name="info" class="cursor-info">
+                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+            </QIcon>
+        </template>
+    </VnInput>
+</template>

src/components/common/VnInputDateTime.vue

@@ -0,0 +1,79 @@
+<script setup>
+import { computed, useAttrs } from 'vue';
+import { date } from 'quasar';
+import VnDate from './VnDate.vue';
+import VnTime from './VnTime.vue';
+
+const $attrs = useAttrs();
+const model = defineModel({ type: [Date] });
+
+const $props = defineProps({
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
+});
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
+const mask = 'DD-MM-YYYY HH:mm';
+const selectedDate = computed({
+    get() {
+        if (!model.value) return new Date(model.value);
+        return date.formatDate(new Date(model.value), mask);
+    },
+    set(value) {
+        model.value = Date.convertToISODateTime(value);
+    },
+});
+const manageDate = (date) => {
+    selectedDate.value = date;
+};
+</script>
+
+<template>
+    <div @mouseover="hover = true" @mouseleave="hover = false">
+        <QInput
+            ref="vnInputDateRef"
+            v-model="selectedDate"
+            class="vn-input-date"
+            placeholder="dd/mm/aaaa HH:mm"
+            v-bind="{ ...$attrs, ...styleAttrs }"
+            :clearable="false"
+            @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
+            hide-bottom-space
+            @update:model-value="manageDate"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
+        >
+            <template #prepend>
+                <QIcon name="today" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnDate :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+            <template #append>
+                <QIcon name="access_time" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnTime format24h :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+        </QInput>
+    </div>
+</template>
+<i18n>
+    es:
+        Open date: Abrir fecha
+</i18n>

src/components/common/VnLog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, onMounted, onUnmounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';

src/components/common/VnSelect.vue

@@ -152,6 +152,16 @@ const value = computed({
     },
 });
 
+const arrayDataKey =
+    $props.dataKey ??
+    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
+
+const arrayData = useArrayData(arrayDataKey, {
+    url: $props.url,
+    searchUrl: false,
+    mapKey: $attrs['map-key'],
+});
+const isMenuOpened = ref(false);
 const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
@@ -174,16 +184,9 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const arrayDataKey =
+const someIsLoading = computed(
-    $props.dataKey ??
+    () => (isLoading.value || !!arrayData?.isLoading?.value) && !isMenuOpened.value,
-    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
+);
-
-const arrayData = useArrayData(arrayDataKey, {
-    url: $props.url,
-    searchUrl: false,
-    mapKey: $attrs['map-key'],
-});
-
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -366,8 +369,10 @@ function getCaption(opt) {
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
-        :loading="isLoading"
+        :loading="someIsLoading"
         @virtual-scroll="onScroll"
+        @popup-hide="isMenuOpened = false"
+        @popup-show="isMenuOpened = true"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
         :data-url="url"

src/components/common/VnSmsDialog.vue

@@ -232,7 +232,7 @@ fr:
     pt: Portugais
 pt:
     Send SMS: Enviar SMS
-    CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
+    CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
     Language: Linguagem
     Phone: Móvel
     Subject: Assunto

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

@@ -1,4 +1,5 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
 import { Notify } from 'quasar';

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

@@ -1,4 +1,5 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 import VnDms from 'src/components/common/VnDms.vue';
 
@@ -40,7 +41,10 @@ describe('VnDms', () => {
         companyFk: 2,
         dmsTypeFk: 3,
         description: 'This is a test description',
-        files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
+        files: {
+            name: 'example.txt',
+            content: new Blob(['file content'], { type: 'text/plain' }),
+        },
     };
 
     const expectedBody = {
@@ -59,7 +63,7 @@ describe('VnDms', () => {
                 url: '/test',
                 formInitialData: { id: 1, reference: 'test' },
                 model: 'Worker',
-            }
+            },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
@@ -113,7 +117,9 @@ describe('VnDms', () => {
     describe('save', () => {
         it('should save data correctly', async () => {
             await vm.save();
-            expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
+            expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), {
+                params: expectedBody,
+            });
             expect(wrapper.emitted('onDataSaved')).toBeTruthy();
         });
     });
@@ -127,8 +133,8 @@ describe('VnDms', () => {
                 warehouseFk: 2,
                 companyFk: 3,
                 dmsTypeFk: 2,
-                description: 'This is a test description'
+                description: 'This is a test description',
-            }
+            };
             await wrapper.setProps({ formInitialData: testData });
             vm.defaultData();
 

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

@@ -1,4 +1,6 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import VnDmsList from 'src/components/common/VnDmsList.vue';
 import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
 
@@ -23,6 +25,9 @@ describe('VnDmsList', () => {
                 deleteModel: 'WorkerDms',
                 downloadModel: 'WorkerDms',
             },
+            global: {
+                stubs: ['VnUserLink'],
+            },
         }).vm;
     });
 

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

@@ -0,0 +1,81 @@
+import { createWrapper } from 'app/test/vitest/helper.js';
+import { describe, it, expect, beforeAll } from 'vitest';
+import VnInputDateTime from 'components/common/VnInputDateTime.vue';
+import vnDateBoot from 'src/boot/vnDate';
+
+let vm;
+let wrapper;
+
+beforeAll(() => {
+    // Initialize the vnDate boot
+    vnDateBoot();
+});
+function generateWrapper(date, outlined, showEvent) {
+    wrapper = createWrapper(VnInputDateTime, {
+        props: {
+            modelValue: date,
+            isOutlined: outlined,
+            showEvent: showEvent,
+        },
+    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+}
+
+describe('VnInputDateTime', () => {
+    describe('selectedDate', () => {
+        it('formats a valid datetime correctly', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).toBe('25-12-2023 10:30');
+        });
+
+        it('handles null date value', async () => {
+            generateWrapper(null, false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).toBeInstanceOf(Date);
+        });
+
+        it('updates the model value when a new datetime is set', async () => {
+            vm.selectedDate = '31-12-2023 15:45';
+            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+        });
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({});
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {
+            generateWrapper('2023-12-25T10:30:00', true, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({
+                dense: true,
+                outlined: true,
+                rounded: true,
+            });
+        });
+    });
+
+    describe('component rendering', () => {
+        it('should render date and time icons', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const icons = wrapper.findAllComponents({ name: 'QIcon' });
+            expect(icons.length).toBe(2);
+            expect(icons[0].props('name')).toBe('today');
+            expect(icons[1].props('name')).toBe('access_time');
+        });
+
+        it('should render popup proxies for date and time', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
+            expect(popups.length).toBe(2);
+        });
+    });
+});

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

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnLog from 'src/components/common/VnLog.vue';
 
 describe('VnLog', () => {
@@ -89,7 +90,7 @@ describe('VnLog', () => {
 
         vm = createWrapper(VnLog, {
             global: {
-                stubs: [],
+                stubs: ['VnUserLink'],
                 mocks: {},
             },
             propsData: {

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

@@ -1,5 +1,6 @@
 import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
 import VnNotes from 'src/components/ui/VnNotes.vue';
 
 describe('VnNotes', () => {

src/components/ui/CatalogItem.vue

@@ -132,8 +132,7 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-    white-space: nowrap;
+
-    width: 192px;
     p {
         margin-bottom: 0;
     }

src/components/ui/EntityDescriptor.vue

@@ -1,8 +1,6 @@
 <script setup>
-import { onBeforeMount, watch, computed, ref } from 'vue';
+import { watch, ref, onMounted } from 'vue';
 import { useArrayData } from 'composables/useArrayData';
-import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
 import VnDescriptor from './VnDescriptor.vue';
 
 const $props = defineProps({
@@ -20,57 +18,66 @@ const $props = defineProps({
     },
 });
 
-const state = useState();
-const route = useRoute();
 let arrayData;
 let store;
-let entity;
+const entity = ref();
 const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const containerRef = ref(null);
-defineExpose({ getData });
 
-onBeforeMount(async () => {
+onMounted(async () => {
-    arrayData = useArrayData($props.dataKey, {
+    let isPopup;
+    let el = containerRef.value.$el;
+    while (el) {
+        if (el.classList?.contains('q-menu')) {
+            isPopup = true;
+            break;
+        }
+        el = el.parentElement;
+    }
+
+    arrayData = useArrayData($props.dataKey + (isPopup ? 'Proxy' : ''), {
         url: $props.url,
         userFilter: $props.filter,
         skip: 0,
         oneRecord: true,
     });
     store = arrayData.store;
-    entity = computed(() => {
-        const data = store.data ?? {};
-        if (data) emit('onFetch', data);
-        return data;
-    });
 
-    // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
         () => [$props.url, $props.filter],
         async () => {
-            if (!isSameDataKey.value) await getData();
+            await getData();
+        },
+        { immediate: true },
+    );
+
+    watch(
+        () => arrayData.store.data,
+        (newValue) => {
+            entity.value = newValue;
         },
     );
 });
 
+defineExpose({ getData });
+const emit = defineEmits(['onFetch']);
+
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
-        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        await arrayData.fetch({ append: false, updateRouter: false });
-        state.set($props.dataKey, data);
+        const { data } = store;
         emit('onFetch', data);
     } finally {
         isLoading.value = false;
     }
 }
-
-const emit = defineEmits(['onFetch']);
 </script>
 
 <template>
-    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
+    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey" ref="containerRef">
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>

src/components/ui/VnDescriptor.vue

@@ -6,6 +6,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
 const entity = defineModel({ type: Object, default: null });
 const $props = defineProps({
@@ -56,18 +57,6 @@ const routeName = computed(() => {
     return `${routeName}Summary`;
 });
 
-function getValueFromPath(path) {
-    if (!path) return;
-    const keys = path.toString().split('.');
-    let current = entity.value;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}
-
 function copyIdText(id) {
     copyText(id, {
         component: {
@@ -170,10 +159,10 @@ const toModule = computed(() => {
                         <div class="title">
                             <span
                                 v-if="title"
-                                :title="getValueFromPath(title)"
+                                :title="getValueFromPath(entity, title)"
                                 :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
                             >
-                                {{ getValueFromPath(title) ?? title }}
+                                {{ getValueFromPath(entity, title) ?? title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span
@@ -189,7 +178,7 @@ const toModule = computed(() => {
                             class="subtitle"
                             :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
                         >
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                            #{{ getValueFromPath(entity, subtitle) ?? entity.id }}
                         </QItemLabel>
                         <QBtn
                             round

src/components/ui/VnUserLink.vue

@@ -1,18 +1,39 @@
 <script setup>
+import AccountDescriptorProxy from 'src/pages/Account/Card/AccountDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-
+import { ref, onMounted } from 'vue';
-defineProps({
+import axios from 'axios';
+const $props = defineProps({
     name: { type: String, default: null },
     tag: { type: String, default: null },
     workerId: { type: Number, default: null },
     defaultName: { type: Boolean, default: false },
 });
+const isWorker = ref(false);
+
+onMounted(async () => {
+    if (!$props.workerId) return;
+    try {
+        const {
+            data: { exists },
+        } = await axios(`/Workers/${$props.workerId}/exists`);
+        isWorker.value = exists;
+    } catch (error) {
+        if (error.status === 403) return;
+        throw error;
+    }
+});
 </script>
 <template>
     <slot name="link">
         <span :class="{ link: workerId }">
-            {{ defaultName ? name ?? $t('globals.system') : name }}
+            {{ defaultName ? (name ?? $t('globals.system')) : name }}
         </span>
     </slot>
-    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
+    <WorkerDescriptorProxy
+        v-if="isWorker"
+        :id="workerId"
+        @on-fetch="(data) => (isWorker = data?.workerId !== undefined)"
+    />
+    <AccountDescriptorProxy v-else :id="workerId" />
 </template>

src/components/ui/VnUsesMana.vue

@@ -1,60 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-const props = defineProps({
-    usesMana: {
-        type: Boolean,
-        required: true,
-    },
-    manaCode: {
-        type: String,
-        required: true,
-    },
-    manaVal: {
-        type: String,
-        default: 'mana',
-    },
-    manaLabel: {
-        type: String,
-        default: 'Promotion mana',
-    },
-    manaClaimVal: {
-        type: String,
-        default: 'manaClaim',
-    },
-    claimLabel: {
-        type: String,
-        default: 'Claim mana',
-    },
-});
-
-const manaCode = ref(props.manaCode);
-</script>
-
-<template>
-    <div class="column q-gutter-y-sm q-mt-sm">
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaVal"
-            :label="t(manaLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaClaimVal"
-            :label="t(claimLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-    </div>
-</template>
-<i18n>
-    es:
-        Promotion mana: Maná promoción
-        Claim mana: Maná reclamación
-</i18n>

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

@@ -1,5 +1,7 @@
 import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import CardSummary from 'src/components/ui/CardSummary.vue';
 import * as vueRouter from 'vue-router';
 

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

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
 describe('VnPaginate', () => {

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeAll, vi } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import axios from 'axios';
 import parsePhone from 'src/filters/parsePhone';
 
 describe('parsePhone filter', () => {

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

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnSms from 'src/components/ui/VnSms.vue';
 
 describe('VnSms', () => {

src/composables/__tests__/downloadFile.spec.js

@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import axios from 'axios';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useSession } from 'src/composables/useSession';
 const session = useSession();

src/composables/__tests__/useAcl.spec.js

@@ -1,5 +1,7 @@
 import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import axios from 'axios';
+
+import { flushPromises } from '@vue/test-utils';
 import { useAcl } from 'src/composables/useAcl';
 
 describe('useAcl', () => {

src/composables/__tests__/useArrayData.spec.js

@@ -1,15 +1,39 @@
 import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
 import { useArrayData } from 'composables/useArrayData';
 import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
+import { setActivePinia, createPinia } from 'pinia';
 
 describe('useArrayData', () => {
     const filter = '{"limit":20,"skip":0}';
     const params = { supplierFk: 2 };
+
     beforeEach(() => {
-        vi.spyOn(useRouter(), 'replace');
+        setActivePinia(createPinia());
-        vi.spyOn(useRouter(), 'push');
+
+        // Mock route
+        vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
+            path: 'mockSection/list',
+            matched: [],
+            query: {},
+            params: {},
+            meta: { moduleName: 'mockName' },
+        });
+
+        // Mock router
+        vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
+            push: vi.fn(),
+            replace: vi.fn(),
+            currentRoute: {
+                value: {
+                    path: 'mockSection/list',
+                    params: { id: 1 },
+                    meta: { moduleName: 'mockName' },
+                    matched: [{ path: 'mockName/:id' }],
+                },
+            },
+        });
     });
 
     afterEach(() => {
@@ -17,103 +41,69 @@ describe('useArrayData', () => {
     });
 
     it('should fetch and replace url with new params', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
 
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
+        const arrayData = useArrayData('ArrayData', {
+            url: 'mockUrl',
+            searchUrl: 'params',
+        });
 
         arrayData.store.userParams = params;
-        arrayData.fetch({});
+        await arrayData.fetch({});
 
-        await flushPromises();
         const routerReplace = useRouter().replace.mock.calls[0][0];
 
-        expect(axios.get.mock.calls[0][1].params).toEqual({
+        expect(axios.get).toHaveBeenCalledWith('mockUrl', {
+            signal: expect.any(Object),
+            params: {
                 filter,
                 supplierFk: 2,
+            },
         });
-        expect(routerReplace.path).toEqual('mockSection/list');
+
+        expect(routerReplace.path).toBe('mockSection/list');
         expect(JSON.parse(routerReplace.query.params)).toEqual(
             expect.objectContaining(params),
         );
     });
 
-    it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
+    it('should redirect to detail when single record is returned with navigation', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({
+            data: [{ id: 1 }],
+        });
 
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
+        const arrayData = useArrayData('ArrayData', {
+            url: 'mockUrl',
+            navigate: {},
+        });
 
         arrayData.store.userParams = params;
-        arrayData.fetch({});
+        await arrayData.fetch({});
 
-        await flushPromises();
         const routerPush = useRouter().push.mock.calls[0][0];
 
-        expect(axios.get.mock.calls[0][1].params).toEqual({
+        expect(routerPush.path).toBe('mockName/1');
-            filter,
-            supplierFk: 2,
-        });
-        expect(routerPush.path).toEqual('mockName/1');
         expect(routerPush.query).toBeUndefined();
     });
 
-    it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
+    it('should return one record when oneRecord is true', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({
-
-        vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
-            matched: [],
-            query: {},
-            params: {},
-            meta: { moduleName: 'mockName' },
-            path: 'mockName/1',
-        });
-        vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
-            push: vi.fn(),
-            replace: vi.fn(),
-            currentRoute: {
-                value: {
-                    params: {
-                        id: 1,
-                    },
-                    meta: { moduleName: 'mockName' },
-                    matched: [{ path: 'mockName/:id' }],
-                },
-            },
-        });
-
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
-
-        arrayData.store.userParams = params;
-        arrayData.fetch({});
-
-        await flushPromises();
-        const routerPush = useRouter().push.mock.calls[0][0];
-
-        expect(axios.get.mock.calls[0][1].params).toEqual({
-            filter,
-            supplierFk: 2,
-        });
-        expect(routerPush.path).toEqual('mockName/');
-        expect(routerPush.query.params).toBeDefined();
-    });
-
-    it('should return one record', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({
             data: [
                 { id: 1, name: 'Entity 1' },
                 { id: 2, name: 'Entity 2' },
             ],
         });
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
+
+        const arrayData = useArrayData('ArrayData', {
+            url: 'mockUrl',
+            oneRecord: true,
+        });
+
         await arrayData.fetch({});
 
-        expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
+        expect(arrayData.store.data).toEqual({
-    });
+            id: 1,
-
+            name: 'Entity 1',
-    it('should handle empty data gracefully if has to return one record', async () => {
+        });
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
-        await arrayData.fetch({});
-
-        expect(arrayData.store.data).toBeUndefined();
     });
 });

src/composables/__tests__/useRole.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { flushPromises } from '@vue/test-utils';
 import { useRole } from 'composables/useRole';
 const role = useRole();
 

src/composables/__tests__/useSession.spec.js

@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import axios from 'axios';
 import { useSession } from 'composables/useSession';
 import { useState } from 'composables/useState';
 

src/composables/__tests__/useTokenConfig.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { flushPromises } from '@vue/test-utils';
 import { useTokenConfig } from 'composables/useTokenConfig';
 const tokenConfig = useTokenConfig();
 

src/composables/getValueFromPath.js

@@ -0,0 +1,11 @@
+export function getValueFromPath(root, path) {
+    if (!root || !path) return;
+    const keys = path.toString().split('.');
+    let current = root;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}

src/composables/updateMinPriceBeforeSave.js

@@ -0,0 +1,51 @@
+import axios from 'axios';
+
+export async function beforeSave(data, getChanges, modelOrigin) {
+    try {
+        const changes = data.updates;
+        if (!changes) return data;
+        const patchPromises = [];
+
+        for (const change of changes) {
+            let patchData = {};
+
+            if ('hasMinPrice' in change.data) {
+                patchData.hasMinPrice = change.data?.hasMinPrice;
+                delete change.data.hasMinPrice;
+            }
+            if ('minPrice' in change.data) {
+                patchData.minPrice = change.data?.minPrice;
+                delete change.data.minPrice;
+            }
+
+            if (Object.keys(patchData).length > 0) {
+                const promise = axios
+                    .get(`${modelOrigin}/findOne`, {
+                        params: {
+                            filter: {
+                                fields: ['itemFk'],
+                                where: { id: change.where.id },
+                            },
+                        },
+                    })
+                    .then((row) => {
+                        return axios.patch(`Items/${row.data.itemFk}`, patchData);
+                    })
+                    .catch((error) => {
+                        console.error('Error processing change: ', change, error);
+                    });
+
+                patchPromises.push(promise);
+            }
+        }
+
+        await Promise.all(patchPromises);
+
+        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+        return data;
+    } catch (error) {
+        console.error('Error in beforeSave:', error);
+        throw error;
+    }
+}

src/composables/useAcl.js

@@ -30,9 +30,16 @@ export function useAcl() {
         return false;
     }
 
+    function hasAcl(model, prop, accessType) {
+        const modelAcl = state.getAcls().value[model];
+        const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
+        return !!(propAcl?.[accessType] || propAcl?.['*']);
+    }
+
     return {
         fetch,
         hasAny,
         state,
+        hasAcl,
     };
 }

src/composables/useArrayData.js

@@ -1,16 +1,15 @@
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
 import { buildFilter } from 'filters/filterPanel';
 import { isDialogOpened } from 'src/filters';
 
-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');
+    const arrayDataStore = useArrayDataStore(); // Move inside function
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
 
@@ -347,7 +346,7 @@ export function useArrayData(key, userOptions) {
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);
-    const isLoading = computed(() => store.isLoading || false);
+    const isLoading = ref(store.isLoading || false);
 
     return {
         fetch,

src/composables/useSession.js

@@ -60,7 +60,7 @@ export function useSession() {
                 const { data: isValidToken } = await axios.get('VnUsers/validateToken');
                 if (isValidToken)
                     destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
-                        destroyToken(url, storage, key)
+                        destroyToken(url, storage, key),
                     );
             }
         } finally {

src/composables/useValidator.js

@@ -47,7 +47,9 @@ export function useValidator() {
                 return !validator.isEmpty(value ? String(value) : '') || message;
             },
             required: (required, value) => {
-                return required ? !!value || t('globals.fieldRequired') : null;
+                return required
+                    ? value === 0 || !!value || t('globals.fieldRequired')
+                    : null;
             },
             length: (value) => {
                 const options = {
@@ -78,7 +80,8 @@ export function useValidator() {
                 if (min >= 0)
                     if (Math.floor(value) < min) return t('inputMin', { value: min });
             },
-            custom: (value) => validation.bindedFunction(value) || 'Invalid value',
+            custom: (value) =>
+                eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
         };
     };
 

src/css/app.scss

@@ -340,3 +340,6 @@ input::-webkit-inner-spin-button {
 .containerShrinked {
     width: 70%;
 }
+.q-item__section--main ~ .q-item__section--side {
+    padding-inline: 0;
+}

src/css/quasar.variables.scss

@@ -18,6 +18,7 @@ $positive: #c8e484;
 $negative: #fb5252;
 $info: #84d0e2;
 $warning: #f4b974;
+$neutral: #b0b0b0;
 // Pendiente de cuadrar con la base de datos
 $success: $positive;
 $alert: $negative;
@@ -51,3 +52,6 @@ $width-xl: 1600px;
 .bg-alert {
     background-color: $negative;
 }
+.bg-neutral {
+    background-color: $neutral;
+}

src/i18n/locale/en.yml

@@ -19,6 +19,7 @@ globals:
     logOut: Log out
     date: Date
     dataSaved: Data saved
+    openDetail: Open detail
     dataDeleted: Data deleted
     delete: Delete
     search: Search
@@ -877,6 +878,11 @@ components:
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items
+        name: Nombre
+        rate2: Grouping price
+        rate3: Packing price
+        minPrice: Min. Price
+        itemFk: Item id
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings

src/i18n/locale/es.yml

@@ -20,10 +20,11 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    dataCreated: Datos creados
+    openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
     changes: Cambios
-    dataCreated: Datos creados
     add: Añadir
     create: Crear
     edit: Modificar
@@ -961,6 +962,11 @@ components:
         to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
+        name: Nombre
+        rate2: Precio grouping
+        rate3: Precio packing
+        minPrice: Precio mínimo
+        itemFk: Id item
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -100,12 +100,8 @@ const onChangePass = (oldPass) => {
 };
 
 onMounted(() => {
-    hasitManagementAccess.value = useAcl().hasAny([
+    hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
-        { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
+    hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
-    ]);
-    hasSysadminAccess.value = useAcl().hasAny([
-        { model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
-    ]);
 });
 </script>
 <template>
@@ -227,7 +223,7 @@ onMounted(() => {
         <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
+        v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
         v-ripple
         clickable
         @click="showSyncDialog = true"

src/pages/Account/Card/AccountDescriptorProxy.vue

@@ -4,11 +4,6 @@ import AccountSummary from './AccountSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <AccountDescriptor
+        <AccountDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="AccountSummary" />
-            v-if="$attrs.id"
-            v-bind="$attrs"
-            :summary="AccountSummary"
-            :proxy-render="true"
-        />
     </QPopupProxy>
 </template>

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDateHourMinSec, toPercentage } from 'src/filters';
@@ -9,7 +9,6 @@ import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/Departme
 import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import { getUrl } from 'src/composables/getUrl';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import filter from './ClaimFilter.js';
 
@@ -23,24 +22,13 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const salixUrl = ref();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const STATE_COLOR = {
+function stateColor(entity) {
-    pending: 'warning',
+    return entity?.claimState?.classColor;
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-function stateColor(code) {
-    return STATE_COLOR[code];
 }
-
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-});
 </script>
 
 <template>
@@ -57,9 +45,8 @@ onMounted(async () => {
             <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
-                        :color="stateColor(entity.claimState.code)"
+                        :color="stateColor(entity)"
-                        text-color="black"
+                        style="color: var(--vn-black-text-color)"
-                        dense
                     >
                         {{ entity.claimState.description }}
                     </QBadge>
@@ -133,7 +120,7 @@ onMounted(async () => {
                     size="md"
                     icon="assignment"
                     color="primary"
-                    :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
+                    :to="{ name: 'TicketSaleTracking', params: { id: entity.ticketFk } }"
                 >
                     <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
                 </QBtn>
@@ -141,7 +128,7 @@ onMounted(async () => {
                     size="md"
                     icon="visibility"
                     color="primary"
-                    :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
+                    :to="{ name: 'TicketTracking', params: { id: entity.ticketFk } }"
                 >
                     <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
                 </QBtn>

src/pages/Claim/Card/ClaimDescriptorProxy.vue

@@ -4,11 +4,6 @@ import ClaimSummary from './ClaimSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <ClaimDescriptor
+        <ClaimDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="ClaimSummary" />
-            v-if="$attrs.id"
-            v-bind="$attrs.id"
-            :summary="ClaimSummary"
-            :proxy-render="true"
-        />
     </QPopupProxy>
 </template>

src/pages/Claim/Card/ClaimLines.vue

@@ -123,8 +123,8 @@ async function fetchMana() {
 
 async function updateDiscount({ saleFk, discount, canceller }) {
     const body = { salesIds: [saleFk], newDiscount: discount };
-    const claimId = claim.value.ticketFk;
+    const ticketFk = claim.value.ticketFk;
-    const query = `Tickets/${claimId}/updateDiscount`;
+    const query = `Tickets/${ticketFk}/updateDiscount`;
 
     await axios.post(query, body, {
         signal: canceller.signal,

src/pages/Claim/Card/ClaimSummary.vue

@@ -54,7 +54,7 @@ const detailsColumns = ref([
     {
         name: 'item',
         label: 'claim.item',
-        field: (row) => row.sale.itemFk,
+        field: (row) => dashIfEmpty(row.sale.itemFk),
         sortable: true,
     },
     {
@@ -67,13 +67,13 @@ const detailsColumns = ref([
     {
         name: 'quantity',
         label: 'claim.quantity',
-        field: (row) => row.sale.quantity,
+        field: (row) => dashIfEmpty(row.sale.quantity),
         sortable: true,
     },
     {
         name: 'claimed',
         label: 'claim.claimed',
-        field: (row) => row.quantity,
+        field: (row) => dashIfEmpty(row.quantity),
         sortable: true,
     },
     {
@@ -84,7 +84,7 @@ const detailsColumns = ref([
     {
         name: 'price',
         label: 'claim.price',
-        field: (row) => row.sale.price,
+        field: (row) => dashIfEmpty(row.sale.price),
         sortable: true,
     },
     {
@@ -108,15 +108,9 @@ const markerLabels = [
     { value: 5, label: t('claim.person') },
 ];
 
-const STATE_COLOR = {
-    pending: 'warning',
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-
 function stateColor(code) {
-    return STATE_COLOR[code];
+    const claimState = claimStates.value.find((state) => state.code === code);
+    return claimState?.classColor;
 }
 
 const developmentColumns = ref([
@@ -188,7 +182,7 @@ function claimUrl(section) {
 <template>
     <FetchData
         url="ClaimStates"
-        :filter="{ fields: ['id', 'description'] }"
+        :filter="{ fields: ['id', 'description', 'code', 'classColor'] }"
         @on-fetch="(data) => (claimStates = data)"
         auto-load
     />
@@ -343,22 +337,16 @@ function claimUrl(section) {
                             </QTh>
                         </QTr>
                     </template>
-                    <template #body="props">
+                    <template #body-cell-description="props">
-                        <QTr :props="props">
+                        <QTd :props="props">
-                            <QTd v-for="col in props.cols" :key="col.name" :props="props">
+                            <span class="link">
-                                <span v-if="col.name != 'description'">{{
+                                {{ props.value }}
-                                    t(col.value)
+                            </span>
-                                }}</span>
-                                <span class="link" v-if="col.name === 'description'">{{
-                                    t(col.value)
-                                }}</span>
                             <ItemDescriptorProxy
-                                    v-if="col.name == 'description'"
                                 :id="props.row.sale.itemFk"
                                 :sale-fk="props.row.saleFk"
-                                ></ItemDescriptorProxy>
+                            />
                         </QTd>
-                        </QTr>
                     </template>
                 </QTable>
             </QCard>

src/pages/Claim/Card/ClaimSummaryAction.vue

@@ -88,13 +88,13 @@ const columns = [
         auto-load
     >
         <template #column-itemFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
         </template>
         <template #column-ticketFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.ticketFk }}
                 <TicketDescriptorProxy :id="row.ticketFk" />
             </span>

src/pages/Claim/Card/__tests__/ClaimDescriptorMenu.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 
 describe('ClaimDescriptorMenu', () => {

src/pages/Claim/Card/__tests__/ClaimLines.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimLines from '/src/pages/Claim/Card/ClaimLines.vue';
 
 describe('ClaimLines', () => {

src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimLinesImport from 'pages/Claim/Card/ClaimLinesImport.vue';
 
 describe('ClaimLinesImport', () => {

src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js

@@ -1,7 +1,7 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimPhoto from 'pages/Claim/Card/ClaimPhoto.vue';
-
 describe('ClaimPhoto', () => {
     let vm;
 
@@ -61,7 +61,7 @@ describe('ClaimPhoto', () => {
                         title: 'This file will be deleted',
                         icon: 'delete',
                         data: { index: 1 },
-                        promise: vm.deleteDms
+                        promise: vm.deleteDms,
                     },
                 })
             );

src/pages/Claim/ClaimList.vue

@@ -101,7 +101,10 @@ const columns = computed(() => [
         name: 'stateCode',
         chip: {
             condition: () => true,
-            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+            color: ({ stateCode }) => {
+                const state = states.value?.find(({ code }) => code === stateCode);
+                return `bg-${state.classColor}`;
+            },
         },
         columnFilter: {
             name: 'claimStateFk',
@@ -131,12 +134,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-const STATE_COLOR = {
-    pending: 'bg-warning',
-    loses: 'bg-negative',
-    resolved: 'bg-positive',
-};
 </script>
 
 <template>

src/pages/Customer/Card/CustomerAddress.vue

@@ -77,10 +77,10 @@ const isDefaultAddress = (address) => {
     return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
 
-const setDefault = (address) => {
+const setDefault = async (address) => {
     const url = `Clients/${route.params.id}`;
     const payload = { defaultAddressFk: address.id };
-    axios.patch(url, payload).then((res) => {
+    await axios.patch(url, payload).then((res) => {
         if (res.data) {
             client.value.defaultAddressFk = res.data.defaultAddressFk;
             sortAddresses();

src/pages/Customer/Card/CustomerBalance.vue

@@ -25,7 +25,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
-const { hasAny } = useAcl();
+const { hasAcl } = useAcl();
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -277,9 +277,7 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="
+                    :disable="!hasAcl('Receipt', '*', 'WRITE')"
-                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
-                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />

src/pages/Customer/Card/CustomerBillingData.vue

@@ -9,6 +9,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 CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnInputBic from 'src/components/common/VnInputBic.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -17,7 +18,7 @@ const bankEntitiesRef = ref(null);
 
 const filter = {
     fields: ['id', 'bic', 'name'],
-    order: 'bic ASC'
+    order: 'bic ASC',
 };
 
 const getBankEntities = (data, formData) => {
@@ -43,13 +44,11 @@ const getBankEntities = (data, formData) => {
             </VnRow>
 
             <VnRow>
-                <VnInput :label="t('IBAN')" clearable v-model="data.iban">
+                <VnInputBic
-                    <template #append>
+                    :label="t('IBAN')"
-                        <QIcon name="info" class="cursor-info">
+                    v-model="data.iban"
-                            <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                    @update-bic="(bankEntityFk) => (data.bankEntityFk = bankEntityFk)"
-                        </QIcon>
+                />
-                    </template>
-                </VnInput>
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     ref="bankEntitiesRef"
@@ -59,7 +58,7 @@ const getBankEntities = (data, formData) => {
                     :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                     :rules="validate('Worker.bankEntity')"
                     hide-selected
-                    option-label="name"
+                    option-label="bic"
                     option-value="id"
                     v-model="data.bankEntityFk"
                 >

src/pages/Customer/Card/CustomerConsumption.vue

@@ -17,8 +17,9 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
-const arrayData = useArrayData('Client');
+const arrayData = useArrayData('Customer');
 const { t } = useI18n();
 const route = useRoute();
 const campaignList = ref();
@@ -50,7 +51,7 @@ const columns = computed(() => [
         label: t('globals.ticket'),
         cardVisible: true,
         columnFilter: {
-            inWhere: true,
+            name: 'ticketId',
         },
     },
     {
@@ -84,7 +85,8 @@ const columns = computed(() => [
         label: t('globals.description'),
         columnClass: 'expand',
         columnFilter: {
-            inWhere: true,
+            name: 'description',
+            
         },
     },
     {
@@ -92,17 +94,10 @@ const columns = computed(() => [
         label: t('globals.quantity'),
         cardVisible: true,
         visible: true,
-        columnFilter: {
+        columnFilter: false
-            inWhere: true,
+         
-        },
-    },
-    {
-        name: 'grouped',
-        label: t('Group by items'),
-        component: 'checkbox',
-        visible: false,
-        orderBy: false,
     },
+   
 ]);
 
 onBeforeMount(async () => {
@@ -170,7 +165,6 @@ const updateDateParams = (value, params) => {
         v-if="campaignList"
         data-key="CustomerConsumption"
         url="Clients/consumption"
-        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
         :filter="{ where: { clientFk: route.params.id } }"
         :columns="columns"
         search-url="consumption"
@@ -218,9 +212,9 @@ const updateDateParams = (value, params) => {
             <div v-if="row.subName" class="subName">
                 {{ row.subName }}
             </div>
-            <FetchedTags :item="row" />
+            <FetchedTags :item="row" :columns="6"/>
         </template>
-        <template #moreFilterPanel="{ params }">
+        <template #moreFilterPanel="{ params, searchFn}">
             <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
                 <VnSelect
                     :filled="true"
@@ -260,7 +254,7 @@ const updateDateParams = (value, params) => {
                     :label="t('globals.campaign')"
                     :filled="true"
                     class="q-px-sm q-pt-none fit"
-                    :option-label="(opt) => t(opt.code)"
+                    :option-label="(opt) => t(opt.code ?? '')"
                     :fields="['id', 'code', 'dated', 'scopeDays']"
                     @update:model-value="(data) => updateDateParams(data, params)"
                     dense
@@ -290,6 +284,13 @@ const updateDateParams = (value, params) => {
                     class="q-px-xs q-pt-none fit"
                     dense
                 />
+                <VnCheckbox
+                    v-model="params.grouped"
+                    :label="t('Group by items')"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                    @update:modelValue="() => searchFn()"
+                />
             </div>
         </template>
     </VnTable>

src/pages/Customer/Card/CustomerCreditContracts.vue

@@ -2,12 +2,13 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import { useQuasar } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
-import { toDate } from 'src/filters';
+import CustomerCreditContractsCreate from '../components/CustomerCreditContractsCreate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -16,6 +17,7 @@ const quasar = useQuasar();
 
 const vnPaginateRef = ref(null);
 const showQPageSticky = ref(true);
+const showForm = ref();
 
 const filter = {
     order: 'finished ASC, started DESC',
@@ -36,25 +38,21 @@ const fetch = (data) => {
     data.forEach((element) => {
         if (!element.finished) {
             showQPageSticky.value = false;
-            return;
         }
     });
 };
 
-const toCustomerCreditContractsCreate = () => {
-    router.push({ name: 'CustomerCreditContractsCreate' });
-};
-
 const openDialog = (item) => {
     quasar.dialog({
         component: ModalCloseContract,
         componentProps: {
             id: item.id,
-            promise: updateData,
+            promise: async () => {
+                await updateData();
+                showQPageSticky.value = true;
+            },
         },
     });
-    updateData();
-    showQPageSticky.value = true;
 };
 
 const openViewCredit = (credit) => {
@@ -66,14 +64,14 @@ const openViewCredit = (credit) => {
     });
 };
 
-const updateData = () => {
+const updateData = async () => {
-    vnPaginateRef.value?.fetch();
+    await vnPaginateRef.value?.fetch();
 };
 </script>
 
 <template>
-    <div class="full-width flex justify-center">
+    <section class="row justify-center">
-        <QCard class="card-width q-pa-lg">
+        <QCard class="q-pa-lg" style="width: 70%">
             <VnPaginate
                 :user-filter="filter"
                 @on-fetch="fetch"
@@ -84,100 +82,84 @@ const updateData = () => {
                 url="CreditClassifications"
             >
                 <template #body="{ rows }">
-                    <div v-if="rows.length">
+                    <div v-if="rows.length" class="q-gutter-y-md">
                         <QCard
                             v-for="(item, index) in rows"
                             :key="index"
-                            :class="{
+                            :class="{ disabled: item.finished }"
-                                'customer-card': true,
-                                'q-mb-md': index < rows.length - 1,
-                                'is-active': !item.finished,
-                            }"
                         >
                             <QCardSection
-                                class="full-width flex justify-between q-py-none"
+                                class="full-width"
-                            >
+                                :class="{ 'row justify-between': $q.screen.gt.md }"
-                                <div class="width-state flex">
-                                    <div
-                                        class="flex items-center cursor-pointer q-mr-md"
-                                        v-if="!item.finished"
                             >
+                                <div class="width-state row no-wrap">
                                     <QIcon
+                                        :style="{
+                                            visibility: item.finished
+                                                ? 'hidden'
+                                                : 'visible',
+                                        }"
                                         @click.stop="openDialog(item)"
                                         color="primary"
                                         name="lock"
+                                        data-cy="closeBtn"
                                         size="md"
-                                            class="fill-icon"
+                                        class="fill-icon q-px-md"
                                     >
                                         <QTooltip>{{ t('Close contract') }}</QTooltip>
                                     </QIcon>
-                                    </div>
 
-                                    <div>
+                                    <div class="column">
-                                        <div class="flex q-mb-xs">
+                                        <VnLv
-                                            <div class="q-mr-sm color-vn-label">
+                                            :label="t('Since')"
-                                                {{ t('Since') }}:
+                                            :value="toDate(item.started)"
-                                            </div>
+                                        />
-                                            <div class="text-weight-bold">
+                                        <VnLv
-                                                {{ toDate(item.started) }}
+                                            :label="t('To')"
-                                            </div>
+                                            :value="toDate(item.finished)"
-                                        </div>
+                                        />
-                                        <div class="flex">
-                                            <div class="q-mr-sm color-vn-label">
-                                                {{ t('To') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.finished) }}
-                                            </div>
-                                        </div>
                                     </div>
                                 </div>
 
                                 <QSeparator vertical />
 
-                                <div class="width-data flex">
+                                <div class="column width-data">
                                     <div
-                                        class="full-width flex justify-between items-center"
+                                        class="column"
                                         v-if="item?.insurances.length"
+                                        v-for="insurance in item.insurances"
+                                        :key="insurance.id"
                                     >
-                                        <div class="flex">
+                                        <div
-                                            <div class="color-vn-label q-mr-xs">
+                                            :class="{
-                                                {{ t('Credit') }}:
+                                                'row q-gutter-x-md': $q.screen.gt.sm,
-                                            </div>
+                                            }"
-                                            <div class="text-weight-bold">
+                                            class="q-mb-sm"
-                                                {{ item.insurances[0].credit }}
+                                        >
+                                            <VnLv
+                                                :label="t('Credit')"
+                                                :value="toCurrency(insurance.credit)"
+                                            />
+                                            <VnLv
+                                                :label="t('Grade')"
+                                                :value="dashIfEmpty(insurance.grade)"
+                                            />
+                                            <VnLv
+                                                :label="t('Date')"
+                                                :value="toDate(insurance.created)"
+                                            />
                                         </div>
                                     </div>
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Grade') }}:
                                 </div>
-                                            <div class="text-weight-bold">
+                                <QBtn
-                                                {{ item.insurances[0].grade || '-' }}
-                                            </div>
-                                        </div>
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Date') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.insurances[0].created) }}
-                                            </div>
-                                        </div>
-                                        <div class="flex items-center cursor-pointer">
-                                            <QIcon
                                     @click.stop="openViewCredit(item)"
-                                                color="primary"
+                                    icon="preview"
-                                                name="preview"
                                     size="md"
-                                            >
+                                    :title="t('View credits')"
-                                                <QTooltip>{{
+                                    data-cy="viewBtn"
-                                                    t('View credits')
+                                    color="primary"
-                                                }}</QTooltip>
+                                    flat
-                                            </QIcon>
+                                />
-                                        </div>
-                                    </div>
-                                </div>
                             </QCardSection>
                         </QCard>
                     </div>
@@ -187,11 +169,12 @@ const updateData = () => {
                 </template>
             </VnPaginate>
         </QCard>
-    </div>
+    </section>
 
     <QPageSticky :offset="[18, 18]" v-if="showQPageSticky">
         <QBtn
-            @click.stop="toCustomerCreditContractsCreate()"
+            data-cy="createBtn"
+            @click.stop="showForm = !showForm"
             color="primary"
             fab
             icon="add"
@@ -201,24 +184,25 @@ const updateData = () => {
             {{ t('New contract') }}
         </QTooltip>
     </QPageSticky>
+
+    <QDialog v-model="showForm">
+        <CustomerCreditContractsCreate @on-data-saved="updateData()" />
+    </QDialog>
 </template>
 
 <style lang="scss" scoped>
-.customer-card {
-    border: 2px solid var(--vn-light-gray);
-    border-radius: 10px;
-    padding: 10px;
-    display: flex;
-    justify-content: space-between;
-}
-.is-active {
-    background-color: var(--vn-light-gray);
-}
 .width-state {
     width: 30%;
 }
 .width-data {
-    width: 65%;
+    width: 50%;
+}
+::v-deep(.label) {
+    margin-right: 5px;
+}
+::v-deep(.label)::after {
+    content: ':';
+    color: var(--vn-label-color);
 }
 </style>
 

src/pages/Customer/Card/CustomerCreditContractsInsurance.vue

@@ -0,0 +1,93 @@
+<script setup>
+import { computed, onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { toCurrency, toDate } from 'src/filters';
+
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const create = ref(null);
+const tableRef = ref();
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'created',
+        format: ({ created }) => toDate(created),
+        label: t('Created'),
+        name: 'created',
+        create: true,
+        columnCreate: {
+            component: 'date',
+        },
+    },
+    {
+        align: 'left',
+        field: 'grade',
+        label: t('Grade'),
+        name: 'grade',
+        create: true,
+    },
+    {
+        align: 'left',
+        format: ({ credit }) => toCurrency(credit),
+        label: t('Credit'),
+        name: 'credit',
+        create: true,
+    },
+]);
+
+onBeforeMount(async () => {
+    const query = `CreditClassifications/findOne?filter=${encodeURIComponent(
+        JSON.stringify({
+            fields: ['finished'],
+            where: { id: route.params.creditId },
+        }),
+    )}`;
+    const { data } = await axios(query);
+    create.value = data.finished
+        ? false
+        : {
+              urlCreate: 'CreditInsurances',
+              title: t('Create Insurance'),
+              onDataSaved: () => tableRef.value.reload(),
+              formInitialData: {
+                  created: Date.vnNew(),
+                  creditClassificationFk: route.params.creditId,
+              },
+          };
+});
+</script>
+
+<template>
+    <VnTable
+        v-if="create != null"
+        url="CreditInsurances"
+        ref="tableRef"
+        data-key="creditInsurances"
+        :filter="{
+            where: {
+                creditClassificationFk: `${route.params.creditId}`,
+            },
+            order: 'created DESC',
+        }"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        :create
+        auto-load
+    />
+</template>
+
+<i18n>
+es:
+    Created: Fecha creación
+    Grade: Grade
+    Credit: Crédito
+</i18n>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -79,7 +79,7 @@ async function acceptPropagate({ isEqualizated }) {
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >
-        <template #form="{ data, validate }">
+        <template #form="{ data, validate, validations }">
             <VnRow>
                 <VnInput
                     :label="t('Social name')"
@@ -99,7 +99,13 @@ async function acceptPropagate({ isEqualizated }) {
             </VnRow>
 
             <VnRow>
-                <VnInput :label="t('Street')" clearable v-model="data.street" required />
+                <VnInput
+                    :label="t('Street')"
+                    clearable
+                    v-model="data.street"
+                    :uppercase="true"
+                    required
+                />
             </VnRow>
 
             <VnRow>
@@ -111,7 +117,6 @@ async function acceptPropagate({ isEqualizated }) {
                     option-value="id"
                     v-model="data.sageTaxTypeFk"
                     data-cy="sageTaxTypeFk"
-                    :required="data.isTaxDataChecked"
                 />
                 <VnSelect
                     :label="t('Sage transaction type')"
@@ -121,7 +126,6 @@ async function acceptPropagate({ isEqualizated }) {
                     option-value="id"
                     data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
-                    :required="data.isTaxDataChecked"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

src/pages/Customer/Card/CustomerSamples.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { QBtn, useQuasar } from 'quasar';
-
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'src/components/VnTable/VnTable.vue';
@@ -34,7 +33,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        format: (row) => row.type.description,
+        format: (row) => row?.type?.description,
         label: t('Description'),
         name: 'description',
     },
@@ -74,12 +73,11 @@ const tableRef = ref();
 <template>
     <VnTable
         ref="tableRef"
-        data-key="ClientSamples"
+        data-key="CustomerSamples"
         auto-load
-        :filter="filter"
+        :user-filter="filter"
         url="ClientSamples"
         :columns="columns"
-        :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
         :right-search="false"
         :rows="rows"

src/pages/Customer/Card/CustomerSummary.vue

@@ -181,11 +181,11 @@ const sumRisk = ({ clientRisks }) => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
-                    :value="entity.payMethod.name"
+                    :value="entity.payMethod?.name"
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
@@ -292,7 +292,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
-                    :value="toCurrency(entity.creditInsurance)"
+                    :value="`${toCurrency(entity.creditInsurance)} (${entity.classifications[0]?.insurances[0]?.grade || ''})`"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
 

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -26,6 +26,7 @@ const columns = computed(() => [
                 url: 'Clients',
                 fields: ['id', 'socialName'],
                 optionLabel: 'socialName',
+                optionValue: 'socialName',
             },
         },
         columnClass: 'expand',
@@ -37,8 +38,11 @@ const columns = computed(() => [
         name: 'city',
         columnFilter: {
             component: 'select',
+            inWhere: true,
             attrs: {
                 url: 'Towns',
+                optionValue: 'name',
+                optionLabel: 'name',
             },
         },
         cardVisible: true,
@@ -95,7 +99,7 @@ const columns = computed(() => [
     </VnSubToolbar>
     <VnTable
         :data-key="dataKey"
-        url="Clients/filter"
+        url="Clients/extendedListFilter"
         :table="{
             'row-key': 'id',
             selection: 'multiple',

src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import CustomerPayments from 'src/pages/Customer/Payments/CustomerPayments.vue';
 
 describe('CustomerPayments', () => {

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -179,6 +179,11 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
+
+function onAgentCreated({ id, fiscalName }, data) {
+    customsAgents.value.push({ id, fiscalName });
+    data.customsAgentFk = id;
+}
 </script>
 
 <template>
@@ -292,9 +297,14 @@ function handleLocation(data, location) {
                     option-value="id"
                     v-model="data.customsAgentFk"
                     :tooltip="t('New customs agent')"
+                    :acls="[{ model: 'CustomsAgent', props: '*', accessType: 'WRITE' }]"
                 >
                     <template #form>
-                        <CustomerNewCustomsAgent />
+                        <CustomerNewCustomsAgent
+                            @on-data-saved="
+                                (requestResponse) => onAgentCreated(requestResponse, data)
+                            "
+                        />
                     </template>
                 </VnSelectDialog>
             </VnRow>

src/pages/Customer/components/CustomerCreditContractsCreate.vue

@@ -3,44 +3,29 @@ import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const routeId = computed(() => route.params.id);
-const router = useRouter();
 
 const initialData = reactive({
     started: Date.vnNew(),
     clientFk: routeId.value,
 });
-
-const toCustomerCreditContracts = () => {
-    router.push({ name: 'CustomerCreditContracts' });
-};
 </script>
 
 <template>
-    <FormModel
+    <FormModelPopup
+        v-on="$attrs"
         :form-initial-data="initialData"
         :observe-form-changes="false"
         url-create="creditClassifications/createWithInsurance"
-        @on-data-saved="toCustomerCreditContracts()"
     >
-        <template #moreActions>
+        <template #form-inputs="{ data }">
-            <QBtn
-                :label="t('globals.cancel')"
-                @click="toCustomerCreditContracts"
-                color="primary"
-                flat
-                icon="close"
-            />
-        </template>
-
-        <template #form="{ data }">
             <VnRow>
                 <div class="col">
                     <VnInput
@@ -63,7 +48,7 @@ const toCustomerCreditContracts = () => {
                 </div>
             </VnRow>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>

src/pages/Customer/components/CustomerCreditContractsInsurance.vue

@@ -1,63 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-import { toCurrency, toDate } from 'src/filters';
-
-import VnTable from 'src/components/VnTable/VnTable.vue';
-
-const { t } = useI18n();
-const route = useRoute();
-
-const filter = {
-    where: {
-        creditClassificationFk: `${route.params.creditId}`,
-    },
-    limit: 20,
-};
-const columns = computed(() => [
-    {
-        align: 'left',
-        field: 'created',
-        format: ({ created }) => toDate(created),
-        label: t('Created'),
-        name: 'created',
-    },
-    {
-        align: 'left',
-        field: 'grade',
-        label: t('Grade'),
-        name: 'grade',
-    },
-    {
-        align: 'left',
-        format: ({ credit }) => toCurrency(credit),
-        label: t('Credit'),
-        name: 'credit',
-    },
-]);
-</script>
-
-<template>
-    <VnTable
-        url="CreditInsurances"
-        ref="tableRef"
-        data-key="creditInsurances"
-        :filter="filter"
-        :columns="columns"
-        :right-search="false"
-        :is-editable="false"
-        :use-model="true"
-        :column-search="false"
-        :disable-option="{ card: true }"
-        auto-load
-    ></VnTable>
-</template>
-
-<i18n>
-es:
-    Created: Fecha creación
-    Grade: Grade
-    Credit: Crédito
-</i18n>

src/pages/Customer/components/CustomerFileManagementActions.vue

@@ -1,9 +1,9 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import { useQuasar } from 'quasar';
 
+import { usePrintService } from 'composables/usePrintService';
 import { downloadFile } from 'src/composables/downloadFile';
 
 import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
@@ -12,7 +12,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
-
+const { openReport } = usePrintService();
 const $props = defineProps({
     id: {
         type: Number,
@@ -24,7 +24,7 @@ const $props = defineProps({
     },
 });
 
-const setDownloadFile = () => downloadFile($props.id);
+const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
 
 const toCustomerFileManagementEdit = () => {
     router.push({

src/pages/Customer/components/CustomerNewCustomsAgent.vue

@@ -16,6 +16,7 @@ const onDataSaved = (dataSaved) => {
 
 <template>
     <FormModelPopup
+        :form-initial-data="{}"
         :title="t('New customs agent')"
         @on-data-saved="onDataSaved($event)"
         model="customer"

src/pages/Customer/components/CustomerNewPayment.vue

@@ -130,20 +130,22 @@ async function onDataSaved(formData, { id }) {
     }
 }
 
-async function getSupplierClientReferences(value) {
+async function getSupplierClientReferences(data) {
-    if (!value) return (initialData.description = '');
+    if (!data) return (initialData.description = '');
-    const params = { bankAccount: value };
+    const params = { bankAccount: data.compensationAccount };
-    const { data } = await axios(`Clients/getClientOrSupplierReference`, { params });
+    const { data: reference } = await axios(`Clients/getClientOrSupplierReference`, {
-    if (!data.clientId) {
+        params,
-        initialData.description = t('Supplier Compensation Reference', {
+    });
-            supplierId: data.supplierId,
+    if (reference.supplierId) {
-            supplierName: data.supplierName,
+        data.description = t('Supplier Compensation Reference', {
+            supplierId: reference.supplierId,
+            supplierName: reference.supplierName,
         });
         return;
     }
-    initialData.description = t('Client Compensation Reference', {
+    data.description = t('Client Compensation Reference', {
-        clientId: data.clientId,
+        clientId: reference.clientId,
-        clientName: data.clientName,
+        clientName: reference.clientName,
     });
 }
 
@@ -222,6 +224,7 @@ async function getAmountPaid() {
                         clearable
                         v-model.number="data.amountPaid"
                         data-cy="paymentAmount"
+                        :positive="false"
                     />
                 </VnRow>
                 <VnRow>
@@ -251,7 +254,7 @@ async function getAmountPaid() {
                             :label="t('Compensation account')"
                             clearable
                             v-model="data.compensationAccount"
-                            @blur="getSupplierClientReferences(data.compensationAccount)"
+                            @blur="getSupplierClientReferences(data)"
                         />
                     </VnRow>
                 </div>
@@ -287,6 +290,9 @@ async function getAmountPaid() {
 </template>
 
 <i18n>
+en:
+    Supplier Compensation Reference: ({supplierId}) Ntro Proveedor {supplierName}
+    Client Compensation Reference: ({clientId}) Ntro Cliente {clientName}
 es:
     New payment: Añadir pago
     Date: Fecha

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -15,7 +15,7 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
-
+import { getItemPackagingType } from '../composables/getItemPackagingType.js';
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
@@ -161,23 +161,6 @@ const setShippedColor = (date) => {
 };
 const rowClick = ({ id }) =>
     window.open(router.resolve({ params: { id }, name: 'TicketSummary' }).href, '_blank');
-
-const getItemPackagingType = (ticketSales) => {
-    if (!ticketSales?.length) return '-';
-
-    const packagingTypes = ticketSales.reduce((types, sale) => {
-        const { itemPackingTypeFk } = sale.item;
-        if (
-            !types.includes(itemPackingTypeFk) &&
-            (itemPackingTypeFk === 'H' || itemPackingTypeFk === 'V')
-        ) {
-            types.push(itemPackingTypeFk);
-        }
-        return types;
-    }, []);
-
-    return dashIfEmpty(packagingTypes.join(', ') || '-');
-};
 </script>
 
 <template>

src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js

@@ -0,0 +1,36 @@
+import { describe, it, expect } from 'vitest';
+import { getItemPackagingType } from '../getItemPackagingType';
+
+describe('getItemPackagingType', () => {
+    it('should return "-" if ticketSales is null or undefined', () => {
+        expect(getItemPackagingType(null)).toBe('-');
+        expect(getItemPackagingType(undefined)).toBe('-');
+    });
+
+    it('should return "-" if ticketSales does not have a length property', () => {
+        const ticketSales = { someKey: 'someValue' }; // No tiene propiedad length
+        expect(getItemPackagingType(ticketSales)).toBe('-');
+    });
+
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } },
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V');
+    });
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'A' } },
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V, A');
+    });
+
+    it('should return "-" if ticketSales is an empty array', () => {
+        expect(getItemPackagingType([])).toBe('-');
+    });
+});

src/pages/Customer/composables/getItemPackagingType.js

@@ -0,0 +1,11 @@
+import { dashIfEmpty } from 'src/filters';
+
+export function getItemPackagingType(ticketSales) {
+    if (!ticketSales?.length) return '-';
+
+    const packagingTypes = Array.from(
+        new Set(ticketSales.map(({ item: { itemPackingTypeFk } }) => itemPackingTypeFk)),
+    );
+
+    return dashIfEmpty(packagingTypes.join(', '));
+}

src/pages/Customer/locale/en.yml

@@ -123,3 +123,4 @@ customer:
         ticketFk: Ticket Id
         description: Description
         quantity: Quantity
+        ticketId: Ticket

src/pages/Customer/locale/es.yml

@@ -123,3 +123,4 @@ customer:
         ticketFk: Id Ticket
         description: Descripción
         quantity: Cantidad
+        ticketId: Ticket