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/quasar.js

@@ -3,14 +3,51 @@ import qFormMixin from './qformMixin';
 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(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/CreateNewPostcodeForm.vue

@@ -108,11 +108,11 @@ watch(
 
 watch(
     () => postcodeFormData.provinceFk,
-    async (newProvinceFk, oldValueFk) => {
+    async (newProvinceFk) => {
         if (Array.isArray(newProvinceFk)) {
             newProvinceFk = newProvinceFk[0];
         }
-        if (newProvinceFk !== oldValueFk) {
+        if (newProvinceFk !== postcodeFormData.provinceFk) {
             await townsFetchDataRef.value.fetch({
                 where: { provinceFk: newProvinceFk },
             });
@@ -147,7 +147,13 @@ async function handleCountries(data) {
         auto-load
         url="Towns/location"
     />
-
+    <FetchData
+        @on-fetch="handleCountries"
+        :sort-by="['name ASC']"
+        :limit="30"
+        auto-load
+        url="Countries"
+    />
     <FormModelPopup
         url-create="postcodes"
         model="postcode"
@@ -213,10 +219,8 @@ async function handleCountries(data) {
                     @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
-                    url="Countries"
-                    :sort-by="['name ASC']"
                     :label="t('Country')"
-                    @update:options="handleCountries"
+                    :options="countriesOptions"
                     hide-selected
                     option-label="name"
                     option-value="id"

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/VnSelectProvince.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useValidator } from 'src/composables/useValidator';
 import { useI18n } from 'vue-i18n';
 

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/Item/ItemRequest.vue

@@ -258,15 +258,28 @@ onBeforeMount(() => {
             <template #body-cell-attender="{ row }">
                 <QTd>
                     <VnSelect
+                        url="Workers/search"
                         v-model="row.attenderFk"
-                        :where="{ role: 'buyer' }"
+                        :params="{ departmentCodes: ['shopping'] }"
-                        sort-by="id"
+                        :fields="['id', 'nickname']"
-                        url="Workers"
+                        sort-by="nickname ASC"
                         hide-selected
-                        option-label="firstName"
+                        option-label="nickname"
                         option-value="id"
                         dense
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QTd>
             </template>
             <template #body-cell-item="{ row }">

src/pages/Item/ItemTypeCreate.vue

@@ -52,15 +52,27 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
+                        url="Workers/search"
                         v-model="data.workerFk"
-                        :label="t('itemType.shared.worker')"
+                        :label="t('shared.worker')"
-                        url="Workers"
+                        sort-by="nickname ASC"
-                        sort-by="firstName ASC"
+                        :fields="['id', 'nickname']"
-                        :fields="['id', 'firstName']"
+                        :params="{ departmentCodes: ['shopping'] }"
+                        option-label="nickname"
                         option-value="id"
-                        option-label="firstName"
                         hide-selected
-                    />
+                        ><template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                     <VnSelect
                         v-model="data.categoryFk"
                         :label="t('itemType.shared.category')"

src/pages/ItemType/Card/ItemTypeBasicData.vue

@@ -41,15 +41,27 @@ const temperaturesOptions = ref([]);
             </VnRow>
             <VnRow>
                 <VnSelect
+                    url="Workers/search"
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
-                    url="Workers"
+                    sort-by="nickname ASC"
-                    sort-by="firstName ASC"
+                    :fields="['id', 'nickname']"
-                    :fields="['id', 'firstName']"
+                    :params="{ departmentCodes: ['shopping'] }"
+                    option-label="nickname"
                     option-value="id"
-                    option-label="firstName"
                     hide-selected
-                />
+                    ><template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption
+                                    >{{ scope.opt?.nickname }},
+                                    {{ scope.opt?.code }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template></VnSelect
+                >
                 <VnSelect
                     v-model="data.categoryFk"
                     :label="t('shared.category')"

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/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) => {

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/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',
-                })
-            );
         });
     });
 });