fix: refs #7319 fix order

.eslintrc.cjs

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

.gitignore

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

.husky/addReferenceTag.js

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

.prettierrc.js

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

CHANGELOG.md

@@ -1,157 +1,3 @@
-# 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 @@
-export default { extends: ['@commitlint/config-conventional'] };
+module.exports = { extends: ['@commitlint/config-conventional'] };

cypress.config.js

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

docs/.vitepress/config.js

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

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

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

@@ -1,13 +0,0 @@
----
-# 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,74 +1,68 @@
 {
-  "name": "salix-front",
+    "name": "salix-front",
-  "version": "25.06.0",
+    "version": "25.04.0",
-  "description": "Salix frontend",
+    "description": "Salix frontend",
-  "productName": "Salix",
+    "productName": "Salix",
-  "author": "Verdnatura",
+    "author": "Verdnatura",
-  "private": true,
+    "private": true,
-  "packageManager": "pnpm@8.15.1",
+    "packageManager": "pnpm@8.15.1",
-  "type": "module",
+    "scripts": {
-  "scripts": {
+        "resetDatabase": "cd ../salix && gulp docker",
-    "resetDatabase": "cd ../salix && gulp docker",
+        "lint": "eslint --ext .js,.vue ./",
-    "lint": "eslint --ext .js,.vue ./",
+        "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-    "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
+        "test:e2e": "cypress open",
-    "test:e2e": "cypress open",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
-    "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-    "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
+        "test:unit": "vitest",
-    "test:unit": "vitest",
+        "test:unit:ci": "vitest run",
-    "test:unit:ci": "vitest run",
+        "commitlint": "commitlint --edit",
-    "commitlint": "commitlint --edit",
+        "prepare": "npx husky install",
-    "prepare": "npx husky install",
+        "addReferenceTag": "node .husky/addReferenceTag.js"
-    "addReferenceTag": "node .husky/addReferenceTag.js",
+    },
-    "docs:dev": "vitepress dev docs",
+    "dependencies": {
-    "docs:build": "vitepress build docs",
+        "@quasar/cli": "^2.3.0",
-    "docs:preview": "vitepress preview docs"
+        "@quasar/extras": "^1.16.9",
-  },
+        "axios": "^1.4.0",
-  "dependencies": {
+        "chromium": "^3.0.3",
-    "@quasar/cli": "^2.4.1",
+        "croppie": "^2.6.5",
-    "@quasar/extras": "^1.16.16",
+        "moment": "^2.30.1",
-    "axios": "^1.4.0",
+        "pinia": "^2.1.3",
-    "chromium": "^3.0.3",
+        "quasar": "^2.14.5",
-    "croppie": "^2.6.5",
+        "validator": "^13.9.0",
-    "moment": "^2.30.1",
+        "vue": "^3.3.4",
-    "pinia": "^2.1.3",
+        "vue-i18n": "^9.2.2",
-    "quasar": "^2.17.7",
+        "vue-router": "^4.2.1"
-    "validator": "^13.9.0",
+    },
-    "vue": "^3.5.13",
+    "devDependencies": {
-    "vue-i18n": "^9.3.0",
+        "@commitlint/cli": "^19.2.1",
-    "vue-router": "^4.2.5"
+        "@commitlint/config-conventional": "^19.1.0",
-  },
+        "@intlify/unplugin-vue-i18n": "^0.8.1",
-  "devDependencies": {
+        "@pinia/testing": "^0.1.2",
-    "@commitlint/cli": "^19.2.1",
+        "@quasar/app-vite": "^1.7.3",
-    "@commitlint/config-conventional": "^19.1.0",
+        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
-    "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
-    "@pinia/testing": "^0.1.2",
+        "@vue/test-utils": "^2.4.4",
-    "@quasar/app-vite": "^2.0.8",
+        "autoprefixer": "^10.4.14",
-    "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "cypress": "^13.6.6",
-    "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "cypress-mochawesome-reporter": "^3.8.2",
-    "@vue/test-utils": "^2.4.4",
+        "eslint": "^8.41.0",
-    "autoprefixer": "^10.4.14",
+        "eslint-config-prettier": "^8.8.0",
-    "cypress": "^13.6.6",
+        "eslint-plugin-cypress": "^2.13.3",
-    "cypress-mochawesome-reporter": "^3.8.2",
+        "eslint-plugin-vue": "^9.14.1",
-    "eslint": "^9.18.0",
+        "husky": "^8.0.0",
-    "eslint-config-prettier": "^10.0.1",
+        "postcss": "^8.4.23",
-    "eslint-plugin-cypress": "^4.1.0",
+        "prettier": "^2.8.8",
-    "eslint-plugin-vue": "^9.32.0",
+        "vitest": "^0.31.1"
-    "husky": "^8.0.0",
+    },
-    "postcss": "^8.4.23",
+    "engines": {
-    "prettier": "^3.4.2",
+        "node": "^20 || ^18 || ^16",
-    "sass": "^1.83.4",
+        "npm": ">= 8.1.2",
-    "vitepress": "^1.6.3",
+        "yarn": ">= 1.21.1",
-    "vitest": "^0.34.0"
+        "bun": ">= 1.0.25"
-  },
+    },
-  "engines": {
+    "overrides": {
-    "node": "^20 || ^18 || ^16",
+        "@vitejs/plugin-vue": "^5.0.4",
-    "npm": ">= 8.1.2",
+        "vite": "^5.1.4",
-    "yarn": ">= 1.21.1",
+        "vitest": "^0.31.1"
-    "bun": ">= 1.0.25"
+    }
-  },
+}
-  "overrides": {
-    "@vitejs/plugin-vue": "^5.2.1",
-    "vite": "^6.0.11",
-    "vitest": "^0.31.1"
-  }
-}

postcss.config.js

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

proxy-serve.js

@@ -1,6 +0,0 @@
-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
 
-import { configure } from 'quasar/wrappers';
+const { configure } = require('quasar/wrappers');
-import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
+const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
-import path from 'path';
+const path = require('path');
 
-export default configure(function (/* ctx */) {
+module.exports = configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,
@@ -179,6 +179,7 @@ export default 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,8 +1,6 @@
 {
     "@quasar/testing-unit-vitest": {
-        "options": [
+        "options": ["scripts"]
-            "scripts"
-        ]
     },
     "@quasar/qcalendar": {}
 }

src/boot/__tests__/axios.spec.js

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

src/boot/axios.js

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

src/components/CrudModel.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, useAttrs, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -17,7 +17,6 @@ const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
-const $attrs = useAttrs();
 
 const $props = defineProps({
     model: {
@@ -114,11 +113,9 @@ onBeforeRouteLeave((to, from, next) => {
 });
 
 async function fetch(data) {
-    const keyData = $attrs['key-data'];
+    resetData(data);
-    const rows = keyData ? data[keyData] : data;
+    emit('onFetch', data);
-    resetData(rows);
+    return data;
-    emit('onFetch', rows);
-    return rows;
 }
 
 function resetData(data) {
@@ -149,7 +146,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        },
+        }
     );
 }
 
@@ -215,7 +212,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,6 +31,7 @@ const props = defineProps({
 const route = useRoute();
 
 const itemTypesOptions = ref([]);
+const suppliersOptions = ref([]);
 const tagOptions = ref([]);
 const tagValues = ref([]);
 const categoryList = ref(null);
@@ -39,13 +40,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
     );
 });
 
@@ -133,6 +134,13 @@ 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'] }"
@@ -341,11 +349,4 @@ 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,13 +10,12 @@ 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,
@@ -175,10 +174,6 @@ function normalize(text) {
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase();
 }
-const searchModule = () => {
-    const [item] = filteredItems.value;
-    if (item) router.push({ name: item.name });
-};
 </script>
 
 <template>
@@ -193,11 +188,10 @@ const searchModule = () => {
                         filled
                         dense
                         autofocus
-                        @keyup.enter.stop="searchModule()"
                     />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size && !search">
+                <template v-if="filteredPinnedModules.size">
                     <LeftMenuItem
                         v-for="[key, pinnedModule] of filteredPinnedModules"
                         :key="key"
@@ -221,11 +215,11 @@ const searchModule = () => {
                     </LeftMenuItem>
                     <QSeparator />
                 </template>
-                <template v-for="(item, index) in filteredItems" :key="item.name">
+                <template v-for="item in filteredItems" :key="item.name">
                     <template
-                        v-if="search ||item.children && !filteredPinnedModules.has(item.name)"
+                        v-if="item.children && !filteredPinnedModules.has(item.name)"
                     >
-                        <LeftMenuItem :item="item" group="modules" :class="search && index === 0 ? 'searched' : ''">
+                        <LeftMenuItem :item="item" group="modules">
                             <template #side>
                                 <QBtn
                                     v-if="item.isPinned === true"
@@ -342,9 +336,6 @@ const searchModule = () => {
 .header {
     color: var(--vn-label-color);
 }
-.searched{
-    background-color: var(--vn-section-hover-color);
-}
 </style>
 <i18n>
     es:

src/components/NavBar.vue

@@ -20,7 +20,6 @@ const appName = 'Lilium';
 const pinnedModulesRef = ref();
 
 onMounted(() => stateStore.setMounted());
-const refresh = () => window.location.reload();
 </script>
 <template>
     <QHeader color="white" elevated>
@@ -65,13 +64,6 @@ const refresh = () => window.location.reload();
             <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,9 +1,6 @@
 <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';
@@ -34,7 +31,14 @@ const userLocale = computed({
 
         value = localeEquivalence[value] ?? value;
 
-        quasarLang(value);
+        try {
+            /* @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,19 +314,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter
+            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
-                :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
@@ -484,9 +472,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                 btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                             "
                             :style="`visibility: ${
-                                ((btn.show && btn.show(row)) ?? true)
+                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
-                                    ? 'visible'
-                                    : 'hidden'
                             }`"
                             @click="btn.action(row)"
                         />

src/components/VnTable/VnTableFilter.vue

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

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

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

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

@@ -1,53 +0,0 @@
-<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-prepend" v-if="stateStore.isHeaderMounted()">
+    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"
@@ -26,7 +26,6 @@ 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,7 +12,6 @@ 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 },
@@ -33,7 +32,6 @@ 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: Number(prop.row.file.split('.')[0]),
+                id: 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,12 +299,11 @@ defineExpose({
         :url="$props.model"
         :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
-        auto-load
+        :auto-load="true"
         @on-fetch="setData"
     >
         <template #body>
             <QTable
-                v-if="rows"
                 :columns="columns"
                 :rows="rows"
                 class="full-width q-mt-md"
@@ -374,7 +373,7 @@ defineExpose({
                                                 v-if="
                                                     shouldRenderButton(
                                                         button.name,
-                                                        props.row.isDocuware,
+                                                        props.row.isDocuware
                                                     )
                                                 "
                                                 :is="button.component"

src/components/common/VnInput.vue

@@ -42,13 +42,10 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
-    uppercase: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const vnInputRef = ref(null);
+const showPassword = ref(false);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -75,7 +72,6 @@ const focus = () => {
 
 defineExpose({
     focus,
-    vnInputRef,
 });
 
 const mixinRules = [
@@ -121,10 +117,6 @@ const handleInsertMode = (e) => {
         input.setSelectionRange(cursorPos + 1, cursorPos + 1);
     });
 };
-
-const handleUppercase = () => {
-    value.value = value.value?.toUpperCase() || '';
-};
 </script>
 
 <template>
@@ -167,20 +159,7 @@ const handleUppercase = () => {
                             emit('remove');
                         }
                     "
-                ></QIcon>
+                />
-                
-                <QIcon
-                    name="match_case"
-                    size="xs"
-                    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">
                     <QTooltip max-width="350px">
@@ -191,27 +170,3 @@ const handleUppercase = () => {
         </QInput>
     </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,7 +105,6 @@ const manageDate = (date) => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = !isPopupOpen"
-            @keydown="isPopupOpen = false"
             hide-bottom-space
         >
             <template #append>

src/components/common/VnInputTime.vue

@@ -79,7 +79,6 @@ 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,7 +15,6 @@ 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();
@@ -131,7 +130,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) {
@@ -193,7 +192,7 @@ function getLogTree(data) {
                     user: log.user,
                     userFk: log.userFk,
                     logs: [],
-                }),
+                })
             );
         }
         // Model
@@ -211,7 +210,7 @@ function getLogTree(data) {
                     id: log.changedModelId,
                     showValue: log.changedModelValue,
                     logs: [],
-                }),
+                })
             );
             nLogs = 0;
         }
@@ -283,7 +282,7 @@ function setDate(type) {
     to = date.adjustDate(
         to,
         { hour: 21, minute: 59, second: 59, millisecond: 999 },
-        true,
+        true
     );
 
     switch (type) {
@@ -366,7 +365,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();
 }
@@ -379,7 +378,7 @@ watch(
     () => router.currentRoute.value.params.id,
     () => {
         applyFilter();
-    },
+    }
 );
 </script>
 <template>
@@ -392,7 +391,7 @@ watch(
                     const changedModel = item.changedModel;
                     return {
                         locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel,
+                            validations[changedModel]?.locale?.name ?? changedModel
                         ),
                         value: changedModel,
                     };
@@ -508,7 +507,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'`
                                                 "
                                             >
@@ -578,7 +577,7 @@ watch(
                                                         t(
                                                             `actions.${
                                                                 actionsText[log.action]
-                                                            }`,
+                                                            }`
                                                         )
                                                     "
                                                 />
@@ -678,144 +677,139 @@ watch(
             </div>
         </template>
     </VnPaginate>
-    <RightMenu>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <template #right-panel>
+        <QList dense>
-            <QList dense>
+            <QSeparator />
-                <QSeparator />
+            <QItem class="q-mt-sm">
-                <QItem class="q-mt-sm">
+                <QInput
-                    <QInput
+                    :label="t('globals.search')"
-                        :label="t('globals.search')"
+                    v-model="searchInput"
-                        v-model="searchInput"
+                    class="full-width"
-                        class="full-width"
+                    clearable
-                        clearable
+                    clear-icon="close"
-                        clear-icon="close"
+                    @keyup.enter="() => selectFilter('search')"
-                        @keyup.enter="() => selectFilter('search')"
+                    @focusout="() => selectFilter('search')"
-                        @focusout="() => selectFilter('search')"
+                    @clear="() => selectFilter('search')"
-                        @clear="() => selectFilter('search')"
+                >
-                    >
+                    <template #append>
-                        <template #append>
+                        <QIcon name="info" class="cursor-pointer">
-                            <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                        </QIcon>
-                            </QIcon>
+                    </template>
-                        </template>
+                </QInput>
-                    </QInput>
+            </QItem>
-                </QItem>
+            <QItem>
-                <QItem>
+                <VnSelect
+                    class="full-width"
+                    :label="t('globals.entity')"
+                    v-model="selectedFilters.changedModel"
+                    option-label="locale"
+                    option-value="value"
+                    :options="actions"
+                    @update:model-value="selectFilter('action')"
+                    hide-selected
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QOptionGroup
+                    size="sm"
+                    v-model="userRadio"
+                    :options="userTypes"
+                    color="primary"
+                    @update:model-value="selectFilter('userRadio')"
+                    right-label
+                >
+                    <template #label="{ label }">
+                        {{ t(`Users.${label}`) }}
+                    </template>
+                </QOptionGroup>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QItemSection v-if="userRadio !== null">
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.entity')"
+                        :label="t('globals.user')"
-                        v-model="selectedFilters.changedModel"
+                        v-model="userSelect"
-                        option-label="locale"
+                        option-label="name"
-                        option-value="value"
+                        option-value="id"
-                        :options="actions"
+                        :url="`${model}Logs/${$route.params.id}/editors`"
-                        @update:model-value="selectFilter('action')"
+                        :fields="['id', 'nickname', 'name', 'image']"
+                        sort-by="nickname"
+                        @update:model-value="selectFilter('userSelect')"
                         hide-selected
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QOptionGroup
-                        size="sm"
-                        v-model="userRadio"
-                        :options="userTypes"
-                        color="primary"
-                        @update:model-value="selectFilter('userRadio')"
-                        right-label
                     >
-                        <template #label="{ label }">
+                        <template #option="{ opt, itemProps }">
-                            {{ t(`Users.${label}`) }}
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItemSection class="col-3 items-center">
+                                    <VnAvatar :worker-id="opt.id" />
+                                </QItemSection>
+                                <QItemSection class="col-9 justify-center">
+                                    <span>{{ opt.name }}</span>
+                                    <span class="text-grey">{{ opt.nickname }}</span>
+                                </QItemSection>
+                            </QItem>
                         </template>
-                    </QOptionGroup>
+                    </VnSelect>
-                </QItem>
+                </QItemSection>
-                <QItem class="q-mt-sm">
+            </QItem>
-                    <QItemSection v-if="userRadio !== null">
+            <QItem class="q-mt-sm">
-                        <VnSelect
+                <QInput
-                            class="full-width"
+                    :label="t('globals.changes')"
-                            :label="t('globals.user')"
+                    v-model="changeInput"
-                            v-model="userSelect"
+                    class="full-width"
-                            option-label="name"
+                    clearable
-                            option-value="id"
+                    clear-icon="close"
-                            :url="`${model}Logs/${route.params.id}/editors`"
+                    @keyup.enter="selectFilter('change')"
-                            :fields="['id', 'nickname', 'name', 'image']"
+                    @focusout="selectFilter('change')"
-                            sort-by="nickname"
+                    @clear="selectFilter('change')"
-                            @update:model-value="selectFilter('userSelect')"
-                            hide-selected
-                        >
-                            <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
-                                    <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker-id="opt.id" />
-                                    </QItemSection>
-                                    <QItemSection class="col-9 justify-center">
-                                        <span>{{ opt.name }}</span>
-                                        <span class="text-grey">{{ opt.nickname }}</span>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.changes')"
-                        v-model="changeInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="selectFilter('change')"
-                        @focusout="selectFilter('change')"
-                        @clear="selectFilter('change')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip max-width="250px">{{
-                                    t('tooltips.changes')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem
-                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                    v-for="(checkboxOption, index) in checkboxOptions"
-                    :key="index"
                 >
-                    <QCheckbox
+                    <template #append>
-                        size="sm"
+                        <QIcon name="info" class="cursor-pointer">
-                        v-model="checkboxOption.selected"
+                            <QTooltip max-width="250px">{{
-                        :label="t(`actions.${checkboxOption.label}`)"
+                                t('tooltips.changes')
-                        @update:model-value="selectFilter"
+                            }}</QTooltip>
-                    />
+                        </QIcon>
-                </QItem>
+                    </template>
-                <QItem class="q-mt-sm">
+                </QInput>
-                    <QInput
+            </QItem>
-                        class="full-width"
+            <QItem
-                        :label="t('globals.date')"
+                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                        @click="dateFromDialog = true"
+                v-for="(checkboxOption, index) in checkboxOptions"
-                        @focus="(evt) => evt.target.blur()"
+                :key="index"
-                        @clear="selectFilter('date', 'to')"
+            >
-                        v-model="dateFrom"
+                <QCheckbox
-                        clearable
+                    size="sm"
-                        clear-icon="close"
+                    v-model="checkboxOption.selected"
-                    />
+                    :label="t(`actions.${checkboxOption.label}`)"
-                </QItem>
+                    @update:model-value="selectFilter"
-                <QItem class="q-mt-sm">
+                />
-                    <QInput
+            </QItem>
-                        class="full-width"
+            <QItem class="q-mt-sm">
-                        :label="t('globals.to')"
+                <QInput
-                        @click="dateToDialog = true"
+                    class="full-width"
-                        @focus="(evt) => evt.target.blur()"
+                    :label="t('globals.date')"
-                        @clear="selectFilter('date', 'from')"
+                    @click="dateFromDialog = true"
-                        v-model="dateTo"
+                    @focus="(evt) => evt.target.blur()"
-                        clearable
+                    @clear="selectFilter('date', 'to')"
-                        clear-icon="close"
+                    v-model="dateFrom"
-                    />
+                    clearable
-                </QItem>
+                    clear-icon="close"
-            </QList>
+                />
-        </template>
+            </QItem>
-    </RightMenu>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('to')"
+                    @click="dateToDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'from')"
+                    v-model="dateTo"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+        </QList>
+    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"
@@ -1059,9 +1053,9 @@ en:
         Deletes: Deletes
         Accesses: Accesses
     Users:
-        User: User
+        User: Usuario
-        All: All
+        All: Todo
-        System: System
+        System: Sistema
     properties:
         id: ID
         claimFk: Claim ID

src/components/common/VnSection.vue

@@ -1,10 +1,10 @@
 <script setup>
-import RightAdvancedMenu from './RightAdvancedMenu.vue';
+import RightMenu from './RightMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
+import { onBeforeMount, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
 
 const $props = defineProps({
@@ -47,14 +47,16 @@ const $props = defineProps({
 });
 
 const route = useRoute();
-const router = useRouter();
-
 let arrayData;
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
-const isMainSection = ref(false);
+const isMainSection = computed(() => {
-
+    const isSame = sectionValue.value == route.name;
+    if (!isSame && arrayData) {
+        arrayData.reset(['userParams', 'userFilter']);
+    }
+    return isSame;
+});
 const searchbarId = 'section-searchbar';
-const advancedMenuSlot = 'advanced-menu';
 const hasContent = useHasContent(`#${searchbarId}`);
 
 onBeforeMount(() => {
@@ -65,27 +67,7 @@ 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">
@@ -98,9 +80,9 @@ function checkIsMain() {
         />
         <div :id="searchbarId"></div>
     </slot>
-    <RightAdvancedMenu :is-main-section="isMainSection">
+    <RightMenu>
-        <template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
+        <template #right-panel v-if="$slots['rightMenu'] || rightFilter">
-            <slot :name="advancedMenuSlot">
+            <slot name="rightMenu">
                 <VnTableFilter
                     v-if="rightFilter && columns"
                     :data-key="dataKey"
@@ -109,7 +91,7 @@ function checkIsMain() {
                 />
             </slot>
         </template>
-    </RightAdvancedMenu>
+    </RightMenu>
     <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, Function],
+        type: [String],
         default: 'name',
     },
     optionValue: {
@@ -232,15 +232,12 @@ 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 filterOptions = { where, include, limit };
+    const fetchOptions = { where, include, limit };
-    if (fields) filterOptions.fields = fields;
+    if (fields) fetchOptions.fields = fields;
-    if (sortBy) filterOptions.order = sortBy;
+    if (sortBy) fetchOptions.order = sortBy;
     arrayData.resetPagination();
 
-    const { data } = await arrayData.applyFilter(
+    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
-        { filter: filterOptions },
-        { updateRouter: false }
-    );
     setOptions(data);
     return data;
 }
@@ -297,7 +294,7 @@ async function onScroll({ to, direction, from, index }) {
     }
 }
 
-defineExpose({ opts: myOptions, vnSelectRef });
+defineExpose({ opts: myOptions });
 
 function handleKeyDown(event) {
     if (event.key === 'Tab' && !event.shiftKey) {

src/components/common/VnSelectDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -7,7 +7,6 @@ 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,
@@ -34,13 +33,10 @@ 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

@@ -1,35 +0,0 @@
-<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,
     },
-    info: {
+    hasInfo: {
-        type: String,
+        type: Boolean,
-        default: undefined,
+        default: false,
     },
     modelValue: {
         type: [String, Number, Object],
@@ -53,14 +53,13 @@ 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" v-bind="$attrs" />
+            <VnAvatar :worker-id="value" color="primary" :title="title" />
         </template>
-        <template #append v-if="$props.info">
+        <template #append v-if="$props.hasInfo">
             <QIcon name="info" class="cursor-pointer">
-                <QTooltip>{{ $t($props.info) }}</QTooltip>
+                <QTooltip>{{ $t($props.hasInfo) }}</QTooltip>
             </QIcon>
         </template>
         <template #option="scope">
@@ -73,8 +72,7 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        #{{ scope.opt.id }}, {{ scope.opt.nickname }},
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
-                        {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

src/components/common/VnSummaryDialog.vue

@@ -10,10 +10,6 @@ defineProps({
         type: Object,
         required: true,
     },
-    width: {
-        type: String,
-        default: 'md-width',
-    },
 });
 
 defineEmits([...useDialogPluginComponent.emits]);
@@ -21,19 +17,7 @@ defineEmits([...useDialogPluginComponent.emits]);
 const { dialogRef, onDialogHide } = useDialogPluginComponent();
 </script>
 <template>
-    <QDialog ref="dialogRef" @hide="onDialogHide">
+    <QDialog ref="dialogRef" @hide="onDialogHide" full-width>
-        <component :is="summary" :id="id" :class="width" />
+        <component :is="summary" :id="id" />
     </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

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

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

src/components/ui/CardDescriptor.vue

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

src/components/ui/CardSummary.vue

@@ -175,7 +175,7 @@ async function fetch() {
                 display: inline-block;
             }
             .header.link:hover {
-                color: rgba(var(--q-primary), 0.8);
+                color: lighten($primary, 20%);
             }
             .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" @click.stop>
+                <span class="link">
                     {{ 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.scss';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
 
 const $props = defineProps({
     bordered: {

src/components/ui/SkeletonSummary.vue

@@ -1,49 +1,38 @@
 <template>
     <div class="header bg-primary q-pa-sm q-mb-md">
         <QSkeleton type="rect" square />
-        <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
-        <div class="col">
+        <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
-        </div>
+        <QSkeleton type="text" square />
-        <div class="col">
+        <QSkeleton type="text" square />
-            <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-        </div>
+        <QSkeleton type="text" square />
-        <div class="col">
+        <QSkeleton type="text" square />
-            <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-        </div>
+        <QSkeleton type="text" square />
-        <div class="col">
+        <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
     </div>
 </template>
 

src/components/ui/VnFilterPanel.vue

@@ -190,10 +190,7 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else {
+    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
-        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,10 +78,6 @@ const props = defineProps({
         type: String,
         default: '',
     },
-    keyData: {
-        type: String,
-        default: undefined,
-    },
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@@ -123,7 +119,7 @@ watch(
     () => props.data,
     () => {
         store.data = props.data;
-    },
+    }
 );
 
 watch(
@@ -132,12 +128,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 });
@@ -170,7 +166,7 @@ function emitStoreData() {
 async function paginate() {
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
-    if (!arrayData.store.url) return;
+    if (!props.url) return;
 
     isLoading.value = true;
     await arrayData.loadMore();
@@ -198,7 +194,7 @@ function endPagination() {
 async function onLoad(index, done) {
     if (!store.data || !mounted.value) return done();
 
-    if (store.data.length === 0 || !arrayData.store.url) return done(false);
+    if (store.data.length === 0 || !props.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
 
@@ -259,7 +255,7 @@ defineExpose({
         :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
-        <slot name="body" :rows="keyData ? store.data[keyData] : store.data"></slot>
+        <slot name="body" :rows="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,20 +113,23 @@ onMounted(() => {
 });
 
 async function search() {
+    const staticParams = Object.keys(store.userParams ?? {}).length
+        ? store.userParams
+        : store.defaultParams;
     arrayData.resetPagination();
 
-    let filter = { params: { search: searchText.value } };
+    const filter = {
+        params: {
+            search: searchText.value,
+        },
+        filter: props.filter,
+    };
 
     if (!props.searchRemoveParams || !searchText.value) {
-        filter = {
+        filter.params = {
-            params: {
+            ...staticParams,
-                ...store.userParams,
+            search: searchText.value,
-                search: searchText.value,
-            },
-            filter: store.filter,
         };
-    } else {
-        arrayData.reset(['currentFilter', 'userParams']);
     }
 
     if (props.whereFilter) {
@@ -176,7 +179,6 @@ 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 { ref } from 'vue';
+import { defineProps, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();

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

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

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

src/composables/useArrayData.js

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

src/composables/useFilterParams.js

@@ -29,12 +29,8 @@ export function useFilterParams(key) {
         orders.value = orderObject;
     }
 
-    function setUserParams(watchedParams = {}) {
+    function setUserParams(watchedParams) {
-        if (Object.keys(watchedParams).length == 0) {
+        if (!watchedParams || Object.keys(watchedParams).length == 0) return;
-            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,7 +6,6 @@ import axios from 'axios';
 import { useRouter } from 'vue-router';
 import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
-import { getToken, getTokenMultimedia } from 'src/utils/session';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
@@ -16,6 +15,19 @@ export function useSession() {
     let isCheckingToken = false;
     let intervalId = null;
 
+    function getToken() {
+        const localToken = localStorage.getItem(TOKEN);
+        const sessionToken = sessionStorage.getItem(TOKEN);
+
+        return localToken || sessionToken || '';
+    }
+    function getTokenMultimedia() {
+        const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
+        const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
+
+        return localTokenMultimedia || sessionTokenMultimedia || '';
+    }
+
     function setSession(data) {
         let keepLogin = data.keepLogin;
         const storage = keepLogin ? localStorage : sessionStorage;

src/composables/useSummaryDialog.js

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

src/css/app.scss

@@ -1,6 +1,6 @@
 // app global css in SCSS form
 @import './icons.scss';
-@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.scss';
+@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
 
 body.body--light {
     --vn-header-color: #cecece;
@@ -310,14 +310,6 @@ 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?uocffs');
+  src:  url('fonts/icon.eot?y0x93o');
-  src:  url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
+  src:  url('fonts/icon.eot?y0x93o#iefix') format('embedded-opentype'),
-    url('fonts/icon.ttf?uocffs') format('truetype'),
+    url('fonts/icon.ttf?y0x93o') format('truetype'),
-    url('fonts/icon.woff?uocffs') format('woff'),
+    url('fonts/icon.woff?y0x93o') format('woff'),
-    url('fonts/icon.svg?uocffs#icon') format('svg');
+    url('fonts/icon.svg?y0x93o#icon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -25,17 +25,8 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-inactive-car:before {
+.icon-entry_lastbuys:before {
-  content: "\e978";
+  content: "\e91a";
-}
-.icon-hasItemLost:before {
-  content: "\e957";
-}
-.icon-hasItemDelay:before {
-  content: "\e96d";
-}
-.icon-add_entries:before {
-  content: "\e953";
 }
 .icon-100:before {
   content: "\e901";
@@ -61,9 +52,6 @@
 .icon-addperson:before {
   content: "\e908";
 }
-.icon-agencia_tributaria:before {
-  content: "\e948";
-}
 .icon-agency:before {
   content: "\e92a";
 }
@@ -201,9 +189,6 @@
 .icon-entry:before {
   content: "\e937";
 }
-.icon-entry_lastbuys:before {
-  content: "\e91a";
-}
 .icon-exit:before {
   content: "\e938";
 }

src/css/quasar.variables.scss

@@ -33,11 +33,6 @@ $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,7 +16,6 @@ import getUpdatedValues from './getUpdatedValues';
 import getParamWhere from './getParamWhere';
 import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
-import toCelsius from './toCelsius';
 
 export {
     getUpdatedValues,
@@ -37,5 +36,4 @@ export {
     dashIfEmpty,
     dateRange,
     getParamWhere,
-    toCelsius,
 };

src/filters/toCelsius.js

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

src/i18n/locale/en.yml

@@ -2,14 +2,12 @@ globals:
     lang:
         es: Spanish
         en: English
-    language: Language
     quantity: Quantity
+    language: Language
     entity: Entity
-    preview: Preview
     user: User
     details: Details
-    collapseMenu: Collapse lateral menu
+    collapseMenu: Collapse left menu
-    advancedMenu: Advanced menu
     backToDashboard: Return to dashboard
     notifications: Notifications
     userPanel: User panel
@@ -37,6 +35,7 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
+    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -60,7 +59,6 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
-    entry: Entry
     warehouseOut: Warehouse Out
     warehouseIn: Warehouse In
     landed: Landed
@@ -69,11 +67,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
@@ -83,9 +81,6 @@ 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
@@ -135,26 +130,6 @@ 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
@@ -176,14 +151,13 @@ 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
@@ -219,28 +193,27 @@ globals:
         claims: Claims
         claimCreate: New claim
         lines: Lines
-        development: Development
         photos: Photos
+        development: Development
         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
@@ -253,10 +226,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
@@ -265,16 +238,21 @@ 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
@@ -282,13 +260,14 @@ globals:
         items: Items
         diary: Diary
         tags: Tags
-        fixedPrice: Fixed prices
+        create: Create
         buyRequest: Buy requests
+        fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        barcode: Barcodes
         tax: Tax
         botanical: Botanical
-        barcode: Barcodes
         itemTypeCreate: New item type
         family: Item Type
         lastEntries: Last entries
@@ -304,20 +283,13 @@ 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
@@ -326,15 +298,29 @@ 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
@@ -352,13 +338,19 @@ globals:
         supplierFk: Supplier
         supplierRef: Supplier ref
         serial: Serial
-        amount: Amount
+        amount: Importe
         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
@@ -397,6 +389,80 @@ cau:
     subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
     inputLabel: Explain why this error should not appear
     askPrivileges: Ask for privileges
+entry:
+    list:
+        newEntry: New entry
+        tableVisibleColumns:
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
+            companyFk: Company
+            travelFk: Travel
+            isExcludedFromAvailable: Inventory
+            invoiceAmount: Import
+    summary:
+        commission: Commission
+        currency: Currency
+        invoiceNumber: Invoice number
+        ordered: Ordered
+        booked: Booked
+        excludedFromAvailable: Inventory
+        travelReference: Reference
+        travelAgency: Agency
+        travelShipped: Shipped
+        travelDelivered: Delivered
+        travelLanded: Landed
+        travelReceived: Received
+        buys: Buys
+        stickers: Stickers
+        package: Package
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Buying value
+        import: Import
+        pvp: PVP
+    basicData:
+        travel: Travel
+        currency: Currency
+        commission: Commission
+        observation: Observation
+        booked: Booked
+        excludedFromAvailable: Inventory
+    buys:
+        observations: Observations
+        packagingFk: Box
+        color: Color
+        printedStickers: Printed stickers
+    notes:
+        observationType: Observation type
+    latestBuys:
+        tableVisibleColumns:
+            image: Picture
+            itemFk: Item ID
+            weightByPiece: Weight/Piece
+            isActive: Active
+            family: Family
+            entryFk: Entry
+            freightValue: Freight value
+            comissionValue: Commission value
+            packageValue: Package value
+            isIgnored: Is ignored
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Package out
+            landing: Landing
+            isExcludedFromAvailable: Es inventory
+    params:
+        toShipped: To
+        fromShipped: From
+        warehouseiNFk: Warehouse
+        daysOnward: Days onward
+        daysAgo: Days ago
+        warehouseInFk: Warehouse in
 ticket:
     params:
         ticketFk: Ticket ID
@@ -454,7 +520,6 @@ ticket:
         service: Service
         attender: Attender
         ok: Ok
-        consigneeStreet: Street
     create:
         address: Address
 invoiceOut:
@@ -499,6 +564,21 @@ 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
@@ -510,24 +590,6 @@ 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
@@ -543,24 +605,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: DNI expiration date
+        fiDueDate: FI due date
         sex: Sex
-        seniority: Antiquity
+        seniority: Seniority
         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
@@ -619,23 +672,6 @@ 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
@@ -734,9 +770,6 @@ supplier:
     consumption:
         entry: Entry
 travel:
-    search: Search travel
-    searchInfo: You can search by travel id or name
-    id: Id
     travelList:
         tableVisibleColumns:
             ref: Reference
@@ -745,7 +778,6 @@ travel:
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
-            awb: AWB
     summary:
         entryId: Entry Id
         freight: Freight
@@ -767,7 +799,62 @@ travel:
         destination: Destination
         thermograph: Thermograph
         travelFileDescription: 'Travel id { travelId }'
-        carrier: Carrier
+item:
+    descriptor:
+        buyer: Buyer
+        color: Color
+        category: Category
+        available: Available
+        warehouseText: 'Calculated on the warehouse of { warehouseName }'
+        itemDiary: Item diary
+    list:
+        id: Identifier
+        stems: Stems
+        category: Category
+        typeName: Type
+        isActive: Active
+        userName: Buyer
+        weightByPiece: Weight/Piece
+        stemMultiplier: Multiplier
+    fixedPrice:
+        itemFk: Item ID
+        groupingPrice: Grouping price
+        packingPrice: Packing price
+        hasMinPrice: Has min price
+        minPrice: Min price
+        started: Started
+        ended: Ended
+    create:
+        priority: Priority
+    buyRequest:
+        requester: Requester
+        requested: Requested
+        attender: Atender
+        achieved: Achieved
+        concept: Concept
+    summary:
+        otherData: Other data
+        tax: Tax
+        botanical: Botanical
+        barcode: Barcode
+        completeName: Complete name
+        family: Familiy
+        stems: Stems
+        multiplier: Multiplier
+        buyer: Buyer
+        doPhoto: Do photo
+        intrastatCode: Intrastat code
+        ref: Reference
+        relevance: Relevance
+        weight: Weight (gram)/stem
+        units: Units/box
+        expense: Expense
+        generic: Generic
+        recycledPlastic: Recycled plastic
+        nonRecycledPlastic: Non recycled plastic
+        minSalesQuantity: Min sales quantity
+        genus: Genus
+        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:
@@ -782,10 +869,7 @@ components:
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
-        supplierFk: Supplier
         from: From
-        to: To
-        visible: Is visible
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items

src/i18n/locale/es.yml

@@ -5,11 +5,9 @@ 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
@@ -55,12 +53,11 @@ globals:
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
-    microsip: Abrir en MicroSIP
     noSelectedRows: No tienes ninguna línea seleccionada
+    microsip: Abrir en MicroSIP
     downloadCSVSuccess: Descarga de CSV exitosa
     reference: Referencia
     agency: Agencia
-    entry: Entrada
     warehouseOut: Alm. salida
     warehouseIn: Alm. entrada
     landed: F. entrega
@@ -135,26 +132,6 @@ 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
@@ -177,17 +154,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
@@ -253,10 +230,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
@@ -265,8 +242,8 @@ globals:
         routeCreate: Nueva ruta
         RouteRoadmap: Troncales
         RouteRoadmapCreate: Crear troncal
-        RouteExtendedList: Enrutador
         autonomous: Autónomos
+        RouteExtendedList: Enrutador
         suppliers: Proveedores
         supplier: Proveedor
         supplierCreate: Nuevo proveedor
@@ -326,15 +303,28 @@ 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
@@ -357,6 +347,12 @@ 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
@@ -393,6 +389,80 @@ cau:
     subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
     inputLabel: Explique el motivo por el que no deberia aparecer este fallo
     askPrivileges: Solicitar permisos
+entry:
+    list:
+        newEntry: Nueva entrada
+        tableVisibleColumns:
+            created: Creación
+            supplierFk: Proveedor
+            isBooked: Asentado
+            isConfirmed: Confirmado
+            isOrdered: Pedida
+            companyFk: Empresa
+            travelFk: Envio
+            isExcludedFromAvailable: Inventario
+            invoiceAmount: Importe
+    summary:
+        commission: Comisión
+        currency: Moneda
+        invoiceNumber: Núm. factura
+        ordered: Pedida
+        booked: Contabilizada
+        excludedFromAvailable: Inventario
+        travelReference: Referencia
+        travelAgency: Agencia
+        travelShipped: F. envio
+        travelWarehouseOut: Alm. salida
+        travelDelivered: Enviada
+        travelLanded: F. entrega
+        travelReceived: Recibida
+        buys: Compras
+        stickers: Etiquetas
+        package: Embalaje
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Coste
+        import: Importe
+        pvp: PVP
+    basicData:
+        travel: Envío
+        currency: Moneda
+        observation: Observación
+        commission: Comisión
+        booked: Asentado
+        excludedFromAvailable: Inventario
+    buys:
+        observations: Observaciónes
+        packagingFk: Embalaje
+        color: Color
+        printedStickers: Etiquetas impresas
+    notes:
+        observationType: Tipo de observación
+    latestBuys:
+        tableVisibleColumns:
+            image: Foto
+            itemFk: Id Artículo
+            weightByPiece: Peso (gramos)/tallo
+            isActive: Activo
+            family: Familia
+            entryFk: Entrada
+            freightValue: Porte
+            comissionValue: Comisión
+            packageValue: Embalaje
+            isIgnored: Ignorado
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Embalaje envíos
+            landing: Llegada
+            isExcludedFromAvailable: Es inventario
+    params:
+        toShipped: Hasta
+        fromShipped: Desde
+        warehouseInFk: Alm. entrada
+        daysOnward: Días adelante
+        daysAgo: Días atras
 ticket:
     params:
         ticketFk: ID de ticket
@@ -449,18 +519,13 @@ ticket:
         purchaseRequest: Petición de compra
         service: Servicio
         attender: Consignatario
-        consigneeStreet: Dirección
     create:
         address: Dirección
-order:
+invoiceOut:
-    field:
+    card:
-        salesPersonFk: Comercial
+        issued: Fecha emisión
-    form:
+        customerCard: Ficha del cliente
-        clientFk: Cliente
+        ticketList: Listado de tickets
-        addressFk: Dirección
-        agencyModeFk: Agencia
-    list:
-        newOrder: Nuevo Pedido
     summary:
         issued: Fecha
         dued: Fecha límite
@@ -471,6 +536,47 @@ order:
         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
@@ -482,26 +588,6 @@ 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
@@ -526,15 +612,6 @@ 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
@@ -581,23 +658,6 @@ 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
@@ -610,6 +670,7 @@ worker:
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
         machine: Máquina
+
 wagon:
     type:
         submit: Guardar
@@ -705,9 +766,6 @@ supplier:
     consumption:
         entry: Entrada
 travel:
-    search: Buscar envío
-    searchInfo: Buscar envío por id o nombre
-    id: Id
     travelList:
         tableVisibleColumns:
             ref: Referencia
@@ -716,7 +774,6 @@ travel:
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
-            awb: AWB
     summary:
         entryId: Id entrada
         freight: Porte
@@ -738,7 +795,62 @@ travel:
         destination: Destino
         thermograph: Termógrafo
         travelFileDescription: 'Id envío { travelId }'
-        carrier: Transportista
+item:
+    descriptor:
+        buyer: Comprador
+        color: Color
+        category: Categoría
+        available: Disponible
+        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
+        itemDiary: Registro de compra-venta
+    list:
+        id: Identificador
+        stems: Tallos
+        category: Reino
+        typeName: Tipo
+        isActive: Activo
+        weightByPiece: Peso (gramos)/tallo
+        userName: Comprador
+        stemMultiplier: Multiplicador
+    fixedPrice:
+        itemFk: ID Artículo
+        groupingPrice: Precio grouping
+        packingPrice: Precio packing
+        hasMinPrice: Tiene precio mínimo
+        minPrice: Precio min
+        started: Inicio
+        ended: Fin
+    create:
+        priority: Prioridad
+    summary:
+        otherData: Otros datos
+        tax: IVA
+        botanical: Botánico
+        barcode: Código de barras
+        completeName: Nombre completo
+        family: Familia
+        stems: Tallos
+        multiplier: Multiplicador
+        buyer: Comprador
+        doPhoto: Hacer foto
+        intrastatCode: Código intrastat
+        ref: Referencia
+        relevance: Relevancia
+        weight: Peso (gramos)/tallo
+        units: Unidades/caja
+        expense: Gasto
+        generic: Genérico
+        recycledPlastic: Plástico reciclado
+        nonRecycledPlastic: Plástico no reciclado
+        minSalesQuantity: Cantidad mínima de venta
+        genus: Genus
+        specie: Specie
+    buyRequest:
+        requester: Solicitante
+        requested: Solicitado
+        attender: Comprador
+        achieved: Conseguido
+        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:
@@ -754,11 +866,7 @@ components:
         wareHouseFk: Almacén
         # LatestBuysFilter
         salesPersonFk: Comprador
-        supplierFk: Proveedor
-        visible: Visible
         active: Activo
-        from: Desde
-        to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:

src/layouts/OutLayout.vue

@@ -2,8 +2,6 @@
 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();
 
@@ -14,9 +12,18 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        value = localeEquivalence[value] ?? value;
+        if (value === 'en') value = 'en-GB';
 
-        quasarLang(value);
+        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
+        // 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,6 +4,7 @@ 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';
@@ -12,11 +13,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;
@@ -200,62 +201,58 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <RightMenu v-if="claim">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
-        <template #right-panel>
+        <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
-            <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
+            {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
-                {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
+        </QCard>
-            </QCard>
+        <QCard class="q-mb-md q-pa-sm no-box-shadow">
-            <QCard class="q-mb-md q-pa-sm no-box-shadow">
+            <QItem class="justify-between">
-                <QItem class="justify-between">
+                <QItemLabel class="slider-container">
-                    <QItemLabel class="slider-container">
+                    <p class="text-primary">
-                        <p class="text-primary">
+                        {{ t('claim.actions') }}
-                            {{ t('claim.actions') }}
+                    </p>
-                        </p>
+                    <QSlider
-                        <QSlider
+                        class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
-                            class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
+                        v-model="claim.responsibility"
-                            v-model="claim.responsibility"
+                        :label-value="t('claim.responsibility')"
-                            :label-value="t('claim.responsibility')"
+                        @change="(value) => save({ responsibility: value })"
-                            @change="(value) => save({ responsibility: value })"
+                        label-always
-                            label-always
+                        color="primary"
-                            color="primary"
+                        markers
-                            markers
+                        :marker-labels="marker_labels"
-                            :marker-labels="marker_labels"
+                        :min="DEFAULT_MIN_RESPONSABILITY"
-                            :min="DEFAULT_MIN_RESPONSABILITY"
+                        :max="DEFAULT_MAX_RESPONSABILITY"
-                            :max="DEFAULT_MAX_RESPONSABILITY"
-                        />
-                    </QItemLabel>
-                </QItem>
-            </QCard>
-            <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
-                <QItemLabel class="mana q-mb-md">
-                    <QCheckbox
-                        v-model="claim.isChargedToMana"
-                        @update:model-value="(value) => save({ isChargedToMana: value })"
                     />
-                    <span>{{ t('mana') }}</span>
                 </QItemLabel>
-            </QCard>
+            </QItem>
-            <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
+        </QCard>
-                <QInput
+        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
-                    :disable="
+            <QItemLabel class="mana q-mb-md">
-                        !(
+                <QCheckbox
-                            claim.responsibility >=
+                    v-model="claim.isChargedToMana"
-                            Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
+                    @update:model-value="(value) => save({ isChargedToMana: value })"
-                        )
-                    "
-                    :label="t('confirmGreuges')"
-                    class="q-field__native text-grey-2"
-                    type="number"
-                    placeholder="0"
-                    id="multiplicatorValue"
-                    name="multiplicatorValue"
-                    min="0"
-                    max="50"
-                    v-model="multiplicatorValue"
                 />
-            </QCard>
+                <span>{{ t('mana') }}</span>
-        </template>
+            </QItemLabel>
-    </RightMenu>
+        </QCard>
+        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
+            <QInput
+                :disable="
+                    !(claim.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2)
+                "
+                :label="t('confirmGreuges')"
+                class="q-field__native text-grey-2"
+                type="number"
+                placeholder="0"
+                id="multiplicatorValue"
+                name="multiplicatorValue"
+                min="0"
+                max="50"
+                v-model="multiplicatorValue"
+            />
+        </QCard>
+    </Teleport>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
         v-if="claim"
         data-key="ClaimEnds"

src/pages/Claim/ClaimList.vue

@@ -131,10 +131,10 @@ const STATE_COLOR = {
         prefix="claim"
         :array-data-props="{
             url: 'Claims/filter',
-            order: ['cs.priority ASC', 'created ASC'],
+            order: 'cs.priority ASC, created ASC',
         }"
     >
-        <template #advanced-menu>
+        <template #rightMenu>
             <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.payMethodFk"
+                    v-model="data.payMethod"
                 />
                 <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>

src/pages/Customer/Card/CustomerCard.vue

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

src/pages/Customer/Card/CustomerConsumption.vue

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

src/pages/Customer/Card/CustomerConsumptionFilter.vue

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

src/pages/Customer/Card/CustomerCredits.vue

@@ -59,7 +59,6 @@ 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,7 +53,6 @@ const debtWarning = computed(() => {
         @on-fetch="setData"
         :summary="$props.summary"
         data-key="customer"
-        width="lg-width"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
@@ -188,18 +187,14 @@ const debtWarning = computed(() => {
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'OrderList',
+                        name: 'AccountSummary',
-                        query: {
+                        params: { id: entity.id },
-                            createForm: JSON.stringify({
-                                clientFk: entity.id,
-                            }),
-                        },
                     }"
                     size="md"
-                    icon="vn:basketadd"
+                    icon="face"
                     color="primary"
                 >
-                    <QTooltip>{{ t('globals.pageTitles.createOrder') }}</QTooltip>
+                    <QTooltip>{{ t('Go to user') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="entity.supplier"
@@ -223,9 +218,14 @@ 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,6 +51,7 @@ const openCreateForm = (type) => {
     };
     const clientFk = {
         ticket: 'clientId',
+        order: 'clientFk',
     };
     const key = clientFk[type];
     if (!key) return;
@@ -69,6 +70,11 @@ const openCreateForm = (type) => {
             {{ t('globals.pageTitles.createTicket') }}
         </QItemSection>
     </QItem>
+    <QItem v-ripple clickable @click="openCreateForm('order')">
+        <QItemSection>
+            {{ t('globals.pageTitles.createOrder') }}
+        </QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>

src/pages/Customer/Card/CustomerFiscalData.vue

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

src/pages/Customer/Card/CustomerGreuges.vue

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

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -50,8 +50,7 @@ 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,4 +1,3 @@
-
 <script setup>
 import { useI18n } from 'vue-i18n';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
@@ -170,16 +169,9 @@ 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
@@ -188,13 +180,6 @@ 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,19 +5,18 @@ import { useRouter } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDate } from 'src/filters';
 
+import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const tableRef = ref();
-const dataKey = 'CustomerList';
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -38,8 +37,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'name',
         label: t('globals.name'),
+        name: 'name',
         isTitle: true,
         create: true,
         columnClass: 'expand',
@@ -51,30 +50,17 @@ const columns = computed(() => [
         isTitle: true,
         create: true,
         columnClass: 'expand',
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                url: 'Clients',
-                fields: ['socialName'],
-                optionLabel: 'socialName',
-                optionValue: 'socialName',
-                uppercase: false,
-            },
-        },
-        attrs: {
-            uppercase: true,
-        },
     },
     {
         align: 'left',
-        name: 'fi',
         label: t('customer.extendedList.tableVisibleColumns.fi'),
+        name: 'fi',
         create: true,
     },
     {
         align: 'left',
-        name: 'salesPersonFk',
         label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
         component: 'select',
         attrs: {
             url: 'Workers/activeWithInheritedRole',
@@ -90,8 +76,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'credit',
         label: t('customer.summary.credit'),
+        name: 'credit',
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -99,8 +85,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'creditInsurance',
         label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+        name: 'creditInsurance',
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -108,8 +94,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'phone',
         label: t('customer.extendedList.tableVisibleColumns.phone'),
+        name: 'phone',
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -128,8 +114,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'mobile',
         label: t('customer.summary.mobile'),
+        name: 'mobile',
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -138,8 +124,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'street',
         label: t('customer.extendedList.tableVisibleColumns.street'),
+        name: 'street',
         create: true,
         columnFilter: {
             inWhere: true,
@@ -148,8 +134,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'countryFk',
         label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        name: 'countryFk',
         columnFilter: {
             component: 'select',
             inWhere: true,
@@ -162,8 +148,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'provinceFk',
         label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
         component: 'select',
         attrs: {
             url: 'Provinces',
@@ -175,24 +161,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'city',
         label: t('customer.summary.city'),
+        name: 'city',
     },
     {
         align: 'left',
-        name: 'postcode',
         label: t('customer.summary.postcode'),
+        name: 'postcode',
     },
     {
         align: 'left',
-        name: 'email',
         label: t('globals.params.email'),
+        name: 'email',
         cardVisible: true,
     },
     {
         align: 'left',
-        name: 'created',
         label: t('customer.extendedList.tableVisibleColumns.created'),
+        name: 'created',
         format: ({ created }) => toDate(created),
         columnFilter: {
             component: 'date',
@@ -202,13 +188,10 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'businessTypeFk',
         label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+        name: 'businessTypeFk',
         create: true,
         component: 'select',
-        columnFilter: {
-            inWhere: true,
-        },
         attrs: {
             url: 'BusinessTypes',
             fields: ['code', 'description'],
@@ -223,8 +206,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'payMethodFk',
         label: t('customer.summary.payMethodFk'),
+        name: 'payMethodFk',
         columnFilter: {
             component: 'select',
             attrs: {
@@ -244,6 +227,8 @@ const columns = computed(() => [
                 optionLabel: 'vat',
                 url: 'SageTaxTypes',
             },
+            alias: 'sti',
+            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
     },
@@ -257,13 +242,15 @@ const columns = computed(() => [
                 optionLabel: 'transaction',
                 url: 'SageTransactionTypes',
             },
+            alias: 'stt',
+            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
     },
     {
         align: 'left',
-        name: 'isActive',
         label: t('customer.summary.isActive'),
+        name: 'isActive',
         chip: {
             color: null,
             condition: (value) => !value,
@@ -275,24 +262,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'isVies',
         label: t('globals.isVies'),
+        name: 'isVies',
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        name: 'isTaxDataChecked',
         label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+        name: 'isTaxDataChecked',
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        name: 'isEqualizated',
         label: t('customer.summary.isEqualizated'),
+        name: 'isEqualizated',
         create: true,
         columnFilter: {
             inWhere: true,
@@ -300,8 +287,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'isFreezed',
         label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+        name: 'isFreezed',
         chip: {
             color: null,
             condition: (value) => value,
@@ -313,48 +300,48 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'hasToInvoice',
         label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+        name: 'hasToInvoice',
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        name: 'hasToInvoiceByAddress',
         label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+        name: 'hasToInvoiceByAddress',
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        name: 'isToBeMailed',
         label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+        name: 'isToBeMailed',
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        name: 'hasLcr',
         label: t('customer.summary.hasLcr'),
+        name: 'hasLcr',
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        name: 'hasCoreVnl',
         label: t('customer.summary.hasCoreVnl'),
+        name: 'hasCoreVnl',
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        name: 'hasSepaVnl',
         label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+        name: 'hasSepaVnl',
         columnFilter: {
             inWhere: true,
         },
@@ -403,91 +390,82 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <VnSection
+    <VnSearchbar
-        :data-key="dataKey"
+        :info="t('You can search by customer id or name')"
-        :columns="columns"
+        :label="t('Search customer')"
-        prefix="customer"
+        data-key="CustomerList"
-        :array-data-props="{
+    />
-            url: 'Clients/filter',
+    <RightMenu>
-            order: ['id DESC'],
+        <template #right-panel>
-        }"
-    >
-        <template #advanced-menu>
             <CustomerFilter data-key="CustomerList" />
         </template>
-        <template #body>
+    </RightMenu>
-            <VnTable
+    <VnTable
-                ref="tableRef"
+        ref="tableRef"
-                :data-key="dataKey"
+        data-key="CustomerList"
-                url="Clients/filter"
+        url="Clients/filter"
-                :create="{
+        order="id DESC"
-                    urlCreate: 'Clients/createWithUser',
+        :create="{
-                    title: t('globals.pageTitles.customerCreate'),
+            urlCreate: 'Clients/createWithUser',
-                    onDataSaved: ({ id }) => tableRef.redirect(id),
+            title: t('globals.pageTitles.customerCreate'),
-                    formInitialData: {
+            onDataSaved: ({ id }) => tableRef.redirect(id),
-                        active: true,
+            formInitialData: {
-                        isEqualizated: false,
+                active: true,
-                    },
+                isEqualizated: false,
+            },
+        }"
+        :columns="columns"
+        :right-search="false"
+        redirect="customer"
+    >
+        <template #more-create-dialog="{ data }">
+            <VnSelectWorker
+                :label="t('customer.summary.salesPerson')"
+                v-model="data.salesPersonFk"
+                :params="{
+                    departmentCodes: ['VT', 'shopping'],
                 }"
-                :columns="columns"
+                :has-avatar="true"
-                :right-search="false"
+                :id-value="data.salesPersonFk"
-                redirect="customer"
+                emit-value
+                auto-load
             >
-                <template #more-create-dialog="{ data }">
+                <template #prepend>
-                    <VnSelectWorker
+                    <VnAvatar
-                        :label="t('customer.summary.salesPerson')"
+                        :worker-id="data.salesPersonFk"
-                        v-model="data.salesPersonFk"
+                        color="primary"
-                        :params="{
+                        :title="title"
-                            departmentCodes: ['VT', 'shopping'],
-                        }"
-                        :has-avatar="true"
-                        :id-value="data.salesPersonFk"
-                        emit-value
-                        auto-load
-                    >
-                        <template #prepend>
-                            <VnAvatar
-                                :worker-id="data.salesPersonFk"
-                                color="primary"
-                                :title="title"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption
-                                        >{{ scope.opt?.nickname }},
-                                        {{ scope.opt?.code }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectWorker>
-                    <VnLocation
-                        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
                     />
-                    <QInput v-model="data.userName" :label="t('Web user')" />
-                    <QInput
-                        :label="t('Email')"
-                        clearable
-                        type="email"
-                        v-model="data.email"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip max-width="400px">{{
-                                    t('customer.basicData.youCanSaveMultipleEmails')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
                 </template>
-            </VnTable>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelectWorker>
+            <VnLocation
+                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
+                v-model="data.location"
+                @update:model-value="(location) => handleLocation(data, location)"
+            />
+            <QInput v-model="data.userName" :label="t('Web user')" />
+            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
+                <template #append>
+                    <QIcon name="info" class="cursor-info">
+                        <QTooltip max-width="400px">{{
+                            t('customer.basicData.youCanSaveMultipleEmails')
+                        }}</QTooltip>
+                    </QIcon>
+                </template>
+            </QInput>
         </template>
-    </VnSection>
+    </VnTable>
 </template>
 <i18n>
 es:

src/pages/Customer/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,37 +165,26 @@ const viewAddObservation = (rowsSelected) => {
     });
 };
 
+const onFetch = async (data) => {
+    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
+};
+
 function exprBuilder(param, value) {
     switch (param) {
-        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 'creditInsurance':
+        case 'amount':
+        case 'workerFk':
+        case 'departmentFk':
+        case 'countryFk':
+        case 'payMethod':
+        case 'salesPersonFk':
+            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>
@@ -203,7 +192,7 @@ function exprBuilder(param, value) {
 <template>
     <VnSubToolbar>
         <template #st-data>
-            <CustomerBalanceDueTotal :amount="arrayData.store.data?.amount" />
+            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
         </template>
         <template #st-actions>
             <QBtn
@@ -222,6 +211,8 @@ function exprBuilder(param, value) {
         url="Defaulters/filter"
         :expr-builder="exprBuilder"
         :columns="columns"
+        @on-fetch="onFetch"
+        :use-model="true"
         :table="{
             'row-key': 'clientFk',
             selection: 'multiple',
@@ -230,7 +221,6 @@ 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,12 +13,11 @@ 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([]);
@@ -84,26 +83,8 @@ const deleteNote = (id, index) => {
     notes.value.splice(index, 1);
 };
 
-const updateAddress = async (data) => {
+const onDataSaved = async () => {
-    await axios.patch(urlUpdate.value, data);
+    let payload = {
-};
-
-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
@@ -120,40 +101,14 @@ function getPayload() {
                 where: { id: note.id },
             })),
     };
-}
 
-async function handleDialog(data) {
+    await axios.post('AddressObservations/crud', payload);
-    const payload = getPayload();
-    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 = [];
+    toCustomerAddress();
+};
+
+const toCustomerAddress = () => {
     router.push({
         name: 'CustomerAddress',
         params: {
@@ -188,7 +143,7 @@ function handleLocation(data, location) {
         :observe-form-changes="false"
         :url-update="urlUpdate"
         :url="`Addresses/${route.params.addressId}`"
-        :save-fn="handleDialog"
+        @on-data-saved="onDataSaved()"
         auto-load
     >
         <template #moreActions>
@@ -381,9 +336,4 @@ 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('globals.preview')"
+                    :label="t('Preview')"
                     :loading="isLoading"
                     @click.stop="getPreview()"
                     color="primary"
@@ -353,6 +353,7 @@ 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, 'lg-width'),
+                action: (row) => viewSummary(row.id, TicketSummary),
             },
         ],
     },

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

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

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

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

@@ -1,15 +0,0 @@
-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,8 +94,6 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
-    search: Search customer
-    searchInfo: You can search by customer ID
     params:
         id: Id
         isWorker: Is Worker

src/pages/Customer/locale/es.yml

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

src/pages/Department/Card/DepartmentCard.vue

@@ -10,4 +10,4 @@ import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue
         base-url="Departments"
         :descriptor="DepartmentDescriptor"
     />
-</template>
+</template>

src/pages/Department/Card/DepartmentDescriptor.vue

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

src/pages/Entry/Card/EntryBasicData.vue

@@ -3,6 +3,7 @@ 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';
@@ -10,9 +11,8 @@ 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,7 +26,6 @@ const onFilterTravelSelected = (formData, id) => {
     formData.travelFk = id;
 };
 </script>
-
 <template>
     <FetchData
         ref="companiesRef"
@@ -52,12 +51,28 @@ const onFilterTravelSelected = (formData, id) => {
     >
         <template #form="{ data }">
             <VnRow>
-                <VnSelectSupplier
+                <VnSelect
+                    :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"
@@ -78,13 +93,14 @@ 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)
-                                    {{ scope.opt?.warehouseOutName }}
+                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
-                                    ({{ toDate(scope.opt?.landed) }})
+                                        toDate(scope.opt?.landed)
-                                </QItemLabel>
+                                    }})</QItemLabel
+                                >
                             </QItemSection>
                         </QItem>
                     </template>
@@ -110,13 +126,6 @@ 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"
@@ -124,23 +133,12 @@ const onFilterTravelSelected = (formData, id) => {
                     option-value="id"
                     option-label="code"
                 />
-            </VnRow>
+                <QInput
-            <VnRow>
+                    :label="t('entry.summary.commission')"
-                <VnInputNumber
+                    v-model="data.commission"
-                    v-model="data.initialTemperature"
+                    type="number"
-                    name="initialTemperature"
+                    autofocus
-                    :label="t('entry.basicData.initialTemperature')"
+                    min="0"
-                    :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>