From 56f8cbe615de8996b100cab085716c45a62629fd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 11:37:44 +0200
Subject: [PATCH 1/7] fix: refs #7353 sales person filter and locale

---
 src/components/ui/VnFilterPanel.vue              | 15 +++++++++++++--
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 11 ++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cebdc4bbf..12525c7cc 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,
@@ -200,6 +200,11 @@ function sanitizer(params) {
     }
     return params;
 }
+
+function getLocale(label) {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+}
 </script>
 
 <template>
@@ -248,7 +253,12 @@ function sanitizer(params) {
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
-                        <slot name="tags" :tag="chip" :format-fn="formatValue">
+                        <slot
+                            name="tags"
+                            :tag="chip"
+                            :format-fn="formatValue"
+                            :locale-fn="getLocale"
+                        >
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
@@ -262,6 +272,7 @@ function sanitizer(params) {
                         :tags="customTags"
                         :format-fn="formatValue"
                         :search-fn="search"
+                        :locale-fn="getLocale"
                     />
                 </div>
             </QItem>
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 3c95f5cdd..01e9d65ec 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -11,7 +11,7 @@ import FetchData from 'src/components/FetchData.vue';
 import { dateRange } from 'src/filters';
 
 defineProps({ dataKey: { type: String, required: true } });
-const { t } = useI18n();
+const { t, te } = useI18n();
 const warehouses = ref();
 const groupedStates = ref();
 
@@ -26,6 +26,11 @@ const handleScopeDays = (params, days, callback) => {
     }
     if (callback) callback();
 };
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>
 <template>
     <FetchData url="Warehouses" auto-load @on-fetch="(data) => (warehouses = data)" />
@@ -46,7 +51,7 @@ const handleScopeDays = (params, days, callback) => {
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong v-text="`${t(`params.${tag.label}`)}:`" />
+                <strong v-text="`${getLocale(tag.label)}:`" />
                 <span v-text="formatFn(tag.value)" />
             </div>
         </template>
@@ -110,7 +115,7 @@ const handleScopeDays = (params, days, callback) => {
                         url="Workers/search"
                         :params="{ departmentCodes: ['VT'] }"
                         is-outlined
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         :no-one="true"
                     >

From 3f03f0d4e91e6cf40b51ccd264a206937a634782 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:41:57 +0200
Subject: [PATCH 2/7] fix: refs #7353 show unremovable params

---
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 01e9d65ec..2d48bd44e 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -48,6 +48,7 @@ const getLocale = (label) => {
         :hidden-tags="['from', 'to', 'search']"
         :custom-tags="['scopeDays']"
         :unremovable-params="['from', 'to', 'scopeDays']"
+        search-url="saleMonitorTickets"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">

From 2cb2ce16efacf8919e000026995a446b03b12820 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:56:50 +0200
Subject: [PATCH 3/7] fix: refs #7353 locale

---
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 2d48bd44e..57248d580 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -28,8 +28,9 @@ const handleScopeDays = (params, days, callback) => {
 };
 
 const getLocale = (label) => {
-    const globalLocale = `globals.params.${label}`;
-    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+    const param = label.split('.').at(-1);
+    const globalLocale = `globals.params.${param}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${param}`);
 };
 </script>
 <template>

From ed4a4e1e59ab55b6698c7d50ab85e8036bd0f2bf Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:57:43 +0200
Subject: [PATCH 4/7] fix: refs #7353 rollback

---
 src/components/ui/VnFilterPanel.vue | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 12525c7cc..03b01b0ab 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -200,11 +200,6 @@ function sanitizer(params) {
     }
     return params;
 }
-
-function getLocale(label) {
-    const globalLocale = `globals.params.${label}`;
-    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
-}
 </script>
 
 <template>
@@ -253,12 +248,7 @@ function getLocale(label) {
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
-                        <slot
-                            name="tags"
-                            :tag="chip"
-                            :format-fn="formatValue"
-                            :locale-fn="getLocale"
-                        >
+                        <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
@@ -272,7 +262,6 @@ function getLocale(label) {
                         :tags="customTags"
                         :format-fn="formatValue"
                         :search-fn="search"
-                        :locale-fn="getLocale"
                     />
                 </div>
             </QItem>

From eb6f12ae3b28229372d16a87a4f46b7155da0ca5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 12:58:06 +0200
Subject: [PATCH 5/7] fix: refs #7353 rollback

---
 src/components/ui/VnFilterPanel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 03b01b0ab..cebdc4bbf 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
-const { t, te } = useI18n();
+const { t } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,

From 3906fc386f6b99528a9973299b22b0a7c974147d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 12:49:45 +0200
Subject: [PATCH 6/7] hotFix: supplierDescriptor not use same data-key

---
 src/pages/Supplier/Card/SupplierDescriptor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 6e60a336c..5754031b3 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -109,7 +109,7 @@ const getEntryQueryParams = (supplier) => {
         :subtitle="data.subtitle"
         :filter="filter"
         @on-fetch="setData"
-        data-key="supplier"
+        data-key="supplierDescriptor"
         :summary="$props.summary"
     >
         <template #body="{ entity }">

From f86525e31dcf0bc79a5b04dc01ab8456efae34ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 13:24:21 +0200
Subject: [PATCH 7/7] fix: not null variable

---
 src/components/VnTable/VnTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6f678d5c1..5b39265fb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -192,7 +192,7 @@ function setUserParams(watchedParams, watchedOrder) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value == 'object') {
+        if (value && typeof value == 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }