Merge branch 'dev' into 6772_reload_sections

src/components/ui/VnPaginate.vue

@@ -135,7 +135,6 @@ async function paginate() {
 }
 
 function endPagination() {
-    hasMoreData.value = arrayData.hasMoreData.value;
     isLoading.value = false;
     emit('onFetch', store.data);
     emit('onPaginate');
@@ -191,11 +190,12 @@ defineExpose({ fetch, addFilter });
             </QCard>
         </div>
     </div>
+    
     <QInfiniteScroll
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
+        :disable="disableInfiniteScroll || !arrayData.hasMoreData"
         class="full-width"
         v-bind="$attrs"
     >

src/composables/useArrayData.js

@@ -116,7 +116,7 @@ export function useArrayData(key, userOptions) {
         const { limit } = filter;
 
         hasMoreData.value = response.data.length >= limit;
-
+        store.hasMoreData = hasMoreData.value;
         if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
@@ -187,7 +187,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function loadMore() {
-        if (!hasMoreData.value) return;
+        if (!hasMoreData.value && !store.hasMoreData) return;
 
         store.skip = store.limit * page.value;
         page.value += 1;

src/pages/Customer/locale/en.yml

@@ -1,4 +1,4 @@
 customerFilter:
     filter:
-        name: 'Name'
-        socialName: 'Social name'
+        name: Name
+        socialName: Social name

src/pages/Customer/locale/es.yml

@@ -1,4 +1,4 @@
 customerFilter:
     filter:
-        name: 'Nombre'
-        socialName: 'Razón Social'
+        name: Nombre
+        socialName: Razón Social

src/pages/Entry/locale/en.yml

@@ -1,8 +1,8 @@
 entryList:
     list:
-        inventoryEntry: 'Inventory entry'
-        virtualEntry: 'Virtual entry'
+        inventoryEntry: Inventory entry
+        virtualEntry: Virtual entry
 entryFilter:
     filter:
-        search: 'General search'
-        reference: 'Reference'
+        search: General search
+        reference: Reference

src/pages/Entry/locale/es.yml

@@ -1,8 +1,8 @@
 entryList:
     list:
-        inventoryEntry: 'Es inventario'
-        virtualEntry: 'Es una redada'
+        inventoryEntry: Es inventario
+        virtualEntry: Es una redada
 entryFilter:
     filter:
-        search: 'Búsqueda general'
-        reference: 'Referencia'
+        search: Búsqueda general
+        reference: Referencia

src/pages/Travel/locale/en.yml

@@ -1,6 +1,6 @@
 travelFilter:
     filter:
-        warehouseOutFk: 'Warehouse Out'
-        warehouseInFk: 'Warehouse In'
-        agencyModeFk: 'Agency'
-        scopeDays: 'Days onward'
+        warehouseOutFk: Warehouse Out
+        warehouseInFk: Warehouse In
+        agencyModeFk: Agency
+        scopeDays: Days onward

src/pages/Travel/locale/es.yml

@@ -1,6 +1,6 @@
 travelFilter:
     filter:
-        warehouseInFk: 'Alm. entrada'
-        warehouseOutFk: 'Alm. salida'
-        agencyModeFk: 'Agencia'
-        scopeDays: 'Días adelante'
+        warehouseInFk: Alm. entrada
+        warehouseOutFk: Alm. salida
+        agencyModeFk: Agencia
+        scopeDays: Días adelante

vitest.config.js

@@ -27,7 +27,10 @@ export default defineConfig({
             sassVariables: 'src/quasar-variables.scss',
         }),
         VueI18nPlugin({
-            include: path.resolve(__dirname, 'src/i18n/**'),
+            include: [
+                path.resolve(__dirname, 'src/i18n/**'),
+                path.resolve(__dirname, 'src/pages/**/locale/**'),
+            ],
         }),
         jsconfigPaths(),
     ],