From 94c7ee3ae3afa39043c8e058695043c4a756a47f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 10:36:42 +0100
Subject: [PATCH 01/14] fix: arrayData store shared

---
 src/components/CrudModel.vue                   | 2 +-
 src/components/VnTable/VnFilter.vue            | 2 +-
 src/components/VnTable/VnOrder.vue             | 2 +-
 src/components/ui/VnFilterPanel.vue            | 2 +-
 src/components/ui/VnPaginate.vue               | 9 ++++++---
 src/components/ui/VnSearchbar.vue              | 2 +-
 src/composables/useArrayData.js                | 2 +-
 src/pages/Account/AccountList.vue              | 6 +++---
 src/pages/Account/Role/AccountRoles.vue        | 4 ++--
 src/pages/Account/Role/Card/RoleCard.vue       | 2 +-
 src/pages/Claim/ClaimFilter.vue                | 2 +-
 src/pages/Customer/CustomerFilter.vue          | 2 +-
 src/pages/Customer/CustomerList.vue            | 6 +++---
 src/pages/InvoiceIn/InvoiceInList.vue          | 2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue        | 6 +++---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 1 -
 src/pages/Ticket/TicketFilter.vue              | 2 +-
 src/pages/Ticket/TicketList.vue                | 6 +++---
 src/pages/Travel/TravelFilter.vue              | 2 +-
 src/pages/Worker/Card/WorkerCard.vue           | 1 +
 src/pages/Worker/WorkerList.vue                | 6 +++---
 src/pages/Zone/Card/ZoneSearchbar.vue          | 2 +-
 src/pages/Zone/ZoneFilterPanel.vue             | 1 -
 src/pages/Zone/ZoneList.vue                    | 4 ++--
 src/stores/useArrayDataStore.js                | 2 +-
 25 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index a4cb55a2c..0de5d3aa2 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -77,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref();
+const formData = ref([]);
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 9da0b26a4..86802ee92 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -25,7 +25,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
 });
 
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 7fdd23b78..8ffdfe2bc 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     vertical: {
         type: Boolean,
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 43d634ad9..1ed1194ea 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -49,7 +49,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     redirect: {
         type: Boolean,
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 80c607214..f5519eb01 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
@@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;
 
 onMounted(async () => {
-    if (props.autoLoad) await fetch();
+    if (props.autoLoad && !store.data?.length) await fetch();
     mounted.value = true;
 });
 
@@ -115,7 +115,10 @@ watch(
 
 watch(
     () => store.data,
-    (data) => emit('onChange', data)
+    (data) => {
+        emit('onChange', data);
+    },
+    { immediate: true }
 );
 
 watch(
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index dc6d4751c..da2d370fe 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -45,7 +45,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 30bcac66b..7fa494349 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -269,7 +269,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                destroy();
+                else destroy();
                 return router.push(pushUrl);
             }
         }
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 72c445fa9..9e750e1cb 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountUsers"
+        data-key="AccountList"
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
@@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
     />
     <RightMenu>
         <template #right-panel>
-            <AccountFilter data-key="AccountUsers" />
+            <AccountFilter data-key="AccountList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="AccountUsers"
+        data-key="AccountList"
         url="VnUsers/preview"
         :filter="filter"
         order="id DESC"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index ea175d913..1f3c9ee5a 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Roles"
+        data-key="AccountRolesList"
         :expr-builder="exprBuilder"
         :label="t('role.searchRoles')"
         :info="t('role.searchInfo')"
     />
     <VnTable
         ref="tableRef"
-        data-key="Roles"
+        data-key="AccountRolesList"
         :url="`VnRoles`"
         :create="{
             urlCreate: 'VnRoles',
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 35f9a1f27..a2d5710f4 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -9,7 +9,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRoles"
+        search-data-key="AccountRolesList"
         :searchbar-props="{
             url: 'VnRoles',
             label: t('role.searchRoles'),
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index dc25fe4a0..f7e2ffbf6 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 6c50cc9df..479d3e7ab 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -14,7 +14,7 @@ defineProps({
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 63f5149e8..55065cdcc 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -395,16 +395,16 @@ function handleLocation(data, location) {
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
-        data-key="Customer"
+        data-key="CustomerList"
     />
     <RightMenu>
         <template #right-panel>
-            <CustomerFilter data-key="Customer" />
+            <CustomerFilter data-key="CustomerList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Customer"
+        data-key="CustomerList"
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 265f95b0e..c77113d2b 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -122,7 +122,7 @@ const cols = computed(() => [
         :columns="cols"
         :right-search="false"
         :disable-option="{ card: true }"
-        :auto-load="!!$route.query.params"
+        :auto-load="!!$route.query.table"
     >
         <template #column-supplierFk="{ row }">
             <span class="link" @click.stop>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 91477e1a4..f1b4902f2 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -182,11 +182,11 @@ watchEffect(selectedRows);
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
         :label="t('searchInvoice')"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
     />
     <RightMenu>
         <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOut" />
+            <InvoiceOutFilter data-key="invoiceOutList" />
         </template>
     </RightMenu>
     <VnSubToolbar>
@@ -203,7 +203,7 @@ watchEffect(selectedRows);
     </VnSubToolbar>
     <VnTable
         ref="tableRef"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 834fced87..bf4a1efb4 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -348,7 +348,6 @@ async function hasDocuware() {
 }
 
 async function uploadDocuware(force) {
-    console.log('force: ', force);
     if (!force)
         return quasar
             .dialog({
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7f72f9862..6f1cac83b 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -47,7 +47,7 @@ const getGroupedStates = (data) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c8687ed5f..1c1fa78d4 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -455,18 +455,18 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Ticket"
+        data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Ticket" />
+            <TicketFilter data-key="TicketList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Ticket"
+        data-key="TicketList"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c91146257..1ac83b9e0 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -24,7 +24,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 5f9fa0f8e..e17ea6503 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -14,6 +14,7 @@ import WorkerFilter from '../WorkerFilter.vue';
             url: 'Workers/filter',
             label: 'Search worker',
             info: 'You can search by worker id or name',
+            order: 'id DESC',
         }"
         :redirect-on-error="true"
     />
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 7a3f760bc..022cecdc6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -169,7 +169,7 @@ async function autofillBic(worker) {
 </script>
 <template>
     <VnSearchbar
-        data-key="Worker"
+        data-key="WorkerList"
         :label="t('Search worker')"
         :info="t('You can search by worker id or name')"
     />
@@ -191,13 +191,13 @@ async function autofillBic(worker) {
     />
     <RightMenu>
         <template #right-panel>
-            <WorkerFilter data-key="Worker" />
+            <WorkerFilter data-key="WorkerList" />
         </template>
     </RightMenu>
     <VnTable
         v-if="defaultPayMethod"
         ref="tableRef"
-        data-key="Worker"
+        data-key="WorkerList"
         url="Workers/filter"
         :create="{
             urlCreate: 'Workers/new',
diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index 06168eb62..f7a59e97f 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -26,7 +26,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :filter="{
             include: { relation: 'agencyMode', scope: { fields: ['name'] } },
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 98bfd35ed..1213f7515 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -32,7 +32,6 @@ const agencies = ref([]);
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        search-url="table"
     >
         <template #tags="{ tag }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index b01f8b7e7..158d985d2 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -139,12 +139,12 @@ onMounted(() => (stateStore.rightDrawer = true));
     <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
-            <ZoneFilterPanel data-key="Zones" />
+            <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :create="{
             urlCreate: 'Zones',
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index ea029bc12..6a0e7dfa8 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -8,7 +8,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         userFilter: {},
         userParams: {},
         url: '',
-        limit: 10,
+        limit: 20,
         skip: 0,
         order: '',
         isLoading: false,

From 139861f6cf9414434ef8e7ee5a555ce24fe12540 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 10:38:02 +0100
Subject: [PATCH 02/14] test: fix limit

---
 test/vitest/__tests__/composables/useArrayData.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vitest/__tests__/composables/useArrayData.spec.js b/test/vitest/__tests__/composables/useArrayData.spec.js
index 21323395b..d4c5d0949 100644
--- a/test/vitest/__tests__/composables/useArrayData.spec.js
+++ b/test/vitest/__tests__/composables/useArrayData.spec.js
@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 
 describe('useArrayData', () => {
-    const filter = '{"limit":10,"skip":0}';
+    const filter = '{"limit":20,"skip":0}';
     const params = { supplierFk: 2 };
     beforeEach(() => {
         vi.spyOn(useRouter(), 'replace');

From f2b132db79f42f39a8b4b644c62767b2470d9879 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Nov 2024 08:50:10 +0100
Subject: [PATCH 03/14] fix(VnPaginate): not start without data

---
 src/components/ui/VnPaginate.vue                     | 1 +
 src/pages/Worker/Card/WorkerNotificationsManager.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index f5519eb01..b058dc642 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -116,6 +116,7 @@ watch(
 watch(
     () => store.data,
     (data) => {
+        if (!mounted.value) return;
         emit('onChange', data);
     },
     { immediate: true }
diff --git a/src/pages/Worker/Card/WorkerNotificationsManager.vue b/src/pages/Worker/Card/WorkerNotificationsManager.vue
index 4ebe9b0dd..7c29f46ce 100644
--- a/src/pages/Worker/Card/WorkerNotificationsManager.vue
+++ b/src/pages/Worker/Card/WorkerNotificationsManager.vue
@@ -69,7 +69,7 @@ function setNotifications(data) {
         :default-reset="false"
         :default-remove="false"
         :default-save="false"
-        @on-fetch="setNotifications"
+        @on-fetch="(data) => data && setNotifications(data)"
         search-url="notifications"
     >
         <template #body>

From 5e5d2f3c42dcc04fb0375353ba70344348e10f6d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 17 Nov 2024 13:44:44 +0000
Subject: [PATCH 04/14] fix: #7671 apply sort-by itemFk and name

---
 src/pages/Item/ItemFixedPrice.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 7d4d6b896..815c7d519 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -64,8 +64,7 @@ const columns = computed(() => [
     },
     {
         label: t('globals.name'),
-        field: 'name',
-        name: 'description',
+        name: 'name',
         ...defaultColumnAttrs,
         create: true,
         cardVisible: true,
@@ -426,7 +425,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['description DESC']"
+            :order="['itemFk DESC', 'name DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -480,7 +479,7 @@ function handleOnDataSave({ CrudModelRef }) {
                     </template>
                 </VnSelect>
             </template>
-            <template #column-description="{ row }">
+            <template #column-name="{ row }">
                 <span class="link">
                     {{ row.name }}
                 </span>

From e230cc61a07c28980be2b7032c84c5539ff86924 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 09:18:06 +0100
Subject: [PATCH 05/14] fix(TicketBasicData): getShipped, getLanded & bad try
 catch

---
 .../Card/BasicData/TicketBasicDataForm.vue    | 137 +++++++-----------
 .../Card/BasicData/TicketBasicDataView.vue    |  87 +++++------
 2 files changed, 88 insertions(+), 136 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index f5ce8a0f3..ee5f5b8d4 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -16,12 +16,9 @@ import { useAcl } from 'src/composables/useAcl';
 import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
-const $props = defineProps({
-    formData: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-    },
+const formData = defineModel({
+    type: Object,
+    required: true,
 });
 
 const emit = defineEmits(['updateForm']);
@@ -40,7 +37,6 @@ const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
 const zoneSelectRef = ref();
-const formData = ref($props.formData);
 
 watch(
     () => formData.value,
@@ -69,75 +65,44 @@ const zoneWhere = computed(() => {
         : {};
 });
 
-const getLanded = async (params) => {
-    try {
-        const validParams =
-            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+async function getLanded(params) {
+    getDate(`Agencies/getLanded`, params);
+}
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getLanded`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = data.landed;
-            formData.value.shipped = params.shipped;
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+async function getShipped(params) {
+    getDate(`Agencies/getShipped`, params);
+}
+
+async function getDate(query, params) {
+    for (const param in params) {
+        if (!params[param]) return;
     }
-};
 
-const getShipped = async (params) => {
-    try {
-        const validParams =
-            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+    formData.value.zoneFk = null;
+    zonesOptions.value = [];
+    const { data } = await axios.get(query, { params });
+    if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getShipped`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = params.landed;
-            formData.value.shipped = data.shipped;
-        } else {
-            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-    }
-};
+    formData.value.zoneFk = data.zoneFk;
+    if (data.landed) formData.value.landed = data.landed;
+    if (data.shipped) formData.value.shipped = data.shipped;
+}
 
 const onChangeZone = async (zoneId) => {
-    try {
-        formData.value.agencyModeFk = null;
-        const { data } = await axios.get(`Zones/${zoneId}`);
-        formData.value.agencyModeFk = data.agencyModeFk;
-    } catch (error) {
-        console.error(error);
-    }
+    formData.value.agencyModeFk = null;
+    const { data } = await axios.get(`Zones/${zoneId}`);
+    formData.value.agencyModeFk = data.agencyModeFk;
 };
 
 const onChangeAddress = async (addressId) => {
-    try {
-        formData.value.nickname = null;
-        const { data } = await axios.get(`Addresses/${addressId}`);
-        formData.value.nickname = data.nickname;
-    } catch (error) {
-        console.error(error);
-    }
+    formData.value.nickname = null;
+    const { data } = await axios.get(`Addresses/${addressId}`);
+    formData.value.nickname = data.nickname;
 };
 
 const getClientDefaultAddress = async (clientId) => {
-    try {
-        const { data } = await axios.get(`Clients/${clientId}`);
-        if (data) addressId.value = data.defaultAddressFk;
-    } catch (error) {
-        console.error(error);
-    }
+    const { data } = await axios.get(`Clients/${clientId}`);
+    if (data) addressId.value = data.defaultAddressFk;
 };
 
 const clientAddressesList = async (value) => {
@@ -189,18 +154,26 @@ const clientId = computed({
     },
 });
 
-const landed = computed({
-    get: () => formData.value?.landed,
-    set: (val) => {
-        formData.value.landed = val;
-        getShipped({
-            landed: val,
+function addDateParams(obj) {
+    return {
+        ...obj,
+        ...{
             addressFk: formData.value?.addressFk,
             agencyModeFk: formData.value?.agencyModeFk,
             warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
+        },
+    };
+}
+
+async function setLanded(landed) {
+    if (!landed) return;
+    getShipped(addDateParams({ landed }));
+}
+
+async function setShipped(shipped) {
+    if (!shipped) return;
+    getLanded(addDateParams({ shipped }));
+}
 
 const agencyModeId = computed({
     get: () => formData.value.agencyModeFk,
@@ -248,21 +221,6 @@ const warehouseId = computed({
     },
 });
 
-const shipped = computed({
-    get: () => formData.value?.shipped,
-    set: (val) => {
-        if (new Date(formData.value?.shipped).toDateString() != val.toDateString())
-            val.setHours(0, 0, 0, 0);
-        formData.value.shipped = val;
-        getLanded({
-            shipped: val,
-            addressFk: formData.value?.addressFk,
-            agencyModeFk: formData.value?.agencyModeFk,
-            warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
-
 const onFormModelInit = () => {
     if (formData.value?.clientFk) clientAddressesList(formData.value?.clientFk);
 };
@@ -463,18 +421,21 @@ async function getZone(options) {
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shipped')"
+                @update:model-value="setShipped"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shippedHour')"
+                @update:model-value="setShipped"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
                 :rules="validate('basicData.landed')"
+                @update:model-value="setLanded"
             />
         </VnRow>
     </QForm>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 92640f898..851593bff 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -70,60 +70,51 @@ const isFormInvalid = () => {
 };
 
 const getPriceDifference = async () => {
-    try {
-        const params = {
-            landed: formData.value.landed,
-            addressId: formData.value.addressFk,
-            agencyModeId: formData.value.agencyModeFk,
-            zoneId: formData.value.zoneFk,
-            warehouseId: formData.value.warehouseFk,
-            shipped: formData.value.shipped,
-        };
-        const { data } = await axios.post(
-            `tickets/${formData.value.id}/priceDifference`,
-            params
-        );
-        formData.value.sale = data;
-    } catch (error) {
-        console.error(error);
-    }
+    const params = {
+        landed: formData.value.landed,
+        addressId: formData.value.addressFk,
+        agencyModeId: formData.value.agencyModeFk,
+        zoneId: formData.value.zoneFk,
+        warehouseId: formData.value.warehouseFk,
+        shipped: formData.value.shipped,
+    };
+    const { data } = await axios.post(
+        `tickets/${formData.value.id}/priceDifference`,
+        params
+    );
+    formData.value.sale = data;
 };
 
 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 = {
-            clientFk: formData.value.clientFk,
-            nickname: formData.value.nickname,
-            agencyModeFk: formData.value.agencyModeFk,
-            addressFk: formData.value.addressFk,
-            zoneFk: formData.value.zoneFk,
-            warehouseFk: formData.value.warehouseFk,
-            companyFk: formData.value.companyFk,
-            shipped: formData.value.shipped,
-            landed: formData.value.landed,
-            isDeleted: formData.value.isDeleted,
-            option: formData.value.option,
-            isWithoutNegatives: formData.value.withoutNegatives,
-            withWarningAccept: formData.value.withWarningAccept,
-            keepPrice: false,
-        };
+    const params = {
+        clientFk: formData.value.clientFk,
+        nickname: formData.value.nickname,
+        agencyModeFk: formData.value.agencyModeFk,
+        addressFk: formData.value.addressFk,
+        zoneFk: formData.value.zoneFk,
+        warehouseFk: formData.value.warehouseFk,
+        companyFk: formData.value.companyFk,
+        shipped: formData.value.shipped,
+        landed: formData.value.landed,
+        isDeleted: formData.value.isDeleted,
+        option: formData.value.option,
+        isWithoutNegatives: formData.value.withoutNegatives,
+        withWarningAccept: formData.value.withWarningAccept,
+        keepPrice: false,
+    };
 
-        const { data } = await axios.post(
-            `tickets/${formData.value.id}/componentUpdate`,
-            params
-        );
+    const { data } = await axios.post(
+        `tickets/${formData.value.id}/componentUpdate`,
+        params
+    );
 
-        if (!data) return;
+    if (!data) return;
 
-        const ticketToMove = data.id;
-        notify(t('basicData.unroutedTicket'), 'positive');
-        router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
-    } catch (error) {
-        console.error(error);
-    }
+    const ticketToMove = data.id;
+    notify(t('basicData.unroutedTicket'), 'positive');
+    router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
 };
 
 const submitWithNegatives = async () => {
@@ -167,7 +158,7 @@ onBeforeMount(async () => await getTicketData());
             <TicketBasicDataForm
                 v-if="initialDataLoaded"
                 @update-form="($event) => (formData = $event)"
-                :form-data="formData"
+                v-model="formData"
             />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">

From 9ea9239250ba209a644057b4be5102b631f3935d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 18 Nov 2024 10:41:25 +0100
Subject: [PATCH 06/14] fix: customerSummary balanceDue label value

---
 src/pages/Customer/Card/CustomerSummary.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 8b5f0f2c2..62792a5c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
-import { toCurrency, toPercentage, toDate } from 'src/filters';
+import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@@ -25,16 +25,16 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-
+const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
 const balanceDue = computed(() => {
-    return (
-        customer.value &&
-        customer.value.defaulters.length &&
-        customer.value.defaulters[0].amount
-    );
+    const amount = defaulterAmount.value;
+    if (!amount || amount < 0) {
+        return null;
+    }
+    return amount;
 });
 
-const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
+const balanceDueWarning = computed(() => (defaulterAmount.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
     return customer.value.claimsRatio?.claimingRate ?? 0;
@@ -281,7 +281,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.defaulters"
                     :label="t('customer.summary.balanceDue')"
-                    :value="toCurrency(balanceDue)"
+                    :value="dashOrCurrency(balanceDue)()"
                     :class="balanceDueWarning"
                     :info="t('customer.summary.balanceDueInfo')"
                 />

From 09aad5914fb7b9a253d74cb48d43df36f881da27 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 10:49:30 +0100
Subject: [PATCH 07/14] feat(TicketSummary): add ticketDescritporMenu

---
 src/components/ui/CardSummary.vue             |  2 +-
 .../Ticket/Card/TicketDescriptorMenu.vue      | 32 ++++++------
 src/pages/Ticket/Card/TicketSummary.vue       | 49 ++++++++++++-------
 3 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 11dcbee3b..9bc1cec7b 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -98,7 +98,7 @@ function existSummary(routes) {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right">
+                    <slot name="header-right" :entity="entity">
                         <span></span>
                     </slot>
                 </div>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index bf4a1efb4..9ee22dad2 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, toRefs } from 'vue';
+import { computed, ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
@@ -31,7 +31,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const ticketSummary = useArrayData('TicketSummary');
 const { ticket } = toRefs(props);
-const ticketId = currentRoute.value.params.id;
+const ticketId = computed(() => props.ticket.id ?? currentRoute.value.params.id);
 const client = ref();
 const showTransferDialog = ref(false);
 const showTurnDialog = ref(false);
@@ -68,7 +68,7 @@ const actions = {
     setWeight: async () => {
         try {
             const invoiceIds = (
-                await axios.post(`Tickets/${ticketId}/setWeight`, {
+                await axios.post(`Tickets/${ticketId.value}/setWeight`, {
                     weight: weight.value,
                 })
             ).data;
@@ -86,7 +86,7 @@ const actions = {
     },
     remove: async () => {
         try {
-            await axios.post(`Tickets/${ticketId}/setDeleted`);
+            await axios.post(`Tickets/${ticketId.value}/setDeleted`);
 
             notify({ message: t('Ticket deleted'), type: 'positive' });
             notify({
@@ -176,14 +176,14 @@ function showSmsDialog(template, customData) {
 }
 
 async function showSmsDialogWithChanges() {
-    const query = `TicketLogs/${ticketId}/getChanges`;
+    const query = `TicketLogs/${ticketId.value}/getChanges`;
     const response = await axios.get(query);
 
     showSmsDialog('orderChanges', { changes: response.data });
 }
 
 async function sendSms(body) {
-    await axios.post(`Tickets/${ticketId}/sendSms`, body);
+    await axios.post(`Tickets/${ticketId.value}/sendSms`, body);
     notify({
         message: 'Notification sent',
         type: 'positive',
@@ -256,7 +256,10 @@ async function transferClient(client) {
         clientFk: client,
     };
 
-    const { data } = await axios.patch(`Tickets/${ticketId}/transferClient`, params);
+    const { data } = await axios.patch(
+        `Tickets/${ticketId.value}/transferClient`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -296,7 +299,10 @@ async function changeShippedHour(time) {
         shipped: time,
     };
 
-    const { data } = await axios.post(`Tickets/${ticketId}/updateEditableTicket`, params);
+    const { data } = await axios.post(
+        `Tickets/${ticketId.value}/updateEditableTicket`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -313,7 +319,7 @@ function openRecalculateDialog() {
 }
 
 async function recalculateComponents() {
-    await axios.post(`Tickets/${ticketId}/recalculateComponents`);
+    await axios.post(`Tickets/${ticketId.value}/recalculateComponents`);
     notify({
         message: t('Data saved'),
         type: 'positive',
@@ -336,11 +342,11 @@ async function handleInvoiceOutData() {
 }
 
 async function docuwareDownload() {
-    await axios.get(`Tickets/${ticketId}/docuwareDownload`);
+    await axios.get(`Tickets/${ticketId.value}/docuwareDownload`);
 }
 
 async function hasDocuware() {
-    const { data } = await axios.post(`Docuwares/${ticketId}/checkFile`, {
+    const { data } = await axios.post(`Docuwares/${ticketId.value}/checkFile`, {
         fileCabinet: 'deliveryNote',
         signed: true,
     });
@@ -374,7 +380,7 @@ async function uploadDocuware(force) {
         :url="
             route.path.startsWith('/ticket')
                 ? `Tickets/${ticketId}/isEditable`
-                : `Tickets/${ticket}/isEditable`
+                : `Tickets/${ticket.id}/isEditable`
         "
         auto-load
         @on-fetch="handleFetchData"
@@ -396,8 +402,6 @@ async function uploadDocuware(force) {
                 <VnSelect
                     url="Clients"
                     :fields="['id', 'name']"
-                    option-label="name"
-                    option-value="id"
                     v-model="client"
                     :label="t('Client')"
                     auto-load
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 61751357c..d20fd9c5f 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -20,6 +20,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -116,24 +117,36 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right>
-            <QBtnDropdown
-                ref="stateBtnDropdownRef"
-                color="black"
-                text-color="white"
-                :label="t('globals.changeState')"
-                :disable="!isEditable()"
-            >
-                <VnSelect
-                    :options="editableStates"
-                    hide-selected
-                    option-label="name"
-                    option-value="code"
-                    hide-dropdown-icon
-                    focus-on-mount
-                    @update:model-value="changeState"
-                />
-            </QBtnDropdown>
+        <template #header-right="{ entity }">
+            <div>
+                <QBtnDropdown
+                    ref="stateBtnDropdownRef"
+                    color="black"
+                    text-color="white"
+                    :label="t('globals.changeState')"
+                    :disable="!isEditable()"
+                >
+                    <VnSelect
+                        :options="editableStates"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        hide-dropdown-icon
+                        focus-on-mount
+                        @update:model-value="changeState"
+                    />
+                </QBtnDropdown>
+                <QBtn color="white" dense flat icon="more_vert" round size="md">
+                    <QTooltip>
+                        {{ t('components.cardDescriptor.moreOptions') }}
+                    </QTooltip>
+                    <QMenu>
+                        <QList>
+                            <TicketDescriptorMenu :ticket="entity" />
+                        </QList>
+                    </QMenu>
+                </QBtn>
+            </div>
         </template>
         <template #body="{ entity }">
             <QCard class="vn-one">

From 383f51c1b260cd48550cee10f05777df696c331c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 10:57:26 +0100
Subject: [PATCH 08/14] refactor(TicketDescritporMenu): url isEditable

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 9ee22dad2..f1d30b1bd 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -3,7 +3,7 @@ import axios from 'axios';
 import { computed, ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -23,7 +23,6 @@ const props = defineProps({
         required: true,
     },
 });
-const route = useRoute();
 
 const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
@@ -377,11 +376,7 @@ async function uploadDocuware(force) {
 </script>
 <template>
     <FetchData
-        :url="
-            route.path.startsWith('/ticket')
-                ? `Tickets/${ticketId}/isEditable`
-                : `Tickets/${ticket.id}/isEditable`
-        "
+        :url="`Tickets/${ticketId}/isEditable`"
         auto-load
         @on-fetch="handleFetchData"
     />

From d3993442b677d03155aaec8d39efadd5a69265b1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 18 Nov 2024 13:26:27 +0100
Subject: [PATCH 09/14] fix: hotfix OrderTickets

---
 src/pages/Order/Card/OrderLines.vue  | 1 +
 src/pages/Ticket/Card/TicketSale.vue | 7 +++++++
 src/pages/Ticket/locale/en.yml       | 1 +
 src/pages/Ticket/locale/es.yml       | 1 +
 4 files changed, 10 insertions(+)

diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 5aec976fa..c852ab6a1 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -111,6 +111,7 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'Items',
+            sortBy: 'name ASC ',
             fields: ['id', 'name', 'subName'],
         },
         columnField: {
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 0e464d533..1b9791529 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -106,6 +106,13 @@ const columns = computed(() => [
         format: (row) => row?.item?.name,
         columnClass: 'expand',
     },
+    {
+        align: 'left',
+        label: t('ticketSale.size'),
+        name: 'size',
+        format: (row) => row?.item?.size,
+        columnClass: 'expand',
+    },
     {
         align: 'left',
         label: t('ticketSale.price'),
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 829ea7a91..b3ab0e69b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -48,6 +48,7 @@ ticketSale:
     shipped: Shipped
     agency: Agency
     address: Address
+    size: Size
 advanceTickets:
     preparation: Preparation
     origin: Origin
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index eab38a402..32ff3ba62 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -184,6 +184,7 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+    size: Medida
 ticketComponents:
     item: Artículo
     description: Descripción

From 00fdbfa2e4bd9823a1a6b7641e99317ca18b8885 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 13:41:54 +0100
Subject: [PATCH 10/14] fix(OrderCatalogFilter): hotFix use search-url="params"

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 6de43e86a..4c018bbb1 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -184,6 +184,7 @@ function addOrder(value, field, params) {
         :custom-tags="['tagGroups']"
         @remove="clearFilter"
         :redirect="false"
+        search-url="params"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">

From e7b431e9ec2c9745fb9b980d039d8f721093498c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 09:32:35 +0100
Subject: [PATCH 11/14] fix(VnPaginate): disable pagination

---
 src/components/ui/VnPaginate.vue     | 2 ++
 src/pages/Item/ItemFixedPrice.vue    | 2 +-
 src/pages/Ticket/Card/TicketSale.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index b058dc642..04a843889 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -141,6 +141,8 @@ async function fetch(params) {
 }
 
 async function paginate() {
+    if (props.disableInfiniteScroll || !store.hasMoreData) return;
+
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
     if (!props.url) return;
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 815c7d519..628af681a 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -440,7 +440,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 selection: 'multiple',
             }"
             :crud-model="{
-                paginate: false,
+                disableInfiniteScroll: true,
             }"
             v-model:selected="rowsSelected"
             :row-click="saveOnRowChange"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 1b9791529..08cf248ba 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -621,7 +621,7 @@ watch(
         }"
         :create-as-dialog="false"
         :crud-model="{
-            paginate: false,
+            disableInfiniteScroll: true,
         }"
         :default-remove="false"
         :default-reset="false"

From 5d58bb0c139d7dd108c75736cd24325c8115a447 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 09:47:59 +0100
Subject: [PATCH 12/14] fix(VnPaginate): disable pagination

---
 src/components/VnTable/VnTable.vue | 2 ++
 src/components/ui/VnPaginate.vue   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 908157610..da6c89cbb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -325,6 +325,8 @@ function handleOnDataSaved(_) {
 }
 
 function handleScroll() {
+    if ($props.crudModel.disableInfiniteScroll) return;
+
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 04a843889..b058dc642 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -141,8 +141,6 @@ async function fetch(params) {
 }
 
 async function paginate() {
-    if (props.disableInfiniteScroll || !store.hasMoreData) return;
-
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
     if (!props.url) return;

From 8a1db719e3c3c68eccad2218a9a47c966d050a1f Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 19 Nov 2024 11:58:16 +0100
Subject: [PATCH 13/14] fix(Supplier): change isSerious to isReal

---
 src/i18n/locale/en.yml                         | 2 +-
 src/i18n/locale/es.yml                         | 2 +-
 src/pages/Supplier/Card/SupplierBasicData.vue  | 4 ++--
 src/pages/Supplier/Card/SupplierDescriptor.vue | 4 ++--
 src/pages/Supplier/Card/SupplierSummary.vue    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index aa8df17e2..070125540 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -940,7 +940,7 @@ supplier:
     basicData:
         alias: Alias
         workerFk: Responsible
-        isSerious: Verified
+        isReal: Verified
         isActive: Active
         isPayMethodChecked: PayMethod checked
         note: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 575e2c6c7..54728c5b6 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -938,7 +938,7 @@ supplier:
     basicData:
         alias: Alias
         workerFk: Responsable
-        isSerious: Verificado
+        isReal: Verificado
         isActive: Activo
         isPayMethodChecked: Método de pago validado
         note: Notas
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 52964557d..c1a107d3a 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -61,8 +61,8 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    v-model="data.isSerious"
-                    :label="t('supplier.basicData.isSerious')"
+                    v-model="data.isReal"
+                    :label="t('supplier.basicData.isReal')"
                 />
                 <QCheckbox
                     v-model="data.isActive"
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 5754031b3..9845cd08a 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -38,7 +38,7 @@ const filter = {
         'payDemFk',
         'payDay',
         'isActive',
-        'isSerious',
+        'isReal',
         'isTrucker',
         'account',
     ],
@@ -137,7 +137,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!supplier.isSerious"
+                    v-if="!supplier.isReal"
                     name="vn:supplierfalse"
                     color="primary"
                     size="xs"
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 5791db1eb..a1d1631d4 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -67,7 +67,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                 </VnLv>
                 <QCheckbox
                     :label="t('supplier.summary.verified')"
-                    v-model="supplier.isSerious"
+                    v-model="supplier.isReal"
                     :disable="true"
                 />
                 <QCheckbox

From fef7dd9ac1d4d9c659cfa113004d60c128ff12bf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 07:41:39 +0100
Subject: [PATCH 14/14] =?UTF-8?q?fix(MonitorOrders):=20translation=20sendD?=
 =?UTF-8?q?ate=20=E2=86=92=20landed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Monitor/MonitorOrders.vue | 2 +-
 src/pages/Monitor/locale/en.yml     | 1 -
 src/pages/Monitor/locale/es.yml     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index fac601735..17f72f188 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -27,7 +27,7 @@ function exprBuilder(param, value) {
 
 const columns = computed(() => [
     {
-        label: t('salesOrdersTable.dateSend'),
+        label: t('globals.landed'),
         name: 'dateSend',
         field: 'dateSend',
         align: 'left',
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index b8082f02a..e905d2521 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -11,7 +11,6 @@ salesClientsTable:
     client: Client
 salesOrdersTable:
     delete: Delete
-    dateSend: Send date
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 4ee5b90a9..a19145300 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -11,7 +11,6 @@ salesClientsTable:
     client: Cliente
 salesOrdersTable:
     delete: Eliminar
-    dateSend: Fecha de envío
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial