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

src/components/common/VnCard.vue

@@ -26,11 +26,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
 const entityId = computed(() => props.id || route?.params?.id);
-const arrayData = useArrayData(props.dataKey, {
-    url: props.url,
-    userFilter: props.filter,
-    oneRecord: true,
-});
+let arrayData = getArrayData(entityId.value, props.url);
 
 onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
@@ -61,16 +57,31 @@ onBeforeRouteUpdate(async (to, from) => {
 });
 
 async function fetch(id, append = false) {
-    const regex = /\/(\d+)/;
     if (props.idInWhere) arrayData.store.filter.where = { id };
-    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
-    else arrayData.store.url = props.url.replace(regex, `/${id}`);
+    else {
+        arrayData = getArrayData(id);
+    }
     await arrayData.fetch({ append, updateRouter: false });
     emit('onFetch', arrayData.store.data);
 }
 function hasRouteParam(params, valueToCheck = ':addressId') {
     return Object.values(params).includes(valueToCheck);
 }
+
+function formatUrl(id) {
+    const newId = id || entityId.value;
+    const regex = /\/(\d+)/;
+    if (!regex.test(props.url)) return `${props.url}/${newId}`;
+    return props.url.replace(regex, `/${newId}`);
+}
+
+function getArrayData(id, url) {
+    return useArrayData(props.dataKey, {
+        url: url ?? formatUrl(id),
+        userFilter: props.filter,
+        oneRecord: true,
+    });
+}
 </script>
 <template>
     <template v-if="visual">

src/components/common/VnSection.vue

@@ -40,10 +40,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    keepData: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const route = useRoute();
@@ -61,7 +57,6 @@ onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
             searchUrl: 'table',
-            keepData: $props.keepData,
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });

src/components/ui/VnPaginate.vue

@@ -115,7 +115,7 @@ onMounted(async () => {
 });
 
 onBeforeUnmount(() => {
-    if (!store.keepData) arrayData.reset(['data']);
+    arrayData.reset(['data']);
     arrayData.resetPagination();
 });
 

src/composables/useArrayData.js

@@ -56,7 +56,6 @@ export function useArrayData(key, userOptions) {
             'searchUrl',
             'navigate',
             'mapKey',
-            'keepData',
             'oneRecord',
         ];
         if (typeof userOptions === 'object') {
@@ -108,7 +107,7 @@ export function useArrayData(key, userOptions) {
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
+            if (updateStateParams(response.data)?.redirect) return;
         }
         store.isLoading = false;
         canceller = null;

src/pages/Customer/CustomerFilter.vue

@@ -72,6 +72,7 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
+                        no-one="true"
                     />
                 </QItemSection>
             </QItem>
@@ -154,6 +155,7 @@ en:
         city: City
         phone: Phone
         email: Email
+        departmentFk: Department
         isToBeMailed: Mailed
         isEqualizated: Equailized
         departmentFk: Department
@@ -171,6 +173,7 @@ es:
         search: Contiene
         fi: NIF
         isActive: Activo
+        departmentFk: Departamento
         isToBeMailed: A enviar
         isEqualizated:  Recargo de equivalencia
         businessTypeFk: Tipo de negocio

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -127,6 +127,7 @@ es:
     Identifier: Identificador
     Social name: Razón social
     Phone: Teléfono
+    Postcode: Código postal
     City: Población
     Email: Email
     Campaign consumption: Consumo campaña

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -93,10 +93,26 @@ const updateAddressTicket = async () => {
 };
 
 const updateObservations = async (payload) => {
-    await axios.post('AddressObservations/crud', payload);
+    await axios.post('AddressObservations/crud', cleanPayload(payload));
     notes.value = [];
     deletes.value = [];
 };
+
+function cleanPayload(payload) {
+    ['creates', 'deletes', 'updates'].forEach((prop) => {
+        if (prop === 'creates' || prop === 'updates') {
+            payload[prop] = payload[prop].filter(
+                (item) => item.description !== '' && item.observationTypeFk !== '',
+            );
+        } else {
+            payload[prop] = payload[prop].filter(
+                (item) => item !== null && item !== undefined,
+            );
+        }
+    });
+    return payload;
+}
+
 async function updateAll({ data, payload }) {
     await updateObservations(payload);
     await updateAddress(data);

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
         :without-header="true"
         auto-load
         :row-click="rowClick"
-        order="shipped DESC, id"
+        order="shipped DESC, id DESC"
         :disable-option="{ card: true, table: true }"
         class="full-width"
         :disable-infinite-scroll="true"

src/pages/Supplier/Card/SupplierDescriptor.vue

@@ -106,7 +106,7 @@ const getEntryQueryParams = (supplier) => {
                 <QBtn
                     :to="{
                         name: 'EntryList',
-                        query: { params: JSON.stringify(getEntryQueryParams(entity)) },
+                        query: { table: JSON.stringify(getEntryQueryParams(entity)) },
                     }"
                     size="md"
                     icon="vn:entry"

src/pages/Ticket/Card/TicketSale.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, computed, watch, inject } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
-
+const app = inject('app');
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
@@ -196,13 +196,17 @@ const changeQuantity = async (sale) => {
     if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
         return;
     else sale.originalQuantity = sale.quantity;
-    if (!sale.id) return addSale(sale);
+    try {
+        if (!sale.id) await addSale(sale);
+    } catch (e) {
+        app.config.errorHandler(e);
+        return;
+    }
 
     if (await isSalePrepared(sale)) {
         await confirmUpdate(() => updateQuantity(sale));
     } else await updateQuantity(sale);
 };
-
 const updateQuantity = async (sale) => {
     try {
         let { quantity, id } = sale;
@@ -215,7 +219,7 @@ const updateQuantity = async (sale) => {
             (s) => s.id === sale.id,
         );
         sale.quantity = quantity;
-        throw e;
+        app.config.errorHandler(e);
     }
 };
 
@@ -224,24 +228,27 @@ const addSale = async (sale) => {
         barcode: sale.itemFk,
         quantity: sale.quantity,
     };
+    try {
+        const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
 
-    const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
+        if (!data) return;
 
-    if (!data) return;
+        const newSale = data;
+        sale.id = newSale.id;
+        sale.image = newSale.item.image;
+        sale.subName = newSale.item.subName;
+        sale.concept = newSale.concept;
+        sale.quantity = newSale.quantity;
+        sale.discount = newSale.discount;
+        sale.price = newSale.price;
+        sale.item = newSale.item;
 
-    const newSale = data;
-    sale.id = newSale.id;
-    sale.image = newSale.item.image;
-    sale.subName = newSale.item.subName;
-    sale.concept = newSale.concept;
-    sale.quantity = newSale.quantity;
-    sale.discount = newSale.discount;
-    sale.price = newSale.price;
-    sale.item = newSale.item;
-
-    notify('globals.dataSaved', 'positive');
-    sale.isNew = false;
-    resetChanges();
+        notify('globals.dataSaved', 'positive');
+        sale.isNew = false;
+        resetChanges();
+    } catch (e) {
+        app.config.errorHandler(e);
+    }
 };
 const changeConcept = async (sale) => {
     if (await isSalePrepared(sale)) {
@@ -250,10 +257,14 @@ const changeConcept = async (sale) => {
 };
 
 const updateConcept = async (sale) => {
-    const data = { newConcept: sale.concept };
-    await axios.post(`Sales/${sale.id}/updateConcept`, data);
-    notify('globals.dataSaved', 'positive');
-    resetChanges();
+    try {
+        const data = { newConcept: sale.concept };
+        await axios.post(`Sales/${sale.id}/updateConcept`, data);
+        notify('globals.dataSaved', 'positive');
+        resetChanges();
+    } catch (e) {
+        app.config.errorHandler(e);
+    }
 };
 
 const DEFAULT_EDIT = {
@@ -264,18 +275,6 @@ const DEFAULT_EDIT = {
     oldQuantity: null,
 };
 const edit = ref({ ...DEFAULT_EDIT });
-const usesMana = ref(null);
-
-const getUsesMana = async () => {
-    const { data } = await axios.get('Sales/usesMana');
-    usesMana.value = data;
-};
-
-const getMana = async () => {
-    const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
-    mana.value = data;
-    await getUsesMana();
-};
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
@@ -312,11 +311,15 @@ const changePrice = async (sale) => {
     }
 };
 const updatePrice = async (sale, newPrice) => {
-    await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-    sale.price = newPrice;
-    edit.value = { ...DEFAULT_EDIT };
-    notify('globals.dataSaved', 'positive');
-    resetChanges();
+    try {
+        await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+        sale.price = newPrice;
+        edit.value = { ...DEFAULT_EDIT };
+        notify('globals.dataSaved', 'positive');
+        resetChanges();
+    } catch (e) {
+        app.config.errorHandler(e);
+    }
 };
 
 const changeDiscount = async (sale) => {
@@ -339,15 +342,20 @@ const updateDiscounts = async (sales, newDiscount) => {
 };
 
 const updateDiscount = async (sales, newDiscount = 0) => {
-    const salesIds = sales.map(({ id }) => id);
-    const params = {
-        salesIds,
-        newDiscount,
-        manaCode: manaCode.value,
-    };
-    await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
-    notify('globals.dataSaved', 'positive');
-    resetChanges();
+    try {
+        const salesIds = sales.map(({ id }) => id);
+        const params = {
+            salesIds,
+            newDiscount,
+            manaCode: manaCode.value,
+        };
+        await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
+        notify('globals.dataSaved', 'positive');
+        resetChanges();
+    } catch (e) {
+        app.config.errorHandler(e);
+        return;
+    }
 };
 
 const getNewPrice = computed(() => {
@@ -369,11 +377,15 @@ const getNewPrice = computed(() => {
 });
 
 const newOrderFromTicket = async () => {
-    const { data } = await axios.post(`Orders/newFromTicket`, {
-        ticketFk: Number(route.params.id),
-    });
-    const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
-    window.open(routeData.href, '_blank');
+    try {
+        const { data } = await axios.post(`Orders/newFromTicket`, {
+            ticketFk: Number(route.params.id),
+        });
+        const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
+        window.open(routeData.href, '_blank');
+    } catch (e) {
+        app.config.errorHandler(e);
+    }
 };
 
 const goToLog = (saleId) => {
@@ -390,11 +402,15 @@ const goToLog = (saleId) => {
 };
 
 const changeTicketState = async (val) => {
-    stateBtnDropdownRef.value.hide();
-    const params = { ticketFk: route.params.id, code: val };
-    await axios.post('Tickets/state', params);
-    notify('globals.dataSaved', 'positive');
-    resetChanges();
+    try {
+        stateBtnDropdownRef.value.hide();
+        const params = { ticketFk: route.params.id, code: val };
+        await axios.post('Tickets/state', params);
+        notify('globals.dataSaved', 'positive');
+        resetChanges();
+    } catch (e) {
+        app.config.errorHandler(e);
+    }
 };
 
 const removeSelectedSales = () => {
@@ -414,10 +430,14 @@ const removeSales = async () => {
         .forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
 
     if (params.sales.length == 0) return;
-    await axios.post('Sales/deleteSales', params);
-    removeSelectedSales();
-    notify('globals.dataSaved', 'positive');
-    resetChanges();
+    try {
+        await axios.post('Sales/deleteSales', params);
+        removeSelectedSales();
+        notify('globals.dataSaved', 'positive');
+        resetChanges();
+    } catch (e) {
+        app.config.errorHandler(e);
+    }
 };
 
 const setTransferParams = async () => {

src/pages/Travel/Card/TravelDescriptor.vue

@@ -66,7 +66,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
                     :to="{
                         name: 'TravelList',
                         query: {
-                            params: JSON.stringify({
+                            table: JSON.stringify({
                                 agencyModeFk: entity.agencyModeFk,
                             }),
                         },

src/pages/Travel/ExtraCommunity.vue

@@ -505,7 +505,6 @@ watch(route, () => {
                         :props="props"
                         @click="stopEventPropagation($event, col)"
                         :style="col.style"
-                        style="padding-left: 5px"
                     >
                         <component
                             :is="tableColumnComponents[col.name].component"
@@ -581,19 +580,20 @@ watch(route, () => {
                         <QBtn dense flat class="link">{{ entry.id }} </QBtn>
                         <EntryDescriptorProxy :id="entry.id" />
                     </QTd>
-                    <QTd>
-                        <QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
-                        <SupplierDescriptorProxy :id="entry.supplierFk" />
-                    </QTd>
-                    <QTd class="text-center">
-                        <QIcon
-                            v-if="entry.isCustomInspectionRequired"
-                            name="warning"
-                            color="negative"
-                            size="md"
-                            :title="t('extraCommunity.requiresInspection')"
-                        >
-                        </QIcon>
+                    <QTd :colspan="2">
+                        <div style="display: flex">
+                            <span class="link">
+                                {{ entry.supplierName }}
+                                <SupplierDescriptorProxy :id="entry.supplierFk" />
+                            </span>
+                            <QIcon
+                                v-if="entry.isCustomInspectionRequired"
+                                name="warning"
+                                color="negative"
+                                size="md"
+                                :title="t('extraCommunity.requiresInspection')"
+                            />
+                        </div>
                     </QTd>
                     <QTd class="text-right">
                         <span>{{ toCurrency(entry.invoiceAmount) }}</span>
@@ -639,9 +639,7 @@ watch(route, () => {
         &:nth-child(1) {
             max-width: 65px;
         }
-        &:nth-child(4) {
-            padding: 0;
-        }
+        padding: 0 5px 0;
     }
     thead > tr > th {
         padding: 3px;

src/stores/useArrayDataStore.js

@@ -18,7 +18,6 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         navigate: null,
         page: 1,
         mapKey: 'id',
-        keepData: false,
         oneRecord: false,
     };
 

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

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-
-describe('VnShortcuts', () => {
+// https://redmine.verdnatura.es/issues/8848
+describe.skip('VnShortcuts', () => {
     const modules = {
         item: 'a',
         customer: 'c',

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

@@ -1,4 +1,5 @@
-describe('WorkerList', () => {
+// https://redmine.verdnatura.es/issues/8848
+describe.skip('WorkerList', () => {
     const inputName = '.q-drawer .q-form input[aria-label="First Name"]';
     const searchBtn = '.q-drawer button:nth-child(3)';
     const descriptorTitle = '.descriptor .title span';
@@ -13,7 +14,7 @@ describe('WorkerList', () => {
         cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
         cy.get(searchBtn).click();
         cy.wait('@worker').then(() =>
-            cy.get(descriptorTitle).should('include.text', 'Jessica')
+            cy.get(descriptorTitle).should('include.text', 'Jessica'),
         );
     });
 });