Merge pull request '#7623 add updateRoute prop in VnPaginate' (!475) from 7623-fix-redirection into dev

Reviewed-on: verdnatura/salix-front#475
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

src/components/ui/VnFilterPanel.vue

@@ -60,7 +60,7 @@ const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 const arrayData = useArrayData($props.dataKey, {
     exprBuilder: $props.exprBuilder,
     searchUrl: $props.searchUrl,
-    navigate: {},
+    navigate: $props.redirect ? {} : null,
 });
 const route = useRoute();
 const store = arrayData.store;

src/components/ui/VnNotes.vue

@@ -21,7 +21,7 @@ const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
 function handleKeyUp(event) {
-      if (event.key === 'Enter') {
+    if (event.key === 'Enter') {
         event.preventDefault();
         if (!event.shiftKey) insert();
     }
@@ -78,6 +78,7 @@ async function insert() {
         ref="vnPaginateRef"
         class="show"
         v-bind="$attrs"
+        search-url="notes"
     >
         <template #body="{ rows }">
             <TransitionGroup name="list" tag="div" class="column items-center full-width">

src/composables/useArrayData.js

@@ -73,7 +73,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const filter = {
             order: store.order,
             limit: store.limit,
-            skip: store.skip,
         };
 
         let exprFilter;
@@ -88,7 +87,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         Object.assign(filter, store.userFilter, exprFilter);
-        Object.assign(store.filter, filter);
+        Object.assign(store.filter, { ...filter, skip: store.skip });
         const params = {
             filter: JSON.stringify(store.filter),
         };

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -119,7 +119,7 @@ const departments = ref();
                         emit-value
                         hide-selected
                         map-options
-                        option-label="country"
+                        option-label="name"
                         option-value="id"
                         outlined
                         rounded

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -219,6 +219,7 @@ const useLang = (values) => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups']"
         @remove="clearFilter"
+        :redirect="false"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">

src/pages/Supplier/Card/SupplierConsumption.vue

@@ -104,10 +104,14 @@ const totalEntryPrice = (rows) => {
     for (const row of rows) {
         let total = 0;
         let quantity = 0;
-        for (const buy of row.buys) {
-            total = total + buy.total;
-            quantity = quantity + buy.quantity;
+
+        if (row.buys) {
+            for (const buy of row.buys) {
+                total = total + buy.total;
+                quantity = quantity + buy.quantity;
+            }
         }
+
         row.total = total;
         row.quantity = quantity;
         totalPrice = totalPrice + total;

src/pages/Supplier/Card/SupplierConsumptionFilter.vue

@@ -50,7 +50,7 @@ const itemCategoriesOptions = ref([]);
         @on-fetch="(data) => (itemCategoriesOptions = data)"
         auto-load
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js

@@ -6,15 +6,14 @@ describe('InvoiceInCorrective', () => {
     const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';
 
     it('should create a correcting invoice', () => {
+        cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit(`/#/invoice-in/1/summary?limit=10`);
 
-        cy.openLeftMenu();
         cy.openActionsDescriptor();
 
         cy.get(createRectificative).click();
         cy.get(saveDialog).click();
-        cy.openLeftMenu();
         cy.get(rectificativeSection).click();
         cy.get('tbody > tr:visible').should('have.length', 1);
     });

test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js

@@ -5,18 +5,15 @@ describe('InvoiceInDescriptor', () => {
         '.q-card:nth-child(3) .vn-label-value:nth-child(5) > .value > span';
 
     it('should booking and unbooking the invoice properly', () => {
+        cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit(`/#/invoice-in/1/summary?limit=10`);
+        cy.visit('/#/invoice-in/1/summary');
 
-        cy.openLeftMenu();
         cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();
         cy.get(dialogBtns).eq(1).click();
-        cy.get('.fullscreen').first().click();
         cy.get(isBookedField).should('have.attr', 'title', 'true');
 
-        cy.openLeftMenu();
-        cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();
         cy.get(dialogBtns).eq(1).click();
         cy.get(isBookedField).should('have.attr', 'title', 'false');