Merge pull request 'Fix[VnPaginate]: Fixed paginate' (!1319) from Fix-OrderCatalogPaginate into dev

Reviewed-on: #1319
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

.eslintrc.js

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

.gitignore

@@ -29,5 +29,9 @@ yarn-error.log*
 *.sln
 
 # Cypress directories and files
-/tests/cypress/videos
+/test/cypress/videos
-/tests/cypress/screenshots
+/test/cypress/screenshots
+
+# VitePress directories and files
+/docs/.vitepress/cache
+/docs/.vuepress

.husky/addReferenceTag.js

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

.prettierrc.js

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

CHANGELOG.md

@@ -1,3 +1,157 @@
+# Version 25.04 - 2025-01-28
+
+### Added 🆕
+
+- chore: add task comment  by:jorgep
+- chore: refs #8198 rollback  by:jorgep
+- chore: refs #8322 unnecessary prop  by:alexm
+- feat: refs #7055 added new test case  by:provira
+- feat: refs #7055 created FilterItemForm test  by:provira
+- feat: refs #7077 created test for VnInputTime  by:provira
+- feat: refs #7078 created test for VnJsonValue  by:provira
+- feat: refs #7087 added more test cases  by:provira
+- feat: refs #7087 added new test  by:provira
+- feat: refs #7087 created CardSummary test  by:provira
+- feat: refs #7088 created test for FetchedTags  by:provira
+- feat: refs #7202 added new field  by:Jon
+- feat: refs #7882 Added coords to create a address  by:guillermo
+- feat: refs #7957 add tooltip and i18n support for search link in VnSearchbar component  by:jorgep
+- feat: refs #7957 enhance search functionality and improve data filtering logic  by:jorgep
+- feat: refs #7957 open in new tab  by:jorgep
+- feat: refs #7957 simplify fn to  by:jorgep
+- feat: refs #7957 update VnSearchbar component with improved search URL handling and styling enhancements  by:jorgep
+- feat: refs #8117 filters and values added as needed  by:jtubau
+- feat: refs #8197 useHasContent and use in VnSection and RightMenu  by:alexm
+- feat: refs #8219 added invoice out e2e tests  by:Jon
+- feat: refs #8219 global invoicing e2e  by:Jon
+- feat: refs #8220 added barcodes e2e test  by:Jon
+- feat: refs #8220 created items e2e  by:Jon
+- feat: refs #8220 modified create item form and added respective e2e  by:Jon
+- feat: refs #8225 added account and invoiceOut modules  by:Jon
+- feat: refs #8225 added entry module and fixed translations  by:Jon
+- feat: refs #8225 added invoiceIn and travel module  by:Jon
+- feat: refs #8225 added moreOptions and use it in customer and ticket summary  by:Jon
+- feat: refs #8225 added route and shelving module  by:Jon
+- feat: refs #8225 added worker and zone modules  by:Jon
+- feat: refs #8225 use it in claim, item and order modules  by:Jon
+- feat: refs #8258 added button to pass to uppercase  by:provira
+- feat: refs #8258 added uppercase option to VnInput  by:provira
+- feat: refs #8258 added uppercase validation on supplier create  by:provira
+- feat: refs #8298 add price optimum input and update translations for bonus and price optimum  by:jgallego
+- feat: refs #8316 add entryFilter prop to VnTable component in EntryList  by:jtubau
+- feat: refs #8322 added department changes  by:provira
+- feat: refs #8372 workerPBX  by:robert
+- feat: refs #8381 add initial and final temperature fields to entry forms and summaries  by:jgallego
+- feat: refs #8381 add initial and final temperature labels in English and Spanish locales  by:jgallego
+- feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries  by:jgallego
+- feat: skip tests  by:jorgep
+- style: refs #7957 update VnSearchbar padding for improved layout  by:jorgep
+
+### Changed 📦
+
+- perf: refs #8219 #8219 minor change  by:Javier Segarra
+- perf: refs #8220 on-fetch and added missing translations  by:Jon
+- perf: refs #8220 on-fetch  by:Jon
+- perf: refs #8220 translations  by:Jon
+- perf: refs #8220 use searchbar selector in e2e tests  by:Jon
+- perf: remove warning default value  by:Javier Segarra
+- refactor: redirect using  params  by:Jon
+- refactor: refs #7077 removed some comments  by:provira
+- refactor: refs #7087 removed unused imports  by:provira
+- refactor: refs #7100 added const mockData  by:jtubau
+- refactor: refs #7100 delete unnecesary set prop  by:jtubau
+- refactor: refs #7100 refactorized with methods  by:jtubau
+- refactor: refs #7957 remove blank  by:jorgep
+- refactor: refs #8198 simplify data fetching and filtering logic  by:jorgep
+- refactor: refs #8198 simplify state management and data fetching in ItemDiary component  by:jorgep
+- refactor: refs #8219 modified e2e tests and fixed some translations  by:Jon
+- refactor: refs #8219 modified list test, created cypress download folder and added to gitignore  by:Jon
+- refactor: refs #8219 requested changes  by:Jon
+- refactor: refs #8219 use checkNotification command  by:Jon
+- refactor: refs #8220 added data-cy for e2e tests  by:Jon
+- refactor: refs #8220 requested changes  by:Jon
+- refactor: refs #8220 skip failling test and modifed tag test  by:Jon
+- refactor: refs #8225 requested changes  by:Jon
+- refactor: refs #8247 use new acl for sysadmin  by:Jon
+- refactor: refs #8316 added claimFilter  by:jtubau
+- refactor: refs #8316 added entryFilter  by:jtubau
+- refactor: refs #8316 add new localization keys and update existing ones for entry components  by:jtubau
+- refactor: refs #8316 moved localizations to local locale  by:jtubau
+- refactor: refs #8316 move order localization  by:jtubau
+- refactor: refs #8316 remove unused OrderSearchbar component  by:jtubau
+- refactor: refs #8316 update EntryCard to use user-filter prop and remove exprBuilder from EntryList  by:jtubau
+- refactor: refs #8316 used VnSection and VnCardBeta  by:jtubau
+- refactor: refs #8322 changed translations  by:provira
+- refactor: refs #8322 changed Worker component to use VnSection/VnCardBeta  by:provira
+- refactor: refs #8322 set department inside worker  by:alexm
+- refactor: skip intermitent failing test  by:Jon
+
+### Fixed 🛠️
+
+- feat: refs #8225 added entry module and fixed translations  by:Jon
+- fix: added missing translations in InvoiceIn  by:provira
+- fix: changed invoiceIn for InvoiceIn  by:provira
+- fix: changed translations to only use "invoicein"  by:provira
+- fix: department descriptor link  by:Jon
+- fix: e2e tests  by:Jon
+- fix: entry summary view and build warnings  by:Jon
+- fix: fixed InvoiceIn filter translations  by:provira
+- fix: modified setData in customerDescriptor to show the icons  by:Jon
+- fix: redirect to TicketSale from OrderLines  (origin/Fix-RedirectToTicketSale) by:Jon
+- fix: redirect when confirming lines  by:Jon
+- fix: refs #7055 #7055 #7055 fixed some tests  by:provira
+- fix: refs #7077 removed unused imports  by:provira
+- fix: refs #7078 added missing case with array  by:provira
+- fix: refs #7087 fixed some tests  by:provira
+- fix: refs #7088 changed "vm.vm" to "vm"  by:provira
+- fix: refs #7088 changed wrapper to vm  by:provira
+- fix: refs #7699 add icons and hint  by:carlossa
+- fix: refs #7699 add pwd vnInput  by:carlossa
+- fix: refs #7699 fix component  by:carlossa
+- fix: refs #7699 fix password visibility  by:carlossa
+- fix: refs #7699 fix tfront clean code  by:carlossa
+- fix: refs #7699 fix vnChangePassword, clean VnInput  by:carlossa
+- fix: refs #7699 fix vnInputPassword  by:carlossa
+- fix: refs #7957 add missing closing brace  by:jorgep
+- fix: refs #7957 css  by:jorgep
+- fix: refs #7957 rollback  by:jorgep
+- fix: refs #7957 update data-cy  by:jorgep
+- fix: refs #7957 update visibility handling for clear icon in VnInput component  by:jorgep
+- fix: refs #7957 vn-searchbar test  by:jorgep
+- fix: refs #8117 update salesPersonFk filter options and URL for improved data retrieval  by:jtubau
+- fix: refs #8197 not use yet  by:alexm
+- fix: refs #8198 update query param  by:jorgep
+- fix: refs #8219 fixed e2e tests  by:Jon
+- fix: refs #8219 fixed summary and global tests  by:Jon
+- fix: refs #8219 forgotten dataCy  by:Jon
+- fix: refs #8219 global e2e  by:Jon
+- fix: refs #8219 requested changes  by:Jon
+- fix: refs #8220 itemTag test  by:Javier Segarra
+- fix: refs #8225 invoice in translations  by:Jon
+- fix: refs #8243 fixed SkeletonSummary  by:provira
+- fix: refs #8247 conflicts  by:Jon
+- fix: refs #8247 fixed acls and added lost options  by:Jon
+- fix: refs #8316 ref="claimFilterRef"  by:alexm
+- fix: refs #8316 userFilter  by:alexm
+- fix: refs #8316 use rightMenu  by:alexm
+- fix: refs #8316 use section-searchbar  by:alexm
+- fix: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice  by:jtubau
+- fix: refs #8322 unnecessary section  by:alexm
+- fix: refs #8338 fixed VnTable translations  by:provira
+- fix: refs #8338 removed chipLocale property/added more translations  by:provira
+- fix: refs #8448 e2e  by:Jon
+- fix: refs #8448 not use croppie  by:alexm
+- fix: remove departmentCode  by:Javier Segarra
+- fix: removed unused searchbar  by:PAU ROVIRA ROSALENY
+- fix: skip failling e2e  by:Jon
+- fix: sort by name in description  by:Jon
+- fix: translations  by:Jon
+- fix: use entryFilter  by:alexm
+- fix(VnCardBeta): add userFilter  by:alexm
+- refactor: refs #8219 modified e2e tests and fixed some translations  by:Jon
+- revert: revert header  by:alexm
+- test: fix expedition e2e  by:alexm
+
 # Version 25.00 - 2025-01-14
 
 ### Added 🆕

commitlint.config.js

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

cypress.config.js

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

docs/.vitepress/config.js

@@ -0,0 +1,38 @@
+import { defineConfig } from 'vitepress';
+
+// https://vitepress.dev/reference/site-config
+export default defineConfig({
+    title: 'Lilium',
+    description: 'Lilium docs',
+    themeConfig: {
+        // https://vitepress.dev/reference/default-theme-config
+        nav: [
+            { text: 'Home', link: '/' },
+            { text: 'Components', link: '/components/vnInput' },
+            { text: 'Composables', link: '/composables/useArrayData' },
+        ],
+
+        sidebar: [
+            {
+                items: [
+                    {
+                        text: 'Components',
+                        collapsible: true,
+                        collapsed: true,
+                        items: [{ text: 'VnInput', link: '/components/vnInput' }],
+                    },
+                    {
+                        text: 'Composables',
+                        collapsible: true,
+                        collapsed: true,
+                        items: [
+                            { text: 'useArrayData', link: '/composables/useArrayData' },
+                        ],
+                    },
+                ],
+            },
+        ],
+
+        socialLinks: [{ icon: 'github', link: 'https://github.com/vuejs/vitepress' }],
+    },
+});

docs/components/vnInput.md

@@ -0,0 +1,136 @@
+# VnInput
+
+`VnInput` is a custom input component that provides various useful features such as validation, input clearing, and more.
+
+## Props
+
+### `modelValue`
+
+- **Type:** `String | Number`
+- **Default:** `null`
+- **Description:** The value of the model bound to the component.
+
+### `isOutlined`
+
+- **Type:** `Boolean`
+- **Default:** `false`
+- **Description:** If `true`, the component is rendered with an outlined style.
+
+### `info`
+
+- **Type:** `String`
+- **Default:** `''`
+- **Description:** Additional information displayed alongside the component.
+
+### `clearable`
+
+- **Type:** `Boolean`
+- **Default:** `true`
+- **Description:** If `true`, the component shows a button to clear the input.
+
+### `emptyToNull`
+
+- **Type:** `Boolean`
+- **Default:** `true`
+- **Description:** If `true`, converts empty inputs to `null`.
+
+### `insertable`
+
+- **Type:** `Boolean`
+- **Default:** `false`
+- **Description:** If `true`, allows the insertion of new values.
+
+### `maxlength`
+
+- **Type:** `Number`
+- **Default:** `null`
+- **Description:** The maximum number of characters allowed in the input.
+
+### `uppercase`
+
+- **Type:** `Boolean`
+- **Default:** `false`
+- **Description:** If `true`, converts the input text to uppercase.
+
+## Emits
+
+### `update:modelValue`
+
+- **Description:** Emits the updated model value.
+- **Behavior:** This event is emitted whenever the input value changes. It is used to update the model value bound to the component.
+
+### `update:options`
+
+- **Description:** Emits the updated options.
+- **Behavior:** This event is emitted when the component's options change. It is useful for components with dynamic options.
+
+### `keyup.enter`
+
+- **Description:** Emits an event when the Enter key is pressed.
+- **Behavior:** This event is emitted whenever the Enter key is pressed while the input is focused. It can be used to handle specific actions when the input is confirmed.
+
+### `remove`
+
+- **Description:** Emits an event to remove the current value.
+- **Behavior:** This event is emitted when the clear button (close icon) is clicked. It is used to handle the removal of the current input value.
+
+## Functions
+
+### `focus`
+
+- **Description:** Focuses the input.
+- **Behavior:** This function is exposed so it can be called from outside the component. It uses `vnInputRef.value.focus()` to focus the input.
+
+### `handleKeydown`
+
+- **Description:** Handles the `keydown` event of the input.
+- **Behavior:** This function is called whenever a key is pressed while the input is focused. If the pressed key is `Backspace`, it does nothing. If `insertable` is `true` and the pressed key is a number, it calls `handleInsertMode`.
+
+### `handleInsertMode`
+
+- **Description:** Handles the insertion mode of values.
+- **Behavior:** This function is called when `insertable` is `true` and a numeric key is pressed. It inserts the value at the cursor position and updates the input value. Then, it moves the cursor to the correct position.
+
+### `handleUppercase`
+
+- **Description:** Converts the input value to uppercase.
+- **Behavior:** This function is called when the uppercase icon is clicked. It converts the current input value to uppercase.
+
+## Usage
+
+```vue
+<template>
+    <VnInput
+        v-model="inputValue"
+        :isOutlined="true"
+        info="Additional information"
+        :clearable="true"
+        :emptyToNull="true"
+        :insertable="false"
+        :maxlength="50"
+        :uppercase="true"
+        @update:modelValue="handleUpdate"
+        @keyup.enter="handleEnter"
+        @remove="handleRemove"
+    />
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const inputValue = ref('');
+
+const handleUpdate = (value) => {
+    console.log('Updated value:', value);
+};
+
+const handleEnter = () => {
+    console.log('Enter pressed');
+};
+
+const handleRemove = () => {
+    console.log('Value removed');
+};
+</script>
+```

docs/composables/useArrayData.md

@@ -0,0 +1,215 @@
+# useArrayData
+
+`useArrayData` is a composable function that provides a set of utilities for managing array data in a Vue component. It leverages Pinia for state management and provides various methods for fetching, filtering, and manipulating data.
+
+## Usage
+
+```javascript
+import { useArrayData } from 'src/composables/useArrayData';
+
+const {
+    fetch,
+    applyFilter,
+    addFilter,
+    getCurrentFilter,
+    setCurrentFilter,
+    addFilterWhere,
+    addOrder,
+    deleteOrder,
+    refresh,
+    destroy,
+    loadMore,
+    store,
+    totalRows,
+    updateStateParams,
+    isLoading,
+    deleteOption,
+    reset,
+    resetPagination,
+} = useArrayData('myKey', userOptions);
+```
+
+## Parameters
+
+### `key`
+
+- **Type:** `String`
+- **Description:** A unique key to identify the data store.
+
+### `userOptions`
+
+- **Type:** `Object`
+- **Description:** An object containing user-defined options for configuring the data store.
+
+## Methods
+
+### `fetch`
+
+Fetches data from the server.
+
+#### Parameters
+
+- **`options`** : An object with the following properties:
+- `append` (Boolean): Whether to append the fetched data to the existing data.
+- `updateRouter` (Boolean): Whether to update the router with the current filter.
+
+#### Returns
+
+- **`Promise`** : A promise that resolves with the fetched data.
+
+### `applyFilter`
+
+Applies a filter to the data.
+
+#### Parameters
+
+- **`filter`** : An object containing the filter criteria.
+- **`params`** : Additional parameters for the filter.
+- **`fetchOptions`** : Options for the fetch method.
+
+#### Returns
+
+- **`Promise`** : A promise that resolves with the filtered data.
+
+### `addFilter`
+
+Adds a filter to the existing filters.
+
+#### Parameters
+
+- **`filter`** : An object containing the filter criteria.
+- **`params`** : Additional parameters for the filter.
+
+#### Returns
+
+- **`Promise`** : A promise that resolves with the updated filter and parameters.
+
+### `getCurrentFilter`
+
+Gets the current filter applied to the data.
+
+#### Returns
+
+- **`Object`** : The current filter and parameters.
+
+### `setCurrentFilter`
+
+Sets the current filter for the data.
+
+#### Returns
+
+- **`Object`** : The current filter and parameters.
+
+### `addFilterWhere`
+
+Adds a `where` clause to the existing filters.
+
+#### Parameters
+
+- **`where`** : An object containing the `where` clause.
+
+#### Returns
+
+- **`Promise`** : A promise that resolves when the filter is applied.
+
+### `addOrder`
+
+Adds an order to the existing orders.
+
+#### Parameters
+
+- **`field`** : The field to order by.
+- **`direction`** : The direction of the order (`ASC` or `DESC`).
+
+#### Returns
+
+- **`Promise`** : A promise that resolves with the updated order.
+
+### `deleteOrder`
+
+Deletes an order from the existing orders.
+
+#### Parameters
+
+- **`field`** : The field to delete the order for.
+
+#### Returns
+
+- **`Promise`** : A promise that resolves when the order is deleted.
+
+### `refresh`
+
+Refreshes the data by re-fetching it from the server.
+
+#### Returns
+
+- **`Promise`** : A promise that resolves with the refreshed data.
+
+### `destroy`
+
+Destroys the data store for the given key.
+
+### `loadMore`
+
+Loads more data by incrementing the pagination.
+
+#### Returns
+
+- **`Promise`** : A promise that resolves with the additional data.
+
+### `updateStateParams`
+
+Updates the state parameters with the given data.
+
+#### Parameters
+
+- **`data`** : The data to update the state parameters with.
+
+### `deleteOption`
+
+Deletes an option from the store.
+
+#### Parameters
+
+- **`option`** : The option to delete.
+
+### `reset`
+
+Resets the store to its default state.
+
+#### Parameters
+
+- **`opts`** : An array of options to reset.
+
+### `resetPagination`
+
+Resets the pagination for the store.
+
+## Computed Properties
+
+### `totalRows`
+
+- **Description:** The total number of rows in the data.
+- **Type:** `Number`
+
+### `isLoading`
+
+- **Description:** Whether the data is currently being loaded.
+- **Type:** `Boolean`
+
+```vue
+<script setup>
+import { useArrayData } from 'src/composables/useArrayData';
+
+const userOptions = {
+    url: '/api/data',
+    limit: 10,
+};
+
+const arrayData = useArrayData('myKey', userOptions);
+</script>
+```
+
+```
+
+```

docs/index.md

@@ -0,0 +1,13 @@
+---
+# https://vitepress.dev/reference/default-theme-home-page
+layout: home
+
+hero:
+    name: 'Lilium'
+    text: 'Lilium docs'
+    tagline: Powered by Verdnatura
+    actions:
+        - theme: brand
+          text: Docs
+          link: /components/vnInput
+---

package.json

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

postcss.config.js

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

proxy-serve.js

@@ -0,0 +1,6 @@
+export default [
+    {
+        path: '/api',
+        rule: { target: 'http://0.0.0.0:3000' },
+    },
+];

quasar.config.js

@@ -8,11 +8,11 @@
 // Configuration for your app
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
-const { configure } = require('quasar/wrappers');
+import { configure } from 'quasar/wrappers';
-const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
+import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
-const path = require('path');
+import path from 'path';
 
-module.exports = configure(function (/* ctx */) {
+export default configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,
@@ -179,7 +179,6 @@ module.exports = configure(function (/* ctx */) {
                 'render', // keep this as last one
             ],
         },
-
         // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
         pwa: {
             workboxMode: 'generateSW', // or 'injectManifest'

quasar.extensions.json

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

src/boot/__tests__/axios.spec.js

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

src/boot/axios.js

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

src/components/CrudModel.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, watch } from 'vue';
+import { computed, ref, useAttrs, watch } from 'vue';
 import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -17,6 +17,7 @@ const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
+const $attrs = useAttrs();
 
 const $props = defineProps({
     model: {
@@ -113,9 +114,11 @@ onBeforeRouteLeave((to, from, next) => {
 });
 
 async function fetch(data) {
-    resetData(data);
+    const keyData = $attrs['key-data'];
-    emit('onFetch', data);
+    const rows = keyData ? data[keyData] : data;
-    return data;
+    resetData(rows);
+    emit('onFetch', rows);
+    return rows;
 }
 
 function resetData(data) {
@@ -146,7 +149,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        }
+        },
     );
 }
 
@@ -212,7 +215,7 @@ async function remove(data) {
 
     if (preRemove.length) {
         newData = newData.filter(
-            (form) => !preRemove.some((index) => index == form.$index)
+            (form) => !preRemove.some((index) => index == form.$index),
         );
         const changes = getChanges();
         if (!changes.creates?.length && !changes.updates?.length)

src/components/ItemsFilterPanel.vue

@@ -31,7 +31,6 @@ const props = defineProps({
 const route = useRoute();
 
 const itemTypesOptions = ref([]);
-const suppliersOptions = ref([]);
 const tagOptions = ref([]);
 const tagValues = ref([]);
 const categoryList = ref(null);
@@ -40,13 +39,13 @@ const selectedTypeFk = ref(getParamWhere(route.query.table, 'typeFk', false));
 
 const selectedCategory = computed(() => {
     return (categoryList.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value
+        (category) => category?.id === selectedCategoryFk.value,
     );
 });
 
 const selectedType = computed(() => {
     return (itemTypesOptions.value || []).find(
-        (type) => type?.id === selectedTypeFk.value
+        (type) => type?.id === selectedTypeFk.value,
     );
 });
 
@@ -134,13 +133,6 @@ const setCategoryList = (data) => {
 
 <template>
     <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
-    <FetchData
-        url="Suppliers"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-    />
     <FetchData
         url="Tags"
         :filter="{ fields: ['id', 'name', 'isFree'] }"
@@ -349,4 +341,11 @@ es:
         floramondo: Floramondo
         salesPersonFk: Comprador
         categoryFk: Categoría
+    Plant: Planta natural
+    Flower: Flor fresca
+    Handmade: Hecho a mano
+    Artificial: Artificial
+    Green: Verdes frescos
+    Accessories: Complementos florales
+    Fruit: Fruta
 </i18n>

src/components/LeftMenu.vue

@@ -10,12 +10,13 @@ import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
 import VnInput from './common/VnInput.vue';
+import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const route = useRoute();
 const quasar = useQuasar();
 const navigation = useNavigationStore();
-
+const router = useRouter();
 const props = defineProps({
     source: {
         type: String,
@@ -174,6 +175,10 @@ function normalize(text) {
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase();
 }
+const searchModule = () => {
+    const [item] = filteredItems.value;
+    if (item) router.push({ name: item.name });
+};
 </script>
 
 <template>
@@ -188,10 +193,11 @@ function normalize(text) {
                         filled
                         dense
                         autofocus
+                        @keyup.enter.stop="searchModule()"
                     />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size">
+                <template v-if="filteredPinnedModules.size && !search">
                     <LeftMenuItem
                         v-for="[key, pinnedModule] of filteredPinnedModules"
                         :key="key"
@@ -215,11 +221,11 @@ function normalize(text) {
                     </LeftMenuItem>
                     <QSeparator />
                 </template>
-                <template v-for="item in filteredItems" :key="item.name">
+                <template v-for="(item, index) in filteredItems" :key="item.name">
                     <template
-                        v-if="item.children && !filteredPinnedModules.has(item.name)"
+                        v-if="search ||item.children && !filteredPinnedModules.has(item.name)"
                     >
-                        <LeftMenuItem :item="item" group="modules">
+                        <LeftMenuItem :item="item" group="modules" :class="search && index === 0 ? 'searched' : ''">
                             <template #side>
                                 <QBtn
                                     v-if="item.isPinned === true"
@@ -336,6 +342,9 @@ function normalize(text) {
 .header {
     color: var(--vn-label-color);
 }
+.searched{
+    background-color: var(--vn-section-hover-color);
+}
 </style>
 <i18n>
     es:

src/components/NavBar.vue

@@ -20,6 +20,7 @@ const appName = 'Lilium';
 const pinnedModulesRef = ref();
 
 onMounted(() => stateStore.setMounted());
+const refresh = () => window.location.reload();
 </script>
 <template>
     <QHeader color="white" elevated>
@@ -64,6 +65,13 @@ onMounted(() => stateStore.setMounted());
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
+                <QIcon
+                    name="refresh"
+                    size="md"
+                    color="red"
+                    v-if="state.get('error')"
+                    @click="refresh"
+                />
                 <QBtn
                     :class="{ 'q-pa-none': quasar.platform.is.mobile }"
                     id="pinnedModules"

src/components/UserPanel.vue

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

src/components/VnTable/VnTable.vue

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

src/components/VnTable/VnTableFilter.vue

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

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

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

src/components/VnTable/filters/tableFooter.js

@@ -0,0 +1,12 @@
+export default function (initialFooter, data) {
+    const footer = data.reduce(
+        (acc, row) => {
+            Object.entries(initialFooter).forEach(([key, initialValue]) => {
+                acc[key] += row?.[key] !== undefined ? row[key] : initialValue;
+            });
+            return acc;
+        },
+        { ...initialFooter }
+    );
+    return footer;
+}

src/components/common/RightAdvancedMenu.vue

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

src/components/common/RightMenu.vue

@@ -17,7 +17,7 @@ onMounted(() => {
 });
 </script>
 <template>
-    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
+    <Teleport to="#actions-prepend" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"
@@ -26,6 +26,7 @@ onMounted(() => {
                 round
                 dense
                 icon="dock_to_left"
+                data-cy="toggle-right-drawer"
             >
                 <QTooltip bottom anchor="bottom right">
                     {{ t('globals.collapseMenu') }}

src/components/common/VnCardBeta.vue

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

src/components/common/VnDmsList.vue

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

src/components/common/VnInput.vue

@@ -75,6 +75,7 @@ const focus = () => {
 
 defineExpose({
     focus,
+    vnInputRef,
 });
 
 const mixinRules = [
@@ -174,7 +175,11 @@ const handleUppercase = () => {
                     v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
                     @click="handleUppercase"
                     class="uppercase-icon"
-                />
+                >
+                    <QTooltip>
+                        {{ t('Convert to uppercase') }}
+                    </QTooltip>
+                </QIcon>
                 
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
@@ -187,13 +192,26 @@ const handleUppercase = () => {
     </div>
 </template>
 
+<style>
+.uppercase-icon {
+  transition: color 0.3s, transform 0.2s;
+  cursor: pointer;
+}
+
+.uppercase-icon:hover {
+  color: #ed9937;
+  transform: scale(1.2);
+}
+</style>
 <i18n>
     en:
         inputMin: Must be more than {value}
         maxLength: The value exceeds {value} characters
         inputMax: Must be less than {value}
+
     es:
         inputMin: Debe ser mayor a {value}
         maxLength: El valor excede los {value} carácteres
         inputMax: Debe ser menor a {value}
+        Convert to uppercase: Convertir a mayúsculas
 </i18n>

src/components/common/VnInputDate.vue

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

src/components/common/VnInputTime.vue

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

src/components/common/VnLog.vue

@@ -15,6 +15,7 @@ import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 import VnPaginate from '../ui/VnPaginate.vue';
+import RightMenu from './RightMenu.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -130,7 +131,7 @@ const actionsIcon = {
 };
 const validDate = new RegExp(
     /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source +
-        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
+        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source,
 );
 
 function castJsonValue(value) {
@@ -192,7 +193,7 @@ function getLogTree(data) {
                     user: log.user,
                     userFk: log.userFk,
                     logs: [],
-                })
+                }),
             );
         }
         // Model
@@ -210,7 +211,7 @@ function getLogTree(data) {
                     id: log.changedModelId,
                     showValue: log.changedModelValue,
                     logs: [],
-                })
+                }),
             );
             nLogs = 0;
         }
@@ -282,7 +283,7 @@ function setDate(type) {
     to = date.adjustDate(
         to,
         { hour: 21, minute: 59, second: 59, millisecond: 999 },
-        true
+        true,
     );
 
     switch (type) {
@@ -365,7 +366,7 @@ async function clearFilter() {
     dateTo.value = undefined;
     userRadio.value = undefined;
     Object.keys(checkboxOptions.value).forEach(
-        (opt) => (checkboxOptions.value[opt].selected = false)
+        (opt) => (checkboxOptions.value[opt].selected = false),
     );
     await applyFilter();
 }
@@ -378,7 +379,7 @@ watch(
     () => router.currentRoute.value.params.id,
     () => {
         applyFilter();
-    }
+    },
 );
 </script>
 <template>
@@ -391,7 +392,7 @@ watch(
                     const changedModel = item.changedModel;
                     return {
                         locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel
+                            validations[changedModel]?.locale?.name ?? changedModel,
                         ),
                         value: changedModel,
                     };
@@ -507,7 +508,7 @@ watch(
                                                 :title="
                                                     date.formatDate(
                                                         log.creationDate,
-                                                        'DD/MM/YYYY hh:mm:ss'
+                                                        'DD/MM/YYYY hh:mm:ss',
                                                     ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
                                                 "
                                             >
@@ -577,7 +578,7 @@ watch(
                                                         t(
                                                             `actions.${
                                                                 actionsText[log.action]
-                                                            }`
+                                                            }`,
                                                         )
                                                     "
                                                 />
@@ -677,7 +678,8 @@ watch(
             </div>
         </template>
     </VnPaginate>
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
+        <template #right-panel>
             <QList dense>
                 <QSeparator />
                 <QItem class="q-mt-sm">
@@ -732,14 +734,17 @@ watch(
                             v-model="userSelect"
                             option-label="name"
                             option-value="id"
-                        :url="`${model}Logs/${$route.params.id}/editors`"
+                            :url="`${model}Logs/${route.params.id}/editors`"
                             :fields="['id', 'nickname', 'name', 'image']"
                             sort-by="nickname"
                             @update:model-value="selectFilter('userSelect')"
                             hide-selected
                         >
                             <template #option="{ opt, itemProps }">
-                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItem
+                                    v-bind="itemProps"
+                                    class="q-pa-xs row items-center"
+                                >
                                     <QItemSection class="col-3 items-center">
                                         <VnAvatar :worker-id="opt.id" />
                                     </QItemSection>
@@ -799,7 +804,7 @@ watch(
                 <QItem class="q-mt-sm">
                     <QInput
                         class="full-width"
-                    :label="t('to')"
+                        :label="t('globals.to')"
                         @click="dateToDialog = true"
                         @focus="(evt) => evt.target.blur()"
                         @clear="selectFilter('date', 'from')"
@@ -809,7 +814,8 @@ watch(
                     />
                 </QItem>
             </QList>
-    </Teleport>
+        </template>
+    </RightMenu>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"
@@ -1053,9 +1059,9 @@ en:
         Deletes: Deletes
         Accesses: Accesses
     Users:
-        User: Usuario
+        User: User
-        All: Todo
+        All: All
-        System: Sistema
+        System: System
     properties:
         id: ID
         claimFk: Claim ID

src/components/common/VnSection.vue

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

src/components/common/VnSelect.vue

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

src/components/common/VnSelectDialog.vue

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

src/components/common/VnSelectSupplier.vue

@@ -0,0 +1,35 @@
+<script setup>
+import { computed } from 'vue';
+import VnSelect from 'components/common/VnSelect.vue';
+
+const model = defineModel({ type: [String, Number, Object] });
+const url = 'Suppliers';
+</script>
+
+<template>
+    <VnSelect
+        :label="$t('globals.supplier')"
+        v-bind="$attrs"
+        v-model="model"
+        :url="url"
+        option-value="id"
+        option-label="nickname"
+        :fields="['id', 'name', 'nickname', 'nif']"
+        sort-by="name ASC"
+    >
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection>
+                    <QItemLabel>
+                        {{ scope.opt?.name }}
+                    </QItemLabel>
+                    <QItemLabel caption>
+                        {{
+                            `#${scope.opt?.id} , ${scope.opt?.nickname} (${scope.opt?.nif})`
+                        }}
+                    </QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnSelect>
+</template>

src/components/common/VnSelectWorker.vue

@@ -9,9 +9,9 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    hasInfo: {
+    info: {
-        type: Boolean,
+        type: String,
-        default: false,
+        default: undefined,
     },
     modelValue: {
         type: [String, Number, Object],
@@ -53,13 +53,14 @@ const url = computed(() => {
         :fields="['id', 'name', 'nickname', 'code']"
         :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
+        data-cy="vnWorkerSelect"
     >
         <template #prepend v-if="$props.hasAvatar">
-            <VnAvatar :worker-id="value" color="primary" :title="title" />
+            <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
         </template>
-        <template #append v-if="$props.hasInfo">
+        <template #append v-if="$props.info">
             <QIcon name="info" class="cursor-pointer">
-                <QTooltip>{{ $t($props.hasInfo) }}</QTooltip>
+                <QTooltip>{{ $t($props.info) }}</QTooltip>
             </QIcon>
         </template>
         <template #option="scope">
@@ -72,7 +73,8 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }},
+                        {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

src/components/common/VnSummaryDialog.vue

@@ -10,6 +10,10 @@ defineProps({
         type: Object,
         required: true,
     },
+    width: {
+        type: String,
+        default: 'md-width',
+    },
 });
 
 defineEmits([...useDialogPluginComponent.emits]);
@@ -17,7 +21,19 @@ defineEmits([...useDialogPluginComponent.emits]);
 const { dialogRef, onDialogHide } = useDialogPluginComponent();
 </script>
 <template>
-    <QDialog ref="dialogRef" @hide="onDialogHide" full-width>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
-        <component :is="summary" :id="id" />
+        <component :is="summary" :id="id" :class="width" />
     </QDialog>
 </template>
+
+<style lang="scss" scoped>
+.md-width {
+    max-width: $width-md;
+}
+.lg-width {
+    max-width: $width-lg;
+}
+.xlg-width {
+    max-width: $width-xl;
+}
+</style>

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

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

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

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

src/components/ui/CardDescriptor.vue

@@ -37,6 +37,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    width: {
+        type: String,
+        default: 'md-width',
+    },
 });
 
 const state = useState();
@@ -128,9 +132,8 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn></slot
                 >
-
                 <QBtn
-                    @click.stop="viewSummary(entity.id, $props.summary)"
+                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
                     round
                     flat
                     dense

src/components/ui/CardSummary.vue

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

src/components/ui/CatalogItem.vue

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

src/components/ui/QCalendarMonthWrapper.vue

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

src/components/ui/VnFilterPanel.vue

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

src/components/ui/VnPaginate.vue

@@ -78,6 +78,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    keyData: {
+        type: String,
+        default: undefined,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@@ -119,7 +123,7 @@ watch(
     () => props.data,
     () => {
         store.data = props.data;
-    }
+    },
 );
 
 watch(
@@ -128,12 +132,12 @@ watch(
         if (!mounted.value) return;
         emit('onChange', data);
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 watch(
     () => [props.url, props.filter],
-    ([url, filter]) => mounted.value && fetch({ url, filter })
+    ([url, filter]) => mounted.value && fetch({ url, filter }),
 );
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
@@ -166,7 +170,7 @@ function emitStoreData() {
 async function paginate() {
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
-    if (!props.url) return;
+    if (!arrayData.store.url) return;
 
     isLoading.value = true;
     await arrayData.loadMore();
@@ -194,7 +198,7 @@ function endPagination() {
 async function onLoad(index, done) {
     if (!store.data || !mounted.value) return done();
 
-    if (store.data.length === 0 || !props.url) return done(false);
+    if (store.data.length === 0 || !arrayData.store.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
 
@@ -255,7 +259,7 @@ defineExpose({
         :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
-        <slot name="body" :rows="store.data"></slot>
+        <slot name="body" :rows="keyData ? store.data[keyData] : store.data"></slot>
         <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
             <QSpinner color="primary" size="md" />
         </div>

src/components/ui/VnSearchbar.vue

@@ -102,7 +102,7 @@ watch(
     (val) => {
         arrayData = useArrayData(val, { ...props });
         store = arrayData.store;
-    }
+    },
 );
 
 onMounted(() => {
@@ -113,23 +113,20 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.keys(store.userParams ?? {}).length
-        ? store.userParams
-        : store.defaultParams;
     arrayData.resetPagination();
 
-    const filter = {
+    let filter = { params: { search: searchText.value } };
-        params: {
-            search: searchText.value,
-        },
-        filter: props.filter,
-    };
 
     if (!props.searchRemoveParams || !searchText.value) {
-        filter.params = {
+        filter = {
-            ...staticParams,
+            params: {
+                ...store.userParams,
                 search: searchText.value,
+            },
+            filter: store.filter,
         };
+    } else {
+        arrayData.reset(['currentFilter', 'userParams']);
     }
 
     if (props.whereFilter) {
@@ -179,6 +176,7 @@ async function search() {
                     >
                         <QTooltip>{{ t(props.info) }}</QTooltip>
                     </QIcon>
+                    <div id="searchbar-after"></div>
                 </template>
             </VnInput>
         </QForm>

src/components/ui/VnUsesMana.vue

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

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

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

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

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

src/composables/useArrayData.js

@@ -33,10 +33,11 @@ export function useArrayData(key, userOptions) {
                     : JSON.parse(params?.filter ?? '{}');
             delete params.filter;
 
-            store.userParams = { ...store.userParams, ...params };
+            store.userParams = params;
             store.filter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }
+        setCurrentFilter();
     });
 
     if (key && userOptions) setOptions();
@@ -78,11 +79,7 @@ export function useArrayData(key, userOptions) {
 
         cancelRequest();
         canceller = new AbortController();
-        const { params, limit } = getCurrentFilter();
+        const { params, limit } = setCurrentFilter();
-
-        store.currentFilter = JSON.parse(JSON.stringify(params));
-        delete store.currentFilter.filter.include;
-        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
 
         let exprFilter;
         if (store?.exprBuilder) {
@@ -107,7 +104,7 @@ export function useArrayData(key, userOptions) {
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect) return;
+            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
         }
         store.isLoading = false;
         canceller = null;
@@ -142,12 +139,12 @@ export function useArrayData(key, userOptions) {
         }
     }
 
-    async function applyFilter({ filter, params }) {
+    async function applyFilter({ filter, params }, fetchOptions = {}) {
         if (filter) store.userFilter = filter;
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch({});
+        const response = await fetch(fetchOptions);
         return response;
     }
 
@@ -173,10 +170,9 @@ export function useArrayData(key, userOptions) {
 
     async function addOrder(field, direction = 'ASC') {
         const newOrder = field + ' ' + direction;
-        let order = store.order || [];
+        const order = toArray(store.order);
-        if (typeof order == 'string') order = [order];
 
-        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        let index = getOrderIndex(order, field);
         if (index > -1) {
             order[index] = newOrder;
         } else {
@@ -193,16 +189,24 @@ export function useArrayData(key, userOptions) {
     }
 
     async function deleteOrder(field) {
-        let order = store.order ?? [];
+        const order = toArray(store.order);
-        if (typeof order == 'string') order = [order];
+        const index = getOrderIndex(order, field);
-
-        const index = order.findIndex((o) => o.split(' ')[0] === field);
         if (index > -1) order.splice(index, 1);
 
         store.order = order;
         fetch({});
     }
 
+    function getOrderIndex(order, field) {
+        return order.findIndex((o) => o.split(' ')[0] === field);
+    }
+
+    function toArray(str = []) {
+        if (!str) return [];
+        if (Array.isArray(str)) return str;
+        if (typeof str === 'string') return str.split(',').map((item) => item.trim());
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -276,14 +280,14 @@ export function useArrayData(key, userOptions) {
     }
 
     function getCurrentFilter() {
+        if (!Object.keys(store.userParams).length)
+            store.userParams = store.defaultParams ?? {};
+
         const filter = {
             limit: store.limit,
+            ...store.userFilter,
         };
 
-        let userParams = { ...store.userParams };
-
-        Object.assign(filter, store.userFilter);
-
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -291,15 +295,22 @@ export function useArrayData(key, userOptions) {
         filter.where = where;
         const params = { filter };
 
-        Object.assign(params, userParams);
+        Object.assign(params, store.userParams);
         if (params.filter) params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order) params.filter.order = toArray(store.order);
-        if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
         return { filter, params, limit: filter.limit };
     }
 
+    function setCurrentFilter() {
+        const { params, limit } = getCurrentFilter();
+        store.currentFilter = JSON.parse(JSON.stringify(params));
+        delete store.currentFilter.filter.include;
+        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
+        return { params, limit };
+    }
+
     function processData(data, { map = true, append = true }) {
         if (!append) {
             store.data = [];
@@ -333,6 +344,7 @@ export function useArrayData(key, userOptions) {
         applyFilter,
         addFilter,
         getCurrentFilter,
+        setCurrentFilter,
         addFilterWhere,
         addOrder,
         deleteOrder,

src/composables/useFilterParams.js

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

src/composables/useHasContent.js

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

src/composables/useSession.js

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

src/composables/useSummaryDialog.js

@@ -4,10 +4,10 @@ import { useQuasar } from 'quasar';
 export function useSummaryDialog() {
     const quasar = useQuasar();
 
-    function viewSummary(id, summary) {
+    function viewSummary(id, summary, width) {
         quasar.dialog({
             component: VnSummaryDialog,
-            componentProps: { id, summary },
+            componentProps: { id, summary, width },
         });
     }
 

src/css/app.scss

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

src/css/icons.scss

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

src/css/quasar.variables.scss

@@ -33,6 +33,11 @@ $dark-shadow-color: black;
 $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
 $spacing-md: 16px;
 $color-font-secondary: #777;
+$width-xs: 400px;
+$width-sm: 544px;
+$width-md: 800px;
+$width-lg: 1280px;
+$width-xl: 1600px;
 .bg-success {
     background-color: $positive;
 }

src/filters/index.js

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

src/filters/toCelsius.js

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

src/i18n/locale/en.yml

@@ -2,12 +2,14 @@ globals:
     lang:
         es: Spanish
         en: English
-    quantity: Quantity
     language: Language
+    quantity: Quantity
     entity: Entity
+    preview: Preview
     user: User
     details: Details
-    collapseMenu: Collapse left menu
+    collapseMenu: Collapse lateral menu
+    advancedMenu: Advanced menu
     backToDashboard: Return to dashboard
     notifications: Notifications
     userPanel: User panel
@@ -35,7 +37,6 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
-    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -59,6 +60,7 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
+    entry: Entry
     warehouseOut: Warehouse Out
     warehouseIn: Warehouse In
     landed: Landed
@@ -67,11 +69,11 @@ globals:
     amount: Amount
     packages: Packages
     download: Download
+    downloadPdf: Download PDF
     selectRows: 'Select all { numberRows } row(s)'
     allRows: 'All { numberRows } row(s)'
     markAll: Mark all
     requiredField: Required field
-    valueCantBeEmpty: Value cannot be empty
     class: clase
     type: Type
     reason: reason
@@ -81,6 +83,9 @@ globals:
     warehouse: Warehouse
     company: Company
     fieldRequired: Field required
+    valueCantBeEmpty: Value cannot be empty
+    Value can't be blank: Value cannot be blank
+    Value can't be null: Value cannot be null
     allowedFilesText: 'Allowed file types: { allowedContentTypes }'
     smsSent: SMS sent
     confirmDeletion: Confirm deletion
@@ -130,6 +135,26 @@ globals:
     medium: Medium
     big: Big
     email: Email
+    supplier: Supplier
+    ticketList: Ticket List
+    created: Created
+    worker: Worker
+    now: Now
+    name: Name
+    new: New
+    comment: Comment
+    observations: Observations
+    goToModuleIndex: Go to module index
+    createInvoiceIn: Create invoice in
+    myAccount: My account
+    noOne: No one
+    maxTemperature: Max
+    minTemperature: Min
+    changePass: Change password
+    deleteConfirmTitle: Delete selected elements
+    changeState: Change state
+    raid: 'Raid {daysInForward} days'
+    isVies: Vies
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -151,13 +176,14 @@ globals:
         subRoles: Subroles
         inheritedRoles: Inherited Roles
         customers: Customers
+        customerCreate: New customer
+        createCustomer: Create customer
+        createOrder: New order
         list: List
         webPayments: Web Payments
         extendedList: Extended list
         notifications: Notifications
         defaulter: Defaulter
-        customerCreate: New customer
-        createOrder: New order
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
@@ -193,27 +219,28 @@ globals:
         claims: Claims
         claimCreate: New claim
         lines: Lines
-        photos: Photos
         development: Development
+        photos: Photos
         action: Action
         invoiceOuts: Invoice out
         negativeBases: Negative Bases
         globalInvoicing: Global invoicing
         invoiceOutCreate: Create invoice out
+        order: Orders
+        orderList: List
+        orderCreate: New order
+        catalog: Catalog
+        volume: Volume
         shelving: Shelving
         shelvingList: Shelving List
         shelvingCreate: New shelving
         invoiceIns: Invoices In
         invoiceInCreate: Create invoice in
         vat: VAT
+        labeler: Labeler
         dueDay: Due day
         intrastat: Intrastat
         corrective: Corrective
-        order: Orders
-        orderList: List
-        orderCreate: New order
-        catalog: Catalog
-        volume: Volume
         workers: Workers
         workerCreate: New worker
         department: Department
@@ -226,10 +253,10 @@ globals:
         wagonsList: Wagons List
         wagonCreate: Create wagon
         wagonEdit: Edit wagon
+        wagonCounter: Trolley counter
         typesList: Types List
         typeCreate: Create type
         typeEdit: Edit type
-        wagonCounter: Trolley counter
         roadmap: Roadmap
         stops: Stops
         routes: Routes
@@ -238,21 +265,16 @@ globals:
         routeCreate: New route
         RouteRoadmap: Roadmaps
         RouteRoadmapCreate: Create roadmap
+        RouteExtendedList: Router
         autonomous: Autonomous
         suppliers: Suppliers
         supplier: Supplier
-        expedition: Expedition
-        services: Service
-        components: Components
-        pictures: Pictures
-        packages: Packages
-        tracking: Tracking
-        labeler: Labeler
         supplierCreate: New supplier
         accounts: Accounts
         addresses: Addresses
         agencyTerm: Agency agreement
         travel: Travels
+        create: Create
         extraCommunity: Extra community
         travelCreate: New travel
         history: Log
@@ -260,14 +282,13 @@ globals:
         items: Items
         diary: Diary
         tags: Tags
-        create: Create
-        buyRequest: Buy requests
         fixedPrice: Fixed prices
+        buyRequest: Buy requests
         wasteBreakdown: Waste breakdown
         itemCreate: New item
-        barcode: Barcodes
         tax: Tax
         botanical: Botanical
+        barcode: Barcodes
         itemTypeCreate: New item type
         family: Item Type
         lastEntries: Last entries
@@ -283,13 +304,20 @@ globals:
         formation: Formation
         locations: Locations
         warehouses: Warehouses
-        saleTracking: Sale tracking
         roles: Roles
         connections: Connections
         acls: ACLs
         mailForwarding: Mail forwarding
         mailAlias: Mail alias
         privileges: Privileges
+        observation: Notes
+        expedition: Expedition
+        saleTracking: Sale tracking
+        services: Service
+        tracking: Tracking
+        components: Components
+        pictures: Pictures
+        packages: Packages
         ldap: LDAP
         samba: Samba
         twoFactor: Two factor
@@ -298,29 +326,15 @@ globals:
         ticketsMonitor: Tickets monitor
         clientsActionsMonitor: Clients and actions
         serial: Serial
+        business: Business
         medical: Mutual
         pit: IRPF
-        RouteExtendedList: Router
         wasteRecalc: Waste recaclulate
         operator: Operator
         parking: Parking
-    supplier: Supplier
-    created: Created
-    worker: Worker
-    now: Now
-    name: Name
-    new: New
-    comment: Comment
-    observations: Observations
-    goToModuleIndex: Go to module index
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
-    createInvoiceIn: Create invoice in
-    myAccount: My account
-    noOne: No one
-    maxTemperature: Max
-    minTemperature: Min
     params:
         clientFk: Client id
         salesPersonFk: Sales person
@@ -338,19 +352,13 @@ globals:
         supplierFk: Supplier
         supplierRef: Supplier ref
         serial: Serial
-        amount: Importe
+        amount: Amount
         awbCode: AWB
         correctedFk: Rectified
         correctingFk: Rectificative
         daysOnward: Days onward
         countryFk: Country
         companyFk: Company
-    changePass: Change password
-    setPass: Set password
-    deleteConfirmTitle: Delete selected elements
-    changeState: Change state
-    raid: 'Raid {daysInForward} days'
-    isVies: Vies
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -446,6 +454,7 @@ ticket:
         service: Service
         attender: Attender
         ok: Ok
+        consigneeStreet: Street
     create:
         address: Address
 invoiceOut:
@@ -490,21 +499,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: CSV download failed
-shelving:
-    list:
-        parking: Parking
-        priority: Priority
-        newShelving: New Shelving
-    summary:
-        recyclable: Recyclable
-parking:
-    pickingOrder: Picking order
-    sector: Sector
-    row: Row
-    column: Column
-    searchBar:
-        info: You can search by parking code
-        label: Search parking...
 department:
     chat: Chat
     bossDepartment: Boss Department
@@ -516,6 +510,24 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
+    pageTitles:
+        workers: Workers
+        list: List
+        basicData: Basic data
+        summary: Summary
+        notifications: Notifications
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        notes: Notas
+        dms: My documentation
+        pbx: Private Branch Exchange
+        log: Log
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        balance: Balance
+        medical: Medical
     list:
         department: Department
         schedule: Schedule
@@ -531,15 +543,24 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: FI due date
+        fiDueDate: DNI expiration date
         sex: Sex
-        seniority: Seniority
+        seniority: Antiquity
         fi: DNI/NIE/NIF
         birth: Birth
         isFreelance: Freelance
         isSsDiscounted: SS Bonification
         hasMachineryAuthorized: Machinery authorized
         isDisable: Disable
+        business: Business
+        started: Started
+        ended: Ended
+        reasonEnd: Reason End
+        department: Departament
+        workerBusinessCategory: Worker Business Category
+        notes: Notes
+        workCenter: Center
+        professionalCategory: Professional Category
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -598,6 +619,23 @@ worker:
         sizeLimit: Size limit
         isOnReservationMode: Reservation mode
         machine: Machine
+    business:
+        tableVisibleColumns:
+            started: Start Date
+            ended: End Date
+            company: Company
+            reasonEnd: Reason for Termination
+            department: Department
+            professionalCategory: Professional Category
+            calendarType: Work Calendar
+            workCenter: Work Center
+            payrollCategories: Contract Category
+            occupationCode: Contribution Code
+            rate: Rate
+            businessType: Contract Type
+            amount: Salary
+            basicSalary: Transport Workers Salary
+            notes: Notes
 wagon:
     type:
         submit: Submit
@@ -696,6 +734,9 @@ supplier:
     consumption:
         entry: Entry
 travel:
+    search: Search travel
+    searchInfo: You can search by travel id or name
+    id: Id
     travelList:
         tableVisibleColumns:
             ref: Reference
@@ -704,6 +745,7 @@ travel:
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
+            awb: AWB
     summary:
         entryId: Entry Id
         freight: Freight
@@ -725,62 +767,7 @@ travel:
         destination: Destination
         thermograph: Thermograph
         travelFileDescription: 'Travel id { travelId }'
-item:
+        carrier: Carrier
-    descriptor:
-        buyer: Buyer
-        color: Color
-        category: Category
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-    list:
-        id: Identifier
-        stems: Stems
-        category: Category
-        typeName: Type
-        isActive: Active
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-    create:
-        priority: Priority
-    buyRequest:
-        requester: Requester
-        requested: Requested
-        attender: Atender
-        achieved: Achieved
-        concept: Concept
-    summary:
-        otherData: Other data
-        tax: Tax
-        botanical: Botanical
-        barcode: Barcode
-        completeName: Complete name
-        family: Familiy
-        stems: Stems
-        multiplier: Multiplier
-        buyer: Buyer
-        doPhoto: Do photo
-        intrastatCode: Intrastat code
-        ref: Reference
-        relevance: Relevance
-        weight: Weight (gram)/stem
-        units: Units/box
-        expense: Expense
-        generic: Generic
-        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: Min sales quantity
-        genus: Genus
-        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -5,9 +5,11 @@ globals:
     language: Idioma
     quantity: Cantidad
     entity: Entidad
+    preview: Vista previa
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
+    advancedMenu: Menú avanzado
     backToDashboard: Volver al tablón
     notifications: Notificaciones
     userPanel: Panel de usuario
@@ -53,11 +55,12 @@ globals:
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
-    noSelectedRows: No tienes ninguna línea seleccionada
     microsip: Abrir en MicroSIP
+    noSelectedRows: No tienes ninguna línea seleccionada
     downloadCSVSuccess: Descarga de CSV exitosa
     reference: Referencia
     agency: Agencia
+    entry: Entrada
     warehouseOut: Alm. salida
     warehouseIn: Alm. entrada
     landed: F. entrega
@@ -132,6 +135,26 @@ globals:
     medium: Mediano/a
     big: Grande
     email: Correo
+    supplier: Proveedor
+    ticketList: Listado de tickets
+    created: Fecha creación
+    worker: Trabajador
+    now: Ahora
+    name: Nombre
+    new: Nuevo
+    comment: Comentario
+    observations: Observaciones
+    goToModuleIndex: Ir al índice del módulo
+    createInvoiceIn: Crear factura recibida
+    myAccount: Mi cuenta
+    noOne: Nadie
+    maxTemperature: Máx
+    minTemperature: Mín
+    changePass: Cambiar contraseña
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+    changeState: Cambiar estado
+    raid: 'Redada {daysInForward} días'
+    isVies: Vies
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -154,17 +177,17 @@ globals:
         inheritedRoles: Roles heredados
         customers: Clientes
         customerCreate: Nuevo cliente
+        createCustomer: Crear cliente
         createOrder: Nuevo pedido
         list: Listado
         webPayments: Pagos Web
         extendedList: Listado extendido
         notifications: Notificaciones
         defaulter: Morosos
-        createCustomer: Crear cliente
         fiscalData: Datos fiscales
         billingData: Forma de pago
         consignees: Consignatarios
-        'address-create': Nuevo consignatario
+        address-create: Nuevo consignatario
         notes: Notas
         credits: Créditos
         greuges: Greuges
@@ -230,10 +253,10 @@ globals:
         wagonsList: Listado vagones
         wagonCreate: Crear tipo
         wagonEdit: Editar tipo
+        wagonCounter: Contador de carros
         typesList: Listado tipos
         typeCreate: Crear tipo
         typeEdit: Editar tipo
-        wagonCounter: Contador de carros
         roadmap: Troncales
         stops: Paradas
         routes: Rutas
@@ -242,8 +265,8 @@ globals:
         routeCreate: Nueva ruta
         RouteRoadmap: Troncales
         RouteRoadmapCreate: Crear troncal
-        autonomous: Autónomos
         RouteExtendedList: Enrutador
+        autonomous: Autónomos
         suppliers: Proveedores
         supplier: Proveedor
         supplierCreate: Nuevo proveedor
@@ -303,28 +326,15 @@ globals:
         ticketsMonitor: Monitor de tickets
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
+        business: Contratos
         medical: Mutua
         pit: IRPF
         wasteRecalc: Recalcular mermas
         operator: Operario
         parking: Parking
-    supplier: Proveedor
-    created: Fecha creación
-    worker: Trabajador
-    now: Ahora
-    name: Nombre
-    new: Nuevo
-    comment: Comentario
-    observations: Observaciones
-    goToModuleIndex: Ir al índice del módulo
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
-    createInvoiceIn: Crear factura recibida
-    myAccount: Mi cuenta
-    noOne: Nadie
-    maxTemperature: Máx
-    minTemperature: Mín
     params:
         clientFk: Id cliente
         salesPersonFk: Comercial
@@ -347,12 +357,6 @@ globals:
         packing: ITP
         countryFk: País
         companyFk: Empresa
-    changePass: Cambiar contraseña
-    setPass: Establecer contraseña
-    deleteConfirmTitle: Eliminar los elementos seleccionados
-    changeState: Cambiar estado
-    raid: 'Redada {daysInForward} días'
-    isVies: Vies
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -445,13 +449,18 @@ ticket:
         purchaseRequest: Petición de compra
         service: Servicio
         attender: Consignatario
+        consigneeStreet: Dirección
     create:
         address: Dirección
-invoiceOut:
+order:
-    card:
+    field:
-        issued: Fecha emisión
+        salesPersonFk: Comercial
-        customerCard: Ficha del cliente
+    form:
-        ticketList: Listado de tickets
+        clientFk: Cliente
+        addressFk: Dirección
+        agencyModeFk: Agencia
+    list:
+        newOrder: Nuevo Pedido
     summary:
         issued: Fecha
         dued: Fecha límite
@@ -462,47 +471,6 @@ invoiceOut:
         fee: Cuota
         tickets: Tickets
         totalWithVat: Importe
-    globalInvoices:
-        errors:
-            chooseValidClient: Selecciona un cliente válido
-            chooseValidCompany: Selecciona una empresa válida
-            chooseValidPrinter: Selecciona una impresora válida
-            chooseValidSerialType: Selecciona una tipo de serie válida
-            fillDates: La fecha de la factura y la fecha máxima deben estar completas
-            invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
-            invoiceWithFutureDate: Existe una factura con una fecha futura
-            noTicketsToInvoice: No existen tickets para facturar
-            criticalInvoiceError: Error crítico en la facturación proceso detenido
-            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
-        table:
-            addressId: Id dirección
-            streetAddress: Dirección fiscal
-        statusCard:
-            percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
-            pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
-    negativeBases:
-        clientId: Id cliente
-        base: Base
-        active: Activo
-        hasToInvoice: Facturar
-        verifiedData: Datos comprobados
-        comercial: Comercial
-        errors:
-            downloadCsvFailed: Error al descargar CSV
-shelving:
-    list:
-        parking: Parking
-        priority: Prioridad
-        newShelving: Nuevo Carro
-    summary:
-        recyclable: Reciclable
-parking:
-    pickingOrder: Orden de recogida
-    row: Fila
-    column: Columna
-    searchBar:
-        info: Puedes buscar por código de parking
-        label: Buscar parking...
 department:
     chat: Chat
     bossDepartment: Jefe de departamento
@@ -514,6 +482,26 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
+    pageTitles:
+        workers: Trabajadores
+        list: Listado
+        basicData: Datos básicos
+        summary: Resumen
+        notifications: Notificaciones
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        notes: Notas
+        dms: Mi documentación
+        pbx: Centralita
+        log: Historial
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        balance: Balance
+        business: Contrato
+        formation: Formación
+        medical: Mutua
     list:
         department: Departamento
         schedule: Horario
@@ -538,6 +526,15 @@ worker:
         isSsDiscounted: Bonificación SS
         hasMachineryAuthorized: Autorizado para maquinaria
         isDisable: Deshabilitado
+        business: Contrato
+        started: Antigüedad
+        ended: Fin
+        reasonEnd: Motivo finalización
+        department: Departamento
+        workerBusinessCategory: Categoria profesional
+        notes: Notas
+        workCenter: Centro
+        professionalCategory: Categoria profesional
     notificationsManager:
         activeNotifications: Notificaciones activas
         availableNotifications: Notificaciones disponibles
@@ -584,6 +581,23 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+    business:
+        tableVisibleColumns:
+            started: Fecha inicio
+            ended: Fecha fin
+            company: Empresa
+            reasonEnd: Motivo finalización
+            department: Departamento
+            professionalCategory: Categoria profesional
+            calendarType: Calendario laboral
+            workCenter: Centro
+            payrollCategories: Categoria contrato
+            occupationCode: Cotización
+            rate: Tarifa
+            businessType: Contrato
+            amount: Salario
+            basicSalary: Salario transportistas
+            notes: Notas
     operator:
         numberOfWagons: Número de vagones
         train: tren
@@ -596,7 +610,6 @@ worker:
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
         machine: Máquina
-
 wagon:
     type:
         submit: Guardar
@@ -692,6 +705,9 @@ supplier:
     consumption:
         entry: Entrada
 travel:
+    search: Buscar envío
+    searchInfo: Buscar envío por id o nombre
+    id: Id
     travelList:
         tableVisibleColumns:
             ref: Referencia
@@ -700,6 +716,7 @@ travel:
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
+            awb: AWB
     summary:
         entryId: Id entrada
         freight: Porte
@@ -721,62 +738,7 @@ travel:
         destination: Destino
         thermograph: Termógrafo
         travelFileDescription: 'Id envío { travelId }'
-item:
+        carrier: Transportista
-    descriptor:
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-    list:
-        id: Identificador
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        isActive: Activo
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-    create:
-        priority: Prioridad
-    summary:
-        otherData: Otros datos
-        tax: IVA
-        botanical: Botánico
-        barcode: Código de barras
-        completeName: Nombre completo
-        family: Familia
-        stems: Tallos
-        multiplier: Multiplicador
-        buyer: Comprador
-        doPhoto: Hacer foto
-        intrastatCode: Código intrastat
-        ref: Referencia
-        relevance: Relevancia
-        weight: Peso (gramos)/tallo
-        units: Unidades/caja
-        expense: Gasto
-        generic: Genérico
-        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: Cantidad mínima de venta
-        genus: Genus
-        specie: Specie
-    buyRequest:
-        requester: Solicitante
-        requested: Solicitado
-        attender: Comprador
-        achieved: Conseguido
-        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:

src/layouts/OutLayout.vue

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

src/pages/Claim/Card/ClaimAction.vue

@@ -4,7 +4,6 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useStateStore } from 'src/stores/useStateStore';
 import { toDate, toPercentage, toCurrency } from 'filters/index';
 import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
@@ -13,11 +12,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
-const stateStore = computed(() => useStateStore());
 const claim = ref(null);
 const claimRef = ref();
 const claimId = route.params.id;
@@ -201,7 +200,8 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
+    <RightMenu v-if="claim">
+        <template #right-panel>
             <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
                 {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
             </QCard>
@@ -238,7 +238,10 @@ async function post(query, params) {
             <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
                 <QInput
                     :disable="
-                    !(claim.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2)
+                        !(
+                            claim.responsibility >=
+                            Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
+                        )
                     "
                     :label="t('confirmGreuges')"
                     class="q-field__native text-grey-2"
@@ -251,8 +254,8 @@ async function post(query, params) {
                     v-model="multiplicatorValue"
                 />
             </QCard>
-    </Teleport>
+        </template>
-    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
+    </RightMenu>
     <CrudModel
         v-if="claim"
         data-key="ClaimEnds"

src/pages/Claim/ClaimList.vue

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

src/pages/Customer/Card/CustomerBillingData.vue

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

src/pages/Customer/Card/CustomerCard.vue

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

src/pages/Customer/Card/CustomerConsumption.vue

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

src/pages/Customer/Card/CustomerConsumptionFilter.vue

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

src/pages/Customer/Card/CustomerCredits.vue

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

src/pages/Customer/Card/CustomerDescriptor.vue

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

src/pages/Customer/Card/CustomerDescriptorMenu.vue

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

src/pages/Customer/Card/CustomerGreuges.vue

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

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -50,7 +50,8 @@ const filterClientFindOne = {
         >
             <template #form="{ data }">
                 <VnRow>
-                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid" />
+                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid"
+                    data-cy="UnpaidCheckBox" />
                 </VnRow>
 
                 <VnRow class="row q-gutter-md q-mb-md" v-show="data.unpaid">

src/pages/Customer/CustomerFilter.vue

@@ -1,3 +1,4 @@
+
 <script setup>
 import { useI18n } from 'vue-i18n';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
@@ -169,9 +170,16 @@ en:
         fi: FI
         salesPersonFk: Salesperson
         provinceFk: Province
+        isActive: Is active
         city: City
         phone: Phone
         email: Email
+        isToBeMailed: Mailed
+        isEqualizated: Equailized
+        businessTypeFk: Business type
+        sageTaxTypeFk: Sage Tax Type
+        sageTransactionTypeFk: Sage Tax Type
+        payMethodFk: Billing data
         zoneFk: Zone
         socialName : Social name
         name: Name
@@ -180,6 +188,13 @@ es:
     params:
         search: Contiene
         fi: NIF
+        isActive: Activo
+        isToBeMailed: A enviar
+        isEqualizated:  Recargo de equivalencia
+        businessTypeFk: Tipo de negocio
+        sageTaxTypeFk: Tipo de impuesto Sage
+        sageTransactionTypeFk: Tipo de impuesto Sage
+        payMethodFk: Forma de pago
         salesPersonFk: Comercial
         provinceFk: Provincia
         city: Ciudad

src/pages/Customer/CustomerList.vue

@@ -5,18 +5,19 @@ import { useRouter } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDate } from 'src/filters';
 
-import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const tableRef = ref();
+const dataKey = 'CustomerList';
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -37,8 +38,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.name'),
         name: 'name',
+        label: t('globals.name'),
         isTitle: true,
         create: true,
         columnClass: 'expand',
@@ -50,25 +51,30 @@ const columns = computed(() => [
         isTitle: true,
         create: true,
         columnClass: 'expand',
-        attrs: {
-            uppercase: true,
-        },
         columnFilter: {
+            component: 'select',
             attrs: {
+                url: 'Clients',
+                fields: ['socialName'],
+                optionLabel: 'socialName',
+                optionValue: 'socialName',
                 uppercase: false,
             },
         },
+        attrs: {
+            uppercase: true,
+        },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.fi'),
         name: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
         create: true,
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
         name: 'salesPersonFk',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
         component: 'select',
         attrs: {
             url: 'Workers/activeWithInheritedRole',
@@ -84,8 +90,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.credit'),
         name: 'credit',
+        label: t('customer.summary.credit'),
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -93,8 +99,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         name: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -102,8 +108,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.phone'),
         name: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -122,8 +128,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.mobile'),
         name: 'mobile',
+        label: t('customer.summary.mobile'),
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -132,8 +138,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.street'),
         name: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
         create: true,
         columnFilter: {
             inWhere: true,
@@ -142,8 +148,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
         name: 'countryFk',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
         columnFilter: {
             component: 'select',
             inWhere: true,
@@ -156,8 +162,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
         name: 'provinceFk',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
         component: 'select',
         attrs: {
             url: 'Provinces',
@@ -169,24 +175,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.city'),
         name: 'city',
+        label: t('customer.summary.city'),
     },
     {
         align: 'left',
-        label: t('customer.summary.postcode'),
         name: 'postcode',
+        label: t('customer.summary.postcode'),
     },
     {
         align: 'left',
-        label: t('globals.params.email'),
         name: 'email',
+        label: t('globals.params.email'),
         cardVisible: true,
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.created'),
         name: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
         format: ({ created }) => toDate(created),
         columnFilter: {
             component: 'date',
@@ -196,10 +202,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
         name: 'businessTypeFk',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
         create: true,
         component: 'select',
+        columnFilter: {
+            inWhere: true,
+        },
         attrs: {
             url: 'BusinessTypes',
             fields: ['code', 'description'],
@@ -214,8 +223,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.payMethodFk'),
         name: 'payMethodFk',
+        label: t('customer.summary.payMethodFk'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -235,8 +244,6 @@ const columns = computed(() => [
                 optionLabel: 'vat',
                 url: 'SageTaxTypes',
             },
-            alias: 'sti',
-            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
     },
@@ -250,15 +257,13 @@ const columns = computed(() => [
                 optionLabel: 'transaction',
                 url: 'SageTransactionTypes',
             },
-            alias: 'stt',
-            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
     },
     {
         align: 'left',
-        label: t('customer.summary.isActive'),
         name: 'isActive',
+        label: t('customer.summary.isActive'),
         chip: {
             color: null,
             condition: (value) => !value,
@@ -270,24 +275,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.isVies'),
         name: 'isVies',
+        label: t('globals.isVies'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
         name: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.isEqualizated'),
         name: 'isEqualizated',
+        label: t('customer.summary.isEqualizated'),
         create: true,
         columnFilter: {
             inWhere: true,
@@ -295,8 +300,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
         name: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
         chip: {
             color: null,
             condition: (value) => value,
@@ -308,48 +313,48 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
         name: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
         name: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
         name: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.hasLcr'),
         name: 'hasLcr',
+        label: t('customer.summary.hasLcr'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.hasCoreVnl'),
         name: 'hasCoreVnl',
+        label: t('customer.summary.hasCoreVnl'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
         name: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
         columnFilter: {
             inWhere: true,
         },
@@ -398,21 +403,23 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <VnSearchbar
+    <VnSection
-        :info="t('You can search by customer id or name')"
+        :data-key="dataKey"
-        :label="t('Search customer')"
+        :columns="columns"
-        data-key="CustomerList"
+        prefix="customer"
-    />
+        :array-data-props="{
-    <RightMenu>
+            url: 'Clients/filter',
-        <template #right-panel>
+            order: ['id DESC'],
+        }"
+    >
+        <template #advanced-menu>
             <CustomerFilter data-key="CustomerList" />
         </template>
-    </RightMenu>
+        <template #body>
             <VnTable
                 ref="tableRef"
-        data-key="CustomerList"
+                :data-key="dataKey"
                 url="Clients/filter"
-        order="id DESC"
                 :create="{
                     urlCreate: 'Clients/createWithUser',
                     title: t('globals.pageTitles.customerCreate'),
@@ -463,7 +470,12 @@ function handleLocation(data, location) {
                         @update:model-value="(location) => handleLocation(data, location)"
                     />
                     <QInput v-model="data.userName" :label="t('Web user')" />
-            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
+                    <QInput
+                        :label="t('Email')"
+                        clearable
+                        type="email"
+                        v-model="data.email"
+                    >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
                                 <QTooltip max-width="400px">{{
@@ -475,6 +487,8 @@ function handleLocation(data, location) {
                 </template>
             </VnTable>
         </template>
+    </VnSection>
+</template>
 <i18n>
 es:
     Web user: Usuario web

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -11,14 +11,14 @@ import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const dataRef = ref(null);
 
-const balanceDueTotal = ref(0);
 const selected = ref([]);
-
+const arrayData = useArrayData('CustomerDefaulter');
 const columns = computed(() => [
     {
         align: 'left',
@@ -165,26 +165,37 @@ const viewAddObservation = (rowsSelected) => {
     });
 };
 
-const onFetch = async (data) => {
-    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
-};
-
 function exprBuilder(param, value) {
     switch (param) {
-        case 'clientFk':
-            return { [`d.${param}`]: value };
-        case 'creditInsurance':
-        case 'amount':
-        case 'workerFk':
-        case 'departmentFk':
-        case 'countryFk':
-        case 'payMethod':
         case 'salesPersonFk':
+        case 'creditInsurance':
+        case 'countryFk':
+            return { [`c.${param}`]: value };
+        case 'payMethod':
+            return { [`c.payMethodFk`]: value };
+        case 'workerFk':
+            return { [`co.${param}`]: value };
+        case 'departmentFk':
+            return { [`wd.${param}`]: value };
+        case 'amount':
+        case 'clientFk':
             return { [`d.${param}`]: value };
         case 'created':
             return { 'd.created': { between: dateRange(value) } };
         case 'defaulterSinced':
             return { 'd.defaulterSinced': { between: dateRange(value) } };
+        case 'isWorker': {
+            if (value == undefined) return;
+            const search = value ? 'worker' : { neq: 'worker' };
+            return { 'c.businessTypeFk': search };
+        }
+        case 'hasRecovery': {
+            if (value == undefined) return;
+            const search = value ? null : { neq: null };
+            return { 'r.finished': search };
+        }
+        case 'observation':
+            return { 'co.text': { like: `%${value}%` } };
     }
 }
 </script>
@@ -192,7 +203,7 @@ function exprBuilder(param, value) {
 <template>
     <VnSubToolbar>
         <template #st-data>
-            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+            <CustomerBalanceDueTotal :amount="arrayData.store.data?.amount" />
         </template>
         <template #st-actions>
             <QBtn
@@ -211,8 +222,6 @@ function exprBuilder(param, value) {
         url="Defaulters/filter"
         :expr-builder="exprBuilder"
         :columns="columns"
-        @on-fetch="onFetch"
-        :use-model="true"
         :table="{
             'row-key': 'clientFk',
             selection: 'multiple',
@@ -221,6 +230,7 @@ function exprBuilder(param, value) {
         :disable-option="{ card: true }"
         auto-load
         :order="['amount DESC']"
+        key-data="defaulters"
     >
         <template #column-clientFk="{ row }">
             <span class="link" @click.stop>

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -2,7 +2,7 @@
 import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
+import { useQuasar } from 'quasar';
 import axios from 'axios';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import FetchData from 'components/FetchData.vue';
@@ -13,11 +13,12 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-
+const quasar = useQuasar();
 const urlUpdate = ref('');
 const agencyModes = ref([]);
 const incoterms = ref([]);
@@ -83,8 +84,26 @@ const deleteNote = (id, index) => {
     notes.value.splice(index, 1);
 };
 
-const onDataSaved = async () => {
+const updateAddress = async (data) => {
-    let payload = {
+    await axios.patch(urlUpdate.value, data);
+};
+
+const updateAddressTicket = async () => {
+    urlUpdate.value += '?updateObservations=true';
+};
+
+const updateObservations = async (payload) => {
+    await axios.post('AddressObservations/crud', payload);
+    notes.value = [];
+    deletes.value = [];
+    toCustomerAddress();
+};
+async function updateAll({ data, payload }) {
+    await updateObservations(payload);
+    await updateAddress(data);
+}
+function getPayload() {
+    return {
         creates: notes.value.filter((note) => note.$isNew),
         deletes: deletes.value,
         updates: notes.value
@@ -101,14 +120,40 @@ const onDataSaved = async () => {
                 where: { id: note.id },
             })),
     };
+}
 
-    await axios.post('AddressObservations/crud', payload);
+async function handleDialog(data) {
-    notes.value = [];
+    const payload = getPayload();
-    deletes.value = [];
+    const body = { data, payload };
+    if (payload.updates.length) {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t(
+                        'confirmTicket'
+                    ),
+                    message: t('confirmDeletionMessage'),
+                },
+            })
+            .onOk(async () => {
+                await updateAddressTicket();
+                await updateAll(body);
                 toCustomerAddress();
-};
+            })
+            .onCancel(async () => {
+                await updateAll(body);
+                toCustomerAddress();
+            });
+    } else {
+        updateAll(body);
+        toCustomerAddress();
+    }
+}
 
 const toCustomerAddress = () => {
+    notes.value = [];
+    deletes.value = [];
     router.push({
         name: 'CustomerAddress',
         params: {
@@ -143,7 +188,7 @@ function handleLocation(data, location) {
         :observe-form-changes="false"
         :url-update="urlUpdate"
         :url="`Addresses/${route.params.addressId}`"
-        @on-data-saved="onDataSaved()"
+        :save-fn="handleDialog"
         auto-load
     >
         <template #moreActions>
@@ -336,4 +381,9 @@ es:
     Remove note: Eliminar nota
     Longitude: Longitud
     Latitude: Latitud
+    confirmTicket: ¿Desea modificar también los estados de todos los tickets que están a punto de ser servidos?
+    confirmDeletionMessage: Si le das a aceptar, se modificaran todas las notas de los ticket a futuro
+en:
+    confirmTicket: Do you also want to modify the states of all the tickets that are about to be served?
+    confirmDeletionMessage: If you click accept, all the notes of the future tickets will be modified
 </i18n>

src/pages/Customer/components/CustomerSamplesCreate.vue

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

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -114,7 +114,7 @@ const columns = computed(() => [
                 action: ({ id }) =>
                     window.open(
                         router.resolve({ params: { id }, name: 'TicketSale' }).href,
-                        '_blank'
+                        '_blank',
                     ),
                 isPrimary: true,
             },
@@ -122,7 +122,7 @@ const columns = computed(() => [
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 isPrimary: true,
-                action: (row) => viewSummary(row.id, TicketSummary),
+                action: (row) => viewSummary(row.id, TicketSummary, 'lg-width'),
             },
         ],
     },

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

@@ -0,0 +1,33 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import axios from 'axios';
+import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
+
+vi.mock('axios');
+
+describe('getAddresses', () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch addresses with correct parameters for a valid clientId', async () => {
+        const clientId = '12345';
+
+        await getAddresses(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['nickname', 'street', 'city', 'id'],
+                    where: { isActive: true },
+                    order: 'nickname ASC',
+                }),
+            },
+        });
+    });
+
+    it('should return undefined when clientId is not provided', async () => {
+        await getAddresses(undefined);
+
+        expect(axios.get).not.toHaveBeenCalled();
+    });
+});

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

@@ -0,0 +1,41 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import axios from 'axios';
+import { getClient } from 'src/pages/Customer/composables/getClient';
+
+vi.mock('axios');
+
+describe('getClient', () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    const generateParams = (clientId) => ({
+        params: {
+            filter: JSON.stringify({
+                include: {
+                    relation: 'defaultAddress',
+                    scope: {
+                        fields: ['id', 'agencyModeFk'],
+                    },
+                },
+                where: { id: clientId },
+            }),
+        },
+    });
+
+    it('should fetch client data with correct parameters for a valid clientId', async () => {
+        const clientId = '12345';
+
+        await getClient(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith('Clients', generateParams(clientId));
+    });
+
+    it('should return undefined when clientId is not provided', async () => {
+        const clientId = undefined;
+
+        await getClient(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith('Clients', generateParams(clientId));
+    });
+});

src/pages/Customer/composables/getAddresses.js

@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+export async function getAddresses(clientId) {   
+    if (!clientId) return;
+    const filter = {
+        fields: ['nickname', 'street', 'city', 'id'],
+        where: { isActive: true },
+        order: 'nickname ASC',
+    };
+    const params = { filter: JSON.stringify(filter) };
+    return await axios.get(`Clients/${clientId}/addresses`, {
+        params,
+    });
+};

src/pages/Customer/composables/getClient.js

@@ -0,0 +1,15 @@
+import axios from 'axios';
+
+export async function getClient(clientId) {
+    const filter = {
+        include: {
+            relation: 'defaultAddress',
+            scope: {
+                fields: ['id', 'agencyModeFk'],
+            },
+        },
+        where: { id: clientId },
+    };
+    const params = { filter: JSON.stringify(filter) };
+    return await axios.get('Clients', { params });
+};

src/pages/Customer/locale/en.yml

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

src/pages/Customer/locale/es.yml

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

src/pages/Entry/Card/EntryBasicData.vue

@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -11,8 +10,9 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -26,6 +26,7 @@ const onFilterTravelSelected = (formData, id) => {
     formData.travelFk = id;
 };
 </script>
+
 <template>
     <FetchData
         ref="companiesRef"
@@ -51,28 +52,12 @@ const onFilterTravelSelected = (formData, id) => {
     >
         <template #form="{ data }">
             <VnRow>
-                <VnSelect
+                <VnSelectSupplier
-                    :label="t('globals.supplier')"
                     v-model="data.supplierFk"
-                    url="Suppliers"
-                    option-value="id"
-                    option-label="nickname"
-                    :fields="['id', 'nickname']"
                     hide-selected
                     :required="true"
                     map-options
-                >
+                />
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
                 <VnSelectDialog
                     :label="t('entry.basicData.travel')"
                     v-model="data.travelFk"
@@ -93,14 +78,13 @@ const onFilterTravelSelected = (formData, id) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection>
-                                <QItemLabel
+                                <QItemLabel>
-                                    >{{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.agencyModeName }} -
-                                    {{ scope.opt?.warehouseInName }} ({{
+                                    {{ scope.opt?.warehouseInName }}
-                                        toDate(scope.opt?.shipped)
+                                    ({{ toDate(scope.opt?.shipped) }}) →
-                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                    {{ scope.opt?.warehouseOutName }}
-                                        toDate(scope.opt?.landed)
+                                    ({{ toDate(scope.opt?.landed) }})
-                                    }})</QItemLabel
+                                </QItemLabel>
-                                >
                             </QItemSection>
                         </QItem>
                     </template>
@@ -126,6 +110,13 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
+                <VnInputNumber
+                    :label="t('entry.summary.commission')"
+                    v-model="data.commission"
+                    step="1"
+                    autofocus
+                    :positive="false"
+                />
                 <VnSelect
                     :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
@@ -133,12 +124,23 @@ const onFilterTravelSelected = (formData, id) => {
                     option-value="id"
                     option-label="code"
                 />
-                <QInput
+            </VnRow>
-                    :label="t('entry.summary.commission')"
+            <VnRow>
-                    v-model="data.commission"
+                <VnInputNumber
-                    type="number"
+                    v-model="data.initialTemperature"
-                    autofocus
+                    name="initialTemperature"
-                    min="0"
+                    :label="t('entry.basicData.initialTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    v-model="data.finalTemperature"
+                    name="finalTemperature"
+                    :label="t('entry.basicData.finalTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
                 />
             </VnRow>
             <VnRow>

src/pages/Entry/Card/EntryDescriptor.vue

@@ -2,13 +2,10 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-
 import { toDate } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
-import filter from './EntryFilter.js';
 import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 
 const $props = defineProps({
@@ -23,7 +20,42 @@ const route = useRoute();
 const { t } = useI18n();
 const entryDescriptorRef = ref(null);
 const url = ref();
-
+const entryFilter = {
+    include: [
+        {
+            relation: 'travel',
+            scope: {
+                fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
+                include: [
+                    {
+                        relation: 'agency',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseOut',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseIn',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'supplier',
+            scope: {
+                fields: ['id', 'nickname'],
+            },
+        },
+    ],
+};
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -58,9 +90,10 @@ const getEntryRedirectionFilter = (entry) => {
         ref="entryDescriptorRef"
         module="Entry"
         :url="`Entries/${entityId}`"
-        :filter="filter"
+        :userFilter="entryFilter"
         title="supplier.nickname"
         data-key="Entry"
+        width="lg-width"
     >
         <template #menu="{ entity }">
             <EntryDescriptorMenu :id="entity.id" />
@@ -147,7 +180,7 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Go to module index: Ir al índice del modulo
+    Show entry report: Ver informe del pedido
     Inventory entry: Es inventario
     Virtual entry: Es una redada
 </i18n>

src/pages/Entry/Card/EntryDescriptorMenu.vue

@@ -1,5 +1,11 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
 import { usePrintService } from 'composables/usePrintService';
+import useNotify from 'src/composables/useNotify.js';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const { openReport } = usePrintService();
 
@@ -9,14 +15,47 @@ const $props = defineProps({
         required: true,
     },
 });
+const { t } = useI18n();
+const { notify } = useNotify();
+const quasar = useQuasar();
+const route = useRoute();
 
 function showEntryReport() {
     openReport(`Entries/${$props.id}/entry-order-pdf`);
 }
+
+const openDialog = () => {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('transferEntryDialog'),
+            promise: transferEntry,
+        },
+    });
+};
+
+const transferEntry = async () => {
+    const { data } = await axios.post(`Entries/${route.params.id}/transfer`);
+    notify('globals.dataSaved', 'positive');
+    const url = `#/entry/${data.newEntryFk.newEntryFk}/summary`;
+    window.open(url, '_blank');
+};
 </script>
 
 <template>
     <QItem v-ripple clickable @click="showEntryReport">
-        <QItemSection>{{ $t('entryList.list.showEntryReport') }}</QItemSection>
+        <QItemSection>{{ $t('entry.descriptorMenu.showEntryReport') }}</QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="openDialog">
+        <QItemSection>{{ t('transferEntry') }}</QItemSection>
     </QItem>
 </template>
+
+<i18n>
+en:
+    transferEntryDialog: The entries will be transferred to the next day
+    transferEntry: Transfer Entry
+es:
+    transferEntryDialog: Se van a transferir las compras al dia siguiente
+    transferEntry: Transferir Entrada
+</i18n>

src/pages/Entry/Card/EntrySummary.vue

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

src/pages/Entry/EntryCreate.vue

@@ -13,6 +13,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -26,7 +27,6 @@ const newEntryForm = reactive({
     travelFk: Number(route.query?.travelFk) || null,
     companyFk: user.value.companyFk || null,
 });
-const suppliersOptions = ref([]);
 const travelsOptions = ref([]);
 const companiesOptions = ref([]);
 
@@ -36,13 +36,6 @@ const redirectToEntryBasicData = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        order="nickname"
-        @on-fetch="(data) => (suppliersOptions = data)"
-        auto-load
-    />
     <FetchData
         url="Travels/filter"
         :filter="{ fields: ['id', 'warehouseInName'] }"
@@ -79,28 +72,13 @@ const redirectToEntryBasicData = (_, { id }) => {
         >
             <template #form="{ data, validate }">
                 <VnRow>
-                    <VnSelect
+                    <VnSelectSupplier
-                        :label="t('Supplier')"
                         class="full-width"
                         v-model="data.supplierFk"
-                        :options="suppliersOptions"
-                        option-value="id"
-                        option-label="nickname"
                         hide-selected
                         :required="true"
                         :rules="validate('entry.supplierFk')"
-                    >
+                    />
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        #{{ scope.opt?.id }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
                 </VnRow>
                 <VnRow>
                     <VnSelect
@@ -152,7 +130,6 @@ const redirectToEntryBasicData = (_, { id }) => {
 
 <i18n>
     es:
-        Supplier: Proveedor
         Travel: Envío
         Company: Empresa
 </i18n>