Merge pull request '#8277 createEntryControl' (!1370) from 8277-createEntryControl into dev

Reviewed-on: #1370
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

cypress.config.js

@@ -44,6 +44,7 @@ export default defineConfig({
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
         downloadsFolder: 'test/cypress/downloads',
+        tmpUploadFolder: 'test/cypress/storage/tmp/dms',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.16.0",
+    "version": "25.18.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -89,4 +89,4 @@
         "vite": "^6.0.11",
         "vitest": "^0.31.1"
     }
-}
+}

src/App.vue

@@ -2,6 +2,7 @@
 import { onMounted } from 'vue';
 import { useQuasar, Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import VnScroll from './components/common/VnScroll.vue';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
@@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
 
 <template>
     <RouterView />
+    <VnScroll/>
 </template>
 
 <style lang="scss">

src/boot/__tests__/axios.spec.js

@@ -67,7 +67,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            expect(result).rejects.toEqual(expect.objectContaining(error));
+            await expect(result).rejects.toEqual(expect.objectContaining(error));
         });
 
         it('should call to the Notify plugin with a message from the response property', async () => {
@@ -83,7 +83,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            expect(result).rejects.toEqual(expect.objectContaining(error));
+            await expect(result).rejects.toEqual(expect.objectContaining(error));
         });
     });
 });

src/boot/vnDate.js

@@ -1,4 +1,6 @@
 import { boot } from 'quasar/wrappers';
+import { date as quasarDate } from 'quasar';
+const { formatDate } = quasarDate;
 
 export default boot(() => {
     Date.vnUTC = () => {
@@ -25,4 +27,34 @@ export default boot(() => {
         const date = new Date(Date.vnUTC());
         return new Date(date.getFullYear(), date.getMonth() + 1, 0);
     };
+
+    Date.getCurrentDateTimeFormatted = (
+        options = {
+            startOfDay: false,
+            endOfDay: true,
+            iso: true,
+            mask: 'DD-MM-YYYY HH:mm',
+        },
+    ) => {
+        const date = Date.vnUTC();
+        if (options.startOfDay) {
+            date.setHours(0, 0, 0);
+        }
+        if (options.endOfDay) {
+            date.setHours(23, 59, 0);
+        }
+        if (options.iso) {
+            return date.toISOString();
+        }
+        return formatDate(date, options.mask);
+    };
+
+    Date.convertToISODateTime = (dateTimeStr) => {
+        const [datePart, timePart] = dateTimeStr.split(' ');
+        const [day, month, year] = datePart.split('-');
+        const [hours, minutes] = timePart.split(':');
+
+        const isoDate = new Date(year, month - 1, day, hours, minutes);
+        return isoDate.toISOString();
+    };
 });

src/components/CreateNewPostcodeForm.vue

@@ -20,7 +20,6 @@ const postcodeFormData = reactive({
     provinceFk: null,
     townFk: null,
 });
-const townFilter = ref({});
 
 const countriesRef = ref(false);
 const provincesOptions = ref([]);
@@ -33,11 +32,11 @@ function onDataSaved(formData) {
     newPostcode.town = town.value.name;
     newPostcode.townFk = town.value.id;
     const provinceObject = provincesOptions.value.find(
-        ({ id }) => id === formData.provinceFk
+        ({ id }) => id === formData.provinceFk,
     );
     newPostcode.province = provinceObject?.name;
     const countryObject = countriesRef.value.opts.find(
-        ({ id }) => id === formData.countryFk
+        ({ id }) => id === formData.countryFk,
     );
     newPostcode.country = countryObject?.name;
     emit('onDataSaved', newPostcode);
@@ -67,21 +66,11 @@ function setTown(newTown, data) {
 }
 async function onCityCreated(newTown, formData) {
     newTown.province = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk
+        (province) => province.id === newTown.provinceFk,
     );
     formData.townFk = newTown;
     setTown(newTown, formData);
 }
-
-async function filterTowns(name) {
-    if (name !== '') {
-        townFilter.value.where = {
-            name: {
-                like: `%${name}%`,
-            },
-        };
-    }
-}
 </script>
 
 <template>
@@ -107,7 +96,6 @@ async function filterTowns(name) {
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
-                    @filter="filterTowns"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
                     url="Towns/location"

src/components/CrudModel.vue

@@ -65,7 +65,7 @@ const $props = defineProps({
         default: null,
     },
     beforeSaveFn: {
-        type: Function,
+        type: [String, Function],
         default: null,
     },
     goTo: {
@@ -83,7 +83,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref([]);
+const formData = ref();
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
@@ -298,6 +298,10 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
+    <SkeletonTable
+        v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
+        :columns="$attrs.columns?.length"
+    />
     <VnPaginate
         :url="url"
         :limit="limit"
@@ -316,10 +320,6 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable
-        v-if="!formData && $attrs.autoLoad"
-        :columns="$attrs.columns?.length"
-    />
     <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />

src/components/EditPictureForm.vue

@@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
             img.onerror = () => {
                 notify(
                     t("This photo provider doesn't allow remote downloads"),
-                    'negative'
+                    'negative',
                 );
             };
         }
@@ -219,11 +219,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateLeft()"
-                    >
+                    />
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate left') }}
-                        </QTooltip> -->
-                    </QIcon>
                     <div>
                         <div ref="photoContainerRef" />
                     </div>
@@ -233,11 +229,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateRight()"
-                    >
+                    />
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate right') }}
-                        </QTooltip> -->
-                    </QIcon>
                 </div>
 
                 <div class="column">
@@ -265,7 +257,6 @@ const makeRequest = async () => {
                                     class="cursor-pointer q-mr-sm"
                                     @click="openInputFile()"
                                 >
-                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
                                 </QIcon>
                                 <QIcon name="info" class="cursor-pointer">
                                     <QTooltip>{{

src/components/FormModel.vue

@@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
-const attrs = useAttrs();
 const $props = defineProps({
     url: {
         type: String,
@@ -99,8 +98,12 @@ const $props = defineProps({
         type: Function,
         default: () => {},
     },
+    preventSubmit: {
+        type: Boolean,
+        default: true,
+    },
 });
-const emit = defineEmits(['onFetch', 'onDataSaved']);
+const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
 const modelValue = computed(
     () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
 ).value;
@@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
     );
 }
 async function onKeyup(evt) {
-    if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
+    if (evt.key === 'Enter' && !$props.preventSubmit) {
         const input = evt.target;
         if (input.type == 'textarea' && evt.shiftKey) {
             let { selectionStart, selectionEnd } = input;
@@ -330,6 +333,7 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
+            v-on="$attrs"
             ref="myForm"
             v-if="formData"
             @submit.prevent="save"
@@ -406,6 +410,7 @@ defineExpose({
             </QBtnDropdown>
             <QBtn
                 v-else
+                data-cy="saveDefaultBtn"
                 :label="tMobile('globals.save')"
                 color="primary"
                 icon="save"

src/components/LeftMenu.vue

@@ -181,7 +181,7 @@ const searchModule = () => {
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
-            <template v-if="$route?.matched[1]?.name === 'Dashboard'">
+            <template v-if="route?.matched[1]?.name === 'Dashboard'">
                 <QItem class="q-pb-md">
                     <VnInput
                         v-model="search"
@@ -262,7 +262,7 @@ const searchModule = () => {
             </template>
 
             <template v-for="item in items" :key="item.name">
-                <template v-if="item.name === $route?.matched[1]?.name">
+                <template v-if="item.name === route?.matched[1]?.name">
                     <QItem class="header">
                         <QItemSection avatar v-if="item.icon">
                             <QIcon :name="item.icon" />

src/components/NavBar.vue

@@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
                     'no-visible': !stateQuery.isLoading().value,
                 }"
                 size="sm"
-                data-cy="loading-spinner"
+                data-cy="navBar-spinner"
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>

src/components/VnTable/VnOrder.vue

@@ -16,7 +16,7 @@ const $props = defineProps({
         required: true,
     },
     searchUrl: {
-        type: String,
+        type: [String, Boolean],
         default: 'table',
     },
     vertical: {

src/components/VnTable/VnTable.vue

@@ -33,6 +33,7 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
 import RightMenu from '../common/RightMenu.vue';
+import VnScroll from '../common/VnScroll.vue'
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -65,7 +66,7 @@ const $props = defineProps({
         default: null,
     },
     create: {
-        type: Object,
+        type: [Boolean, Object],
         default: null,
     },
     createAsDialog: {
@@ -168,6 +169,7 @@ const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
 const app = inject('app');
 const tableHeight = useTableHeight();
+const vnScrollRef = ref(null);
 
 const editingRow = ref(null);
 const editingField = ref(null);
@@ -189,6 +191,17 @@ const tableModes = [
     },
 ];
 
+const onVirtualScroll = ({ to }) => {
+    handleScroll();
+    const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
+    if (virtualScrollContainer) {
+      virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
+      if (vnScrollRef.value) {
+        vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
+      }
+    }
+};
+
 onBeforeMount(() => {
     const urlParams = route.query[$props.searchUrl];
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@@ -327,16 +340,13 @@ function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
-
 function handleScroll() {
-    if ($props.crudModel.disableInfiniteScroll) return;
+    if ($props.crudModel.disableInfiniteScroll) return;		
-
+    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');		
-    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+    const { scrollHeight, scrollTop, clientHeight } = tMiddle;		
-    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;		
-    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
+    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();		
-    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
-
 function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
         const rowIndex = selectedRows[0].$index;
@@ -669,9 +679,9 @@ const rowCtrlClickFunction = computed(() => {
                 ref="tableRef"
                 v-bind="table"
                 :class="[
-                    'vnTable',
+                  'vnTable',
-                    table ? 'selection-cell' : '',
+                  table ? 'selection-cell' : '',
-                    $props.footer ? 'last-row-sticky' : '',
+                  $props.footer ? 'last-row-sticky' : '',
                 ]"
                 wrap-cells
                 :columns="splittedColumns.columns"
@@ -683,7 +693,7 @@ const rowCtrlClickFunction = computed(() => {
                 flat
                 :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="handleScroll"
+                @virtual-scroll="onVirtualScroll"
                 @row-click="(event, row) => handleRowClick(event, row)"
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
@@ -741,6 +751,7 @@ const rowCtrlClickFunction = computed(() => {
                                     withFilters
                                 "
                                 :column="col"
+                                :data-cy="`column-filter-${col.name}`"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
                                 v-model="params[columnName(col)]"
@@ -1087,6 +1098,11 @@ const rowCtrlClickFunction = computed(() => {
             </template>
         </FormModelPopup>
     </QDialog>
+    <VnScroll 
+      ref="vnScrollRef"
+      v-if="isTableMode"
+      :scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
+    />
 </template>
 <i18n>
 en:

src/components/VnTable/VnTableFilter.vue

@@ -30,6 +30,7 @@ function columnName(col) {
         v-bind="$attrs"
         :search-button="true"
         :disable-submit-event="true"
+        :data-key="$attrs['data-key']"
         :search-url
     >
         <template #body="{ params, orders, searchFn }">

src/components/VnTable/VnVisibleColumn.vue

@@ -58,7 +58,7 @@ async function getConfig(url, filter) {
     const response = await axios.get(url, {
         params: { filter: filter },
     });
-    return response.data && response.data.length > 0 ? response.data[0] : null;
+    return response?.data && response?.data?.length > 0 ? response.data[0] : null;
 }
 
 async function fetchViewConfigData() {

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

@@ -11,6 +11,9 @@ describe('VnTable', () => {
             propsData: {
                 columns: [],
             },
+            attrs: {
+                'data-key': 'test',
+            },
         });
         vm = wrapper.vm;
 

src/components/__tests__/CrudModel.spec.js

@@ -11,13 +11,7 @@ describe('CrudModel', () => {
     beforeAll(() => {
         wrapper = createWrapper(CrudModel, {
             global: {
-                stubs: [
+                stubs: ['vnPaginate', 'vue-i18n'],
-                    'vnPaginate',
-                    'useState',
-                    'arrayData',
-                    'useStateStore',
-                    'vue-i18n',
-                ],
                 mocks: {
                     validate: vi.fn(),
                 },
@@ -29,7 +23,7 @@ describe('CrudModel', () => {
                 dataKey: 'crudModelKey',
                 model: 'crudModel',
                 url: 'crudModelUrl',
-                saveFn: '',
+                saveFn: vi.fn(),
             },
         });
         wrapper = wrapper.wrapper;
@@ -231,7 +225,7 @@ describe('CrudModel', () => {
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
 
-            await wrapper.setProps({ saveFn: '' });
+            await wrapper.setProps({ saveFn: null });
         });
 
         it("should use default url if there's not saveFn", async () => {

src/components/__tests__/Leftmenu.spec.js

@@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
         vm = mount('card').vm;
     });
 
-    it('should get routes for card source', async () => {
+    it('should get routes for card source', () => {
         vm.getRoutes();
     });
 });
@@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
     });
 
     it('should get routes for main source', () => {
-        vm.props.source = 'main';
         vm.getRoutes();
         expect(navigation.getModules).toHaveBeenCalled();
     });

src/components/common/VnAccountNumber.vue

@@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
+        @keydown.tab="$refs.inputRef.vnInputRef.blur()"
+        @blur="model = useAccountShortToStandard(model) ?? model"
         @input="model = $event.target.value.replace(/[^\d.]/g, '')"
     />
 </template>

src/components/common/VnDate.vue

@@ -1,5 +1,5 @@
 <script setup>
-const model = defineModel({ type: [String, Number], required: true });
+const model = defineModel({ type: [String, Number], default: '' });
 </script>
 <template>
     <QDate v-model="model" :today-btn="true" :options="$attrs.options" />

src/components/common/VnDms.vue

@@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 
+import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 
 const route = useRoute();
 const { t } = useI18n();
+const { notify } = useNotify();
 const emit = defineEmits(['onDataSaved']);
 
 const $props = defineProps({
@@ -61,8 +63,11 @@ function onFileChange(files) {
 
 function mapperDms(data) {
     const formData = new FormData();
-    const { files } = data;
+    let files = data.files;
-    if (files) formData.append(files?.name, files);
+    if (files) {
+        files = Array.isArray(files) ? files : [files];
+        files.forEach((file) => formData.append(file?.name, file));
+    }
 
     const dms = {
         hasFile: !!data.hasFile,
@@ -83,11 +88,16 @@ function getUrl() {
 }
 
 async function save() {
-    const body = mapperDms(dms.value);
+    try {
-    const response = await axios.post(getUrl(), body[0], body[1]);
+        const body = mapperDms(dms.value);
-    emit('onDataSaved', body[1].params, response);
+        const response = await axios.post(getUrl(), body[0], body[1]);
-    delete dms.value.files;
+        emit('onDataSaved', body[1].params, response);
-    return response;
+        notify(t('globals.dataSaved'), 'positive');
+        delete dms.value.files;
+        return response;
+    } catch (e) {
+        throw e;
+    }
 }
 
 function defaultData() {
@@ -208,7 +218,7 @@ function addDefaultData(data) {
 }
 </style>
 <i18n>
-en:
+en:    
     contentTypesInfo: Allowed file types {allowedContentTypes}
     EntryDmsDescription: Reference {reference}
     WorkersDescription: Working of employee id {reference}

src/components/common/VnDmsList.vue

@@ -13,10 +13,12 @@ import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSession } from 'src/composables/useSession';
+import useNotify from 'src/composables/useNotify.js';
 
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
+const { notify } = useNotify();
 const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
@@ -88,7 +90,6 @@ const dmsFilter = {
             ],
         },
     },
-    where: { [$props.filter]: route.params.id },
 };
 
 const columns = computed(() => [
@@ -258,9 +259,16 @@ function deleteDms(dmsFk) {
             },
         })
         .onOk(async () => {
-            await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
+            try {
-            const index = rows.value.findIndex((row) => row.id == dmsFk);
+                await axios.post(
-            rows.value.splice(index, 1);
+                    `${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
+                );
+                const index = rows.value.findIndex((row) => row.id == dmsFk);
+                rows.value.splice(index, 1);
+                notify(t('globals.dataDeleted'), 'positive');
+            } catch (e) {
+                throw e;
+            }
         });
 }
 
@@ -298,7 +306,9 @@ defineExpose({
         :data-key="$props.model"
         :url="$props.model"
         :user-filter="dmsFilter"
+        search-url="dmsFilter"
         :order="['dmsFk DESC']"
+        :filter="{ where: { [$props.filter]: route.params.id } }"
         auto-load
         @on-fetch="setData"
     >

src/components/common/VnInputDate.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { onMounted, watch, computed, ref, useAttrs } from 'vue';
+import { nextTick, watch, computed, ref, useAttrs } from 'vue';
-import { date } from 'quasar';
+import { date, getCssVar } from 'quasar';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
@@ -20,61 +20,18 @@ const $props = defineProps({
 });
 
 const vnInputDateRef = ref(null);
+const errColor = getCssVar('negative');
+const textColor = ref('');
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
-const mask = ref();
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
-const formattedDate = computed({
-    get() {
-        if (!model.value) return model.value;
-        return date.formatDate(new Date(model.value), dateFormat);
-    },
-    set(value) {
-        if (value == model.value) return;
-        let newDate;
-        if (value) {
-            // parse input
-            if (value.includes('/') && value.length >= 10) {
-                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                value = date.formatDate(
-                    new Date(value).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
-                );
-            }
-            const [year, month, day] = value.split('-').map((e) => parseInt(e));
-            newDate = new Date(year, month - 1, day);
-            if (model.value) {
-                const orgDate =
-                    model.value instanceof Date ? model.value : new Date(model.value);
-
-                newDate.setHours(
-                    orgDate.getHours(),
-                    orgDate.getMinutes(),
-                    orgDate.getSeconds(),
-                    orgDate.getMilliseconds(),
-                );
-            }
-        }
-        if (!isNaN(newDate)) model.value = newDate.toISOString();
-    },
-});
-
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
 );
-onMounted(() => {
-    // fix quasar bug
-    mask.value = '##/##/####';
-});
-watch(
-    () => model.value,
-    (val) => (formattedDate.value = val),
-    { immediate: true },
-);
 
 const styleAttrs = computed(() => {
     return $props.isOutlined
@@ -86,28 +43,138 @@ const styleAttrs = computed(() => {
         : {};
 });
 
+const inputValue = ref('');
+
+const validateAndCleanInput = (value) => {
+    inputValue.value = value.replace(/[^0-9./-]/g, '');
+};
+
 const manageDate = (date) => {
-    formattedDate.value = date;
+    inputValue.value = date.split('/').reverse().join('/');
     isPopupOpen.value = false;
 };
+
+watch(
+    () => model.value,
+    (nVal) => {
+        if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
+        else inputValue.value = '';
+    },
+    { immediate: true },
+);
+
+const formatDate = () => {
+    let value = inputValue.value;
+    if (!value || value === model.value) {
+        textColor.value = '';
+        return;
+    }
+    const regex =
+        /^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
+    if (!regex.test(value)) {
+        textColor.value = errColor;
+        return;
+    }
+
+    value = value.replace(/[.-]/g, '/');
+    const parts = value.split('/');
+    if (parts.length < 2) {
+        textColor.value = errColor;
+        return;
+    }
+
+    let [day, month, year] = parts;
+    if (day.length === 1) day = '0' + day;
+    if (month.length === 1) month = '0' + month;
+
+    const currentYear = Date.vnNew().getFullYear();
+    if (!year) year = currentYear;
+    const millennium = currentYear.toString().slice(0, 1);
+
+    switch (year.length) {
+        case 1:
+            year = `${millennium}00${year}`;
+            break;
+        case 2:
+            year = `${millennium}0${year}`;
+            break;
+        case 3:
+            year = `${millennium}${year}`;
+            break;
+        case 4:
+            break;
+    }
+
+    let isoCandidate = `${year}/${month}/${day}`;
+    isoCandidate = date.formatDate(
+        new Date(isoCandidate).toISOString(),
+        'YYYY-MM-DDTHH:mm:ss.SSSZ',
+    );
+    const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
+    const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
+
+    const isValidDate =
+        parsedDate instanceof Date &&
+        !isNaN(parsedDate) &&
+        parsedDate.getFullYear() === parseInt(year) &&
+        parsedDate.getMonth() === parseInt(month) - 1 &&
+        parsedDate.getDate() === parseInt(day);
+
+    if (!isValidDate) {
+        textColor.value = errColor;
+        return;
+    }
+
+    if (model.value) {
+        const original =
+            model.value instanceof Date ? model.value : new Date(model.value);
+        parsedDate.setHours(
+            original.getHours(),
+            original.getMinutes(),
+            original.getSeconds(),
+            original.getMilliseconds(),
+        );
+    }
+
+    model.value = parsedDate.toISOString();
+
+    textColor.value = '';
+};
+
+const handleEnter = (event) => {
+    formatDate();
+
+    nextTick(() => {
+        const newEvent = new KeyboardEvent('keydown', {
+            key: 'Enter',
+            code: 'Enter',
+            bubbles: true,
+            cancelable: true,
+        });
+        vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
+    });
+};
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
             ref="vnInputDateRef"
-            v-model="formattedDate"
+            v-model="inputValue"
             class="vn-input-date"
-            :mask="mask"
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: isRequired }"
             :rules="mixinRules"
             :clearable="false"
+            :input-style="{ color: textColor }"
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
+            @blur="formatDate"
+            @keydown.enter.prevent="handleEnter"
             hide-bottom-space
             :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
+            @update:model-value="validateAndCleanInput"
         >
             <template #append>
                 <QIcon
@@ -116,11 +183,12 @@ const manageDate = (date) => {
                     v-if="
                         ($attrs.clearable == undefined || $attrs.clearable) &&
                         hover &&
-                        model &&
+                        inputValue &&
                         !$attrs.disable
                     "
                     @click="
                         vnInputDateRef.focus();
+                        inputValue = null;
                         model = null;
                         isPopupOpen = false;
                     "

src/components/common/VnInputDateTime.vue

@@ -0,0 +1,79 @@
+<script setup>
+import { computed, useAttrs } from 'vue';
+import { date } from 'quasar';
+import VnDate from './VnDate.vue';
+import VnTime from './VnTime.vue';
+
+const $attrs = useAttrs();
+const model = defineModel({ type: [Date, String] });
+
+const $props = defineProps({
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
+});
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
+const mask = 'DD-MM-YYYY HH:mm';
+const selectedDate = computed({
+    get() {
+        if (!model.value) return JSON.stringify(new Date(model.value));
+        return date.formatDate(new Date(model.value), mask);
+    },
+    set(value) {
+        model.value = Date.convertToISODateTime(value);
+    },
+});
+const manageDate = (date) => {
+    selectedDate.value = date;
+};
+</script>
+
+<template>
+    <div @mouseover="hover = true" @mouseleave="hover = false">
+        <QInput
+            ref="vnInputDateRef"
+            v-model="selectedDate"
+            class="vn-input-date"
+            placeholder="dd/mm/aaaa HH:mm"
+            v-bind="{ ...$attrs, ...styleAttrs }"
+            :clearable="false"
+            @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
+            hide-bottom-space
+            @update:model-value="manageDate"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
+        >
+            <template #prepend>
+                <QIcon name="today" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnDate :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+            <template #append>
+                <QIcon name="access_time" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnTime format24h :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+        </QInput>
+    </div>
+</template>
+<i18n>
+    es:
+        Open date: Abrir fecha
+</i18n>

src/components/common/VnScroll.vue

@@ -0,0 +1,100 @@
+<script setup>
+import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
+
+const props = defineProps({
+    scrollTarget: { type: [String, Object], default: 'window' }
+});
+
+const scrollPosition = ref(0);
+const showButton = ref(false);
+let scrollContainer = null;
+
+const onScroll = () => {
+    if (!scrollContainer) return;
+    scrollPosition.value = 
+        typeof props.scrollTarget === 'object' 
+            ? scrollContainer.scrollTop 
+            : window.scrollY;
+};
+
+watch(scrollPosition, (newValue) => {
+    showButton.value = newValue > 0;
+});
+
+const scrollToTop = () => {
+    if (scrollContainer) {
+        scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
+    }
+};
+
+const updateScrollContainer = (container) => {
+  if (container) {
+    if (scrollContainer) {
+      scrollContainer.removeEventListener('scroll', onScroll);
+    }
+    scrollContainer = container;
+    scrollContainer.addEventListener('scroll', onScroll);
+    onScroll();
+  }
+};
+
+defineExpose({
+  updateScrollContainer
+});
+
+const initScrollContainer = async () => {
+    await nextTick();
+
+    if (typeof props.scrollTarget === 'object') {
+        scrollContainer = props.scrollTarget;
+    } else {
+        scrollContainer = window;
+    }
+
+    if (!scrollContainer) return
+        scrollContainer.addEventListener('scroll', onScroll);    
+};
+
+
+onMounted(() => {
+    initScrollContainer();
+});
+
+onUnmounted(() => {
+    if (scrollContainer) {
+        scrollContainer.removeEventListener('scroll', onScroll);
+        scrollContainer = null;
+    }
+});
+</script>
+
+<template>
+    <QIcon
+        v-if="showButton"
+        color="primary"
+        name="keyboard_arrow_up"
+        class="scroll-to-top"
+        @click="scrollToTop"
+    >
+        <QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
+    </QIcon>
+</template>
+
+<style scoped>
+.scroll-to-top {
+  position: fixed;
+  top: 70px;
+  font-size: 65px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 1000;
+  transition: transform 0.2s ease-in-out;
+}
+
+.scroll-to-top:hover {
+  transform: translateX(-50%) scale(1.2);
+  cursor: pointer;
+  filter: brightness(0.8);
+}
+</style>
+

src/components/common/VnSelect.vue

@@ -54,6 +54,10 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
+    filterFn: {
+        type: Function,
+        default: null,
+    },
     exprBuilder: {
         type: Function,
         default: null,
@@ -62,16 +66,12 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    defaultFilter: {
-        type: Boolean,
-        default: true,
-    },
     fields: {
         type: Array,
         default: null,
     },
     include: {
-        type: [Object, Array],
+        type: [Object, Array, String],
         default: null,
     },
     where: {
@@ -79,7 +79,7 @@ const $props = defineProps({
         default: null,
     },
     sortBy: {
-        type: String,
+        type: [String, Array],
         default: null,
     },
     limit: {
@@ -152,10 +152,22 @@ const value = computed({
     },
 });
 
+const arrayDataKey =
+    $props.dataKey ??
+    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
+
+const arrayData = useArrayData(arrayDataKey, {
+    url: $props.url,
+    searchUrl: false,
+    mapKey: $attrs['map-key'],
+});
+
 const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
 
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -174,16 +186,7 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const arrayDataKey =
+const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
-    $props.dataKey ??
-    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
-
-const arrayData = useArrayData(arrayDataKey, {
-    url: $props.url,
-    searchUrl: false,
-    mapKey: $attrs['map-key'],
-});
-
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -252,43 +255,41 @@ async function fetchFilter(val) {
 }
 
 async function filterHandler(val, update) {
-    if (isLoading.value) return update();
-    if (!val && lastVal.value === val) {
-        lastVal.value = val;
-        return update();
-    }
-    lastVal.value = val;
     let newOptions;
 
-    if (!$props.defaultFilter) return update();
+    if ($props.filterFn) update($props.filterFn(val));
-    if (
+    else if (!val && lastVal.value === val) update();
-        $props.url &&
+    else {
-        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
+        const makeRequest =
-    ) {
+            ($props.url && $props.limit) ||
-        newOptions = await fetchFilter(val);
+            (!$props.limit && Object.keys(myOptions.value).length === 0);
-    } else newOptions = filter(val, myOptionsOriginal.value);
+        newOptions = makeRequest
-    update(
+            ? await fetchFilter(val)
-        () => {
+            : filter(val, myOptionsOriginal.value);
-            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
-                newOptions.unshift(noOneOpt.value);
 
-            myOptions.value = newOptions;
+        update(
-        },
+            () => {
-        (ref) => {
+                if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
-            if (val !== '' && ref.options.length > 0) {
+                    newOptions.unshift(noOneOpt.value);
-                ref.setOptionIndex(-1);
+
-                ref.moveOptionSelection(1, true);
+                myOptions.value = newOptions;
-            }
+            },
-        },
+            (ref) => {
-    );
+                if (val !== '' && ref.options.length > 0) {
+                    ref.setOptionIndex(-1);
+                    ref.moveOptionSelection(1, true);
+                }
+            },
+        );
+    }
+
+    lastVal.value = val;
 }
 
 function nullishToTrue(value) {
     return value ?? true;
 }
 
-const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
-
 async function onScroll({ to, direction, from, index }) {
     const lastIndex = myOptions.value.length - 1;
 
@@ -366,7 +367,8 @@ function getCaption(opt) {
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
-        :loading="isLoading"
+        :loading="someIsLoading"
+        :disable="someIsLoading"
         @virtual-scroll="onScroll"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
@@ -374,7 +376,7 @@ function getCaption(opt) {
     >
         <template #append>
             <QIcon
-                v-show="isClearable && value"
+                v-show="isClearable && value != null && value !== ''"
                 name="close"
                 @click="
                     () => {
@@ -389,7 +391,7 @@ function getCaption(opt) {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <div v-if="slotName == 'append'">
                 <QIcon
-                    v-show="isClearable && value"
+                    v-show="isClearable && value != null && value !== ''"
                     name="close"
                     @click.stop="
                         () => {
@@ -414,7 +416,7 @@ function getCaption(opt) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="getCaption(opt)">
+                    <QItemLabel caption v-if="getCaption(opt) !== false">
                         {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>

src/components/common/VnSmsDialog.vue

@@ -232,7 +232,7 @@ fr:
     pt: Portugais
 pt:
     Send SMS: Enviar SMS
-    CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
+    CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
     Language: Linguagem
     Phone: Móvel
     Subject: Assunto

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

@@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
 
 describe('VnDiscount', () => {
     let vm;
-    
+
     beforeAll(() => {
         vm = createWrapper(VnDiscount, {
             props: {
@@ -12,7 +12,9 @@ describe('VnDiscount', () => {
                 price: 100,
                 quantity: 2,
                 discount: 10,
-            }
+                mana: 10,
+                promise: vi.fn(),
+            },
         }).vm;
     });
 
@@ -21,8 +23,8 @@ describe('VnDiscount', () => {
     });
 
     describe('total', () => {
-        it('should calculate total correctly', () => {            
+        it('should calculate total correctly', () => {
             expect(vm.total).toBe(180);
         });
     });
-});
+});

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

@@ -41,10 +41,12 @@ describe('VnDms', () => {
         companyFk: 2,
         dmsTypeFk: 3,
         description: 'This is a test description',
-        files: {
+        files: [
-            name: 'example.txt',
+            {
-            content: new Blob(['file content'], { type: 'text/plain' }),
+                name: 'example.txt',
-        },
+                content: new Blob(['file content'], { type: 'text/plain' }),
+            },
+        ],
     };
 
     const expectedBody = {
@@ -83,7 +85,7 @@ describe('VnDms', () => {
         it('should map DMS data correctly and add file to FormData', () => {
             const [formData, params] = vm.mapperDms(data);
 
-            expect(formData.get('example.txt')).toBe(data.files);
+            expect([formData.get('example.txt')]).toStrictEqual(data.files);
             expect(expectedBody).toEqual(params.params);
         });
 

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

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

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

@@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 let vm;
 let wrapper;
 
-function generateWrapper(date, outlined, required) {
+function generateWrapper(outlined = false, required = false) {
     wrapper = createWrapper(VnInputDate, {
         props: {
-            modelValue: date,
+            modelValue: '2000-12-31T23:00:00.000Z',
+            'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
         },
         attrs: {
             isOutlined: outlined,
-            required: required
+            required: required,
         },
     });
     wrapper = wrapper.wrapper;
     vm = wrapper.vm;
-};
+}
 
 describe('VnInputDate', () => {
-
+    describe('formattedDate', () => {
-    describe('formattedDate', () => {     
+        it('validateAndCleanInput should remove non-numeric characters', async () => {
-        it('formats a valid date correctly', async () => {
+            generateWrapper();
-            generateWrapper('2023-12-25', false, false);
+            vm.validateAndCleanInput('10a/1s2/2dd0a23');
             await vm.$nextTick();
-            expect(vm.formattedDate).toBe('25/12/2023');
+            expect(vm.inputValue).toBe('10/12/2023');
         });
 
-        it('updates the model value when a new date is set', async () => {
+        it('manageDate should reverse the date', async () => {
-            const input = wrapper.find('input');
+            generateWrapper();
-            await input.setValue('31/12/2023');
+            vm.manageDate('10/12/2023');
-            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+            await vm.$nextTick();
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+            expect(vm.inputValue).toBe('2023/12/10');
         });
 
-        it('should not update the model value when an invalid date is set', async () => {
+        it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
             const input = wrapper.find('input');
-            await input.setValue('invalid-date');
+            await input.setValue('25.12/2002');
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+            await vm.$nextTick();
-        }); 
+            await vm.formatDate();
+            expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
+        });
+
+        it('should format the date correctly when a valid date is entered with short year', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('31.12-23');
+            await vm.$nextTick();
+            await vm.formatDate();
+            expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
+        });
+
+        it('should format the date correctly when a valid date is entered without year', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('12.03');
+            await vm.$nextTick();
+            await vm.formatDate();
+            expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
+        });
     });
 
     describe('styleAttrs', () => {
         it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper('2023-12-25', false, false);
+            generateWrapper();
             await vm.$nextTick();
-            expect(vm.styleAttrs).toEqual({}); 
+            expect(vm.styleAttrs).toEqual({});
         });
 
-        it('should set styleAttrs when isOutlined is true', async () => {        
+        it('should set styleAttrs when isOutlined is true', async () => {
-            generateWrapper('2023-12-25', true, false);
+            generateWrapper(true, false);
             await vm.$nextTick();
             expect(vm.styleAttrs.outlined).toBe(true);
         });
@@ -58,15 +77,15 @@ describe('VnInputDate', () => {
 
     describe('required', () => {
         it('should not applies required class when isRequired is false', async () => {
-            generateWrapper('2023-12-25', false, false);
+            generateWrapper();
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
         });
-        
+
         it('should applies required class when isRequired is true', async () => {
-            generateWrapper('2023-12-25', false, true);
+            generateWrapper(false, true);
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).toContain('required');
         });
     });
-});
+});

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

@@ -0,0 +1,81 @@
+import { createWrapper } from 'app/test/vitest/helper.js';
+import { describe, it, expect, beforeAll } from 'vitest';
+import VnInputDateTime from 'components/common/VnInputDateTime.vue';
+import vnDateBoot from 'src/boot/vnDate';
+
+let vm;
+let wrapper;
+
+beforeAll(() => {
+    // Initialize the vnDate boot
+    vnDateBoot();
+});
+function generateWrapper(date, outlined, showEvent) {
+    wrapper = createWrapper(VnInputDateTime, {
+        props: {
+            modelValue: date,
+            isOutlined: outlined,
+            showEvent: showEvent,
+        },
+    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+}
+
+describe('VnInputDateTime', () => {
+    describe('selectedDate', () => {
+        it('formats a valid datetime correctly', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).toBe('25-12-2023 10:30');
+        });
+
+        it('handles null date value', async () => {
+            generateWrapper(null, false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).not.toBe(null);
+        });
+
+        it('updates the model value when a new datetime is set', async () => {
+            vm.selectedDate = '31-12-2023 15:45';
+            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+        });
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({});
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {
+            generateWrapper('2023-12-25T10:30:00', true, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({
+                dense: true,
+                outlined: true,
+                rounded: true,
+            });
+        });
+    });
+
+    describe('component rendering', () => {
+        it('should render date and time icons', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const icons = wrapper.findAllComponents({ name: 'QIcon' });
+            expect(icons.length).toBe(2);
+            expect(icons[0].props('name')).toBe('today');
+            expect(icons[1].props('name')).toBe('access_time');
+        });
+
+        it('should render popup proxies for date and time', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
+            expect(popups.length).toBe(2);
+        });
+    });
+});

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

@@ -90,8 +90,10 @@ describe('VnLog', () => {
 
         vm = createWrapper(VnLog, {
             global: {
-                stubs: [],
+                stubs: ['FetchData', 'vue-i18n'],
-                mocks: {},
+                mocks: {
+                    fetch: vi.fn(),
+                },
             },
             propsData: {
                 model: 'Claim',

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

@@ -26,7 +26,7 @@ describe('VnNotes', () => {
     ) {
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
-            propsData: options,
+            propsData: { ...defaultOptions, ...options },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;

src/components/ui/EntityDescriptor.vue

@@ -58,7 +58,8 @@ async function getData() {
     store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
-        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        await arrayData.fetch({ append: false, updateRouter: false });
+        const { data } = store;
         state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {

src/components/ui/VnConfirm.vue

@@ -89,24 +89,26 @@ function cancel() {
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
-                <QBtn
+                <slot name="actions" :actions="{ confirm, cancel }">
-                    :label="t('globals.cancel')"
+                    <QBtn
-                    color="primary"
+                        :label="t('globals.cancel')"
-                    :disable="isLoading"
+                        color="primary"
-                    flat
+                        :disable="isLoading"
-                    @click="cancel()"
+                        flat
-                    data-cy="VnConfirm_cancel"
+                        @click="cancel()"
-                />
+                        data-cy="VnConfirm_cancel"
-                <QBtn
+                    />
-                    :label="t('globals.confirm')"
+                    <QBtn
-                    :title="t('globals.confirm')"
+                        :label="t('globals.confirm')"
-                    color="primary"
+                        :title="t('globals.confirm')"
-                    :loading="isLoading"
+                        color="primary"
-                    @click="confirm()"
+                        :loading="isLoading"
-                    unelevated
+                        @click="confirm()"
-                    autofocus
+                        unelevated
-                    data-cy="VnConfirm_confirm"
+                        autofocus
-                />
+                        data-cy="VnConfirm_confirm"
+                    />
+                </slot>
             </QCardActions>
         </QCard>
     </QDialog>

src/components/ui/VnFilterPanel.vue

@@ -212,6 +212,7 @@ const getLocale = (label) => {
         color="primary"
         style="position: fixed; z-index: 1; right: 0; bottom: 0"
         icon="search"
+        data-cy="vnFilterPanel_search"
         @click="search()"
     >
         <QTooltip bottom anchor="bottom right">
@@ -229,6 +230,7 @@ const getLocale = (label) => {
                 <QItemSection top side>
                     <QBtn
                         @click="clearFilters"
+                        data-cy="clearFilters"
                         color="primary"
                         dense
                         flat
@@ -292,6 +294,7 @@ const getLocale = (label) => {
         </QList>
     </QForm>
     <QInnerLoading
+        data-cy="filterPanel-spinner"
         :label="t('globals.pleaseWait')"
         :showing="isLoading"
         color="primary"

src/components/ui/VnPaginate.vue

@@ -2,7 +2,9 @@
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
+import { useAttrs } from 'vue';
 
+const attrs = useAttrs();
 const { t } = useI18n();
 
 const props = defineProps({
@@ -67,7 +69,7 @@ const props = defineProps({
         default: null,
     },
     searchUrl: {
-        type: String,
+        type: [String, Boolean],
         default: null,
     },
     disableInfiniteScroll: {
@@ -75,7 +77,7 @@ const props = defineProps({
         default: false,
     },
     mapKey: {
-        type: String,
+        type: [String, Boolean],
         default: '',
     },
     keyData: {
@@ -220,7 +222,7 @@ defineExpose({
 </script>
 
 <template>
-    <div class="full-width">
+    <div class="full-width" v-bind="attrs">
         <div
             v-if="!store.data && !store.data?.length && !isLoading"
             class="info-row q-pa-md text-center"

src/components/ui/VnSearchbar.vue

@@ -46,7 +46,7 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: String,
+        type: [String, Array],
         default: '',
     },
     limit: {

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

@@ -23,10 +23,15 @@ describe('CardSummary', () => {
 
     beforeEach(() => {
         wrapper = createWrapper(CardSummary, {
+            global: {
+                mocks: {
+                    validate: vi.fn(),
+                },
+            },
             propsData: {
                 dataKey: 'cardSummaryKey',
                 url: 'cardSummaryUrl',
-                filter: 'cardFilter',
+                filter: { key: 'cardFilter' },
             },
         });
         vm = wrapper.vm;
@@ -50,7 +55,7 @@ describe('CardSummary', () => {
 
     it('should set correct props to the store', () => {
         expect(vm.store.url).toEqual('cardSummaryUrl');
-        expect(vm.store.filter).toEqual('cardFilter');
+        expect(vm.store.filter).toEqual({ key: 'cardFilter' });
     });
 
     it('should respond to prop changes and refetch data', async () => {

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

@@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
     let wrapper;
     let applyFilterSpy;
     const searchText = 'Bolas de madera';
-    const userParams = {staticKey: 'staticValue'};
+    const userParams = { staticKey: 'staticValue' };
 
     beforeEach(async () => {
         wrapper = createWrapper(VnSearchbar, {
@@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
 
         vm.searchText = searchText;
         vm.arrayData.store.userParams = userParams;
-        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
+        applyFilterSpy = vi
-        
+            .spyOn(vm.arrayData, 'applyFilter')
+            .mockImplementation(() => {});
     });
 
     afterEach(() => {
@@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
     });
 
     it('search resets pagination and applies filter', async () => {
-        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
+        const resetPaginationSpy = vi
+            .spyOn(vm.arrayData, 'resetPagination')
+            .mockImplementation(() => {});
         await vm.search();
 
         expect(resetPaginationSpy).toHaveBeenCalled();
@@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
 
         expect(applyFilterSpy).toHaveBeenCalledWith({
             params: { staticKey: 'staticValue', search: searchText },
-            filter: {skip: 0},
+            filter: { skip: 0 },
         });
     });
 
@@ -68,4 +71,4 @@ describe('VnSearchbar', () => {
         });
         expect(vm.to.query.searchParam).toBe(expectedQuery);
     });
-});
+});

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

@@ -1,5 +1,4 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import axios from 'axios';
 import { createWrapper } from 'app/test/vitest/helper';
 import VnSms from 'src/components/ui/VnSms.vue';
 
@@ -12,6 +11,9 @@ describe('VnSms', () => {
                 stubs: ['VnPaginate'],
                 mocks: {},
             },
+            propsData: {
+                url: 'SmsUrl',
+            },
         }).vm;
     });
 

src/composables/__tests__/useArrayData.spec.js

@@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
 import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 import { setActivePinia, createPinia } from 'pinia';
+import { defineComponent, h } from 'vue';
+import { mount } from '@vue/test-utils';
 
 describe('useArrayData', () => {
     const filter = '{"limit":20,"skip":0}';
@@ -43,7 +45,7 @@ describe('useArrayData', () => {
     it('should fetch and replace url with new params', async () => {
         vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
 
-        const arrayData = useArrayData('ArrayData', {
+        const arrayData = mountArrayData('ArrayData', {
             url: 'mockUrl',
             searchUrl: 'params',
         });
@@ -72,7 +74,7 @@ describe('useArrayData', () => {
             data: [{ id: 1 }],
         });
 
-        const arrayData = useArrayData('ArrayData', {
+        const arrayData = mountArrayData('ArrayData', {
             url: 'mockUrl',
             navigate: {},
         });
@@ -94,7 +96,7 @@ describe('useArrayData', () => {
             ],
         });
 
-        const arrayData = useArrayData('ArrayData', {
+        const arrayData = mountArrayData('ArrayData', {
             url: 'mockUrl',
             oneRecord: true,
         });
@@ -107,3 +109,17 @@ describe('useArrayData', () => {
         });
     });
 });
+
+function mountArrayData(...args) {
+    let arrayData;
+
+    const TestComponent = defineComponent({
+        setup() {
+            arrayData = useArrayData(...args);
+            return () => h('div');
+        },
+    });
+
+    const asd = mount(TestComponent);
+    return arrayData;
+}

src/composables/__tests__/useSession.spec.js

@@ -64,88 +64,84 @@ describe('session', () => {
         });
     });
 
-    describe(
+    describe('login', () => {
-        'login',
+        const expectedUser = {
-        () => {
+            id: 999,
-            const expectedUser = {
+            name: `T'Challa`,
-                id: 999,
+            nickname: 'Black Panther',
-                name: `T'Challa`,
+            lang: 'en',
-                nickname: 'Black Panther',
+            userConfig: {
-                lang: 'en',
+                darkMode: false,
-                userConfig: {
+            },
-                    darkMode: false,
+            worker: { department: { departmentFk: 155 } },
+        };
+        const rolesData = [
+            {
+                role: {
+                    name: 'salesPerson',
                 },
-                worker: { department: { departmentFk: 155 } },
+            },
-            };
+            {
-            const rolesData = [
+                role: {
-                {
+                    name: 'admin',
-                    role: {
-                        name: 'salesPerson',
-                    },
                 },
-                {
+            },
-                    role: {
+        ];
-                        name: 'admin',
+        beforeEach(() => {
-                    },
+            vi.spyOn(axios, 'get').mockImplementation((url) => {
-                },
+                if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
-            ];
+                return Promise.resolve({
-            beforeEach(() => {
+                    data: { roles: rolesData, user: expectedUser },
-                vi.spyOn(axios, 'get').mockImplementation((url) => {
-                    if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
-                    return Promise.resolve({
-                        data: { roles: rolesData, user: expectedUser },
-                    });
                 });
             });
+        });
 
-            it('should fetch the user roles and then set token in the sessionStorage', async () => {
+        it('should fetch the user roles and then set token in the sessionStorage', async () => {
-                const expectedRoles = ['salesPerson', 'admin'];
+            const expectedRoles = ['salesPerson', 'admin'];
-                const expectedToken = 'mySessionToken';
+            const expectedToken = 'mySessionToken';
-                const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
-                const keepLogin = false;
+            const keepLogin = false;
 
-                await session.login({
+            await session.login({
-                    token: expectedToken,
+                token: expectedToken,
-                    tokenMultimedia: expectedTokenMultimedia,
+                tokenMultimedia: expectedTokenMultimedia,
-                    keepLogin,
+                keepLogin,
-                });
-
-                const roles = state.getRoles();
-                const localToken = localStorage.getItem('token');
-                const sessionToken = sessionStorage.getItem('token');
-
-                expect(roles.value).toEqual(expectedRoles);
-                expect(localToken).toBeNull();
-                expect(sessionToken).toEqual(expectedToken);
-
-                await session.destroy(); // this clears token and user for any other test
             });
 
-            it('should fetch the user roles and then set token in the localStorage', async () => {
+            const roles = state.getRoles();
-                const expectedRoles = ['salesPerson', 'admin'];
+            const localToken = localStorage.getItem('token');
-                const expectedToken = 'myLocalToken';
+            const sessionToken = sessionStorage.getItem('token');
-                const expectedTokenMultimedia = 'myLocalTokenMultimedia';
-                const keepLogin = true;
 
-                await session.login({
+            expect(roles.value).toEqual(expectedRoles);
-                    token: expectedToken,
+            expect(localToken).toBeNull();
-                    tokenMultimedia: expectedTokenMultimedia,
+            expect(sessionToken).toEqual(expectedToken);
-                    keepLogin,
-                });
 
-                const roles = state.getRoles();
+            await session.destroy(); // this clears token and user for any other test
-                const localToken = localStorage.getItem('token');
+        });
-                const sessionToken = sessionStorage.getItem('token');
 
-                expect(roles.value).toEqual(expectedRoles);
+        it('should fetch the user roles and then set token in the localStorage', async () => {
-                expect(localToken).toEqual(expectedToken);
+            const expectedRoles = ['salesPerson', 'admin'];
-                expect(sessionToken).toBeNull();
+            const expectedToken = 'myLocalToken';
+            const expectedTokenMultimedia = 'myLocalTokenMultimedia';
+            const keepLogin = true;
 
-                await session.destroy(); // this clears token and user for any other test
+            await session.login({
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin,
             });
-        },
+
-        {},
+            const roles = state.getRoles();
-    );
+            const localToken = localStorage.getItem('token');
+            const sessionToken = sessionStorage.getItem('token');
+
+            expect(roles.value).toEqual(expectedRoles);
+            expect(localToken).toEqual(expectedToken);
+            expect(sessionToken).toBeNull();
+
+            await session.destroy(); // this clears token and user for any other test
+        });
+    });
 
     describe('RenewToken', () => {
         const expectedToken = 'myToken';

src/composables/useArrayData.js

@@ -1,4 +1,4 @@
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) {
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);
-    const isLoading = computed(() => store.isLoading || false);
+    const isLoading = ref(store.isLoading || false);
 
     return {
         fetch,

src/i18n/locale/en.yml

@@ -6,6 +6,7 @@ globals:
     quantity: Quantity
     entity: Entity
     preview: Preview
+    scrollToTop: Go up
     user: User
     details: Details
     collapseMenu: Collapse lateral menu
@@ -19,6 +20,7 @@ globals:
     logOut: Log out
     date: Date
     dataSaved: Data saved
+    openDetail: Open detail
     dataDeleted: Data deleted
     delete: Delete
     search: Search
@@ -160,6 +162,9 @@ globals:
     department: Department
     noData: No data available
     vehicle: Vehicle
+    selectDocumentId: Select document id
+    document: Document
+    import: Import from existing
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -341,6 +346,7 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
+        entryPreAccount: Pre-account
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?

src/i18n/locale/es.yml

@@ -6,6 +6,7 @@ globals:
     quantity: Cantidad
     entity: Entidad
     preview: Vista previa
+    scrollToTop: Ir arriba
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
@@ -20,10 +21,11 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    dataCreated: Datos creados
+    openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
     changes: Cambios
-    dataCreated: Datos creados
     add: Añadir
     create: Crear
     edit: Modificar
@@ -164,6 +166,9 @@ globals:
     noData: Datos no disponibles
     department: Departamento
     vehicle: Vehículo
+    selectDocumentId: Seleccione el id de gestión documental
+    document: Documento
+    import: Importar desde existente
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -344,6 +349,7 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
+        entryPreAccount: Precontabilizar
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?

src/pages/Claim/Card/ClaimPhoto.vue

@@ -23,7 +23,7 @@ const claimDms = ref([
 ]);
 const client = ref({});
 const inputFile = ref();
-const files = ref({});
+const files = ref([]);
 const spinnerRef = ref();
 const claimDmsRef = ref();
 const dmsType = ref({});
@@ -255,9 +255,8 @@ function onDrag() {
                 icon="add"
                 color="primary"
             >
-                <QInput
+                <QFile
                     ref="inputFile"
-                    type="file"
                     style="display: none"
                     multiple
                     v-model="files"

src/pages/Claim/Card/__tests__/ClaimLines.spec.js

@@ -52,7 +52,7 @@ describe('ClaimLines', () => {
                 expectedData,
                 {
                     signal: canceller.signal,
-                }
+                },
             );
         });
     });
@@ -69,7 +69,7 @@ describe('ClaimLines', () => {
                 expect.objectContaining({
                     message: 'Discount updated',
                     type: 'positive',
-                })
+                }),
             );
         });
     });

src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js

@@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
                     fetch: vi.fn(),
                 },
             },
+            propsData: {
+                ticketId: 1,
+            },
         }).vm;
     });
 
@@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
                 expect.objectContaining({
                     message: 'Lines added to claim',
                     type: 'positive',
-                })
+                }),
             );
             expect(vm.canceller).toEqual(null);
         });

src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js

@@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
             await vm.deleteDms({ index: 0 });
 
             expect(axios.post).toHaveBeenCalledWith(
-                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
+                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' })
+                expect.objectContaining({ type: 'positive' }),
             );
         });
     });
@@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
                         data: { index: 1 },
                         promise: vm.deleteDms,
                     },
-                })
+                }),
             );
         });
     });
@@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
                 new FormData(),
                 expect.objectContaining({
                     params: expect.objectContaining({ hasFile: false }),
-                })
+                }),
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' })
+                expect.objectContaining({ type: 'positive' }),
             );
 
             expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -39,7 +39,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => {
-    return $props.id || route.params.id;
+    return Number($props.id || route.params.id);
 });
 
 const data = ref(useCardDescription());

src/pages/Customer/Card/CustomerDescriptorProxy.vue

@@ -11,7 +11,7 @@ const $props = defineProps({
 </script>
 
 <template>
-    <QPopupProxy>
+    <QPopupProxy data-cy="CustomerDescriptor">
         <CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
     </QPopupProxy>
 </template>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
-                    uppercase="true"
+                    :uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>

src/pages/Customer/Card/CustomerSamples.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { QBtn, useQuasar } from 'quasar';
-
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'src/components/VnTable/VnTable.vue';
@@ -74,12 +73,11 @@ const tableRef = ref();
 <template>
     <VnTable
         ref="tableRef"
-        data-key="ClientSamples"
+        data-key="CustomerSamples"
         auto-load
-        :filter="filter"
+        :user-filter="filter"
         url="ClientSamples"
         :columns="columns"
-        :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
         :right-search="false"
         :rows="rows"

src/pages/Customer/Card/CustomerSummary.vue

@@ -25,7 +25,7 @@ const $props = defineProps({
     },
 });
 
-const entityId = computed(() => $props.id || route.params.id);
+const entityId = computed(() => Number($props.id || route.params.id));
 const customer = computed(() => summary.value.entity);
 const summary = ref();
 const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);

src/pages/Customer/CustomerFilter.vue

@@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
-                        no-one="true"
+                        :no-one="true"
                     />
                 </QItemSection>
             </QItem>

src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js

@@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
                 expect.objectContaining({
                     message: 'Payment confirmed',
                     type: 'positive',
-                })
+                }),
             );
         });
     });

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
 const initialData = reactive({});
 const entityId = computed(() => route.params.id);
 const customer = computed(() => useArrayData('Customer').store?.data);
-const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
         { relation: 'province', scope: { fields: ['name'] } },
@@ -73,7 +72,7 @@ onBeforeMount(async () => {
 
 const setEmailUser = (data) => {
     optionsEmailUsers.value = data;
-    initialData.replyTo = data[0]?.email;
+    initialData.replyTo = data[0]?.notificationEmail;
 };
 
 const setClientsAddresses = (data) => {
@@ -182,10 +181,12 @@ const toCustomerSamples = () => {
 
 <template>
     <FetchData
-        :filter="filterEmailUsers"
+        :filter="{
+            where: { id: customer.departmentFk },
+        }"
         @on-fetch="setEmailUser"
         auto-load
-        url="EmailUsers"
+        url="Departments"
     />
     <FetchData
         :filter="filterClientsAddresses"

src/pages/Entry/EntryPreAccount.vue

@@ -0,0 +1,477 @@
+<script setup>
+import { ref, computed, markRaw, useTemplateRef, onBeforeMount, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { toDate, toCurrency } from 'src/filters';
+import { useArrayData } from 'src/composables/useArrayData';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
+import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
+import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnDms from 'src/components/common/VnDms.vue';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
+import { useStateStore } from 'src/stores/useStateStore';
+import { downloadFile } from 'src/composables/downloadFile';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const { notify } = useNotify();
+const user = useState().getUser();
+const stateStore = useStateStore();
+const updateDialog = ref();
+const uploadDialog = ref();
+let maxDays;
+let defaultDays;
+const dataKey = 'entryPreaccountingFilter';
+const url = 'Entries/preAccountingFilter';
+const arrayData = useArrayData(dataKey);
+const daysAgo = ref();
+const isBooked = ref();
+const dmsData = ref();
+const table = useTemplateRef('table');
+const companies = ref([]);
+const countries = ref([]);
+const entryTypes = ref([]);
+const supplierFiscalTypes = ref([]);
+const warehouses = ref([]);
+const defaultDmsDescription = ref();
+const dmsTypeId = ref();
+const selectedRows = ref([]);
+const totalAmount = ref();
+const totalSelectedAmount = computed(() => {
+    if (!selectedRows.value.length) return 0;
+    return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
+});
+let supplierRef;
+let dmsFk;
+const columns = computed(() => [
+    {
+        name: 'id',
+        label: t('entry.preAccount.id'),
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
+    },
+    {
+        name: 'invoiceNumber',
+        label: t('entry.preAccount.invoiceNumber'),
+    },
+    {
+        name: 'company',
+        label: t('globals.company'),
+        columnFilter: {
+            component: 'select',
+            name: 'companyFk',
+            optionLabel: 'code',
+            options: companies.value,
+        },
+    },
+    {
+        name: 'warehouse',
+        label: t('globals.warehouse'),
+        columnFilter: {
+            component: 'select',
+            name: 'warehouseInFk',
+            options: warehouses.value,
+        },
+    },
+    {
+        name: 'gestDocFk',
+        label: t('entry.preAccount.gestDocFk'),
+    },
+    {
+        name: 'dmsType',
+        label: t('entry.preAccount.dmsType'),
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'dmsTypeFk',
+            url: 'DmsTypes',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        name: 'reference',
+        label: t('entry.preAccount.reference'),
+    },
+    {
+        name: 'shipped',
+        label: t('entry.preAccount.shipped'),
+        format: ({ shipped }, dashIfEmpty) => dashIfEmpty(toDate(shipped)),
+        columnFilter: {
+            component: 'date',
+            name: 'shipped',
+        },
+    },
+    {
+        name: 'landed',
+        label: t('entry.preAccount.landed'),
+        format: ({ landed }, dashIfEmpty) => dashIfEmpty(toDate(landed)),
+        columnFilter: {
+            component: 'date',
+            name: 'landed',
+        },
+    },
+    {
+        name: 'invoiceInFk',
+        label: t('entry.preAccount.invoiceInFk'),
+    },
+    {
+        name: 'supplier',
+        label: t('globals.supplier'),
+        format: (row) => row.supplier,
+        columnFilter: {
+            component: markRaw(VnSelectSupplier),
+            label: null,
+            name: 'supplierFk',
+            class: 'fit',
+        },
+    },
+    {
+        name: 'country',
+        label: t('globals.country'),
+        columnFilter: {
+            component: 'select',
+            name: 'countryFk',
+            options: countries.value,
+        },
+    },
+    {
+        name: 'description',
+        label: t('entry.preAccount.entryType'),
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'typeFk',
+            options: entryTypes.value,
+            optionLabel: 'description',
+            optionValue: 'code',
+        },
+    },
+    {
+        name: 'payDem',
+        label: t('entry.preAccount.payDem'),
+        columnFilter: {
+            component: 'number',
+            name: 'payDem',
+        },
+    },
+    {
+        name: 'fiscalCode',
+        label: t('entry.preAccount.fiscalCode'),
+        format: ({ fiscalCode }) => t(fiscalCode),
+        columnFilter: {
+            component: 'select',
+            name: 'fiscalCode',
+            options: supplierFiscalTypes.value,
+            optionLabel: 'locale',
+            optionValue: 'code',
+            sortBy: 'code',
+        },
+    },
+    {
+        name: 'amount',
+        label: t('globals.amount'),
+        format: ({ amount }) => toCurrency(amount),
+        columnFilter: {
+            component: 'number',
+            name: 'amount',
+        },
+    },
+    {
+        name: 'isAgricultural',
+        label: t('entry.preAccount.isAgricultural'),
+        component: 'checkbox',
+        isEditable: false,
+    },
+    {
+        name: 'isBooked',
+        label: t('entry.preAccount.isBooked'),
+        component: 'checkbox',
+    },
+    {
+        name: 'isReceived',
+        label: t('entry.preAccount.isReceived'),
+        component: 'checkbox',
+        isEditable: false,
+    },
+]);
+
+onBeforeMount(async () => {
+    const { data } = await axios.get('EntryConfigs/findOne', {
+        params: { filter: JSON.stringify({ fields: ['maxDays', 'defaultDays'] }) },
+    });
+    maxDays = data.maxDays;
+    defaultDays = data.defaultDays;
+    daysAgo.value = arrayData.store.userParams.daysAgo || defaultDays;
+    isBooked.value = arrayData.store.userParams.isBooked || false;
+    stateStore.leftDrawer = false;
+});
+
+watch(selectedRows, (nVal, oVal) => {
+    const lastRow = nVal.at(-1);
+    if (lastRow?.isBooked) selectedRows.value.pop();
+    if (nVal.length > oVal.length && lastRow.invoiceInFk)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: { title: t('entry.preAccount.hasInvoice') },
+        });
+});
+
+function filterByDaysAgo(val) {
+    if (!val) val = defaultDays;
+    else if (val > maxDays) val = maxDays;
+    daysAgo.value = val;
+    arrayData.store.userParams.daysAgo = daysAgo.value;
+    table.value.reload();
+}
+
+async function preAccount() {
+    const entries = selectedRows.value;
+    const { companyFk, isAgricultural, landed } = entries.at(0);
+    try {
+        dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
+        if (isAgricultural) {
+            const year = new Date(landed).getFullYear();
+            supplierRef = (
+                await axios.get('InvoiceIns/getMaxRef', { params: { companyFk, year } })
+            ).data;
+            return createInvoice();
+        } else if (dmsFk) {
+            supplierRef = (
+                await axios.get(`Dms/${dmsFk}`, {
+                    params: { filter: JSON.stringify({ fields: ['reference'] }) },
+                })
+            ).data?.reference;
+            updateDialog.value.show();
+        } else {
+            uploadFile();
+        }
+    } catch (e) {
+        throw e;
+    }
+}
+
+async function updateFile() {
+    await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId: dmsTypeId.value });
+    await createInvoice();
+}
+
+async function uploadFile() {
+    const firstSelectedEntry = selectedRows.value.at(0);
+    const { supplier, companyFk, invoiceNumber } = firstSelectedEntry;
+    dmsData.value = {
+        dmsTypeFk: dmsTypeId.value,
+        warehouseFk: user.value.warehouseFk,
+        companyFk: companyFk,
+        description: supplier + defaultDmsDescription.value + invoiceNumber,
+        hasFile: false,
+    };
+    uploadDialog.value.show();
+}
+
+async function afterUploadFile({ reference }, res) {
+    supplierRef = reference;
+    dmsFk = res.data[0].id;
+    await createInvoice();
+}
+
+async function createInvoice() {
+    try {
+        await axios.post(`Entries/addInvoiceIn`, {
+            ids: selectedRows.value.map((entry) => entry.id),
+            supplierRef,
+            dmsFk,
+        });
+        notify(t('entry.preAccount.success'), 'positive');
+    } catch (e) {
+        throw e;
+    } finally {
+        supplierRef = null;
+        dmsFk = undefined;
+        selectedRows.value.length = 0;
+        table.value.reload();
+    }
+}
+</script>
+<template>
+    <FetchData
+        url="Countries"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (countries = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        @on-fetch="(data) => (companies = data)"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
+    <FetchData
+        url="EntryTypes"
+        :filter="{ fields: ['code', 'description'] }"
+        @on-fetch="(data) => (entryTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="supplierFiscalTypes"
+        :filter="{ fields: ['code'] }"
+        @on-fetch="
+            (data) =>
+                (supplierFiscalTypes = data.map((x) => ({ locale: t(x.code), ...x })))
+        "
+        auto-load
+    />
+    <FetchData
+        url="InvoiceInConfigs/findOne"
+        :filter="{ fields: ['defaultDmsDescription'] }"
+        @on-fetch="(data) => (defaultDmsDescription = data?.defaultDmsDescription)"
+        auto-load
+    />
+    <FetchData
+        url="DmsTypes/findOne"
+        :filter="{ fields: ['id'] }"
+        :where="{ code: 'invoiceIn' }"
+        @on-fetch="(data) => (dmsTypeId = data?.id)"
+        auto-load
+    />
+    <VnSearchbar
+        :data-key
+        :url
+        :label="t('entry.preAccount.search')"
+        :info="t('entry.preAccount.searchInfo')"
+        :search-remove-params="false"
+    />
+    <VnTable
+        v-model:selected="selectedRows"
+        :data-key
+        :columns
+        :url
+        :search-url="dataKey"
+        ref="table"
+        :disable-option="{ card: true }"
+        redirect="Entry"
+        :order="['landed DESC']"
+        :right-search="false"
+        :user-params="{ daysAgo, isBooked }"
+        :row-click="false"
+        :table="{ selection: 'multiple' }"
+        :limit="0"
+        :footer="true"
+        @on-fetch="
+            (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
+        "
+        auto-load
+    >
+        <template #top-left>
+            <QBtn
+                data-cy="preAccount_btn"
+                icon="account_balance"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows.length"
+                @click="preAccount"
+            >
+                <QTooltip>{{ t('entry.preAccount.btn') }}</QTooltip>
+            </QBtn>
+            <VnInputNumber
+                v-model="daysAgo"
+                :label="$t('globals.daysAgo')"
+                dense
+                :step="1"
+                :decimal-places="0"
+                @update:model-value="filterByDaysAgo"
+                debounce="500"
+                :title="t('entry.preAccount.daysAgo')"
+            />
+        </template>
+        <template #column-id="{ row }">
+            <span class="link" @click.stop>
+                {{ row.id }}
+                <EntryDescriptorProxy :id="row.id" />
+            </span>
+        </template>
+        <template #column-company="{ row }">
+            <QBadge :color="row.color ?? 'transparent'" :label="row.company" />
+        </template>
+        <template #column-gestDocFk="{ row }">
+            <span class="link" @click.stop="downloadFile(row.gestDocFk)">
+                {{ row.gestDocFk }}
+            </span>
+        </template>
+        <template #column-supplier="{ row }">
+            <span class="link" @click.stop>
+                {{ row.supplier }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+        <template #column-invoiceInFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.invoiceInFk }}
+                <InvoiceInDescriptorProxy :id="row.invoiceInFk" />
+            </span>
+        </template>
+        <template #column-footer-amount>
+            <div v-text="toCurrency(totalSelectedAmount)" />
+            <div v-text="toCurrency(totalAmount)" />
+        </template>
+    </VnTable>
+    <VnConfirm
+        ref="updateDialog"
+        :title="t('entry.preAccount.dialog.title')"
+        :message="t('entry.preAccount.dialog.message')"
+    >
+        <template #actions>
+            <QBtn
+                data-cy="updateFileYes"
+                :label="t('globals.yes')"
+                color="primary"
+                @click="updateFile"
+                autofocus
+                v-close-popup
+            />
+            <QBtn
+                data-cy="updateFileNo"
+                :label="t('globals.no')"
+                color="primary"
+                flat
+                @click="uploadFile"
+                v-close-popup
+            />
+            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+        </template>
+    </VnConfirm>
+    <QDialog ref="uploadDialog">
+        <VnDms
+            model="dms"
+            :form-initial-data="dmsData"
+            url="Dms/uploadFile"
+            @on-data-saved="afterUploadFile"
+        />
+    </QDialog>
+</template>
+<i18n>
+en:
+    IntraCommunity: Intra-community
+    NonCommunity: Non-community
+    CanaryIslands: Canary Islands
+es:
+    IntraCommunity: Intracomunitaria
+    NonCommunity: Extracomunitaria
+    CanaryIsland: Islas Canarias
+    National: Nacional
+</i18n>

src/pages/Entry/__tests__/EntryPreAccount.spec.js

@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import EntryPreAccount from '../EntryPreAccount.vue';
+import axios from 'axios';
+
+describe('EntryPreAccount', () => {
+    let wrapper;
+    let vm;
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url == 'EntryConfigs/findOne')
+                return { data: { maxDays: 90, defaultDays: 30 } };
+            return { data: [] };
+        });
+        wrapper = createWrapper(EntryPreAccount);
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('filterByDaysAgo()', () => {
+        it('should set daysAgo to defaultDays if no value is provided', () => {
+            vm.filterByDaysAgo();
+            expect(vm.daysAgo).toBe(vm.defaultDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.defaultDays);
+        });
+
+        it('should set daysAgo to maxDays if the value exceeds maxDays', () => {
+            vm.filterByDaysAgo(500);
+            expect(vm.daysAgo).toBe(vm.maxDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.maxDays);
+        });
+
+        it('should set daysAgo to the provided value if it is valid', () => {
+            vm.filterByDaysAgo(30);
+            expect(vm.daysAgo).toBe(30);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(30);
+        });
+    });
+
+    describe('Dialog behavior when adding a new row', () => {
+        it('should open the dialog if the new row has invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            const selectedRows = [{ id: 1, invoiceInFk: 123 }];
+            vm.selectedRows = selectedRows;
+            await vm.$nextTick();
+            expect(dialogSpy).toHaveBeenCalledWith({
+                component: vm.VnConfirm,
+                componentProps: { title: vm.t('entry.preAccount.hasInvoice') },
+            });
+        });
+
+        it('should not open the dialog if the new row does not have invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            vm.selectedRows = [{ id: 1, invoiceInFk: null }];
+            await vm.$nextTick();
+            expect(dialogSpy).not.toHaveBeenCalled();
+        });
+    });
+});

src/pages/Entry/locale/en.yml

@@ -118,6 +118,33 @@ entry:
     searchInfo: You can search by entry reference
     descriptorMenu:
         showEntryReport: Show entry report
+    preAccount:
+        gestDocFk: Gestdoc
+        dmsType: Gestdoc type
+        invoiceNumber: Entry ref.
+        reference: Gestdoc ref.
+        shipped: Shipped
+        landed: Landed
+        id: Entry
+        invoiceInFk: Invoice in
+        supplierFk: Supplier
+        country: Country
+        description: Entry type
+        payDem: Payment term
+        isBooked: B
+        isReceived: R
+        entryType: Entry type
+        isAgricultural: Agricultural
+        fiscalCode: Account type
+        daysAgo: Max 365 days
+        search: Search
+        searchInfo: You can search by supplier name or nickname
+        btn: Pre-account
+        hasInvoice: This entry has already an invoice in
+        success: It has been successfully pre-accounted
+        dialog:
+            title: Pre-account entries
+            message: Do you want the invoice to inherit the entry document?
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available

src/pages/Entry/locale/es.yml

@@ -69,6 +69,33 @@ entry:
         observationType: Tipo de observación
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
+    preAccount:
+        gestDocFk: Gestdoc
+        dmsType: Tipo gestdoc
+        invoiceNumber: Ref. Entrada
+        reference: Ref. GestDoc
+        shipped: F. envío
+        landed: F. llegada
+        id: Entrada
+        invoiceInFk: Recibida
+        supplierFk: Proveedor
+        country: País
+        description: Tipo de Entrada
+        payDem: Plazo de pago
+        isBooked: C
+        isReceived: R
+        entryType: Tipo de entrada
+        isAgricultural: Agricultural
+        fiscalCode: Tipo de cuenta
+        daysAgo: Máximo 365 días
+        search: Buscar
+        searchInfo: Puedes buscar por nombre o alias de proveedor
+        btn: Precontabilizar
+        hasInvoice: Esta entrada ya tiene una f. recibida
+        success: Se ha precontabilizado correctamente
+        dialog:
+            title: Precontabilizar entradas
+            message: ¿Desea que la factura herede el documento de la entrada?
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación

src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue

@@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        required: true,
+        default: null,
     },
 });
 </script>

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -164,6 +164,7 @@ onMounted(async () => {
             unelevated
             filled
             dense
+            data-cy="formSubmitBtn"
         />
         <QBtn
             v-else
@@ -174,6 +175,7 @@ onMounted(async () => {
             filled
             dense
             @click="getStatus = 'stopping'"
+            data-cy="formStopBtn"
         />
     </QForm>
 </template>

src/pages/Item/Card/ItemTags.vue

@@ -89,7 +89,6 @@ const insertTag = (rows) => {
                 :default-remove="false"
                 :user-filter="{
                     fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
-                    where: { itemFk: route.params.id },
                     include: {
                         relation: 'tag',
                         scope: {
@@ -97,6 +96,7 @@ const insertTag = (rows) => {
                         },
                     },
                 }"
+                :filter="{ where: { itemFk: route.params.id } }"
                 order="priority"
                 auto-load
                 @on-fetch="onItemTagsFetched"

src/pages/Item/components/ItemProposal.vue

@@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
 import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
 import FetchData from 'components/FetchData.vue';
+import { useState } from 'src/composables/useState';
 
 const MATCH = 'match';
+const { notifyResults } = displayResults();
 
 const { t } = useI18n();
 const $props = defineProps({
@@ -18,14 +20,20 @@ const $props = defineProps({
         required: true,
         default: () => {},
     },
+    filter: {
+        type: Object,
+        required: true,
+        default: () => {},
+    },
     replaceAction: {
         type: Boolean,
-        required: false,
+        required: true,
         default: false,
     },
+
     sales: {
         type: Array,
-        required: false,
+        required: true,
         default: () => [],
     },
 });
@@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
 const sale = computed(() => $props.sales[0]);
 const saleFk = computed(() => sale.value.saleFk);
 const filter = computed(() => ({
+    where: $props.filter,
+
     itemFk: $props.itemLack.itemFk,
     sales: saleFk.value,
 }));
@@ -228,11 +238,15 @@ async function handleTicketConfig(data) {
         url="TicketConfigs"
         :filter="{ fields: ['lackAlertPrice'] }"
         @on-fetch="handleTicketConfig"
-        auto-load
+    ></FetchData>
+    <QInnerLoading
+        :showing="isLoading"
+        :label="t && t('globals.pleaseWait')"
+        color="primary"
     />
 
     <VnTable
-        v-if="ticketConfig"
+        v-if="!isLoading"
         auto-load
         data-cy="proposalTable"
         ref="proposalTableRef"

src/pages/Item/components/ItemProposalProxy.vue

@@ -1,13 +1,17 @@
 <script setup>
 import ItemProposal from './ItemProposal.vue';
 import { useDialogPluginComponent } from 'quasar';
-
 const $props = defineProps({
     itemLack: {
         type: Object,
         required: true,
         default: () => {},
     },
+    filter: {
+        type: Object,
+        required: true,
+        default: () => {},
+    },
     replaceAction: {
         type: Boolean,
         required: false,
@@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
     <QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
         <QCard class="dialog-width">
             <QCardSection class="row items-center q-pb-none">
-                <span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
+                <span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
                 <QSpace />
                 <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>

src/pages/Item/composables/cloneItem.js

@@ -11,26 +11,19 @@ export function cloneItem() {
     const router = useRouter();
     const cloneItem = async (entityId) => {
         const { id } = entityId;
-        try {
+        const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
-            const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
+        router.push({ name: 'ItemTags', params: { id: data.id } });
-            router.push({ name: 'ItemTags', params: { id: data.id } });
-        } catch (err) {
-            console.error('Error cloning item');
-        }
     };
 
     const openCloneDialog = async (entityId) => {
-        quasar
+        quasar.dialog({
-            .dialog({
+            component: VnConfirm,
-                component: VnConfirm,
+            componentProps: {
-                componentProps: {
+                title: t('item.descriptor.clone.title'),
-                    title: t('item.descriptor.clone.title'),
+                message: t('item.descriptor.clone.subTitle'),
-                    message: t('item.descriptor.clone.subTitle'),
+                promise: () => cloneItem(entityId),
-                },
+            },
-            })
+        });
-            .onOk(async () => {
-                await cloneItem(entityId);
-            });
     };
     return { openCloneDialog };
 }

src/pages/Monitor/MonitorClientsActions.vue

@@ -8,14 +8,14 @@ import VnRow from 'src/components/ui/VnRow.vue';
         class="q-pa-md"
         :style="{ 'flex-direction': $q.screen.lt.lg ? 'column' : 'row', gap: '0px' }"
     >
-        <div style="flex: 0.3">
+        <div style="flex: 0.3" data-cy="clientsOnWebsite">
             <span
                 class="q-ml-md text-body1"
                 v-text="$t('salesMonitor.clientsOnWebsite')"
             />
             <SalesClientTable />
         </div>
-        <div style="flex: 0.7">
+        <div style="flex: 0.7" data-cy="recentOrderActions">
             <span
                 class="q-ml-md text-body1"
                 v-text="$t('salesMonitor.recentOrderActions')"

src/pages/Monitor/MonitorOrders.vue

@@ -9,6 +9,7 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
 import { toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
+import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const { t } = useI18n();
@@ -165,16 +166,7 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
             </div>
         </template>
         <template #column-dateSend="{ row }">
-            <QTd>
+            <VnDateBadge :date="row.date_send" />
-                <QBadge
-                    :color="getBadgeColor(row.date_send)"
-                    text-color="black"
-                    class="q-pa-sm"
-                    style="font-size: 14px"
-                >
-                    {{ toDateFormat(row.date_send) }}
-                </QBadge>
-            </QTd>
         </template>
 
         <template #column-clientFk="{ row }">

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { dateRange } from 'src/filters';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
 defineProps({ dataKey: { type: String, required: true } });
 const { t, te } = useI18n();
@@ -209,7 +210,7 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <QCheckbox
+                    <VnCheckbox
                         :label="t('params.myTeam')"
                         v-model="params.myTeam"
                         toggle-indeterminate
@@ -218,7 +219,7 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <QCheckbox
+                    <VnCheckbox
                         :label="t('params.problems')"
                         v-model="params.problems"
                         toggle-indeterminate
@@ -227,7 +228,7 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <QCheckbox
+                    <VnCheckbox
                         :label="t('params.pending')"
                         v-model="params.pending"
                         toggle-indeterminate

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
@@ -168,9 +167,11 @@ const columns = computed(() => [
             component: 'select',
             name: 'provinceFk',
             attrs: {
-                options: provinceOpts.value,
+                url: 'Provinces',
-                'option-value': 'id',
+                fields: ['id', 'name'],
-                'option-label': 'name',
+                sortBy: ['name ASC'],
+                optionValue: 'id',
+                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -183,9 +184,11 @@ const columns = computed(() => [
             component: 'select',
             name: 'stateFk',
             attrs: {
-                options: stateOpts.value,
+                sortBy: ['name ASC'],
-                'option-value': 'id',
+                url: 'States',
-                'option-label': 'name',
+                fields: ['id', 'name'],
+                optionValue: 'id',
+                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -212,9 +215,12 @@ const columns = computed(() => [
             component: 'select',
             name: 'zoneFk',
             attrs: {
-                options: zoneOpts.value,
+                url: 'Zones',
-                'option-value': 'id',
+                fields: ['id', 'name'],
-                'option-label': 'name',
+                sortBy: ['name ASC'],
+
+                optionValue: 'id',
+                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -225,11 +231,12 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
-            url: 'PayMethods',
             attrs: {
-                options: PayMethodOpts.value,
+                url: 'PayMethods',
-                optionValue: 'id',
+                fields: ['id', 'name'],
+                sortBy: ['id ASC'],
                 optionLabel: 'name',
+                optionValue: 'id',
                 dense: true,
             },
         },
@@ -254,7 +261,9 @@ const columns = computed(() => [
         columnFilter: {
             component: 'select',
             attrs: {
-                options: DepartmentOpts.value,
+                url: 'Departments',
+                fields: ['id', 'name'],
+                sortBy: ['id ASC'],
                 dense: true,
             },
         },
@@ -265,11 +274,12 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
-            url: 'ItemPackingTypes',
             attrs: {
-                options: ItemPackingTypeOpts.value,
+                url: 'ItemPackingTypes',
-                'option-value': 'code',
+                fields: ['code'],
-                'option-label': 'code',
+                sortBy: ['code ASC'],
+                optionValue: 'code',
+                optionCode: 'code',
                 dense: true,
             },
         },
@@ -324,60 +334,6 @@ const totalPriceColor = (ticket) => {
 const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
 </script>
 <template>
-    <FetchData
-        url="Provinces"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (provinceOpts = data)"
-    />
-    <FetchData
-        url="States"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (stateOpts = data)"
-    />
-    <FetchData
-        url="Zones"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (zoneOpts = data)"
-    />
-    <FetchData
-        url="ItemPackingTypes"
-        :filter="{
-            fields: ['code'],
-            order: 'code ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (ItemPackingTypeOpts = data)"
-    />
-    <FetchData
-        url="Departments"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'id ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (DepartmentOpts = data)"
-    />
-    <FetchData
-        url="PayMethods"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'id ASC',
-        }"
-        auto-load
-        @on-fetch="(data) => (PayMethodOpts = data)"
-    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>

src/pages/Order/Card/OrderCatalog.vue

@@ -120,7 +120,6 @@ watch(
                 :data-key="dataKey"
                 :tag-value="tagValue"
                 :tags="tags"
-                :initial-catalog-params="catalogParams"
                 :arrayData
             />
         </template>

src/pages/Order/Card/OrderDescriptor.vue

@@ -27,7 +27,7 @@ const getTotalRef = ref();
 const total = ref(0);
 
 const entityId = computed(() => {
-    return $props.id || route.params.id;
+    return Number($props.id || route.params.id);
 });
 
 const orderTotal = computed(() => state.get('orderTotal') ?? 0);

src/pages/Route/Card/RouteSummary.vue

@@ -233,10 +233,10 @@ const ticketColumns = ref([
                                 </span>
                             </QTd>
                         </template>
-                        <template #body-cell-client="{ value, row }">
+                        <template #body-cell-client="{ row }">
-                            <QTd auto-width>
+                            <QTd>
                                 <span class="link">
-                                    {{ value }}
+                                    {{ row.clientFk }}
                                     <CustomerDescriptorProxy :id="row?.clientFk" />
                                 </span>
                             </QTd>

src/pages/Route/Cmr/CmrList.vue

@@ -6,18 +6,13 @@ import { useRoute } from 'vue-router';
 import { useSession } from 'src/composables/useSession';
 import { toDateHourMin } from 'filters/index';
 import { useStateStore } from 'src/stores/useStateStore';
-import { dashIfEmpty } from 'src/filters';
 
-import AgencyDescriptorProxy from '../Agency/Card/AgencyDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import RouteDescriptorProxy from '../Card/RouteDescriptorProxy.vue';
-import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -35,117 +30,39 @@ const userParams = {
 
 const columns = computed(() => [
     {
-        align: 'right',
+        align: 'left',
         name: 'cmrFk',
-        label: t('cmr.params.cmrFk'),
+        label: t('route.cmr.params.cmrFk'),
         chip: {
             condition: () => true,
         },
         isId: true,
     },
     {
-        align: 'right',
+        align: 'center',
-        label: t('cmr.params.ticketFk'),
+        name: 'hasCmrDms',
+        label: t('route.cmr.params.hasCmrDms'),
+        component: 'checkbox',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('route.cmr.params.ticketFk'),
         name: 'ticketFk',
     },
     {
-        align: 'right',
+        align: 'left',
-        label: t('cmr.params.routeFk'),
+        label: t('route.cmr.params.routeFk'),
         name: 'routeFk',
     },
     {
-        label: t('cmr.params.client'),
+        align: 'left',
+        label: t('route.cmr.params.clientFk'),
         name: 'clientFk',
-        component: 'select',
-        attrs: {
-            url: 'Clients',
-            fields: ['id', 'name'],
-        },
-        columnFilter: {
-            name: 'clientFk',
-            attrs: {
-                url: 'Clients',
-                fields: ['id', 'name'],
-            },
-        },
     },
     {
-        label: t('cmr.params.agency'),
+        align: 'right',
-        name: 'agencyModeFk',
+        label: t('route.cmr.params.countryFk'),
-        component: 'select',
-        attrs: {
-            url: 'Agencies',
-            fields: ['id', 'name'],
-        },
-        columnFilter: {
-            name: 'agencyModeFk',
-            attrs: {
-                url: 'Agencies',
-                fields: ['id', 'name'],
-            },
-        },
-        format: ({ agencyName }) => agencyName,
-    },
-    {
-        label: t('cmr.params.supplier'),
-        name: 'supplierFk',
-        component: 'select',
-        attrs: {
-            url: 'suppliers',
-            fields: ['id', 'name'],
-        },
-        columnFilter: {
-            name: 'supplierFk',
-            attrs: {
-                url: 'suppliers',
-                fields: ['id', 'name'],
-            },
-        },
-    },
-    {
-        label: t('cmr.params.sender'),
-        name: 'addressFromFk',
-        component: 'select',
-        attrs: {
-            url: 'Addresses',
-            fields: ['id', 'nickname'],
-            optionValue: 'id',
-            optionLabel: 'nickname',
-        },
-        columnFilter: {
-            name: 'addressFromFk',
-            attrs: {
-                url: 'Addresses',
-                fields: ['id', 'nickname'],
-                optionValue: 'id',
-                optionLabel: 'nickname',
-            },
-        },
-        format: ({ origin }) => origin,
-    },
-    {
-        label: t('cmr.params.destination'),
-        name: 'addressToFk',
-        component: 'select',
-        attrs: {
-            url: 'addresses',
-            fields: ['id', 'nickname'],
-            optionValue: 'id',
-            optionLabel: 'nickname',
-        },
-        columnFilter: {
-            name: 'addressToFk',
-            attrs: {
-                url: 'addresses',
-                fields: ['id', 'nickname'],
-                optionValue: 'id',
-                optionLabel: 'nickname',
-            },
-        },
-        format: ({ destination }) => destination,
-    },
-    {
-        label: t('cmr.params.country'),
         name: 'countryFk',
         component: 'select',
         attrs: {
@@ -162,61 +79,16 @@ const columns = computed(() => [
         format: ({ countryName }) => countryName,
     },
     {
-        label: t('cmr.params.created'),
+        align: 'right',
-        name: 'created',
+        label: t('route.cmr.params.shipped'),
-        component: 'date',
-        format: ({ created }) => dashIfEmpty(toDateHourMin(created)),
-    },
-    {
-        label: t('cmr.params.shipped'),
         name: 'shipped',
+        cardVisible: true,
         component: 'date',
-        format: ({ shipped }) => dashIfEmpty(toDateHourMin(shipped)),
+        format: ({ shipped }) => toDateHourMin(shipped),
     },
     {
-        label: t('cmr.params.etd'),
+        align: 'right',
-        name: 'ead',
+        label: t('route.cmr.params.warehouseFk'),
-        component: 'date',
-        format: ({ ead }) => dashIfEmpty(toDateHourMin(ead)),
-        toolTip: t('cmr.params.etdTooltip'),
-    },
-    {
-        label: t('globals.landed'),
-        name: 'landed',
-        component: 'date',
-        format: ({ landed }) => dashIfEmpty(toDateHourMin(landed)),
-    },
-    {
-        align: 'left',
-        label: t('cmr.params.packageList'),
-        name: 'packagesList',
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('cmr.params.observation'),
-        name: 'observation',
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('cmr.params.senderInstructions'),
-        name: 'senderInstruccions',
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('cmr.params.paymentInstructions'),
-        name: 'paymentInstruccions',
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('cmr.params.vehiclePlate'),
-        name: 'truckPlate',
-    },
-    {
-        label: t('cmr.params.warehouse'),
         name: 'warehouseFk',
         component: 'select',
         attrs: {
@@ -224,6 +96,7 @@ const columns = computed(() => [
             fields: ['id', 'name'],
         },
         columnFilter: {
+            inWhere: true,
             name: 'warehouseFk',
             attrs: {
                 url: 'warehouses',
@@ -232,23 +105,12 @@ const columns = computed(() => [
         },
         format: ({ warehouseName }) => warehouseName,
     },
-    {
-        align: 'left',
-        name: 'specialAgreements',
-        label: t('cmr.params.specialAgreements'),
-        columnFilter: false,
-    },
-    {
-        name: 'hasCmrDms',
-        label: t('cmr.params.hasCmrDms'),
-        component: 'checkbox',
-    },
     {
         align: 'center',
         name: 'tableActions',
         actions: [
             {
-                title: t('cmr.params.viewCmr'),
+                title: t('route.cmr.params.viewCmr'),
                 icon: 'visibility',
                 isPrimary: true,
                 action: (row) => window.open(getCmrUrl(row?.cmrFk), '_blank'),
@@ -289,7 +151,11 @@ function downloadPdfs() {
 }
 </script>
 <template>
-    <VnSearchbar :data-key :label="t('cmr.search')" :info="t('cmr.searchInfo')" />
+    <VnSearchbar
+        :data-key
+        :label="t('route.cmr.search')"
+        :info="t('route.cmr.searchInfo')"
+    />
     <VnSubToolbar>
         <template #st-actions>
             <QBtn
@@ -299,7 +165,7 @@ function downloadPdfs() {
                 :disable="!selectedRows?.length"
                 @click="downloadPdfs"
             >
-                <QTooltip>{{ t('cmr.params.downloadCmrs') }}</QTooltip>
+                <QTooltip>{{ t('route.cmr.params.downloadCmrs') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -325,72 +191,11 @@ function downloadPdfs() {
                 <TicketDescriptorProxy :id="row.ticketFk" />
             </span>
         </template>
-        <template #column-routeFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.routeFk }}
-                <RouteDescriptorProxy :id="row.routeFk" />
-            </span>
-        </template>
         <template #column-clientFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.clientName }}
+                {{ row.clientFk }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
-        <template #column-agencyModeFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.agencyName }}
-                <AgencyDescriptorProxy :id="row.agencyModeFk" />
-            </span>
-        </template>
-        <template #column-supplierFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.carrierName }}
-                <SupplierDescriptorProxy :id="row.supplierFk" />
-            </span>
-        </template>
-        <template #column-observation="{ row }">
-            <VnInput
-                v-if="row.observation"
-                type="textarea"
-                v-model="row.observation"
-                readonly
-                dense
-                rows="2"
-                style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-            />
-        </template>
-        <template #column-packagesList="{ row }">
-            <span>
-                {{ row.packagesList }}
-                <QTooltip v-if="row.packagesList" :label="row.packagesList">
-                    {{ row.packagesList }}
-                </QTooltip>
-            </span>
-        </template>
-        <template #column-senderInstruccions="{ row }">
-            <span>
-                {{ row.senderInstruccions }}
-                <QTooltip v-if="row.packagesList" :label="row.packagesList">
-                    {{ row.senderInstruccions }}
-                </QTooltip>
-            </span>
-        </template>
-        <template #column-paymentInstruccions="{ row }">
-            <span>
-                {{ row.paymentInstruccions }}
-                <QTooltip v-if="row.packagesList" :label="row.packagesList">
-                    {{ row.paymentInstruccions }}
-                </QTooltip>
-            </span>
-        </template>
-        <template #column-specialAgreements="{ row }">
-            <span>
-                {{ row.specialAgreements }}
-                <QTooltip v-if="row.packagesList" :label="row.packagesList">
-                    {{ row.specialAgreements }}
-                </QTooltip>
-            </span>
-        </template>
     </VnTable>
 </template>

src/pages/Route/Cmr/locale/en.yml

@@ -1,31 +0,0 @@
-cmr:
-  search: Search Cmr
-  searchInfo: You can search Cmr by Id
-  params:
-      agency: Agency
-      client: Client
-      cmrFk: CMR id
-      country: Country
-      created: Created
-      destination: Destination
-      downloadCmrs: Download CMRs
-      etd: ETD
-      etdTooltip: Estimated Time Delivery
-      hasCmrDms: Attached in gestdoc
-      observation: Observation
-      packageList: Package List
-      paymentInstructions: Payment instructions
-      routeFk: Route id
-      results: results
-      search: General search
-      sender: Sender
-      senderInstructions: Sender instructions
-      shipped: Shipped
-      specialAgreements: Special agreements
-      supplier: Carrier
-      ticketFk: Ticket id
-      vehiclePlate: Vehicle plate
-      viewCmr: View CMR
-      warehouse: Warehouse
-      'true': 'Yes'
-      'false': 'No'

src/pages/Route/Cmr/locale/es.yml

@@ -1,31 +0,0 @@
-cmr:
-  search: Buscar Cmr
-  searchInfo: Puedes buscar cmr por id
-  params:
-      agency: Agencia
-      client: Cliente
-      cmrFk: Id cmr
-      country: País
-      created: Creado
-      destination: Destinatario
-      downloadCmrs: Descargar CMRs
-      etd: ETD
-      etdTooltip: Fecha estimada de entrega
-      hasCmrDms: Adjunto en gestdoc
-      observation: Observaciones
-      packageList: Listado embalajes
-      paymentInstructions: Instrucciones de pago
-      routeFk: Id ruta
-      results: Resultados
-      search: Busqueda general
-      sender: Remitente
-      senderInstructions: Instrucciones de envío
-      shipped: F. envío
-      specialAgreements: Acuerdos especiales
-      supplier: Transportista
-      ticketFk: Id ticket
-      vehiclePlate: Matrícula
-      viewCmr: Ver CMR
-      warehouse: Almacén
-      'true': 'Si'
-      'false': 'No'

src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue

@@ -0,0 +1,65 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+import useNotify from 'src/composables/useNotify.js';
+
+import axios from 'axios';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+
+const dmsOptions = ref([]);
+const dmsId = ref(null);
+
+const importDms = async () => {
+    try {
+        if (!dmsId.value) throw new Error(t(`vehicle.errors.documentIdEmpty`));
+
+        const data = {
+            vehicleFk: route.params.id,
+            dmsFk: dmsId.value,
+        };
+
+        await axios.post('vehicleDms', data);
+        notify(t('globals.dataSaved'), 'positive');
+        dmsId.value = null;
+        emit('onDataSaved');
+    } catch (e) {
+        throw e;
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="Dms"
+        :filter="{ fields: ['id'], order: 'id ASC' }"
+        auto-load
+        @on-fetch="(data) => (dmsOptions = data)"
+    />
+    <FormModelPopup
+        model="DmsImport"
+        :title="t('globals.selectDocumentId')"
+        :form-initial-data="{}"
+        :save-fn="importDms"
+    >
+        <template #form-inputs>
+            <VnSelect
+                :label="t('globals.document')"
+                :options="dmsOptions"
+                hide-selected
+                option-label="id"
+                option-value="id"
+                v-model="dmsId"
+            />
+        </template>
+    </FormModelPopup>
+</template>

src/pages/Route/Vehicle/VehicleDms.vue

@@ -0,0 +1,42 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+import VehicleDmsImportForm from 'src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue';
+
+const { t } = useI18n();
+
+const dmsListRef = ref(null);
+const showImportDialog = ref(false);
+
+const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
+</script>
+<template>
+    <VnDmsList
+        ref="dmsListRef"
+        model="VehicleDms"
+        update-model="vehicles"
+        delete-model="VehicleDms"
+        download-model="dms"
+        default-dms-code="vehicles"
+        filter="vehicleFk"
+    />
+    <QDialog v-model="showImportDialog">
+        <VehicleDmsImportForm @on-data-saved="onDataSaved()" />
+    </QDialog>
+    <QPageSticky position="bottom-right" :offset="[25, 90]">
+        <QBtn
+            fab
+            color="primary"
+            icon="file_copy"
+            @click="showImportDialog = true"
+            class="fill-icon"
+            data-cy="importBtn"
+        >
+            <QTooltip>
+                {{ t('globals.import') }}
+            </QTooltip>
+        </QBtn>
+    </QPageSticky>
+</template>

src/pages/Route/Vehicle/locale/en.yml

@@ -18,3 +18,5 @@ vehicle:
     params:
         vehicleTypeFk: Type
         vehicleStateFk: State
+    errors:
+        documentIdEmpty: The document identifier can't be empty

src/pages/Route/Vehicle/locale/es.yml

@@ -18,3 +18,5 @@ vehicle:
     params:
         vehicleTypeFk: Tipo
         vehicleStateFk: Estado
+    errors:
+        documentIdEmpty: El número de documento no puede estar vacío

src/pages/Route/locale/en.yml

@@ -51,11 +51,6 @@ route:
         agencyModeName: Agency route
         isOwn: Own
         isAnyVolumeAllowed: Any volume allowed
-        created: Created
-        addressFromFk: Sender
-        addressToFk: Destination
-        landed: Landed
-        ead: EAD
     Worker: Worker
     Agency: Agency
     Vehicle: Vehicle
@@ -75,3 +70,21 @@ route:
     searchInfo: You can search by route reference
     dated: Dated
     preview: Preview
+    cmr:
+        search: Search Cmr
+        searchInfo: You can search Cmr by Id
+        params:
+            results: results
+            cmrFk: CMR id
+            hasCmrDms: Attached in gestdoc
+            'true': 'Yes'
+            'false': 'No'
+            ticketFk: Ticketd id
+            routeFk: Route id
+            countryFk: Country
+            clientFk: Client id
+            warehouseFk: Warehouse
+            shipped: Preparation date
+            viewCmr: View CMR
+            downloadCmrs: Download CMRs
+            search: General search

src/pages/Route/locale/es.yml

@@ -47,16 +47,11 @@ route:
         routeFk: Id ruta
         clientFk: Id cliente
         countryFk: Pais
-        shipped: F. envío
+        shipped: Fecha preparación
         agencyModeName: Agencia Ruta
         agencyAgreement: Agencia Acuerdo
         isOwn: Propio
         isAnyVolumeAllowed: Cualquier volumen
-        created: Creado
-        addressFromFk: Remitente
-        addressToFk: Destinatario
-        landed: F. entrega
-        ead: ETD
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo

src/pages/Shelving/Parking/ParkingList.vue

@@ -80,7 +80,7 @@ const columns = computed(() => [
             <VnTable
                 :data-key="dataKey"
                 :columns="columns"
-                is-editable="false"
+                :is-editable="false"
                 :right-search="false"
                 :use-model="true"
                 :disable-option="{ table: true }"

src/pages/Shelving/ShelvingList.vue

@@ -90,7 +90,7 @@ const onDataSaved = ({ id }) => {
             <VnTable
                 :data-key="dataKey"
                 :columns="columns"
-                is-editable="false"
+                :is-editable="false"
                 :right-search="false"
                 :use-model="true"
                 :disable-option="{ table: true }"

src/pages/Supplier/Card/SupplierAccounts.vue

@@ -65,15 +65,13 @@ function findBankFk(value, row) {
     if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
 }
 
-function bankEntityFilter(val, update) {
+function bankEntityFilter(val) {
-    update(() => {
+    const needle = val.toLowerCase();
-        const needle = val.toLowerCase();
+    filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
-        filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
+        (bank) =>
-            (bank) =>
+            bank.bic.toLowerCase().startsWith(needle) ||
-                bank.bic.toLowerCase().startsWith(needle) ||
+            bank.name.toLowerCase().includes(needle),
-                bank.name.toLowerCase().includes(needle),
+    );
-        );
-    });
 }
 </script>
 <template>
@@ -82,7 +80,8 @@ function bankEntityFilter(val, update) {
         url="BankEntities"
         @on-fetch="
             (data) => {
-                (bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
+                bankEntitiesOptions = data;
+                filteredBankEntitiesOptions = data;
             }
         "
         auto-load
@@ -135,10 +134,8 @@ function bankEntityFilter(val, update) {
                         :label="t('worker.create.bankEntity')"
                         v-model="row.bankEntityFk"
                         :options="filteredBankEntitiesOptions"
-                        :default-filter="false"
+                        :filter-fn="bankEntityFilter"
-                        @filter="(val, update) => bankEntityFilter(val, update)"
                         option-label="bic"
-                        option-value="id"
                         hide-selected
                         :required="true"
                         :roles-allowed-to-create="['financial']"

src/pages/Supplier/Card/SupplierDescriptorProxy.vue

@@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        required: true,
+        default: null,
     },
 });
 </script>

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -11,10 +11,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
-
+import { useArrayData } from 'src/composables/useArrayData';
 const route = useRoute();
 const { t } = useI18n();
-
+const arrayData = useArrayData('Supplier');
 const sageTaxTypesOptions = ref([]);
 const sageWithholdingsOptions = ref([]);
 const sageTransactionTypesOptions = ref([]);
@@ -89,6 +89,7 @@ function handleLocation(data, location) {
         }"
         auto-load
         :clear-store-on-unmount="false"
+        @on-data-saved="arrayData.fetch({})"
     >
         <template #form="{ data, validate }">
             <VnRow>

src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue

@@ -101,7 +101,7 @@ const onNextStep = async () => {
                 t('basicData.negativesConfirmMessage'),
                 submitWithNegatives,
             );
-        else submit();
+        else await submit();
     }
 };
 </script>

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -28,6 +28,7 @@ const props = defineProps({
 
 onMounted(() => {
     restoreTicket();
+    hasDocuware();
 });
 
 watch(

src/pages/Ticket/Card/TicketDescriptorProxy.vue

@@ -1,7 +1,6 @@
 <script setup>
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketSummary from './TicketSummary.vue';
-
 const $props = defineProps({
     id: {
         type: Number,
@@ -10,7 +9,7 @@ const $props = defineProps({
 });
 </script>
 <template>
-    <QPopupProxy>
+    <QPopupProxy data-cy="TicketDescriptor">
         <TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
     </QPopupProxy>
 </template>

src/pages/Ticket/Card/TicketDmsImportForm.vue

@@ -34,7 +34,7 @@ const importDms = async () => {
         dmsId.value = null;
         emit('onDataSaved');
     } catch (e) {
-        throw new Error(e.message);
+        throw e;
     }
 };
 </script>
@@ -49,7 +49,7 @@ const importDms = async () => {
     <FormModelPopup
         url-create="genera"
         model="DmsImport"
-        :title="t('Select document id')"
+        :title="t('globals.selectDocumentId')"
         :form-initial-data="{}"
         :save-fn="importDms"
     >
@@ -70,7 +70,6 @@ const importDms = async () => {
 
 <i18n>
 es:
-    Select document id: Introduzca id de gestion documental
     Document: Documento
     The document indentifier can't be empty: El número de documento no puede estar vacío
 </i18n>

src/pages/Ticket/Card/TicketSale.vue

@@ -773,6 +773,7 @@ watch(
                 v-model="row.itemFk"
                 :use-like="false"
                 @update:model-value="changeItem(row)"
+                autofocus
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

src/pages/Ticket/Card/TicketSplit.vue

@@ -3,7 +3,9 @@ import { ref } from 'vue';
 
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import split from './components/split';
-const emit = defineEmits(['ticketTransfered']);
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+const { notifyResults } = displayResults();
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     ticket: {
@@ -16,13 +18,20 @@ const splitDate = ref(Date.vnNew());
 
 const splitSelectedRows = async () => {
     const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
-    await split(tickets, splitDate.value);
+    const results = await split(tickets, splitDate.value);
-    emit('ticketTransfered', tickets);
+    notifyResults(results, 'ticketFk');
+    emit('ticketTransferred', tickets);
 };
 </script>
 
 <template>
-    <VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
+    <VnInputDate
+        class="q-mr-sm"
+        :label="$t('New date')"
+        v-model="splitDate"
+        clearable
+        autofocus
+    />
     <QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
 </template>
 <style lang="scss">

src/pages/Ticket/Card/TicketTransfer.vue

@@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-const emit = defineEmits(['ticketTransfered']);
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     mana: {

src/pages/Ticket/Card/TicketTransferProxy.vue

@@ -1,8 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import TicketTransfer from './TicketTransfer.vue';
-import Split from './TicketSplit.vue';
+import TicketSplit from './TicketSplit.vue';
-const emit = defineEmits(['ticketTransfered']);
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     mana: {
@@ -35,7 +35,7 @@ const transferRef = ref(null);
 <template>
     <QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
         <div class="flex row items-center q-ma-lg" v-if="$props.split">
-            <Split
+            <TicketSplit
                 ref="splitRef"
                 @splitSelectedRows="splitSelectedRows"
                 :ticket="$props.ticket"

src/pages/Ticket/Card/components/split.js

@@ -1,13 +1,11 @@
 import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
-
 export default async function (data, date) {
     const reducedData = data.reduce((acc, item) => {
         const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
         if (existing) {
             existing.sales.push(item.saleFk);
         } else {
-            acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
+            acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
         }
         return acc;
     }, []);
@@ -16,7 +14,5 @@ export default async function (data, date) {
 
     const results = await Promise.allSettled(promises);
 
-    notifyResults(results, 'ticketFk');
-
     return results;
 }

src/pages/Ticket/Negative/TicketLackDetail.vue

@@ -23,7 +23,6 @@ const tableRef = ref();
 const changeItemDialogRef = ref(null);
 const changeStateDialogRef = ref(null);
 const changeQuantityDialogRef = ref(null);
-const showProposalDialog = ref(false);
 const showChangeQuantityDialog = ref(false);
 const selectedRows = ref([]);
 const route = useRoute();
@@ -34,7 +33,7 @@ onUnmounted(() => {
     stateStore.rightDrawer = true;
 });
 
-const entityId = computed(() => route.params.id);
+const entityId = computed(() => route.params.itemFk);
 const item = ref({});
 
 const itemProposalSelected = ref(null);
@@ -63,6 +62,7 @@ const showItemProposal = () => {
         .dialog({
             component: ItemProposalProxy,
             componentProps: {
+                filter: filter.value,
                 itemLack: tableRef.value.itemLack,
                 replaceAction: true,
                 sales: selectedRows.value,
@@ -117,21 +117,17 @@ const showItemProposal = () => {
                                 sales: selectedRows,
                                 lastActiveTickets: selectedRows.map((row) => row.id),
                             }"
-                            @ticket-transfered="reload"
+                            @ticket-transferred="reload"
                         ></TicketTransferProxy>
                     </template>
                 </QBtn>
                 <QBtn
                     color="primary"
-                    @click="showProposalDialog = true"
+                    @click="showItemProposal"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     data-cy="itemProposal"
                 >
-                    <QIcon
+                    <QIcon name="import_export" class="rotate-90" />
-                        name="import_export"
-                        class="rotate-90"
-                        @click="showItemProposal"
-                    ></QIcon>
                     <QTooltip bottom anchor="bottom right">
                         {{ t('itemProposal') }}
                     </QTooltip>
@@ -139,7 +135,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeItem"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeItem.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:item" /> </template>
@@ -153,7 +149,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeState"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeState.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:eye" /> </template>
@@ -167,7 +163,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeQuantity"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeQuantity.title')"
                     @click="showChangeQuantityDialog = true"
                 >