From 2ee4f0e65ce48a88b92f512db52d4392f962d391 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Dec 2024 08:19:07 +0100
Subject: [PATCH 1/6] fix: remove params when searching by id on VnSearchbar

---
 src/components/ui/VnSearchbar.vue         | 14 ++++++++++++--
 src/pages/Order/Card/OrderCatalog.vue     |  3 ++-
 src/pages/Zone/Card/ZoneLocationsTree.vue |  8 +++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 4e90245d6..92babfcc6 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -63,6 +63,10 @@ const props = defineProps({
         type: Function,
         default: undefined,
     },
+    searchRemoveParams: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const searchText = ref();
@@ -101,12 +105,18 @@ async function search() {
 
     const filter = {
         params: {
-            ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
-        ...{ filter: props.filter },
+        filter: props.filter,
     };
 
+    if (!props.searchRemoveParams || !searchText.value) {
+        filter.params = {
+            ...Object.fromEntries(staticParams),
+            search: searchText.value,
+        };
+    }
+
     if (props.whereFilter) {
         filter.filter = {
             where: props.whereFilter(searchText.value),
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 26133a7eb..2ede429a0 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref, computed, watch, provide, nextTick } from 'vue';
+import { onMounted, onUnmounted, ref, computed, watch, provide } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -101,6 +101,7 @@ provide('onItemSaved', onItemSaved);
         url="Orders/CatalogFilter"
         :label="t('Search items')"
         :info="t('You can search items by name or id')"
+        :search-remove-params="false"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 650047e40..5c87faf99 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -163,7 +163,13 @@ onUnmounted(() => {
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
-    <VnSearchbar v-if="!showSearchBar" :data-key="datakey" :url="url" :redirect="false" />
+    <VnSearchbar
+        v-if="!showSearchBar"
+        :data-key="datakey"
+        :url="url"
+        :redirect="false"
+        :search-remove-params="false"
+    />
     <QTree
         ref="treeRef"
         :nodes="nodes"

From f918bbd53963e9ad4c0029491addfa03d92bac5b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Dec 2024 08:47:29 +0100
Subject: [PATCH 2/6] fix: modified bottom button to show it when no data in
 the table and refactored add sale function

---
 src/components/VnTable/VnTable.vue   | 48 +++++++++++++---------------
 src/css/app.scss                     |  3 +-
 src/pages/Ticket/Card/TicketSale.vue |  7 +++-
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9ab080276..d6117a117 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -54,8 +54,8 @@ const $props = defineProps({
         default: true,
     },
     bottom: {
-        type: Object,
-        default: null,
+        type: Boolean,
+        default: false,
     },
     cardClass: {
         type: String,
@@ -575,29 +575,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         />
                     </QTd>
                 </template>
-                <template #bottom v-if="bottom">
-                    <slot name="bottom-table">
-                        <QBtn
-                            @click="
-                                () =>
-                                    createAsDialog
-                                        ? (showForm = !showForm)
-                                        : handleOnDataSaved(create)
-                            "
-                            class="cursor-pointer fill-icon"
-                            color="primary"
-                            icon="add_circle"
-                            size="md"
-                            round
-                            flat
-                            shortcut="+"
-                            :disabled="!disabledAttr"
-                        />
-                        <QTooltip>
-                            {{ createForm.title }}
-                        </QTooltip>
-                    </slot>
-                </template>
                 <template #item="{ row, colsMap }">
                     <component
                         :is="$props.redirect ? 'router-link' : 'span'"
@@ -727,6 +704,27 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                     </QTr>
                 </template>
             </QTable>
+            <div class="full-width bottomButton" v-if="bottom">
+                <QBtn
+                    @click="
+                        () =>
+                            createAsDialog
+                                ? (showForm = !showForm)
+                                : handleOnDataSaved(create)
+                    "
+                    class="cursor-pointer fill-icon"
+                    color="primary"
+                    icon="add_circle"
+                    size="md"
+                    round
+                    flat
+                    shortcut="+"
+                    :disabled="!disabledAttr"
+                />
+                <QTooltip>
+                    {{ createForm.title }}
+                </QTooltip>
+            </div>
         </template>
     </CrudModel>
     <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
diff --git a/src/css/app.scss b/src/css/app.scss
index abb388be9..fa798d543 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -149,7 +149,8 @@ select:-webkit-autofill {
 .q-card,
 .q-table,
 .q-table__bottom,
-.q-drawer {
+.q-drawer,
+.bottomButton {
     background-color: var(--vn-section-color);
 }
 
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 19cfdee2c..8e3c99aa4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -54,6 +54,7 @@ const transfer = ref({
 });
 const tableRef = ref([]);
 const canProceed = ref();
+const isLoading = ref(false);
 
 watch(
     () => route.params.id,
@@ -213,6 +214,9 @@ const updateQuantity = async ({ quantity, id }) => {
 };
 
 const addSale = async (sale) => {
+    if (isLoading.value) return;
+
+    isLoading.value = true;
     const params = {
         barcode: sale.itemFk,
         quantity: sale.quantity,
@@ -233,7 +237,7 @@ const addSale = async (sale) => {
     sale.item = newSale.item;
 
     notify('globals.dataSaved', 'positive');
-    window.location.reload();
+    arrayData.fetch({});
 };
 
 const updateConcept = async (sale) => {
@@ -466,6 +470,7 @@ const addRow = (original = null) => {
 };
 
 const endNewRow = (row) => {
+    if (!row) return;
     if (row.itemFk && row.quantity) {
         row.isNew = false;
     }

From 3c7880d02fa21885bff842da419e2d8531a3923b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 30 Dec 2024 14:02:23 +0100
Subject: [PATCH 3/6] fix: zone events postcode select

---
 src/components/common/VnSelect.vue   | 6 +++++-
 src/pages/Zone/ZoneDeliveryPanel.vue | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e5ac05231..1cfe0a184 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -148,7 +148,11 @@ onMounted(() => {
 const arrayDataKey =
     $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
 
-const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
+const arrayData = useArrayData(arrayDataKey, {
+    url: $props.url,
+    searchUrl: false,
+    mapKey: $attrs['map-key'],
+});
 
 function findKeyInOptions() {
     if (!$props.options) return;
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index ccc7aab3f..0a535afcb 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -89,7 +89,7 @@ watch(
                 v-model="formData.geoFk"
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
-                sort-by="code, townFk"
+                :sort-by="['code ASC']"
                 option-value="geoFk"
                 option-label="code"
                 :filter-options="['code']"
@@ -97,6 +97,7 @@ watch(
                 dense
                 outlined
                 rounded
+                map-key="geoFk"
             >
                 <template #option="{ itemProps, opt }">
                     <QItem v-bind="itemProps">

From 229130409aa02a7e6d59803e1d0feb33241fcd9d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 31 Dec 2024 10:45:37 +0100
Subject: [PATCH 4/6] fix: init fix

---
 .../Customer/Card/CustomerConsumption.vue     | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 35f366e47..e41c22ee6 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -104,18 +104,12 @@ function getParams() {
     };
 }
 const userParams = computed(() => {
-    const minDate = Date.vnNew();
-    minDate.setHours(0, 0, 0, 0);
-    minDate.setMonth(minDate.getMonth() - 2);
-
-    const maxDate = Date.vnNew();
-    maxDate.setHours(23, 59, 59, 59);
-
-    return {
-        campaign: campaignList.value[0]?.id,
-        from: minDate,
-        to: maxDate,
+    const campaign = campaignList.value[0]?.id;
+    const userParams = {
+        campaign,
+        ...updateDateParams(campaign, { from: Date.vnNew(), to: Date.vnNew() }),
     };
+    return userParams;
 });
 const openReportPdf = () => {
     openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
@@ -134,6 +128,28 @@ const sendCampaignMetricsEmail = ({ address }) => {
         ...getParams(),
     });
 };
+
+const updateDateParams = (value, params) => {
+    if (!value) {
+        params.from = null;
+        params.to = null;
+        return;
+    }
+    const campaign = campaignList.value.find((c) => c.id === value);
+    if (!campaign) return;
+
+    const { dated, previousDays, scopeDays } = campaign;
+    const _date = new Date(dated);
+    _date.setHours(0, 0, 0, 0);
+    params.from = new Date(
+        new Date(dated).setDate(_date.getDate() - previousDays)
+    ).toISOString();
+    _date.setHours(23, 59, 59, 59);
+    params.to = new Date(
+        new Date(dated).setDate(_date.getDate() + scopeDays)
+    ).toISOString();
+    return params;
+};
 </script>
 
 <template>
@@ -144,7 +160,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
         :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
         :columns="columns"
         search-url="consumption"
-        :filter="filter"
         :user-params="userParams"
         :default-remove="false"
         :default-reset="false"
@@ -201,6 +216,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
                     class="q-px-sm q-pt-none fit"
                     dense
                     option-label="code"
+                    @update:model-value="(data) => updateDateParams(data, params)"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

From b6161a41e861db1e3a09b51428f168a96db1dfa5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 31 Dec 2024 10:48:07 +0100
Subject: [PATCH 5/6] perf: use dateRange

---
 src/pages/Customer/Card/CustomerConsumption.vue | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index e41c22ee6..640e37ed3 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -2,7 +2,7 @@
 import { ref, computed, onBeforeMount } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters/index';
+import { dateRange, toDate } from 'src/filters/index';
 import { useRoute } from 'vue-router';
 
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -140,14 +140,9 @@ const updateDateParams = (value, params) => {
 
     const { dated, previousDays, scopeDays } = campaign;
     const _date = new Date(dated);
-    _date.setHours(0, 0, 0, 0);
-    params.from = new Date(
-        new Date(dated).setDate(_date.getDate() - previousDays)
-    ).toISOString();
-    _date.setHours(23, 59, 59, 59);
-    params.to = new Date(
-        new Date(dated).setDate(_date.getDate() + scopeDays)
-    ).toISOString();
+    const [from, to] = dateRange(_date);
+    params.from = new Date(from.setDate(from.getDate() - previousDays)).toISOString();
+    params.to = new Date(to.setDate(to.getDate() + scopeDays)).toISOString();
     return params;
 };
 </script>

From 65a54b12e6ef3b8813b3c313d70bd1ff2317348a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 31 Dec 2024 13:11:59 +0100
Subject: [PATCH 6/6] fix: use map-key prop to show all ocurrencies

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

diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue
index bf6e0695e..8b25ba5da 100644
--- a/src/components/ui/VnSms.vue
+++ b/src/components/ui/VnSms.vue
@@ -54,6 +54,7 @@ function formatNumber(number) {
                 :offset="100"
                 :limit="5"
                 auto-load
+                map-key="smsFk"
             >
                 <template #body="{ rows }">
                     <QCard