Merge branch 'dev' into 6641-myTeamFilterClaim

CHANGELOG.md

@@ -5,14 +5,33 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2420.01]
+
+## [2418.01]
+
+## [2416.01] - 2024-04-18
+
+### Added
+
+### Fixed
+
+-   (General) => Se vuelven a mostrar los parámetros en la url al aplicar un filtro
+
 ## [2414.01] - 2024-04-04
 
 ### Added
 
+-   (Tickets) => Se añade la opción de clonar ticket. #6951
+-   (Parking) => Se añade la sección Parking. #5186
+
+-   (Rutas) => Se añade el campo "servida" a la tabla y se añade también a los filtros. #7130
+
 ### Changed
 
 ### Fixed
 
+-   (General) => Se corrige la redirección cuando hay 1 solo registro y cuando se aplica un filtro diferente al id al hacer una búsqueda general. #6893
+
 ## [2400.01] - 2024-01-04
 
 ### Added

cypress.config.js

@@ -3,6 +3,7 @@ const { defineConfig } = require('cypress');
 module.exports = defineConfig({
     e2e: {
         baseUrl: 'http://localhost:9000/',
+        experimentalStudio: true,
         fixturesFolder: 'test/cypress/fixtures',
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.14.0",
+    "version": "24.20.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -32,6 +32,7 @@
         "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
         "@quasar/app-vite": "^1.7.3",
+        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",

quasar.config.js

@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
@@ -93,13 +93,11 @@ module.exports = configure(function (/* ctx */) {
                 [
                     VueI18nPlugin({
                         runtimeOnly: false,
+                        include: [
+                            path.resolve(__dirname, './src/i18n/locale/**'),
+                            path.resolve(__dirname, './src/pages/**/locale/**'),
+                        ],
                     }),
-                    {
-                        // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false`
-                        // compositionOnly: false,
-                        // you need to set i18n resource including paths !
-                        include: path.resolve(__dirname, './src/i18n/**'),
-                    },
                 ],
             ],
         },
@@ -117,6 +115,7 @@ module.exports = configure(function (/* ctx */) {
                     secure: false,
                 },
             },
+            open: false,
         },
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework

quasar.extensions.json

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

src/App.vue

@@ -16,7 +16,7 @@ onMounted(() => {
     if (availableLocales.includes(userLang)) {
         locale.value = userLang;
     } else {
-        locale.value = fallbackLocale;
+        locale.value = fallbackLocale.value;
     }
 });
 

src/boot/defaults/qTable.js

@@ -0,0 +1,5 @@
+import { QTable } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QTable, 'pagination', { rowsPerPage: 0 });
+setDefault(QTable, 'hidePagination', true);

src/boot/defaults/setDefault.js

@@ -0,0 +1,18 @@
+export default function (component, key, value) {
+    const prop = component.props[key];
+    switch (typeof prop) {
+        case 'object':
+            prop.default = value;
+            break;
+        case 'function':
+            component.props[key] = {
+                type: prop,
+                default: value,
+            };
+            break;
+        case 'undefined':
+            throw new Error('unknown prop: ' + key);
+        default:
+            throw new Error('unhandled type: ' + typeof prop);
+    }
+}

src/boot/qformMixin.js

@@ -0,0 +1,21 @@
+import { getCurrentInstance } from 'vue';
+
+const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
+const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
+
+
+export default {
+    mounted: function () {
+        const vm = getCurrentInstance();
+        if (vm.type.name === 'QForm')
+            if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
+                // AUTOFOCUS
+                const elementsArray = Array.from(this.$el.elements);
+                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
+
+                if (firstInputElement) {
+                    firstInputElement.focus();
+                }
+            }
+    },
+};

src/boot/quasar.defaults.js

@@ -0,0 +1 @@
+export * from './defaults/qTable';

src/boot/quasar.js

@@ -0,0 +1,6 @@
+import { boot } from 'quasar/wrappers';
+import qFormMixin from './qformMixin';
+
+export default boot(({ app }) => {
+    app.mixin(qFormMixin);
+});

src/components/CreateBankEntityForm.vue

@@ -3,7 +3,7 @@ import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
@@ -78,7 +78,7 @@ onMounted(async () => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('country')"
                         v-model="data.countryFk"
                         :options="countriesOptions"

src/components/CreateManualInvoiceForm.vue

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import VnInputDate from './common/VnInputDate.vue';
@@ -73,7 +73,7 @@ const onDataSaved = async (formData, requestResponse) => {
             </span>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Ticket')"
                         :options="ticketsOptions"
                         hide-selected
@@ -92,13 +92,13 @@ const onDataSaved = async (formData, requestResponse) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <span class="row items-center" style="max-width: max-content">{{
                     t('Or')
                 }}</span>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -114,7 +114,7 @@ const onDataSaved = async (formData, requestResponse) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Serial')"
                         :options="invoiceOutSerialsOptions"
                         hide-selected
@@ -125,7 +125,7 @@ const onDataSaved = async (formData, requestResponse) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Area')"
                         :options="taxAreasOptions"
                         hide-selected

src/components/CreateNewCityForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -48,7 +48,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Province')"
                         :options="provincesOptions"
                         hide-selected

src/components/CreateNewPostcodeForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CreateNewCityForm from './CreateNewCityForm.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
@@ -28,8 +28,23 @@ const countriesOptions = ref([]);
 const provincesOptions = ref([]);
 const townsLocationOptions = ref([]);
 
-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
+const onDataSaved = (formData) => {
+    const newPostcode = {
+        ...formData
+    };
+    const townObject = townsLocationOptions.value.find(
+        ({id}) => id === formData.townFk
+    );
+    newPostcode.town = townObject?.name;
+    const provinceObject = provincesOptions.value.find(
+        ({id}) => id === formData.provinceFk
+    );
+    newPostcode.province = provinceObject?.name;
+    const countryObject = countriesOptions.value.find(
+        ({id}) => id === formData.countryFk
+    );
+    newPostcode.country = countryObject?.country;
+    emit('onDataSaved', newPostcode);  
 };
 
 const onCityCreated = async ({ name, provinceFk }, formData) => {
@@ -73,7 +88,7 @@ const onProvinceCreated = async ({ name }, formData) => {
         :title="t('New postcode')"
         :subtitle="t('Please, ensure you put the correct data!')"
         :form-initial-data="postcodeFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
@@ -123,7 +138,7 @@ const onProvinceCreated = async ({ name }, formData) => {
                     </VnSelectDialog>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Country')"
                         :options="countriesOptions"
                         hide-selected

src/components/CreateNewProvinceForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -48,7 +48,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Autonomy')"
                         :options="autonomiesOptions"
                         hide-selected

src/components/CreateThermographForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -64,7 +64,7 @@ const onDataSaved = (dataSaved) => {
                 </div>
 
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Model')"
                         :options="thermographsModels"
                         hide-selected
@@ -78,7 +78,7 @@ const onDataSaved = (dataSaved) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Warehouse')"
                         :options="warehousesOptions"
                         hide-selected
@@ -89,7 +89,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Temperature')"
                         :options="temperaturesOptions"
                         hide-selected

src/components/CrudModel.vue

@@ -24,6 +24,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    limit: {
+        type: Number,
+        default: 20,
+    },
     saveUrl: {
         type: String,
         default: null,
@@ -76,6 +80,7 @@ defineExpose({
     reset,
     hasChanges,
     saveChanges,
+    getChanges,
 });
 
 async function fetch(data) {
@@ -260,6 +265,7 @@ watch(formUrl, async () => {
 <template>
     <VnPaginate
         :url="url"
+        :limit="limit"
         v-bind="$attrs"
         @on-fetch="fetch"
         :skeleton="false"

src/components/EditPictureForm.vue

@@ -2,7 +2,7 @@
 import { reactive, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -293,7 +293,7 @@ const makeRequest = async () => {
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
                         <div class="col">
-                            <VnSelectFilter
+                            <VnSelect
                                 :label="t('Orientation')"
                                 :options="viewportTypes"
                                 hide-selected

src/components/EditTableCellValueForm.vue

@@ -1,9 +1,12 @@
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import { QCheckbox } from 'quasar';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -28,11 +31,16 @@ const $props = defineProps({
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const formData = reactive({
-    field: null,
-    newValue: null,
-});
+const inputs = {
+    input: markRaw(VnInput),
+    number: markRaw(VnInput),
+    date: markRaw(VnInputDate),
+    checkbox: markRaw(QCheckbox),
+    select: markRaw(VnSelect),
+};
 
+const newValue = ref(null);
+const selectedField = ref(null);
 const closeButton = ref(null);
 const isLoading = ref(false);
 
@@ -47,8 +55,8 @@ const submitData = async () => {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
         const payload = {
-            field: formData.field,
-            newValue: formData.newValue,
+            field: selectedField.value.field,
+            newValue: newValue.value,
             lines: rowsToEdit,
         };
 
@@ -75,19 +83,20 @@ const closeForm = () => {
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
+                <VnSelect
                     :label="t('Field to edit')"
                     :options="fieldsOptions"
                     hide-selected
                     option-label="label"
-                        option-value="field"
-                        v-model="formData.field"
+                    v-model="selectedField"
+                />
+                <component
+                    :is="inputs[selectedField?.component || 'input']"
+                    v-bind="selectedField?.attrs || {}"
+                    v-model="newValue"
+                    :label="t('Value')"
+                    style="width: 200px"
                 />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Value')" v-model="formData.newValue" />
-                </div>
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn

src/components/FetchData.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { h, onMounted } from 'vue';
+import { onMounted } from 'vue';
 import axios from 'axios';
 
 const $props = defineProps({
@@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
     }
 }
 </script>
+<template>
+    <template></template>
+</template>

src/components/FilterItemForm.vue

@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -160,7 +160,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.producer')"
                         :options="producersOptions"
                         hide-selected
@@ -170,7 +170,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.type')"
                         :options="ItemTypesOptions"
                         hide-selected
@@ -180,7 +180,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.color')"
                         :options="InksOptions"
                         hide-selected
@@ -202,7 +202,6 @@ const selectItem = ({ id }) => {
             <QTable
                 :columns="tableColumns"
                 :rows="tableRows"
-                :pagination="{ rowsPerPage: 0 }"
                 :loading="loading"
                 :hide-header="!tableRows || !tableRows.length > 0"
                 :no-data-label="t('Enter a new search')"

src/components/FilterTravelForm.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -146,7 +146,7 @@ const selectTravel = ({ id }) => {
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.agency')"
                         :options="agenciesOptions"
                         hide-selected
@@ -156,7 +156,7 @@ const selectTravel = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.warehouseOut')"
                         :options="warehousesOptions"
                         hide-selected
@@ -166,7 +166,7 @@ const selectTravel = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.warehouseIn')"
                         :options="warehousesOptions"
                         hide-selected
@@ -200,7 +200,6 @@ const selectTravel = ({ id }) => {
             <QTable
                 :columns="tableColumns"
                 :rows="tableRows"
-                :pagination="{ rowsPerPage: 0 }"
                 :loading="loading"
                 :hide-header="!tableRows || !tableRows.length > 0"
                 :no-data-label="t('Enter a new search')"

src/components/FormModel.vue

@@ -81,6 +81,7 @@ const emit = defineEmits(['onFetch', 'onDataSaved']);
 const componentIsRendered = ref(false);
 
 onMounted(async () => {
+    originalData.value = $props.formInitialData;
     nextTick(() => {
         componentIsRendered.value = true;
     });
@@ -101,8 +102,7 @@ onMounted(async () => {
 });
 
 onBeforeRouteLeave((to, from, next) => {
-    if (!hasChanges.value) next();
-
+    if (hasChanges.value && $props.observeFormChanges)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -111,6 +111,7 @@ onBeforeRouteLeave((to, from, next) => {
                 promise: () => next(),
             },
         });
+    else next();
 });
 
 onUnmounted(() => {
@@ -126,18 +127,18 @@ const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
-const originalData = ref({ ...$props.formInitialData });
+const originalData = ref({});
 const formData = computed(() => state.get($props.model));
 const formUrl = computed(() => $props.url);
 const defaultButtons = computed(() => ({
     save: {
         color: 'primary',
-        icon: 'restart_alt',
+        icon: 'save',
         label: 'globals.save',
     },
     reset: {
         color: 'primary',
-        icon: 'save',
+        icon: 'restart_alt',
         label: 'globals.reset',
     },
     ...$props.defaultButtons,
@@ -154,14 +155,18 @@ const startFormWatcher = () => {
 };
 
 async function fetch() {
+    try {
         const { data } = await axios.get($props.url, {
             params: { filter: JSON.stringify($props.filter) },
         });
-
         state.set($props.model, data);
         originalData.value = data && JSON.parse(JSON.stringify(data));
 
         emit('onFetch', state.get($props.model));
+    } catch (error) {
+        state.set($props.model, {});
+        originalData.value = {};
+    }
 }
 
 async function save() {
@@ -227,6 +232,7 @@ watch(formUrl, async () => {
 defineExpose({
     save,
     isLoading,
+    hasChanges,
 });
 </script>
 <template>
@@ -284,6 +290,9 @@ defineExpose({
     />
 </template>
 <style lang="scss" scoped>
+.q-notifications {
+    color: black;
+}
 #formModel {
     max-width: 800px;
     width: 100%;

src/components/FormModelPopup.vue

@@ -76,23 +76,25 @@ defineExpose({
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" :data="data" :validate="validate" />
             <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
                 <QBtn
                     :label="t('globals.cancel')"
+                    :title="t('globals.cancel')"
                     type="reset"
                     color="primary"
                     flat
-                    class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     v-close-popup
                 />
+                <QBtn
+                    :label="t('globals.save')"
+                    :title="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
             </div>
         </template>
     </FormModel>

src/components/FormPopup.vue

@@ -56,14 +56,6 @@ const closeForm = () => {
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" />
             <div class="q-mt-lg row justify-end">
-                <QBtn
-                    v-if="defaultSubmitButton"
-                    :label="customSubmitButtonLabel || t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
                 <QBtn
                     v-if="defaultCancelButton"
                     :label="t('globals.cancel')"
@@ -74,6 +66,14 @@ const closeForm = () => {
                     :loading="isLoading"
                     v-close-popup
                 />
+                <QBtn
+                    v-if="defaultSubmitButton"
+                    :label="customSubmitButtonLabel || t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
                 <slot name="customButtons" />
             </div>
         </QCard>

src/components/ItemsFilterPanel.vue

@@ -0,0 +1,359 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
+import axios from 'axios';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    customTags: {
+        type: Array,
+        default: () => [],
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
+});
+
+const itemCategories = ref([]);
+const selectedCategoryFk = ref(null);
+const selectedTypeFk = ref(null);
+const itemTypesOptions = ref([]);
+const suppliersOptions = ref([]);
+const tagOptions = ref([]);
+const tagValues = ref([]);
+
+const categoryList = computed(() => {
+    return (itemCategories.value || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+});
+
+const selectedCategory = computed(() =>
+    (itemCategories.value || []).find(
+        (category) => category?.id === selectedCategoryFk.value
+    )
+);
+
+const selectedType = computed(() => {
+    return (itemTypesOptions.value || []).find(
+        (type) => type?.id === selectedTypeFk.value
+    );
+});
+
+const selectCategory = async (params, categoryId, search) => {
+    if (params.categoryFk === categoryId) {
+        resetCategory(params);
+        search();
+        return;
+    }
+    selectedCategoryFk.value = categoryId;
+    params.categoryFk = categoryId;
+    await fetchItemTypes(categoryId);
+    search();
+};
+
+const resetCategory = (params) => {
+    selectedCategoryFk.value = null;
+    itemTypesOptions.value = null;
+    if (params) {
+        params.categoryFk = null;
+        params.typeFk = null;
+    }
+};
+
+const applyTags = (params, search) => {
+    params.tags = tagValues.value
+        .filter((tag) => tag.selectedTag && tag.value)
+        .map((tag) => ({
+            tagFk: tag.selectedTag.id,
+            tagName: tag.selectedTag.name,
+            value: tag.value,
+        }));
+    search();
+};
+
+const fetchItemTypes = async (id) => {
+    try {
+        const filter = {
+            fields: ['id', 'name', 'categoryFk'],
+            where: { categoryFk: id },
+            include: 'category',
+            order: 'name ASC',
+        };
+        const { data } = await axios.get('ItemTypes', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemTypesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching item types', err);
+    }
+};
+
+const getCategoryClass = (category, params) => {
+    if (category.id === params?.categoryFk) {
+        return 'active';
+    }
+};
+
+const getSelectedTagValues = async (tag) => {
+    try {
+        tag.value = null;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+            limit: 30,
+        };
+
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+            params,
+        });
+        tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
+};
+
+const removeTag = (index, params, search) => {
+    (tagValues.value || []).splice(index, 1);
+    applyTags(params, search);
+};
+</script>
+
+<template>
+    <FetchData
+        url="ItemCategories"
+        limit="30"
+        auto-load
+        @on-fetch="(data) => (itemCategories = data)"
+    />
+    <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'] }"
+        auto-load
+        limit="30"
+        @on-fetch="(data) => (tagOptions = data)"
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :expr-builder="exprBuilder"
+        :custom-tags="customTags"
+    >
+        <template #tags="{ tag, formatFn }">
+            <strong v-if="tag.label === 'categoryFk'">
+                {{ t(selectedCategory?.name || '') }}
+            </strong>
+            <strong v-else-if="tag.label === 'typeFk'">
+                {{ t(selectedType?.name || '') }}
+            </strong>
+            <div v-else class="q-gutter-x-xs">
+                <strong>{{ t(`components.itemsFilterPanel.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #customTags="{ tags, params }">
+            <template v-for="tag in tags" :key="tag.label">
+                <VnFilterPanelChip
+                    v-for="chip in tag.value"
+                    :key="chip"
+                    removable
+                    @remove="removeTagChip(chip, params, searchFn)"
+                >
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ chip.tagName }}: </strong>
+                        <span>"{{ chip.value }}"</span>
+                    </div>
+                </VnFilterPanelChip>
+            </template>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="category-filter q-mt-md">
+                <QBtn
+                    dense
+                    flat
+                    round
+                    v-for="category in categoryList"
+                    :key="category.name"
+                    :class="['category', getCategoryClass(category, params)]"
+                    :icon="category.icon"
+                    @click="selectCategory(params, category.id, searchFn)"
+                >
+                    <QTooltip>
+                        {{ t(category.name) }}
+                    </QTooltip>
+                </QBtn>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('components.itemsFilterPanel.typeFk')"
+                        v-model="params.typeFk"
+                        :options="itemTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        use-input
+                        :disable="!selectedCategoryFk"
+                        @update:model-value="
+                            (value) => {
+                                selectedTypeFk = value;
+                                searchFn();
+                            }
+                        "
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.categoryName }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <slot name="body" :params="params" :search-fn="searchFn" />
+            <QItem
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="q-mt-md filter-value"
+            >
+                <QItemSection class="col">
+                    <VnSelect
+                        :label="t('components.itemsFilterPanel.tag')"
+                        v-model="value.selectedTag"
+                        :options="tagOptions"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="getSelectedTagValues(value)"
+                    />
+                </QItemSection>
+                <QItemSection class="col">
+                    <VnSelect
+                        v-if="!value?.selectedTag?.isFree && value.valueOptions"
+                        :label="t('components.itemsFilterPanel.value')"
+                        v-model="value.value"
+                        :options="value.valueOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!value"
+                        :is-clearable="false"
+                        @update:model-value="applyTags(params, searchFn)"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="value.value"
+                        :label="t('components.itemsFilterPanel.value')"
+                        :disable="!value"
+                        is-outlined
+                        :is-clearable="false"
+                        @keyup.enter="applyTags(params, searchFn)"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="fill-icon-on-hover q-px-xs"
+                    color="primary"
+                    size="sm"
+                    @click="removeTag(index, params, searchFn)"
+                />
+            </QItem>
+            <QItem class="q-mt-lg">
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-px-xs"
+                    color="primary"
+                    size="sm"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style lang="scss" scoped>
+.category-filter {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 12px;
+
+    .category {
+        padding: 8px;
+        width: 60px;
+        height: 60px;
+        font-size: 1.4rem;
+        background-color: var(--vn-accent-color);
+
+        &.active {
+            background-color: $primary;
+        }
+    }
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        supplier: Supplier
+        from: From
+        to: To
+        active: Is active
+        visible: Is visible
+        floramondo: Is floramondo
+        salesPersonFk: Buyer
+        categoryFk: Category
+
+es:
+    params:
+        supplier: Proveedor
+        from: Desde
+        to: Hasta
+        active: Activo
+        visible: Visible
+        floramondo: Floramondo
+        salesPersonFk: Comprador
+        categoryFk: Categoría
+</i18n>

src/components/LeftMenu.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -22,6 +22,8 @@ const props = defineProps({
     },
 });
 
+const expansionItemElements = reactive({});
+
 onMounted(async () => {
     await navigation.fetchPinned();
     getRoutes();
@@ -108,6 +110,10 @@ async function togglePinned(item, event) {
         type: 'positive',
     });
 }
+
+const handleItemExpansion = (itemName) => {
+    expansionItemElements[itemName].scrollToLastElement();
+};
 </script>
 
 <template>
@@ -213,8 +219,12 @@ async function togglePinned(item, event) {
                         :icon="item.icon"
                         :label="t(item.title)"
                         :content-inset-level="0.5"
+                        @after-show="handleItemExpansion(item.name)"
                     >
-                        <LeftMenuItemGroup :item="item" />
+                        <LeftMenuItemGroup
+                            :ref="(el) => (expansionItemElements[item.name] = el)"
+                            :item="item"
+                        />
                     </QExpansionItem>
                 </QList>
             </template>

src/components/LeftMenuItem.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 
 const props = defineProps({
     item: {
@@ -11,19 +11,25 @@ const props = defineProps({
     },
 });
 
-const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
+const itemComputed = computed(() => {
+    const item = JSON.parse(JSON.stringify(props.item));
+    const [, , section] = item.title.split('.');
+
+    if (!te(item.title)) item.title = t(`globals.pageTitles.${section}`);
+    return item;
+});
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
-        <QItemSection avatar v-if="item.icon">
-            <QIcon :name="item.icon" />
+    <QItem active-class="bg-hover" :to="{ name: itemComputed.name }" clickable v-ripple>
+        <QItemSection avatar v-if="itemComputed.icon">
+            <QIcon :name="itemComputed.icon" />
         </QItemSection>
-        <QItemSection avatar v-if="!item.icon">
+        <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>{{ t(item.title) }}</QItemSection>
+        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
         <QItemSection side>
-            <slot name="side" :item="item" />
+            <slot name="side" :item="itemComputed" />
         </QItemSection>
     </QItem>
 </template>

src/components/LeftMenuItemGroup.vue

@@ -1,6 +1,7 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import LeftMenuItem from './LeftMenuItem.vue';
+import { elementIsVisibleInViewport } from 'src/composables/elementIsVisibleInViewport';
 
 const props = defineProps({
     item: {
@@ -13,10 +14,27 @@ const props = defineProps({
     },
 });
 
+const groupEnd = ref(null);
+
+const scrollToLastElement = () => {
+    if (groupEnd.value && !elementIsVisibleInViewport(groupEnd.value)) {
+        groupEnd.value.scrollIntoView({
+            behavior: 'smooth',
+            block: 'end',
+        });
+    }
+};
+
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
+
+defineExpose({
+    scrollToLastElement,
+});
 </script>
+
 <template>
     <template v-for="section in item.children" :key="section.name">
         <LeftMenuItem :item="section" />
     </template>
+    <div ref="groupEnd" />
 </template>

src/components/RegularizeStockForm.vue

@@ -2,7 +2,7 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
@@ -54,12 +54,13 @@ const onDataSaved = (data) => {
                     <QInput
                         :label="t('Type the visible quantity')"
                         v-model.number="data.quantity"
+                        autofocus
                     />
                 </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="data.warehouseFk"
                         :options="warehousesOptions"

src/components/TransferInvoiceForm.vue

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
 
 import axios from 'axios';
@@ -84,7 +84,7 @@ const transferInvoice = async () => {
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -103,10 +103,10 @@ const transferInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Rectificative type')"
                         :options="rectificativeTypeOptions"
                         hide-selected
@@ -119,7 +119,7 @@ const transferInvoice = async () => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Class')"
                         :options="siiTypeInvoiceOutsOptions"
                         hide-selected
@@ -138,10 +138,10 @@ const transferInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Type')"
                         :options="invoiceCorrectionTypesOptions"
                         hide-selected

src/components/UserPanel.vue

@@ -7,12 +7,16 @@ import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'components/FetchData.vue';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 import { useClipboard } from 'src/composables/useClipboard';
+import { ref } from 'vue';
 const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
@@ -45,6 +49,9 @@ const darkMode = computed({
 
 const user = state.getUser();
 const token = session.getTokenMultimedia();
+const warehousesData = ref();
+const companiesData = ref();
+const accountBankData = ref();
 
 onMounted(async () => {
     updatePreferences();
@@ -87,10 +94,28 @@ function copyUserToken() {
 </script>
 
 <template>
+    <FetchData
+        url="Warehouses"
+        order="name"
+        @on-fetch="(data) => (warehousesData = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        order="name"
+        @on-fetch="(data) => (companiesData = data)"
+        auto-load
+    />
+    <FetchData
+        url="Accountings"
+        order="name"
+        @on-fetch="(data) => (accountBankData = data)"
+        auto-load
+    />
     <QMenu anchor="bottom left" class="bg-vn-section-color">
         <div class="row no-wrap q-pa-md">
-            <div class="column panel">
-                <div class="text-h6 q-mb-md">
+            <div class="col column">
+                <div class="text-h6 q-ma-sm q-mb-none">
                     {{ t('components.userPanel.settings') }}
                 </div>
                 <QToggle
@@ -114,7 +139,7 @@ function copyUserToken() {
 
             <QSeparator vertical inset class="q-mx-lg" />
 
-            <div class="column items-center panel">
+            <div class="col column items-center q-mb-sm">
                 <QAvatar size="80px">
                     <QImg
                         :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
@@ -131,7 +156,6 @@ function copyUserToken() {
                 >
                     @{{ user.name }}
                 </div>
-
                 <QBtn
                     id="logout"
                     color="orange"
@@ -141,17 +165,72 @@ function copyUserToken() {
                     icon="logout"
                     @click="logout()"
                     v-close-popup
+                    dense
                 />
             </div>
         </div>
+        <QSeparator inset class="q-mx-lg" />
+        <div class="col q-gutter-xs q-pa-md">
+            <VnRow>
+                <VnSelect
+                    :label="t('components.userPanel.localWarehouse')"
+                    v-model="user.localWarehouseFk"
+                    :options="warehousesData"
+                    option-label="name"
+                    option-value="id"
+                />
+                <VnSelect
+                    :label="t('components.userPanel.localBank')"
+                    v-model="user.localBankFk"
+                    :options="accountBankData"
+                    option-label="bank"
+                    option-value="id"
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `${opt.id}: ${opt.bank}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('components.userPanel.localCompany')"
+                    hide-selected
+                    v-model="user.companyFk"
+                    :options="companiesData"
+                    option-label="code"
+                    option-value="id"
+                />
+                <VnSelect
+                    :label="t('components.userPanel.userWarehouse')"
+                    hide-selected
+                    v-model="user.warehouseFk"
+                    :options="warehousesData"
+                    option-label="name"
+                    option-value="id"
+                />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('components.userPanel.userCompany')"
+                    hide-selected
+                    v-model="user.companyFk"
+                    :options="companiesData"
+                    option-label="code"
+                    option-value="id"
+                    style="flex: 0"
+                />
+            </VnRow>
+        </div>
     </QMenu>
 </template>
 
 <style lang="scss" scoped>
-.panel {
-    width: 150px;
-}
-
 .copyText {
     &:hover {
         cursor: alias;

src/components/common/VnBreadcrumbs.vue

@@ -5,16 +5,16 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useCamelCase } from 'src/composables/useCamelCase';
 
-const router = useRouter();
-const quasar = useQuasar();
-const { t } = useI18n();
+const { currentRoute } = useRouter();
+const { screen } = useQuasar();
+const { t, te } = useI18n();
 
 let matched = ref([]);
 let breadcrumbs = ref([]);
 let root = ref(null);
 
 watchEffect(() => {
-    matched.value = router.currentRoute.value.matched.filter(
+    matched.value = currentRoute.value.matched.filter(
         (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
@@ -34,13 +34,17 @@ function getBreadcrumb(param) {
         icon: param.meta.icon,
         path: param.path,
         root: root.value,
+        locale: t(`globals.pageTitles.${param.meta.title}`),
     };
 
-    if (quasar.screen.gt.sm) {
+    if (screen.gt.sm) {
         breadcrumb.name = param.name;
         breadcrumb.title = useCamelCase(param.meta.title);
     }
 
+    const moduleLocale = `${breadcrumb.root}.pageTitles.${breadcrumb.title}`;
+    if (te(moduleLocale)) breadcrumb.locale = t(moduleLocale);
+
     return breadcrumb;
 }
 </script>
@@ -50,7 +54,7 @@ function getBreadcrumb(param) {
             v-for="(breadcrumb, index) of breadcrumbs"
             :key="index"
             :icon="breadcrumb.icon"
-            :label="t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)"
+            :label="breadcrumb.locale"
             :to="breadcrumb.path"
         />
     </QBreadcrumbs>

src/components/common/VnCard.vue

@@ -0,0 +1,78 @@
+<script setup>
+import { onBeforeMount, computed } from 'vue';
+import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import useCardSize from 'src/composables/useCardSize';
+import VnSubToolbar from '../ui/VnSubToolbar.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const props = defineProps({
+    dataKey: { type: String, required: true },
+    baseUrl: { type: String, default: undefined },
+    customUrl: { type: String, default: undefined },
+    filter: { type: Object, default: () => {} },
+    descriptor: { type: Object, required: true },
+    searchbarDataKey: { type: String, default: undefined },
+    searchbarUrl: { type: String, default: undefined },
+    searchbarLabel: { type: String, default: '' },
+    searchbarInfo: { type: String, default: '' },
+});
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const route = useRoute();
+const url = computed(() => {
+    if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
+    return props.customUrl;
+});
+
+const arrayData = useArrayData(props.dataKey, {
+    url: url.value,
+    filter: props.filter,
+});
+
+onBeforeMount(async () => {
+    if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+    await arrayData.fetch({ append: false });
+});
+
+if (props.baseUrl) {
+    onBeforeRouteUpdate(async (to, from) => {
+        if (to.params.id !== from.params.id) {
+            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            await arrayData.fetch({ append: false });
+        }
+    });
+}
+</script>
+<template>
+    <Teleport
+        to="#searchbar"
+        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
+    >
+        <VnSearchbar
+            :data-key="props.searchbarDataKey"
+            :url="props.searchbarUrl"
+            :label="t(props.searchbarLabel)"
+            :info="t(props.searchbarInfo)"
+        />
+    </Teleport>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <component :is="descriptor" />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div :class="[useCardSize(), $attrs.class]">
+                <RouterView />
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>

src/components/common/VnCurrency.vue

@@ -5,7 +5,7 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const props = defineProps({
-    modelValue: { type: String, default: '' },
+    modelValue: { type: [String, Number], default: '' },
 });
 
 const { t } = useI18n();

src/components/common/VnDms.vue

@@ -6,7 +6,7 @@ import axios from 'axios';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
@@ -123,7 +123,7 @@ function addDefaultData(data) {
             <div class="q-gutter-y-ms">
                 <VnRow>
                     <VnInput :label="t('globals.reference')" v-model="dms.reference" />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.company')"
                         v-model="dms.companyFk"
                         :options="companies"
@@ -133,7 +133,7 @@ function addDefaultData(data) {
                     />
                 </VnRow>
                 <VnRow>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.warehouse')"
                         v-model="dms.warehouseFk"
                         :options="warehouses"
@@ -141,7 +141,7 @@ function addDefaultData(data) {
                         option-label="name"
                         input-debounce="0"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.type')"
                         v-model="dms.dmsTypeFk"
                         :options="dmsTypes"
@@ -198,9 +198,13 @@ function addDefaultData(data) {
 en:
     contentTypesInfo: Allowed file types {allowedContentTypes}
     EntryDmsDescription: Reference {reference}
+    WorkersDescription: Working of employee id {reference}
+    SupplierDmsDescription: Reference {reference}
 es:
     Generate identifier for original file: Generar identificador para archivo original
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     EntryDmsDescription: Referencia {reference}
+    WorkersDescription: Laboral del empleado {reference}
+    SupplierDmsDescription: Referencia {reference}
 
 </i18n>

src/components/common/VnDmsList.vue

@@ -5,9 +5,11 @@ import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
 
-import FetchData from 'components/FetchData.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 import { downloadFile } from 'src/composables/downloadFile';
 
 const route = useRoute();
@@ -26,6 +28,15 @@ const $props = defineProps({
         type: String,
         default: null,
     },
+    deleteModel: {
+        type: String,
+        default: null,
+    },
+    downloadModel: {
+        type: String,
+        required: false,
+        default: null,
+    },
     defaultDmsCode: {
         type: String,
         required: true,
@@ -74,7 +85,7 @@ const dmsFilter = {
             ],
         },
     },
-    order: ['dmsFk DESC'],
+    where: { [$props.filter]: route.params.id },
 };
 
 const columns = computed(() => [
@@ -94,12 +105,12 @@ const columns = computed(() => [
         props: (prop) => ({
             readonly: true,
             borderless: true,
-            'model-value': prop.row.dmsType.name,
+            'model-value': prop.row.dmsType?.name,
         }),
     },
     {
         align: 'left',
-        field: 'order',
+        field: 'hardCopyNumber',
         label: t('globals.order'),
         name: 'order',
         component: 'span',
@@ -117,6 +128,7 @@ const columns = computed(() => [
         label: t('globals.description'),
         name: 'description',
         component: 'span',
+        props: (prop) => ({ value: prop.value?.toUpperCase() }),
     },
     {
         align: 'left',
@@ -136,21 +148,53 @@ const columns = computed(() => [
         name: 'file',
         component: 'span',
     },
+    {
+        align: 'left',
+        field: 'worker',
+        label: t('globals.worker'),
+        name: 'worker',
+        component: VnUserLink,
+        props: (prop) => ({
+            name: prop.row.worker?.user?.name.toLowerCase(),
+            workerId: prop.row.worker?.id,
+        }),
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('globals.created'),
+        name: 'created',
+        component: VnInputDate,
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.created,
+        }),
+    },
     {
         field: 'options',
         name: 'options',
         components: [
             {
                 component: QBtn,
+                name: 'download',
+                isDocuware: true,
                 props: () => ({
                     icon: 'cloud_download',
                     flat: true,
                     color: 'primary',
                 }),
-                click: (prop) => downloadFile(prop.row.id),
+                click: (prop) =>
+                    downloadFile(
+                        prop.row.id,
+                        $props.downloadModel,
+                        undefined,
+                        prop.row.download
+                    ),
             },
             {
                 component: QBtn,
+                name: 'edit',
+                external: false,
                 props: () => ({
                     icon: 'edit',
                     flat: true,
@@ -160,6 +204,8 @@ const columns = computed(() => [
             },
             {
                 component: QBtn,
+                name: 'delete',
+                external: false,
                 props: () => ({
                     icon: 'delete',
                     flat: true,
@@ -167,12 +213,24 @@ const columns = computed(() => [
                 }),
                 click: (prop) => deleteDms(prop.row.id),
             },
+            {
+                component: QBtn,
+                name: 'open',
+                external: true,
+                props: () => ({
+                    icon: 'open_in_new',
+                    flat: true,
+                    color: 'primary',
+                }),
+                click: (prop) => open(prop.row.url),
+            },
         ],
     },
 ]);
 
 function setData(data) {
-    const newData = data.map((value) => value.dms);
+    const newData = data.map((value) => value.dms || value);
+    newData.sort((a, b) => new Date(b.created) - new Date(a.created));
     rows.value = newData;
 }
 
@@ -186,7 +244,7 @@ function deleteDms(dmsFk) {
             },
         })
         .onOk(async () => {
-            await axios.post(`${$props.model}/${dmsFk}/removeFile`);
+            await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
             const index = rows.value.findIndex((row) => row.id == dmsFk);
             rows.value.splice(index, 1);
         });
@@ -206,19 +264,29 @@ function parseDms(data) {
     }
     return data;
 }
+
+async function open(url) {
+    window.open(url).focus();
+}
+
+function shouldRenderButton(button, isExternal = false) {
+    if (button.name == 'download') return true;
+    return button.external === isExternal;
+}
 </script>
 <template>
-    <FetchData
+    <VnPaginate
         ref="dmsRef"
+        :data-key="$props.model"
         :url="$props.model"
         :filter="dmsFilter"
-        :where="{ [$props.filter]: route.params.id }"
+        :order="['dmsFk DESC']"
+        :auto-load="true"
         @on-fetch="setData"
-        auto-load
-    />
+    >
+        <template #body>
             <QTable
                 :columns="columns"
-        :pagination="{ rowsPerPage: 0 }"
                 :rows="rows"
                 class="full-width q-mt-md"
                 hide-bottom
@@ -241,9 +309,12 @@ function parseDms(data) {
                             </component>
                         </QTr>
 
-                <div class="flex justify-center" v-if="props.col.name == 'options'">
+                        <div class="row no-wrap" v-if="props.col.name == 'options'">
                             <div v-for="button of props.col.components" :key="button.id">
                                 <component
+                                    v-if="
+                                        shouldRenderButton(button, props.row.isDocuware)
+                                    "
                                     :is="button.component"
                                     v-bind="button.props(props)"
                                     @click="button.click(props)"
@@ -273,6 +344,12 @@ function parseDms(data) {
                                             class="row"
                                         >
                                             <component
+                                                v-if="
+                                                    shouldRenderButton(
+                                                        button.name,
+                                                        props.row.isDocuware
+                                                    )
+                                                "
                                                 :is="button.component"
                                                 v-bind="button.props(col)"
                                                 @click="button.click(col)"
@@ -285,6 +362,8 @@ function parseDms(data) {
                     </div>
                 </template>
             </QTable>
+        </template>
+    </VnPaginate>
     <QDialog v-model="formDialog.show">
         <VnDms
             :model="updateModel ?? model"

src/components/common/VnInput.vue

@@ -26,7 +26,7 @@ const value = computed({
         emit('update:modelValue', value);
     },
 });
-
+const hover = ref(false);
 const styleAttrs = computed(() => {
     return $props.isOutlined
         ? {
@@ -41,6 +41,10 @@ const onEnterPress = () => {
     emit('keyup.enter');
 };
 
+const handleValue = (val = null) => {
+    value.value = val;
+};
+
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -51,20 +55,33 @@ defineExpose({
 </script>
 
 <template>
+    <div
+        @mouseover="hover = true"
+        @mouseleave="hover = false"
+        :rules="$attrs.required ? [requiredFieldRule] : null"
+    >
         <QInput
             ref="vnInputRef"
             v-model="value"
             v-bind="{ ...$attrs, ...styleAttrs }"
-        type="text"
+            :type="$attrs.type"
             :class="{ required: $attrs.required }"
             @keyup.enter="onEnterPress()"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
+            :clearable="false"
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-        <template v-if="$slots.append" #append>
-            <slot name="append" />
+
+            <template #append>
+                <slot name="append" v-if="$slots.append" />
+                <QIcon
+                    name="close"
+                    size="xs"
+                    v-if="hover && value"
+                    @click="handleValue(null)"
+                ></QIcon>
             </template>
         </QInput>
+    </div>
 </template>

src/components/common/VnInputDate.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { computed, ref } from 'vue';
-import VnInput from 'components/common/VnInput.vue';
-import isValidDate from "filters/isValidDate";
+import isValidDate from 'filters/isValidDate';
 
 const props = defineProps({
     modelValue: {
@@ -17,6 +16,8 @@ const props = defineProps({
         default: false,
     },
 });
+const hover = ref(false);
+
 const emit = defineEmits(['update:modelValue']);
 
 const joinDateAndTime = (date, time) => {
@@ -77,14 +78,21 @@ const styleAttrs = computed(() => {
 </script>
 
 <template>
-    <VnInput
+    <div @mouseover="hover = true" @mouseleave="hover = false">
+        <QInput
             class="vn-input-date"
+            readonly
             :model-value="displayDate(value)"
             v-bind="{ ...$attrs, ...styleAttrs }"
-        readonly
             @click="isPopupOpen = true"
         >
             <template #append>
+                <QIcon
+                    name="close"
+                    size="xs"
+                    v-if="hover && value"
+                    @click="onDateUpdate(null)"
+                ></QIcon>
                 <QIcon name="event" class="cursor-pointer">
                     <QPopupProxy
                         v-model="isPopupOpen"
@@ -94,13 +102,15 @@ const styleAttrs = computed(() => {
                         :no-parent-event="props.readonly"
                     >
                         <QDate
+                            :today-btn="true"
                             :model-value="formatDate(value)"
                             @update:model-value="onDateUpdate"
                         />
                     </QPopupProxy>
                 </QIcon>
             </template>
-    </VnInput>
+        </QInput>
+    </div>
 </template>
 
 <style lang="scss">

src/components/common/VnInputTime.vue

@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
-import VnInput from "components/common/VnInput.vue";
 
 const props = defineProps({
     modelValue: {
@@ -20,6 +19,7 @@ const props = defineProps({
 });
 const { t } = useI18n();
 const emit = defineEmits(['update:modelValue']);
+
 const value = computed({
     get() {
         return props.modelValue;
@@ -27,12 +27,7 @@ const value = computed({
     set(value) {
         const [hours, minutes] = value.split(':');
         const date = new Date(props.modelValue);
-        date.setHours(
-            Number.parseInt(hours) || 0,
-            Number.parseInt(minutes) || 0,
-            0,
-            0
-        );
+        date.setHours(Number.parseInt(hours) || 0, Number.parseInt(minutes) || 0, 0, 0);
         emit('update:modelValue', value ? date.toISOString() : null);
     },
 });
@@ -71,7 +66,7 @@ const styleAttrs = computed(() => {
 </script>
 
 <template>
-    <VnInput
+    <QInput
         class="vn-input-time"
         readonly
         :model-value="formatTime(value)"
@@ -79,7 +74,7 @@ const styleAttrs = computed(() => {
         @click="isPopupOpen = true"
     >
         <template #append>
-            <QIcon name="event" class="cursor-pointer">
+            <QIcon name="schedule" class="cursor-pointer">
                 <QPopupProxy
                     v-model="isPopupOpen"
                     cover
@@ -111,7 +106,7 @@ const styleAttrs = computed(() => {
                 </QPopupProxy>
             </QIcon>
         </template>
-    </VnInput>
+    </QInput>
 </template>
 
 <style lang="scss">

src/components/common/VnLocation.vue

@@ -88,6 +88,10 @@ function locationFilter(search = '') {
 function handleFetch(data) {
     postcodesOptions.value = data;
 }
+function onDataSaved(newPostcode) {
+    postcodesOptions.value.push(newPostcode);
+    value.value = newPostcode.code;
+}
 </script>
 <template>
     <FetchData
@@ -111,11 +115,13 @@ function handleFetch(data) {
         clearable
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="locationFilter()" />
+            <CreateNewPostcode
+                @on-data-saved="onDataSaved"
+            />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
-                <QItemSection v-if="opt">
+                <QItemSection v-if="opt.code">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
                     <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
                 </QItemSection>

src/components/common/VnLog.vue

@@ -12,7 +12,7 @@ import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
-import VnSelectFilter from './VnSelectFilter.vue';
+import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 
 const stateStore = useStateStore();
@@ -403,7 +403,7 @@ setLogTree();
         auto-load
     />
     <div
-        class="column items-center logs origin-log"
+        class="column items-center logs origin-log q-mt-md"
         v-for="(originLog, originLogIndex) in logTree"
         :key="originLogIndex"
     >
@@ -659,7 +659,7 @@ setLogTree();
                     </QInput>
                 </QItem>
                 <QItem>
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width"
                         :label="t('globals.entity')"
                         v-model="selectedFilters.changedModel"
@@ -689,7 +689,7 @@ setLogTree();
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="workers && userRadio !== null">
-                        <VnSelectFilter
+                        <VnSelect
                             class="full-width"
                             :label="t('globals.user')"
                             v-model="userSelect"
@@ -713,7 +713,7 @@ setLogTree();
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QItemSection>
                 </QItem>
                 <QItem class="q-mt-sm">
@@ -1030,7 +1030,7 @@ en:
         ticketCreated: Created
         created: Created
         isChargedToMana: Charged to mana
-        hasToPickUp: Has to pick Up
+        pickup: Type of pickup
         dmsFk: Document ID
         text: Description
         claimStateFk: Claim State
@@ -1069,7 +1069,7 @@ es:
         ticketCreated: Creado
         created: Creado
         isChargedToMana: Cargado a maná
-        hasToPickUp: Se debe recoger
+        pickup: Se debe recoger
         dmsFk: ID documento
         text: Descripción
         claimStateFk: Estado de la reclamación

src/components/common/VnSelect.vue

@@ -51,8 +51,8 @@ const $props = defineProps({
         default: null,
     },
     limit: {
-        type: Number,
-        default: 30,
+        type: [Number, String],
+        default: '30',
     },
 });
 
@@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
         :limit="limit"
-        :order-by="orderBy"
+        :sort-by="sortBy"
         :fields="fields"
     />
     <QSelect

src/components/common/VnSelectDialog.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useRole } from 'src/composables/useRole';
 
@@ -52,7 +52,7 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
+    <VnSelect v-model="value" :options="options" v-bind="$attrs">
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
@@ -72,7 +72,7 @@ const toggleForm = () => {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData" :key="slotName" />
         </template>
-    </VnSelectFilter>
+    </VnSelect>
 </template>
 
 <style lang="scss" scoped>

src/components/common/VnSmsDialog.vue

@@ -21,7 +21,8 @@ const props = defineProps({
     },
     template: {
         type: String,
-        required: true,
+        required: false,
+        default: '',
     },
     locale: {
         type: String,
@@ -49,7 +50,7 @@ updateMessage();
 
 function updateMessage() {
     const params = props.data;
-    const key = `templates['${props.template}']`;
+    const key = props.template ? `templates['${props.template}']` : '';
 
     message.value = t(key, params, { locale: locale.value });
 }
@@ -104,15 +105,14 @@ async function send() {
                     map-options
                     :input-debounce="0"
                     rounded
-                    outlined
                     dense
                 />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput :label="t('Phone')" v-model="phone" is-outlined />
+                <VnInput :label="t('Phone')" v-model="phone" />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput v-model="subject" :label="t('Subject')" is-outlined />
+                <VnInput v-model="subject" :label="t('Subject')" />
             </QCardSection>
             <QCardSection class="q-mb-md" q-input>
                 <QInput
@@ -125,7 +125,6 @@ async function send() {
                     :bottom-slots="true"
                     :rules="[(value) => value.length < maxLength || 'Error!']"
                     stack-label
-                    outlined
                     autofocus
                 >
                     <template #append>
@@ -135,6 +134,11 @@ async function send() {
                             @click="message = ''"
                             class="cursor-pointer"
                         />
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>
+                                {{ t('messageTooltip') }}
+                            </QTooltip>
+                        </QIcon>
                     </template>
                     <template #counter>
                         <QChip :color="color" dense>
@@ -184,18 +188,20 @@ en:
     es: Spanish
     fr: French
     pt: Portuguese
+    messageTooltip: Special characters like accents counts as multiple
 es:
     Send SMS: Enviar SMS
     Language: Idioma
     Phone: Móvil
     Subject: Asunto
     Message: Mensaje
+    messageTooltip: Carácteres especiales como acentos cuentan como varios
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            { orderId } del día { shipped } para recibirlo sin portes adicionales.'
-        orderChanges: 'Pedido {orderId} día { shipped }: { changes }'
+            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+        orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés
     es: Español
     fr: Francés
@@ -207,12 +213,14 @@ fr:
     Phone: Mobile
     Subject: Affaire
     Message: Message
+    messageTooltip: Les caractères spéciaux comme les accents comptent comme plusieurs
     templates:
-        pendingPayment: 'Votre commande est en attente de paiement.
-            Veuillez vous connecter sur le site web et effectuer le paiement par carte. Merci beaucoup.'
-        minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande
-            { orderId } du { shipped } afin de la recevoir sans frais de port supplémentaires.'
-        orderChanges: 'Commande { orderId } du { shipped }: { changes }'
+        pendingPayment: 'Verdnatura : Commande en attente de règlement. Veuillez régler votre commande avant 9h.
+            Sinon elle sera décalée en fonction de vos jours de livraison . Merci'
+        minAmount: 'Verdnatura vous rappelle :
+            Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
+            Merci.'
+        orderChanges: 'Commande {orderId} livraison {landing} indisponible/s. Désolés pour le dérangement.'
     en: Anglais
     es: Espagnol
     fr: Français
@@ -224,12 +232,13 @@ pt:
     Phone: Móvel
     Subject: Assunto
     Message: Mensagem
+    messageTooltip: Caracteres especiais como acentos contam como vários
     templates:
         pendingPayment: 'Seu pedido está pendente de pagamento.
             Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.'
         minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido
-            { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.'
-        orderChanges: 'Pedido { orderId } dia { shipped }: { changes }'
+            { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
+        orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
     en: Inglês
     es: Espanhol
     fr: Francês

src/components/ui/CardDescriptor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, useSlots, watch, computed, ref } from 'vue';
+import { onBeforeMount, watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -38,37 +38,33 @@ const $props = defineProps({
 });
 
 const state = useState();
-const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const entity = computed(() => useArrayData($props.dataKey).store.data);
+const arrayData = useArrayData($props.dataKey || $props.module, {
+    url: $props.url,
+    filter: $props.filter,
+    skip: 0,
+});
+const { store } = arrayData;
+const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
 defineExpose({
     getData,
 });
-onMounted(async () => {
+onBeforeMount(async () => {
     await getData();
-    watch(
-        () => $props.url,
-        async (newUrl, lastUrl) => {
-            if (newUrl == lastUrl) return;
-            await getData();
-        }
-    );
+    watch($props, async () => await getData());
 });
 
 async function getData() {
-    const arrayData = useArrayData($props.dataKey, {
-        url: $props.url,
-        filter: $props.filter,
-        skip: 0,
-    });
+    store.url = $props.url;
+    store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
         state.set($props.dataKey, data);
-        emit('onFetch', data);
+        emit('onFetch', Array.isArray(data) ? data[0] : data);
     } finally {
         isLoading.value = false;
     }
@@ -118,7 +114,7 @@ const emit = defineEmits(['onFetch']);
                     icon="more_vert"
                     round
                     size="md"
-                    :class="{ invisible: !slots.menu }"
+                    :class="{ invisible: !$slots.menu }"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
@@ -158,7 +154,7 @@ const emit = defineEmits(['onFetch']);
             <div class="icons">
                 <slot name="icons" :entity="entity" />
             </div>
-            <div class="actions">
+            <div class="actions justify-center">
                 <slot name="actions" :entity="entity" />
             </div>
             <slot name="after" />
@@ -177,22 +173,23 @@ const emit = defineEmits(['onFetch']);
 .body {
     background-color: var(--vn-section-color);
     .text-h5 {
+        font-size: 20px;
         padding-top: 5px;
-        padding-bottom: 5px;
+        padding-bottom: 0px;
     }
     .q-item {
         min-height: 20px;
 
         .link {
-            margin-left: 5px;
+            margin-left: 10px;
         }
     }
     .vn-label-value {
         display: flex;
-        padding: 2px 16px;
+        padding: 0px 16px;
         .label {
             color: var(--vn-label-color);
-            font-size: 12px;
+            font-size: 14px;
 
             &:not(:has(a))::after {
                 content: ':';
@@ -201,7 +198,7 @@ const emit = defineEmits(['onFetch']);
         .value {
             color: var(--vn-text-color);
             font-size: 14px;
-            margin-left: 12px;
+            margin-left: 4px;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
@@ -219,18 +216,19 @@ const emit = defineEmits(['onFetch']);
     overflow: hidden;
     text-overflow: ellipsis;
     span {
-        color: $primary;
+        color: var(--vn-text-color);
         font-weight: bold;
     }
 }
 .subtitle {
     color: var(--vn-text-color);
     font-size: 16px;
-    margin-bottom: 15px;
+    margin-bottom: 2px;
 }
 .list-box {
     .q-item__label {
         color: var(--vn-label-color);
+        padding-bottom: 0%;
     }
 }
 .descriptor {
@@ -248,6 +246,7 @@ const emit = defineEmits(['onFetch']);
     }
     .actions {
         margin: 0 5px;
+        justify-content: center !important;
     }
 }
 </style>

src/components/ui/CardSummary.vue

@@ -1,11 +1,10 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { ref, computed, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
-import axios from 'axios';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
-const entity = ref();
 const props = defineProps({
     url: {
         type: String,
@@ -16,46 +15,52 @@ const props = defineProps({
         default: null,
     },
     entityId: {
-        type: Number,
+        type: [Number, String],
         default: null,
     },
+    dataKey: {
+        type: String,
+        default: '',
+    },
 });
 const emit = defineEmits(['onFetch']);
 const route = useRoute();
 const isSummary = ref();
+const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
+    url: props.url,
+    filter: props.filter,
+    skip: 0,
+});
+const { store } = arrayData;
+const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+const isLoading = ref(false);
 
 defineExpose({
     entity,
     fetch,
 });
 
-onMounted(() => {
+onBeforeMount(async () => {
     isSummary.value = String(route.path).endsWith('/summary');
-    fetch();
+    await fetch();
+    watch(props, async () => await fetch());
 });
 
 async function fetch() {
-    const params = {};
-
-    if (props.filter) params.filter = JSON.stringify(props.filter);
-
-    const { data } = await axios.get(props.url, { params });
-    entity.value = data;
-
-    emit('onFetch', data);
+    store.url = props.url;
+    store.filter = props.filter ?? {};
+    isLoading.value = true;
+    const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+    emit('onFetch', Array.isArray(data) ? data[0] : data);
+    isLoading.value = false;
 }
-
-watch(props, async () => {
-    entity.value = null;
-    fetch();
-});
 </script>
 
 <template>
     <div class="summary container">
         <QCard class="cardSummary">
-            <SkeletonSummary v-if="!entity" />
-            <template v-if="entity">
+            <SkeletonSummary v-if="!entity || isLoading" />
+            <template v-if="entity && !isLoading">
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link
@@ -70,7 +75,7 @@ watch(props, async () => {
                         </router-link>
                         <span v-else></span>
                     </slot>
-                    <slot name="header" :entity="entity">
+                    <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
                     <slot name="header-right">
@@ -93,7 +98,6 @@ watch(props, async () => {
 
 .cardSummary {
     width: 100%;
-
     .summaryHeader {
         text-align: center;
         font-size: 20px;
@@ -128,6 +132,7 @@ watch(props, async () => {
             padding: 7px;
             font-size: 16px;
             min-width: 275px;
+            box-shadow: none;
 
             .vn-label-value {
                 display: flex;

src/components/ui/QCalendarMonthWrapper.vue

@@ -0,0 +1,168 @@
+<script setup>
+import { computed } from 'vue';
+import { useQuasar } from 'quasar';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
+
+const $props = defineProps({
+    bordered: {
+        type: Boolean,
+        default: false,
+    },
+    transparentBackground: {
+        type: Boolean,
+        default: false,
+    },
+    viewCustomization: {
+        type: String,
+        default: '',
+    },
+});
+
+const $q = useQuasar();
+
+// El objetivo de asignar las clases de personalización desde el wrapper es no tener conflictos entre vistas que usen el mismo componente
+const viewCustomizationClasses = {
+    workerCalendar: 'worker-calendar-customizations',
+};
+
+const containerClasses = computed(() => {
+    const classes = ['main-container-background'];
+    if (viewCustomizationClasses[$props.viewCustomization])
+        classes.push(viewCustomizationClasses[$props.viewCustomization]);
+    if ($props.bordered) classes.push('--bordered');
+    if ($props.transparentBackground) classes.push('transparent-background');
+    else classes.push($q.dark.isActive ? '--dark' : '--light');
+    return classes;
+});
+</script>
+
+<template>
+    <div :class="containerClasses">
+        <div class="nav-container row"><slot name="header" /></div>
+        <slot name="calendar" />
+    </div>
+</template>
+
+<style lang="scss">
+@import '../../css/quasar.variables.scss';
+
+:root {
+    // Cambia los colores del día actual del calendario por los de salix
+    --calendar-border-current-dark: #84d0e2 2px solid;
+    --calendar-border-current: #84d0e2 2px solid;
+    --calendar-current-color-dark: #84d0e2;
+    // Colores de fondo del calendario en dark mode
+    --calendar-outside-background-dark: #222;
+    --calendar-background-dark: #222;
+}
+
+// Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
+.q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
+    background-color: $primary !important;
+    color: white !important;
+}
+
+.q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
+    background-color: $primary !important;
+    color: white !important;
+}
+
+.q-calendar-month__head--weekday {
+    // Transforma los nombres de los días de la semana a mayúsculas
+    text-transform: capitalize;
+}
+
+.transparent-background {
+    --calendar-background-dark: transparent;
+    --calendar-background: transparent;
+    --calendar-outside-background-dark: transparent;
+}
+
+.q-calendar__button {
+    &:hover {
+        background-color: var(--vn-accent-color);
+        cursor: pointer;
+    }
+}
+
+.main-container-background {
+    --calendar-current-background-dark: transparent;
+
+    &.--dark {
+        background-color: var(--calendar-background-dark);
+    }
+
+    &.--light {
+        background-color: var(--calendar-background);
+    }
+
+    &.--bordered {
+        border: 1px solid #222;
+    }
+}
+
+.worker-calendar-customizations {
+    .q-calendar__button {
+        width: 32px;
+        height: 32px;
+        font-size: 13px;
+
+        &:hover {
+            background-color: var(--vn-accent-color);
+            cursor: pointer;
+        }
+    }
+
+    .q-calendar-month__week--days > div:nth-child(6),
+    .q-calendar-month__week--days > div:nth-child(7) {
+        // Cambia el color de los días sábado y domingo
+        color: #777777;
+    }
+
+    .q-calendar-month__week--wrapper {
+        margin-bottom: 4px;
+    }
+
+    .q-calendar-month__workweek {
+        height: 32px;
+        display: flex;
+        justify-content: center;
+    }
+
+    .q-calendar__button--bordered {
+        color: $info !important;
+    }
+
+    .q-calendar-month__day--content {
+        position: absolute;
+        top: 1;
+        left: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .q-outside .calendar-event {
+        display: none;
+    }
+
+    .q-calendar-month__workweek,
+    .q-calendar-month__head--workweek,
+    .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
+        text-transform: capitalize;
+        color: #777;
+        font-weight: bold;
+        font-size: 0.8rem;
+        text-align: center;
+    }
+}
+
+.nav-container {
+    display: flex;
+    align-items: center;
+
+    &.--bordered {
+        border: 1px solid black;
+    }
+}
+</style>

src/components/ui/VnFilterPanel.vue

@@ -164,7 +164,7 @@ function formatValue(value) {
 </script>
 
 <template>
-    <QForm @submit="search">
+    <QForm @submit="search" id="filterPanelForm">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>

src/components/ui/VnLinkPhone.vue

@@ -15,7 +15,6 @@ const { t } = useI18n();
         color="primary"
         padding="none"
         :href="`sip:${props.phoneNumber}`"
-        :title="t('globals.microsip')"
         @click.stop
     />
 </template>

src/components/ui/VnNotes.vue

@@ -1,11 +1,12 @@
 <script setup>
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
-import { toDateHour } from 'src/filters';
+import { toDateHourMin } from 'src/filters';
 import { ref } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from './VnPaginate.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
+import { useState } from 'src/composables/useState';
 
 const $props = defineProps({
     url: { type: String, default: null },
@@ -13,8 +14,10 @@ const $props = defineProps({
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
 });
+
 const { t } = useI18n();
-const noteModal = ref(false);
+const state = useState();
+const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
 
@@ -22,98 +25,83 @@ async function insert() {
     const body = $props.body;
     Object.assign(body, { text: newNote.value });
     await axios.post($props.url, body);
-    vnPaginateRef.value.fetch();
+    await vnPaginateRef.value.fetch();
     newNote.value = '';
 }
 </script>
 <template>
-    <div class="column items-center full-height full-width">
-        <VnPaginate
-            :data-key="$props.url"
-            :url="$props.url"
-            order="created DESC"
-            :limit="20"
-            :filter="$props.filter"
-            auto-load
-            ref="vnPaginateRef"
-        >
-            <template #body="{ rows }">
-                <div class="column items-center full-width">
-                    <QCard
-                        class="q-pa-xs q-mb-sm full-width"
-                        v-for="(note, index) in rows"
-                        :key="index"
-                    >
+    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
-                            <slot name="picture">
-                                <VnAvatar
-                                    :descriptor="false"
-                                    :worker-id="note.workerFk"
-                                    size="md"
-                                />
-                            </slot>
+            <VnAvatar :worker-id="currentUser.id" size="md" />
             <div class="full-width row justify-between q-pa-xs">
-                                <VnUserLink
-                                    :name="`${note.worker.user.nickname}`"
-                                    :worker-id="note.worker.id"
-                                />
-
-                                <slot name="actions">
-                                    {{ toDateHour(note.created) }}
-                                </slot>
+                <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
+                {{ t('globals.now') }}
             </div>
         </QCardSection>
-                        <QCardSection class="q-pa-xs q-my-none q-py-none">
-                            <slot name="text">
-                                {{ note.text }}
-                            </slot>
-                        </QCardSection>
-                    </QCard>
-                </div>
-            </template>
-        </VnPaginate>
-        <QPageSticky position="bottom-right" :offset="[25, 25]" v-if="addNote">
-            <QBtn color="primary" icon="add" size="lg" round @click="noteModal = true" />
-        </QPageSticky>
-        <QDialog v-model="noteModal" @hide="newNote = ''">
-            <QCard>
-                <QCardSection>
-                    <QItem class="q-px-none">
-                        <span class="text-primary text-h6 full-width">
-                            <QIcon name="draft" class="q-mr-xs" />
-                            {{ t('Add note') }}
-                        </span>
-                        <QBtn icon="close" flat round dense v-close-popup />
-                    </QItem>
-                </QCardSection>
-                <QCardSection>
+        <QCardSection class="q-pa-xs q-my-none q-py-none" horizontal>
             <QInput
-                        autofocus
+                v-model="newNote"
+                class="full-width"
                 type="textarea"
                 :label="t('Add note here...')"
                 filled
                 size="lg"
                 autogrow
-                        v-model="newNote"
-                    ></QInput>
-                </QCardSection>
-                <QCardActions class="justify-end q-mr-sm">
-                    <QBtn
+                autofocus
+                @keyup.ctrl.enter.stop="insert"
+                clearable
+            >
+                <template #append
+                    ><QBtn
+                        :title="t('Save (ctrl + Enter)')"
+                        icon="save"
+                        color="primary"
                         flat
-                        :label="t('globals.close')"
-                        color="primary"
-                        v-close-popup
-                    />
-                    <QBtn
-                        :label="t('globals.save')"
-                        color="primary"
-                        v-close-popup
                         @click="insert"
                     />
-                </QCardActions>
+                </template>
+            </QInput>
+        </QCardSection>
     </QCard>
-        </QDialog>
+    <VnPaginate
+        :data-key="$props.url"
+        :url="$props.url"
+        order="created DESC"
+        :limit="0"
+        :filter="$props.filter"
+        auto-load
+        ref="vnPaginateRef"
+        class="show"
+        v-bind="$attrs"
+    >
+        <template #body="{ rows }">
+            <TransitionGroup name="list" tag="div" class="column items-center full-width">
+                <QCard
+                    class="q-pa-xs q-mb-sm full-width"
+                    v-for="(note, index) in rows"
+                    :key="note.id ?? index"
+                >
+                    <QCardSection horizontal>
+                        <VnAvatar
+                            :descriptor="false"
+                            :worker-id="note.workerFk"
+                            size="md"
+                        />
+                        <div class="full-width row justify-between q-pa-xs">
+                            <VnUserLink
+                                :name="`${note.worker.user.nickname}`"
+                                :worker-id="note.worker.id"
+                            />
+                            {{ toDateHourMin(note.created) }}
                         </div>
+                    </QCardSection>
+                    <QCardSection class="q-pa-xs q-my-none q-py-none">
+                        {{ note.text }}
+                    </QCardSection>
+                </QCard>
+            </TransitionGroup>
+        </template>
+    </VnPaginate>
 </template>
 <style lang="scss" scoped>
 .q-card {
@@ -128,9 +116,20 @@ async function insert() {
 .q-dialog .q-card {
     width: 400px;
 }
+.list-enter-active,
+.list-leave-active {
+    transition: all 1s ease;
+}
+.list-enter-from,
+.list-leave-to {
+    opacity: 0;
+    background-color: $primary;
+}
 </style>
 <i18n>
     es:
         Add note here...: Añadir nota aquí...
-        Add note: Añadir nota
+        New note: Nueva nota
+        Save (ctrl + Enter): Guardar (Ctrl + Intro)
+
 </i18n>

src/components/ui/VnPaginate.vue

@@ -61,7 +61,6 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate']);
-defineExpose({ fetch });
 const isLoading = ref(false);
 const pagination = ref({
     sortBy: props.order,
@@ -91,9 +90,13 @@ watch(
     }
 );
 
+const addFilter = async (filter, params) => {
+    await arrayData.addFilter({ filter, params });
+};
+
 async function fetch() {
     await arrayData.fetch({ append: false });
-    if (!arrayData.hasMoreData.value) {
+    if (!store.hasMoreData) {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
@@ -106,11 +109,10 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-
-    if (!arrayData.hasMoreData.value) {
-        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
+    if (!store.hasMoreData) {
+        if (store.userParamsChanged) store.hasMoreData = true;
         store.userParamsChanged = false;
-        isLoading.value = false;
+        endPagination();
         return;
     }
 
@@ -120,16 +122,16 @@ async function paginate() {
     pagination.value.sortBy = sortBy;
     pagination.value.descending = descending;
 
-    isLoading.value = false;
+    endPagination();
+}
 
+function endPagination() {
+    isLoading.value = false;
     emit('onFetch', store.data);
     emit('onPaginate');
 }
-
 async function onLoad(index, done) {
-    if (!store.data) {
-        return done();
-    }
+    if (!store.data) return done();
 
     if (store.data.length === 0 || !props.url) return done(false);
 
@@ -137,9 +139,11 @@ async function onLoad(index, done) {
 
     await paginate();
     let isDone = false;
-    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
+    if (store.userParamsChanged) isDone = !store.hasMoreData;
     done(isDone);
 }
+
+defineExpose({ fetch, addFilter });
 </script>
 
 <template>
@@ -179,8 +183,8 @@ async function onLoad(index, done) {
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
         class="full-width"
+        :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
@@ -188,6 +192,12 @@ async function onLoad(index, done) {
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
+    <div
+        v-if="!isLoading && store.hasMoreData"
+        class="w-full flex justify-center q-mt-md"
+    >
+        <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
+    </div>
 </template>
 
 <style lang="scss" scoped>
@@ -204,4 +214,5 @@ async function onLoad(index, done) {
 es:
     No data to display: Sin datos que mostrar
     No results found: No se han encontrado resultados
+    Load more data: Cargar más resultados
 </i18n>

src/components/ui/VnRow.vue

@@ -1,17 +1,17 @@
 <template>
-    <div id="row" class="q-gutter-md q-mb-md">
+    <div class="vn-row q-gutter-md q-mb-md">
         <slot></slot>
     </div>
 </template>
 <style lang="scss" scopped>
-#row {
+.vn-row {
     display: flex;
     > * {
         flex: 1;
     }
 }
 @media screen and (max-width: 800px) {
-    #row {
+    .vn-row {
         flex-direction: column;
     }
 }

src/components/ui/VnSearchbar.vue

@@ -1,11 +1,9 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useArrayData } from 'composables/useArrayData';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
 
@@ -68,9 +66,8 @@ const props = defineProps({
 });
 
 const router = useRouter();
-const route = useRoute();
 const arrayData = useArrayData(props.dataKey, { ...props });
-const store = arrayData.store;
+const { store } = arrayData;
 const searchText = ref('');
 
 onMounted(() => {
@@ -92,23 +89,31 @@ async function search() {
     });
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName) {
-        router.push({
+    if (props.customRouteRedirectName)
+        return router.push({
             name: props.customRouteRedirectName,
             params: { id: searchText.value },
         });
-        return;
-    }
 
-    const { matched: matches } = route;
-    const { path } = matches[matches.length - 1];
-    const newRoute = path.replace(':id', searchText.value);
-    await router.push(newRoute);
+    const { matched: matches } = router.currentRoute.value;
+    const { path } = matches.at(-1);
+    const [, moduleName] = path.split('/');
+
+    if (!store.data.length || store.data.length > 1)
+        return router.push({ path: `/${moduleName}/list` });
+
+    const targetId = store.data[0].id;
+    let targetUrl;
+
+    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
+    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
+
+    await router.push({ path: targetUrl });
 }
 </script>
 
 <template>
-    <QForm @submit="search">
+    <QForm @submit="search" id="searchbarForm">
         <VnInput
             id="searchbar"
             v-model="searchText"
@@ -126,13 +131,6 @@ async function search() {
                 />
             </template>
             <template #append>
-                <QIcon
-                    v-if="searchText !== ''"
-                    name="close"
-                    @click="searchText = ''"
-                    class="cursor-pointer"
-                />
-
                 <QIcon
                     v-if="props.info && $q.screen.gt.xs"
                     name="info"

src/components/ui/VnSubToolbar.vue

@@ -1,11 +1,27 @@
 <script setup>
-import { onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
-
 const stateStore = useStateStore();
+const actions = ref(null);
+const data = ref(null);
+const opts = { subtree: true, childList: true, attributes: true };
+const hasContent = ref(false);
 
 onMounted(() => {
     stateStore.toggleSubToolbar();
+    actions.value = document.querySelector('#st-actions');
+    data.value = document.querySelector('#st-data');
+
+    if (!actions.value && !data.value) return;
+
+    // Check if there's content to display
+    const observer = new MutationObserver(
+        () =>
+            (hasContent.value =
+                actions.value.childNodes.length + data.value.childNodes.length)
+    );
+    if (actions.value) observer.observe(actions.value, opts);
+    if (data.value) observer.observe(data.value, opts);
 });
 
 onUnmounted(() => {
@@ -14,7 +30,10 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <QToolbar class="justify-end sticky">
+    <QToolbar
+        class="justify-end sticky"
+        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
+    >
         <slot name="st-data">
             <div id="st-data"></div>
         </slot>
@@ -24,6 +43,11 @@ onUnmounted(() => {
         </slot>
     </QToolbar>
 </template>
+<style lang="scss">
+.q-toolbar {
+    background: var(--vn-section-color);
+}
+</style>
 <style lang="scss" scoped>
 .sticky {
     position: sticky;

src/components/ui/VnTree.vue

@@ -76,7 +76,7 @@ const removeNode = (node) => {
                 notify(t('department.departmentRemoved'), 'positive');
                 await fetchNodeLeaves(parentFk);
             } catch (err) {
-                console.log('Error removing department');
+                console.error('Error removing department');
             }
         });
 };

src/components/ui/VnUserLink.vue

@@ -1,5 +1,6 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { useI18n } from 'vue-i18n';
 
 const $props = defineProps({

src/composables/downloadFile.js

@@ -1,11 +1,11 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
 
-const {getTokenMultimedia} = useSession();
+const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
-export async function downloadFile(dmsId) {
+export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
     let appUrl = await getUrl('', 'lilium');
     appUrl = appUrl.replace('/#/', '');
-    window.open(`${appUrl}/api/dms/${dmsId}/downloadFile?access_token=${token}`);
+    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
 }

src/composables/elementIsVisibleInViewport.js

@@ -0,0 +1,6 @@
+export const elementIsVisibleInViewport = (el) => {
+    const { top, left, bottom, right } = el.getBoundingClientRect();
+    const { innerHeight, innerWidth } = window;
+
+    return top >= 0 && left >= 0 && bottom <= innerHeight && right <= innerWidth;
+};

src/composables/getDateQBadgeColor.js

@@ -0,0 +1,11 @@
+export function getDateQBadgeColor(date) {
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+    let timeTicket = new Date(date);
+    timeTicket.setHours(0, 0, 0, 0);
+
+    let comparation = today - timeTicket;
+
+    if (comparation == 0) return 'warning';
+    if (comparation < 0) return 'negative';
+}

src/composables/useArrayData.js

@@ -1,5 +1,5 @@
 import { onMounted, ref, computed } from 'vue';
-import { useRouter, useRoute } from 'vue-router';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
 import { buildFilter } from 'filters/filterPanel';
@@ -9,13 +9,9 @@ const arrayDataStore = useArrayDataStore();
 export function useArrayData(key, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
-    if (!arrayDataStore.get(key)) {
-        arrayDataStore.set(key);
-    }
+    if (!arrayDataStore.get(key)) arrayDataStore.set(key);
 
     const store = arrayDataStore.get(key);
-    const hasMoreData = ref(false);
-    const router = useRouter();
     const route = useRoute();
     let canceller = null;
 
@@ -23,6 +19,7 @@ export function useArrayData(key, userOptions) {
 
     onMounted(() => {
         setOptions();
+        store.skip = 0;
 
         const query = route.query;
         if (query.params) {
@@ -30,9 +27,7 @@ export function useArrayData(key, userOptions) {
         }
     });
 
-    if (key && userOptions) {
-        setOptions();
-    }
+    if (key && userOptions) setOptions();
 
     function setOptions() {
         const allowedOptions = [
@@ -97,15 +92,14 @@ export function useArrayData(key, userOptions) {
         });
 
         const { limit } = filter;
-
-        hasMoreData.value = response.data.length === limit;
+        store.hasMoreData = limit && response.data.length >= limit;
 
         if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]'))
+            if (!document.querySelectorAll('[role="dialog"]').length)
                 updateRouter && updateStateParams();
         }
 
@@ -145,6 +139,8 @@ export function useArrayData(key, userOptions) {
         store.userParams = userParams;
         store.skip = 0;
         store.filter.skip = 0;
+        page.value = 1;
+
         await fetch({ append: false });
         return { filter, params };
     }
@@ -155,9 +151,10 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[
-                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
-                    ];
+                    const key = Object.keys(
+                        exprBuilder && exprBuilder(param) ? exprBuilder(param) : param
+                    );
+                    if (key[0]) delete store.filter.where[key[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
@@ -168,7 +165,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function loadMore() {
-        if (!hasMoreData.value) return;
+        if (!store.hasMoreData) return;
 
         store.skip = store.limit * page.value;
         page.value += 1;
@@ -188,11 +185,15 @@ export function useArrayData(key, userOptions) {
         if (store.userParams && Object.keys(store.userParams).length !== 0)
             query.params = JSON.stringify(store.userParams);
 
-        if (router)
-            router.replace({
-                path: route.path,
-                query: query,
-            });
+        const url = new URL(window.location.href);
+        const { hash: currentHash } = url;
+        const [currentRoute] = currentHash.split('?');
+
+        const params = new URLSearchParams();
+        for (const param in query) params.append(param, query[param]);
+
+        url.hash = currentRoute + '?' + params.toString();
+        window.history.pushState({}, '', url.hash);
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);
@@ -206,7 +207,6 @@ export function useArrayData(key, userOptions) {
         destroy,
         loadMore,
         store,
-        hasMoreData,
         totalRows,
         updateStateParams,
         isLoading,

src/composables/usePrintService.js

@@ -4,7 +4,7 @@ import { useQuasar } from 'quasar';
 
 export function usePrintService() {
     const quasar = useQuasar();
-    const { getToken } = useSession();
+    const { getTokenMultimedia } = useSession();
 
     function sendEmail(path, params) {
         return axios.post(path, params).then(() =>
@@ -19,7 +19,7 @@ export function usePrintService() {
     function openReport(path, params) {
         params = Object.assign(
             {
-                access_token: getToken(),
+                access_token: getTokenMultimedia(),
             },
             params
         );

src/composables/useSession.js

@@ -3,31 +3,29 @@ import { useRole } from './useRole';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
+const TOKEN_MULTIMEDIA = 'tokenMultimedia';
+const TOKEN = 'token';
 
 export function useSession() {
     const { notify } = useNotify();
 
     function getToken() {
-        const localToken = localStorage.getItem('token');
-        const sessionToken = sessionStorage.getItem('token');
+        const localToken = localStorage.getItem(TOKEN);
+        const sessionToken = sessionStorage.getItem(TOKEN);
 
         return localToken || sessionToken || '';
     }
     function getTokenMultimedia() {
-        const localTokenMultimedia = localStorage.getItem('tokenMultimedia');
-        const sessionTokenMultimedia = sessionStorage.getItem('tokenMultimedia');
+        const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
+        const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
 
         return localTokenMultimedia || sessionTokenMultimedia || '';
     }
 
     function setToken(data) {
-        if (data.keepLogin) {
-            localStorage.setItem('token', data.token);
-            localStorage.setItem('tokenMultimedia', data.tokenMultimedia);
-        } else {
-            sessionStorage.setItem('token', data.token);
-            sessionStorage.setItem('tokenMultimedia', data.tokenMultimedia);
-        }
+        const storage = data.keepLogin ? localStorage : sessionStorage;
+        storage.setItem(TOKEN, data.token);
+        storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
     }
     async function destroyToken(url, storage, key) {
         if (storage.getItem(key)) {
@@ -71,8 +69,8 @@ export function useSession() {
     }
 
     function isLoggedIn() {
-        const localToken = localStorage.getItem('token');
-        const sessionToken = sessionStorage.getItem('token');
+        const localToken = localStorage.getItem(TOKEN);
+        const sessionToken = sessionStorage.getItem(TOKEN);
 
         return !!(localToken || sessionToken);
     }

src/css/app.scss

@@ -1,5 +1,6 @@
 // app global css in SCSS form
 @import './icons.scss';
+@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
 
 body.body--light {
     --font-color: black;
@@ -14,21 +15,15 @@ body.body--light {
     .q-header .q-toolbar {
         color: var(--font-color);
     }
-    .q-card,
-    .q-table,
-    .q-table__bottom,
-    .q-drawer {
-        background-color: var(--vn-section-color);
-    }
 }
-
 body.body--dark {
-    --vn-section-color: #403c3c;
+    --vn-page-color: #222;
+    --vn-section-color: #3d3d3d;
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
 
-    background-color: #222;
+    background-color: var(--vn-page-color);
 }
 
 a {
@@ -76,6 +71,13 @@ select:-webkit-autofill {
 .bg-vn-section-color {
     background-color: var(--vn-section-color);
 }
+.bg-hover {
+    background-color: #666666;
+}
+
+.color-vn-label {
+    color: var(--vn-label);
+}
 
 .color-vn-text {
     color: var(--vn-text-color);
@@ -85,12 +87,21 @@ select:-webkit-autofill {
     color: $white;
 }
 
+.card-width {
+    max-width: 800px;
+    width: 100%;
+}
+
 .vn-card {
     background-color: var(--vn-section-color);
     color: var(--vn-text-color);
     border-radius: 8px;
 }
 
+.card-width {
+    width: 770px;
+}
+
 .vn-card-list {
     width: 100%;
     max-width: 60em;
@@ -108,6 +119,11 @@ select:-webkit-autofill {
     font-variation-settings: 'FILL' 1;
 }
 
+.fill-icon-on-hover:hover {
+    font-variation-settings: 'FILL' 1;
+    cursor: pointer;
+}
+
 .vn-table-separation-row {
     height: 16px !important;
     background-color: var(--vn-section-color) !important;
@@ -118,9 +134,49 @@ select:-webkit-autofill {
     content: ' *';
 }
 
-.q-chip {
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
+.q-checkbox {
+    & .q-checkbox__label {
+        color: var(--vn-text-color);
+    }
+    & .q-checkbox__inner {
+        color: var(--vn-label-color);
+    }
+}
+
+.tr-header {
+    color: var(--vn-label-color);
+}
+
+.q-chip,
+.q-notification__message,
+.q-notification__icon {
     color: black;
 }
+.q-notification--standard.bg-negative {
+    background-color: #fa3939 !important;
+}
+.q-notification--standard.bg-positive {
+    background-color: #a3d131 !important;
+}
+
+.q-tooltip {
+    background-color: var(--vn-page-color);
+    color: var(--font-color);
+    font-size: medium;
+}
+
+.q-card__actions {
+    justify-content: center;
+}
+
+/* q-notification row items-stretch q-notification--standard bg-negative text-white */
 
 input[type='number'] {
     -moz-appearance: textfield;
@@ -131,3 +187,7 @@ input::-webkit-inner-spin-button {
     -webkit-appearance: none;
     -moz-appearance: none;
 }
+
+.q-scrollarea__content {
+    max-width: 100%;
+}

src/css/fonts/icon.svg

@@ -80,7 +80,7 @@
 <glyph unicode="&#xe94b;" glyph-name="consignatarios" d="M409.6-64v349.867h204.8v-349.867h256v563.2h153.6l-512 460.8-512-460.8h153.6v-563.2h256z" />
 <glyph unicode="&#xe94c;" glyph-name="control" d="M418.133 315.733l-128-123.733 256-256 469.333 469.333-128 128-341.333-341.333zM546.133 311.467l34.133 34.133h-68.267zM230.4 128l-59.733 64 153.6 153.6h-68.267v102.4h426.667l204.8 204.8 85.333-85.333v187.733c0 55.467-46.933 102.4-102.4 102.4h-213.333c-21.333 59.733-76.8 102.4-145.067 102.4s-123.733-42.667-145.067-102.4h-213.333c-55.467 0-102.4-46.933-102.4-102.4v-716.8c0-55.467 46.933-102.4 102.4-102.4h273.067l-196.267 192zM512 857.6c29.867 0 51.2-21.333 51.2-51.2s-21.333-51.2-51.2-51.2-51.2 21.333-51.2 51.2c0 29.867 21.333 51.2 51.2 51.2zM256 652.8h512v-102.4h-512v102.4zM665.6-64h204.8c55.467 0 102.4 46.933 102.4 102.4v204.8l-307.2-307.2z" />
 <glyph unicode="&#xe94d;" glyph-name="credit" d="M921.6 849.067h-819.2c-55.467 0-102.4-42.667-102.4-98.133v-601.6c0-55.467 46.933-102.4 102.4-102.4h819.2c55.467 0 102.4 42.667 102.4 102.4v601.6c0 55.467-46.933 98.133-102.4 98.133zM921.6 145.067h-819.2v302.933h819.2v-302.933zM921.6 648.533h-819.2v102.4h819.2v-102.4z" />
-<glyph unicode="&#xe94e;" glyph-name="deaulter" d="M677.973-64c-30.72 35.84-61.867 70.827-91.307 107.52-40.96 51.2-80.64 103.253-121.173 154.88-16.64 21.333-21.76 20.48-30.72-4.693-13.227-36.693-25.6-73.387-40.107-109.653-5.12-12.8-13.227-26.88-24.32-34.56-51.627-34.987-104.107-69.12-157.867-100.693-10.667-6.4-30.72-5.547-41.813 0.853-8.107 4.693-12.373 23.893-11.093 35.84 0.853 8.96 11.093 19.627 19.627 25.6 39.253 26.453 78.933 51.627 119.040 76.8 18.347 11.52 30.293 26.027 35.84 47.787 12.373 48.213 27.307 95.573 39.253 143.36 8.533 33.707 26.88 58.88 56.32 77.227 40.533 25.173 80.64 52.053 120.747 78.507 6.4 4.267 10.24 11.52 15.36 17.493-7.253 2.56-14.933 7.253-22.187 6.827-75.52-6.4-151.467-13.227-226.987-20.48-2.133 0-4.693-0.853-6.827-0.853-22.613-1.707-39.253 10.24-40.96 29.867s12.373 33.707 35.413 35.84c45.227 4.267 90.88 8.96 136.107 12.8 65.707 5.547 131.84 10.667 197.547 15.36 26.027 1.707 53.76-21.76 67.413-55.467 9.813-23.893 5.12-46.080-18.347-65.28-49.92-40.107-100.693-78.933-151.040-118.187-23.040-17.92-23.893-23.467-6.4-46.507 58.453-78.080 116.48-156.587 174.933-234.667 27.307-36.693 25.173-50.773-12.373-75.52-5.12 0-9.813 0-14.080 0zM791.893 649.813c-43.093 1.28-76.373-31.573-77.227-75.52-0.853-44.373 29.44-76.8 72.107-77.653 45.227-1.28 77.653 29.44 78.080 73.813 0.427 45.227-29.44 78.080-72.96 79.36zM671.147 737.707c0-72.107-34.133-136.107-87.467-176.64l-235.52-21.76c-72.107 36.693-122.027 111.787-122.027 198.4 0 122.88 99.84 222.293 222.72 222.293 122.453 0 222.293-99.413 222.293-222.293zM592.213 680.533l-50.347 18.347c-2.133-8.533-5.12-16.213-9.813-22.613-5.12-6.4-10.24-11.947-16.213-17.067-5.973-4.267-12.373-8.107-19.2-11.093s-13.653-4.693-20.053-5.547c-17.92-2.987-33.707-0.427-48.64 6.827s-26.88 18.347-36.693 32.853l76.373 12.373 7.253 32.427-97.28-15.787c-1.28 5.547-2.987 11.093-3.84 16.64l-0.853 4.267 99.413 16.213 7.253 32.427-106.667-17.493c0.853 9.387 2.987 17.493 6.4 26.027 3.84 8.533 8.107 16.213 14.080 23.040 5.547 6.827 12.8 12.373 21.333 17.067s17.92 8.107 28.587 9.813c6.827 1.28 13.227 1.707 20.907 1.28s14.507-1.707 21.333-3.84c6.827-2.133 13.653-5.973 20.053-10.24 5.973-4.693 11.947-11.093 17.493-18.773l38.827 37.973c-13.227 17.92-30.293 31.147-52.053 39.253-21.76 8.533-46.080 10.667-73.387 6.4-19.627-2.987-36.267-9.387-51.2-17.92-14.507-8.533-26.88-19.2-37.547-32-10.667-12.373-18.773-26.027-23.893-40.96-5.547-14.507-8.96-29.867-9.813-45.653l-21.76-3.84-7.253-32.427 29.013 4.693 0.427-2.987c1.28-6.827 2.56-12.8 4.267-18.347l-23.467-3.84-8.107-32.427 43.52 7.253c6.827-13.653 15.787-26.027 26.027-36.693 10.24-11.52 22.187-20.48 35.413-27.733 13.227-7.68 27.307-12.8 42.667-15.787s31.573-3.413 47.36-0.853c12.373 2.133 24.32 5.12 35.84 10.667s22.613 11.52 32.853 19.2c10.24 8.107 18.347 16.64 26.027 26.453 6.827 9.387 12.373 20.48 15.36 32.427z" />
+<glyph unicode="&#xe94e;" glyph-name="defaulter" d="M677.973-64c-30.72 35.84-61.867 70.827-91.307 107.52-40.96 51.2-80.64 103.253-121.173 154.88-16.64 21.333-21.76 20.48-30.72-4.693-13.227-36.693-25.6-73.387-40.107-109.653-5.12-12.8-13.227-26.88-24.32-34.56-51.627-34.987-104.107-69.12-157.867-100.693-10.667-6.4-30.72-5.547-41.813 0.853-8.107 4.693-12.373 23.893-11.093 35.84 0.853 8.96 11.093 19.627 19.627 25.6 39.253 26.453 78.933 51.627 119.040 76.8 18.347 11.52 30.293 26.027 35.84 47.787 12.373 48.213 27.307 95.573 39.253 143.36 8.533 33.707 26.88 58.88 56.32 77.227 40.533 25.173 80.64 52.053 120.747 78.507 6.4 4.267 10.24 11.52 15.36 17.493-7.253 2.56-14.933 7.253-22.187 6.827-75.52-6.4-151.467-13.227-226.987-20.48-2.133 0-4.693-0.853-6.827-0.853-22.613-1.707-39.253 10.24-40.96 29.867s12.373 33.707 35.413 35.84c45.227 4.267 90.88 8.96 136.107 12.8 65.707 5.547 131.84 10.667 197.547 15.36 26.027 1.707 53.76-21.76 67.413-55.467 9.813-23.893 5.12-46.080-18.347-65.28-49.92-40.107-100.693-78.933-151.040-118.187-23.040-17.92-23.893-23.467-6.4-46.507 58.453-78.080 116.48-156.587 174.933-234.667 27.307-36.693 25.173-50.773-12.373-75.52-5.12 0-9.813 0-14.080 0zM791.893 649.813c-43.093 1.28-76.373-31.573-77.227-75.52-0.853-44.373 29.44-76.8 72.107-77.653 45.227-1.28 77.653 29.44 78.080 73.813 0.427 45.227-29.44 78.080-72.96 79.36zM671.147 737.707c0-72.107-34.133-136.107-87.467-176.64l-235.52-21.76c-72.107 36.693-122.027 111.787-122.027 198.4 0 122.88 99.84 222.293 222.72 222.293 122.453 0 222.293-99.413 222.293-222.293zM592.213 680.533l-50.347 18.347c-2.133-8.533-5.12-16.213-9.813-22.613-5.12-6.4-10.24-11.947-16.213-17.067-5.973-4.267-12.373-8.107-19.2-11.093s-13.653-4.693-20.053-5.547c-17.92-2.987-33.707-0.427-48.64 6.827s-26.88 18.347-36.693 32.853l76.373 12.373 7.253 32.427-97.28-15.787c-1.28 5.547-2.987 11.093-3.84 16.64l-0.853 4.267 99.413 16.213 7.253 32.427-106.667-17.493c0.853 9.387 2.987 17.493 6.4 26.027 3.84 8.533 8.107 16.213 14.080 23.040 5.547 6.827 12.8 12.373 21.333 17.067s17.92 8.107 28.587 9.813c6.827 1.28 13.227 1.707 20.907 1.28s14.507-1.707 21.333-3.84c6.827-2.133 13.653-5.973 20.053-10.24 5.973-4.693 11.947-11.093 17.493-18.773l38.827 37.973c-13.227 17.92-30.293 31.147-52.053 39.253-21.76 8.533-46.080 10.667-73.387 6.4-19.627-2.987-36.267-9.387-51.2-17.92-14.507-8.533-26.88-19.2-37.547-32-10.667-12.373-18.773-26.027-23.893-40.96-5.547-14.507-8.96-29.867-9.813-45.653l-21.76-3.84-7.253-32.427 29.013 4.693 0.427-2.987c1.28-6.827 2.56-12.8 4.267-18.347l-23.467-3.84-8.107-32.427 43.52 7.253c6.827-13.653 15.787-26.027 26.027-36.693 10.24-11.52 22.187-20.48 35.413-27.733 13.227-7.68 27.307-12.8 42.667-15.787s31.573-3.413 47.36-0.853c12.373 2.133 24.32 5.12 35.84 10.667s22.613 11.52 32.853 19.2c10.24 8.107 18.347 16.64 26.027 26.453 6.827 9.387 12.373 20.48 15.36 32.427z" />
 <glyph unicode="&#xe94f;" glyph-name="deletedTicket" d="M160.672 85.696h693.248v639.776c0 0-2.016 234.528-349.696 234.528s-343.552-234.528-343.552-234.528v-639.776zM291.328 652.704h170.976v152.256h102.336v-152.256h171.008v-102.336h-171.008v-356.96h-102.336v356.96h-170.976v102.336zM64 61.056v-123.456h899.008v123.456h-899.008z" />
 <glyph unicode="&#xe950;" glyph-name="deleteline" d="M354.133 192l-98.133 98.133 157.867 153.6-157.867 157.867 98.133 102.4 157.867-157.867 157.867 153.6 98.133-98.133-157.867-157.867 157.867-153.6-98.133-98.133-157.867 157.867-157.867-157.867zM780.8 507.733l-64-64 59.733-55.467h247.467v119.467h-243.2zM307.2 443.733l-64 64h-243.2v-119.467h251.733l55.467 55.467z" />
 <glyph unicode="&#xe951;" glyph-name="delivery" d="M789.333 264.533c-55.467 0-102.4-46.933-102.4-102.4s46.933-102.4 102.4-102.4 102.4 46.933 102.4 102.4c0 59.733-46.933 102.4-102.4 102.4zM789.333 110.933c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2 51.2-21.333 51.2-51.2c0-25.6-25.6-51.2-51.2-51.2zM251.733 264.533c-55.467 0-102.4-46.933-102.4-102.4s46.933-102.4 102.4-102.4c55.467 0 102.4 46.933 102.4 102.4 0 59.733-46.933 102.4-102.4 102.4zM251.733 110.933c-29.867 0-51.2 21.333-51.2 51.2s21.333 51.2 51.2 51.2c29.867 0 51.2-21.333 51.2-51.2 0-25.6-25.6-51.2-51.2-51.2zM1006.933 537.6l-196.267 192c-12.8 12.8-29.867 17.067-46.933 17.067h-98.133v38.4c0 25.6-21.333 51.2-51.2 51.2h-563.2c-29.867 0-51.2-21.333-51.2-51.2v-554.667c0-29.867 25.6-51.2 51.2-51.2h68.267c8.533 64 64 115.2 132.267 115.2 64 0 123.733-51.2 132.267-115.2h268.8c8.533 64 64 115.2 132.267 115.2s128-51.2 136.533-115.2h51.2c29.867 0 51.2 25.6 51.2 51.2v260.267c0 17.067-8.533 34.133-17.067 46.933zM725.333 682.667c0 4.267 4.267 8.533 8.533 8.533h34.133c0 0 4.267 0 4.267-4.267l153.6-145.067c4.267 0 0-12.8-4.267-12.8h-187.733c-8.533 0-8.533 4.267-8.533 8.533v145.067zM311.467 597.333c0 46.933 29.867 85.333 59.733 93.867 4.267 0 4.267 0 8.533 0l98.133 12.8v-51.2c0-46.933-29.867-85.333-59.733-93.867-4.267 0-4.267 0-8.533 0l-98.133-17.067v55.467zM311.467 516.267l46.933 8.533c17.067 4.267 29.867-17.067 29.867-38.4l4.267-29.867-51.2-4.267c-17.067-4.267-29.867 12.8-29.867 38.4v25.6zM149.333 597.333v51.2l85.333 12.8c34.133 4.267 55.467-25.6 55.467-72.533v-51.2l-85.333-12.8c-34.133 0-59.733 29.867-55.467 72.533zM285.867 512v-38.4c0-34.133-21.333-64-42.667-68.267h-4.267l-72.533-8.533v38.4c0 34.133 21.333 64 42.667 68.267h4.267l72.533 8.533z" />

src/css/icons.scss

@@ -10,7 +10,8 @@
     font-display: block;
 }
 
-[class^="icon-"], [class*=" icon-"] {
+[class^='icon-'],
+[class*=' icon-'] {
     /* use !important to prevent issues with browser extensions that change fonts */
     font-family: 'icon' !important;
     speak: never;
@@ -26,377 +27,392 @@
 }
 
 .icon-100:before {
-  content: "\e926";
+    content: '\e926';
 }
 .icon-Client_unpaid:before {
-  content: "\e925";
+    content: '\e925';
+}
+.icon-Client_unpaid:before {
+    content: '\e925';
 }
 .icon-History:before {
-  content: "\e964";
+    content: '\e964';
 }
 .icon-Person:before {
-  content: "\e984";
+    content: '\e984';
 }
 .icon-accessory:before {
-  content: "\e948";
+    content: '\e948';
 }
 .icon-account:before {
-  content: "\e927";
+    content: '\e927';
 }
 .icon-actions:before {
-  content: "\e928";
+    content: '\e928';
 }
 .icon-addperson:before {
-  content: "\e929";
+    content: '\e929';
 }
 .icon-agency:before {
-  content: "\e92a";
+    content: '\e92a';
+}
+.icon-agency:before {
+    content: '\e92a';
 }
 .icon-agency-term:before {
-  content: "\e92b";
+    content: '\e92b';
 }
 .icon-albaran:before {
-  content: "\e92c";
+    content: '\e92c';
+}
+.icon-albaran:before {
+    content: '\e92c';
 }
 .icon-anonymous:before {
-  content: "\e92d";
+    content: '\e92d';
 }
 .icon-apps:before {
-  content: "\e92e";
+    content: '\e92e';
 }
 .icon-artificial:before {
-  content: "\e92f";
+    content: '\e92f';
 }
 .icon-attach:before {
-  content: "\e930";
+    content: '\e930';
 }
 .icon-barcode:before {
-  content: "\e932";
+    content: '\e932';
 }
 .icon-basket:before {
-  content: "\e933";
+    content: '\e933';
 }
 .icon-basketadd:before {
-  content: "\e934";
+    content: '\e934';
 }
 .icon-bin:before {
-  content: "\e935";
+    content: '\e935';
 }
 .icon-botanical:before {
-  content: "\e936";
+    content: '\e936';
 }
 .icon-bucket:before {
-  content: "\e937";
+    content: '\e937';
 }
 .icon-buscaman:before {
-  content: "\e938";
+    content: '\e938';
 }
 .icon-buyrequest:before {
-  content: "\e939";
+    content: '\e939';
 }
 .icon-calc_volum:before {
-  content: "\e93a";
+    content: '\e93a';
 }
 .icon-calendar:before {
-  content: "\e940";
+    content: '\e940';
 }
 .icon-catalog:before {
-  content: "\e941";
+    content: '\e941';
 }
 .icon-claims:before {
-  content: "\e942";
+    content: '\e942';
 }
 .icon-client:before {
-  content: "\e943";
+    content: '\e943';
 }
 .icon-clone:before {
-  content: "\e945";
+    content: '\e945';
 }
 .icon-columnadd:before {
-  content: "\e946";
+    content: '\e946';
 }
 .icon-columndelete:before {
-  content: "\e947";
+    content: '\e947';
 }
 .icon-components:before {
-  content: "\e949";
+    content: '\e949';
 }
 .icon-consignatarios:before {
-  content: "\e94b";
+    content: '\e94b';
 }
 .icon-control:before {
-  content: "\e94c";
+    content: '\e94c';
 }
 .icon-credit:before {
-  content: "\e94d";
+    content: '\e94d';
 }
-.icon-deaulter:before {
-  content: "\e94e";
+.icon-defaulter:before {
+    content: '\e94e';
 }
 .icon-deletedTicket:before {
-  content: "\e94f";
+    content: '\e94f';
 }
 .icon-deleteline:before {
-  content: "\e950";
+    content: '\e950';
 }
 .icon-delivery:before {
-  content: "\e951";
+    content: '\e951';
 }
 .icon-deliveryprices:before {
-  content: "\e952";
+    content: '\e952';
 }
 .icon-details:before {
-  content: "\e954";
+    content: '\e954';
 }
 .icon-dfiscales:before {
-  content: "\e955";
+    content: '\e955';
 }
 .icon-disabled:before {
-  content: "\e965";
+    content: '\e965';
 }
 .icon-doc:before {
-  content: "\e956";
+    content: '\e956';
 }
 .icon-entry:before {
-  content: "\e958";
+    content: '\e958';
 }
 .icon-exit:before {
-  content: "\e959";
+    content: '\e959';
 }
 .icon-eye:before {
-  content: "\e95a";
+    content: '\e95a';
 }
 .icon-fixedPrice:before {
-  content: "\e95b";
+    content: '\e95b';
 }
 .icon-flower:before {
-  content: "\e95c";
+    content: '\e95c';
 }
 .icon-frozen:before {
-  content: "\e95d";
+    content: '\e95d';
 }
 .icon-fruit:before {
-  content: "\e95e";
+    content: '\e95e';
 }
 .icon-funeral:before {
-  content: "\e95f";
+    content: '\e95f';
 }
 .icon-grafana:before {
-  content: "\e931";
+    content: '\e931';
+}
+.icon-grafana:before {
+    content: '\e931';
 }
 .icon-greenery:before {
-  content: "\e91e";
+    content: '\e91e';
 }
 .icon-greuge:before {
-  content: "\e960";
+    content: '\e960';
 }
 .icon-grid:before {
-  content: "\e961";
+    content: '\e961';
 }
 .icon-handmade:before {
-  content: "\e94a";
+    content: '\e94a';
 }
 .icon-handmadeArtificial:before {
-  content: "\e962";
+    content: '\e962';
 }
 .icon-headercol:before {
-  content: "\e963";
+    content: '\e963';
 }
 .icon-info:before {
-  content: "\e966";
+    content: '\e966';
 }
 .icon-inventory:before {
-  content: "\e967";
+    content: '\e967';
 }
 .icon-invoice:before {
-  content: "\e969";
+    content: '\e969';
 }
 .icon-invoice-in:before {
-  content: "\e96a";
+    content: '\e96a';
 }
 .icon-invoice-in-create:before {
-  content: "\e96b";
+    content: '\e96b';
 }
 .icon-invoice-out:before {
-  content: "\e96c";
+    content: '\e96c';
 }
 .icon-isTooLittle:before {
-  content: "\e96e";
+    content: '\e96e';
 }
 .icon-item:before {
-  content: "\e96f";
+    content: '\e96f';
 }
 .icon-languaje:before {
-  content: "\e912";
+    content: '\e912';
 }
 .icon-lines:before {
-  content: "\e971";
+    content: '\e971';
 }
 .icon-linesprepaired:before {
-  content: "\e972";
+    content: '\e972';
 }
 .icon-link-to-corrected:before {
-  content: "\e900";
+    content: '\e900';
 }
 .icon-link-to-correcting:before {
-  content: "\e906";
+    content: '\e906';
 }
 .icon-logout:before {
-  content: "\e90a";
+    content: '\e90a';
 }
 .icon-mana:before {
-  content: "\e974";
+    content: '\e974';
 }
 .icon-mandatory:before {
-  content: "\e975";
+    content: '\e975';
 }
 .icon-net:before {
-  content: "\e976";
+    content: '\e976';
 }
 .icon-newalbaran:before {
-  content: "\e977";
+    content: '\e977';
 }
 .icon-niche:before {
-  content: "\e979";
+    content: '\e979';
 }
 .icon-no036:before {
-  content: "\e97a";
+    content: '\e97a';
 }
 .icon-noPayMethod:before {
-  content: "\e97b";
+    content: '\e97b';
 }
 .icon-notes:before {
-  content: "\e97c";
+    content: '\e97c';
 }
 .icon-noweb:before {
-  content: "\e97e";
+    content: '\e97e';
 }
 .icon-onlinepayment:before {
-  content: "\e97f";
+    content: '\e97f';
 }
 .icon-package:before {
-  content: "\e980";
+    content: '\e980';
 }
 .icon-payment:before {
-  content: "\e982";
+    content: '\e982';
 }
 .icon-pbx:before {
-  content: "\e983";
+    content: '\e983';
 }
 .icon-pets:before {
-  content: "\e985";
+    content: '\e985';
 }
 .icon-photo:before {
-  content: "\e986";
+    content: '\e986';
 }
 .icon-plant:before {
-  content: "\e987";
+    content: '\e987';
 }
 .icon-polizon:before {
-  content: "\e989";
+    content: '\e989';
 }
 .icon-preserved:before {
-  content: "\e98a";
+    content: '\e98a';
 }
 .icon-recovery:before {
-  content: "\e98b";
+    content: '\e98b';
 }
 .icon-regentry:before {
-  content: "\e901";
+    content: '\e901';
 }
 .icon-reserva:before {
-  content: "\e902";
+    content: '\e902';
 }
 .icon-revision:before {
-  content: "\e903";
+    content: '\e903';
 }
 .icon-risk:before {
-  content: "\e904";
+    content: '\e904';
 }
 .icon-services:before {
-  content: "\e905";
+    content: '\e905';
 }
 .icon-settings:before {
-  content: "\e907";
+    content: '\e907';
 }
 .icon-shipment:before {
-  content: "\e908";
+    content: '\e908';
 }
 .icon-sign:before {
-  content: "\e909";
+    content: '\e909';
 }
 .icon-sms:before {
-  content: "\e90b";
+    content: '\e90b';
 }
 .icon-solclaim:before {
-  content: "\e90c";
+    content: '\e90c';
 }
 .icon-solunion:before {
-  content: "\e90d";
+    content: '\e90d';
 }
 .icon-splitline:before {
-  content: "\e90e";
+    content: '\e90e';
 }
 .icon-splur:before {
-  content: "\e90f";
+    content: '\e90f';
 }
 .icon-stowaway:before {
-  content: "\e910";
+    content: '\e910';
 }
 .icon-supplier:before {
-  content: "\e911";
+    content: '\e911';
 }
 .icon-supplierfalse:before {
-  content: "\e913";
+    content: '\e913';
 }
 .icon-tags:before {
-  content: "\e914";
+    content: '\e914';
 }
 .icon-tax:before {
-  content: "\e915";
+    content: '\e915';
 }
 .icon-thermometer:before {
-  content: "\e916";
+    content: '\e916';
 }
 .icon-ticket:before {
-  content: "\e917";
+    content: '\e917';
 }
 .icon-ticketAdd:before {
-  content: "\e918";
+    content: '\e918';
 }
 .icon-traceability:before {
-  content: "\e919";
+    content: '\e919';
 }
 .icon-transaction:before {
-  content: "\e93b";
+    content: '\e93b';
+}
+.icon-transaction:before {
+    content: '\e93b';
 }
 .icon-treatments:before {
-  content: "\e91c";
+    content: '\e91c';
 }
 .icon-trolley:before {
-  content: "\e91a";
+    content: '\e91a';
 }
 .icon-troncales:before {
-  content: "\e91b";
+    content: '\e91b';
 }
 .icon-unavailable:before {
-  content: "\e91d";
+    content: '\e91d';
 }
 .icon-volume:before {
-  content: "\e91f";
+    content: '\e91f';
 }
 .icon-wand:before {
-  content: "\e920";
+    content: '\e920';
 }
 .icon-web:before {
-  content: "\e921";
+    content: '\e921';
 }
 .icon-wiki:before {
-  content: "\e922";
+    content: '\e922';
 }
 .icon-worker:before {
-  content: "\e923";
+    content: '\e923';
 }
 .icon-zone:before {
-  content: "\e924";
+    content: '\e924';
 }

src/css/quasar.variables.scss

@@ -22,7 +22,7 @@ $warning: #f4b974;
 $success: $positive;
 $alert: $negative;
 $white: #fff;
-$dark: #3c3b3b;
+$dark: #3d3d3d;
 // custom
 $color-link: #66bfff;
 $color-spacer-light: #a3a3a31f;

src/filters/date.js

@@ -26,11 +26,11 @@ export function isValidDate(date) {
  * // returns "02/12/2022"
  * toDateFormat(new Date(2022, 11, 2));
  */
-export function toDateFormat(date) {
+export function toDateFormat(date, locale = 'es-ES') {
     if (!isValidDate(date)) {
         return '';
     }
-    return new Date(date).toLocaleDateString('es-ES', {
+    return new Date(date).toLocaleDateString(locale, {
         year: 'numeric',
         month: '2-digit',
         day: '2-digit',
@@ -56,7 +56,7 @@ export function toTimeFormat(date, showSeconds = false) {
     if (!isValidDate(date)) {
         return '';
     }
-    return new Date(date).toLocaleDateString('es-ES', {
+    return new Date(date).toLocaleTimeString('es-ES', {
         hour: '2-digit',
         minute: '2-digit',
         second: showSeconds ? '2-digit' : undefined,
@@ -91,3 +91,42 @@ export function toDateTimeFormat(date, showSeconds = false) {
         second: showSeconds ? '2-digit' : undefined,
     });
 }
+
+/**
+ * Converts seconds to a formatted string representing hours and minutes (hh:mm).
+ * @param {number} seconds - The number of seconds to convert.
+ * @param {boolean} includeHSuffix - Optional parameter indicating whether to include "h." after the hour.
+ * @returns {string} A string representing the time in the format "hh:mm" with optional "h." suffix.
+ */
+export function secondsToHoursMinutes(seconds, includeHSuffix = true) {
+    if (!seconds) return includeHSuffix ? '00:00 h.' : '00:00';
+
+    const hours = Math.floor(seconds / 3600);
+    const remainingMinutes = seconds % 3600;
+    const minutes = Math.floor(remainingMinutes / 60);
+    const formattedHours = hours < 10 ? '0' + hours : hours;
+    const formattedMinutes = minutes < 10 ? '0' + minutes : minutes;
+
+    // Append "h." if includeHSuffix is true
+    const suffix = includeHSuffix ? ' h.' : '';
+    // Return formatted string
+    return formattedHours + ':' + formattedMinutes + suffix;
+}
+
+export function getTimeDifferenceWithToday(date) {
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    date = new Date(date);
+    date.setHours(0, 0, 0, 0);
+
+    return today - date;
+}
+
+export function isLower(date) {
+    return getTimeDifferenceWithToday(date) > 0;
+}
+
+export function isBigger(date) {
+    return getTimeDifferenceWithToday(date) < 0;
+}

src/filters/index.js

@@ -1,7 +1,8 @@
 import toLowerCase from './toLowerCase';
 import toDate from './toDate';
 import toDateString from './toDateString';
-import toDateHour from './toDateHour';
+import toDateHourMin from './toDateHourMin';
+import toDateHourMinSec from './toDateHourMinSec';
 import toRelativeDate from './toRelativeDate';
 import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
@@ -16,7 +17,8 @@ export {
     toDate,
     toHour,
     toDateString,
-    toDateHour,
+    toDateHourMin,
+    toDateHourMinSec,
     toRelativeDate,
     toCurrency,
     toPercentage,

src/filters/toDateHourMin.js

@@ -0,0 +1,11 @@
+export default function toDateHourMin(date) {
+    const dateHour = new Date(date).toLocaleDateString('es-ES', {
+        timeZone: 'Europe/Madrid',
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+    });
+    return dateHour;
+}

src/filters/toDateHourMinSec.js

@@ -1,4 +1,4 @@
-export default function toDateHour(date) {
+export default function toDateHourMinSec(date) {
     const dateHour = new Date(date).toLocaleDateString('es-ES', {
         timeZone: 'Europe/Madrid',
         year: 'numeric',

src/i18n/index.js

@@ -1,9 +1,28 @@
-import en from './en';
-import es from './es';
-export const localeEquivalence = {
-     'en':'en-GB'
+const files = import.meta.glob(`./locale/*.yml`);
+const modules = import.meta.glob(`../pages/**/locale/*.yml`);
+
+const translations = {};
+
+for (const file in files) {
+    const lang = file.split('/').at(2).split('.')[0];
+
+    files[file]()
+        .then((g) => {
+            translations[lang] = g.default;
+        })
+        .finally(() => {
+            const actualLang = lang + '.yml';
+            for (const module in modules) {
+                if (!module.endsWith(actualLang)) continue;
+                modules[module]().then((t) => {
+                    Object.assign(translations[lang], t.default);
+                })
+            }
+    });
 }
-export default {
-    en: en,
-    es: es,
+
+export const localeEquivalence = {
+    en: 'en-GB',
 };
+
+export default translations;

src/pages/Agency/AgencyList.vue

@@ -0,0 +1,79 @@
+<script setup>
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const router = useRouter();
+const stateStore = useStateStore();
+function navigate(id) {
+    router.push({ path: `/agency/${id}` });
+}
+function exprBuilder(param, value) {
+    if (!value) return;
+    if (param !== 'search') return;
+
+    if (!isNaN(value)) return { id: value };
+
+    return { name: { like: `%${value}%` } };
+}
+</script>
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                :info="t('You can search by name')"
+                :label="t('Search agency')"
+                data-key="AgencyList"
+                url="Agencies"
+            />
+        </Teleport>
+    </template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyList"
+                url="Agencies"
+                order="name"
+                :expr-builder="exprBuilder"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate(row.id)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <QCheckbox
+                                :label="t('isOwn')"
+                                v-model="row.isOwn"
+                                :disable="true"
+                            />
+                            <QCheckbox
+                                :label="t('isAnyVolumeAllowed')"
+                                v-model="row.isAnyVolumeAllowed"
+                                :disable="true"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>

src/pages/Agency/Card/AgencyBasicData.vue

@@ -0,0 +1,52 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const routeId = route.params?.id || null;
+const warehouses = ref([]);
+</script>
+<template>
+    <FetchData
+        url="warehouses"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
+    <FormModel :url="`Agencies/${routeId}`" model="agency" auto-load>
+        <template #form="{ data }">
+            <VnRow>
+                <VnInput v-model="data.name" :label="t('globals.name')" />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    v-model="data.warehouseFk"
+                    option-value="id"
+                    option-label="name"
+                    :label="t('globals.warehouse')"
+                    :options="warehouses"
+                    use-input
+                    input-debounce="0"
+                    :is-clearable="false"
+                />
+            </VnRow>
+            <VnRow>
+                <QCheckbox :label="t('agency.isOwn')" v-model="data.isOwn" />
+            </VnRow>
+            <VnRow>
+                <QCheckbox
+                    :label="t('agency.isAnyVolumeAllowed')"
+                    v-model="data.isAnyVolumeAllowed"
+                />
+            </VnRow>
+        </template>
+    </FormModel>
+</template>

src/pages/Agency/Card/AgencyCard.vue

@@ -0,0 +1,35 @@
+<script setup>
+import { onMounted, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useArrayData } from 'src/composables/useArrayData';
+
+import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
+import VnCard from 'components/common/VnCard.vue';
+
+const route = useRoute();
+const arrayData = useArrayData('Agency', {
+    url: `Agencies/${route.params.id}`,
+});
+const { store } = arrayData;
+onMounted(async () => await arrayData.fetch({ append: false }));
+watch(
+    () => route.params.id,
+    async (newId) => {
+        if (newId) {
+            store.url = `Agencies/${newId}`;
+            await arrayData.fetch({ append: false });
+        }
+    }
+);
+</script>
+<template>
+    <VnCard
+        data-key="Agency"
+        base-url="Agencies"
+        :descriptor="AgencyDescriptor"
+        searchbar-data-key="AgencyList"
+        searchbar-url="Agencies"
+        searchbar-label="agency.searchBar.label"
+        searchbar-info="agency.searchBar.info"
+    />
+</template>

src/pages/Agency/Card/AgencyDescriptor.vue

@@ -0,0 +1,35 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { useArrayData } from 'src/composables/useArrayData';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+const { params } = useRoute();
+const entityId = computed(() => props.id || params.id);
+const { store } = useArrayData('Parking');
+const card = computed(() => store.data);
+</script>
+<template>
+    <CardDescriptor
+        module="Agency"
+        data-key="Agency"
+        :url="`Agencies/${entityId}`"
+        :title="card?.name"
+        :subtitle="props.id"
+    >
+        <template #body="{ entity: agency }">
+            <VnLv :label="t('globals.name')" :value="agency.name" />
+        </template>
+    </CardDescriptor>
+</template>

src/pages/Agency/Card/AgencyLog.vue

@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Agency" url="/AgencyLogs" />
+</template>

src/pages/Agency/Card/AgencyModes.vue

@@ -0,0 +1,60 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardList from 'src/components/ui/CardList.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const routeId = route.params.id;
+</script>
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyModes"
+                :url="`AgencyModes`"
+                :filter="{ where: { agencyFk: routeId } }"
+                order="name"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <VnLv
+                                :label="t('globals.description')"
+                                :value="row?.description"
+                            />
+                            <VnLv
+                                :label="t('deliveryMethod')"
+                                :value="row?.deliveryMethodFk"
+                            />
+                            <VnLv label="m3" :value="row?.m3" />
+                            <VnLv :label="t('inflation')" :value="row?.inflation" />
+                            <VnLv :label="t('globals.code')" :value="row?.code" />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+        deliveryMethod: Método de entrega
+        inflation: Inflación
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>

src/pages/Agency/Card/AgencySummary.vue

@@ -0,0 +1,55 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'src/components/FetchData.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const { params } = useRoute();
+const { t } = useI18n();
+const entityId = computed(() => $props.id || params.id);
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+
+<template>
+    <div class="q-pa-md">
+        <CardSummary :url="`Agencies/${entityId}`">
+            <template #header="{ entity: agency }">{{ agency.name }}</template>
+            <template #body="{ entity: agency }">
+                <QCard class="vn-one">
+                    <QCardSection class="q-pa-none">
+                        <VnTitle
+                            :url="`#/agency/${entityId}/basic-data`"
+                            :text="t('globals.pageTitles.basicData')"
+                        />
+                    </QCardSection>
+                    <VnLv :label="t('globals.name')" :value="agency.name" />
+                    <QCheckbox
+                        :label="t('agency.isOwn')"
+                        v-model="agency.isOwn"
+                        :disable="true"
+                    />
+                    <QCheckbox
+                        :label="t('agency.isAnyVolumeAllowed')"
+                        v-model="agency.isAnyVolumeAllowed"
+                        :disable="true"
+                    />
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>

src/pages/Agency/Card/AgencyWorkcenter.vue

@@ -0,0 +1,136 @@
+<script setup>
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'src/components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const paginate = ref();
+const dialog = ref();
+const routeId = computed(() => route.params.id);
+const quasar = useQuasar();
+
+const initialData = computed(() => {
+    return {
+        agencyFk: routeId.value,
+        workCenterFk: null,
+    };
+});
+
+async function deleteWorCenter(id) {
+    try {
+        await axios.delete(`AgencyWorkCenters/${id}`).then(async () => {
+            quasar.notify({
+                message: t('agency.notification.removeItem'),
+                type: 'positive',
+            });
+        });
+    } catch (error) {
+        quasar.notify({
+            message: t('agency.notification.removeItemError'),
+            type: 'error',
+        });
+    }
+    paginate.value.fetch();
+}
+</script>
+<template>
+    <div class="centerCard">
+        <FetchData
+            url="workCenters"
+            sort-by="name"
+            @on-fetch="(data) => (warehouses = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="AgencyWorkCenters"
+            url="AgencyWorkCenters"
+            :filter="{ where: { agencyFk: routeId } }"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-pa-md q-mb-sm"
+                >
+                    <QItem>
+                        <QItemSection side-left>
+                            <VnLv :value="row?.workCenter?.name" icon="delete" />
+                        </QItemSection>
+                        <QItemSection side>
+                            <QBtn
+                                @click.stop="deleteWorCenter(row.id)"
+                                icon="delete"
+                                color="primary"
+                                round
+                                flat
+                            />
+                        </QItemSection>
+                    </QItem>
+                </QCard>
+            </template>
+        </VnPaginate>
+    </div>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+            <QDialog ref="dialog">
+                <FormModelPopup
+                    :title="t('Add work center')"
+                    url-create="AgencyWorkCenters"
+                    model="AgencyWorkCenter"
+                    :form-initial-data="initialData"
+                    @on-data-saved="paginate.fetch()"
+                >
+                    <template #form-inputs="{ data }">
+                        <VnRow class="row q-gutter-md q-mb-md">
+                            <VnSelect
+                                v-model="data.workCenterFk"
+                                option-value="id"
+                                option-label="name"
+                                :label="t('workCenter')"
+                                :options="warehouses"
+                                use-input
+                                input-debounce="0"
+                                :is-clearable="false"
+                            />
+                        </VnRow>
+                    </template>
+                </FormModelPopup>
+            </QDialog>
+        </QBtn>
+        <QTooltip>
+            {{ t('globals.new') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+<style lang="scss" scoped>
+.centerCard {
+    padding: 5%;
+    width: 100%;
+    max-width: 50%;
+    margin: 0 auto;
+}
+</style>
+<i18n>
+    es:
+        workCenter removed successfully: Centro de trabajo eliminado correctamente
+        This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
+        Add work center: Añadir centro de trabajo
+        workCenter: Centro de trabajo
+</i18n>

src/pages/Agency/locale/en.yml

@@ -0,0 +1,11 @@
+agency:
+    isOwn: Own
+    isAnyVolumeAllowed: Any volume allowed
+    notification:
+        removeItemError: Error removing agency
+        removeItem: WorkCenter removed successfully
+    pageTitles:
+        agency: Agency
+    searchBar:
+        info: You can search by agency code
+        label: Search agency...

src/pages/Agency/locale/es.yml

@@ -0,0 +1,12 @@
+agency:
+    isOwn: Propio
+    isAnyVolumeAllowed: Cualquier volumen
+    removeItem: Agencia eliminada correctamente
+    notification:
+        removeItemError: Error al eliminar la agencia
+        removeItem: Centro de trabajo eliminado correctamente
+    pageTitles:
+        agency: Agencia
+    searchBar:
+        info: Puedes buscar por nombre o id
+        label: Buscar agencia...

src/pages/Claim/Card/ClaimAction.vue

@@ -9,7 +9,7 @@ import { toDate, toPercentage, toCurrency } from 'filters/index';
 import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -291,8 +291,6 @@ async function importToNewRefundTicket() {
                 selection="multiple"
                 v-model:selected="selectedRows"
                 :grid="$q.screen.lt.md"
-                :pagination="{ rowsPerPage: 0 }"
-                :hide-bottom="true"
             >
                 <template #body-cell-ticket="{ value }">
                     <QTd align="center">
@@ -304,7 +302,7 @@ async function importToNewRefundTicket() {
                 </template>
                 <template #body-cell-destination="{ row }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row.claimDestinationFk"
                             :options="destinationTypes"
                             option-label="description"
@@ -346,7 +344,7 @@ async function importToNewRefundTicket() {
                                     </QItemSection>
                                     <QItemSection side>
                                         <QItemLabel v-if="column.name === 'destination'">
-                                            <VnSelectFilter
+                                            <VnSelect
                                                 v-model="props.row.claimDestinationFk"
                                                 :options="destinationTypes"
                                                 option-label="description"
@@ -420,7 +418,7 @@ async function importToNewRefundTicket() {
                 </QItem>
             </QCardSection>
             <QItemSection>
-                <VnSelectFilter
+                <VnSelect
                     class="q-pa-sm"
                     v-model="claimDestinationFk"
                     :options="destinationTypes"

src/pages/Claim/Card/ClaimBasicData.vue

@@ -9,6 +9,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
+import axios from 'axios';
 import { useSession } from 'src/composables/useSession';
 
 const route = useRoute();
@@ -24,7 +25,7 @@ const claimFilter = {
         'workerFk',
         'claimStateFk',
         'packages',
-        'hasToPickUp',
+        'pickup',
     ],
     include: [
         {
@@ -50,6 +51,20 @@ function setClaimStates(data) {
     claimStates.value = data;
     claimStatesCopy.value = data;
 }
+let optionsList;
+async function getEnumValues() {
+    optionsList = [{ id: null, description: t('claim.basicData.null') }];
+    const { data } = await axios.get(`Applications/get-enum-values`, {
+        params: {
+            schema: 'vn',
+            table: 'claim',
+            column: 'pickup',
+        },
+    });
+    for (let value of data)
+        optionsList.push({ id: value, description: t(`claim.basicData.${value}`) });
+}
+getEnumValues();
 
 const workerFilter = {
     options: workers,
@@ -168,13 +183,19 @@ const statesFilter = {
                         type="number"
                     />
                 </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QCheckbox
-                        v-model="data.hasToPickUp"
-                        :label="t('claim.basicData.picked')"
-                    />
+                    <QSelect
+                        v-model="data.pickup"
+                        :options="optionsList"
+                        option-value="id"
+                        option-label="description"
+                        emit-value
+                        :label="t('claim.basicData.pickup')"
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                    </QSelect>
                 </div>
             </VnRow>
         </template>

src/pages/Claim/Card/ClaimCard.vue

@@ -1,46 +1,15 @@
 <script setup>
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
-import { useI18n } from 'vue-i18n';
+import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="ClaimList"
-            url="Claims/filter"
-            :label="t('Search claim')"
-            :info="t('You can search by claim id or customer name')"
+    <VnCard
+        data-key="Claim"
+        base-url="Claims"
+        :descriptor="ClaimDescriptor"
+        searchbar-data-key="ClaimList"
+        searchbar-url="Claims/filter"
+        searchbar-label="Search claim"
+        searchbar-info="You can search by claim id or customer name"
     />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ClaimDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
 </template>
-
-<i18n>
-es:
-    Search claim: Buscar reclamación
-    You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
-    Details: Detalles
-    Notes: Notas
-    Action: Acción
-</i18n>

src/pages/Claim/Card/ClaimDevelopment.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import { tMobile } from 'composables/tMobile';
 
 const route = useRoute();
@@ -150,10 +150,8 @@ const columns = computed(() => [
             <QTable
                 :columns="columns"
                 :rows="rows"
-                :pagination="{ rowsPerPage: 0 }"
                 row-key="$index"
                 selection="multiple"
-                hide-pagination
                 v-model:selected="selected"
                 :grid="$q.screen.lt.md"
                 table-header-class="text-left"
@@ -163,7 +161,7 @@ const columns = computed(() => [
                         auto-width
                         @keyup.ctrl.enter.stop="claimDevelopmentForm.saveChanges()"
                     >
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -183,7 +181,7 @@ const columns = computed(() => [
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #item="props">
@@ -200,7 +198,7 @@ const columns = computed(() => [
                             <QList dense>
                                 <QItem v-for="col in props.cols" :key="col.name">
                                     <QItemSection>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             :label="col.label"
                                             v-model="props.row[col.model]"
                                             :options="col.options"

src/pages/Claim/Card/ClaimLines.vue

@@ -121,11 +121,6 @@ async function fetchMana() {
     mana.value = response.data;
 }
 
-async function updateQuantity({ id, quantity }) {
-    if (!id) return;
-    await axios.patch(`ClaimBeginnings/${id}`, { quantity });
-}
-
 async function updateDiscount({ saleFk, discount, canceller }) {
     const body = { salesIds: [saleFk], newDiscount: discount };
     const claimId = claim.value.ticketFk;
@@ -155,6 +150,10 @@ function showImportDialog() {
         })
         .onOk(() => claimLinesForm.value.reload());
 }
+
+function saveWhenHasChanges() {
+    claimLinesForm.value.getChanges().updates && claimLinesForm.value.onSubmit();
+}
 </script>
 <template>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
@@ -181,8 +180,7 @@ function showImportDialog() {
         @on-fetch="onFetchClaim"
         auto-load
     />
-    <div class="column items-center">
-        <div class="list">
+    <div class="q-pa-md">
         <CrudModel
             data-key="ClaimLines"
             ref="claimLinesForm"
@@ -195,39 +193,27 @@ function showImportDialog() {
             :default-save="false"
             :default-reset="false"
             auto-load
+            :limit="0"
         >
             <template #body="{ rows }">
                 <QTable
                     :columns="columns"
                     :rows="rows"
                     :dense="$q.screen.lt.md"
-                        :pagination="{ rowsPerPage: 0 }"
                     row-key="id"
                     selection="multiple"
                     v-model:selected="selected"
-                        hide-pagination
                     :grid="$q.screen.lt.md"
                 >
-                        <template #body-cell-claimed="{ row, value }">
+                    <template #body-cell-claimed="{ row }">
                         <QTd auto-width align="right" class="text-primary">
-                                <span>{{ value }}</span>
-
-                                <QPopupEdit
-                                    v-model="row.quantity"
-                                    v-slot="scope"
-                                    :title="t('Claimed quantity')"
-                                    @update:model-value="updateQuantity(row)"
-                                    buttons
-                                >
                             <QInput
-                                        v-model="scope.value"
+                                v-model="row.quantity"
                                 type="number"
                                 dense
-                                        autofocus
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
+                                @keyup.enter="saveWhenHasChanges()"
+                                @blur="saveWhenHasChanges()"
                             />
-                                </QPopupEdit>
                         </QTd>
                     </template>
                     <template #body-cell-description="{ row, value }">
@@ -274,32 +260,18 @@ function showImportDialog() {
                                             </QItemLabel>
                                         </QItemSection>
                                         <QItemSection side>
-                                                <template
-                                                    v-if="column.name === 'claimed'"
-                                                >
+                                            <template v-if="column.name === 'claimed'">
                                                 <QItemLabel class="text-primary">
-                                                        {{ column.value }}
-                                                        <QPopupEdit
-                                                            v-model="props.row.quantity"
-                                                            v-slot="scope"
-                                                            :title="t('Claimed quantity')"
-                                                            @update:model-value="
-                                                                updateQuantity(props.row)
-                                                            "
-                                                            buttons
-                                                        >
                                                     <QInput
-                                                                v-model="scope.value"
+                                                        v-model="props.row.quantity"
                                                         type="number"
                                                         dense
                                                         autofocus
-                                                                @keyup.enter="scope.set"
-                                                                @focus="
-                                                                    ($event) =>
-                                                                        $event.target.select()
+                                                        @keyup.enter="
+                                                            saveWhenHasChanges()
                                                         "
+                                                        @blur="saveWhenHasChanges()"
                                                     />
-                                                        </QPopupEdit>
                                                 </QItemLabel>
                                             </template>
                                             <template
@@ -338,7 +310,6 @@ function showImportDialog() {
             </template>
         </CrudModel>
     </div>
-    </div>
 
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="showImportDialog()" />

src/pages/Claim/Card/ClaimLinesImport.vue

@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import FetchData from 'components/FetchData.vue';
 import { toDate, toCurrency, toPercentage } from 'filters/index';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import axios from 'axios';
 
 defineEmits([...useDialogPluginComponent.emits]);
@@ -34,6 +35,7 @@ const columns = computed(() => [
         label: t('Quantity'),
         field: (row) => row.quantity,
         sortable: true,
+        default: 0,
     },
     {
         name: 'description',
@@ -74,7 +76,6 @@ async function importLines() {
     const body = sales.map((row) => ({
         claimFk: route.params.id,
         saleFk: row.saleFk,
-        quantity: row.quantity,
     }));
 
     canceller = new AbortController();
@@ -118,16 +119,21 @@ function cancel() {
                 <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>
             <QTable
-                class="my-sticky-header-table"
                 :columns="columns"
                 :rows="claimableSales"
-                :pagination="{ rowsPerPage: 10 }"
                 row-key="saleFk"
                 selection="multiple"
                 v-model:selected="selected"
                 square
                 flat
-            />
+            >
+                <template #body-cell-description="{ row, value }">
+                    <QTd auto-width align="right" class="link">
+                        {{ value }}
+                        <ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy>
+                    </QTd>
+                </template>
+            </QTable>
             <QSeparator />
             <QCardActions align="right">
                 <QBtn :label="t('globals.cancel')" color="primary" flat @click="cancel" />
@@ -149,33 +155,6 @@ function cancel() {
 }
 </style>
 
-<style lang="scss">
-.my-sticky-header-table {
-    height: 400px;
-
-    thead tr th {
-        position: sticky;
-        z-index: 1;
-    }
-
-    thead tr:first-child th {
-        /* this is when the loading indicator appears */
-        top: 0;
-    }
-
-    &.q-table--loading thead tr:last-child th {
-        /* height of all previous header rows */
-        top: 48px;
-    }
-
-    // /* prevent scrolling behind sticky top row on focus */
-    tbody {
-        /* height of all previous header rows */
-        scroll-margin-top: 48px;
-    }
-}
-</style>
-
 <i18n>
 es:
     Available sales lines: Líneas de venta disponibles

src/pages/Claim/Card/ClaimNotes.vue

@@ -16,7 +16,7 @@ const claimId = computed(() => $props.id || route.params.id);
 
 const claimFilter = {
     where: { claimFk: claimId.value },
-    fields: ['created', 'workerFk', 'text'],
+    fields: ['id', 'created', 'workerFk', 'text'],
     include: {
         relation: 'worker',
         scope: {
@@ -38,10 +38,11 @@ const body = {
 </script>
 <template>
     <VnNotes
-        style="overflow-y: auto"
-        :add-note="$props.addNote"
         url="claimObservations"
+        :add-note="$props.addNote"
         :filter="claimFilter"
         :body="body"
+        v-bind="$attrs"
+        style="overflow-y: auto"
     />
 </template>

src/pages/Claim/Card/ClaimSummary.vue

@@ -12,6 +12,7 @@ import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -177,7 +178,7 @@ function openDialog(dmsId) {
         @on-fetch="getClaimDms"
     >
         <template #header="{ entity: { claim } }">
-            {{ claim.id }} - {{ claim.client.name }}
+            {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
             <QCard class="vn-one">
@@ -214,16 +215,15 @@ function openDialog(dmsId) {
                 </VnLv>
                 <VnLv :label="t('claim.summary.customer')">
                     <template #value>
-                        <VnUserLink
-                            :name="claim.client?.name"
-                            :worker-id="claim.client?.id"
-                        />
+                        <span class="link cursor-pointer">
+                            {{ claim.client?.name }}
+                            <CustomerDescriptorProxy :id="claim.clientFk" />
+                        </span>
                     </template>
                 </VnLv>
-                <QCheckbox
-                    :label="t('claim.basicData.picked')"
-                    v-model="claim.hasToPickUp"
-                    :disable="true"
+                <VnLv
+                    :label="t('claim.basicData.pickup')"
+                    :value="t(`claim.basicData.${claim.pickup}`)"
                 />
             </QCard>
             <QCard class="vn-three">
@@ -280,6 +280,48 @@ function openDialog(dmsId) {
                     </template>
                 </QTable>
             </QCard>
+            <QCard class="vn-two" v-if="claimDms.length > 0">
+                <VnTitle
+                    :url="`#/claim/${entityId}/photos`"
+                    :text="t('claim.summary.photos')"
+                />
+                <div class="container">
+                    <div
+                        class="multimedia-container"
+                        v-for="(media, index) of claimDms"
+                        :key="index"
+                    >
+                        <div class="relative-position">
+                            <QIcon
+                                name="play_circle"
+                                color="primary"
+                                size="xl"
+                                class="absolute-center zindex"
+                                v-if="media.isVideo"
+                                @click.stop="openDialog(media.dmsFk)"
+                            >
+                                <QTooltip>Video</QTooltip>
+                            </QIcon>
+                            <QCard class="multimedia relative-position">
+                                <QImg
+                                    :src="media.url"
+                                    class="rounded-borders cursor-pointer fit"
+                                    @click="openDialog(media.dmsFk)"
+                                    v-if="!media.isVideo"
+                                >
+                                </QImg>
+                                <video
+                                    :src="media.url"
+                                    class="rounded-borders cursor-pointer fit"
+                                    muted="muted"
+                                    v-if="media.isVideo"
+                                    @click="openDialog(media.dmsFk)"
+                                />
+                            </QCard>
+                        </div>
+                    </div>
+                </div>
+            </QCard>
             <QCard class="vn-two" v-if="developments.length > 0">
                 <VnTitle
                     :url="claimUrl + 'development'"
@@ -302,49 +344,6 @@ function openDialog(dmsId) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-max" v-if="claimDms.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/photos`"
-                    :text="t('claim.summary.photos')"
-                />
-                <div class="container">
-                    <div
-                        class="multimedia-container"
-                        v-for="(media, index) of claimDms"
-                        :key="index"
-                    >
-                        <div class="relative-position">
-                            <QIcon
-                                name="play_circle"
-                                color="primary"
-                                size="xl"
-                                class="absolute-center zindex"
-                                v-if="media.isVideo"
-                                @click.stop="openDialog(media.dmsFk)"
-                            >
-                                <QTooltip>Video</QTooltip>header
-                            </QIcon>
-                            <QCard class="multimedia relative-position">
-                                <QImg
-                                    :src="media.url"
-                                    class="rounded-borders cursor-pointer fit"
-                                    @click="openDialog(media.dmsFk)"
-                                    v-if="!media.isVideo"
-                                >
-                                </QImg>
-                                <video
-                                    :src="media.url"
-                                    class="rounded-borders cursor-pointer fit"
-                                    muted="muted"
-                                    v-if="media.isVideo"
-                                    @click="openDialog(media.dmsFk)"
-                                />
-                            </QCard>
-                        </div>
-                    </div>
-                </div>
-            </QCard>
-
             <QCard class="vn-max">
                 <VnTitle :url="claimUrl + 'action'" :text="t('claim.summary.actions')" />
                 <div id="slider-container" class="q-px-xl q-py-md">

src/pages/Claim/ClaimFilter.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
@@ -64,7 +64,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
@@ -87,7 +87,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Attender')"
                         v-model="params.attenderFk"
                         @update:model-value="searchFn()"
@@ -110,7 +110,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Responsible')"
                         v-model="params.claimResponsibleFk"
                         @update:model-value="searchFn()"
@@ -133,7 +133,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="states">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('State')"
                         v-model="params.claimStateFk"
                         @update:model-value="searchFn()"

src/pages/Claim/locale/es.yml

@@ -0,0 +1,2 @@
+Search claim: Buscar reclamación
+You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente

src/pages/Customer/Card/CustomerAddress.vue

@@ -1,18 +1,21 @@
 <script setup>
-import { ref } from 'vue';
+import { onBeforeMount, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
+import axios from 'axios';
+
 import FetchData from 'components/FetchData.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
+const addresses = ref([]);
+const client = ref(null);
 const provincesLocation = ref([]);
 
-const consigneeFilter = {
+const addressFilter = {
     fields: [
         'id',
         'isDefaultAddress',
@@ -44,6 +47,42 @@ const consigneeFilter = {
     ],
 };
 
+onBeforeMount(() => {
+    const { id } = route.params;
+    getAddressesData(id);
+    getClientData(id);
+});
+
+watch(
+    () => route.params.id,
+    (newValue) => {
+        if (!newValue) return;
+        getAddressesData(newValue);
+        getClientData(newValue);
+    }
+);
+
+const getAddressesData = async (id) => {
+    try {
+        const { data } = await axios.get(`Clients/${id}/addresses`, {
+            params: { filter: JSON.stringify(addressFilter) },
+        });
+        addresses.value = data;
+        sortAddresses();
+    } catch (error) {
+        return error;
+    }
+};
+
+const getClientData = async (id) => {
+    try {
+        const { data } = await axios.get(`Clients/${id}`);
+        client.value = data;
+    } catch (error) {
+        return error;
+    }
+};
+
 const setProvince = (provinceFk) => {
     const result = provincesLocation.value.filter(
         (province) => province.id === provinceFk
@@ -51,16 +90,38 @@ const setProvince = (provinceFk) => {
     return result[0]?.name || '';
 };
 
-const toCustomerConsigneeCreate = () => {
-    router.push({ name: 'CustomerConsigneeCreate' });
+const isDefaultAddress = (address) => {
+    return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
 
-const toCustomerConsigneeEdit = (consigneeId) => {
+const setDefault = (address) => {
+    const url = `Clients/${route.params.id}`;
+    const payload = { defaultAddressFk: address.id };
+    axios.patch(url, payload).then((res) => {
+        if (res.data) {
+            client.value.defaultAddressFk = res.data.defaultAddressFk;
+            sortAddresses();
+        }
+    });
+};
+
+const sortAddresses = () => {
+    if (!client.value || !addresses.value) return;
+    addresses.value = addresses.value.sort((a, b) => {
+        return isDefaultAddress(b) - isDefaultAddress(a);
+    });
+};
+
+const toCustomerAddressCreate = () => {
+    router.push({ name: 'CustomerAddressCreate' });
+};
+
+const toCustomerAddressEdit = (addressId) => {
     router.push({
-        name: 'CustomerConsigneeEdit',
+        name: 'CustomerAddressEdit',
         params: {
             id: route.params.id,
-            consigneeId,
+            addressId,
         },
     });
 };
@@ -73,26 +134,41 @@ const toCustomerConsigneeEdit = (consigneeId) => {
         url="Provinces/location"
     />
 
-    <QCard class="q-pa-lg">
-        <VnPaginate
-            data-key="CustomerConsignees"
-            :url="`Clients/${route.params.id}/addresses`"
-            order="id"
-            auto-load
-            :filter="consigneeFilter"
-        >
-            <template #body="{ rows }">
-                <QCard
-                    v-for="(item, index) in rows"
+    <div class="full-width flex justify-center">
+        <QCard class="card-width q-pa-lg" v-if="addresses.length">
+            <QCardSection>
+                <div
+                    v-for="(item, index) in addresses"
                     :key="index"
+                    class="address-card"
                     :class="{
-                        'consignees-card': true,
-                        'q-mb-md': index < rows.length - 1,
+                        'q-mb-md': index < addresses.length - 1,
+                        'item-disabled': !item.isActive,
                     }"
-                    @click="toCustomerConsigneeEdit(item.id)"
+                    @click="toCustomerAddressEdit(item.id)"
                 >
                     <div class="q-ml-xs q-mr-md flex items-center">
-                        <QIcon name="star" size="md" color="primary" />
+                        <QIcon
+                            :style="{
+                                'font-variation-settings': `'FILL' ${isDefaultAddress(
+                                    item
+                                )}`,
+                            }"
+                            color="primary"
+                            name="star"
+                            size="md"
+                            @click.stop="!isDefaultAddress(item) && setDefault(item)"
+                        >
+                            <QTooltip>
+                                {{
+                                    t(
+                                        isDefaultAddress(item)
+                                            ? 'Default address'
+                                            : 'Set as default'
+                                    )
+                                }}
+                            </QTooltip>
+                        </QIcon>
                     </div>
                     <div>
                         <div class="text-weight-bold q-mb-sm">
@@ -136,12 +212,13 @@ const toCustomerConsigneeEdit = (consigneeId) => {
                             <div>{{ observation.description }}</div>
                         </div>
                     </div>
+                </div>
+            </QCardSection>
         </QCard>
-            </template>
-        </VnPaginate>
-    </QCard>
+    </div>
+
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerConsigneeCreate()" color="primary" fab icon="add" />
+        <QBtn @click.stop="toCustomerAddressCreate()" color="primary" fab icon="add" />
         <QTooltip>
             {{ t('New consignee') }}
         </QTooltip>
@@ -149,8 +226,8 @@ const toCustomerConsigneeEdit = (consigneeId) => {
 </template>
 
 <style lang="scss" scoped>
-.consignees-card {
-    border: 2px solid var(--vn-accent-color);
+.address-card {
+    border: 2px solid var(--vn-light-gray);
     border-radius: 10px;
     padding: 10px;
     display: flex;
@@ -160,6 +237,10 @@ const toCustomerConsigneeEdit = (consigneeId) => {
         background-color: var(--vn-accent-color);
     }
 }
+
+.item-disabled {
+    opacity: 0.6;
+}
 </style>
 
 <i18n>
@@ -167,4 +248,6 @@ es:
     Is equalizated: Recargo de equivalencia
     Is logiflora allowed: Compra directa en Holanda
     New consignee: Nuevo consignatario
+    Default address: Consignatario predeterminado
+    Set as default: Establecer como predeterminado
 </i18n>