From 3ab4574155de6064f966af58614297e75c5c09d0 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 24 Oct 2024 13:35:57 +0200
Subject: [PATCH 01/36] feat: refs #8001 ticketExpeditionGrafana

---
 src/pages/Ticket/Card/TicketExpedition.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index bd63f259c..6a0989644 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -123,6 +123,12 @@ const columns = computed(() => [
                 isPrimary: true,
                 action: (row) => showLog(row),
             },
+            {
+                title: t('Grafana'),
+                icon: 'vn:grafana',
+                isPrimary: true,
+                action: (row) => openGrafana(row.id),
+            },
         ],
     },
 ]);
@@ -200,6 +206,13 @@ const getExpeditionState = async (expedition) => {
     }
 };
 
+const openGrafana = (expeditionFk) => {
+    window.open(
+        `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`,
+        '_blank'
+    );
+};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'history');

From 87b5af7060d6177c62df04f640f8249c1405acba Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 29 Nov 2024 08:38:38 +0100
Subject: [PATCH 02/36] feat: refs #8001 change request

---
 src/pages/Ticket/Card/TicketExpedition.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 3268bd7da..0e56948e7 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -17,6 +17,7 @@ import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnBtnSelect from 'src/components/common/VnBtnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const route = useRoute();
 const stateStore = useStateStore();
@@ -127,7 +128,7 @@ const columns = computed(() => [
                 title: t('Grafana'),
                 icon: 'vn:grafana',
                 isPrimary: true,
-                action: (row) => openGrafana(row.id),
+                action: ({ id }) => openGrafana(id),
             },
         ],
     },
@@ -199,9 +200,8 @@ const getExpeditionState = async (expedition) => {
 };
 
 const openGrafana = (expeditionFk) => {
-    window.open(
-        `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`,
-        '_blank'
+    useOpenURL(
+        `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
     );
 };
 

From 68c691587d3417093613f73058b2f9ee0a4bd0ea Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 29 Nov 2024 09:55:22 +0100
Subject: [PATCH 03/36] feat: refs #8001 change request

---
 src/pages/Ticket/Card/TicketExpedition.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 0e56948e7..43d8c34f5 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -207,8 +207,8 @@ const openGrafana = (expeditionFk) => {
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    const filteredColumns = columns.value.filter((col) => col.name !== 'history');
-    allColumnNames.value = filteredColumns.map((col) => col.name);
+    const filteredColumns = columns.value.filter(({ name }) => name !== 'history');
+    allColumnNames.value = filteredColumns.map(({ name }) => name);
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));

From 809ad95e4683410bcee522d0a03ff4520f6bed8f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Dec 2024 10:18:05 +0100
Subject: [PATCH 04/36] fix: hotfix date

---
 .../Supplier/Card/SupplierConsumption.vue      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index fe1cec260..a4fcf8bcd 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -8,7 +8,7 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
-import { toDate } from 'src/filters';
+import { dateRange, toDate } from 'src/filters';
 import { dashIfEmpty } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
@@ -35,14 +35,20 @@ const store = arrayData.store;
 
 onUnmounted(() => state.unset('SupplierConsumption'));
 const dateRanges = computed(() => {
-    const { from, to } = arrayData.store?.userParams || {};
+    let { from, to } = arrayData.store?.userParams || {};
     return { from, to };
 });
 
-const reportParams = computed(() => ({
-    recipientId: Number(route.params.id),
-    ...dateRanges.value,
-}));
+const reportParams = computed(() => {
+    const dates = {
+        to: dateRange(dateRanges.value.to)[1].toISOString(),
+        from: dateRange(dateRanges.value.from)[1].toISOString(),
+    };
+    return {
+        recipientId: Number(route.params.id),
+        ...dates,
+    };
+});
 
 async function getSupplierConsumptionData() {
     await arrayData.fetch({ append: false });

From eb91b9c1090dcd05d4675315a5ba9ffc10ec1154 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 10 Dec 2024 11:02:00 +0100
Subject: [PATCH 05/36] fix: fix front

---
 src/pages/Item/ItemRequest.vue       |  42 +++++------
 src/pages/Item/ItemRequestFilter.vue | 107 ++++-----------------------
 src/pages/Travel/TravelFilter.vue    |   1 +
 src/pages/Worker/Card/WorkerPit.vue  |  16 +++-
 4 files changed, 45 insertions(+), 121 deletions(-)

diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 4f037529a..9bb573787 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -1,42 +1,33 @@
 <script setup>
-import { ref, computed, onMounted, watch } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { useArrayData } from 'composables/useArrayData';
-import { dashIfEmpty, toCurrency } from 'filters/index';
+import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import ItemRequestDenyForm from './ItemRequestDenyForm.vue';
 import { toDate } from 'src/filters';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import ItemRequestFilter from './ItemRequestFilter.vue';
 const { t } = useI18n();
 const { notify } = useNotify();
 const stateStore = useStateStore();
-let filterParams = ref({});
 const denyFormRef = ref(null);
 const denyRequestId = ref(null);
 const denyRequestIndex = ref(null);
 const itemRequestsOptions = ref([]);
-const arrayData = useArrayData('ItemRequests', {
-    url: 'TicketRequests/filter',
-    userParams: filterParams,
-    order: ['shippedDate ASC', 'isOk ASC'],
-});
-const store = arrayData.store;
-
 const userParams = {
     state: 'pending',
-    daysOnward: 7,
+    daysOnward: '7',
 };
-
 const tableRef = ref();
-watch(
-    () => store.data,
-    (value) => (itemRequestsOptions.value = value)
-);
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
 
 const columns = computed(() => [
     {
@@ -220,14 +211,14 @@ const onDenyAccept = (_, responseData) => {
     denyRequestIndex.value = null;
     tableRef.value.reload();
 };
-
-onMounted(async () => {
-    await arrayData.fetch({ append: false });
-    stateStore.rightDrawer = true;
-});
 </script>
 
 <template>
+    <RightMenu>
+        <template #right-panel>
+            <ItemRequestFilter data-key="itemRequest" ref="tableRef" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="itemRequest"
@@ -236,6 +227,7 @@ onMounted(async () => {
         :columns="columns"
         :user-params="userParams"
         :is-editable="true"
+        :right-search="false"
         auto-load
         :disable-option="{ card: true }"
         chip-locale="item.params"
@@ -295,16 +287,20 @@ onMounted(async () => {
             </span>
         </template>
         <template #moreFilterPanel="{ params }">
+            {{ params }}
             <VnInputNumber
                 :label="t('params.scopeDays')"
-                v-model.number="params.scopeDays"
+                v-model.number="params.daysOnward"
                 @keyup.enter="(evt) => handleScopeDays(evt.target.value)"
                 @remove="handleScopeDays()"
                 class="q-px-xs q-pr-lg"
                 filled
                 dense
+                lazy-rules
+                is-outlined
             />
         </template>
+
         <template #column-denyOptions="{ row, rowIndex }">
             <QTd class="sticky no-padding">
                 <QIcon
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 64bc0e575..8b7304279 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -6,7 +6,6 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -42,20 +41,6 @@ const exprBuilder = (param, value) => {
             };
     }
 };
-
-const add = (paramsObj, key) => {
-    if (paramsObj[key] === undefined) {
-        paramsObj[key] = 1;
-    } else {
-        paramsObj[key]++;
-    }
-};
-
-const decrement = (paramsObj, key) => {
-    if (paramsObj[key] === 0) return;
-
-    paramsObj[key]--;
-};
 </script>
 
 <template>
@@ -79,8 +64,7 @@ const decrement = (paramsObj, key) => {
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span v-if="tag.label !== 'state'">{{ formatFn(tag.value) }}</span>
-                <span v-else>{{ t(`${tag.value}`) }}</span>
+                <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
         <template #body="{ params, searchFn }">
@@ -174,83 +158,6 @@ const decrement = (paramsObj, key) => {
                     </VnSelect>
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.myTeam"
-                        :label="t('params.myTeam')"
-                        @update:model-value="searchFn()"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
-            <QCard bordered>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.from')"
-                            v-model="params.from"
-                            @update:model-value="searchFn()"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.to')"
-                            v-model="params.to"
-                            @update:model-value="searchFn()"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.scopeDays"
-                            :label="t('globals.daysOnward')"
-                            type="number"
-                            dense
-                            outlined
-                            rounded
-                            :min="0"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="add"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    shortcut="+"
-                                    @click="add(params, 'scopeDays')"
-                                />
-                                <QBtn
-                                    icon="remove"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="decrement(params, 'scopeDays')"
-                                />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QIcon name="info" style="position: absolute; top: 4px; right: 4px">
-                    <QTooltip max-width="300px">
-                        {{ t('dateFiltersTooltip') }}
-                    </QTooltip>
-                </QIcon>
-            </QCard>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        :label="t('params.mine')"
-                        v-model="params.mine"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
@@ -267,6 +174,18 @@ const decrement = (paramsObj, key) => {
                     />
                 </QItemSection>
             </QItem>
+
+            {{ params }}
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.daysOnward')"
+                        v-model="params.daysOnward"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 1ac83b9e0..c8d57fbc3 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -124,6 +124,7 @@ defineExpose({ states });
                     lazy-rules
                     is-outlined
                 />
+                {{ params }}
                 <VnInput
                     :label="t('travel.travelList.tableVisibleColumns.daysOnward')"
                     v-model="params.daysOnward"
diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index c58196c7b..79cf1a04f 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -23,6 +23,7 @@ const insertTag = () => {
     workerPitCrudRef.value.insert();
 };
 const quasar = useQuasar();
+
 const deleteRelative = async (id) => {
     await new Promise((resolve) => {
         quasar
@@ -62,7 +63,6 @@ const deleteRelative = async (id) => {
     >
         <template #form="{ data }">
             <QCard class="q-px-lg q-py-lg">
-                <VnTitle :text="t('IRPF')" />
                 <VnRow>
                     <VnInput
                         :label="t('familySituation')"
@@ -100,8 +100,12 @@ const deleteRelative = async (id) => {
                         :label="t(`spousePension`)"
                     />
                 </VnRow>
-                <VnRow>
-                    <QCheckbox v-model="data.isDependend" :label="t(`isDependend`)" />
+                <VnRow wrap>
+                    <QCheckbox
+                        clearable
+                        v-model="data.isDependend"
+                        :label="t(`isDependend`)"
+                    />
                     <QCheckbox
                         v-model="data.hasHousingPaymentBefore"
                         :label="t(`hasHousingPaymentBefore`)"
@@ -127,7 +131,11 @@ const deleteRelative = async (id) => {
                 :filter="{
                     where: { workerFk: route.params.id },
                 }"
-                :data-required="{ workerFk: route.params.id }"
+                :data-required="{
+                    workerFk: route.params.id,
+                    isJointCustody: false,
+                    isDependend: false,
+                }"
                 :has-sub-toolbar="false"
             >
                 <template #body="{ rows }">

From 884138af480115b8bb9524aafda7d5217cc7eb81 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 10 Dec 2024 12:33:53 +0100
Subject: [PATCH 06/36] fix: remove Iso

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index a4fcf8bcd..6e2ea14bf 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -40,13 +40,10 @@ const dateRanges = computed(() => {
 });
 
 const reportParams = computed(() => {
-    const dates = {
-        to: dateRange(dateRanges.value.to)[1].toISOString(),
-        from: dateRange(dateRanges.value.from)[1].toISOString(),
-    };
     return {
         recipientId: Number(route.params.id),
-        ...dates,
+        to: dateRange(dateRanges.value.to)[1],
+        from: dateRange(dateRanges.value.from)[1],
     };
 });
 

From a6f970cec8e0f7fffe15ee31b2ce09a4a4bc9ff4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 10 Dec 2024 14:06:34 +0100
Subject: [PATCH 07/36] fix: fixed filter when searching by id

---
 src/components/ui/VnSearchbar.vue    | 11 ++++++-----
 src/pages/Ticket/Card/TicketCard.vue |  7 +++++++
 src/pages/Ticket/TicketList.vue      |  9 +++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index da2d370fe..cabc6ff18 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -51,10 +51,6 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    staticParams: {
-        type: Array,
-        default: () => [],
-    },
     exprBuilder: {
         type: Function,
         default: null,
@@ -67,6 +63,10 @@ const props = defineProps({
         type: Function,
         default: undefined,
     },
+    beforeSearch: {
+        type: Function,
+        default: undefined,
+    },
 });
 
 const searchText = ref();
@@ -103,7 +103,7 @@ async function search() {
     const staticParams = Object.entries(store.userParams);
     arrayData.reset(['skip', 'page']);
 
-    const filter = {
+    let filter = {
         params: {
             ...Object.fromEntries(staticParams),
             search: searchText.value,
@@ -117,6 +117,7 @@ async function search() {
         };
         delete filter.params.search;
     }
+    if (props.beforeSearch) filter = props.beforeSearch(filter);
     await arrayData.applyFilter(filter);
 }
 </script>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 73b6f5543..8832cb8b0 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -18,6 +18,13 @@ const { t } = useI18n();
             url: 'Tickets/filter',
             label: t('card.search'),
             info: t('card.searchInfo'),
+            beforeSearch: (filter) => {
+                if (filter.params.search) {
+                    delete filter.params.from;
+                    delete filter.params.to;
+                }
+                return filter;
+            },
         }"
     />
 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 6f6c556ca..c06dcfa39 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -455,6 +455,15 @@ function setReference(data) {
         data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
+        :before-search="
+            (filter) => {
+                if (filter.params.search) {
+                    delete filter.params.from;
+                    delete filter.params.to;
+                }
+                return filter;
+            }
+        "
     />
     <RightMenu>
         <template #right-panel>

From 309033c6de572ca410e82739802ae63210abe46d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Dec 2024 06:05:38 +0100
Subject: [PATCH 08/36] fix: fixed panel function

---
 .../Item/ItemType/Card/ItemTypeSummary.vue    | 23 +++++++------
 src/pages/Item/ItemType/locale/en.yml         | 33 ++++++++++---------
 src/pages/Item/ItemType/locale/es.yml         | 33 ++++++++++---------
 src/pages/Zone/Card/ZoneEvents.vue            |  1 +
 src/pages/Zone/Card/ZoneEventsPanel.vue       | 27 +++++++++++----
 5 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
index c51d59e13..9ba774ca4 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
@@ -78,29 +78,32 @@ async function setItemTypeData(data) {
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" />
                 </router-link>
-                <VnLv :label="t('summary.id')" :value="itemType.id" />
-                <VnLv :label="t('shared.code')" :value="itemType.code" />
-                <VnLv :label="t('shared.name')" :value="itemType.name" />
-                <VnLv :label="t('shared.worker')">
+                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
+                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
+                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv :label="t('itemType.shared.worker')">
                     <template #value>
                         <span class="link">{{ itemType.worker?.firstName }}</span>
                         <WorkerDescriptorProxy :id="itemType.worker?.id" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('shared.category')" :value="itemType.category?.name" />
                 <VnLv
-                    :label="t('shared.temperature')"
+                    :label="t('itemType.shared.category')"
+                    :value="itemType.category?.name"
+                />
+                <VnLv
+                    :label="t('itemType.shared.temperature')"
                     :value="itemType.temperature?.name"
                 />
-                <VnLv :label="t('summary.life')" :value="itemType.life" />
-                <VnLv :label="t('summary.promo')" :value="itemType.promo" />
+                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
+                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
                 <VnLv
-                    :label="t('summary.itemPackingType')"
+                    :label="t('itemType.summary.itemPackingType')"
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
                     class="large-label"
-                    :label="t('summary.isUnconventionalSize')"
+                    :label="t('itemType.summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
             </QCard>
diff --git a/src/pages/Item/ItemType/locale/en.yml b/src/pages/Item/ItemType/locale/en.yml
index 575d5e402..99c6791f2 100644
--- a/src/pages/Item/ItemType/locale/en.yml
+++ b/src/pages/Item/ItemType/locale/en.yml
@@ -1,16 +1,17 @@
-shared:
-    code: Code
-    name: Name
-    worker: Worker
-    category: Category
-    temperature: Temperature
-    life: Life
-    itemPackingType: Item packing type
-    maxRefs: Maximum references
-    fragile: Fragile
-summary:
-    id: id
-    life: Life
-    promo: Promo
-    itemPackingType: Item packing type
-    isUnconventionalSize: Is unconventional size
+itemType:
+    shared:
+        code: Code
+        name: Name
+        worker: Worker
+        category: Category
+        temperature: Temperature
+        life: Life
+        itemPackingType: Item packing type
+        maxRefs: Maximum references
+        fragile: Fragile
+    summary:
+        id: id
+        life: Life
+        promo: Promo
+        itemPackingType: Item packing type
+        isUnconventionalSize: Is unconventional size
diff --git a/src/pages/Item/ItemType/locale/es.yml b/src/pages/Item/ItemType/locale/es.yml
index 93f8b0d0e..c91fb4058 100644
--- a/src/pages/Item/ItemType/locale/es.yml
+++ b/src/pages/Item/ItemType/locale/es.yml
@@ -1,16 +1,17 @@
-shared:
-    code: Código
-    name: Nombre
-    worker: Trabajador
-    category: Reino
-    temperature: Temperatura
-    life: Vida
-    itemPackingType: Tipo de embalaje
-    maxRefs: Referencias máximas
-    fragile: Frágil
-summary:
-    id: id
-    life: Vida
-    promo: Promoción
-    itemPackingType: Tipo de embalaje
-    isUnconventionalSize: Es de tamaño poco convencional
+itemType:
+    shared:
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+        life: Vida
+        itemPackingType: Tipo de embalaje
+        maxRefs: Referencias máximas
+        fragile: Frágil
+    summary:
+        id: id
+        life: Vida
+        promo: Promoción
+        itemPackingType: Tipo de embalaje
+        isUnconventionalSize: Es de tamaño poco convencional
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 6d5b37096..923a72391 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -52,6 +52,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 :last-day="lastDay"
                 :events="events"
                 v-model:formModeName="formModeName"
+                @open-zone-form="openForm"
             />
         </QScrollArea>
     </QDrawer>
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index da1c0cf71..bb8c15934 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -11,10 +11,6 @@ import { dashIfEmpty } from 'src/filters';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
-const formModeName = defineModel('formModeName', {
-    type: String,
-    required: true,
-});
 const props = defineProps({
     firstDay: {
         type: Date,
@@ -31,8 +27,18 @@ const props = defineProps({
         required: true,
         default: () => [],
     },
+    formModeName: {
+        type: String,
+        required: true,
+        default: 'include',
+    },
 });
 
+const formName = computed({
+    get: () => props.formModeName,
+    set: (value) => emit('update:formModeName', value),
+});
+const emit = defineEmits(['openZoneForm', 'update:formModeName']);
 const { t } = useI18n();
 const route = useRoute();
 const weekdayStore = useWeekdayStore();
@@ -80,6 +86,15 @@ const deleteEvent = async (id) => {
     await fetchData();
 };
 
+const openInclusionForm = (event) => {
+    formName.value = 'include';
+    emit('openZoneForm', {
+        date: event.dated,
+        event,
+        isNewMode: false,
+    });
+};
+
 onMounted(async () => {
     weekdayStore.initStore();
 });
@@ -92,13 +107,13 @@ onMounted(async () => {
                 t('eventsPanel.editMode')
             }}</span>
             <QRadio
-                v-model="formModeName"
+                v-model="formName"
                 dense
                 val="include"
                 :label="t('eventsPanel.include')"
             />
             <QRadio
-                v-model="formModeName"
+                v-model="formName"
                 dense
                 val="exclude"
                 :label="t('eventsPanel.exclude')"

From 86ccbecc47b59f637957f1601734f1b67d736bbd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Dec 2024 09:27:45 +0100
Subject: [PATCH 09/36] fix(VnVisibleColumn): fix when is null is visible

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index ea7cf1dda..9ab080276 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -162,7 +162,9 @@ onMounted(() => {
             : $props.defaultMode;
     stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
+        ...splittedColumns.value.columns
+            .filter((c) => c.visible === false)
+            .map((c) => c.name),
         ...['tableActions'],
     ];
     createForm.value = $props.create;
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index f5c3458cd..dad950d73 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -152,7 +152,7 @@ onMounted(async () => {
                     <QCheckbox
                         v-for="col in localColumns"
                         :key="col.name"
-                        :label="col.label"
+                        :label="col.label ?? col.name"
                         v-model="col.visible"
                     />
                 </div>

From 19f91e73a361f93ffa0f424b31051f1dfa0f9003 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Dec 2024 09:47:07 +0100
Subject: [PATCH 10/36] fix: ticketBasicData haveNegatives and style

---
 src/css/app.scss                              |  4 +
 .../Ticket/Card/BasicData/TicketBasicData.vue | 90 +++++++++----------
 .../Card/BasicData/TicketBasicDataForm.vue    |  8 --
 .../Card/BasicData/TicketBasicDataView.vue    | 12 +--
 4 files changed, 46 insertions(+), 68 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 63a9f5c46..abb388be9 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -264,6 +264,10 @@ input::-webkit-inner-spin-button {
     .shrink {
         max-width: 75px;
     }
+    .number {
+        text-align: right;
+        width: 96px;
+    }
     .expand {
         max-width: 400px;
     }
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index ab96a6e75..e1f4e1bb1 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@@ -10,37 +10,15 @@ import { useStateStore } from 'stores/useStateStore';
 import { toCurrency } from 'filters/index';
 import { useRole } from 'src/composables/useRole';
 
-const $props = defineProps({
-    formData: {
-        type: Object,
-        required: true,
-    },
-    haveNegatives: {
-        type: Boolean,
-        required: true,
-        default: false,
-    },
-});
-
-const emit = defineEmits(['updateForm', 'update:haveNegatives']);
+const haveNegatives = defineModel('haveNegatives', { type: Boolean, required: true });
+const formData = defineModel({ type: Object, required: true });
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { hasAny } = useRole();
 
-const _ticketData = ref($props.formData);
 const ticketUpdateActions = ref(null);
-const haveNegatives = computed({
-    get: () => $props.haveNegatives,
-    set: (val) => emit('update:haveNegatives', val),
-});
-const rows = computed(() => _ticketData.value?.sale?.items || []);
-
-watch(
-    () => _ticketData.value,
-    (val) => emit('updateForm', val),
-    { deep: true }
-);
+const rows = computed(() => formData.value?.sale?.items || []);
 
 const columns = computed(() => [
     {
@@ -57,24 +35,28 @@ const columns = computed(() => [
         align: 'left',
         hidden: true,
     },
+    {
+        name: 'subName',
+        align: 'left',
+        required: true,
+    },
     {
         label: t('basicData.movable'),
         name: 'movable',
-        align: 'left',
     },
     {
         required: true,
         label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
-        align: 'left',
+        classes: 'number',
     },
     {
         required: true,
         label: t('basicData.pricePPU'),
         name: 'price',
         field: 'price',
-        align: 'left',
+        classes: 'number',
         format: (val) => toCurrency(val),
     },
     {
@@ -82,7 +64,7 @@ const columns = computed(() => [
         label: t('basicData.newPricePPU'),
         name: 'newPrice',
         field: (row) => row.component.newPrice,
-        align: 'left',
+        classes: 'number',
         format: (val) => toCurrency(val),
     },
     {
@@ -90,14 +72,15 @@ const columns = computed(() => [
         label: t('basicData.difference'),
         name: 'difference',
         field: (row) => row.component.difference,
-        align: 'left',
+        classes: 'number',
         format: (val) => toCurrency(val),
+        autoWidth: true,
     },
 ]);
 
 const loadDefaultTicketAction = () => {
     const isSalesAssistant = hasAny(['salesAssistant']);
-    _ticketData.value.option = isSalesAssistant ? 'mana' : 'renewPrices';
+    formData.value.option = isSalesAssistant ? 'mana' : 'renewPrices';
 };
 
 const totalPrice = computed(() => {
@@ -115,24 +98,25 @@ const totalDifference = computed(() => {
     return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
 });
 const showMovableColumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
-const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
-const ticketHaveNegatives = () => {
+const haveDifferences = computed(() => formData.value.sale?.haveDifferences);
+async function ticketHaveNegatives() {
     let _haveNegatives = false;
     let haveNotNegatives = false;
-    _ticketData.value.withoutNegatives = false;
-    _ticketData.value?.sale?.items.forEach((item) => {
+    formData.value.withoutNegatives = false;
+    formData.value?.sale?.items.forEach((item) => {
         if (item.quantity > item.movable) _haveNegatives = true;
         else haveNotNegatives = true;
     });
 
     haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences.value;
-    if (haveNegatives.value) _ticketData.value.withoutNegatives = true;
-};
+    await nextTick();
+    if (haveNegatives.value) formData.value.withoutNegatives = true;
+}
 
-onMounted(() => {
+onMounted(async () => {
     stateStore.rightDrawer = true;
     loadDefaultTicketAction();
-    ticketHaveNegatives();
+    await ticketHaveNegatives();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -191,7 +175,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 horizontal
             >
                 <QRadio
-                    v-model="_ticketData.option"
+                    v-model="formData.option"
                     :val="action.code"
                     :label="action.description"
                     dense
@@ -208,7 +192,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <QCardSection horizontal class="flex row items-center">
                 <QCheckbox
                     :label="t('basicData.withoutNegatives')"
-                    v-model="_ticketData.withoutNegatives"
+                    v-model="formData.withoutNegatives"
                     :toggle-indeterminate="false"
                 />
                 <QIcon name="info" size="xs" class="q-ml-sm">
@@ -225,7 +209,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :columns="columns"
         row-key="id"
         :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
+        class="full-width"
         :no-data-label="t('globals.noResults')"
         flat
     >
@@ -238,21 +222,27 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
-            <QTd style="display: contents">
-                <div class="column">
+            <QTd style="min-width: 120px; max-width: 120px">
+                <div class="column q-pb-xs" style="min-width: 120px">
                     <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
-                    <FetchedTags :item="row.item" />
+                    <FetchedTags :item="row.item" class="full-width" />
                 </div>
             </QTd>
         </template>
-        <template #body-cell-movable="{ row }">
+        <template #body-cell-subName="{ row }">
             <QTd>
-                <QBadge
-                    v-if="_ticketData?.sale?.haveDifferences"
+                <span class="color-vn-label">{{ row.item.subName }}</span>
+            </QTd>
+        </template>
+        <template #body-cell-movable="{ row }">
+            <QTd class="number">
+                <QChip
+                    v-if="formData?.sale?.haveDifferences"
                     :text-color="row.quantity > row.movable ? 'black' : 'white'"
                     :color="row.quantity > row.movable ? 'negative' : 'transparent'"
                     :label="row.movable"
+                    dense
+                    square
                 />
             </QTd>
         </template>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 0c53552fe..df84add93 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -21,7 +21,6 @@ const formData = defineModel({
     required: true,
 });
 
-const emit = defineEmits(['updateForm']);
 const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
@@ -33,18 +32,11 @@ const canEditZone = useAcl().hasAny([
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
-const currenciesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
 const zoneSelectRef = ref();
 
-watch(
-    () => formData.value,
-    (val) => emit('updateForm', val),
-    { deep: true }
-);
-
 onMounted(() => onFormModelInit());
 
 const agencyByWarehouseFilter = computed(() => ({
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 851593bff..89249b899 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -155,18 +155,10 @@ onBeforeMount(async () => await getTicketData());
         }"
     >
         <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
-            <TicketBasicDataForm
-                v-if="initialDataLoaded"
-                @update-form="($event) => (formData = $event)"
-                v-model="formData"
-            />
+            <TicketBasicDataForm v-if="initialDataLoaded" v-model="formData" />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
-            <TicketBasicData
-                :form-data="formData"
-                v-model:haveNegatives="haveNegatives"
-                @update-form="($event) => (formData = $event)"
-            />
+            <TicketBasicData v-model="formData" v-model:have-negatives="haveNegatives" />
         </QStep>
         <template #navigation>
             <QStepperNavigation class="flex justify-between">

From 87551058dc94c3a463a71d28ba3b6b08affff9c5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 10:18:43 +0100
Subject: [PATCH 11/36] fix: rollback

---
 src/pages/Worker/Card/WorkerBalance.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 95e0b986e..25ab92c9b 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -15,9 +15,6 @@ const columns = computed(() => [
         name: 'paymentDate',
         label: t('worker.balance.tableVisibleColumns.paymentDate'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'date',
         field: 'paymentDate',
         cardVisible: true,
@@ -27,9 +24,6 @@ const columns = computed(() => [
         name: 'incomeTypeFk',
         label: t('worker.balance.tableVisibleColumns.incomeType'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'select',
         attrs: {
             options: payrollComponents,
@@ -43,9 +37,6 @@ const columns = computed(() => [
         name: 'debit',
         label: t('worker.balance.tableVisibleColumns.debit'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'input',
         field: 'debit',
         cardVisible: true,
@@ -55,9 +46,6 @@ const columns = computed(() => [
         name: 'credit',
         label: t('worker.balance.tableVisibleColumns.credit'),
         create: true,
-        columnCreate: {
-            required: true,
-        },
         component: 'input',
         field: 'credit',
         cardVisible: true,

From 542ec13cfedbf583e62968a3b3c23f3a766dfe02 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 11:30:48 +0100
Subject: [PATCH 12/36] feat: add flag attr to prevent submit

---
 src/boot/qformMixin.js                               | 2 +-
 src/components/FormModel.vue                         | 2 ++
 src/pages/Customer/components/CustomerNewPayment.vue | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index fc7852369..8d009dbea 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -8,7 +8,7 @@ export default {
                 // TODO: AUTOFOCUS IS NOT FOCUSING
                 const that = this;
                 this.$el.addEventListener('keyup', function (evt) {
-                    if (evt.key === 'Enter') {
+                    if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
                         const input = evt.target;
                         if (input.type == 'textarea' && evt.shiftKey) {
                             evt.preventDefault();
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 2cb6ad8e6..03709d93b 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -285,6 +285,7 @@ defineExpose({
 </script>
 <template>
     <div class="column items-center full-width">
+        {{ $attrs }}
         <QForm
             ref="myForm"
             v-if="formData"
@@ -293,6 +294,7 @@ defineExpose({
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
+            :prevent-submit="$attrs['prevent-submit']"
         >
             <QCard>
                 <slot
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 291f28642..7c2cc6dc4 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -189,6 +189,7 @@ async function getAmountPaid() {
             :url-create="urlCreate"
             :mapper="onBeforeSave"
             @on-data-saved="onDataSaved"
+            :prevent-submit="true"
         >
             <template #form="{ data, validate }">
                 <span ref="closeButton" class="row justify-end close-icon" v-close-popup>

From f4d7982228919875165461eefc3fe786bc7edca9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 11:34:08 +0100
Subject: [PATCH 13/36] fix: remove useless code

---
 src/components/FormModel.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 03709d93b..c569f2553 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -285,7 +285,6 @@ defineExpose({
 </script>
 <template>
     <div class="column items-center full-width">
-        {{ $attrs }}
         <QForm
             ref="myForm"
             v-if="formData"

From f04d675f6bda6ac144004e888ed6eeb16c6caea1 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 11 Dec 2024 11:41:58 +0100
Subject: [PATCH 14/36] feat: refs #7882 Added longitude & latitude

---
 .../components/CustomerAddressEdit.vue        | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index c32fa6630..150ef3b84 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -144,7 +145,6 @@ function handleLocation(data, location) {
         :url="`Addresses/${route.params.addressId}`"
         @on-data-saved="onDataSaved()"
         auto-load
-        model="customer"
     >
         <template #moreActions>
             <QBtn
@@ -220,31 +220,35 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
             <VnRow>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Incoterms')"
-                        :options="incoterms"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        v-model="data.incotermsFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelectDialog
-                        :label="t('Customs agent')"
-                        :options="customsAgents"
-                        hide-selected
-                        option-label="fiscalName"
-                        option-value="id"
-                        v-model="data.customsAgentFk"
-                        :tooltip="t('New customs agent')"
-                    >
-                        <template #form>
-                            <CustomerNewCustomsAgent />
-                        </template>
-                    </VnSelectDialog>
-                </div>
+                <VnSelect
+                    :label="t('Incoterms')"
+                    :options="incoterms"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    v-model="data.incotermsFk"
+                />
+                <VnSelectDialog
+                    :label="t('Customs agent')"
+                    :options="customsAgents"
+                    hide-selected
+                    option-label="fiscalName"
+                    option-value="id"
+                    v-model="data.customsAgentFk"
+                    :tooltip="t('New customs agent')"
+                >
+                    <template #form>
+                        <CustomerNewCustomsAgent />
+                    </template>
+                </VnSelectDialog>
+            </VnRow>
+            <VnRow>
+                <VnInputNumber
+                    :label="t('Longitude')"
+                    clearable
+                    v-model="data.longitude"
+                />
+                <VnInputNumber :label="t('Latitude')" clearable v-model="data.latitude" />
             </VnRow>
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
             <VnRow
@@ -322,4 +326,6 @@ es:
     Description: Descripción
     Add note: Añadir nota
     Remove note: Eliminar nota
+    Longitude: Longitud
+    Latitude: Latitud
 </i18n>

From 740cca2b93f87bf43aac7532c45f3c650b52c789 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 13:03:18 +0100
Subject: [PATCH 15/36] fix: not trigger submit on enter

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

diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 7c2cc6dc4..c2c38b55a 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -304,7 +304,7 @@ async function getAmountPaid() {
                         :label="t('globals.save')"
                         :loading="formModelRef.isLoading"
                         color="primary"
-                        type="submit"
+                        @click="formModelRef.save()"
                     />
                 </div>
             </template>

From c61ad16681480d6958093a5cf534ab3ca482375f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Dec 2024 13:38:04 +0100
Subject: [PATCH 16/36] feat: added logic to avoid other filter params when
 searching on vnsearchbar

---
 src/components/ui/VnSearchbar.vue    | 26 +++++++++++++-------------
 src/pages/Ticket/Card/TicketCard.vue |  7 -------
 src/pages/Ticket/TicketList.vue      | 13 ++-----------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 2b6b59a6e..c3a3c0a03 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -63,10 +63,6 @@ const props = defineProps({
         type: Function,
         default: undefined,
     },
-    beforeSearch: {
-        type: Function,
-        default: undefined,
-    },
 });
 
 const searchText = ref();
@@ -102,22 +98,26 @@ onMounted(() => {
 async function search() {
     const staticParams = Object.entries(store.userParams);
     arrayData.reset(['skip', 'page']);
-
     let filter = {
         params: {
-            ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
-        ...{ filter: props.filter },
     };
-
-    if (props.whereFilter) {
-        filter.filter = {
-            where: props.whereFilter(searchText.value),
+    if (!(searchText.value && searchText.value !== '')) {
+        filter = {
+            params: {
+                ...Object.fromEntries(staticParams),
+            },
+            ...{ filter: props.filter },
         };
-        delete filter.params.search;
+
+        if (props.whereFilter) {
+            filter.filter = {
+                where: props.whereFilter(searchText.value),
+            };
+            delete filter.params.search;
+        }
     }
-    if (props.beforeSearch) filter = props.beforeSearch(filter);
     await arrayData.applyFilter(filter);
 }
 </script>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 8832cb8b0..73b6f5543 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -18,13 +18,6 @@ const { t } = useI18n();
             url: 'Tickets/filter',
             label: t('card.search'),
             info: t('card.searchInfo'),
-            beforeSearch: (filter) => {
-                if (filter.params.search) {
-                    delete filter.params.from;
-                    delete filter.params.to;
-                }
-                return filter;
-            },
         }"
     />
 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 9fbdea3aa..eb03a4927 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -46,7 +46,7 @@ const userParams = {
     from: null,
     to: null,
 };
-onMounted(() => {
+onBeforeMount(() => {
     initializeFromQuery();
     stateStore.rightDrawer = true;
     if (!route.query.createForm) return;
@@ -457,15 +457,6 @@ function setReference(data) {
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
         data-cy="ticketListSearchBar"
-        :before-search="
-            (filter) => {
-                if (filter.params.search) {
-                    delete filter.params.from;
-                    delete filter.params.to;
-                }
-                return filter;
-            }
-        "
     />
     <RightMenu>
         <template #right-panel>

From b635010972de48f428748033f6090ab3b042043f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Dec 2024 14:03:56 +0100
Subject: [PATCH 17/36] perf: if searchtext condition

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

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index c3a3c0a03..bdebfd875 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -103,7 +103,7 @@ async function search() {
             search: searchText.value,
         },
     };
-    if (!(searchText.value && searchText.value !== '')) {
+    if (!searchText.value) {
         filter = {
             params: {
                 ...Object.fromEntries(staticParams),

From 9e8c967567e77016f4da4b07e6020338d34e3033 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Dec 2024 15:01:28 +0100
Subject: [PATCH 18/36] fix(VnSearchbar): hotFix rollback

---
 src/components/ui/VnSearchbar.vue | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index bdebfd875..4e90245d6 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -98,25 +98,20 @@ onMounted(() => {
 async function search() {
     const staticParams = Object.entries(store.userParams);
     arrayData.reset(['skip', 'page']);
-    let filter = {
+
+    const filter = {
         params: {
+            ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
+        ...{ filter: props.filter },
     };
-    if (!searchText.value) {
-        filter = {
-            params: {
-                ...Object.fromEntries(staticParams),
-            },
-            ...{ filter: props.filter },
-        };
 
-        if (props.whereFilter) {
-            filter.filter = {
-                where: props.whereFilter(searchText.value),
-            };
-            delete filter.params.search;
-        }
+    if (props.whereFilter) {
+        filter.filter = {
+            where: props.whereFilter(searchText.value),
+        };
+        delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
 }

From bc41eabcf3af7e012e57622d091cb8050df8828c Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 12 Dec 2024 07:19:38 +0100
Subject: [PATCH 19/36] refactor: refs #8288 changed invoice out spanish
 translation

---
 src/i18n/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 61a5984cb..120f7742b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -497,7 +497,7 @@ invoiceOut:
         ticketList: Listado de tickets
     summary:
         issued: Fecha
-        dued: Vencimiento
+        dued: Fecha límite
         booked: Contabilizada
         taxBreakdown: Desglose impositivo
         taxableBase: Base imp.

From 06329ef857040695bb5d20d7cd4f7cfca07f2f4c Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 12 Dec 2024 08:14:58 +0100
Subject: [PATCH 20/36] feat: refs #7882 Added distribution point

---
 src/pages/Zone/Card/ZoneBasicData.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 731e03ba7..2d65476ce 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -108,7 +108,20 @@ const agencyOptions = ref([]);
                     clearable
                 />
             </VnRow>
-
+            <VnRow>
+                <VnSelect
+                    :label="t('Distribution point')"
+                    v-model="data.addressFk"
+                    option-value="id"
+                    option-label="nickname"
+                    url="Addresses"
+                    :fields="['id', 'nickname']"
+                    sort-by="id"
+                    hide-selected
+                    map-options
+                    :rules="validate('data.addressFk')"
+                />
+            </VnRow>
             <VnRow>
                 <VnInput
                     v-model="data.inflation"
@@ -143,4 +156,5 @@ es:
     Inflation: Inflación
     Volumetric: Volumétrico
     Max length m³: Medida máxima tumbado
+    Distribution point: Punto de distribución
 </i18n>

From 96df567b1d218792c3fc9f5eac434368e1c692da Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 12 Dec 2024 08:53:31 +0100
Subject: [PATCH 21/36] fix: clean

---
 src/pages/Travel/TravelFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c8d57fbc3..1ac83b9e0 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -124,7 +124,6 @@ defineExpose({ states });
                     lazy-rules
                     is-outlined
                 />
-                {{ params }}
                 <VnInput
                     :label="t('travel.travelList.tableVisibleColumns.daysOnward')"
                     v-model="params.daysOnward"

From 2283e654020925b740981d505d6db883cda2f5df Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 12 Dec 2024 08:56:25 +0100
Subject: [PATCH 22/36] fix: clean

---
 src/pages/Item/ItemRequestFilter.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 8b7304279..8d8a1aa40 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -174,8 +174,6 @@ const exprBuilder = (param, value) => {
                     />
                 </QItemSection>
             </QItem>
-
-            {{ params }}
             <QItem>
                 <QItemSection>
                     <VnInput

From 842a3775f1de83062560a38454c7102be4669e86 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 12 Dec 2024 08:56:43 +0100
Subject: [PATCH 23/36] fix: clean

---
 src/pages/Item/ItemRequest.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 9bb573787..38ea6b6c2 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -287,7 +287,6 @@ const onDenyAccept = (_, responseData) => {
             </span>
         </template>
         <template #moreFilterPanel="{ params }">
-            {{ params }}
             <VnInputNumber
                 :label="t('params.scopeDays')"
                 v-model.number="params.daysOnward"

From 5b0e36fa4ed6ecb8f5bd2f31211e7a509d9e6daf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 12 Dec 2024 09:18:32 +0100
Subject: [PATCH 24/36] fix: change number

---
 src/pages/Item/ItemRequest.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 38ea6b6c2..ad6e5663e 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -22,7 +22,7 @@ const denyRequestIndex = ref(null);
 const itemRequestsOptions = ref([]);
 const userParams = {
     state: 'pending',
-    daysOnward: '7',
+    daysOnward: 7,
 };
 const tableRef = ref();
 onMounted(async () => {

From 6895780c09c0d2204ba3898b36b450208382dc3a Mon Sep 17 00:00:00 2001
From: Jtubau <jtubau@verdnatura.es>
Date: Thu, 12 Dec 2024 16:26:01 +0100
Subject: [PATCH 25/36] feat: refs #7072 added test to computed fn total

---
 .../components/common/VnDiscount.spec.js      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 test/vitest/__tests__/components/common/VnDiscount.spec.js

diff --git a/test/vitest/__tests__/components/common/VnDiscount.spec.js b/test/vitest/__tests__/components/common/VnDiscount.spec.js
new file mode 100644
index 000000000..5d5be61ac
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnDiscount.spec.js
@@ -0,0 +1,28 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnDiscount from 'components/common/vnDiscount.vue';
+
+describe('VnDiscount', () => {
+    let vm;
+    
+    beforeAll(() => {
+        vm = createWrapper(VnDiscount, {
+            props: {
+                data: {},
+                price: 100,
+                quantity: 2,
+                discount: 10,
+            }
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('total', () => {
+        it('should calculate total correctly', () => {            
+            expect(vm.total).toBe(180);
+        });
+    });
+});
\ No newline at end of file

From 696be32fa6c8c43e45294f358f345df61022732f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 06:54:40 +0100
Subject: [PATCH 26/36] feat: remove search after category

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

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 1dd569fb5..39627595d 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -65,7 +65,6 @@ const selectCategory = async (params, category, search) => {
     params.typeFk = null;
     params.categoryFk = category.id;
     await loadTypes(category?.id);
-    await search();
 };
 
 const loadTypes = async (id) => {

From bd15d2e73aef226c68e04d51d88098e72703af7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 06:56:22 +0100
Subject: [PATCH 27/36] feat: remove re-fetch when add element

---
 src/pages/Order/Card/OrderCatalog.vue         | 22 +++++++++----------
 .../Order/Card/OrderCatalogItemDialog.vue     | 15 ++++++++-----
 src/pages/Order/Card/OrderDescriptor.vue      | 11 +++++++---
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 453037f15..0b01c88ac 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -75,19 +75,17 @@ watch(
     },
     { immediate: true }
 );
-const onItemSaved = (updatedItem) => {
-    requestAnimationFrame(() => {
-        scrollToItem(updatedItem.items[0].itemFk);
-    });
-};
+// const onItemSaved = (updatedItem) => {
+//     console.error(stateStore);
+// };
 
-const scrollToItem = async (id) => {
-    const element = itemRefs.value[id]?.$el;
-    if (element) {
-        element.scrollIntoView({ behavior: 'smooth', block: 'center' });
-    }
-};
-provide('onItemSaved', onItemSaved);
+// const scrollToItem = async (id) => {
+//     const element = itemRefs.value[id]?.$el;
+//     if (element) {
+//         element.scrollIntoView({ behavior: 'smooth', block: 'center' });
+//     }
+// };
+// provide('onItemSaved', onItemSaved);
 </script>
 
 <template>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index b1cd8ed6b..d07fa7650 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -1,12 +1,12 @@
 <script setup>
 import toCurrency from 'src/filters/toCurrency';
-import { inject, ref } from 'vue';
+import { computed, inject, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useRoute } from 'vue-router';
 import useNotify from 'composables/useNotify';
-import { useArrayData } from 'composables/useArrayData';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import { useState } from 'src/composables/useState';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -18,9 +18,12 @@ const props = defineProps({
         required: true,
     },
 });
-const onItemSaved = inject('onItemSaved');
+const state = useState();
+
+const total = computed(() => state.get('orderTotal'));
+
+// const onItemSaved = inject('onItemSaved');
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
-const descriptorData = useArrayData('orderData');
 const isLoading = ref(false);
 const addToOrder = async () => {
     if (isLoading.value) return;
@@ -30,9 +33,9 @@ const addToOrder = async () => {
         items,
         orderFk: Number(route.params.id),
     });
+    state.set('orderTotal', total.value + 100);
     notify(t('globals.dataSaved'), 'positive');
-    await descriptorData.fetch({});
-    onItemSaved({ ...props, items, saved: true });
+    //  onItemSaved({ ...props, items, saved: true });
     emit('added', items);
     isLoading.value = false;
 };
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 138fcc40f..12b106847 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -63,21 +63,26 @@ const setData = (entity) => {
     if (!entity) return;
     getTotalRef.value && getTotalRef.value.fetch();
     data.value = useCardDescription(entity?.client?.name, entity?.id);
-    state.set('orderData', entity);
+    state.set('orderTotal', _total);
 };
 
 const getConfirmationValue = (isConfirmed) => {
     return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
 
-const total = ref(null);
+const total = computed(() => state.get('orderTotal') ?? 0);
+const _total = ref(0);
 </script>
 
 <template>
     <FetchData
         ref="getTotalRef"
         :url="`Orders/${entityId}/getTotal`"
-        @on-fetch="(response) => (total = response)"
+        @on-fetch="
+            (response) => {
+                _total = response;
+            }
+        "
     />
     <CardDescriptor
         ref="descriptor"

From b3170108e0018de0be4dfa8d926c6867051139a9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 10:50:32 +0100
Subject: [PATCH 28/36] feat: update quantity

---
 src/components/ui/CatalogItem.vue             | 44 +++++++++++--------
 .../Order/Card/OrderCatalogItemDialog.vue     | 26 ++++++++++-
 2 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 74a36ff2e..9670d9b68 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, toRef } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnLv from 'components/ui/VnLv.vue';
@@ -13,7 +13,7 @@ const DEFAULT_PRICE_KG = 0;
 
 const { t } = useI18n();
 
-defineProps({
+const props = defineProps({
     item: {
         type: Object,
         required: true,
@@ -25,57 +25,63 @@ defineProps({
 });
 
 const dialog = ref(null);
+const card = toRef(props, 'item');
 </script>
 
 <template>
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
-                <div v-if="item.hex && isCatalog" class="item-color-container">
+                <VnImg :id="card.id" class="image" zoom-resolution="1600x900" />
+                <div v-if="card.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
-                        :style="{ backgroundColor: `#${item.hex}` }"
+                        :style="{ backgroundColor: `#${card.hex}` }"
                     ></div>
                 </div>
             </div>
             <div class="content">
                 <span class="link">
-                    {{ item.name }}
-                    <ItemDescriptorProxy :id="item.id" />
+                    {{ card.name }}
+                    <ItemDescriptorProxy :id="card.id" />
                 </span>
-                <p class="subName">{{ item.subName }}</p>
+                <p class="subName">{{ card.subName }}</p>
                 <template v-for="index in 4" :key="`tag-${index}`">
                     <VnLv
-                        v-if="item?.[`tag${index + 4}`]"
-                        :label="item?.[`tag${index + 4}`] + ':'"
-                        :value="item?.[`value${index + 4}`]"
+                        v-if="card?.[`tag${index + 4}`]"
+                        :label="card?.[`tag${index + 4}`] + ':'"
+                        :value="card?.[`value${index + 4}`]"
                     />
                 </template>
-                <div v-if="item.minQuantity" class="min-quantity">
+                <div v-if="card.minQuantity" class="min-quantity">
                     <QIcon name="production_quantity_limits" size="xs" />
-                    {{ item.minQuantity }}
+                    {{ card.minQuantity }}
                 </div>
                 <div class="footer">
                     <div class="price">
                         <p v-if="isCatalog">
-                            {{ item.available }} {{ t('to') }}
-                            {{ toCurrency(item.price) }}
+                            {{ card.available }} {{ t('to') }}
+                            {{ toCurrency(card.price) }}
                         </p>
                         <slot name="price" />
                         <QIcon v-if="isCatalog" name="add_circle" class="icon">
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
-                                    :item="item"
-                                    @added="() => dialog.hide()"
+                                    :item="card"
+                                    @added="
+                                        (quantityAdded) => {
+                                            card.available += quantityAdded;
+                                            dialog.hide();
+                                        }
+                                    "
                                 />
                             </QPopupProxy>
                         </QIcon>
                     </div>
-                    <p v-if="item.priceKg" class="price-kg">
+                    <p v-if="card.priceKg" class="price-kg">
                         {{ t('price-kg') }}
-                        {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
+                        {{ toCurrency(card.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index d07fa7650..7b07582f0 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -25,6 +25,25 @@ const total = computed(() => state.get('orderTotal'));
 // const onItemSaved = inject('onItemSaved');
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const isLoading = ref(false);
+const calculateTotals = (items) => {
+    return items.reduce(
+        (acc, item) => {
+            acc.totalQuantity += item.quantity;
+            acc.totalSum += item.quantity * item.price;
+            return acc;
+        },
+        { totalQuantity: 0, totalSum: 0 }
+    );
+};
+
+// const totalSum = (items) =>
+//     items.reduce((acc, item) => {
+//         return acc + item.quantity * item.price;
+//     }, 0);
+// const totalQuantity = (items) =>
+//     items.reduce((acc, item) => {
+//         return acc + item.quantity;
+//     }, 0);
 const addToOrder = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
@@ -33,10 +52,13 @@ const addToOrder = async () => {
         items,
         orderFk: Number(route.params.id),
     });
-    state.set('orderTotal', total.value + 100);
+
+    const { totalQuantity, totalSum } = calculateTotals(items);
+
+    state.set('orderTotal', total.value + totalSum);
     notify(t('globals.dataSaved'), 'positive');
     //  onItemSaved({ ...props, items, saved: true });
-    emit('added', items);
+    emit('added', -totalQuantity);
     isLoading.value = false;
 };
 const canAddToOrder = () => {

From d0e6c2c5674bef9a69e7d1f95f2c30527387255e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Dec 2024 11:45:56 +0100
Subject: [PATCH 29/36] feat: hide menus

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 9 ++++++++-
 src/router/modules/monitor.js               | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index e5fea3003..46201f87d 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -16,6 +16,7 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import MonitorTicketSearchbar from './MonitorTicketSearchbar.vue';
 import MonitorTicketFilter from './MonitorTicketFilter.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; // 2min in ms
 const { t } = useI18n();
@@ -24,6 +25,7 @@ const tableRef = ref(null);
 const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
+const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
 
 const [from, to] = dateRange(Date.vnNew());
@@ -34,6 +36,11 @@ const stateColors = {
     alert: 'negative',
 };
 
+onMounted(() => {
+    stateStore.leftDrawer = false;
+    stateStore.rightDrawer = false;
+});
+
 function exprBuilder(param, value) {
     switch (param) {
         case 'stateFk':
diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js
index 7342a5904..2af60c09c 100644
--- a/src/router/modules/monitor.js
+++ b/src/router/modules/monitor.js
@@ -20,6 +20,7 @@ export default {
             path: '',
             name: 'MonitorMain',
             component: () => import('src/components/common/VnSectionMain.vue'),
+            props: (route) => ({ leftDrawer: route.name === 'MonitorClientsActions' }),
             redirect: { name: 'MonitorTickets' },
             children: [
                 {

From b18de7df4e337b322b9f75a416a0bce9b40e07ac Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 12:17:54 +0100
Subject: [PATCH 30/36] perf: #6896  REMOVE COMMENTS

---
 src/pages/Order/Card/OrderCatalog.vue           | 11 -----------
 src/pages/Order/Card/OrderCatalogItemDialog.vue | 10 ----------
 src/pages/Order/Card/OrderDescriptor.vue        | 10 +++++-----
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 0b01c88ac..b7af615bb 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -75,17 +75,6 @@ watch(
     },
     { immediate: true }
 );
-// const onItemSaved = (updatedItem) => {
-//     console.error(stateStore);
-// };
-
-// const scrollToItem = async (id) => {
-//     const element = itemRefs.value[id]?.$el;
-//     if (element) {
-//         element.scrollIntoView({ behavior: 'smooth', block: 'center' });
-//     }
-// };
-// provide('onItemSaved', onItemSaved);
 </script>
 
 <template>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 7b07582f0..39b0b0120 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -22,7 +22,6 @@ const state = useState();
 
 const total = computed(() => state.get('orderTotal'));
 
-// const onItemSaved = inject('onItemSaved');
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const isLoading = ref(false);
 const calculateTotals = (items) => {
@@ -36,14 +35,6 @@ const calculateTotals = (items) => {
     );
 };
 
-// const totalSum = (items) =>
-//     items.reduce((acc, item) => {
-//         return acc + item.quantity * item.price;
-//     }, 0);
-// const totalQuantity = (items) =>
-//     items.reduce((acc, item) => {
-//         return acc + item.quantity;
-//     }, 0);
 const addToOrder = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
@@ -57,7 +48,6 @@ const addToOrder = async () => {
 
     state.set('orderTotal', total.value + totalSum);
     notify(t('globals.dataSaved'), 'positive');
-    //  onItemSaved({ ...props, items, saved: true });
     emit('added', -totalQuantity);
     isLoading.value = false;
 };
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 12b106847..e0c613aed 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -63,15 +63,15 @@ const setData = (entity) => {
     if (!entity) return;
     getTotalRef.value && getTotalRef.value.fetch();
     data.value = useCardDescription(entity?.client?.name, entity?.id);
-    state.set('orderTotal', _total);
+    state.set('orderTotal', total);
 };
 
 const getConfirmationValue = (isConfirmed) => {
     return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
 
-const total = computed(() => state.get('orderTotal') ?? 0);
-const _total = ref(0);
+const orderTotal = computed(() => state.get('orderTotal') ?? 0);
+const total = ref(0);
 </script>
 
 <template>
@@ -80,7 +80,7 @@ const _total = ref(0);
         :url="`Orders/${entityId}/getTotal`"
         @on-fetch="
             (response) => {
-                _total = response;
+                total = response;
             }
         "
     />
@@ -117,7 +117,7 @@ const _total = ref(0);
                 :label="t('order.summary.items')"
                 :value="(entity?.rows?.length || DEFAULT_ITEMS).toString()"
             />
-            <VnLv :label="t('order.summary.total')" :value="toCurrency(total)" />
+            <VnLv :label="t('order.summary.total')" :value="toCurrency(orderTotal)" />
         </template>
         <template #actions="{ entity }">
             <QCardActions>

From 5caf82fad7adabebcd32d47729f948294ef90997 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Dec 2024 13:32:40 +0100
Subject: [PATCH 31/36] fix: get total from api

---
 .../Order/Card/OrderCatalogItemDialog.vue     | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 39b0b0120..0d55b7de1 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,21 +20,15 @@ const props = defineProps({
 });
 const state = useState();
 
-const total = computed(() => state.get('orderTotal'));
+const orderData = computed(() => state.get('orderData'));
 
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const isLoading = ref(false);
-const calculateTotals = (items) => {
-    return items.reduce(
-        (acc, item) => {
-            acc.totalQuantity += item.quantity;
-            acc.totalSum += item.quantity * item.price;
-            return acc;
-        },
-        { totalQuantity: 0, totalSum: 0 }
-    );
-};
 
+const totalQuantity = (items) =>
+    items.reduce((acc, item) => {
+        return acc + item.quantity;
+    }, 0);
 const addToOrder = async () => {
     if (isLoading.value) return;
     isLoading.value = true;
@@ -44,11 +38,18 @@ const addToOrder = async () => {
         orderFk: Number(route.params.id),
     });
 
-    const { totalQuantity, totalSum } = calculateTotals(items);
+    const { data: orderTotal } = await axios.get(
+        `Orders/${Number(route.params.id)}/getTotal`
+    );
 
-    state.set('orderTotal', total.value + totalSum);
+    state.set('orderTotal', orderTotal);
+    const rows = orderData.value.rows.push(...items) || [];
+    state.set('orderData', {
+        ...orderData.value,
+        rows,
+    });
     notify(t('globals.dataSaved'), 'positive');
-    emit('added', -totalQuantity);
+    emit('added', -totalQuantity(items));
     isLoading.value = false;
 };
 const canAddToOrder = () => {

From ab99f667587068e3e9affb2c6fba22481329ece3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 16 Dec 2024 11:29:03 +0100
Subject: [PATCH 32/36] refactor: use VnSelectWorker

---
 src/pages/Claim/Card/ClaimDevelopment.vue | 27 +++++++++++++++--------
 src/pages/Claim/Card/ClaimSummary.vue     |  4 ++--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 61d9f5858..e288d8614 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -6,6 +6,7 @@ import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import { tMobile } from 'composables/tMobile';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const route = useRoute();
 
@@ -157,19 +158,14 @@ const columns = computed(() => [
                         auto-width
                         @keyup.ctrl.enter.stop="claimDevelopmentForm.saveChanges()"
                     >
-                        <VnSelect
+                        <VnSelectWorker
+                            v-if="col.name == 'worker'"
                             v-model="row[col.model]"
-                            :url="col.url"
-                            :where="col.where"
-                            :sort-by="col.sortBy"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
                             :autofocus="col.tabIndex == 1"
                             input-debounce="0"
                             hide-selected
                         >
-                            <template #option="scope" v-if="col.name == 'worker'">
+                            <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
                                     <QItemSection>
                                         <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
@@ -180,7 +176,20 @@ const columns = computed(() => [
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelect>
+                        </VnSelectWorker>
+                        <VnSelect
+                            v-else
+                            v-model="row[col.model]"
+                            :url="col.url"
+                            :where="col.where"
+                            :sort-by="col.sortBy"
+                            :options="col.options"
+                            :option-value="col.optionValue"
+                            :option-label="col.optionLabel"
+                            :autofocus="col.tabIndex == 1"
+                            input-debounce="0"
+                            hide-selected
+                        />
                     </QTd>
                 </template>
                 <template #item="props">
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index edfa52b4b..200ab4bea 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -120,13 +120,13 @@ const developmentColumns = ref([
     {
         name: 'claimReason',
         label: 'claim.reason',
-        field: (row) => row.claimReason.description,
+        field: (row) => row.claimReason?.description,
         sortable: true,
     },
     {
         name: 'claimResult',
         label: 'claim.result',
-        field: (row) => row.claimResult.description,
+        field: (row) => row.claimResult?.description,
         sortable: true,
     },
     {

From a3ea359b019ee999f725f8b70092e54f93fcee73 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Dec 2024 07:02:44 +0100
Subject: [PATCH 33/36] fix: remove useless try catch

---
 .../Zone/Card/ZoneDescriptorMenuItems.vue     | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index 22d5bcd5e..3c45700cb 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
@@ -16,24 +16,14 @@ const actions = {
     clone: async () => {
         const opts = { message: t('Zone cloned'), type: 'positive' };
 
-        try {
-            const { data } = await axios.post(`Zones/${zoneId}/clone`, {});
-            notify(opts);
-            push(`/zone/${data.id}/basic-data`);
-        } catch (e) {
-            opts.message = t('It was not able to clone the zone');
-            opts.type = 'negative';
-        }
+        const { data } = await axios.post(`Zones/${zoneId}/clone`, {});
+        notify(opts);
+        push(`/zone/${data.id}/basic-data`);
     },
     remove: async () => {
-        try {
-            await axios.post(`Zones/${zoneId}/deleteZone`);
-
-            notify({ message: t('Zone deleted'), type: 'positive' });
-            push({ name: 'ZoneList' });
-        } catch (e) {
-            notify({ message: e.message, type: 'negative' });
-        }
+        await axios.post(`Zones/${zoneId}/deleteZone`);
+        notify({ message: t('Zone deleted'), type: 'positive' });
+        push({ name: 'ZoneList' });
     },
 };
 function openConfirmDialog(callback) {

From 4dff5a2eec020ca99ca3d37aef2dc38cccd542a0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 17 Dec 2024 09:03:09 +0100
Subject: [PATCH 34/36] refactor: use teleport to avoid qdrawer overlapping

---
 src/pages/Order/Card/OrderCatalog.vue         | 20 +++++++++----------
 src/pages/Order/Card/OrderLines.vue           |  4 ++--
 .../Supplier/Card/SupplierConsumption.vue     |  8 +++-----
 src/pages/Ticket/Card/TicketBoxing.vue        |  7 ++++---
 src/pages/Ticket/Card/TicketComponents.vue    |  4 ++--
 src/pages/Ticket/Card/TicketSale.vue          |  6 +++---
 src/pages/Ticket/Card/TicketVolume.vue        | 11 ++++------
 src/pages/Zone/Card/ZoneEvents.vue            | 18 ++++++++---------
 8 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b7af615bb..4ad009133 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, ref, computed, watch, provide } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -87,16 +87,14 @@ watch(
         :label="t('Search items')"
         :info="t('You can search items by name or id')"
     />
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <OrderCatalogFilter
-                :data-key="dataKey"
-                :tag-value="tagValue"
-                :tags="tags"
-                :initial-catalog-params="catalogParams"
-            />
-        </QScrollArea>
-    </QDrawer>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+        <OrderCatalogFilter
+            :data-key="dataKey"
+            :tag-value="tagValue"
+            :tags="tags"
+            :initial-catalog-params="catalogParams"
+        />
+    </Teleport>
     <QPage class="column items-center q-pa-md" data-cy="orderCatalogPage">
         <div class="full-width">
             <VnPaginate
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index cb6649155..e5b683534 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -251,7 +251,7 @@ watch(
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QCard
             class="order-lines-summary q-pa-lg"
             v-if="orderSummary.vat && orderSummary.total"
@@ -266,7 +266,7 @@ watch(
             <VnLv :label="t('VAT') + ': '" :value="toCurrency(orderSummary?.vat)" />
             <VnLv :label="t('total') + ': '" :value="toCurrency(orderSummary?.total)" />
         </QCard>
-    </QDrawer>
+    </Teleport>
 
     <VnTable
         ref="tableLinesRef"
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index fe1cec260..e89507290 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -171,11 +171,9 @@ onMounted(async () => {
         </div>
     </Teleport>
     <QPage class="column items-center q-pa-md">
-        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-            <QScrollArea class="fit text-grey-8">
-                <SupplierConsumptionFilter data-key="SupplierConsumption" />
-            </QScrollArea>
-        </QDrawer>
+        <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+            <SupplierConsumptionFilter data-key="SupplierConsumption" />
+        </Teleport>
         <QTable
             :rows="rows"
             row-key="id"
diff --git a/src/pages/Ticket/Card/TicketBoxing.vue b/src/pages/Ticket/Card/TicketBoxing.vue
index 1a7287396..7c127efda 100644
--- a/src/pages/Ticket/Card/TicketBoxing.vue
+++ b/src/pages/Ticket/Card/TicketBoxing.vue
@@ -1,6 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { date, useQuasar } from 'quasar';
+import { useStateStore } from 'src/stores/useStateStore';
 import { computed, onMounted, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -8,7 +9,7 @@ import { useRouter } from 'vue-router';
 const router = useRouter();
 const { t } = useI18n();
 const quasar = useQuasar();
-
+const stateStore = useStateStore();
 onMounted(async () => {
     await fetch();
 });
@@ -84,7 +85,7 @@ async function getVideoList(expeditionId, timed) {
 </script>
 
 <template>
-    <QDrawer show-if-above side="right">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QScrollArea class="fit">
             <QList bordered separator style="max-width: 318px">
                 <QItem v-if="lastExpedition && videoList.length">
@@ -150,7 +151,7 @@ async function getVideoList(expeditionId, timed) {
                 </QItem>
             </QList>
         </QScrollArea>
-    </QDrawer>
+    </Teleport>
 
     <QCard>
         <QCarousel animated v-model="slide" height="max-content">
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 8fab1968b..64815752a 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -178,7 +178,7 @@ onMounted(() => {
         @on-fetch="(data) => (components = data)"
         auto-load
     />
-    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
@@ -264,7 +264,7 @@ onMounted(() => {
                 <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
             </QCardSection>
         </QCard>
-    </QDrawer>
+    </Teleport>
     <VnTable
         ref="tableRef"
         data-key="TicketComponents"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index a7e0f6171..703a00a0e 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -617,7 +617,7 @@ watch(
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <div
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             style="border: 2px solid black"
@@ -638,8 +638,8 @@ watch(
                 <span class="q-mr-xs color-vn-label"> {{ t('basicData.total') }}: </span>
                 <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
             </QCardSection>
-        </div></QDrawer
-    >
+        </div>
+    </Teleport>
     <VnTable
         ref="tableRef"
         data-key="TicketSales"
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 20eced98e..3c9f579d4 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -100,11 +100,9 @@ onMounted(() => (stateStore.rightDrawer = true));
         @on-fetch="(data) => applyVolumes(data)"
         auto-load
     />
-    <QDrawer
-        v-if="packingTypeVolume.length"
-        side="right"
-        :width="265"
-        v-model="stateStore.rightDrawer"
+    <Teleport
+        to="#right-panel"
+        v-if="stateStore.isHeaderMounted() && packingTypeVolume.length"
     >
         <QCard
             v-for="(packingType, index) in packingTypeVolume"
@@ -124,8 +122,7 @@ onMounted(() => (stateStore.rightDrawer = true));
                 <span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
             </QCardSection>
         </QCard>
-    </QDrawer>
-
+    </Teleport>
     <VnTable
         ref="tableRef"
         data-key="TicketVolume"
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 0685c264f..a5806bab9 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -43,16 +43,14 @@ const onZoneEventFormClose = () => {
 </script>
 
 <template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <ZoneEventsPanel
-                :first-day="firstDay"
-                :last-day="lastDay"
-                :events="events"
-                v-model:formModeName="formModeName"
-            />
-        </QScrollArea>
-    </QDrawer>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+        <ZoneEventsPanel
+            :first-day="firstDay"
+            :last-day="lastDay"
+            :events="events"
+            v-model:formModeName="formModeName"
+        />
+    </Teleport>
     <QPage class="q-pa-md flex justify-center">
         <ZoneCalendarGrid
             v-model:events="events"

From 2d9d58f79c500294e90797ee1dc58be0277ef9a4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Dec 2024 12:45:02 +0100
Subject: [PATCH 35/36] fix: monitorPayMethodFilter

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 25 ++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 05aee1607..225038e76 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -26,6 +26,7 @@ const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const DepartmentOpts = ref([]);
+const PayMethodOpts = ref([]);
 const ItemPackingTypeOpts = ref([]);
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
@@ -223,7 +224,16 @@ const columns = computed(() => [
         label: t('salesTicketsTable.payMethod'),
         name: 'payMethod',
         align: 'left',
-        columnFilter: false,
+        columnFilter: {
+            component: 'select',
+            url: 'PayMethods',
+            attrs: {
+                options: PayMethodOpts.value,
+                optionValue: 'id',
+                optionLabel: 'name',
+                dense: true,
+            },
+        },
     },
     {
         label: t('salesTicketsTable.total'),
@@ -247,7 +257,7 @@ const columns = computed(() => [
             url: 'Departments',
             attrs: {
                 options: DepartmentOpts.value,
-                optionValue: 'name',
+                optionValue: 'id',
                 optionLabel: 'name',
                 dense: true,
             },
@@ -364,6 +374,15 @@ const openTab = (id) =>
         auto-load
         @on-fetch="(data) => (DepartmentOpts = data)"
     />
+    <FetchData
+        url="PayMethods"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (PayMethodOpts = data)"
+    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>
@@ -383,7 +402,7 @@ const openTab = (id) =>
         auto-load
         :row-click="({ id }) => openTab(id)"
         :disable-option="{ card: true }"
-        :user-params="{ from, to, scopeDays: 0, packing }"
+        :user-params="{ from, to, scopeDays: 0 }"
     >
         <template #top-left>
             <QBtn

From 3da7425f6f90ed751d994ec6cefe67b0cf02e9d2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Dec 2024 12:59:27 +0100
Subject: [PATCH 36/36] fix: remove url

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 225038e76..ef03ec20d 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -254,11 +254,8 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
-            url: 'Departments',
             attrs: {
                 options: DepartmentOpts.value,
-                optionValue: 'id',
-                optionLabel: 'name',
                 dense: true,
             },
         },