Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData

cypress.config.js

@@ -11,6 +11,7 @@ module.exports = defineConfig({
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
+        downloadsFolder: 'test/cypress/downloads',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,

package.json

@@ -25,6 +25,7 @@
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
+        "moment": "^2.30.1",
         "pinia": "^2.1.3",
         "quasar": "^2.14.5",
         "validator": "^13.9.0",

pnpm-lock.yaml

@@ -20,6 +20,9 @@ dependencies:
   croppie:
     specifier: ^2.6.5
     version: 2.6.5
+  moment:
+    specifier: ^2.30.1
+    version: 2.30.1
   pinia:
     specifier: ^2.1.3
     version: 2.1.7(typescript@5.5.4)(vue@3.4.19)
@@ -832,8 +835,8 @@ packages:
       vue-i18n:
         optional: true
     dependencies:
-      '@intlify/message-compiler': 10.0.0
-      '@intlify/shared': 10.0.0
+      '@intlify/message-compiler': 11.0.0-rc.1
+      '@intlify/shared': 11.0.0-rc.1
       jsonc-eslint-parser: 1.4.1
       source-map: 0.6.1
       vue-i18n: 9.9.1(vue@3.4.19)
@@ -847,11 +850,11 @@ packages:
       '@intlify/message-compiler': 9.9.1
       '@intlify/shared': 9.9.1
 
-  /@intlify/message-compiler@10.0.0:
-    resolution: {integrity: sha512-OcaWc63NC/9p1cMdgoNKBj4d61BH8sUW1Hfs6YijTd9656ZR4rNqXAlRnBrfS5ABq0vjQjpa8VnyvH9hK49yBw==}
+  /@intlify/message-compiler@11.0.0-rc.1:
+    resolution: {integrity: sha512-TGw2uBfuTFTegZf/BHtUQBEKxl7Q/dVGLoqRIdw8lFsp9g/53sYn5iD+0HxIzdYjbWL6BTJMXCPUHp9PxDTRPw==}
     engines: {node: '>= 16'}
     dependencies:
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 11.0.0-rc.1
       source-map-js: 1.0.2
     dev: true
 
@@ -862,8 +865,8 @@ packages:
       '@intlify/shared': 9.9.1
       source-map-js: 1.0.2
 
-  /@intlify/shared@10.0.0:
-    resolution: {integrity: sha512-6ngLfI7DOTew2dcF9WMJx+NnMWghMBhIiHbGg+wRvngpzD5KZJZiJVuzMsUQE1a5YebEmtpTEfUrDp/NqVGdiw==}
+  /@intlify/shared@11.0.0-rc.1:
+    resolution: {integrity: sha512-8tR1xe7ZEbkabTuE/tNhzpolygUn9OaYp9yuYAF4MgDNZg06C3Qny80bes2/e9/Wm3aVkPUlCw6WgU7mQd0yEg==}
     engines: {node: '>= 16'}
     dev: true
 
@@ -887,7 +890,7 @@ packages:
         optional: true
     dependencies:
       '@intlify/bundle-utils': 4.0.0(vue-i18n@9.9.1)
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 11.0.0-rc.1
       '@rollup/pluginutils': 4.2.1
       '@vue/compiler-sfc': 3.4.19
       debug: 4.3.4(supports-color@8.1.1)
@@ -4960,6 +4963,10 @@ packages:
       uuid: 8.3.2
     dev: true
 
+  /moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+    dev: false
+
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 

src/components/common/VnChangePassword.vue

@@ -2,9 +2,9 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnRow from '../ui/VnRow.vue';
-import VnInput from './VnInput.vue';
 import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const props = defineProps({
     submitFn: { type: Function, default: () => {} },
@@ -70,19 +70,19 @@ defineExpose({ show: () => changePassDialog.value.show() });
             </QCardSection>
             <QForm ref="form">
                 <QCardSection>
-                    <VnInput
+                    <VnInputPassword
                         v-if="props.askOldPass"
                         :label="t('Old password')"
                         v-model="passwords.oldPassword"
-                        type="password"
                         :required="true"
+                        :toggle-visibility="true"
                         autofocus
                     />
-                    <VnInput
+                    <VnInputPassword
                         :label="t('New password')"
                         v-model="passwords.newPassword"
-                        type="password"
                         :required="true"
+                        :toggle-visibility="true"
                         :info="
                             t('passwordRequirements', {
                                 length: requirements.length,
@@ -95,10 +95,10 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         autofocus
                     />
 
-                    <VnInput
+                    <VnInputPassword
                         :label="t('Repeat password')"
                         v-model="passwords.repeatPassword"
-                        type="password"
+                        :toggle-visibility="true"
                     />
                 </QCardSection>
             </QForm>

src/components/common/VnInput.vue

@@ -45,6 +45,7 @@ const $props = defineProps({
 });
 
 const vnInputRef = ref(null);
+const showPassword = ref(false);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -134,7 +135,7 @@ const handleInsertMode = (e) => {
             hide-bottom-space
             :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
         >
-            <template v-if="$slots.prepend" #prepend>
+            <template #prepend>
                 <slot name="prepend" />
             </template>
             <template #append>
@@ -158,7 +159,7 @@ const handleInsertMode = (e) => {
                             emit('remove');
                         }
                     "
-                ></QIcon>
+                />
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
@@ -169,18 +170,3 @@ const handleInsertMode = (e) => {
         </QInput>
     </div>
 </template>
-<i18n>
-    en:
-        inputMin: Must be more than {value}
-        maxLength: The value exceeds {value} characters
-        inputMax: Must be less than {value}
-    es:
-        inputMin: Debe ser mayor a {value}
-        maxLength: El valor excede los {value} carácteres
-        inputMax: Debe ser menor a {value}
-</i18n>
-<style lang="scss">
-.q-field__append {
-    padding-inline: 0;
-}
-</style>

src/components/common/VnInputPassword.vue

@@ -0,0 +1,31 @@
+<script setup>
+import VnInput from 'src/components/common/VnInput.vue';
+import { ref } from 'vue';
+
+const model = defineModel({ type: [Number, String] });
+const $props = defineProps({
+    toggleVisibility: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const showPassword = ref(false);
+</script>
+<template>
+    <VnInput
+        v-bind="{ ...$attrs }"
+        v-model="model"
+        :type="
+            $props.toggleVisibility ? (showPassword ? 'text' : 'password') : $attrs.type
+        "
+    >
+        <template #append v-if="toggleVisibility">
+            <QIcon
+                :name="showPassword ? 'visibility_off' : 'visibility'"
+                class="cursor-pointer"
+                @click="showPassword = !showPassword"
+            />
+        </template>
+    </VnInput>
+</template>

src/components/common/VnSelect.vue

@@ -205,10 +205,10 @@ function filter(val, options) {
         }
 
         if (!row) return;
-        const id = row[$props.optionValue];
+        const id = String(row[$props.optionValue]);
         const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
-        return id == search || optionLabel.includes(search);
+        return id.includes(search) || optionLabel.includes(search);
     });
 }
 

src/components/common/VnSelectWorker.vue

@@ -51,6 +51,7 @@ const url = computed(() => {
         option-value="id"
         option-label="nickname"
         :fields="['id', 'name', 'nickname', 'code']"
+        :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
@@ -71,7 +72,7 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

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

@@ -0,0 +1,95 @@
+import { describe, it, expect } from 'vitest';
+import VnJsonValue from 'src/components/common/VnJsonValue.vue';
+import { createWrapper } from 'app/test/vitest/helper';
+
+const buildComponent = (props) => {
+    return createWrapper(VnJsonValue, {
+        props,
+    }).wrapper;
+};
+
+describe('VnJsonValue', () => {
+    it('renders null value correctly', async () => {
+        const wrapper = buildComponent({ value: null });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('∅');
+        expect(span.classes()).toContain('json-null');
+    });
+
+    it('renders boolean true correctly', async () => {
+        const wrapper = buildComponent({ value: true });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('✓');
+        expect(span.classes()).toContain('json-true');
+    });
+
+    it('renders boolean false correctly', async () => {
+        const wrapper = buildComponent({ value: false });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('✗');
+        expect(span.classes()).toContain('json-false');
+    });
+
+    it('renders a short string correctly', async () => {
+        const wrapper = buildComponent({ value: 'Hello' });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('Hello');
+        expect(span.classes()).toContain('json-string');
+    });
+
+    it('renders a long string correctly with ellipsis', async () => {
+        const longString = 'a'.repeat(600);
+        const wrapper = buildComponent({ value: longString });
+        const span = wrapper.find('span');
+        expect(span.text()).toContain('...');
+        expect(span.text().length).toBeLessThanOrEqual(515);
+        expect(span.attributes('title')).toBe(longString);
+        expect(span.classes()).toContain('json-string');
+    });
+
+    it('renders a number correctly', async () => {
+        const wrapper = buildComponent({ value: 123.4567 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('123.457');
+        expect(span.classes()).toContain('json-number');
+    });
+
+    it('renders an integer correctly', async () => {
+        const wrapper = buildComponent({ value: 42 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('42');
+        expect(span.classes()).toContain('json-number');
+    });
+
+    it('renders a date correctly', async () => {
+        const date = new Date('2023-01-01');
+        const wrapper = buildComponent({ value: date });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('2023-01-01');
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('renders an object correctly', async () => {
+        const obj = { key: 'value' };
+        const wrapper = buildComponent({ value: obj });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe(obj.toString());
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('renders an array correctly', async () => {
+        const arr = [1, 2, 3];
+        const wrapper = buildComponent({ value: arr });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe(arr.toString());
+        expect(span.classes()).toContain('json-object');
+    });
+
+    it('updates value when prop changes', async () => {
+        const wrapper = buildComponent({ value: true });
+        await wrapper.setProps({ value: 123 });
+        const span = wrapper.find('span');
+        expect(span.text()).toBe('123');
+        expect(span.classes()).toContain('json-number');
+    });
+});

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

@@ -0,0 +1,107 @@
+import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnNotes from 'src/components/ui/VnNotes.vue';
+
+describe('VnNotes', () => {
+    let vm;
+    let wrapper;
+    let spyFetch;
+    let postMock;
+    let expectedBody;
+    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
+
+    function generateExpectedBody() {
+        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+    }
+
+    async function setTestParams(text, observationType, type){
+        vm.newNote.text = text;
+        vm.newNote.observationTypeFk = observationType;
+        wrapper.setProps({ selectType: type });
+    }
+
+    beforeAll(async () => {        
+        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
+
+        wrapper = createWrapper(VnNotes, {
+            propsData: {
+                url: '/test',
+                body: { name: 'Tony', lastName: 'Stark' },
+            }
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    beforeEach(() => {
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
+        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+        expectedBody = {};
+    });
+
+    describe('insert', () => {
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
+            await setTestParams( null, null, true );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
+            await setTestParams( "", null, false );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
+            await setTestParams( "Test Note", null, true );
+
+            await vm.insert();
+
+            expect(postMock).not.toHaveBeenCalled();
+            expect(spyFetch).not.toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
+            await setTestParams( "Test Note", null, false );
+
+            generateExpectedBody();
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
+            await setTestParams( "Test Note", 1, false );
+
+            generateExpectedBody();
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
+            await setTestParams( "Test Note", 1, true );
+
+            generateExpectedBody();
+            
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+    });
+});

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

@@ -0,0 +1,81 @@
+import { describe, expect, it } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
+
+describe('tags computed property', () => {
+    it('returns an object with the correct keys and values', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {
+                    tag1: 'JavaScript',
+                    value1: 'Programming Language',
+                    tag2: 'Vue',
+                    value2: 'Framework',
+                    tag3: 'EmptyTag',
+                },
+                tag: 'tag',
+                value: 'value',
+                columns: 2,
+            },
+        }).vm;
+        expect(vm.tags).toEqual({
+            JavaScript: 'Programming Language',
+            Vue: 'Framework',
+            EmptyTag: '',
+        });
+    });
+
+    it('returns an empty object if the item prop is an empty object', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {},
+                tag: 'tag',
+                value: 'value',
+            },
+        }).vm;
+        expect(vm.tags).toEqual({});
+    });
+
+    it('should calculate the correct columnStyle when columns prop is defined', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {
+                    tag1: 'JavaScript',
+                    value1: 'Programming Language',
+                    tag2: 'Vue',
+                    value2: 'Framework',
+                    tag3: 'EmptyTag',
+                },
+                tag: 'tag',
+                value: 'value',
+                columns: 2,
+            },
+        }).vm;
+
+        const expectedStyle = {
+            'grid-template-columns': 'repeat(2, 1fr)',
+            'max-width': '8rem', 
+        };
+
+        expect(vm.columnStyle).toEqual(expectedStyle);
+    });
+
+    it('should return an empty object for columnStyle when columns prop is not defined', () => {
+        const vm = createWrapper(FetchedTags, {
+            props: {
+                item: {
+                    tag1: 'JavaScript',
+                    value1: 'Programming Language',
+                    tag2: 'Vue',
+                    value2: 'Framework',
+                    tag3: 'EmptyTag',
+                },
+                tag: 'tag',
+                value: 'value',
+                columns: null,
+            },
+        }).vm;
+
+        expect(vm.columnStyle).toEqual({});
+    });
+});

src/composables/useArrayData.js

@@ -105,15 +105,17 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         store.hasMoreData = limit && response.data.length >= limit;
 
+        if (!append && !isDialogOpened() && updateRouter) {
+            if (updateStateParams(response.data)?.redirect) return;
+        }
+        store.isLoading = false;
+        canceller = null;
+
         processData(response.data, {
             map: !!store.mapKey,
             append,
             oneRecord: store.oneRecord,
         });
-        if (!append && !isDialogOpened()) updateRouter && updateStateParams();
-
-        store.isLoading = false;
-        canceller = null;
 
         return store.data;
     }
@@ -244,7 +246,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         if (Object.values(store.userParams).length) await fetch({});
     }
 
-    function updateStateParams() {
+    function updateStateParams(data) {
         if (!route?.path) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         if (store?.searchUrl)
@@ -261,15 +263,15 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             const { path } = matches.at(-1);
 
             const to =
-                store?.data?.length === 1
-                    ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
+                data?.length === 1
+                    ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
                     : path.replace(/:id.*/, '');
 
             if (route.path != to) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                return router.push(pushUrl);
+                return router.push(pushUrl) && { redirect: true };
             }
         }
 

src/filters/toDateHourMin.js

@@ -1,5 +1,6 @@
 export default function toDateHourMin(date) {
-    const dateHour = new Date(date).toLocaleDateString('es-ES', {
+    if (!date) return date;
+    return new Date(date).toLocaleDateString('es-ES', {
         timeZone: 'Europe/Madrid',
         year: 'numeric',
         month: '2-digit',
@@ -7,5 +8,4 @@ export default function toDateHourMin(date) {
         hour: '2-digit',
         minute: '2-digit',
     });
-    return dateHour;
 }

src/filters/toDateHourMinSec.js

@@ -1,5 +1,6 @@
 export default function toDateHourMinSec(date) {
-    const dateHour = new Date(date).toLocaleDateString('es-ES', {
+    if (!date) return date;
+    return new Date(date).toLocaleDateString('es-ES', {
         timeZone: 'Europe/Madrid',
         year: 'numeric',
         month: '2-digit',
@@ -8,5 +9,4 @@ export default function toDateHourMinSec(date) {
         minute: '2-digit',
         second: '2-digit',
     });
-    return dateHour;
 }

src/i18n/locale/en.yml

@@ -455,12 +455,26 @@ entry:
             packingOut: Package out
             landing: Landing
             isExcludedFromAvailable: Es inventory
+    params:
+        toShipped: To
+        fromShipped: From
+        warehouseiNFk: Warehouse
+        daysOnward: Days onward
+        daysAgo: Days ago
+        warehouseInFk: Warehouse in
 ticket:
     params:
         ticketFk: Ticket ID
         weekDay: Weekday
         agencyModeFk: Agency
         id: Worker
+        state: State
+        created: Created
+        externalId: External ID
+        counter: Counter
+        freightItemName: Freight item name
+        packageItemName: Package item name
+        longName: Long name
     card:
         customerId: Customer ID
         customerCard: Customer card
@@ -511,6 +525,7 @@ invoiceOut:
     card:
         issued: Issued
         customerCard: Customer card
+        ticketList: Ticket List
     summary:
         issued: Issued
         dued: Due

src/i18n/locale/es.yml

@@ -456,12 +456,25 @@ entry:
             packingOut: Embalaje envíos
             landing: Llegada
             isExcludedFromAvailable: Es inventario
+    params:
+        toShipped: Hasta
+        fromShipped: Desde
+        warehouseInFk: Alm. entrada
+        daysOnward: Días adelante
+        daysAgo: Días atras
 ticket:
     params:
         ticketFk: ID de ticket
         weekDay: Salida
         agencyModeFk: Agencia
         id: Comercial
+        created: Creado
+        state: Estado
+        externalId: ID externo
+        counter: Contador
+        freightItemName: Nombre
+        packageItemName: Embalaje
+        longName: Descripción
     card:
         customerId: ID cliente
         customerCard: Ficha del cliente

src/pages/Account/AccountCreate.vue

@@ -6,6 +6,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -61,10 +62,10 @@ const redirectToAccountBasicData = (_, { id }) => {
                     hide-selected
                     :rules="validate('VnUser.roleFk')"
                 />
-                <VnInput
+                <VnInputPassword
                     v-model="data.password"
                     :label="t('ldap.password')"
-                    type="password"
+                    :toggle-visibility="true"
                     :rules="validate('VnUser.password')"
                 />
                 <QCheckbox

src/pages/Account/AccountLdap.vue

@@ -8,6 +8,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -128,10 +129,9 @@ onMounted(async () => await getInitialLdapConfig());
                         :required="true"
                         :rules="validate('LdapConfig.rdn')"
                     />
-                    <VnInput
+                    <VnInputPassword
                         :label="t('ldap.password')"
                         clearable
-                        type="password"
                         v-model="data.password"
                         :required="true"
                         :rules="validate('LdapConfig.password')"

src/pages/Account/AccountList.vue

@@ -6,14 +6,13 @@ import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import exprBuilder from './AccountExprBuilder.js';
 import filter from './Card/AccountFilter.js';
-const tableRef = ref();
-
-import VnInput from 'src/components/common/VnInput.vue';
 import VnSection from 'src/components/common/VnSection.vue';
 import FetchData from 'src/components/FetchData.vue';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
 
 const dataKey = 'AccountList';
 const roles = ref([]);
@@ -151,10 +150,9 @@ const columns = computed(() => [
             >
                 <template #more-create-dialog="{ data }">
                     <QCardSection>
-                        <VnInput
+                        <VnInputPassword
                             :label="t('Password')"
                             v-model="data.password"
-                            type="password"
                             :required="true"
                             autocomplete="new-password"
                         />

src/pages/Account/AccountSamba.vue

@@ -8,6 +8,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -143,10 +144,9 @@ onMounted(async () => await getInitialSambaConfig());
                         v-model="data.adUser"
                         :rules="validate('SambaConfigs.adUser')"
                     />
-                    <VnInput
+                    <VnInputPassword
                         :label="t('samba.passwordAD')"
                         clearable
-                        type="password"
                         v-model="data.adPassword"
                     />
                     <VnInput

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -9,6 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useQuasar } from 'quasar';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const $props = defineProps({
     hasAccount: {
@@ -97,14 +98,13 @@ async function sync() {
                     <QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
                 </QIcon></QCheckbox
             >
-            <QInput
+            <VnInputPassword
                 v-if="shouldSyncPassword"
                 :label="t('login.password')"
                 v-model="syncPassword"
                 class="full-width"
                 clearable
                 clear-icon="close"
-                type="password"
             />
         </template>
     </VnConfirm>

src/pages/Claim/ClaimFilter.vue

@@ -93,16 +93,7 @@ defineExpose({ states });
                     outlined
                     rounded
                     dense
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                />
                 <VnSelect
                     :label="t('claim.responsible')"
                     v-model="params.claimResponsibleFk"

src/pages/Customer/locale/en.yml

@@ -95,6 +95,7 @@ customer:
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
     params:
+        id: Id
         isWorker: Is Worker
         payMethod: Payment Method
         workerFk: Author
@@ -103,3 +104,14 @@ customer:
         creditInsurance: Credit Insurance
         defaulterSinced: Defaulted Since
         hasRecovery: Has Recovery
+        socialName: Social name
+        city: City
+        phone: Phone
+        postcode: Postcode
+        campaign: Campaign
+        grouped: Grouped
+        search: Contains
+        itemId: Item Id
+        ticketFk: Ticket Id
+        description: Description
+        quantity: Quantity

src/pages/Customer/locale/es.yml

@@ -97,6 +97,7 @@ customer:
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
     params:
+        id: ID
         isWorker: Es trabajador
         payMethod: F. Pago
         workerFk: Autor
@@ -105,3 +106,14 @@ customer:
         creditInsurance: Crédito A.
         defaulterSinced: Desde
         hasRecovery: Tiene recobro
+        socialName: Razón social
+        campaign: Campaña
+        city: Ciudad
+        phone: Teléfono
+        postcode: Código postal
+        grouped: Agrupado
+        search: Contiene
+        itemId: Id Artículo
+        ticketFk: Id Ticket
+        description: Descripción
+        quantity: Cantidad

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -65,7 +65,11 @@ const { openConfirmationModal } = useVnConfirm();
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('department.chat')" :value="entity.chatName" />
-            <VnLv :label="t('globals.email')" :value="entity.notificationEmail" copy />
+            <VnLv
+                :label="t('globals.params.email')"
+                :value="entity.notificationEmail"
+                copy
+            />
             <VnLv
                 :label="t('department.selfConsumptionCustomer')"
                 :value="entity.client?.name"

src/pages/Department/Card/DepartmentSummary.vue

@@ -58,7 +58,7 @@ onMounted(async () => {
                             dash
                         />
                         <VnLv
-                            :label="t('globals.email')"
+                            :label="t('globals.params.email')"
                             :value="department.notificationEmail"
                             dash
                         />

src/pages/Entry/EntryBuysTableDialog.vue

@@ -1,24 +1,24 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { usePrintService } from 'composables/usePrintService';
-const { openReport } = usePrintService();
 
+const { openReport } = usePrintService();
+const buyRows = ref([]);
 const route = useRoute();
 const { t } = useI18n();
 const $props = defineProps({
     id: {
-        type: String,
+        type: Number,
         required: false,
         default: null,
     },
 });
 const entityId = computed(() => $props.id || route.params.id);
-
 const entriesTableColumns = computed(() => [
     {
         align: 'left',
@@ -63,34 +63,39 @@ const entriesTableColumns = computed(() => [
         field: 'grouping',
     },
 ]);
-</script>
 
+function downloadCSV(rows) {
+    const headers = ['id', 'itemFk', 'name', 'stickers', 'packing', 'comment'];
+
+    const csvRows = rows.map((row) => {
+        const buy = row;
+        const item = buy.item || {};
+
+        return [
+            buy.id,
+            buy.itemFk,
+            item.name || '',
+            buy.stickers,
+            buy.packing,
+            item.comment || '',
+        ].join(',');
+    });
+
+    const csvContent = [headers.join(','), ...csvRows].join('\n');
+
+    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.setAttribute('download', `${entityId.value}data.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+}
+</script>
 <template>
     <QDialog ref="dialogRef">
         <QCard style="min-width: 800px">
-            <QCardSection class="row items-center q-pb-none">
-                <QAvatar
-                    :icon="icon"
-                    color="primary"
-                    text-color="white"
-                    size="xl"
-                    v-if="icon"
-                />
-                <span class="text-h6 text-grey">{{ title }}</span>
-                <QSpace />
-                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn
-                    :label="t('myEntries.printLabels')"
-                    color="primary"
-                    icon="print"
-                    :loading="isLoading"
-                    @click="openReport(`Entries/${entityId}/labelSupplier`)"
-                    unelevated
-                    autofocus
-                />
-            </QCardActions>
             <QCardSection class="row items-center">
                 <VnPaginate
                     ref="entryBuysPaginateRef"
@@ -101,6 +106,7 @@ const entriesTableColumns = computed(() => [
                 >
                     <template #body="{ rows }">
                         <QTable
+                            ref="buyRows"
                             :rows="rows"
                             :columns="entriesTableColumns"
                             row-key="id"
@@ -110,6 +116,26 @@ const entriesTableColumns = computed(() => [
                             :grid="$q.screen.lt.md"
                             :no-data-label="t('globals.noResults')"
                         >
+                            <template #top-left>
+                                <QBtn
+                                    :label="t('myEntries.downloadCsv')"
+                                    color="primary"
+                                    icon="csv"
+                                    @click="downloadCSV(rows)"
+                                    unelevated
+                                />
+                            </template>
+                            <template #top-right>
+                                <QBtn
+                                    class="q-mr-lg"
+                                    :label="t('myEntries.printLabels')"
+                                    color="primary"
+                                    icon="print"
+                                    @click="
+                                        openReport(`Entries/${entityId}/labelSupplier`)
+                                    "
+                                />
+                            </template>
                             <template #body="props">
                                 <QTr>
                                     <QTd v-for="col in props.cols" :key="col.name">
@@ -118,7 +144,6 @@ const entriesTableColumns = computed(() => [
                                     <QBtn
                                         icon="visibility"
                                         v-if="props.row.stickers > 0"
-                                        :loading="isLoading"
                                         @click="
                                             openReport(
                                                 `Entries/${props.row.id}/buy-label-supplier`

src/pages/Entry/EntryFilter.vue

@@ -123,6 +123,7 @@ const companiesOptions = ref([]);
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="nickname"
                         hide-selected
                         dense
@@ -132,9 +133,12 @@ const companiesOptions = ref([]);
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -69,12 +69,14 @@ const tagValues = ref([]);
                         use-input
                         @update:model-value="searchFn()"
                     >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ opt.nickname }}
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>

src/pages/Entry/MyEntries.vue

@@ -102,7 +102,7 @@ const columns = computed(() => [
         actions: [
             {
                 title: t('myEntries.printLabels'),
-                icon: 'print',
+                icon: 'move_item',
                 isPrimary: true,
                 action: (row) => printBuys(row.id),
             },

src/pages/Entry/locale/en.yml

@@ -17,13 +17,6 @@ myEntries:
     warehouseInFk: Warehouse in
     daysOnward: Days onward
     daysAgo: Days ago
+    downloadCsv: Download CSV
 wasteRecalc:
     recalcOk: The wastes were successfully recalculated
-entry:
-    params:
-        toShipped: To
-        fromShipped: From
-        warehouseiNFk: Warehouse
-        daysOnward: Days onward
-        daysAgo: Days ago
-        

src/pages/Entry/locale/es.yml

@@ -20,13 +20,6 @@ myEntries:
     warehouseInFk: Alm. entrada
     daysOnward: Días adelante
     daysAgo: Días atras
+    downloadCsv: Descargar CSV
 wasteRecalc:
     recalcOk: Se han recalculado las mermas correctamente
-entry:
-    params:
-        toShipped: Hasta
-        fromShipped: Desde
-        warehouseInFk: Alm. entrada
-        daysOnward: Días adelante
-        daysAgo: Días atras
-        

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -68,13 +68,26 @@ function handleDaysAgo(params, daysAgo) {
                     <VnSelect
                         v-model="params.supplierFk"
                         url="Suppliers"
-                        :fields="['id', 'nickname']"
+                        :fields="['id', 'nickname', 'name']"
                         :label="getLocale('supplierFk')"
                         option-label="nickname"
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>

src/pages/InvoiceIn/InvoiceInList.vue

@@ -165,18 +165,18 @@ const cols = computed(() => [
             <VnSelect
                 v-model="data.supplierFk"
                 url="Suppliers"
-                :fields="['id', 'nickname']"
+                :fields="['id', 'nickname', 'name']"
                 :label="t('globals.supplier')"
                 option-value="id"
                 option-label="nickname"
-                :filter-options="['id', 'name']"
+                :filter-options="['id', 'name', 'nickname']"
                 :required="true"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
                             <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                            <QItemLabel caption> #{{ scope.opt?.id }}, {{  scope.opt?.name }} </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>

src/pages/InvoiceOut/InvoiceOutFilter.vue

@@ -47,6 +47,7 @@ const states = ref();
                         :label="t('Amount')"
                         v-model="params.amount"
                         is-outlined
+                        data-cy="InvoiceOutFilterAmountBtn"
                     />
                 </QItemSection>
             </QItem>

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -101,6 +101,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalClientSelect"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -125,6 +126,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalSerialSelect"
             />
             <VnInputDate
                 v-model="formData.invoiceDate"
@@ -135,6 +137,7 @@ onMounted(async () => {
                 v-model="formData.maxShipped"
                 :label="t('maxShipped')"
                 is-outlined
+                data-cy="InvoiceOutGlobalMaxShippedDate"
             />
             <VnSelect
                 :label="t('company')"
@@ -144,6 +147,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalCompanySelect"
             />
             <VnSelect
                 :label="t('printer')"
@@ -152,6 +156,7 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
+                data-cy="InvoiceOutGlobalPrinterSelect"
             />
         </div>
         <QBtn

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -197,6 +197,7 @@ watchEffect(selectedRows);
                 icon-right="cloud_download"
                 @click="downloadPdf()"
                 :disable="!hasSelectedCards"
+                data-cy="InvoiceOutDownloadPdfBtn"
             >
                 <QTooltip>{{ t('downloadPdf') }}</QTooltip>
             </QBtn>
@@ -245,6 +246,7 @@ watchEffect(selectedRows);
                                 v-model="data.ticketFk"
                                 :label="t('globals.ticket')"
                                 style="flex: 1"
+                                data-cy="InvoiceOutCreateTicketinput"
                             />
 
                             <div
@@ -359,6 +361,7 @@ watchEffect(selectedRows);
                             option-value="code"
                             option-filter
                             :expr-builder="exprBuilder"
+                            data-cy="InvoiceOutCreateSerialSelect"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">

src/pages/Item/ItemFixedPrice.vue

@@ -35,6 +35,7 @@ const editTableCellDialogRef = ref(null);
 const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
+const hasSelectedRows = computed(() => rowsSelected.value.length > 0);
 const rowsSelected = ref([]);
 const itemFixedPriceFilterRef = ref();
 
@@ -368,9 +369,9 @@ function handleOnDataSave({ CrudModelRef }) {
         </template>
     </RightMenu>
     <VnSubToolbar>
-        <template #st-data>
+        <template #st-actions>
             <QBtn
-                v-if="rowsSelected.length"
+                :disable="!hasSelectedRows"
                 @click="openEditTableCellDialog()"
                 color="primary"
                 icon="edit"
@@ -380,13 +381,13 @@ function handleOnDataSave({ CrudModelRef }) {
                 </QTooltip>
             </QBtn>
             <QBtn
+                :disable="!hasSelectedRows"
                 :label="tMobile('globals.remove')"
                 color="primary"
                 icon="delete"
                 flat
                 @click="(row) => confirmRemove(row, true)"
                 :title="t('globals.remove')"
-                v-if="rowsSelected.length"
             />
         </template>
     </VnSubToolbar>

src/pages/Item/ItemList.vue

@@ -142,6 +142,17 @@ const columns = computed(() => [
         label: t('item.list.typeName'),
         name: 'typeName',
         align: 'left',
+        component: 'select',
+        columnFilter: {
+            name: 'typeFk',
+            attrs: {
+                url: 'ItemTypes',
+                fields: ['id', 'name'],
+            },
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
         label: t('item.list.category'),

src/pages/Item/ItemListFilter.vue

@@ -199,17 +199,7 @@ onMounted(async () => {
                         dense
                         outlined
                         rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.name}`)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -265,6 +255,7 @@ onMounted(async () => {
                         option-value="id"
                         option-label="name"
                         :fields="['id', 'name', 'nickname']"
+                        :filter-options="['id', 'name', 'nickname']"
                         sort-by="name ASC"
                         hide-selected
                         dense
@@ -274,9 +265,12 @@ onMounted(async () => {
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
-                                    <QItemLabel>{{
-                                        scope.opt?.name + ': ' + scope.opt?.nickname
-                                    }}</QItemLabel>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -375,6 +369,7 @@ onMounted(async () => {
                         :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
+                        option-value="label"                        
                         dense
                         outlined
                         rounded

src/pages/Item/ItemRequestFilter.vue

@@ -149,7 +149,6 @@ onMounted(async () => {
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
-                        :fields="['id', 'name']"
                         :params="{ departmentCodes: ['VT'] }"
                         hide-selected
                         dense

src/pages/Login/LoginMain.vue

@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { Notify } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 import { useSession } from 'src/composables/useSession';
 import { useLogin } from 'src/composables/useLogin';
 
@@ -63,11 +63,10 @@ async function onSubmit() {
             :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
             color="primary"
         />
-        <VnInput
-            type="password"
+        <VnInputPassword
             v-model="password"
             :label="t('login.password')"
-            lazy-rules
+            :toggle-visibility="true"
             :rules="[(val) => (val && val.length > 0) || t('login.fieldRequired')]"
             class="red"
         />

src/pages/Login/ResetPassword.vue

@@ -7,6 +7,7 @@ import axios from 'axios';
 
 import VnInput from 'components/common/VnInput.vue';
 import VnOutForm from 'components/ui/VnOutForm.vue';
+import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const quasar = useQuasar();
 const router = useRouter();
@@ -54,8 +55,7 @@ async function onSubmit() {
 <template>
     <VnOutForm @submit="onSubmit" :title="t('globals.pageTitles.resetPassword')">
         <template #default>
-            <VnInput
-                type="password"
+            <VnInputPassword
                 :label="t('login.password')"
                 v-model="newPassword"
                 :info="
@@ -72,9 +72,8 @@ async function onSubmit() {
                 <template #prepend>
                     <QIcon name="password" />
                 </template>
-            </VnInput>
-            <VnInput
-                type="password"
+            </VnInputPassword>
+            <VnInputPassword
                 :label="t('resetPassword.repeatPassword')"
                 v-model="repeatPassword"
                 required
@@ -82,7 +81,7 @@ async function onSubmit() {
                 <template #prepend>
                     <QIcon name="password" />
                 </template>
-            </VnInput>
+            </VnInputPassword>
         </template>
         <template #buttons>
             <QBtn

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -110,15 +110,13 @@ const columns = computed(() => [
         name: 'salesPersonFk',
         field: 'userName',
         align: 'left',
-        optionFilter: 'firstName',
         columnFilter: {
             component: 'select',
             attrs: {
-                url: 'Workers/activeWithInheritedRole',
-                fields: ['id', 'name'],
+                url: 'Workers/search?departmentCodes=["VT"]',
+                fields: ['id', 'name', 'nickname', 'code'],
                 sortBy: 'nickname ASC',
-                where: { role: 'salesPerson' },
-                useLike: false,
+                optionLabel: 'nickname',
             },
         },
     },

src/pages/Order/Card/OrderFilter.vue

@@ -97,6 +97,7 @@ const sourceList = ref([]);
                     v-model="params.sourceApp"
                     :options="sourceList"
                     option-label="value"
+                    option-value="value"
                     dense
                     outlined
                     rounded

src/pages/Route/locale/en.yml

@@ -1,4 +1,18 @@
 route:
+    params:
+        etd: ETD
+        tractorPlate: Plate
+        price: Price
+        observations: Observations
+        id: ID
+        name: Name
+        cmrFk: CMR id
+        hasCmrDms: Attached in gestdoc
+        ticketFk: Ticketd id
+        routeFk: Route id
+        shipped: Shipped
+        agencyAgreement: Agency agreement
+        agencyModeName: Agency route
     Worker: Worker
     Agency: Agency
     Vehicle: Vehicle

src/pages/Supplier/Card/SupplierSummary.vue

@@ -39,6 +39,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
         :url="`Suppliers/${entityId}/getSummary`"
         @on-fetch="(data) => setData(data)"
         data-key="SupplierSummary"
+        module-name="Supplier"
     >
         <template #header>
             <span>{{ supplier.id }} - {{ supplier.name }}</span>

src/pages/Ticket/Card/TicketExpedition.vue

@@ -201,7 +201,7 @@ const getExpeditionState = async (expedition) => {
 
 const openGrafana = (expeditionFk) => {
     useOpenURL(
-        `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
+        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
     );
 };
 

src/pages/Ticket/TicketFilter.vue

@@ -101,7 +101,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="states">
-                    <QSelect
+                    <VnSelect
                         :label="t('State')"
                         v-model="params.stateFk"
                         @update:model-value="searchFn()"
@@ -122,7 +122,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="groupedStates">
-                    <QSelect
+                    <VnSelect
                         :label="t('Grouped state')"
                         v-model="params.groupedStates"
                         @update:model-value="searchFn()"
@@ -217,7 +217,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="provinces">
-                    <QSelect
+                    <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -238,7 +238,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="agencies">
-                    <QSelect
+                    <VnSelect
                         :label="t('Agency')"
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
@@ -259,7 +259,7 @@ const getGroupedStates = (data) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="warehouses">
-                    <QSelect
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="params.warehouseFk"
                         @update:model-value="searchFn()"

src/pages/Ticket/TicketList.vue

@@ -684,6 +684,7 @@ function setReference(data) {
             color="primary"
             fab
             icon="vn:invoice-in"
+            data-cy="ticketListMakeInvoiceBtn"
         />
         <QTooltip>
             {{ t('ticketList.createInvoice') }}

src/pages/Travel/ExtraCommunity.vue

@@ -597,7 +597,7 @@ const getColor = (percentage) => {
                             v-if="entry.isCustomInspectionRequired"
                             name="warning"
                             color="negative"
-                            size="xs"
+                            size="md"
                             :title="t('requiresInspection')"
                         >
                         </QIcon>
@@ -627,7 +627,7 @@ const getColor = (percentage) => {
                         <QBtn
                             v-if="entry.evaNotes"
                             icon="comment"
-                            size="sm"
+                            size="md"
                             flat
                             color="primary"
                         >

src/pages/Travel/ExtraCommunityFilter.vue

@@ -221,7 +221,20 @@ warehouses();
                         dense
                         outlined
                         rounded
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name}}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -232,6 +245,7 @@ warehouses();
                         :options="continentsOptions"
                         option-value="code"
                         option-label="name"
+                        :filter-options="['code', 'name']"
                         hide-selected
                         dense
                         outlined

src/pages/Travel/TravelFilter.vue

@@ -140,10 +140,10 @@ en:
         Id: Contains
         ref: Reference
         agency: Agency
-        warehouseInFk: W. In
+        warehouseInFk: Warehouse In
         shipped: Shipped
         shipmentHour: Shipment Hour
-        warehouseOut: W. Out
+        warehouseOut: Warehouse Out
         landed: Landed
         landingHour: Landing Hour
         totalEntries: Σ
@@ -156,7 +156,7 @@ es:
         warehouseInFk: Alm.Entrada
         shipped: F.Envío
         shipmentHour: Hora de envío
-        warehouseOut: Alm.Entrada
+        warehouseOut: Alm.Salida
         landed: F.Entrega
         landingHour: Hora de entrega
         totalEntries: Σ

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -22,6 +22,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import { toTimeFormat, secondsToHoursMinutes } from 'filters/date.js';
 import toDateString from 'filters/toDateString.js';
+import moment from 'moment';
 import { date } from 'quasar';
 
 const route = useRoute();
@@ -64,6 +65,7 @@ const selectedDateFormatted = ref(toDateString(defaultDate.value));
 
 const arrayData = useArrayData('workerData');
 const acl = useAcl();
+const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
 const worker = computed(() => arrayData.store?.data);
 const canSend = computed(() =>
     acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }])
@@ -278,7 +280,7 @@ const fetchHours = async () => {
 
 const fetchWeekData = async () => {
     const where = {
-        year: selectedDate.value.getFullYear(),
+        year: selectedDateYear.value,
         week: selectedWeekNumber.value,
     };
     const mail = (
@@ -370,7 +372,7 @@ const showReasonForm = () => {
 
 const updateWorkerTimeControlMail = async (state, reason) => {
     const params = {
-        year: selectedDate.value.getFullYear(),
+        year: selectedDateYear.value,
         week: selectedWeekNumber.value,
         state,
     };
@@ -400,7 +402,7 @@ const resendEmail = async () => {
     const params = {
         recipient: worker.value[0]?.user?.emailUser?.email,
         week: selectedWeekNumber.value,
-        year: selectedDate.value.getFullYear(),
+        year: selectedDateYear.value,
         workerId: Number(route.params.id),
         state: 'SENDED',
     };

src/pages/Worker/Card/WorkerTimeControlCalendar.vue

@@ -102,8 +102,7 @@ const getWorkWeekElements = () => {
 };
 
 const paintWorkWeeks = async () => {
-    for (var i = 0; i < workWeeksElements.value.length; i++) {
-        const element = workWeeksElements.value[i];
+    for (const element of workWeeksElements.value) {
         const week = Number(element.innerHTML);
         const weekState = workerTimeControlMailsMap.value.get(week);
         const { className, title } = stateClasses[weekState] || {};

src/pages/Worker/WorkerDepartment.vue

@@ -4,7 +4,7 @@ import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <VnSection data-key="WorkerDepartment">
+    <VnSection data-key="WorkerDepartment" :search-bar="false">
         <template #body>
             <div class="flex flex-center q-pa-md">
                 <WorkerDepartmentTree />

test/cypress/.gitignore

@@ -1,2 +1,3 @@
 reports/*
 screenshots/*
+downloads/*

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

@@ -0,0 +1,46 @@
+/// <reference types="cypress" />
+describe('InvoiceOut list', () => {
+    const invoice = {
+        Ticket: { val: '8' },
+        Serial: { val: 'Española rapida', type: 'select' },
+    };
+    const invoiceError = {
+        Ticket: { val: '1' },
+        Serial: { val: 'Española rapida', type: 'select' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/invoice-out/list`);
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('should search and filter an invoice and enter to the summary', () => {
+        cy.typeSearchbar('1{enter}');
+        cy.get('.q-virtual-scroll__content > :nth-child(2) > :nth-child(7)').click();
+        cy.get('.header > a.q-btn > .q-btn__content').click();
+        cy.typeSearchbar('{enter}');
+        cy.dataCy('InvoiceOutFilterAmountBtn').find('input').type('8.88{enter}');
+    });
+
+    it('should download all pdfs', () => {
+        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+        cy.dataCy('InvoiceOutDownloadPdfBtn').click();
+        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+    });
+
+    it('should give an error when manual invoicing a ticket that is already invoiced', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(invoiceError);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('This ticket is already invoiced');
+    });
+
+    it('should create a manual invoice and enter to its summary', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(invoice);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+});

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

@@ -0,0 +1,21 @@
+/// <reference types="cypress" />
+describe('InvoiceOut manual invoice', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/ticket/list`);
+        cy.get('#searchbar input').type('{enter}');
+    });
+
+    it('should create an invoice from a ticket and go to that invoice', () => {
+        cy.searchByLabel('Customer ID', '1101');
+        cy.get(
+            '[data-q-vs-anchor=""] > :nth-child(1) > .q-checkbox > .q-checkbox__inner'
+        ).click();
+        cy.dataCy('ticketListMakeInvoiceBtn').click();
+        cy.checkNotification('Data saved');
+        cy.get('.q-virtual-scroll__content > :nth-child(1) > :nth-child(3)').click();
+        cy.get(':nth-child(8) > .value > .link').click();
+        cy.get('.header > :nth-child(3) > .q-btn__content').click();
+    });
+});

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

@@ -0,0 +1,16 @@
+/// <reference types="cypress" />
+describe('InvoiceOut negative bases', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/invoice-out/negative-bases`);
+    });
+
+    it('should filter and download as CSV', () => {
+        cy.get(
+            ':nth-child(7) > .full-width > :nth-child(1) > .column > div.q-px-xs > .q-field > .q-field__inner > .q-field__control'
+        ).type('23{enter}');
+        cy.get('#subToolbar > .q-btn').click();
+        cy.checkNotification('CSV downloaded successfully');
+    });
+});

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

@@ -0,0 +1,47 @@
+/// <reference types="cypress" />
+describe('InvoiceOut summary', () => {
+    const transferInvoice = {
+        Client: { val: 'employee', type: 'select' },
+        Type: { val: 'Error in customer data', type: 'select' },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/invoice-out/list`);
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('should generate the invoice PDF', () => {
+        cy.typeSearchbar('T1111111{enter}');
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(6)').click();
+        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');
+    });
+
+    it('should delete an invoice ', () => {
+        cy.typeSearchbar('T2222222{enter}');
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(4)').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('InvoiceOut deleted');
+    });
+
+    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();
+        cy.fillInForm(transferInvoice);
+        cy.get('.q-mt-lg > .q-btn').click();
+        cy.checkNotification('Transferred invoice');
+    });
+});

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

@@ -0,0 +1,28 @@
+/// <reference types="cypress" />
+describe('InvoiceOut global invoicing', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('administrative');
+        cy.visit(`/#/invoice-out/global-invoicing`);
+    });
+
+    it('should invoice the client tickets', () => {
+        cy.get('.q-mb-sm > .q-radio__inner').click();
+        cy.dataCy('InvoiceOutGlobalClientSelect').type('1102');
+        cy.get('.q-menu .q-item').contains('1102').click();
+        cy.dataCy('InvoiceOutGlobalSerialSelect').click();
+        cy.get('.q-menu .q-item').contains('global').click();
+        cy.dataCy('InvoiceOutGlobalCompanySelect').type('VNL');
+        cy.get('.q-menu .q-item').contains('VNL').click();
+        cy.dataCy('InvoiceOutGlobalPrinterSelect').type('printer1');
+        cy.get('.q-menu .q-item').contains('printer1').click();
+        cy.get(
+            '[label="Invoice date"] > .q-field > .q-field__inner > .q-field__control'
+        ).click();
+        cy.get(':nth-child(5) > div > .q-btn > .q-btn__content > .block').click();
+        cy.get('.q-date__years-content > :nth-child(2) > .q-btn').click();
+        cy.get('.q-date__calendar-days > :nth-child(6) > .q-btn').click();
+        cy.get('[label="Max date ticket"]').type('01-01-2001{enter}');
+        cy.get('.q-card').should('be.visible');
+    });
+});

test/cypress/integration/outLogin/login.spec.js

@@ -19,6 +19,7 @@ describe('Login', () => {
     it('should fail to log in using wrong password', () => {
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('wrongPassword');
+        cy.get('.q-field__append > .q-icon');
         cy.get('button[type="submit"]').click();
         cy.get('.q-notification__message').should(
             'have.text',

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

@@ -16,10 +16,12 @@ describe('VnSearchBar', () => {
     });
 
     it('should stay on the list page if there are several results or none', () => {
+        cy.typeSearchbar('salesA{enter}');
         cy.typeSearchbar('salesA{enter}');
         checkTableLength(2);
 
         cy.clearSearchbar();
+
         cy.typeSearchbar('0{enter}');
         checkTableLength(0);
     });
@@ -27,6 +29,7 @@ describe('VnSearchBar', () => {
     const searchAndCheck = (searchTerm, expectedText) => {
         cy.clearSearchbar();
         cy.typeSearchbar(`${searchTerm}{enter}`);
+        cy.typeSearchbar(`${searchTerm}{enter}`);
         cy.get(idGap).should('have.text', expectedText);
     };
 

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

@@ -1,6 +1,5 @@
 describe('WorkerCreate', () => {
     const externalRadio = '.q-radio:nth-child(2)';
-    const notification = '.q-notification__message';
     const developerBossId = 120;
     const payMethodCross =
         '.grid-create .full-width > :nth-child(9) .q-select .q-field__append:not(.q-anchor--skip)';
@@ -41,7 +40,7 @@ describe('WorkerCreate', () => {
         cy.fillInForm(internal);
         cy.get(payMethodCross).click();
         cy.get(saveBtn).click();
-        cy.get(notification).should('contains.text', 'Payment method is required');
+        cy.checkNotification('Payment method is required');
     });
 
     it('should create an internal', () => {
@@ -50,13 +49,13 @@ describe('WorkerCreate', () => {
             'Pay method': { val: 'PayMethod one', type: 'select' },
         });
         cy.get(saveBtn).click();
-        cy.get(notification).should('contains.text', 'Data created');
+        cy.checkNotification('Data created');
     });
 
     it('should create an external', () => {
         cy.get(externalRadio).click();
         cy.fillInForm(external);
         cy.get(saveBtn).click();
-        cy.get(notification).should('contains.text', 'Data created');
+        cy.checkNotification('Data created');
     });
 });

test/cypress/integration/zone/zoneBasicData.spec.js

@@ -1,5 +1,4 @@
 describe('ZoneBasicData', () => {
-    const notification = '.q-notification__message';
     const priceBasicData = '[data-cy="Price_input"]';
 
     beforeEach(() => {
@@ -11,13 +10,13 @@ describe('ZoneBasicData', () => {
     it('should throw an error if the name is empty', () => {
         cy.get('[data-cy="zone-basic-data-name"] input').type('{selectall}{backspace}');
         cy.get('.q-btn-group > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', "can't be blank");
+        cy.checkNotification("can't be blank");
     });
 
     it('should throw an error if the price is empty', () => {
         cy.get(priceBasicData).clear();
         cy.get('.q-btn-group > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', 'cannot be blank');
+        cy.checkNotification('cannot be blank');
     });
 
     it("should edit the basicData's zone", () => {

test/cypress/integration/zone/zoneCreate.spec.js

@@ -1,6 +1,4 @@
 describe('ZoneCreate', () => {
-    const notification = '.q-notification__message';
-
     const data = {
         Name: { val: 'Zone pickup D' },
         Price: { val: '3' },
@@ -24,7 +22,7 @@ describe('ZoneCreate', () => {
         cy.get('input[aria-label="Close"]').type('10:00');
         cy.get('body').click();
         cy.get('.q-mt-lg > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', 'Agency cannot be blank');
+        cy.checkNotification('Agency cannot be blank');
     });
 
     it('should create a zone', () => {
@@ -35,6 +33,6 @@ describe('ZoneCreate', () => {
         cy.get('input[aria-label="Close"]').type('10:00');
         cy.get('body').click();
         cy.get('.q-mt-lg > .q-btn--standard').click();
-        cy.get(notification).should('contains.text', 'Data created');
+        cy.checkNotification('Data created');
     });
 });

test/cypress/support/commands.js

@@ -124,7 +124,7 @@ Cypress.Commands.add('countSelectOptions', (selector, option) => {
 });
 
 Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
-    cy.waitForElement('.q-form > .q-card');
+    cy.waitForElement(form);
     cy.get(`${form} input`).each(([el]) => {
         cy.wrap(el)
             .invoke('attr', 'aria-label')
@@ -277,7 +277,7 @@ Cypress.Commands.add('clearSearchbar', (element) => {
     cy.get('[data-cy="vn-searchbar"]').clear();
 });
 
-Cypress.Commands.add('writeSearchbar', (value) => {
+Cypress.Commands.add('typeSearchbar', (value) => {
     cy.get('[data-cy="vn-searchbar"]').type(value);
 });