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

Reviewed-on: verdnatura/salix-front#850
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

src/boot/axios.js

@@ -39,37 +39,7 @@ const onResponse = (response) => {
 const onResponseError = (error) => {
     stateQuery.remove(error.config);
 
-    let message = '';
+    if (session.isLoggedIn() && error.response?.status === 401) {
-
-    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);
@@ -78,8 +48,6 @@ const onResponseError = (error) => {
         return Promise.reject(error);
     }
 
-    notify(message, 'negative');
-
     return Promise.reject(error);
 };
 

src/boot/qFormEnterEvent.js

@@ -1,27 +0,0 @@
-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

@@ -1,54 +0,0 @@
-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

@@ -0,0 +1,30 @@
+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,18 +1,53 @@
 import { boot } from 'quasar/wrappers';
-import qFormEnterEvent from './qFormEnterEvent';
+import qFormMixin from './qformMixin';
-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(qFormEnterEvent);
+    app.mixin(qFormMixin);
-    app.mixin(qFormFocus);
     app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
-    app.config.errorHandler = function (err) {
+    app.config.errorHandler = (error) => {
-        console.error(err);
+        let message;
-        notify('globals.error', 'negative', 'error');
+        const response = error.response;
+        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,9 +217,6 @@ 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,6 +61,7 @@ defineExpose({
                     :loading="isLoading"
                     @click="emit('onDataCanceled')"
                     v-close-popup
+                    data-cy="FormModelPopup_cancel"
                 />
                 <QBtn
                     :label="t('globals.save')"
@@ -70,6 +71,7 @@ defineExpose({
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
+                    data-cy="FormModelPopup_save"
                 />
             </div>
         </template>

src/components/VnTable/VnTable.vue

@@ -457,7 +457,11 @@ function handleScroll() {
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh v-if="col.visible ?? true">
+                    <QTh
+                        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,10 +9,6 @@ const $props = defineProps({
         type: Number, //Progress value (1.0 > x > 0.0)
         required: true,
     },
-    showDialog: {
-        type: Boolean,
-        required: true,
-    },
     cancelled: {
         type: Boolean,
         required: false,
@@ -24,30 +20,22 @@ const emit = defineEmits(['cancel', 'close']);
 
 const dialogRef = ref(null);
 
-const _showDialog = computed({
+const showDialog = defineModel('showDialog', {
-    get: () => $props.showDialog,
+    type: Boolean,
-    set: (value) => {
+    default: false,
-        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="onDialogHide">
+    <QDialog ref="dialogRef" v-model="showDialog" @hide="emit('close')">
         <QCard class="full-width dialog">
             <QCardSection class="row">
                 <span class="text-h6">{{ t('Progress') }}</span>
                 <QSpace />
-                <QBtn icon="close" flat round dense @click="emit('close')" />
+                <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>
             <QCardSection>
                 <div class="column">
@@ -80,7 +68,7 @@ const cancel = () => {
                     type="button"
                     flat
                     class="text-primary"
-                    @click="cancel()"
+                    v-close-popup
                 >
                     {{ t('globals.cancel') }}
                 </QBtn>

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

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

src/pages/Account/Card/AccountMailAlias.vue

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

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

@@ -46,29 +46,15 @@ const columns = computed(() => [
 ]);
 
 const deleteSubRole = async (row) => {
-    try {
+    await axios.delete(`${urlPath.value}/${row.id}`);
-        await axios.delete(`${urlPath.value}/${row.id}`);
+    fetchSubRoles();
-        fetchSubRoles();
+    notify(t('Role removed. Changes will take a while to fully propagate.'), 'positive');
-        notify(
-            t('Role removed. Changes will take a while to fully propagate.'),
-            'positive'
-        );
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const createSubRole = async (subRoleFormData) => {
-    try {
+    await axios.post(urlPath.value, subRoleFormData);
-        await axios.post(urlPath.value, subRoleFormData);
+    notify(t('Role added! Changes will take a while to fully propagate.'), 'positive');
-        notify(
+    fetchSubRoles();
-            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,32 +112,20 @@ const getShipped = async (params) => {
 };
 
 const onChangeZone = async (zoneId) => {
-    try {
+    formData.value.agencyModeFk = null;
-        formData.value.agencyModeFk = null;
+    const { data } = await axios.get(`Zones/${zoneId}`);
-        const { data } = await axios.get(`Zones/${zoneId}`);
+    formData.value.agencyModeFk = data.agencyModeFk;
-        formData.value.agencyModeFk = data.agencyModeFk;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const onChangeAddress = async (addressId) => {
-    try {
+    formData.value.nickname = null;
-        formData.value.nickname = null;
+    const { data } = await axios.get(`Addresses/${addressId}`);
-        const { data } = await axios.get(`Addresses/${addressId}`);
+    formData.value.nickname = data.nickname;
-        formData.value.nickname = data.nickname;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getClientDefaultAddress = async (clientId) => {
-    try {
+    const { data } = await axios.get(`Clients/${clientId}`);
-        const { data } = await axios.get(`Clients/${clientId}`);
+    if (data) addressId.value = data.defaultAddressFk;
-        if (data) addressId.value = data.defaultAddressFk;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const clientAddressesList = async (value) => {

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

@@ -70,60 +70,51 @@ const isFormInvalid = () => {
 };
 
 const getPriceDifference = async () => {
-    try {
+    const params = {
-        const params = {
+        landed: formData.value.landed,
-            landed: formData.value.landed,
+        addressId: formData.value.addressFk,
-            addressId: formData.value.addressFk,
+        agencyModeId: formData.value.agencyModeFk,
-            agencyModeId: formData.value.agencyModeFk,
+        zoneId: formData.value.zoneFk,
-            zoneId: formData.value.zoneFk,
+        warehouseId: formData.value.warehouseFk,
-            warehouseId: formData.value.warehouseFk,
+        shipped: formData.value.shipped,
-            shipped: formData.value.shipped,
+    };
-        };
+    const { data } = await axios.post(
-        const { data } = await axios.post(
+        `tickets/${formData.value.id}/priceDifference`,
-            `tickets/${formData.value.id}/priceDifference`,
+        params
-            params
+    );
-        );
+    formData.value.sale = data;
-        formData.value.sale = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const submit = async () => {
-    try {
+    if (!formData.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
-        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,26 +34,20 @@ const newTicketFormData = reactive({});
 const date = new Date();
 
 const createTicket = async () => {
-    try {
+    const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
-        const expeditionIds = $props.selectedExpeditions.map(
+    const params = {
-            (expedition) => expedition.id
+        clientId: $props.ticket.clientFk,
-        );
+        landed: newTicketFormData.landed,
-        const params = {
+        warehouseId: $props.ticket.warehouseFk,
-            clientId: $props.ticket.clientFk,
+        addressId: $props.ticket.addressFk,
-            landed: newTicketFormData.landed,
+        agencyModeId: $props.ticket.agencyModeFk,
-            warehouseId: $props.ticket.warehouseFk,
+        routeId: newTicketFormData.routeFk,
-            addressId: $props.ticket.addressFk,
+        expeditionIds: expeditionIds,
-            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,31 +150,19 @@ const getTotal = computed(() => {
 });
 
 const getComponentsSum = async () => {
-    try {
+    const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
-        const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
+    componentsList.value = data;
-        componentsList.value = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getTheoricalCost = async () => {
-    try {
+    const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
-        const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
+    theoricalCost.value = data;
-        theoricalCost.value = data;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const getTicketVolume = async () => {
-    try {
+    if (!ticketData.value) return;
-        if (!ticketData.value) return;
+    const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
-        const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
+    ticketVolume.value = data[0].volume;
-        ticketVolume.value = data[0].volume;
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 onMounted(() => {

src/pages/Ticket/Card/TicketExpedition.vue

@@ -163,16 +163,12 @@ const showNewTicketDialog = (withRoute = false) => {
 };
 
 const deleteExpedition = async () => {
-    try {
+    const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
-        const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
+    const params = { expeditionIds };
-        const params = { expeditionIds };
+    await axios.post('Expeditions/deleteExpeditions', params);
-        await axios.post('Expeditions/deleteExpeditions', params);
+    vnTableRef.value.reload();
-        vnTableRef.value.reload();
+    selectedExpeditions.value = [];
-        selectedExpeditions.value = [];
+    notify(t('expedition.expeditionRemoved'), 'positive');
-        notify(t('expedition.expeditionRemoved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const showLog = async (expedition) => {
@@ -181,23 +177,19 @@ const showLog = async (expedition) => {
 };
 
 const getExpeditionState = async (expedition) => {
-    try {
+    const filter = {
-        const filter = {
+        where: { expeditionFk: expedition.id },
-            where: { expeditionFk: expedition.id },
+        order: ['created DESC'],
-            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,14 +165,10 @@ const createRefund = async (withWarehouse) => {
         negative: true,
     };
 
-    try {
+    const { data } = await axios.post('Tickets/cloneAll', params);
-        const { data } = await axios.post('Tickets/cloneAll', params);
+    const [refundTicket] = data;
-        const [refundTicket] = data;
+    notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
-        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+    push({ name: 'TicketSale', params: { id: refundTicket.id } });
-        push({ name: 'TicketSale', params: { id: refundTicket.id } });
-    } catch (error) {
-        console.error(error);
-    }
 };
 </script>
 

src/pages/Ticket/Card/TicketSaleTracking.vue

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

src/pages/Ticket/Card/TicketService.vue

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

src/pages/Ticket/TicketAdvanceFilter.vue

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

src/pages/Ticket/TicketFutureFilter.vue

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

src/pages/Worker/Card/WorkerDescriptor.vue

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

src/pages/Worker/Card/WorkerDescriptorProxy.vue

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

src/pages/Worker/Card/WorkerNotificationsManager.vue

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

src/pages/Zone/Card/ZoneWarehouses.vue

@@ -34,21 +34,13 @@ const columns = computed(() => [
 ]);
 
 const deleteWarehouse = async (row) => {
-    try {
+    await axios.delete(`${urlPath.value}/${row.id}`);
-        await axios.delete(`${urlPath.value}/${row.id}`);
+    fetchWarehouses();
-        fetchWarehouses();
-    } catch (error) {
-        console.error(error);
-    }
 };
 
 const createZoneWarehouse = async (ZoneWarehouseFormData) => {
-    try {
+    await axios.post(urlPath.value, ZoneWarehouseFormData);
-        await axios.post(urlPath.value, ZoneWarehouseFormData);
+    fetchWarehouses();
-        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', '**/VnUsers/acl', {
+            cy.intercept('GET', '**DefaultViewConfigs**', {
                 statusCode: 401,
                 body: {
                     error: {
@@ -24,10 +24,11 @@ describe('Logout', () => {
                     },
                 },
                 statusMessage: 'AUTHORIZATION_REQUIRED',
-            }).as('someRoute');
+            });
         });
+
         it('when token not exists', () => {
-            cy.reload();
+            cy.get('.q-list > [href="#/item"]').click();
             cy.get('.q-notification__message').should(
                 'have.text',
                 'Authorization Required'

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

@@ -7,31 +7,20 @@ describe('AgencyWorkCenter', () => {
     const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
     const workCenterCombobox = 'input[role="combobox"]';
 
-    it('assign workCenter', () => {
+    it('check workCenter crud', () => {
+        // create
         cy.get(createButton).click();
         cy.get(workCenterCombobox).type('workCenterOne{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.hasNotify('Data created');
-    });
 
-    it('delete workCenter', () => {
+        // expect error when duplicate
+        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.get('.q-notification__message').should(
+        cy.hasNotify('WorkCenter removed successfully');
-            '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,10 +17,7 @@ describe('WorkerNotificationsManager', () => {
         cy.login('developer');
         cy.visit(`/#/worker/${salesPersonId}/notifications`);
         cy.get(firstAvailableNotification).click();
-        cy.notificationHas(
+        cy.hasNotify('The notification subscription of this worker cant be modified');
-            '.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,3 +262,14 @@ 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,8 +36,6 @@ 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,
@@ -45,19 +43,10 @@ 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,
@@ -70,14 +59,7 @@ 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',
-                })
-            );
         });
     });
 });