Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7790_formFocus_mixin

src/boot/axios.js

@@ -39,7 +39,37 @@ const onResponse = (response) => {
 const onResponseError = (error) => {
     stateQuery.remove(error.config);
 
-    if (session.isLoggedIn() && error.response?.status === 401) {
+    let message = '';
+
+    const response = error.response;
+    const responseData = response && response.data;
+    const responseError = responseData && response.data.error;
+    if (responseError) {
+        message = responseError.message;
+    }
+
+    switch (response?.status) {
+        case 422:
+            if (error.name == 'ValidationError')
+                message +=
+                    ' "' +
+                    responseError.details.context +
+                    '.' +
+                    Object.keys(responseError.details.codes).join(',') +
+                    '"';
+            break;
+        case 500:
+            message = 'errors.statusInternalServerError';
+            break;
+        case 502:
+            message = 'errors.statusBadGateway';
+            break;
+        case 504:
+            message = 'errors.statusGatewayTimeout';
+            break;
+    }
+
+    if (session.isLoggedIn() && response?.status === 401) {
         session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
@@ -48,6 +78,8 @@ const onResponseError = (error) => {
         return Promise.reject(error);
     }
 
+    notify(message, 'negative');
+
     return Promise.reject(error);
 };
 

src/boot/qFormEnterEvent.js

@@ -0,0 +1,27 @@
+import { getCurrentInstance } from 'vue';
+
+export default {
+    mounted: function () {
+        const vm = getCurrentInstance();
+        if (vm.type.name === 'QForm') {
+            const that = this;
+            this.$el.addEventListener('keyup', function (evt) {
+                if (evt.key === 'Enter') {
+                    const input = evt.target;
+                    if (input.type == 'textarea' && evt.shiftKey) {
+                        evt.preventDefault();
+                        let { selectionStart, selectionEnd } = input;
+                        input.value =
+                            input.value.substring(0, selectionStart) +
+                            '\n' +
+                            input.value.substring(selectionEnd);
+                        selectionStart = selectionEnd = selectionStart + 1;
+                        return;
+                    }
+                    evt.preventDefault();
+                    that.onSubmit();
+                }
+            });
+        }
+    },
+};

src/boot/qFormFocus.js

@@ -0,0 +1,54 @@
+export default {
+    mounted: function () {
+        // func
+        const observer = new MutationObserver((mutations, observerInstance) => {
+            try {
+                // Login
+                const inputsFormCard = document.querySelectorAll(
+                    'form.formCard input:not([disabled]):not([type="checkbox"])'
+                );
+                if (inputsFormCard.length) {
+                    // .focus();
+                    // observerInstance.disconnect();
+                    // return;
+                    focusFirstInput(inputsFormCard[0], observerInstance);
+                }
+                // VnNotes
+                const textareas = document.querySelectorAll(
+                    'textarea:not([disabled]), [contenteditable]:not([disabled])'
+                );
+                if (textareas.length) {
+                    // textareas[textareas.length - 1].focus();
+                    // observerInstance.disconnect();
+                    // return;
+                    focusFirstInput(textareas[textareas.length - 1], observerInstance);
+                }
+                // if (!inputs || inputs.length === 0) return;
+                const inputs = document.querySelectorAll(
+                    'form#formModel input:not([disabled]):not([type="checkbox"])'
+                );
+                const input = inputs[0];
+                if (!input) return;
+                // if (input.type === 'textarea' || input.form) {
+                // AUTOFOCUS
+
+                focusFirstInput(input, observerInstance);
+                //             input.focus();
+                // observerInstance.disconnect();
+            } catch (error) {
+                console.error(error);
+            }
+        });
+
+        observer.observe(this.$el, {
+            childList: true,
+            subtree: false,
+        });
+    },
+};
+
+function focusFirstInput(input, observerInstance) {
+    input.focus();
+    observerInstance.disconnect();
+    return;
+}

src/boot/qformMixin.js

@@ -1,30 +0,0 @@
-import { getCurrentInstance } from 'vue';
-
-export default {
-    mounted: function () {
-        const vm = getCurrentInstance();
-        if (vm.type.name === 'QForm') {
-            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
-                // TODO: AUTOFOCUS IS NOT FOCUSING
-                const that = this;
-                this.$el.addEventListener('keyup', function (evt) {
-                    if (evt.key === 'Enter') {
-                        const input = evt.target;
-                        if (input.type == 'textarea' && evt.shiftKey) {
-                            evt.preventDefault();
-                            let { selectionStart, selectionEnd } = input;
-                            input.value =
-                                input.value.substring(0, selectionStart) +
-                                '\n' +
-                                input.value.substring(selectionEnd);
-                            selectionStart = selectionEnd = selectionStart + 1;
-                            return;
-                        }
-                        evt.preventDefault();
-                        that.onSubmit();
-                    }
-                });
-            }
-        }
-    },
-};

src/boot/quasar.js

@@ -1,53 +1,18 @@
 import { boot } from 'quasar/wrappers';
-import qFormMixin from './qformMixin';
+import qFormEnterEvent from './qFormEnterEvent';
+import qFormFocus from './qFormFocus';
 import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
 import useNotify from 'src/composables/useNotify.js';
-import { CanceledError } from 'axios';
-
 const { notify } = useNotify();
 
 export default boot(({ app }) => {
-    app.mixin(qFormMixin);
+    app.mixin(qFormEnterEvent);
+    app.mixin(qFormFocus);
     app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
-    app.config.errorHandler = (error) => {
+    app.config.errorHandler = function (err) {
-        let message;
+        console.error(err);
-        const response = error.response;
+        notify('globals.error', 'negative', 'error');
-        const responseData = response?.data;
-        const responseError = responseData && response.data.error;
-        if (responseError) {
-            message = responseError.message;
-        }
-
-        switch (response?.status) {
-            case 422:
-                if (error.name == 'ValidationError')
-                    message +=
-                        ' "' +
-                        responseError.details.context +
-                        '.' +
-                        Object.keys(responseError.details.codes).join(',') +
-                        '"';
-                break;
-            case 500:
-                message = 'errors.statusInternalServerError';
-                break;
-            case 502:
-                message = 'errors.statusBadGateway';
-                break;
-            case 504:
-                message = 'errors.statusGatewayTimeout';
-                break;
-        }
-
-        console.error(error);
-        if (error instanceof CanceledError) {
-            const env = process.env.NODE_ENV;
-            if (env && env !== 'development') return;
-            message = 'Duplicate request';
-        }
-
-        notify(message ?? 'globals.error', 'negative', 'error');
     };
 });

src/components/FormModel.vue

@@ -217,6 +217,9 @@ async function save() {
         updateAndEmit('onDataSaved', formData.value, response?.data);
         if ($props.reload) await arrayData.fetch({});
         hasChanges.value = false;
+    } catch (err) {
+        console.error(err);
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }

src/components/FormModelPopup.vue

@@ -61,7 +61,6 @@ defineExpose({
                     :loading="isLoading"
                     @click="emit('onDataCanceled')"
                     v-close-popup
-                    data-cy="FormModelPopup_cancel"
                 />
                 <QBtn
                     :label="t('globals.save')"
@@ -71,7 +70,6 @@ defineExpose({
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
-                    data-cy="FormModelPopup_save"
                 />
             </div>
         </template>

src/components/VnTable/VnTable.vue

@@ -457,11 +457,7 @@ function handleScroll() {
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh
+                    <QTh v-if="col.visible ?? true">
-                        v-if="col.visible ?? true"
-                        :style="col.headerStyle"
-                        :class="col.headerClass"
-                    >
                         <div
                             class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"

src/components/common/VnProgressModal.vue

@@ -9,6 +9,10 @@ const $props = defineProps({
         type: Number, //Progress value (1.0 > x > 0.0)
         required: true,
     },
+    showDialog: {
+        type: Boolean,
+        required: true,
+    },
     cancelled: {
         type: Boolean,
         required: false,
@@ -20,22 +24,30 @@ const emit = defineEmits(['cancel', 'close']);
 
 const dialogRef = ref(null);
 
-const showDialog = defineModel('showDialog', {
+const _showDialog = computed({
-    type: Boolean,
+    get: () => $props.showDialog,
-    default: false,
+    set: (value) => {
+        if (value) dialogRef.value.show();
+    },
 });
 
 const _progress = computed(() => $props.progress);
+
 const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
+
+const cancel = () => {
+    dialogRef.value.hide();
+    emit('cancel');
+};
 </script>
 
 <template>
-    <QDialog ref="dialogRef" v-model="showDialog" @hide="emit('close')">
+    <QDialog ref="dialogRef" v-model="_showDialog" @hide="onDialogHide">
         <QCard class="full-width dialog">
             <QCardSection class="row">
                 <span class="text-h6">{{ t('Progress') }}</span>
                 <QSpace />
-                <QBtn icon="close" flat round dense v-close-popup />
+                <QBtn icon="close" flat round dense @click="emit('close')" />
             </QCardSection>
             <QCardSection>
                 <div class="column">
@@ -68,7 +80,7 @@ const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
                     type="button"
                     flat
                     class="text-primary"
-                    v-close-popup
+                    @click="cancel()"
                 >
                     {{ t('globals.cancel') }}
                 </QBtn>

src/pages/Account/Alias/Card/AliasUsers.vue

@@ -46,9 +46,13 @@ const columns = computed(() => [
 ]);
 
 const deleteAlias = async (row) => {
-    await axios.delete(`${urlPath.value}/${row.id}`);
+    try {
-    notify(t('User removed'), 'positive');
+        await axios.delete(`${urlPath.value}/${row.id}`);
-    fetchAliases();
+        notify(t('User removed'), 'positive');
+        fetchAliases();
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 watch(

src/pages/Account/Card/AccountMailAlias.vue

@@ -61,15 +61,23 @@ const fetchAccountExistence = async () => {
 };
 
 const deleteMailAlias = async (row) => {
-    await axios.delete(`${urlPath}/${row.id}`);
+    try {
-    fetchMailAliases();
+        await axios.delete(`${urlPath}/${row.id}`);
-    notify(t('Unsubscribed from alias!'), 'positive');
+        fetchMailAliases();
+        notify(t('Unsubscribed from alias!'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const createMailAlias = async (mailAliasFormData) => {
-    await axios.post(urlPath, mailAliasFormData);
+    try {
-    notify(t('Subscribed to alias!'), 'positive');
+        await axios.post(urlPath, mailAliasFormData);
-    fetchMailAliases();
+        notify(t('Subscribed to alias!'), 'positive');
+        fetchMailAliases();
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const fetchMailAliases = async () => {

src/pages/Account/Role/Card/SubRoles.vue

@@ -46,15 +46,29 @@ const columns = computed(() => [
 ]);
 
 const deleteSubRole = async (row) => {
-    await axios.delete(`${urlPath.value}/${row.id}`);
+    try {
-    fetchSubRoles();
+        await axios.delete(`${urlPath.value}/${row.id}`);
-    notify(t('Role removed. Changes will take a while to fully propagate.'), 'positive');
+        fetchSubRoles();
+        notify(
+            t('Role removed. Changes will take a while to fully propagate.'),
+            'positive'
+        );
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const createSubRole = async (subRoleFormData) => {
-    await axios.post(urlPath.value, subRoleFormData);
+    try {
-    notify(t('Role added! Changes will take a while to fully propagate.'), 'positive');
+        await axios.post(urlPath.value, subRoleFormData);
-    fetchSubRoles();
+        notify(
+            t('Role added! Changes will take a while to fully propagate.'),
+            'positive'
+        );
+        fetchSubRoles();
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 watch(

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

@@ -112,20 +112,32 @@ const getShipped = async (params) => {
 };
 
 const onChangeZone = async (zoneId) => {
-    formData.value.agencyModeFk = null;
+    try {
-    const { data } = await axios.get(`Zones/${zoneId}`);
+        formData.value.agencyModeFk = null;
-    formData.value.agencyModeFk = data.agencyModeFk;
+        const { data } = await axios.get(`Zones/${zoneId}`);
+        formData.value.agencyModeFk = data.agencyModeFk;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const onChangeAddress = async (addressId) => {
-    formData.value.nickname = null;
+    try {
-    const { data } = await axios.get(`Addresses/${addressId}`);
+        formData.value.nickname = null;
-    formData.value.nickname = data.nickname;
+        const { data } = await axios.get(`Addresses/${addressId}`);
+        formData.value.nickname = data.nickname;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const getClientDefaultAddress = async (clientId) => {
-    const { data } = await axios.get(`Clients/${clientId}`);
+    try {
-    if (data) addressId.value = data.defaultAddressFk;
+        const { data } = await axios.get(`Clients/${clientId}`);
+        if (data) addressId.value = data.defaultAddressFk;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const clientAddressesList = async (value) => {

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

@@ -70,51 +70,60 @@ const isFormInvalid = () => {
 };
 
 const getPriceDifference = async () => {
-    const params = {
+    try {
-        landed: formData.value.landed,
+        const params = {
-        addressId: formData.value.addressFk,
+            landed: formData.value.landed,
-        agencyModeId: formData.value.agencyModeFk,
+            addressId: formData.value.addressFk,
-        zoneId: formData.value.zoneFk,
+            agencyModeId: formData.value.agencyModeFk,
-        warehouseId: formData.value.warehouseFk,
+            zoneId: formData.value.zoneFk,
-        shipped: formData.value.shipped,
+            warehouseId: formData.value.warehouseFk,
-    };
+            shipped: formData.value.shipped,
-    const { data } = await axios.post(
+        };
-        `tickets/${formData.value.id}/priceDifference`,
+        const { data } = await axios.post(
-        params
+            `tickets/${formData.value.id}/priceDifference`,
-    );
+            params
-    formData.value.sale = data;
+        );
+        formData.value.sale = data;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const submit = async () => {
-    if (!formData.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
+    try {
+        if (!formData.value.option)
+            return notify(t('basicData.chooseAnOption'), 'negative');
 
-    const params = {
+        const params = {
-        clientFk: formData.value.clientFk,
+            clientFk: formData.value.clientFk,
-        nickname: formData.value.nickname,
+            nickname: formData.value.nickname,
-        agencyModeFk: formData.value.agencyModeFk,
+            agencyModeFk: formData.value.agencyModeFk,
-        addressFk: formData.value.addressFk,
+            addressFk: formData.value.addressFk,
-        zoneFk: formData.value.zoneFk,
+            zoneFk: formData.value.zoneFk,
-        warehouseFk: formData.value.warehouseFk,
+            warehouseFk: formData.value.warehouseFk,
-        companyFk: formData.value.companyFk,
+            companyFk: formData.value.companyFk,
-        shipped: formData.value.shipped,
+            shipped: formData.value.shipped,
-        landed: formData.value.landed,
+            landed: formData.value.landed,
-        isDeleted: formData.value.isDeleted,
+            isDeleted: formData.value.isDeleted,
-        option: formData.value.option,
+            option: formData.value.option,
-        isWithoutNegatives: formData.value.withoutNegatives,
+            isWithoutNegatives: formData.value.withoutNegatives,
-        withWarningAccept: formData.value.withWarningAccept,
+            withWarningAccept: formData.value.withWarningAccept,
-        keepPrice: false,
+            keepPrice: false,
-    };
+        };
 
-    const { data } = await axios.post(
+        const { data } = await axios.post(
-        `tickets/${formData.value.id}/componentUpdate`,
+            `tickets/${formData.value.id}/componentUpdate`,
-        params
+            params
-    );
+        );
 
-    if (!data) return;
+        if (!data) return;
 
-    const ticketToMove = data.id;
+        const ticketToMove = data.id;
-    notify(t('basicData.unroutedTicket'), 'positive');
+        notify(t('basicData.unroutedTicket'), 'positive');
-    router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
+        router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const submitWithNegatives = async () => {

src/pages/Ticket/Card/ExpeditionNewTicket.vue

@@ -34,20 +34,26 @@ const newTicketFormData = reactive({});
 const date = new Date();
 
 const createTicket = async () => {
-    const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
+    try {
-    const params = {
+        const expeditionIds = $props.selectedExpeditions.map(
-        clientId: $props.ticket.clientFk,
+            (expedition) => expedition.id
-        landed: newTicketFormData.landed,
+        );
-        warehouseId: $props.ticket.warehouseFk,
+        const params = {
-        addressId: $props.ticket.addressFk,
+            clientId: $props.ticket.clientFk,
-        agencyModeId: $props.ticket.agencyModeFk,
+            landed: newTicketFormData.landed,
-        routeId: newTicketFormData.routeFk,
+            warehouseId: $props.ticket.warehouseFk,
-        expeditionIds: expeditionIds,
+            addressId: $props.ticket.addressFk,
-    };
+            agencyModeId: $props.ticket.agencyModeFk,
+            routeId: newTicketFormData.routeFk,
+            expeditionIds: expeditionIds,
+        };
 
-    const { data } = await axios.post('Expeditions/moveExpeditions', params);
+        const { data } = await axios.post('Expeditions/moveExpeditions', params);
-    notify(t('globals.dataSaved'), 'positive');
+        notify(t('globals.dataSaved'), 'positive');
-    router.push({ name: 'TicketSummary', params: { id: data.id } });
+        router.push({ name: 'TicketSummary', params: { id: data.id } });
+    } catch (error) {
+        console.error(error);
+    }
 };
 </script>
 

src/pages/Ticket/Card/TicketComponents.vue

@@ -150,19 +150,31 @@ const getTotal = computed(() => {
 });
 
 const getComponentsSum = async () => {
-    const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
+    try {
-    componentsList.value = data;
+        const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
+        componentsList.value = data;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const getTheoricalCost = async () => {
-    const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
+    try {
-    theoricalCost.value = data;
+        const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
+        theoricalCost.value = data;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const getTicketVolume = async () => {
-    if (!ticketData.value) return;
+    try {
-    const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
+        if (!ticketData.value) return;
-    ticketVolume.value = data[0].volume;
+        const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
+        ticketVolume.value = data[0].volume;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 onMounted(() => {

src/pages/Ticket/Card/TicketExpedition.vue

@@ -163,12 +163,16 @@ const showNewTicketDialog = (withRoute = false) => {
 };
 
 const deleteExpedition = async () => {
-    const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
+    try {
-    const params = { expeditionIds };
+        const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
-    await axios.post('Expeditions/deleteExpeditions', params);
+        const params = { expeditionIds };
-    vnTableRef.value.reload();
+        await axios.post('Expeditions/deleteExpeditions', params);
-    selectedExpeditions.value = [];
+        vnTableRef.value.reload();
-    notify(t('expedition.expeditionRemoved'), 'positive');
+        selectedExpeditions.value = [];
+        notify(t('expedition.expeditionRemoved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const showLog = async (expedition) => {
@@ -177,19 +181,23 @@ const showLog = async (expedition) => {
 };
 
 const getExpeditionState = async (expedition) => {
-    const filter = {
+    try {
-        where: { expeditionFk: expedition.id },
+        const filter = {
-        order: ['created DESC'],
+            where: { expeditionFk: expedition.id },
-    };
+            order: ['created DESC'],
+        };
 
-    const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
+        const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
-        params: { filter: JSON.stringify(filter) },
+            params: { filter: JSON.stringify(filter) },
-    });
+        });
 
-    expeditionsLogsData.value = expeditionStates.map((state) => ({
+        expeditionsLogsData.value = expeditionStates.map((state) => ({
-        ...state,
+            ...state,
-        isScanned: !!state.isScanned,
+            isScanned: !!state.isScanned,
-    }));
+        }));
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 onMounted(async () => {

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -165,10 +165,14 @@ const createRefund = async (withWarehouse) => {
         negative: true,
     };
 
-    const { data } = await axios.post('Tickets/cloneAll', params);
+    try {
-    const [refundTicket] = data;
+        const { data } = await axios.post('Tickets/cloneAll', params);
-    notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+        const [refundTicket] = data;
-    push({ name: 'TicketSale', params: { id: refundTicket.id } });
+        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
+    } catch (error) {
+        console.error(error);
+    }
 };
 </script>
 

src/pages/Ticket/Card/TicketSaleTracking.vue

@@ -150,14 +150,18 @@ const shelvingsTableColumns = computed(() => [
 ]);
 
 const getSaleTrackings = async (sale) => {
-    const filter = {
+    try {
-        where: { saleFk: sale.saleFk },
+        const filter = {
-        order: ['itemFk DESC'],
+            where: { saleFk: sale.saleFk },
-    };
+            order: ['itemFk DESC'],
-    const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
+        };
-        params: { filter: JSON.stringify(filter) },
+        const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
-    });
+            params: { filter: JSON.stringify(filter) },
-    saleTrackings.value = data;
+        });
+        saleTrackings.value = data;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const showLog = async (sale) => {
@@ -166,13 +170,17 @@ const showLog = async (sale) => {
 };
 
 const getItemShelvingSales = async (sale) => {
-    const filter = {
+    try {
-        where: { saleFk: sale.saleFk },
+        const filter = {
-    };
+            where: { saleFk: sale.saleFk },
-    const { data } = await axios.get(`ItemShelvingSales/filter`, {
+        };
-        params: { filter: JSON.stringify(filter) },
+        const { data } = await axios.get(`ItemShelvingSales/filter`, {
-    });
+            params: { filter: JSON.stringify(filter) },
-    itemShelvingsSales.value = data;
+        });
+        itemShelvingsSales.value = data;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const showShelving = async (sale) => {
@@ -181,28 +189,36 @@ const showShelving = async (sale) => {
 };
 
 const updateQuantity = async (sale) => {
-    if (oldQuantity.value === sale.quantity) return;
+    try {
-    const params = {
+        if (oldQuantity.value === sale.quantity) return;
-        quantity: sale.quantity,
+        const params = {
-    };
+            quantity: sale.quantity,
-    await axios.patch(`ItemShelvingSales/${sale.id}`, params);
+        };
-    oldQuantity.value = null;
+        await axios.patch(`ItemShelvingSales/${sale.id}`, params);
+        oldQuantity.value = null;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const updateParking = async (sale) => {
-    const filter = {
+    try {
-        fields: ['id'],
+        const filter = {
-        where: {
+            fields: ['id'],
-            code: sale.shelvingFk,
+            where: {
-        },
+                code: sale.shelvingFk,
-    };
+            },
-    const { data } = await axios.get(`Shelvings/findOne`, {
+        };
-        params: { filter: JSON.stringify(filter) },
+        const { data } = await axios.get(`Shelvings/findOne`, {
-    });
+            params: { filter: JSON.stringify(filter) },
-    const params = {
+        });
-        parkingFk: sale.parkingFk,
+        const params = {
-    };
+            parkingFk: sale.parkingFk,
-    await axios.patch(`Shelvings/${data.id}`, params);
+        };
+        await axios.patch(`Shelvings/${data.id}`, params);
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const updateShelving = async (sale) => {
@@ -225,41 +241,61 @@ const updateShelving = async (sale) => {
 };
 
 const saleTrackingNew = async (sale, stateCode, isChecked) => {
-    const params = {
+    try {
-        saleFk: sale.saleFk,
+        const params = {
-        isChecked,
+            saleFk: sale.saleFk,
-        quantity: sale.quantity,
+            isChecked,
-        stateCode,
+            quantity: sale.quantity,
-    };
+            stateCode,
-    await axios.post(`SaleTrackings/new`, params);
+        };
-    notify(t('globals.dataSaved'), 'positive');
+        await axios.post(`SaleTrackings/new`, params);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const saleTrackingDel = async ({ saleFk }, stateCode) => {
-    const params = {
+    try {
-        saleFk,
+        const params = {
-        stateCodes: [stateCode],
+            saleFk,
-    };
+            stateCodes: [stateCode],
-    await axios.post(`SaleTrackings/delete`, params);
+        };
-    notify(t('globals.dataSaved'), 'positive');
+        await axios.post(`SaleTrackings/delete`, params);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const clickSaleGroupDetail = async (sale) => {
-    if (!sale.saleGroupDetailFk) return;
+    try {
+        if (!sale.saleGroupDetailFk) return;
 
-    await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
+        await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
-    sale.hasSaleGroupDetail = false;
+        sale.hasSaleGroupDetail = false;
-    notify(t('globals.dataSaved'), 'positive');
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const clickPreviousSelected = (sale) => {
-    qCheckBoxController(sale, 'isPreviousSelected');
+    try {
-    if (!sale.isPreviousSelected) sale.isPrevious = false;
+        qCheckBoxController(sale, 'isPreviousSelected');
+        if (!sale.isPreviousSelected) sale.isPrevious = false;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const clickPrevious = (sale) => {
-    qCheckBoxController(sale, 'isPrevious');
+    try {
-    if (sale.isPrevious) sale.isPreviousSelected = true;
+        qCheckBoxController(sale, 'isPrevious');
+        if (sale.isPrevious) sale.isPreviousSelected = true;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const qCheckBoxController = (sale, action) => {
@@ -270,12 +306,16 @@ const qCheckBoxController = (sale, action) => {
         isPreviousSelected: 'PREVIOUS_PREPARATION',
     };
     const stateCode = STATE_CODES[action];
-    if (!sale[action]) {
+    try {
-        saleTrackingNew(sale, stateCode, true);
+        if (!sale[action]) {
-        sale[action] = true;
+            saleTrackingNew(sale, stateCode, true);
-    } else {
+            sale[action] = true;
-        saleTrackingDel(sale, stateCode);
+        } else {
-        sale[action] = false;
+            saleTrackingDel(sale, stateCode);
+            sale[action] = false;
+        }
+    } catch (error) {
+        console.error(error);
     }
 };
 </script>

src/pages/Ticket/Card/TicketService.vue

@@ -46,32 +46,40 @@ watch(
 onMounted(async () => await getDefaultTaxClass());
 
 const createRefund = async () => {
-    if (!selected.value.length) return;
+    try {
+        if (!selected.value.length) return;
 
-    const params = {
+        const params = {
-        servicesIds: selected.value.map((s) => +s.id),
+            servicesIds: selected.value.map((s) => +s.id),
-        withWarehouse: false,
+            withWarehouse: false,
-        negative: true,
+            negative: true,
-    };
+        };
-    const { data } = await axios.post('Sales/clone', params);
+        const { data } = await axios.post('Sales/clone', params);
-    const [refundTicket] = data;
+        const [refundTicket] = data;
-    notify(
+        notify(
-        t('service.createRefundSuccess', {
+            t('service.createRefundSuccess', {
-            ticketId: refundTicket.id,
+                ticketId: refundTicket.id,
-        }),
+            }),
-        'positive'
+            'positive'
-    );
+        );
-    router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+        router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const getDefaultTaxClass = async () => {
-    let filter = {
+    try {
-        where: { code: 'G' },
+        let filter = {
-    };
+            where: { code: 'G' },
-    const { data } = await axios.get('TaxClasses/findOne', {
+        };
-        params: { filter: JSON.stringify(filter) },
+        const { data } = await axios.get('TaxClasses/findOne', {
-    });
+            params: { filter: JSON.stringify(filter) },
-    defaultTaxClass.value = data;
+        });
+        defaultTaxClass.value = data;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const columns = computed(() => [

src/pages/Ticket/Card/TicketVolume.vue

@@ -75,18 +75,22 @@ const columns = computed(() => [
 ]);
 
 const applyVolumes = async (salesData) => {
-    if (!salesData.length) return;
+    try {
+        if (!salesData.length) return;
 
-    sales.value = salesData;
+        sales.value = salesData;
-    const ticket = sales.value[0].ticketFk;
+        const ticket = sales.value[0].ticketFk;
-    const { data } = await axios.get(`Tickets/${ticket}/getVolume`);
+        const { data } = await axios.get(`Tickets/${ticket}/getVolume`);
-    const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume]));
+        const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume]));
 
-    sales.value.forEach((sale) => {
+        sales.value.forEach((sale) => {
-        sale.saleVolume = volumes.get(sale.id);
+            sale.saleVolume = volumes.get(sale.id);
-    });
+        });
 
-    packingTypeVolume.value = data.packingTypeVolume;
+        packingTypeVolume.value = data.packingTypeVolume;
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 onMounted(() => (stateStore.rightDrawer = true));

src/pages/Ticket/TicketAdvance.vue

@@ -1,20 +1,24 @@
 <script setup>
-import { ref, computed, reactive, watch } from 'vue';
+import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnProgress from 'src/components/common/VnProgressModal.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketAdvanceFilter from './TicketAdvanceFilter.vue';
+
 import { dashIfEmpty, toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -25,58 +29,109 @@ const user = state.getUser();
 const itemPackingTypesOptions = ref([]);
 const zonesOptions = ref([]);
 const selectedTickets = ref([]);
-const vnTableRef = ref({});
+
-const originElRef = ref(null);
+const exprBuilder = (param, value) => {
-const destinationElRef = ref(null);
+    switch (param) {
-let today = Date.vnNew().toISOString();
+        case 'id':
-const tomorrow = new Date(today);
+        case 'futureId':
-tomorrow.setDate(tomorrow.getDate() + 1);
+        case 'liters':
-const userParams = reactive({
+        case 'futureLiters':
-    dateFuture: tomorrow,
+        case 'lines':
-    dateToAdvance: today,
+        case 'futureLines':
-    warehouseFk: user.value.warehouseFk,
+        case 'totalWithVat':
-    ipt: 'H',
+        case 'futureTotalWithVat':
-    futureIpt: 'H',
+        case 'futureZone':
-    isFullMovable: true,
+        case 'notMovableLines':
+        case 'futureZoneFk':
+            return { [param]: value };
+        case 'iptColFilter':
+            return { ipt: { like: `%${value}%` } };
+        case 'futureIptColFilter':
+            return { futureIpt: { like: `%${value}%` } };
+    }
+};
+
+const userParams = reactive({});
+
+const arrayData = useArrayData('AdvanceTickets', {
+    url: 'Tickets/getTicketsAdvance',
+    userParams: userParams,
+    exprBuilder: exprBuilder,
+    limit: 0,
 });
+const { store } = arrayData;
+const tickets = computed(() =>
+    (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
+);
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        userParams[paramKey] = col.columnFilter.filterValue;
+        await arrayData.addFilter({ params: userParams });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
 
 const ticketColumns = computed(() => [
     {
         label: '',
         name: 'icons',
-        hidden: true,
-        headerClass: 'horizontal-separator',
-    },
-    {
-        align: 'center',
-        label: t('advanceTickets.ticketId'),
-        name: 'id',
-        headerClass: 'horizontal-separator',
-    },
-    {
         align: 'left',
-        label: t('advanceTickets.ipt'),
+        columnFilter: null,
-        name: 'ipt',
+    },
+    {
+        label: t('advanceTickets.ticketId'),
+        name: 'ticketId',
+        align: 'center',
+        sortable: true,
         columnFilter: {
-            component: 'select',
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'id',
+            event: getInputEvents,
             attrs: {
-                url: 'itemPackingTypes',
+                dense: true,
-                fields: ['code', 'description'],
-                where: { isActive: true },
-                optionValue: 'code',
-                optionLabel: 'description',
-                inWhere: false,
             },
         },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
-        headerClass: 'horizontal-separator',
     },
     {
+        label: t('advanceTickets.ipt'),
+        name: 'ipt',
+        field: 'ipt',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'iptColFilter',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
         label: t('advanceTickets.state'),
         name: 'state',
-        headerClass: 'horizontal-separator',
+        align: 'left',
-        hidden: true,
+        sortable: true,
+        columnFilter: null,
     },
     {
         label: t('advanceTickets.preparation'),
@@ -84,105 +139,171 @@ const ticketColumns = computed(() => [
         field: 'preparation',
         align: 'left',
         sortable: true,
-        headerClass: 'horizontal-separator',
+        columnFilter: null,
-        columnFilter: false,
     },
     {
-        align: 'left',
         label: t('advanceTickets.liters'),
-        headerClass: 'horizontal-separator',
         name: 'liters',
+        field: 'liters',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
-        align: 'left',
         label: t('advanceTickets.lines'),
         name: 'lines',
-        headerClass: 'horizontal-separator',
+        field: 'lines',
-        format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.import'),
-        name: 'totalWithVat',
+        field: 'import',
-        hidden: true,
+        name: 'import',
-        headerClass: 'horizontal-separator',
+        align: 'left',
-        format: (row) => toCurrency(row.totalWithVat),
+        sortable: true,
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
-        headerClass: 'vertical-separator horizontal-separator',
+        align: 'left',
-        columnClass: 'vertical-separator',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'futureId',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
+        field: 'futureIpt',
+        align: 'left',
+        sortable: true,
         columnFilter: {
-            component: 'select',
+            component: VnSelect,
+            filterParamKey: 'futureIptColFilter',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'itemPackingTypes',
+                options: itemPackingTypesOptions.value,
-                fields: ['code', 'description'],
+                'option-value': 'code',
-                where: { isActive: true },
+                'option-label': 'description',
-                optionValue: 'code',
+                dense: true,
-                optionLabel: 'description',
             },
         },
-        headerClass: 'horizontal-separator',
+        format: (val) => dashIfEmpty(val),
-        format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureState'),
         name: 'futureState',
-        headerClass: 'horizontal-separator',
+        align: 'left',
-        hidden: true,
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureLiters'),
-        headerClass: 'horizontal-separator',
         name: 'futureLiters',
-    },
+        field: 'futureLiters',
-    {
         align: 'left',
-        label: t('advanceTickets.futureZone'),
+        sortable: true,
-        name: 'futureZoneFk',
-        columnClass: 'expand',
         columnFilter: {
-            component: 'select',
+            component: VnInput,
-            inWhere: true,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'Zones',
+                dense: true,
-                fields: ['id', 'name'],
             },
         },
-        columnField: {
+        format: (val) => dashIfEmpty(val),
-            component: null,
+    },
+    {
+        label: t('advanceTickets.futureZone'),
+        name: 'futureZoneName',
+        field: 'futureZoneName',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            type: 'select',
+            filterValue: null,
+            filterParamKey: 'futureZoneFk',
+            event: getInputEvents,
+            attrs: {
+                options: zonesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
         },
-        headerClass: 'horizontal-separator',
+        format: (val) => dashIfEmpty(val),
-        format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
     },
     {
-        align: 'left',
         label: t('advanceTickets.notMovableLines'),
-        headerClass: 'horizontal-separator',
         name: 'notMovableLines',
+        field: 'notMovableLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureLines'),
-        headerClass: 'horizontal-separator',
         name: 'futureLines',
+        field: 'futureLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureImport'),
-        name: 'futureTotalWithVat',
+        name: 'futureImport',
-        hidden: true,
+        align: 'left',
-        headerClass: 'horizontal-separator',
+        sortable: true,
-        format: (row) => toCurrency(row.futureTotalWithVat),
+        columnFilter: null,
     },
 ]);
 
@@ -208,7 +329,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
     const query = `tickets/${ticket.futureId}/componentUpdate`;
     if (!ticket.landed) {
         const newLanded = await getLanded({
-            shipped: vnTableRef.value.params.dateToAdvance,
+            shipped: userParams.dateToAdvance,
             addressFk: ticket.futureAddressFk,
             agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
             warehouseFk: ticket.futureWarehouseFk,
@@ -231,7 +352,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
         zoneFk: ticket.zoneFk ?? ticket.futureZoneFk,
         warehouseFk: ticket.futureWarehouseFk,
         companyFk: ticket.futureCompanyFk,
-        shipped: vnTableRef.value.params.dateToAdvance,
+        shipped: userParams.dateToAdvance,
         landed: ticket.landed,
         isDeleted: false,
         isWithoutNegatives,
@@ -243,31 +364,36 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
 };
 
 const moveTicketsAdvance = async () => {
-    let ticketsToMove = [];
+    try {
-    for (const ticket of selectedTickets.value) {
+        let ticketsToMove = [];
-        if (!ticket.id) {
+        for (const ticket of selectedTickets.value) {
-            try {
+            if (!ticket.id) {
-                const { query, params } = await requestComponentUpdate(ticket, false);
+                try {
-                axios.post(query, params);
+                    const { query, params } = await requestComponentUpdate(ticket, false);
-            } catch (e) {
+                    axios.post(query, params);
-                console.error('Error moving ticket', e);
+                } catch (e) {
+                    console.error('Error moving ticket', e);
+                }
+                continue;
             }
-            continue;
+            ticketsToMove.push({
+                originId: ticket.futureId,
+                destinationId: ticket.id,
+                originShipped: ticket.futureShipped,
+                destinationShipped: ticket.shipped,
+                workerFk: ticket.workerFk,
+            });
         }
-        ticketsToMove.push({
-            originId: ticket.futureId,
-            destinationId: ticket.id,
-            originShipped: ticket.futureShipped,
-            destinationShipped: ticket.shipped,
-            workerFk: ticket.workerFk,
-        });
-    }
 
-    const params = { tickets: ticketsToMove };
+        const params = { tickets: ticketsToMove };
-    await axios.post('Tickets/merge', params);
+        await axios.post('Tickets/merge', params);
-    vnTableRef.value.reload();
+        arrayData.fetch({ append: false });
-    selectedTickets.value = [];
+        selectedTickets.value = [];
-    if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
+        if (ticketsToMove.length)
+            notify(t('advanceTickets.moveTicketSuccess'), 'positive');
+    } catch (error) {
+        console.error('Error moving tickets', error);
+    }
 };
 
 const progressLength = ref(0);
@@ -308,8 +434,10 @@ const splitTickets = async () => {
                 progressAdd(ticket.futureId);
             }
         }
+    } catch (error) {
+        console.error('Error splitting tickets', error);
     } finally {
-        vnTableRef.value.reload();
+        arrayData.fetch({ append: false });
     }
 };
 
@@ -327,52 +455,22 @@ const handleCloseProgressDialog = () => {
 
 const handleCancelProgress = () => (cancelProgress.value = true);
 
-watch(
+onMounted(async () => {
-    () => vnTableRef.value.tableRef?.$el,
+    let today = Date.vnNew();
-    ($el) => {
+    const tomorrow = new Date(today);
-        if (!$el) return;
+    tomorrow.setDate(tomorrow.getDate() + 1);
-        const head = $el.querySelector('thead');
+    userParams.dateFuture = tomorrow;
-        const firstRow = $el.querySelector('thead > tr');
+    userParams.dateToAdvance = today;
-
+    userParams.scopeDays = 1;
-        const newRow = document.createElement('tr');
+    userParams.warehouseFk = user.value.warehouseFk;
-        destinationElRef.value = document.createElement('th');
+    userParams.ipt = 'H';
-        originElRef.value = document.createElement('th');
+    userParams.futureIpt = 'H';
-
+    userParams.isFullMovable = true;
-        newRow.classList.add('bg-header');
+    const filter = { limit: 0 };
-        destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
+    await arrayData.addFilter({ filter, userParams });
-        originElRef.value.classList.add('text-uppercase', 'color-vn-label');
+});
-
-        destinationElRef.value.setAttribute('colspan', '7');
-        originElRef.value.setAttribute('colspan', '9');
-
-        destinationElRef.value.textContent = `${t(
-            'advanceTickets.destination'
-        )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
-        originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
-            vnTableRef.value.params.dateFuture
-        )}`;
-
-        newRow.append(destinationElRef.value, originElRef.value);
-        head.insertBefore(newRow, firstRow);
-    },
-    { once: true, inmmediate: true }
-);
-
-watch(
-    () => vnTableRef.value.params,
-    () => {
-        if (originElRef.value && destinationElRef.value) {
-            destinationElRef.value.textContent = `${t(
-                'advanceTickets.destination'
-            )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
-            originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
-                vnTableRef.value.params.dateFuture
-            )}`;
-        }
-    },
-    { deep: true }
-);
 </script>
+
 <template>
     <FetchData
         url="itemPackingTypes"
@@ -393,6 +491,11 @@ watch(
         auto-load
         @on-fetch="(data) => (zonesOptions = data)"
     />
+    <VnSearchbar
+        data-key="WeeklyTickets"
+        :label="t('weeklyTickets.search')"
+        :info="t('weeklyTickets.searchInfo')"
+    />
     <VnSubToolbar>
         <template #st-data>
             <QBtn
@@ -436,109 +539,174 @@ watch(
     </VnSubToolbar>
     <RightMenu>
         <template #right-panel>
-            <TicketAdvanceFilter data-key="advanceTickets" />
+            <TicketAdvanceFilter data-key="AdvanceTickets" />
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
-        <VnTable
+        <QTable
-            data-key="advanceTickets"
+            :rows="tickets"
-            ref="vnTableRef"
-            url="Tickets/getTicketsAdvance"
-            search-url="advanceTickets"
-            :user-params="userParams"
-            :limit="0"
             :columns="ticketColumns"
-            :table="{
+            row-key="index"
-                'row-key': '$index',
+            selection="multiple"
-                selection: 'multiple',
-            }"
             v-model:selected="selectedTickets"
             :pagination="{ rowsPerPage: 0 }"
             :no-data-label="t('globals.noResults')"
-            :right-search="false"
+            style="max-width: 99%"
-            auto-load
-            :disable-option="{ card: true }"
         >
-            <template #column-icons="{ row }">
+            <template #header="props">
-                <QIcon
+                {{ userParams.scopeDays }}
-                    v-if="row.futureAgency !== row.agency && row.agency"
+                <QTr :props="props">
-                    color="primary"
+                    <QTh
-                    name="vn:agency-term"
+                        class="horizontal-separator text-uppercase color-vn-label"
-                    size="xs"
+                        colspan="7"
-                >
+                        translate
-                    <QTooltip class="column">
+                    >
-                        <span>
+                        {{ t('advanceTickets.destination') }}
-                            {{
+                        {{ toDateFormat(userParams.dateToAdvance) }}
-                                t('advanceTickets.originAgency', {
+                    </QTh>
-                                    agency: row.futureAgency,
+                    <QTh
-                                })
+                        class="horizontal-separator text-uppercase color-vn-label"
-                            }}
+                        colspan="9"
-                        </span>
+                        translate
-                        <span>
+                    >
-                            {{
+                        {{ t('advanceTickets.origin') }}
-                                t('advanceTickets.destinationAgency', {
+                        {{ toDateFormat(userParams.dateFuture) }}
-                                    agency: row.agency,
+                    </QTh>
-                                })
+                </QTr>
-                            }}
+                <QTr>
-                        </span>
+                    <QTh>
-                    </QTooltip>
+                        <QCheckbox v-model="props.selected" />
-                </QIcon>
+                    </QTh>
+                    <QTh
+                        v-for="(col, index) in ticketColumns"
+                        :key="index"
+                        :class="{ 'vertical-separator': col.name === 'futureId' }"
+                    >
+                        {{ col.label }}
+                    </QTh>
+                </QTr>
             </template>
-            <template #column-id="{ row }">
+            <template #top-row="{ cols }">
-                <QBtn flat class="link">
+                <QTr>
-                    {{ row.id }}
+                    <QTd />
-                    <TicketDescriptorProxy :id="row.id" />
+                    <QTd
-                </QBtn>
+                        v-for="(col, index) in cols"
+                        :key="index"
+                        style="max-width: 100px"
+                    >
+                        <component
+                            :is="col.columnFilter.component"
+                            v-if="col.columnFilter"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
             </template>
-            <template #column-state="{ row }">
+            <template #header-cell-availableLines="{ col }">
-                <QBadge
+                <QTh class="vertical-separator">
-                    v-if="row.state"
+                    {{ col.label }}
-                    text-color="black"
+                </QTh>
-                    :color="row.classColor"
-                    class="q-ma-none"
-                    dense
-                >
-                    {{ row.state }}
-                </QBadge>
-                <span v-else> {{ dashIfEmpty(row.state) }}</span>
             </template>
-            <template #column-import="{ row }">
+            <template #body-cell-icons="{ row }">
-                <QBadge
+                <QTd class="q-gutter-x-xs">
-                    :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
+                    <QIcon
-                    :color="totalPriceColor(row.totalWithVat)"
+                        v-if="row.futureAgency !== row.agency && row.agency"
-                    class="q-ma-none"
+                        color="primary"
-                    dense
+                        name="vn:agency-term"
-                >
+                        size="xs"
-                    {{ toCurrency(row.totalWithVat || 0) }}
+                    >
-                </QBadge>
+                        <QTooltip class="column">
+                            <span>
+                                {{
+                                    t('advanceTickets.originAgency', {
+                                        agency: row.futureAgency,
+                                    })
+                                }}
+                            </span>
+                            <span>
+                                {{
+                                    t('advanceTickets.destinationAgency', {
+                                        agency: row.agency,
+                                    })
+                                }}
+                            </span>
+                        </QTooltip>
+                    </QIcon>
+                </QTd>
             </template>
-            <template #column-futureId="{ row }">
+
-                <QBtn flat class="link" dense>
+            <template #body-cell-ticketId="{ row }">
-                    {{ row.futureId }}
+                <QTd>
-                    <TicketDescriptorProxy :id="row.futureId" />
+                    <QBtn flat class="link">
-                </QBtn>
+                        {{ row.id }}
+                        <TicketDescriptorProxy :id="row.id" />
+                    </QBtn>
+                </QTd>
             </template>
-            <template #column-futureState="{ row }">
+            <template #body-cell-state="{ row }">
-                <QBadge
+                <QTd>
-                    text-color="black"
+                    <QBadge
-                    :color="row.futureClassColor"
+                        v-if="row.state"
-                    class="q-ma-none"
+                        text-color="black"
-                    dense
+                        :color="row.classColor"
-                >
+                        class="q-ma-none"
-                    {{ row.futureState }}
+                        dense
-                </QBadge>
+                    >
+                        {{ row.state }}
+                    </QBadge>
+                    <span v-else> {{ dashIfEmpty(row.state) }}</span>
+                </QTd>
             </template>
-            <template #column-futureImport="{ row }">
+            <template #body-cell-import="{ row }">
-                <QBadge
+                <QTd>
-                    :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
+                    <QBadge
-                    :color="totalPriceColor(row.futureTotalWithVat)"
+                        :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
-                    class="q-ma-none"
+                        :color="totalPriceColor(row.totalWithVat)"
-                    dense
+                        class="q-ma-none"
-                >
+                        dense
-                    {{ toCurrency(row.futureTotalWithVat || 0) }}
+                    >
-                </QBadge>
+                        {{ toCurrency(row.totalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
             </template>
-        </VnTable>
+            <template #body-cell-futureId="{ row }">
+                <QTd class="vertical-separator">
+                    <QBtn flat class="link" dense>
+                        {{ row.futureId }}
+                        <TicketDescriptorProxy :id="row.futureId" />
+                    </QBtn>
+                </QTd>
+            </template>
+            <template #body-cell-futureState="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.futureClassColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.futureState }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-futureImport="{ row }">
+                <QTd>
+                    <QBadge
+                        :text-color="
+                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
+                        "
+                        :color="totalPriceColor(row.futureTotalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.futureTotalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
+            </template>
+        </QTable>
         <VnProgress
             :progress="progressPercentage"
             :cancelled="cancelProgress"
@@ -557,11 +725,11 @@ watch(
 </template>
 
 <style scoped lang="scss">
-:deep(.vertical-separator) {
+.vertical-separator {
     border-left: 4px solid white !important;
 }
 
-:deep(.horizontal-separator) {
+.horizontal-separator {
-    border-top: 4px solid white !important;
+    border-bottom: 4px solid white !important;
 }
 </style>

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -27,16 +27,20 @@ const warehousesOptions = ref([]);
 const itemPackingTypes = ref([]);
 
 const getItemPackingTypes = async () => {
-    const filter = {
+    try {
-        where: { isActive: true },
+        const filter = {
-    };
+            where: { isActive: true },
-    const { data } = await axios.get('ItemPackingTypes', {
+        };
-        params: { filter: JSON.stringify(filter) },
+        const { data } = await axios.get('ItemPackingTypes', {
-    });
+            params: { filter: JSON.stringify(filter) },
-    itemPackingTypes.value = data.map((ipt) => ({
+        });
-        description: t(ipt.description),
+        itemPackingTypes.value = data.map((ipt) => ({
-        code: ipt.code,
+            description: t(ipt.description),
-    }));
+            code: ipt.code,
+        }));
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const getLocale = (val) => {
@@ -54,7 +58,6 @@ onMounted(async () => await getItemPackingTypes());
         auto-load
     />
     <VnFilterPanel
-        search-url="advanceTickets"
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
@@ -98,7 +101,6 @@ onMounted(async () => await getItemPackingTypes());
                         dense
                         outlined
                         rounded
-                        :use-like="false"
                     >
                     </VnSelect>
                 </QItemSection>
@@ -116,7 +118,6 @@ onMounted(async () => await getItemPackingTypes());
                         dense
                         outlined
                         rounded
-                        :use-like="false"
                     >
                     </VnSelect>
                 </QItemSection>

src/pages/Ticket/TicketFutureFilter.vue

@@ -24,25 +24,33 @@ const itemPackingTypes = ref([]);
 const stateOptions = ref([]);
 
 const getItemPackingTypes = async () => {
-    const filter = {
+    try {
-        where: { isActive: true },
+        const filter = {
-    };
+            where: { isActive: true },
-    const { data } = await axios.get('ItemPackingTypes', {
+        };
-        params: { filter: JSON.stringify(filter) },
+        const { data } = await axios.get('ItemPackingTypes', {
-    });
+            params: { filter: JSON.stringify(filter) },
-    itemPackingTypes.value = data.map((ipt) => ({
+        });
-        description: t(ipt.description),
+        itemPackingTypes.value = data.map((ipt) => ({
-        code: ipt.code,
+            description: t(ipt.description),
-    }));
+            code: ipt.code,
+        }));
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const getGroupedStates = async () => {
-    const { data } = await axios.get('AlertLevels');
+    try {
-    stateOptions.value = data.map((state) => ({
+        const { data } = await axios.get('AlertLevels');
-        id: state.id,
+        stateOptions.value = data.map((state) => ({
-        name: t(`futureTickets.${state.code}`),
+            id: state.id,
-        code: state.code,
+            name: t(`futureTickets.${state.code}`),
-    }));
+            code: state.code,
+        }));
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 onMounted(async () => {

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -17,11 +17,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    dataKey: {
-        type: String,
-        required: false,
-        default: 'workerData',
-    },
 });
 const image = ref(null);
 
@@ -70,7 +65,7 @@ const handlePhotoUpdated = (evt = false) => {
     <CardDescriptor
         ref="cardDescriptorRef"
         module="Worker"
-        :data-key="dataKey"
+        data-key="workerData"
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"

src/pages/Worker/Card/WorkerDescriptorProxy.vue

@@ -12,11 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <WorkerDescriptor
+        <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" />
-            v-if="$props.id"
-            :id="$props.id"
-            :summary="WorkerSummary"
-            data-key="workerDescriptorProxy"
-        />
     </QPopupProxy>
 </template>

src/pages/Worker/Card/WorkerNotificationsManager.vue

@@ -44,9 +44,8 @@ async function toggleNotification(notification) {
                 `worker.notificationsManager.${notification.active ? '' : 'un'}subscribed`
             ),
         });
-    } catch (e) {
+    } catch {
         notification.active = !notification.active;
-        throw e;
     }
 }
 

src/pages/Zone/Card/ZoneWarehouses.vue

@@ -34,13 +34,21 @@ const columns = computed(() => [
 ]);
 
 const deleteWarehouse = async (row) => {
-    await axios.delete(`${urlPath.value}/${row.id}`);
+    try {
-    fetchWarehouses();
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        fetchWarehouses();
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 const createZoneWarehouse = async (ZoneWarehouseFormData) => {
-    await axios.post(urlPath.value, ZoneWarehouseFormData);
+    try {
-    fetchWarehouses();
+        await axios.post(urlPath.value, ZoneWarehouseFormData);
+        fetchWarehouses();
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 watch(

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

@@ -13,7 +13,7 @@ describe('Logout', () => {
     });
     describe('not user', () => {
         beforeEach(() => {
-            cy.intercept('GET', '**DefaultViewConfigs**', {
+            cy.intercept('GET', '**/VnUsers/acl', {
                 statusCode: 401,
                 body: {
                     error: {
@@ -24,11 +24,10 @@ describe('Logout', () => {
                     },
                 },
                 statusMessage: 'AUTHORIZATION_REQUIRED',
-            });
+            }).as('someRoute');
         });
-
         it('when token not exists', () => {
-            cy.get('.q-list > [href="#/item"]').click();
+            cy.reload();
             cy.get('.q-notification__message').should(
                 'have.text',
                 'Authorization Required'

test/cypress/integration/route/agency/agencyWorkCenter.spec.js

@@ -7,20 +7,31 @@ describe('AgencyWorkCenter', () => {
     const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
     const workCenterCombobox = 'input[role="combobox"]';
 
-    it('check workCenter crud', () => {
+    it('assign workCenter', () => {
-        // create
         cy.get(createButton).click();
         cy.get(workCenterCombobox).type('workCenterOne{enter}');
-        cy.hasNotify('Data created');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
 
-        // expect error when duplicate
+    it('delete workCenter', () => {
-        cy.get(createButton).click();
-        cy.get('[data-cy="FormModelPopup_save"]').click();
-        cy.hasNotify('This workCenter is already assigned to this agency');
-        cy.get('[data-cy="FormModelPopup_cancel"]').click();
-
-        // delete
         cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
-        cy.hasNotify('WorkCenter removed successfully');
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'WorkCenter removed successfully'
+        );
+    });
+
+    it('error on duplicate workCenter', () => {
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.get(createButton).click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
+
+        cy.get(
+            ':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
+        ).should('have.text', 'This workCenter is already assigned to this agency');
     });
 });

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

@@ -17,7 +17,10 @@ describe('WorkerNotificationsManager', () => {
         cy.login('developer');
         cy.visit(`/#/worker/${salesPersonId}/notifications`);
         cy.get(firstAvailableNotification).click();
-        cy.hasNotify('The notification subscription of this worker cant be modified');
+        cy.notificationHas(
+            '.q-notification__message',
+            'The notification subscription of this worker cant be modified'
+        );
     });
 
     it('should active a notification that is yours', () => {

test/cypress/support/commands.js

@@ -262,14 +262,3 @@ Cypress.Commands.add('openUserPanel', () => {
         '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
     ).click();
 });
-
-Cypress.Commands.add('hasNotify', (text) => {
-    //last
-    cy.get('.q-notification')
-        .should('be.visible')
-        .last()
-        .then(($lastNotification) => {
-            if (!Cypress.$($lastNotification).text().includes(text))
-                throw new Error(`Notification not found: "${text}"`);
-        });
-});

test/vitest/__tests__/boot/axios.spec.js

@@ -36,6 +36,8 @@ describe('Axios boot', () => {
 
     describe('onResponseError()', async () => {
         it('should call to the Notify plugin with a message error for an status code "500"', async () => {
+            Notify.create = vi.fn();
+
             const error = {
                 response: {
                     status: 500,
@@ -43,10 +45,19 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
+
             expect(result).rejects.toEqual(expect.objectContaining(error));
+            expect(Notify.create).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    message: 'An internal server error has ocurred',
+                    type: 'negative',
+                })
+            );
         });
 
         it('should call to the Notify plugin with a message from the response property', async () => {
+            Notify.create = vi.fn();
+
             const error = {
                 response: {
                     status: 401,
@@ -59,7 +70,14 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
+
             expect(result).rejects.toEqual(expect.objectContaining(error));
+            expect(Notify.create).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    message: 'Invalid user or password',
+                    type: 'negative',
+                })
+            );
         });
     });
 });