Merge branch 'dev' into 8380-createTestToVnImg

cypress.config.js

@@ -34,5 +34,7 @@ module.exports = defineConfig({
             require('cypress-mochawesome-reporter/plugin')(on);
             // implement node event listeners here
         },
+        viewportWidth: 1280,
+        viewportHeight: 720,
     },
 });

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.04.0",
+    "version": "25.06.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -21,24 +21,24 @@
     },
     "dependencies": {
         "@quasar/cli": "^2.3.0",
-        "@quasar/extras": "^1.16.9",
+        "@quasar/extras": "^1.16.14",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
         "moment": "^2.30.1",
         "pinia": "^2.1.3",
-        "quasar": "^2.14.5",
+        "quasar": "^2.17.4",
         "validator": "^13.9.0",
-        "vue": "^3.3.4",
-        "vue-i18n": "^9.2.2",
-        "vue-router": "^4.2.1"
+        "vue": "^3.5.13",
+        "vue-i18n": "^9.3.0",
+        "vue-router": "^4.2.5"
     },
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
         "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^1.7.3",
+        "@quasar/app-vite": "^1.11.0",
         "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
@@ -52,7 +52,7 @@
         "husky": "^8.0.0",
         "postcss": "^8.4.23",
         "prettier": "^2.8.8",
-        "vitest": "^0.31.1"
+        "vitest": "^0.34.0"
     },
     "engines": {
         "node": "^20 || ^18 || ^16",

src/components/UserPanel.vue

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

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

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

src/components/common/VnDmsList.vue

@@ -299,11 +299,12 @@ defineExpose({
         :url="$props.model"
         :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
-        :auto-load="true"
+        auto-load
         @on-fetch="setData"
     >
         <template #body>
             <QTable
+                v-if="rows"
                 :columns="columns"
                 :rows="rows"
                 class="full-width q-mt-md"

src/components/common/VnInputDate.vue

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

src/components/common/VnInputTime.vue

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

src/components/common/VnLocation.vue

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

src/components/common/VnSection.vue

@@ -52,7 +52,8 @@ const sectionValue = computed(() => $props.section ?? $props.dataKey);
 const isMainSection = computed(() => {
     const isSame = sectionValue.value == route.name;
     if (!isSame && arrayData) {
-        arrayData.reset(['userParams', 'userFilter']);
+        arrayData.reset(['userParams', 'filter']);
+        arrayData.setCurrentFilter();
     }
     return isSame;
 });

src/components/common/VnSelect.vue

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

src/components/common/VnSelectDialog.vue

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

src/components/common/VnSelectWorker.vue

@@ -55,7 +55,7 @@ const url = computed(() => {
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
-            <VnAvatar :worker-id="value" color="primary" :title="title" />
+            <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
         </template>
         <template #append v-if="$props.hasInfo">
             <QIcon name="info" class="cursor-pointer">
@@ -72,7 +72,8 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }},
+                        {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

src/components/ui/CardSummary.vue

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

src/components/ui/VnSearchbar.vue

@@ -113,23 +113,20 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.keys(store.userParams ?? {}).length
-        ? store.userParams
-        : store.defaultParams;
     arrayData.resetPagination();
 
-    const filter = {
-        params: {
-            search: searchText.value,
-        },
-        filter: props.filter,
-    };
+    let filter = { params: { search: searchText.value } };
 
     if (!props.searchRemoveParams || !searchText.value) {
-        filter.params = {
-            ...staticParams,
-            search: searchText.value,
+        filter = {
+            params: {
+                ...store.userParams,
+                search: searchText.value,
+            },
+            filter: store.filter,
         };
+    } else {
+        arrayData.reset(['currentFilter', 'userParams']);
     }
 
     if (props.whereFilter) {

src/composables/useArrayData.js

@@ -33,10 +33,11 @@ export function useArrayData(key, userOptions) {
                     : JSON.parse(params?.filter ?? '{}');
             delete params.filter;
 
-            store.userParams = { ...store.userParams, ...params };
+            store.userParams = params;
             store.filter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }
+        setCurrentFilter();
     });
 
     if (key && userOptions) setOptions();
@@ -78,11 +79,7 @@ export function useArrayData(key, userOptions) {
 
         cancelRequest();
         canceller = new AbortController();
-        const { params, limit } = getCurrentFilter();
-
-        store.currentFilter = JSON.parse(JSON.stringify(params));
-        delete store.currentFilter.filter.include;
-        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
+        const { params, limit } = setCurrentFilter();
 
         let exprFilter;
         if (store?.exprBuilder) {
@@ -107,7 +104,7 @@ export function useArrayData(key, userOptions) {
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect) return;
+            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
         }
         store.isLoading = false;
         canceller = null;
@@ -142,12 +139,12 @@ export function useArrayData(key, userOptions) {
         }
     }
 
-    async function applyFilter({ filter, params }) {
+    async function applyFilter({ filter, params }, fetchOptions = {}) {
         if (filter) store.userFilter = filter;
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch({});
+        const response = await fetch(fetchOptions);
         return response;
     }
 
@@ -276,14 +273,14 @@ export function useArrayData(key, userOptions) {
     }
 
     function getCurrentFilter() {
+        if (!Object.keys(store.userParams).length)
+            store.userParams = store.defaultParams ?? {};
+
         const filter = {
             limit: store.limit,
+            ...store.userFilter,
         };
 
-        let userParams = { ...store.userParams };
-
-        Object.assign(filter, store.userFilter);
-
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -291,7 +288,7 @@ export function useArrayData(key, userOptions) {
         filter.where = where;
         const params = { filter };
 
-        Object.assign(params, userParams);
+        Object.assign(params, store.userParams);
         if (params.filter) params.filter.skip = store.skip;
         if (store?.order && typeof store?.order == 'string') store.order = [store.order];
         if (store.order?.length) params.filter.order = [...store.order];
@@ -300,6 +297,14 @@ export function useArrayData(key, userOptions) {
         return { filter, params, limit: filter.limit };
     }
 
+    function setCurrentFilter() {
+        const { params, limit } = getCurrentFilter();
+        store.currentFilter = JSON.parse(JSON.stringify(params));
+        delete store.currentFilter.filter.include;
+        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
+        return { params, limit };
+    }
+
     function processData(data, { map = true, append = true }) {
         if (!append) {
             store.data = [];
@@ -333,6 +338,7 @@ export function useArrayData(key, userOptions) {
         applyFilter,
         addFilter,
         getCurrentFilter,
+        setCurrentFilter,
         addFilterWhere,
         addOrder,
         deleteOrder,

src/composables/useFilterParams.js

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

src/css/app.scss

@@ -310,6 +310,14 @@ input::-webkit-inner-spin-button {
 .no-visible {
     visibility: hidden;
 }
+
+.q-item > .q-item__section:has(.q-checkbox) {
+    max-width: min-content;
+}
+
+.row > .column:has(.q-checkbox) {
+    max-width: min-content;
+}
 .q-field__inner {
     .q-field__control {
         min-height: auto !important;

src/filters/index.js

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

src/filters/toCelsius.js

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

src/i18n/locale/en.yml

@@ -704,6 +704,7 @@ travel:
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
+            awb: AWB
     summary:
         entryId: Entry Id
         freight: Freight

src/i18n/locale/es.yml

@@ -700,6 +700,7 @@ travel:
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
+            awb: AWB
     summary:
         entryId: Id entrada
         freight: Porte

src/layouts/OutLayout.vue

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

src/pages/Customer/Card/CustomerBillingData.vue

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

src/pages/Customer/Card/CustomerCredits.vue

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

src/pages/Customer/Card/CustomerGreuges.vue

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

src/pages/Customer/CustomerList.vue

@@ -431,7 +431,7 @@ function handleLocation(data, location) {
                 :label="t('customer.summary.salesPerson')"
                 v-model="data.salesPersonFk"
                 :params="{
-                    departmentCodes: ['VT', 'shopping'],
+                    departmentCodes: ['VT'],
                 }"
                 :has-avatar="true"
                 :id-value="data.salesPersonFk"

src/pages/Entry/Card/EntryBasicData.vue

@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -11,7 +10,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
 
 const route = useRoute();
@@ -26,6 +25,7 @@ const onFilterTravelSelected = (formData, id) => {
     formData.travelFk = id;
 };
 </script>
+
 <template>
     <FetchData
         ref="companiesRef"
@@ -93,14 +93,13 @@ const onFilterTravelSelected = (formData, id) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection>
-                                <QItemLabel
-                                    >{{ scope.opt?.agencyModeName }} -
-                                    {{ scope.opt?.warehouseInName }} ({{
-                                        toDate(scope.opt?.shipped)
-                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
-                                        toDate(scope.opt?.landed)
-                                    }})</QItemLabel
-                                >
+                                <QItemLabel>
+                                    {{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.warehouseInName }}
+                                    ({{ toDate(scope.opt?.shipped) }}) →
+                                    {{ scope.opt?.warehouseOutName }}
+                                    ({{ toDate(scope.opt?.landed) }})
+                                </QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>
@@ -126,6 +125,13 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
+                <VnInputNumber
+                    :label="t('entry.summary.commission')"
+                    v-model="data.commission"
+                    step="1"
+                    autofocus
+                    :positive="false"
+                />
                 <VnSelect
                     :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
@@ -133,12 +139,23 @@ const onFilterTravelSelected = (formData, id) => {
                     option-value="id"
                     option-label="code"
                 />
-                <QInput
-                    :label="t('entry.summary.commission')"
-                    v-model="data.commission"
-                    type="number"
-                    autofocus
-                    min="0"
+            </VnRow>
+            <VnRow>
+                <VnInputNumber
+                    v-model="data.initialTemperature"
+                    name="initialTemperature"
+                    :label="t('entry.basicData.initialTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    v-model="data.finalTemperature"
+                    name="finalTemperature"
+                    :label="t('entry.basicData.finalTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
                 />
             </VnRow>
             <VnRow>

src/pages/Entry/Card/EntrySummary.vue

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

src/pages/Entry/EntryList.vue

@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { toDate } from 'src/filters';
+import { toCelsius, toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
@@ -157,6 +157,20 @@ const columns = computed(() => [
         name: 'invoiceAmount',
         cardVisible: true,
     },
+    {
+        align: 'left',
+        name: 'initialTemperature',
+        label: t('entry.basicData.initialTemperature'),
+        field: 'initialTemperature',
+        format: (row) => toCelsius(row.initialTemperature),
+    },
+    {
+        align: 'left',
+        name: 'finalTemperature',
+        label: t('entry.basicData.finalTemperature'),
+        field: 'finalTemperature',
+        format: (row) => toCelsius(row.finalTemperature),
+    },
     {
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
         name: 'isExcludedFromAvailable',
@@ -188,7 +202,7 @@ const columns = computed(() => [
         :array-data-props="{
             url: 'Entries/filter',
             order: 'id DESC',
-            userFilter: 'entryFilter',
+            userFilter: entryFilter,
         }"
     >
         <template #rightMenu>

src/pages/Entry/locale/en.yml

@@ -40,6 +40,8 @@ entry:
         observation: Observation
         booked: Booked
         excludedFromAvailable: Inventory
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observations
         packagingFk: Box

src/pages/Entry/locale/es.yml

@@ -41,6 +41,8 @@ entry:
         commission: Comisión
         booked: Asentado
         excludedFromAvailable: Inventario
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observaciónes
         packagingFk: Embalaje

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -6,24 +6,16 @@ import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const $props = defineProps({ id: { type: Number, default: null } });
-const { push, currentRoute } = useRouter();
+const { currentRoute } = useRouter();
 const { t } = useI18n();
 
 const cardDescriptorRef = ref();
-const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
-const config = ref();
-const cplusRectificationTypes = ref([]);
-const siiTypeInvoiceIns = ref([]);
-const invoiceCorrectionTypes = ref([]);
 
 const filter = {
     include: [
@@ -85,12 +77,6 @@ const routes = reactive({
         return { name: 'EntryCard', params: { id } };
     },
 });
-const correctionFormData = reactive({
-    invoiceReason: 2,
-    invoiceType: 2,
-    invoiceClass: 6,
-});
-const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
 onBeforeMount(async () => {
     await setInvoiceCorrection(entityId.value);
@@ -122,38 +108,8 @@ async function setInvoiceCorrection(id) {
         (corrected) => corrected.correctingFk
     );
 }
-
-const createInvoiceInCorrection = async () => {
-    const { data: correctingId } = await axios.post(
-        'InvoiceIns/corrective',
-        Object.assign(correctionFormData, { id: entityId.value })
-    );
-    push({ path: `/invoice-in/${correctingId}/summary` });
-};
 </script>
 <template>
-    <FetchData
-        url="InvoiceInConfigs"
-        :where="{ fields: ['sageWithholdingFk'] }"
-        auto-load
-        @on-fetch="(data) => (config = data)"
-    />
-    <FetchData
-        url="CplusRectificationTypes"
-        @on-fetch="(data) => (cplusRectificationTypes = data)"
-        auto-load
-    />
-    <FetchData
-        url="SiiTypeInvoiceIns"
-        :where="{ code: { like: 'R%' } }"
-        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
-        auto-load
-    />
-    <FetchData
-        url="InvoiceCorrectionTypes"
-        @on-fetch="(data) => (invoiceCorrectionTypes = data)"
-        auto-load
-    />
     <CardDescriptor
         ref="cardDescriptorRef"
         module="InvoiceIn"
@@ -167,7 +123,10 @@ const createInvoiceInCorrection = async () => {
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
+            <VnLv
+                :label="t('invoicein.summary.bookedDate')"
+                :value="toDate(entity.booked)"
+            />
             <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
             <VnLv :label="t('invoicein.list.supplier')">
                 <template #value>
@@ -227,65 +186,6 @@ const createInvoiceInCorrection = async () => {
             </QCardActions>
         </template>
     </CardDescriptor>
-    <QDialog ref="correctionDialogRef">
-        <QCard>
-            <QCardSection>
-                <QItem class="q-px-none">
-                    <span class="text-primary text-h6 full-width">
-                        {{ t('Create rectificative invoice') }}
-                    </span>
-                    <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
-            </QCardSection>
-            <QCardSection>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            :label="t('Original invoice')"
-                            v-model="entityId"
-                            readonly
-                        />
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.class'))}`"
-                            v-model="correctionFormData.invoiceClass"
-                            :options="siiTypeInvoiceIns"
-                            option-value="id"
-                            option-label="code"
-                            :required="true"
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.type'))}`"
-                            v-model="correctionFormData.invoiceType"
-                            :options="cplusRectificationTypes"
-                            option-value="id"
-                            option-label="description"
-                            :required="true"
-                        />
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.reason'))}`"
-                            v-model="correctionFormData.invoiceReason"
-                            :options="invoiceCorrectionTypes"
-                            option-value="id"
-                            option-label="description"
-                            :required="true"
-                        />
-                    </QItemSection>
-                </QItem>
-            </QCardSection>
-            <QCardActions class="justify-end q-mr-sm">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn
-                    :label="t('globals.save')"
-                    color="primary"
-                    v-close-popup
-                    @click="createInvoiceInCorrection"
-                    :disable="isNotFilled"
-                />
-            </QCardActions>
-        </QCard>
-    </QDialog>
 </template>
 <style lang="scss" scoped>
 .q-dialog {

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -8,9 +8,12 @@ import { useAcl } from 'src/composables/useAcl';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
+import { useCapitalize } from 'src/composables/useCapitalize';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { hasAny } = useAcl();
 const { t } = useI18n();
@@ -31,6 +34,10 @@ const correctionDialogRef = ref();
 const invoiceInCorrection = reactive({ correcting: [], corrected: null });
 const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.id);
 const invoiceIn = computed(() => arrayData.store.data);
+const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
+const invoiceCorrectionTypes = ref([]);
+const cplusRectificationTypes = ref([]);
+const siiTypeInvoiceIns = ref([]);
 const actions = {
     unbook: {
         title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
@@ -48,6 +55,11 @@ const actions = {
     sendPdf: { cb: sendPdfInvoiceConfirmation },
     correct: { cb: () => correctionDialogRef.value.show() },
 };
+const correctionFormData = reactive({
+    invoiceReason: 2,
+    invoiceType: 2,
+    invoiceClass: 8,
+});
 const canEditProp = (props) =>
     hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
 
@@ -133,9 +145,39 @@ function sendPdfInvoice({ address }) {
             recipient: address,
         });
 }
+
+const createInvoiceInCorrection = async () => {
+    const { data: correctingId } = await axios.post(
+        'InvoiceIns/corrective',
+        Object.assign(correctionFormData, { id: entityId.value })
+    );
+    push({ path: `/invoice-in/${correctingId}/summary` });
+};
 </script>
 
 <template>
+    <FetchData
+        url="InvoiceCorrectionTypes"
+        @on-fetch="(data) => (invoiceCorrectionTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="CplusRectificationTypes"
+        @on-fetch="(data) => (cplusRectificationTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="SiiTypeInvoiceIns"
+        :where="{ code: { like: 'R%' } }"
+        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
+        auto-load
+    />
+    <FetchData
+        url="InvoiceInConfigs"
+        :where="{ fields: ['sageWithholdingFk'] }"
+        auto-load
+        @on-fetch="(data) => (config = data)"
+    />
     <InvoiceInToBook>
         <template #content="{ book }">
             <QItem
@@ -162,7 +204,7 @@ function sendPdfInvoice({ address }) {
         v-if="canEditProp('deleteById')"
         v-ripple
         clickable
-        @click="triggerMenu('invoicein.descriptorMenu.delete')"
+        @click="triggerMenu('delete')"
     >
         <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
     </QItem>
@@ -192,6 +234,79 @@ function sendPdfInvoice({ address }) {
     <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
         <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
     </QItem>
+    <QDialog ref="correctionDialogRef">
+        <QCard>
+            <QCardSection>
+                <QItem class="q-px-none">
+                    <span class="text-primary text-h6 full-width">
+                        {{ t('Create rectificative invoice') }}
+                    </span>
+                    <QBtn icon="close" flat round dense v-close-popup />
+                </QItem>
+            </QCardSection>
+            <QCardSection>
+                <QItem>
+                    <QItemSection>
+                        <QInput
+                            :label="t('Original invoice')"
+                            v-model="entityId"
+                            readonly
+                        />
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.class'))}`"
+                            v-model="correctionFormData.invoiceClass"
+                            :options="siiTypeInvoiceIns"
+                            option-value="id"
+                            option-label="code"
+                            :required="true"
+                        />
+                    </QItemSection>
+                    <QItemSection>
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.type'))}`"
+                            v-model="correctionFormData.invoiceType"
+                            :options="cplusRectificationTypes"
+                            option-value="id"
+                            option-label="description"
+                            :required="true"
+                        >
+                            <template #option="{ itemProps, opt }">
+                                <QItem v-bind="itemProps">
+                                    {{ console.log('opt: ', opt) }}
+                                    <QItemSection>
+                                        <QItemLabel
+                                            >{{ opt.id }} -
+                                            {{ opt.description }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                                <div></div>
+                            </template>
+                        </VnSelect>
+
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.reason'))}`"
+                            v-model="correctionFormData.invoiceReason"
+                            :options="invoiceCorrectionTypes"
+                            option-value="id"
+                            option-label="description"
+                            :required="true"
+                        />
+                    </QItemSection>
+                </QItem>
+            </QCardSection>
+            <QCardActions class="justify-end q-mr-sm">
+                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
+                <QBtn
+                    :label="t('globals.save')"
+                    color="primary"
+                    v-close-popup
+                    @click="createInvoiceInCorrection"
+                    :disable="isNotFilled"
+                />
+            </QCardActions>
+        </QCard>
+    </QDialog>
 </template>
 
 <i18n>

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -25,6 +25,7 @@ const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
 const invoiceInFormRef = ref();
+const expenseRef = ref();
 
 defineProps({
     actionIcon: {
@@ -89,6 +90,11 @@ const columns = computed(() => [
         field: (row) => row.foreignValue,
         align: 'left',
     },
+    {
+        name: 'total',
+        label: 'Total',
+        align: 'left',
+    },
 ]);
 
 const filter = {
@@ -128,8 +134,26 @@ function autocompleteExpense(evt, row, col) {
         ({ id }) => id == useAccountShortToStandard(param)
     );
 
-    if (lookup) row[col.model] = lookup;
+    expenseRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
 }
+
+const taxableBaseTotal = computed(() => {   
+    return getTotal(invoiceInFormRef.value.formData, 'taxableBase', );
+});
+
+const taxRateTotal = computed(() => {
+    return getTotal(invoiceInFormRef.value.formData, null, {
+        cb: taxRate,
+    });
+});
+
+
+const combinedTotal = computed(() => {
+    return +taxableBaseTotal.value + +taxRateTotal.value;
+});
+
+
+
 </script>
 <template>
     <FetchData
@@ -167,6 +191,7 @@ function autocompleteExpense(evt, row, col) {
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
                         <VnSelectDialog
+                            ref="expenseRef"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -270,26 +295,20 @@ function autocompleteExpense(evt, row, col) {
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{ getTotal(rows, 'taxableBase', { currency: 'default' }) }}
+                            {{ toCurrency(taxableBaseTotal) }}
                         </QTd>
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{
-                                getTotal(rows, null, { cb: taxRate, currency: 'default' })
-                            }}</QTd
-                        >
+                            {{ toCurrency(taxRateTotal) }}
+                        </QTd>
+                        <QTd />
                         <QTd>
-                            <template v-if="isNotEuro(invoiceIn.currency.code)">
-                                {{
-                                    getTotal(rows, 'foreignValue', {
-                                        currency: invoiceIn.currency.code,
-                                    })
-                                }}
-                            </template>
+                            {{ toCurrency(combinedTotal) }}
                         </QTd>
                     </QTr>
                 </template>
+
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                         <QCard bordered flat class="q-my-xs">

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -68,6 +68,8 @@ function handleLocation(data, location) {
                 'supplierActivityFk',
                 'healthRegister',
                 'street',
+                'isVies',
+                'isTrucker',
             ],
             include: [
                 {

src/pages/Ticket/Card/TicketSale.vue

@@ -54,7 +54,6 @@ const transfer = ref({
 });
 const tableRef = ref([]);
 const canProceed = ref();
-const isLoading = ref(false);
 
 watch(
     () => route.params.id,
@@ -197,6 +196,7 @@ const changeQuantity = async (sale) => {
     try {
         if (!rowToUpdate.value) return;
         rowToUpdate.value = null;
+        sale.isNew = false;
         await updateQuantity(sale);
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
@@ -214,9 +214,6 @@ const updateQuantity = async ({ quantity, id }) => {
 };
 
 const addSale = async (sale) => {
-    if (isLoading.value) return;
-
-    isLoading.value = true;
     const params = {
         barcode: sale.itemFk,
         quantity: sale.quantity,
@@ -237,6 +234,7 @@ const addSale = async (sale) => {
     sale.item = newSale.item;
 
     notify('globals.dataSaved', 'positive');
+    sale.isNew = false;
     arrayData.fetch({});
 };
 
@@ -754,6 +752,7 @@ watch(
                 option-label="name"
                 option-value="id"
                 v-model="row.itemFk"
+                :use-like="false"
                 @update:model-value="updateItem(row)"
             >
                 <template #option="scope">

src/pages/Ticket/Card/TicketService.vue

@@ -166,8 +166,10 @@ async function handleSave() {
                             v-model="row.ticketServiceTypeFk"
                             :options="ticketServiceOptions"
                             option-label="name"
+                            :roles-allowed-to-create="['administrative']"
                             option-value="id"
                             hide-selected
+                            sort-by="name ASC"
                         >
                             <template #form>
                                 <TicketCreateServiceType

src/pages/Ticket/TicketFilter.vue

@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -81,15 +82,12 @@ const getGroupedStates = (data) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelect
-                        :label="t('Salesperson')"
+                    <VnSelectWorker
+                        :label="t('globals.salesPerson')"
                         v-model="params.salesPersonFk"
-                        url="Workers/activeWithInheritedRole"
-                        :where="{ role: 'salesPerson' }"
-                        option-value="id"
-                        option-label="firstName"
-                        :use-like="false"
-                        sort-by="firstName ASC"
+                        :params="{
+                            departmentCodes: ['VT'],
+                        }"
                         dense
                         outlined
                         rounded

src/pages/Travel/Card/TravelSummary.vue

@@ -9,7 +9,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import axios from 'axios';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
@@ -97,6 +97,20 @@ const entriesTableColumns = computed(() => {
             showValue: true,
         },
         { label: 'm³', field: 'm3', name: 'm3', align: 'left', showValue: true },
+        {
+            label: t('entry.basicData.initialTemperature'),
+            field: 'initialTemperature',
+            name: 'initialTemperature',
+            align: 'left',
+            format: (val) => toCelsius(val),
+        },
+        {
+            label: t('entry.basicData.finalTemperature'),
+            field: 'finalTemperature',
+            name: 'finalTemperature',
+            align: 'left',
+            format: (val) => toCelsius(val),
+        },
         {
             label: '',
             field: 'observation',
@@ -127,14 +141,14 @@ const thermographsTableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),

src/pages/Travel/Card/TravelThermographs.vue

@@ -10,7 +10,7 @@ import FetchData from 'src/components/FetchData.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { toDate } from 'src/filters';
+import { toDate, toCelsius } from 'src/filters';
 import { downloadFile } from 'src/composables/downloadFile';
 
 const route = useRoute();
@@ -52,14 +52,14 @@ const TableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),

src/pages/Travel/TravelList.vue

@@ -79,6 +79,13 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'awb',
+        label: t('travel.travelList.tableVisibleColumns.awb'),
+        columnFilter: false,
+        format: (row) => row.awbCode,
+    },
     {
         align: 'left',
         name: 'warehouseInFk',

src/pages/Worker/Card/WorkerPda.vue

@@ -27,7 +27,7 @@ const initialData = computed(() => {
     return {
         userFk: routeId.value,
         deviceProductionFk: null,
-        simSerialNumber: null,
+        simFk: null,
     };
 });
 
@@ -42,7 +42,7 @@ const deallocatePDA = async (deviceProductionFk) => {
 
 function reloadData() {
     initialData.value.deviceProductionFk = null;
-    initialData.value.simSerialNumber = null;
+    initialData.value.simFk = null;
     paginate.value.fetch();
 }
 </script>
@@ -89,7 +89,7 @@ function reloadData() {
                         />
                         <VnInput
                             :label="t('Current SIM')"
-                            :model-value="row?.simSerialNumber"
+                            :model-value="row?.simFk"
                             disable
                         />
                         <QBtn
@@ -150,7 +150,7 @@ function reloadData() {
                                     </template>
                                 </VnSelect>
                                 <VnInput
-                                    v-model="data.simSerialNumber"
+                                    v-model="data.simFk"
                                     :label="t('SIM serial number')"
                                     id="simSerialNumber"
                                     use-input

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -283,21 +283,22 @@ const fetchWeekData = async () => {
         year: selectedDateYear.value,
         week: selectedWeekNumber.value,
     };
-    const mail = (
-        await axiosNoError.get(`Workers/${route.params.id}/mail`, {
-            params: { filter: { where } },
-        })
-    ).data[0];
+    try {
+        const [{ data: mailData }, { data: countData }] = await Promise.all([
+            axiosNoError.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
+            }),
+            axiosNoError.get('WorkerTimeControlMails/count', { params: { where } }),
+        ]);
 
-    if (!mail) state.value = null;
-    else {
-        state.value = mail.state;
-        reason.value = mail.reason;
+        const mail = mailData[0];
+
+        state.value = mail?.state;
+        reason.value = mail?.reason;
+        canResend.value = !!countData.count;
+    } catch {
+        state.value = null;
     }
-
-    canResend.value = !!(
-        await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
-    ).data.count;
 };
 
 const setHours = (data) => {

src/utils/quasarLang.js

@@ -0,0 +1,12 @@
+const langList = import.meta.glob('../../node_modules/quasar/lang/*.js');
+import { Quasar } from 'quasar';
+
+export default function (value) {
+    try {
+        langList[`../../node_modules/quasar/lang/${value}.js`]().then((lang) => {
+            Quasar.lang.set(lang.default);
+        });
+    } catch (error) {
+        //
+    }
+}

test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js

@@ -9,7 +9,6 @@ describe('InvoiceOut summary', () => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/invoice-out/list`);
-        cy.typeSearchbar('{enter}');
     });
 
     it('should generate the invoice PDF', () => {
@@ -19,13 +18,12 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('The invoice PDF document has been regenerated');
     });
-
     it('should refund the invoice ', () => {
         cy.typeSearchbar('T1111111{enter}');
         cy.dataCy('descriptor-more-opts').click();
         cy.get('.q-menu > .q-list > :nth-child(7)').click();
         cy.get('#q-portal--menu--3 > .q-menu > .q-list > :nth-child(2)').click();
-        cy.checkNotification('The following refund ticket have been created 1000000');
+        cy.checkNotification('The following refund ticket have been created');
     });
 
     it('should delete an invoice ', () => {
@@ -35,8 +33,7 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('InvoiceOut deleted');
     });
-    // https://redmine.verdnatura.es/issues/8415
-    it.skip('should transfer the invoice ', () => {
+    it('should transfer the invoice ', () => {
         cy.typeSearchbar('T1111111{enter}');
         cy.dataCy('descriptor-more-opts').click();
         cy.get('.q-menu > .q-list > :nth-child(1)').click();

test/cypress/integration/ticket/ticketSale.spec.js

@@ -1,7 +1,5 @@
 /// <reference types="cypress" />
 
-const c = require('croppie');
-
 describe('TicketSale', () => {
     beforeEach(() => {
         cy.login('developer');

test/cypress/integration/vnComponent/VnLocation.spec.js

@@ -49,12 +49,12 @@ describe('VnLocation', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/worker/create', { timeout: 5000 });
+            cy.visit('/#/worker/list', { timeout: 5000 });
+            cy.dataCy('vnTableCreateBtn').click();
             cy.waitForElement('.q-card');
             cy.get(inputLocation).click();
         });
-        // https://redmine.verdnatura.es/issues/8436
-        it.skip('Show all options', function () {
+        it('Show all options', function () {
             cy.get(locationOptions).should('have.length.at.least', 5);
         });
         it('input filter location as "al"', function () {

test/cypress/integration/worker/workerList.spec.js

@@ -10,8 +10,8 @@ describe('WorkerList', () => {
 
     it('should open the worker summary', () => {
         cy.get(inputName).type('jessica{enter}');
-        cy.get(searchBtn).click();
         cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
+        cy.get(searchBtn).click();
         cy.wait('@worker').then(() =>
             cy.get(descriptorTitle).should('include.text', 'Jessica')
         );