From 2ca7c44caede88852d8fd5ff5aed3e4ea4d6661d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 21 Jun 2024 14:30:39 +0200
Subject: [PATCH 001/162] feat(AccountConnections): use VnToken

---
 src/pages/Account/AccountConnections.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 98208e5f2..4d16d1ecd 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -29,15 +29,15 @@ const filter = {
     order: 'created DESC',
 };
 
-const urlPath = 'AccessTokens';
+const urlPath = 'VnTokens';
 
 const refresh = () => paginateRef.value.fetch();
 
 const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
 
-const killSession = async (id) => {
+const killSession = async ({ userId, created }) => {
     try {
-        await axios.delete(`${urlPath}/${id}`);
+        await axios.post(`${urlPath}/killSession`, { userId, created });
         paginateRef.value.fetch();
         notify(t('Session killed'), 'positive');
     } catch (error) {
@@ -86,7 +86,7 @@ const killSession = async (id) => {
                                     openConfirmationModal(
                                         t('Session will be killed'),
                                         t('Are you sure you want to continue?'),
-                                        () => killSession(row.id)
+                                        () => killSession(row)
                                     )
                                 "
                                 outline

From b59f8374b3a441e6acff990ee63075e75d2ee0dc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 17:28:45 +0200
Subject: [PATCH 002/162] perf: hide icon for VnInputDate

---
 src/components/common/VnInputDate.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 184f8a158..b22de3606 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -9,6 +9,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
@@ -107,7 +111,7 @@ watch(
                         isPopupOpen = false;
                     "
                 />
-                <QIcon name="event" class="cursor-pointer" />
+                <QIcon v-if="showEvent" name="event" class="cursor-pointer" />
             </template>
             <QMenu
                 transition-show="scale"

From b3ea05fb32900740d226e791a6e8223daeddf66b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 17:31:08 +0200
Subject: [PATCH 003/162] feat: dense rows

---
 src/pages/Item/ItemFixedPrice.vue | 73 ++++++++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 12 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 2ecd1f21b..ea1d92e7b 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -108,8 +108,10 @@ const defaultColumnAttrs = {
     sortable: true,
 };
 
-const columns = computed(() => [
+const columns = ref([
     {
+        sortable: true,
+        align: 'left',
         label: t('item.fixedPrice.itemId'),
         name: 'itemId',
         field: 'itemFk',
@@ -380,6 +382,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
+            dense
             :rows="fixedPrices"
             :columns="columns"
             row-key="id"
@@ -408,10 +411,33 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QTd>
                 </QTr>
             </template>
-
+            <template #header="props">
+                <QTr :props="props" class="bg">
+                    <QTh />
+                    <QTh
+                        v-for="col in props.cols"
+                        :key="col.name"
+                        :props="props"
+                        style="text-wrap: balance"
+                    >
+                        {{ col.label }}
+                    </QTh>
+                </QTr>
+            </template>
+            <template #body-selection="scope">
+                <QCheckbox
+                    flat
+                    style="width: 10px; margin-left: -20px"
+                    v-model="scope.selected"
+                />
+            </template>
+            <template #header-selection="scope">
+                <QCheckbox style="margin-left: -15px" v-model="scope.selected" />
+            </template>
             <template #body-cell-itemId="props">
                 <QTd>
                     <VnSelect
+                        style="width: 115px"
                         url="Items/withName"
                         hide-selected
                         option-label="id"
@@ -436,12 +462,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ row.name }}
                     </span>
                     <ItemDescriptorProxy :id="row.itemFk" />
-                    <FetchedTags :item="row" :max-length="6" />
+                    <FetchedTags style="width: 200px" :item="row" :max-length="6" />
                 </QTd>
             </template>
             <template #body-cell-groupingPrice="props">
                 <QTd class="col">
                     <VnInput
+                        style="width: 80px"
+                        mask="###.##"
                         v-model.number="props.row.rate2"
                         v-on="getRowUpdateInputEvents(props)"
                     >
@@ -452,6 +480,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #body-cell-packingPrice="props">
                 <QTd class="col">
                     <VnInput
+                        mask="###.##"
+                        style="width: 80px"
                         v-model.number="props.row.rate3"
                         v-on="getRowUpdateInputEvents(props)"
                     >
@@ -463,7 +493,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QTd class="col">
                     <div class="row">
                         <QCheckbox
-                            class="col"
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
                             :false-value="0"
@@ -471,8 +500,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             :toggle-indeterminate="false"
                         />
                         <VnInput
+                            style="padding-left: -20px; width: 80px"
                             class="col"
-                            :disable="!props.row.hasMinPrice"
+                            :disable="props.row.hasMinPrice === 'false'"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
                             type="number"
@@ -481,33 +511,43 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
             <template #body-cell-started="props">
-                <QTd class="col" style="min-width: 160px">
+                <QTd class="col">
                     <VnInputDate
+                        style="max-width: 125px"
+                        :show-event="false"
                         v-model="props.row.started"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
                         v-bind="
                             isBigger(props.row.started)
-                                ? { 'bg-color': 'warning', 'is-outlined': true }
+                                ? {
+                                      'bg-color': 'warning',
+                                      'is-outlined': true,
+                                  }
                                 : {}
                         "
                     />
                 </QTd>
             </template>
             <template #body-cell-ended="props">
-                <QTd class="col" style="min-width: 150px">
+                <QTd class="col">
                     <VnInputDate
+                        style="max-width: 125px"
+                        :show-event="false"
                         v-model="props.row.ended"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
                         v-bind="
-                            isLower(props.row.ended)
-                                ? { 'bg-color': 'warning', 'is-outlined': true }
+                            isLower(props.row.started)
+                                ? {
+                                      'bg-color': 'warning',
+                                      'is-outlined': true,
+                                  }
                                 : {}
                         "
                     />
                 </QTd>
             </template>
             <template #body-cell-warehouse="props">
-                <QTd class="col">
+                <QTd class="col" style="max-width: 180px">
                     <VnSelect
                         :options="warehousesOptions"
                         hide-selected
@@ -571,7 +611,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QDialog>
     </QPage>
 </template>
-
+<style lang="scss" scoped>
+.q-table th,
+.q-table td {
+    padding-inline: 5px !important;
+}
+.q-field__after,
+.q-field__append {
+    padding: 0;
+}
+</style>
 <i18n>
 es:
     Add fixed price: Añadir precio fijado

From b781940c77aa9d6d85d60cd2ba1c276eb6a3ffed Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 17:31:40 +0200
Subject: [PATCH 004/162] feat: handle qCheckbox 3rd state

---
 src/pages/Item/ItemFixedPrice.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index ea1d92e7b..997db0fbe 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -65,6 +65,10 @@ const fetchFixedPrices = async () => {
 };
 
 const onFixedPricesFetched = (data) => {
+    data.forEach((item) => {
+        console.log(item.hasMinPrice);
+        item.hasMinPrice = `${item.hasMinPrice !== 0}`;
+    });
     fixedPrices.value = data;
     // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
     fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
@@ -495,8 +499,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
-                            :false-value="0"
-                            :true-value="1"
+                            :true-value="'true'"
+                            :false-value="'false'"
                             :toggle-indeterminate="false"
                         />
                         <VnInput

From 1c88bf25569d297479f475e4b1c4924f7cac5e8d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 17:32:11 +0200
Subject: [PATCH 005/162] feat: only filter by isDestiny

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

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 997db0fbe..7fa698094 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -372,7 +372,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 <template>
     <FetchData
         url="Warehouses"
-        :filter="{ order: ['name'] }"
+        :filter="{ where: { isDestiny: true }, order: ['name'] }"
         auto-load
         @on-fetch="(data) => onWarehousesFetched(data)"
     />

From 72a6056f3d34f2c280adbc782db5d8491ece99e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 17:32:36 +0200
Subject: [PATCH 006/162] perf: change slots order

---
 src/components/common/VnInput.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 33b97e29d..3790a63c2 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -88,7 +88,6 @@ const inputRules = [
                 <slot name="prepend" />
             </template>
             <template #append>
-                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
@@ -100,6 +99,7 @@ const inputRules = [
                         }
                     "
                 ></QIcon>
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
                         {{ info }}
@@ -115,3 +115,8 @@ const inputRules = [
     es:
         inputMin: Debe ser mayor a {value}
 </i18n>
+<style lang="scss">
+.q-field__append {
+    padding-inline: 0;
+}
+</style>

From 3a73c6b908ac9c9239fec307f47bf6b083434990 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 17:42:06 +0200
Subject: [PATCH 007/162] test: fix e2e

---
 test/cypress/integration/entry/myEntry.spec.js                 | 2 +-
 test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js | 1 +
 test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js | 1 +
 test/cypress/integration/ticket/ticketDescriptor.spec.js       | 1 +
 test/cypress/integration/wagonType/wagonTypeCreate.spec.js     | 1 +
 test/cypress/support/commands.js                               | 2 +-
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index 14c09176e..78bc31f56 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,7 +1,7 @@
 describe('WagonTypeCreate', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
-        cy.login('customer');
+        cy.login('supplier');
         cy.visit(`/#/entry/my`, {
             onBeforeLoad(win) {
                 cy.stub(win, 'open');
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index 7863d6bfa..f553c1e74 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -9,6 +9,7 @@ describe('InvoiceInCorrective', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit(`/#/invoice-in/1/summary?limit=10`);
+        cy.waitForElement('.q-page', 6000);
 
         cy.openActionsDescriptor();
 
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index a2e9998bb..46927bfb1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -7,6 +7,7 @@ describe('InvoiceInDescriptor', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('/#/invoice-in/1/summary');
+        cy.waitForElement('.q-page', 6000);
 
         cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index fc920f346..138001ad2 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -9,6 +9,7 @@ describe('Ticket descriptor', () => {
 
         cy.login('developer');
         cy.visit(`/#/ticket/${ticketId}/summary`);
+        cy.waitForElement('.q-page', 7000);
     });
 
     it('should clone the ticket without warehouse', () => {
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index bcf7fe841..5e8b6b888 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -3,6 +3,7 @@ describe('WagonTypeCreate', () => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit('/#/wagon/type/create');
+        cy.waitForElement('.q-page', 6000);
     });
 
     function chooseColor(color) {
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 4ed940ecd..3be4a9f0c 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -239,5 +239,5 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 });
 
 Cypress.Commands.add('openActionsDescriptor', () => {
-    cy.get('.descriptor > .header > .q-btn').click();
+    cy.get('.descriptor > .header > :nth-child(3) > .q-btn__content > .q-icon').click();
 });

From 5d6cdd4e2ebe5f838b4f7059c486b772f7380a6d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 17:42:28 +0200
Subject: [PATCH 008/162] feat: imrpove VnInputTime to set cursor at start

---
 src/components/common/VnInputTime.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 9344ff869..e2c6ffb56 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -2,6 +2,7 @@
 import { watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
+import { nextTick } from 'vue';
 
 const model = defineModel({ type: String });
 const props = defineProps({
@@ -55,17 +56,24 @@ const formattedTime = computed({
 function dateToTime(newDate) {
     return date.formatDate(new Date(newDate), dateFormat);
 }
-
+const timeField = ref();
 watch(
     () => model.value,
     (val) => (formattedTime.value = val),
     { immediate: true }
 );
+const focusField = () => {
+    nextTick(() => {
+        const input = timeField.value.$el.querySelector('input');
+        input.setSelectionRange(0, 0);
+    });
+};
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="timeField"
             class="vn-input-time"
             mask="##:##"
             placeholder="--:--"
@@ -74,6 +82,7 @@ watch(
             :class="{ required: $attrs.required }"
             style="min-width: 100px"
             :rules="$attrs.required ? [requiredFieldRule] : null"
+            @focus="focusField"
         >
             <template #append>
                 <QIcon

From ff80a768d7e7642fc4106c54fc208815e6f4f513 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 18:23:45 +0200
Subject: [PATCH 009/162] feat: try to fix ItemFixedFilterPanel

---
 src/pages/Item/ItemFixedPriceFilter.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 6c847ece8..6fec09f37 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -19,8 +19,17 @@ defineProps({
         default: () => [],
     },
 });
+import { useRoute } from 'vue-router';
+const route = useRoute();
 
 const itemTypeWorkersOptions = ref([]);
+const sanitizeParam = (param) => {
+    return JSON.parse(route.query.params)[param] ? 'true' : 'false';
+};
+const $params = ref({});
+onMounted(() => {
+    ['mine', 'hasMinPrice'].forEach((tag) => ($params.value[tag] = sanitizeParam(tag)));
+});
 </script>
 
 <template>
@@ -33,6 +42,7 @@ const itemTypeWorkersOptions = ref([]);
     />
     <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
+            {{ JSON.parse(route.query.params).mine }}
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
@@ -89,15 +99,19 @@ const itemTypeWorkersOptions = ref([]);
                 <QItemSection>
                     <QCheckbox
                         :label="t('components.itemsFilterPanel.mine')"
-                        v-model="params.mine"
-                        toggle-indeterminate
+                        v-model="$params.mine"
+                        :true-value="'true'"
+                        :false-value="'false'"
+                        toggle-indeterminate="true"
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection>
                     <QCheckbox
                         :label="t('components.itemsFilterPanel.hasMinPrice')"
-                        v-model="params.hasMinPrice"
+                        v-model="$params.hasMinPrice"
+                        :true-value="'true'"
+                        :false-value="'false'"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     />

From 3a7050d6c4b2db7abfb5366a10739eb637a5fb23 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 22:57:24 +0200
Subject: [PATCH 010/162] feat: solve ItemFixedFilterPanel

---
 src/components/ui/VnFilterPanel.vue     |  1 +
 src/pages/Item/ItemFixedPriceFilter.vue | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 2ea51ed8b..70e36e1db 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -110,6 +110,7 @@ async function search(evt) {
 
     store.filter.where = {};
     isLoading.value = true;
+    if (evt?.param) Object.assign(userParams.value, evt.param);
     const filter = { ...userParams.value };
     store.userParamsChanged = true;
     arrayData.reset(['skip', 'filter.skip', 'page']);
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 6fec09f37..4dd4d3b0a 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -24,12 +24,16 @@ const route = useRoute();
 
 const itemTypeWorkersOptions = ref([]);
 const sanitizeParam = (param) => {
-    return JSON.parse(route.query.params)[param] ? 'true' : 'false';
+    const params = JSON.parse(route.query.params);
+    return params[param] ?? 'false';
 };
 const $params = ref({});
 onMounted(() => {
     ['mine', 'hasMinPrice'].forEach((tag) => ($params.value[tag] = sanitizeParam(tag)));
 });
+const pushParam = (param) => ({
+    param: { [param]: $params.value[param] },
+});
 </script>
 
 <template>
@@ -42,6 +46,7 @@ onMounted(() => {
     />
     <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
+            {{ $params }}
             {{ JSON.parse(route.query.params).mine }}
             <QItem class="q-my-md">
                 <QItemSection>
@@ -102,8 +107,7 @@ onMounted(() => {
                         v-model="$params.mine"
                         :true-value="'true'"
                         :false-value="'false'"
-                        toggle-indeterminate="true"
-                        @update:model-value="searchFn()"
+                        @update:model-value="searchFn(pushParam('mine'))"
                     />
                 </QItemSection>
                 <QItemSection>
@@ -112,8 +116,7 @@ onMounted(() => {
                         v-model="$params.hasMinPrice"
                         :true-value="'true'"
                         :false-value="'false'"
-                        toggle-indeterminate
-                        @update:model-value="searchFn()"
+                        @update:model-value="searchFn(pushParam('hasMinPrice'))"
                     />
                 </QItemSection>
             </QItem>

From 32d11edb2f1ff86c5872e4fcb5d27f36d77266e4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 14:34:38 +0200
Subject: [PATCH 011/162] updates

---
 src/pages/Item/ItemFixedPriceFilter.vue  | 5 ++---
 src/pages/Order/Card/OrderDescriptor.vue | 2 +-
 src/pages/Order/OrderLines.vue           | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 4dd4d3b0a..6c35e5cec 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -24,7 +24,8 @@ const route = useRoute();
 
 const itemTypeWorkersOptions = ref([]);
 const sanitizeParam = (param) => {
-    const params = JSON.parse(route.query.params);
+    if (!route?.query?.params) return 'false';
+    const params = JSON.parse(route?.query?.params);
     return params[param] ?? 'false';
 };
 const $params = ref({});
@@ -46,8 +47,6 @@ const pushParam = (param) => ({
     />
     <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
-            {{ $params }}
-            {{ JSON.parse(route.query.params).mine }}
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index f70ba4520..4d84a32fc 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -60,7 +60,7 @@ const filter = {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity?.id);
     state.set('OrderDescriptor', entity);
 };
 
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index e66a3f7c4..3902e8758 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -190,7 +190,7 @@ const columns = computed(() => [
             {
                 title: t('delete'),
                 icon: 'delete',
-                click: (row) => confirmRemove(row.item),
+                action: (row) => confirmRemove(row),
                 isPrimary: true,
             },
         ],
@@ -272,7 +272,7 @@ const columns = computed(() => [
                 </template>
             </VnTable>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
+        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed" style="z-index: 2">
             <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
             <QTooltip>
                 {{ t('confirm') }}

From e23a30c693fbb57d639e533fbac86abb509b431e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 16:05:19 +0200
Subject: [PATCH 012/162] feat: handle dates

---
 src/components/common/VnInputDate.vue |  1 +
 src/pages/Item/ItemFixedPrice.vue     | 20 ++------------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index b22de3606..60f693d18 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -122,6 +122,7 @@ watch(
                 :no-focus="true"
             >
                 <QDate
+                    v-bind="{ ...$attrs }"
                     v-model="popupDate"
                     :today-btn="true"
                     @update:model-value="
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 7fa698094..da574be3a 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -520,15 +520,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         style="max-width: 125px"
                         :show-event="false"
                         v-model="props.row.started"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="
-                            isBigger(props.row.started)
-                                ? {
-                                      'bg-color': 'warning',
-                                      'is-outlined': true,
-                                  }
-                                : {}
-                        "
+                        :options="(date) => date < props.row.ended"
                     />
                 </QTd>
             </template>
@@ -538,15 +530,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         style="max-width: 125px"
                         :show-event="false"
                         v-model="props.row.ended"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="
-                            isLower(props.row.started)
-                                ? {
-                                      'bg-color': 'warning',
-                                      'is-outlined': true,
-                                  }
-                                : {}
-                        "
+                        :options="(date) => date > props.row.ended"
                     />
                 </QTd>
             </template>

From a9bab6ab2c4d69257b77c9d1371d5fef42953109 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 11 Jul 2024 06:16:51 +0200
Subject: [PATCH 013/162] feat: show bad dates

---
 src/pages/Item/ItemFixedPrice.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index da574be3a..11817d3e9 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -69,7 +69,7 @@ const onFixedPricesFetched = (data) => {
         console.log(item.hasMinPrice);
         item.hasMinPrice = `${item.hasMinPrice !== 0}`;
     });
-    fixedPrices.value = data;
+    fixedPrices.value = Array(200).fill(...data);
     // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
     fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
 };
@@ -323,7 +323,17 @@ const addRow = () => {
 const openEditTableCellDialog = () => {
     editTableCellDialogRef.value.show();
 };
-
+async function showBadDates() {
+    try {
+        const { data } = await axios.get('FixedPrices/filter', {
+            params: {
+                showBadDates: true,
+            },
+        });
+    } catch (error) {
+        console.error(error);
+    }
+}
 const onEditCellDataSaved = async () => {
     rowsSelected.value = [];
     await fetchFixedPrices();
@@ -583,6 +593,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
         </QTable>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn @click="showBadDates()" color="primary" fab icon="edit" />
+            <QTooltip>
+                {{ t('Edit fixed price(s)') }}
+            </QTooltip>
+        </QPageSticky>
         <QPageSticky v-if="rowsSelected.length" :offset="[20, 20]">
             <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
             <QTooltip>

From 8018a3ac46c1a6fb11bc8e23db9723b97b476fe2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 11 Jul 2024 10:13:50 +0200
Subject: [PATCH 014/162] fix: options QDate

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

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 60f693d18..9b4d2ccb6 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -122,9 +122,9 @@ watch(
                 :no-focus="true"
             >
                 <QDate
-                    v-bind="{ ...$attrs }"
                     v-model="popupDate"
                     :today-btn="true"
+                    :options="$attrs.options"
                     @update:model-value="
                         (date) => {
                             formattedDate = date;

From 4a12fd08e09f2e2ca846570db482a1171ddc3598 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 11 Jul 2024 12:29:48 +0200
Subject: [PATCH 015/162] feat: handle dates

---
 src/pages/Item/ItemFixedPrice.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 11817d3e9..a5272eee0 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -69,7 +69,7 @@ const onFixedPricesFetched = (data) => {
         console.log(item.hasMinPrice);
         item.hasMinPrice = `${item.hasMinPrice !== 0}`;
     });
-    fixedPrices.value = Array(200).fill(...data);
+    fixedPrices.value = data;
     // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
     fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
 };
@@ -530,7 +530,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         style="max-width: 125px"
                         :show-event="false"
                         v-model="props.row.started"
-                        :options="(date) => date < props.row.ended"
                     />
                 </QTd>
             </template>

From 8a4b3302cf90b6916f19cdb8a0489d6d2e75c34b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 11 Jul 2024 23:45:59 +0200
Subject: [PATCH 016/162] feat: add row

---
 src/pages/Item/ItemFixedPrice.vue | 133 ++++++++++++++++++++++++++++--
 1 file changed, 127 insertions(+), 6 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index a5272eee0..ee6e0528d 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, reactive, computed, onUnmounted, watch } from 'vue';
+import { onMounted, ref, reactive, computed, onUnmounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -291,8 +291,36 @@ const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
         console.error('Error editing price', err);
     }
 };
+const lastRow = ref(null);
+async function saveOnRowChange(_, row) {
+    if (lastRow.value && lastRow.value !== row.id) {
+        console.log('update');
+        // await upsertPrice(row);
+    }
+    lastRow.value = row.id;
+    rowsSelected.value = [row];
+}
+const tableRef = ref();
+function checkLastVisibleRow() {
+    const tableBody = tableRef.value.$el.querySelector('tbody.q-virtual-scroll__content');
+    if (!tableBody) return;
+    const rows = tableBody.querySelectorAll('tr');
+    let lastVisibleRow = null;
 
+    rows.forEach((row, index) => {
+        const rect = row.getBoundingClientRect();
+        if (rect.top >= 0 && rect.bottom <= window.innerHeight) {
+            lastVisibleRow = index;
+        }
+    });
+
+    if (lastVisibleRow) {
+        console.log('Última fila visible:', lastVisibleRow);
+        return lastVisibleRow;
+    }
+}
 const addRow = () => {
+    const lastvisible = checkLastVisibleRow();
     if (!fixedPrices.value || fixedPrices.value.length === 0) {
         fixedPrices.value = [];
 
@@ -316,10 +344,22 @@ const addRow = () => {
         JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
     );
     delete lastItemCopy.id;
-    fixedPricesOriginalData.value.push(lastItemCopy);
-    fixedPrices.value.push(lastItemCopy);
+    fixedPricesOriginalData.value.splice(lastvisible, 0, lastItemCopy);
+    fixedPrices.value.unshift(lastItemCopy);
+    nextTick(() => {
+        highlightNewRow(lastvisible);
+    });
 };
-
+function highlightNewRow(index) {
+    const tableBody = tableRef.value.$el.querySelector('tbody.q-virtual-scroll__content');
+    const row = tableBody.querySelectorAll('tr')[index];
+    if (row) {
+        row.classList.add('highlight');
+        setTimeout(() => {
+            row.classList.remove('highlight');
+        }, 3000); // Duración de la animación en milisegundos
+    }
+}
 const openEditTableCellDialog = () => {
     editTableCellDialogRef.value.show();
 };
@@ -359,6 +399,10 @@ const removePrice = async (id, rowIndex) => {
     }
 };
 
+function onScroll({ to, ref }) {
+    console.log(to, ref);
+}
+
 const updateMinPrice = async (value, props) => {
     // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
     // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
@@ -395,7 +439,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
+        {{ rowsSelected }}
         <QTable
+            ref="tableRef"
+            @virtual-scroll="onScroll"
+            virtual-scroll
             dense
             :rows="fixedPrices"
             :columns="columns"
@@ -405,6 +453,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
             :no-data-label="t('globals.noResults')"
+            @row-click="saveOnRowChange"
+            :virtual-scroll-item-size="48"
         >
             <template #top-row="{ cols }">
                 <QTr>
@@ -427,7 +477,19 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #header="props">
                 <QTr :props="props" class="bg">
-                    <QTh />
+                    <QTh>
+                        <QIcon
+                            @click.stop="addRow()"
+                            class="fill-icon-on-hover"
+                            color="primary"
+                            name="add_circle"
+                            size="sm"
+                        >
+                            <QTooltip>
+                                {{ t('Add fixed price') }}
+                            </QTooltip>
+                        </QIcon>
+                    </QTh>
                     <QTh
                         v-for="col in props.cols"
                         :key="col.name"
@@ -530,6 +592,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         style="max-width: 125px"
                         :show-event="false"
                         v-model="props.row.started"
+                        v-on="getRowUpdateInputEvents(props, false, 'date')"
+                        :options="(date) => date > props.row.ended"
+                        v-bind="
+                            isBigger(props.row.started)
+                                ? {
+                                      'bg-color': 'warning',
+                                      'is-outlined': true,
+                                  }
+                                : {}
+                        "
                     />
                 </QTd>
             </template>
@@ -539,7 +611,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         style="max-width: 125px"
                         :show-event="false"
                         v-model="props.row.ended"
-                        :options="(date) => date > props.row.ended"
+                        :options="isLower(props.row.started)"
+                        v-on="getRowUpdateInputEvents(props, false, 'date')"
+                        v-bind="
+                            isLower(props.row.started)
+                                ? {
+                                      'bg-color': 'warning',
+                                      'is-outlined': true,
+                                  }
+                                : {}
+                        "
                     />
                 </QTd>
             </template>
@@ -598,6 +679,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 {{ t('Edit fixed price(s)') }}
             </QTooltip>
         </QPageSticky>
+        <QPageSticky :offset="[20, -20]">
+            <QBtn @click="addRow()" color="primary" fab icon="add" />
+            <QTooltip>
+                {{ t('Add') }}
+            </QTooltip>
+        </QPageSticky>
         <QPageSticky v-if="rowsSelected.length" :offset="[20, 20]">
             <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
             <QTooltip>
@@ -623,6 +710,40 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 .q-field__append {
     padding: 0;
 }
+/* height or max-height is important */
+
+.q-table__top,
+.q-table__bottom,
+tbody tr:first-child td {
+    /* bg color is important for th; just specify one */
+    background-color: #00b4ff;
+}
+thead tr th {
+    position: sticky;
+    z-index: 1;
+}
+thead tr:first-child th {
+    top: 0;
+}
+
+/* this is when the loading indicator appears */
+
+/* prevent scrolling behind sticky top row on focus */
+tbody
+    /* height of all previous header rows */ {
+    scroll-margin-top: 148px;
+}
+tbody tr.highlight .q-td {
+    animation: highlight-animation 4s ease-in-out;
+}
+@keyframes highlight-animation {
+    0% {
+        background-color: $primary-light;
+    }
+    100% {
+        background-color: transparent;
+    }
+}
 </style>
 <i18n>
 es:

From 77c7a9e03ad60171b997ec2a55af01ac09a0cc4d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 00:26:45 +0200
Subject: [PATCH 017/162] feat: remove future itemFixedPrices

---
 src/pages/Item/ItemFixedPrice.vue | 118 ++++++++++++++++++------------
 1 file changed, 71 insertions(+), 47 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index ee6e0528d..f89c50b1c 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { onMounted, ref, reactive, computed, onUnmounted, watch, nextTick } from 'vue';
+import { onMounted, ref, reactive, onUnmounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
@@ -21,7 +22,9 @@ import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
 import { isLower, isBigger } from 'src/filters/date.js';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { QCheckbox } from 'quasar';
 
+const checked = ref(false);
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
@@ -302,7 +305,7 @@ async function saveOnRowChange(_, row) {
 }
 const tableRef = ref();
 function checkLastVisibleRow() {
-    const tableBody = tableRef.value.$el.querySelector('tbody.q-virtual-scroll__content');
+    const tableBody = tableRef.value.$el.querySelector('tbody');
     if (!tableBody) return;
     const rows = tableBody.querySelectorAll('tr');
     let lastVisibleRow = null;
@@ -351,7 +354,7 @@ const addRow = () => {
     });
 };
 function highlightNewRow(index) {
-    const tableBody = tableRef.value.$el.querySelector('tbody.q-virtual-scroll__content');
+    const tableBody = tableRef.value.$el.querySelector('tbody');
     const row = tableBody.querySelectorAll('tr')[index];
     if (row) {
         row.classList.add('highlight');
@@ -365,11 +368,15 @@ const openEditTableCellDialog = () => {
 };
 async function showBadDates() {
     try {
-        const { data } = await axios.get('FixedPrices/filter', {
-            params: {
-                showBadDates: true,
-            },
-        });
+        if (!checked.value) fixedPrices.value = fixedPricesOriginalData.value;
+        else {
+            const { data } = await axios.get('FixedPrices/filter', {
+                params: {
+                    showBadDates: checked.value,
+                },
+            });
+            fixedPrices.value = data;
+        }
     } catch (error) {
         console.error(error);
     }
@@ -388,6 +395,16 @@ const onWarehousesFetched = (data) => {
     warehouseField.attrs.options = data;
 };
 
+const removeFuturePrice = async () => {
+    try {
+        rowsSelected.value.forEach(({ id }) => {
+            const rowIndex = fixedPrices.value.findIndex((r) => r.id === id);
+            removePrice(id, rowIndex);
+        });
+    } catch (err) {
+        console.error('Error removing price', err);
+    }
+};
 const removePrice = async (id, rowIndex) => {
     try {
         await axios.delete(`FixedPrices/${id}`);
@@ -399,10 +416,6 @@ const removePrice = async (id, rowIndex) => {
     }
 };
 
-function onScroll({ to, ref }) {
-    console.log(to, ref);
-}
-
 const updateMinPrice = async (value, props) => {
     // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
     // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
@@ -438,12 +451,20 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             />
         </template>
     </RightMenu>
+    <VnSubToolbar>
+        <template #st-data>
+            <QCheckbox
+                size="sm"
+                v-model="checked"
+                :label="t(`Show future items`)"
+                @update:model-value="showBadDates"
+            >
+            </QCheckbox>
+        </template>
+    </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
-        {{ rowsSelected }}
         <QTable
             ref="tableRef"
-            @virtual-scroll="onScroll"
-            virtual-scroll
             dense
             :rows="fixedPrices"
             :columns="columns"
@@ -454,7 +475,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             class="full-width q-mt-md"
             :no-data-label="t('globals.noResults')"
             @row-click="saveOnRowChange"
-            :virtual-scroll-item-size="48"
         >
             <template #top-row="{ cols }">
                 <QTr>
@@ -489,6 +509,19 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 {{ t('Add fixed price') }}
                             </QTooltip>
                         </QIcon>
+                        <!-- <QIcon
+                                v-if="!(checked && rowsSelected.length > 0)"
+                            v-else-if="tableRef?.rows?.length > 0"
+                            @click.stop="removeFuturePrice()"
+                            class="fill-icon-on-hover"
+                            color="primary"
+                            name="delete"
+                            size="sm"
+                        >
+                            <QTooltip>
+                                {{ t('Add fixed price') }}
+                            </QTooltip>
+                        </QIcon>-->
                     </QTh>
                     <QTh
                         v-for="col in props.cols"
@@ -593,7 +626,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         :show-event="false"
                         v-model="props.row.started"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        :options="(date) => date > props.row.ended"
                         v-bind="
                             isBigger(props.row.started)
                                 ? {
@@ -611,7 +643,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         style="max-width: 125px"
                         :show-event="false"
                         v-model="props.row.ended"
-                        :options="isLower(props.row.started)"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
                         v-bind="
                             isLower(props.row.started)
@@ -673,24 +704,38 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
         </QTable>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn @click="showBadDates()" color="primary" fab icon="edit" />
-            <QTooltip>
-                {{ t('Edit fixed price(s)') }}
-            </QTooltip>
-        </QPageSticky>
-        <QPageSticky :offset="[20, -20]">
+        <QPageSticky :offset="[20, 0]">
             <QBtn @click="addRow()" color="primary" fab icon="add" />
             <QTooltip>
                 {{ t('Add') }}
             </QTooltip>
         </QPageSticky>
-        <QPageSticky v-if="rowsSelected.length" :offset="[20, 20]">
+        <QPageSticky v-if="rowsSelected.length" :offset="[20, 60]">
             <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
             <QTooltip>
                 {{ t('Edit fixed price(s)') }}
             </QTooltip>
         </QPageSticky>
+        <QPageSticky
+            :offset="[20, 120]"
+            v-if="tableRef?.rows?.length > 0 && checked && rowsSelected.length > 0"
+        >
+            <QBtn
+                color="primary"
+                fab
+                icon="delete"
+                @click.stop="
+                    openConfirmationModal(
+                        t('This row will be removed'),
+                        t('Do you want to clone this item?'),
+                        () => removeFuturePrice()
+                    )
+                "
+            />
+            <QTooltip>
+                {{ t('Add') }}
+            </QTooltip>
+        </QPageSticky>
         <QDialog ref="editTableCellDialogRef">
             <EditTableCellValueForm
                 edit-url="FixedPrices/editFixedPrice"
@@ -712,27 +757,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 }
 /* height or max-height is important */
 
-.q-table__top,
-.q-table__bottom,
-tbody tr:first-child td {
-    /* bg color is important for th; just specify one */
-    background-color: #00b4ff;
-}
-thead tr th {
-    position: sticky;
-    z-index: 1;
-}
-thead tr:first-child th {
-    top: 0;
-}
-
-/* this is when the loading indicator appears */
-
-/* prevent scrolling behind sticky top row on focus */
-tbody
-    /* height of all previous header rows */ {
-    scroll-margin-top: 148px;
-}
 tbody tr.highlight .q-td {
     animation: highlight-animation 4s ease-in-out;
 }

From 68192e50744b7a5e75680a32f65b4a5c887eb35a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 01:20:36 +0200
Subject: [PATCH 018/162] perf: onRowchange

---
 src/pages/Item/ItemFixedPrice.vue | 48 +++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index f89c50b1c..32ccbc281 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -281,28 +281,54 @@ const validations = (row, rowIndex, col) => {
     );
 };
 
+async function upsertFixedPrice(row) {
+    try {
+        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+        return data;
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
+}
 const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
     if (!validations(row, rowIndex, col)) return;
 
     try {
         if (resetMinPrice) row.hasMinPrice = 0;
-
-        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
-        row = data;
+        row = await upsertFixedPrice(row);
         fixedPricesOriginalData.value[rowIndex][col.field] = row[col.field];
     } catch (err) {
         console.error('Error editing price', err);
     }
 };
-const lastRow = ref(null);
 async function saveOnRowChange(_, row) {
-    if (lastRow.value && lastRow.value !== row.id) {
-        console.log('update');
-        // await upsertPrice(row);
-    }
-    lastRow.value = row.id;
+    if (rowsSelected.value.length > 1) return;
+    if (rowsSelected.value[0]?.id === row.id) return;
+    else if (rowsSelected.value.length === 1)
+        await upsertFixedPrice(rowsSelected.value[0]);
     rowsSelected.value = [row];
+    // if (rowsSelected.value.length > 0) {
+    //     disableUnselectedRows();
+    // } else {
+    //     resetRowStates();
+    // }
+    // if (lastRow.value && lastRow.value !== row.id) {
+    //     console.log('update');
+    //     // await upsertPrice(row);
+    // }
+    // lastRow.value = row.id;
 }
+// function disableUnselectedRows() {
+//     fixedPrices.value.forEach((row) => {
+//         row.disabled = !rowsSelected.value.includes(row.id);
+//     });
+// }
+// function resetRowStates() {
+//     fixedPrices.value.forEach((row) => {
+//         row.disable = false;
+//     });
+//     // Aquí puedes guardar los cambios si es necesario
+//     console.log('Guardando cambios...');
+// }
 const tableRef = ref();
 function checkLastVisibleRow() {
     const tableBody = tableRef.value.$el.querySelector('tbody');
@@ -370,6 +396,7 @@ async function showBadDates() {
     try {
         if (!checked.value) fixedPrices.value = fixedPricesOriginalData.value;
         else {
+            rowsSelected.value = [];
             const { data } = await axios.get('FixedPrices/filter', {
                 params: {
                     showBadDates: checked.value,
@@ -539,6 +566,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     style="width: 10px; margin-left: -20px"
                     v-model="scope.selected"
                 />
+                <!--:disable="
+                        rowsSelected.length > 0 && rowsSelected[0].id !== scope.row.id
+                    "-->
             </template>
             <template #header-selection="scope">
                 <QCheckbox style="margin-left: -15px" v-model="scope.selected" />

From 5518fa98e00341cbaaa676c4053c66b0fe05fb96 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 13:13:37 +0200
Subject: [PATCH 019/162] perf: remove icons in header slot

---
 src/pages/Item/ItemFixedPrice.vue | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 32ccbc281..e62e7a910 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -524,32 +524,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #header="props">
                 <QTr :props="props" class="bg">
-                    <QTh>
-                        <QIcon
-                            @click.stop="addRow()"
-                            class="fill-icon-on-hover"
-                            color="primary"
-                            name="add_circle"
-                            size="sm"
-                        >
-                            <QTooltip>
-                                {{ t('Add fixed price') }}
-                            </QTooltip>
-                        </QIcon>
-                        <!-- <QIcon
-                                v-if="!(checked && rowsSelected.length > 0)"
-                            v-else-if="tableRef?.rows?.length > 0"
-                            @click.stop="removeFuturePrice()"
-                            class="fill-icon-on-hover"
-                            color="primary"
-                            name="delete"
-                            size="sm"
-                        >
-                            <QTooltip>
-                                {{ t('Add fixed price') }}
-                            </QTooltip>
-                        </QIcon>-->
-                    </QTh>
+                    <QTh />
                     <QTh
                         v-for="col in props.cols"
                         :key="col.name"

From 4cbca1ca648ed86f352f902648d364e7ae6f4ab0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 13:13:50 +0200
Subject: [PATCH 020/162] feat: showdate icons

---
 src/pages/Item/ItemFixedPrice.vue | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index e62e7a910..5b35670a9 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -628,7 +628,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QTd class="col">
                     <VnInputDate
                         style="max-width: 125px"
-                        :show-event="false"
+                        :show-event="true"
                         v-model="props.row.started"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
                         v-bind="
@@ -646,7 +646,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QTd class="col">
                     <VnInputDate
                         style="max-width: 125px"
-                        :show-event="false"
+                        :show-event="true"
                         v-model="props.row.ended"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
                         v-bind="
@@ -693,21 +693,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QIcon>
                 </QTd>
             </template>
-            <template #bottom-row>
-                <QTd align="center">
-                    <QIcon
-                        @click.stop="addRow()"
-                        class="fill-icon-on-hover"
-                        color="primary"
-                        name="add_circle"
-                        size="sm"
-                    >
-                        <QTooltip>
-                            {{ t('Add fixed price') }}
-                        </QTooltip>
-                    </QIcon>
-                </QTd>
-            </template>
         </QTable>
         <QPageSticky :offset="[20, 0]">
             <QBtn @click="addRow()" color="primary" fab icon="add" />

From fceeaea1f526df2e478beb564c4587b284d722a4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 15:22:29 +0200
Subject: [PATCH 021/162] feat: replace stickyButtons by subtoolbar

---
 src/pages/Item/ItemFixedPrice.vue       | 58 +++++--------------------
 src/pages/Item/ItemFixedPriceFilter.vue | 15 ++++++-
 2 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 5b35670a9..2c55e33e1 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -392,22 +392,6 @@ function highlightNewRow(index) {
 const openEditTableCellDialog = () => {
     editTableCellDialogRef.value.show();
 };
-async function showBadDates() {
-    try {
-        if (!checked.value) fixedPrices.value = fixedPricesOriginalData.value;
-        else {
-            rowsSelected.value = [];
-            const { data } = await axios.get('FixedPrices/filter', {
-                params: {
-                    showBadDates: checked.value,
-                },
-            });
-            fixedPrices.value = data;
-        }
-    } catch (error) {
-        console.error(error);
-    }
-}
 const onEditCellDataSaved = async () => {
     rowsSelected.value = [];
     await fetchFixedPrices();
@@ -480,13 +464,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </RightMenu>
     <VnSubToolbar>
         <template #st-data>
-            <QCheckbox
-                size="sm"
-                v-model="checked"
-                :label="t(`Show future items`)"
-                @update:model-value="showBadDates"
+            <QBtn
+                v-if="rowsSelected.length"
+                @click="openEditTableCellDialog()"
+                color="primary"
+                icon="edit"
             >
-            </QCheckbox>
+                <QTooltip>
+                    {{ t('Edit fixed price(s)') }}
+                </QTooltip>
+            </QBtn>
         </template>
     </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
@@ -700,32 +687,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 {{ t('Add') }}
             </QTooltip>
         </QPageSticky>
-        <QPageSticky v-if="rowsSelected.length" :offset="[20, 60]">
-            <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
-            <QTooltip>
-                {{ t('Edit fixed price(s)') }}
-            </QTooltip>
-        </QPageSticky>
-        <QPageSticky
-            :offset="[20, 120]"
-            v-if="tableRef?.rows?.length > 0 && checked && rowsSelected.length > 0"
-        >
-            <QBtn
-                color="primary"
-                fab
-                icon="delete"
-                @click.stop="
-                    openConfirmationModal(
-                        t('This row will be removed'),
-                        t('Do you want to clone this item?'),
-                        () => removeFuturePrice()
-                    )
-                "
-            />
-            <QTooltip>
-                {{ t('Add') }}
-            </QTooltip>
-        </QPageSticky>
+
         <QDialog ref="editTableCellDialogRef">
             <EditTableCellValueForm
                 edit-url="FixedPrices/editFixedPrice"
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 6c35e5cec..61bac2a6e 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -30,7 +30,9 @@ const sanitizeParam = (param) => {
 };
 const $params = ref({});
 onMounted(() => {
-    ['mine', 'hasMinPrice'].forEach((tag) => ($params.value[tag] = sanitizeParam(tag)));
+    ['mine', 'hasMinPrice', 'showBadDates'].forEach(
+        (tag) => ($params.value[tag] = sanitizeParam(tag))
+    );
 });
 const pushParam = (param) => ({
     param: { [param]: $params.value[param] },
@@ -109,6 +111,17 @@ const pushParam = (param) => ({
                         @update:model-value="searchFn(pushParam('mine'))"
                     />
                 </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        size="sm"
+                        v-model="checked"
+                        :label="t(`Show future items`)"
+                        :true-value="'true'"
+                        :false-value="'false'"
+                        @update:model-value="searchFn(pushParam('showBadDates'))"
+                    >
+                    </QCheckbox>
+                </QItemSection>
                 <QItemSection>
                     <QCheckbox
                         :label="t('components.itemsFilterPanel.hasMinPrice')"

From dbe6e86ba76e0e5c3a7f8950676459b57da54d39 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 13 Jul 2024 00:06:33 +0200
Subject: [PATCH 022/162] ticketComponent i18n

---
 src/pages/Ticket/Card/TicketComponents.vue | 38 +++++++++++-----------
 src/pages/Ticket/locale/en.yml             |  2 +-
 src/pages/Ticket/locale/es.yml             |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 19d25d259..3954b5a62 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -71,39 +71,39 @@ const salesFilter = computed(() => ({
 
 const columns = computed(() => [
     {
-        label: t('components.item'),
+        label: t('ticketComponents.item'),
         name: 'item',
         align: 'left',
     },
     {
-        label: t('components.description'),
+        label: t('ticketComponents.description'),
         name: 'description',
         align: 'left',
     },
     {
-        label: t('components.quantity'),
+        label: t('ticketComponents.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('components.serie'),
+        label: t('ticketComponents.serie'),
         name: 'serie',
         align: 'left',
     },
     {
-        label: t('components.components'),
+        label: t('ticketComponents.components'),
         name: 'components',
         align: 'left',
     },
     {
-        label: t('components.import'),
+        label: t('ticketComponents.import'),
         name: 'import',
         align: 'left',
     },
     {
-        label: t('components.total'),
+        label: t('ticketComponents.total'),
         name: 'total',
         align: 'left',
     },
@@ -184,18 +184,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.total') }}
+                        {{ t('ticketComponents.total') }}
                     </span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label"
-                        >{{ t('components.baseToCommission') }}:
+                        >{{ t('ticketComponents.baseToCommission') }}:
                     </span>
                     <span>{{ toCurrency(getBase) }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label"
-                        >{{ t('components.totalWithoutVat') }}:
+                        >{{ t('ticketComponents.totalWithoutVat') }}:
                     </span>
                     <span>{{ toCurrency(getTotal) }}</span>
                 </QCardSection>
@@ -208,7 +208,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.components') }}
+                        {{ t('ticketComponents.components') }}
                     </span>
                 </QCardSection>
                 <QCardSection
@@ -232,24 +232,24 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.zoneBreakdown') }}
+                        {{ t('ticketComponents.zoneBreakdown') }}
                     </span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.price') }}:
+                        {{ t('ticketComponents.price') }}:
                     </span>
                     <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.bonus') }}:
+                        {{ t('ticketComponents.bonus') }}:
                     </span>
                     <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.zone') }}:
+                        {{ t('ticketComponents.zone') }}:
                     </span>
                     <span class="link">
                         {{ dashIfEmpty(ticketData?.zone?.name) }}
@@ -258,13 +258,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QCardSection>
                 <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.volume') }}:
+                        {{ t('ticketComponents.volume') }}:
                     </span>
                     <span>{{ ticketVolume }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.packages') }}:
+                        {{ t('ticketComponents.packages') }}:
                     </span>
                     <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
                 </QCardSection>
@@ -277,12 +277,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.theoricalCost') }}
+                        {{ t('ticketComponents.theoricalCost') }}
                     </span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.totalPrice') }}:
+                        {{ t('ticketComponents.totalPrice') }}:
                     </span>
                     <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
                 </QCardSection>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index ede5480ff..e3f2f06da 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -178,7 +178,7 @@ service:
     addService: Add service
     quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
     createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
-components:
+ticketComponents:
     item: Item
     description: Description
     quantity: Quantity
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 1b97cd66f..a46bbd5ec 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -164,7 +164,7 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
-components:
+ticketComponents:
     item: Artículo
     description: Descripción
     quantity: Cantidad

From 9fe09bcffc955bd810184c1a0b74981229c377a5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jul 2024 11:45:56 +0200
Subject: [PATCH 023/162] Merge branch 'dev' into 7671_dense_itemFixedPrices

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

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 3b4c81ecd..df6b564d1 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -2,7 +2,6 @@
 import { watch, computed, ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
-import { nextTick } from 'vue';
 
 const model = defineModel({ type: String });
 const props = defineProps({

From 0e5e7c3fda1a7664b1211248591b68eea7eb0e30 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jul 2024 12:07:50 +0200
Subject: [PATCH 024/162] feat:  with VnTable

---
 src/components/VnTable/VnColumn.vue |   2 +-
 src/pages/Item/ItemFixedPrice.vue   | 466 +++++++++++++---------------
 2 files changed, 220 insertions(+), 248 deletions(-)

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 3af58226f..d86dd87da 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -158,7 +158,7 @@ const col = computed(() => {
 const components = computed(() => $props.components ?? defaultComponents);
 </script>
 <template>
-    <div class="row no-wrap">
+    <div class="row no-wrap" :style="$props.column.style">
         <VnComponent
             v-if="col.before"
             :prop="col.before"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 2c55e33e1..fb9fa33f9 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,9 +1,8 @@
 <script setup>
-import { onMounted, ref, reactive, onUnmounted, watch, nextTick } from 'vue';
+import { onMounted, ref, reactive, onUnmounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
-import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -13,15 +12,15 @@ import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { dashIfEmpty } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useState } from 'src/composables/useState';
 import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import { useArrayData } from 'composables/useArrayData';
 import { isLower, isBigger } from 'src/filters/date.js';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import { QCheckbox } from 'quasar';
 
 const checked = ref(false);
@@ -55,106 +54,106 @@ const exprBuilder = (param, value) => {
 };
 
 const params = reactive({});
-const arrayData = useArrayData('ItemFixedPrices', {
-    url: 'FixedPrices/filter',
-    userParams: params,
-    order: ['name ASC', 'itemFk'],
-    exprBuilder: exprBuilder,
-});
-const store = arrayData.store;
+// const arrayData = useArrayData('ItemFixedPrices', {
+//     url: 'FixedPrices/filter',
+//     userParams: params,
+//     order: ['name ASC', 'itemFk'],
+//     exprBuilder: exprBuilder,
+// });
+// const store = arrayData.store;
 
-const fetchFixedPrices = async () => {
-    await arrayData.fetch({ append: false });
-};
+// const fetchFixedPrices = async () => {
+//     await arrayData.fetch({ append: false });
+// };
 
-const onFixedPricesFetched = (data) => {
-    data.forEach((item) => {
-        console.log(item.hasMinPrice);
-        item.hasMinPrice = `${item.hasMinPrice !== 0}`;
-    });
-    fixedPrices.value = data;
-    // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
-    fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
-};
+// const onFixedPricesFetched = (data) => {
+//     data.forEach((item) => {
+//         console.log(item.hasMinPrice);
+//         item.hasMinPrice = `${item.hasMinPrice !== 0}`;
+//     });
+//     fixedPrices.value = data;
+//     // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
+//     fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
+// };
 
-watch(
-    () => store.data,
-    (data) => onFixedPricesFetched(data)
-);
+// watch(
+//     () => store.data,
+//     (data) => onFixedPricesFetched(data)
+// );
 
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
+// const applyColumnFilter = async (col) => {
+//     try {
+//         const paramKey = col.columnFilter?.filterParamKey || col.field;
+//         params[paramKey] = col.columnFilter.filterValue;
+//         await arrayData.addFilter({ params });
+//     } catch (err) {
+//         console.error('Error applying column filter', err);
+//     }
+// };
 
-const getColumnInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
+// const getColumnInputEvents = (col) => {
+//     return col.columnFilter.type === 'select'
+//         ? { 'update:modelValue': () => applyColumnFilter(col) }
+//         : {
+//               'keyup.enter': () => applyColumnFilter(col),
+//           };
+// };
 
-const defaultColumnFilter = {
-    component: VnInput,
-    type: 'text',
-    filterValue: null,
-    event: getColumnInputEvents,
-    attrs: {
-        dense: true,
-    },
-};
+// const defaultColumnFilter = {
+//     component: VnInput,
+//     type: 'text',
+//     filterValue: null,
+//     event: getColumnInputEvents,
+//     attrs: {
+//         dense: true,
+//     },
+// };
 
 const defaultColumnAttrs = {
     align: 'left',
     sortable: true,
 };
 
-const columns = ref([
+const columns = computed(() => [
     {
         sortable: true,
         align: 'left',
         label: t('item.fixedPrice.itemId'),
         name: 'itemId',
-        field: 'itemFk',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
+        isId: true,
+        cardVisible: true,
+        columnField: {
+            component: 'input',
+            type: 'number',
         },
     },
     {
-        label: t('globals.description'),
+        label: t('globals.name'),
         field: 'name',
         name: 'description',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
-        },
+        create: true,
+        cardVisible: true,
     },
     {
         label: t('item.fixedPrice.groupingPrice'),
         field: 'rate2',
-        name: 'groupingPrice',
+        name: 'rate2',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
-        },
-        format: (val) => toCurrency(val),
+        cardVisible: true,
+        class: 'expand',
+
+        style: 'max-width: 80px',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
         field: 'rate3',
-        name: 'packingPrice',
+        name: 'rate3',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
-        },
-        format: (val) => dashIfEmpty(val),
+        cardVisible: true,
+        class: 'expand',
+        style: 'max-width: 80px',
     },
 
     {
@@ -162,8 +161,11 @@ const columns = ref([
         field: 'minPrice',
         name: 'minPrice',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
+        cardVisible: true,
+        columnField: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
         },
     },
     {
@@ -171,93 +173,40 @@ const columns = ref([
         field: 'started',
         name: 'started',
         ...defaultColumnAttrs,
-        columnFilter: null,
+        cardVisible: true,
+        component: 'date',
+        format: (row) => toDate(row.started),
     },
     {
         label: t('item.fixedPrice.ended'),
         field: 'ended',
         name: 'ended',
         ...defaultColumnAttrs,
-        columnFilter: null,
+        cardVisible: true,
+        component: 'date',
+        format: (row) => toDate(row.ended),
     },
 
     {
         label: t('item.fixedPrice.warehouse'),
         field: 'warehouseFk',
-        name: 'warehouse',
+        name: 'warehouseFk',
         ...defaultColumnAttrs,
-        columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getColumnInputEvents,
-            attrs: {
-                options: warehousesOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: (row) => confirmRemove(row),
+                isPrimary: true,
             },
-        },
+        ],
     },
-    { name: 'deleteAction', align: 'center' },
 ]);
 
-const editTableFieldsOptions = [
-    {
-        field: 'rate2',
-        label: t('item.fixedPrice.groupingPrice'),
-        component: 'input',
-        attrs: {
-            type: 'number',
-        },
-    },
-    {
-        field: 'rate3',
-        label: t('item.fixedPrice.packingPrice'),
-        component: 'input',
-        attrs: {
-            type: 'number',
-        },
-    },
-    {
-        field: 'minPrice',
-        label: t('item.fixedPrice.minPrice'),
-        component: 'input',
-        attrs: {
-            type: 'number',
-        },
-    },
-    {
-        field: 'hasMinPrice',
-        label: t('item.fixedPrice.hasMinPrice'),
-        component: 'checkbox',
-        attrs: {
-            'false-value': 0,
-            'true-value': 1,
-        },
-    },
-    {
-        field: 'started',
-        label: t('item.fixedPrice.started'),
-        component: 'date',
-    },
-    {
-        field: 'ended',
-        label: t('item.fixedPrice.ended'),
-        component: 'date',
-    },
-    {
-        field: 'warehouseFk',
-        label: t('item.fixedPrice.warehouse'),
-        component: 'select',
-        attrs: {
-            options: [],
-            'option-label': 'name',
-            'option-value': 'id',
-        },
-    },
-];
-
 const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
     return inputType === 'text'
         ? {
@@ -272,8 +221,8 @@ const validations = (row, rowIndex, col) => {
     // Si la row no tiene id significa que fue agregada con addRow y no se ha guardado en la base de datos
     // Si isNew es falso no se checkea si el valor es igual a la original
     if (!isNew)
-        if (fixedPricesOriginalData.value[rowIndex][col.field] == row[col.field])
-            return false;
+        // if (fixedPricesOriginalData.value[rowIndex][col.field] == row[col.field])
+        return false;
 
     const requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
     return requiredFields.every(
@@ -295,12 +244,12 @@ const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
     try {
         if (resetMinPrice) row.hasMinPrice = 0;
         row = await upsertFixedPrice(row);
-        fixedPricesOriginalData.value[rowIndex][col.field] = row[col.field];
+        // fixedPricesOriginalData.value[rowIndex][col.field] = row[col.field];
     } catch (err) {
         console.error('Error editing price', err);
     }
 };
-async function saveOnRowChange(_, row) {
+async function saveOnRowChange(row) {
     if (rowsSelected.value.length > 1) return;
     if (rowsSelected.value[0]?.id === row.id) return;
     else if (rowsSelected.value.length === 1)
@@ -331,9 +280,9 @@ async function saveOnRowChange(_, row) {
 // }
 const tableRef = ref();
 function checkLastVisibleRow() {
-    const tableBody = tableRef.value.$el.querySelector('tbody');
-    if (!tableBody) return;
-    const rows = tableBody.querySelectorAll('tr');
+    const rows = document
+        .getElementsByClassName('q-table')[0]
+        .querySelectorAll('tr.cursor-pointer');
     let lastVisibleRow = null;
 
     rows.forEach((row, index) => {
@@ -348,7 +297,7 @@ function checkLastVisibleRow() {
         return lastVisibleRow;
     }
 }
-const addRow = () => {
+const addRow = (fixedPrice = null) => {
     const lastvisible = checkLastVisibleRow();
     if (!fixedPrices.value || fixedPrices.value.length === 0) {
         fixedPrices.value = [];
@@ -368,10 +317,16 @@ const addRow = () => {
         fixedPrices.value.push({ ...newPrice });
         return;
     }
+    if (fixedPrice) {
+        lastItem.value = fixedPrice;
+        return;
+    }
 
     const lastItemCopy = JSON.parse(
         JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
     );
+    lastItem.value = lastItemCopy;
+    // tableRef.value.create.formInitialData = lastItem;
     delete lastItemCopy.id;
     fixedPricesOriginalData.value.splice(lastvisible, 0, lastItemCopy);
     fixedPrices.value.unshift(lastItemCopy);
@@ -379,9 +334,11 @@ const addRow = () => {
         highlightNewRow(lastvisible);
     });
 };
+const lastItem = ref(null);
 function highlightNewRow(index) {
-    const tableBody = tableRef.value.$el.querySelector('tbody');
-    const row = tableBody.querySelectorAll('tr')[index];
+    const row = document
+        .getElementsByClassName('q-table')[0]
+        .querySelectorAll('tr.cursor-pointer')[index];
     if (row) {
         row.classList.add('highlight');
         setTimeout(() => {
@@ -394,18 +351,26 @@ const openEditTableCellDialog = () => {
 };
 const onEditCellDataSaved = async () => {
     rowsSelected.value = [];
-    await fetchFixedPrices();
-};
-
-const onWarehousesFetched = (data) => {
-    warehousesOptions.value = data;
-    // Actualiza las 'options' del elemento con field 'warehouseFk' en 'editTableFieldsOptions'.
-    const warehouseField = editTableFieldsOptions.find(
-        (field) => field.field === 'warehouseFk'
-    );
-    warehouseField.attrs.options = data;
 };
+/*const lastRow = ref(null);
+async function saveOnRowChange(row) {
+    if (lastRow.value && lastRow.value !== row.id) {
+        console.log('update');
+        await upsertPrice(row);
+        return;
+    }
+    lastRow.value = row.id;
+}*/
 
+// const onWarehousesFetched = (data) => {
+//     warehousesOptions.value = data;
+//     // Actualiza las 'options' del elemento con field 'warehouseFk' en 'editTableFieldsOptions'.
+//     const warehouseField = editTableFieldsOptions.find(
+//         (field) => field.field === 'warehouseFk'
+//     );
+//     warehouseField.attrs.options = data;
+// };
+import { useQuasar } from 'quasar';
 const removeFuturePrice = async () => {
     try {
         rowsSelected.value.forEach(({ id }) => {
@@ -416,43 +381,54 @@ const removeFuturePrice = async () => {
         console.error('Error removing price', err);
     }
 };
-const removePrice = async (id, rowIndex) => {
+const quasar = useQuasar();
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import FetchData from 'src/components/FetchData.vue';
+
+function confirmRemove(item) {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('This row will be removed'),
+            message: t('Do you want to clone this item?'),
+            promise: async () => removePrice(item.id),
+        },
+    });
+}
+
+const removePrice = async (id) => {
     try {
         await axios.delete(`FixedPrices/${id}`);
-        fixedPrices.value.splice(rowIndex, 1);
-        fixedPricesOriginalData.value.splice(rowIndex, 1);
         notify(t('globals.dataSaved'), 'positive');
+        tableRef.value.reload({});
     } catch (err) {
         console.error('Error removing price', err);
     }
 };
 
-const updateMinPrice = async (value, props) => {
-    // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
-    // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
-    props.row.hasMinPrice = value;
-    await upsertPrice({
-        row: props.row,
-        col: { field: 'hasMinPrice' },
-        rowIndex: props.rowIndex,
-    });
-};
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
-    await fetchFixedPrices();
 });
-
+function handleOnDataSave(CrudModelRef) {
+    addRow(
+        CrudModelRef.CrudModelRef.formData[CrudModelRef.CrudModelRef.formData.length - 1]
+    );
+    CrudModelRef.CrudModelRef.formData.unshift(lastItem);
+    nextTick(() => {
+        highlightNewRow(checkLastVisibleRow());
+    });
+    // CrudModelRef.value.insert(lastItem);
+}
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
     <FetchData
-        url="Warehouses"
-        :filter="{ where: { isDestiny: true }, order: ['name'] }"
+        @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
-        @on-fetch="(data) => onWarehousesFetched(data)"
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
     />
     <RightMenu>
         <template #right-panel>
@@ -476,53 +452,39 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QBtn>
         </template>
     </VnSubToolbar>
-    <QPage class="column items-center q-pa-md">
-        <QTable
+    <QPage>
+        {{ lastRow }}
+        {{ rowsSelected }}
+        <VnTable
+            data-key="ItemFixedPrices"
+            url="FixedPrices/filter"
+            :filter="{ where: exprBuilder }"
+            :order="['name ASC', 'itemFk DESC']"
             ref="tableRef"
             dense
-            :rows="fixedPrices"
             :columns="columns"
-            row-key="id"
-            selection="multiple"
+            default-mode="table"
+            auto-load
+            :is-editable="true"
+            :right-search="false"
+            :table="{
+                'row-key': 'id',
+                selection: 'multiple',
+            }"
             v-model:selected="rowsSelected"
-            :pagination="{ rowsPerPage: 0 }"
-            class="full-width q-mt-md"
-            :no-data-label="t('globals.noResults')"
-            @row-click="saveOnRowChange"
+            :row-click="saveOnRowChange"
+            :create-as-dialog="false"
+            :create="{
+                onDataSaved: handleOnDataSave,
+            }"
+            :use-model="true"
+            :disable-option="{ card: true }"
         >
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.columnFilter"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
-            </template>
-            <template #header="props">
-                <QTr :props="props" class="bg">
-                    <QTh />
-                    <QTh
-                        v-for="col in props.cols"
-                        :key="col.name"
-                        :props="props"
-                        style="text-wrap: balance"
-                    >
-                        {{ col.label }}
-                    </QTh>
-                </QTr>
+            <template #header-selection="scope">
+                <QCheckbox v-model="scope.selected" />
             </template>
             <template #body-selection="scope">
+                {{ scope }}
                 <QCheckbox
                     flat
                     style="width: 10px; margin-left: -20px"
@@ -532,13 +494,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         rowsSelected.length > 0 && rowsSelected[0].id !== scope.row.id
                     "-->
             </template>
-            <template #header-selection="scope">
-                <QCheckbox style="margin-left: -15px" v-model="scope.selected" />
-            </template>
-            <template #body-cell-itemId="props">
+
+            <template #column-itemId="props">
                 <QTd>
                     <VnSelect
-                        style="width: 115px"
+                        style="max-width: 125px"
                         url="Items/withName"
                         hide-selected
                         option-label="id"
@@ -557,7 +517,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </VnSelect>
                 </QTd>
             </template>
-            <template #body-cell-description="{ row }">
+            <template #column-description="{ row }">
                 <QTd class="col">
                     <span class="link">
                         {{ row.name }}
@@ -566,10 +526,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     <FetchedTags style="width: 200px" :item="row" :max-length="6" />
                 </QTd>
             </template>
-            <template #body-cell-groupingPrice="props">
+            <template #column-rate2="props">
                 <QTd class="col">
                     <VnInput
-                        style="width: 80px"
+                        style="max-width: 80px"
                         mask="###.##"
                         v-model.number="props.row.rate2"
                         v-on="getRowUpdateInputEvents(props)"
@@ -578,11 +538,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </VnInput>
                 </QTd>
             </template>
-            <template #body-cell-packingPrice="props">
+            <template #column-rate3="props">
                 <QTd class="col">
                     <VnInput
-                        mask="###.##"
                         style="width: 80px"
+                        mask="###.##"
                         v-model.number="props.row.rate3"
                         v-on="getRowUpdateInputEvents(props)"
                     >
@@ -590,31 +550,31 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </VnInput>
                 </QTd>
             </template>
-            <template #body-cell-minPrice="props">
+            <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row">
+                    <div class="row" style="width: 130px">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
                             :true-value="'true'"
                             :false-value="'false'"
-                            :toggle-indeterminate="false"
                         />
                         <VnInput
-                            style="padding-left: -20px; width: 80px"
                             class="col"
-                            :disable="props.row.hasMinPrice === 'false'"
+                            mask="###.##"
+                            style="width: 80px"
+                            :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
-                            type="number"
-                        />
+                        >
+                            <template #append>€{{ props.row.hasMinPrice }}</template>
+                        </VnInput>
                     </div>
                 </QTd>
             </template>
-            <template #body-cell-started="props">
+            <template #column-started="props">
                 <QTd class="col">
                     <VnInputDate
-                        style="max-width: 125px"
                         :show-event="true"
                         v-model="props.row.started"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
@@ -629,10 +589,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     />
                 </QTd>
             </template>
-            <template #body-cell-ended="props">
+            <template #column-ended="props">
                 <QTd class="col">
                     <VnInputDate
-                        style="max-width: 125px"
                         :show-event="true"
                         v-model="props.row.ended"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
@@ -647,7 +606,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     />
                 </QTd>
             </template>
-            <template #body-cell-warehouse="props">
+            <template #column-warehouseFk="props">
                 <QTd class="col" style="max-width: 180px">
                     <VnSelect
                         :options="warehousesOptions"
@@ -659,7 +618,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     />
                 </QTd>
             </template>
-            <template #body-cell-deleteAction="{ row, rowIndex }">
+            <template #column-deleteAction="{ row, rowIndex }">
                 <QTd class="col">
                     <QIcon
                         name="delete"
@@ -680,7 +639,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QIcon>
                 </QTd>
             </template>
-        </QTable>
+        </VnTable>
         <QPageSticky :offset="[20, 0]">
             <QBtn @click="addRow()" color="primary" fab icon="add" />
             <QTooltip>
@@ -698,11 +657,24 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QDialog>
     </QPage>
 </template>
-<style lang="scss" scoped>
+<style lang="scss">
 .q-table th,
 .q-table td {
     padding-inline: 5px !important;
 }
+.q-table tbody td {
+    max-width: none;
+
+    .q-td.col {
+        & div.row {
+            & .q-checkbox {
+                & .q-checkbox__inner {
+                    position: relative !important;
+                }
+            }
+        }
+    }
+}
 .q-field__after,
 .q-field__append {
     padding: 0;

From ebf329bfc6ccdd8041166e5b596d479ab32f40b6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jul 2024 20:33:55 +0200
Subject: [PATCH 025/162] feat: addRow withour dialog

---
 src/components/VnTable/VnTable.vue | 23 +++++++--
 src/pages/Item/ItemFixedPrice.vue  | 80 +++++++++++++++++-------------
 2 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 97053184a..4592a60cc 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -45,6 +45,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    createAsDialog: {
+        type: Boolean,
+        default: true,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -239,6 +243,11 @@ defineExpose({
     redirect: redirectFn,
     selected,
 });
+
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved(this);
+    else $props.create.onDataSaved(_);
+}
 </script>
 <template>
     <QDrawer
@@ -556,8 +565,16 @@ defineExpose({
             </template>
         </CrudModel>
     </div>
-    <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
-        <QBtn @click="showForm = !showForm" color="primary" fab icon="add" />
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+        <QBtn
+            @click="
+                () =>
+                    createAsDialog ? (showForm = !showForm) : handleOnDataSaved(create)
+            "
+            color="primary"
+            fab
+            icon="add"
+        />
         <QTooltip>
             {{ create.title }}
         </QTooltip>
@@ -566,7 +583,7 @@ defineExpose({
         <FormModelPopup
             v-bind="create"
             :model="$attrs['data-key'] + 'Create'"
-            @on-data-saved="(_, res) => create.onDataSaved(res)"
+            @on-data-saved="handleOnDataSaved"
         >
             <template #form-inputs="{ data }">
                 <div class="grid-create">
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index fb9fa33f9..758594082 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -192,6 +192,10 @@ const columns = computed(() => [
         field: 'warehouseFk',
         name: 'warehouseFk',
         ...defaultColumnAttrs,
+        component: 'select',
+        attrs: {
+            options: warehousesOptions,
+        },
     },
     {
         align: 'right',
@@ -230,16 +234,19 @@ const validations = (row, rowIndex, col) => {
     );
 };
 
-async function upsertFixedPrice(row) {
-    try {
-        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
-        return data;
-    } catch (err) {
-        console.error('Error editing price', err);
-    }
-}
+const updateMinPrice = async (value, props) => {
+    // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
+    // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
+    props.row.hasMinPrice = value;
+    await upsertPrice({
+        row: props.row,
+        col: { field: 'hasMinPrice' },
+        rowIndex: props.rowIndex,
+    });
+};
+
 const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
-    if (!validations(row, rowIndex, col)) return;
+    // if (!validations(row, rowIndex, col)) return;
 
     try {
         if (resetMinPrice) row.hasMinPrice = 0;
@@ -249,6 +256,14 @@ const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
         console.error('Error editing price', err);
     }
 };
+async function upsertFixedPrice(row) {
+    try {
+        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+        return data;
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
+}
 async function saveOnRowChange(row) {
     if (rowsSelected.value.length > 1) return;
     if (rowsSelected.value[0]?.id === row.id) return;
@@ -299,24 +314,24 @@ function checkLastVisibleRow() {
 }
 const addRow = (fixedPrice = null) => {
     const lastvisible = checkLastVisibleRow();
-    if (!fixedPrices.value || fixedPrices.value.length === 0) {
-        fixedPrices.value = [];
+    // if (!fixedPrices.value || fixedPrices.value.length === 0) {
+    //     fixedPrices.value = [];
 
-        const today = Date.vnNew();
-        const millisecsInDay = 86400000;
-        const daysInWeek = 7;
-        const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
+    //     const today = Date.vnNew();
+    //     const millisecsInDay = 86400000;
+    //     const daysInWeek = 7;
+    //     const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
 
-        const newPrice = {
-            started: today,
-            ended: nextWeek,
-            hasMinPrice: 0,
-        };
+    //     const newPrice = {
+    //         started: today,
+    //         ended: nextWeek,
+    //         hasMinPrice: 0,
+    //     };
 
-        fixedPricesOriginalData.value.push({ ...newPrice });
-        fixedPrices.value.push({ ...newPrice });
-        return;
-    }
+    //     fixedPricesOriginalData.value.push({ ...newPrice });
+    //     fixedPrices.value.push({ ...newPrice });
+    //     return;
+    // }
     if (fixedPrice) {
         lastItem.value = fixedPrice;
         return;
@@ -326,7 +341,7 @@ const addRow = (fixedPrice = null) => {
         JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
     );
     lastItem.value = lastItemCopy;
-    // tableRef.value.create.formInitialData = lastItem;
+    tableRef.value.create.formInitialData = lastItem;
     delete lastItemCopy.id;
     fixedPricesOriginalData.value.splice(lastvisible, 0, lastItemCopy);
     fixedPrices.value.unshift(lastItemCopy);
@@ -523,7 +538,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ row.name }}
                     </span>
                     <ItemDescriptorProxy :id="row.itemFk" />
-                    <FetchedTags style="width: 200px" :item="row" :max-length="6" />
+                    <FetchedTags style="max-width: 220px" :item="row" :max-length="6" />
                 </QTd>
             </template>
             <template #column-rate2="props">
@@ -556,8 +571,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
-                            :true-value="'true'"
-                            :false-value="'false'"
+                            :false-value="0"
+                            :true-value="1"
                         />
                         <VnInput
                             class="col"
@@ -640,12 +655,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
         </VnTable>
-        <QPageSticky :offset="[20, 0]">
-            <QBtn @click="addRow()" color="primary" fab icon="add" />
-            <QTooltip>
-                {{ t('Add') }}
-            </QTooltip>
-        </QPageSticky>
 
         <QDialog ref="editTableCellDialogRef">
             <EditTableCellValueForm
@@ -670,6 +679,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             & .q-checkbox {
                 & .q-checkbox__inner {
                     position: relative !important;
+                    &.q-checkbox__inner--truthy {
+                        color: var(--q-primary);
+                    }
                 }
             }
         }

From 7cbdf0d98b3cee2cc0d6f796b37dbd969e906d1a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jul 2024 15:20:44 +0200
Subject: [PATCH 026/162] feat: fix bugs and filters

---
 src/components/VnTable/VnChip.vue       |   4 +-
 src/components/VnTable/VnColumn.vue     |   4 +-
 src/components/VnTable/VnFilter.vue     |   1 +
 src/components/VnTable/VnOrder.vue      |   4 +-
 src/components/VnTable/VnTable.vue      |  18 ++-
 src/components/common/VnComponent.vue   |   5 +-
 src/components/common/VnInputDate.vue   |   1 +
 src/components/ui/VnRow.vue             |  22 +++-
 src/css/app.scss                        |  32 ++---
 src/i18n/locale/en.yml                  |   1 +
 src/i18n/locale/es.yml                  |   1 +
 src/pages/Item/ItemFixedPrice.vue       | 163 ++++++------------------
 src/pages/Item/ItemFixedPriceFilter.vue |  14 +-
 13 files changed, 101 insertions(+), 169 deletions(-)

diff --git a/src/components/VnTable/VnChip.vue b/src/components/VnTable/VnChip.vue
index 74207b943..f70ba7423 100644
--- a/src/components/VnTable/VnChip.vue
+++ b/src/components/VnTable/VnChip.vue
@@ -35,7 +35,9 @@ function stopEventPropagation(event) {
             dense
             square
         >
-            <span v-if="!col.chip.icon">{{ row[col.name] }}</span>
+            <span v-if="!col.chip.icon">
+                {{ col.format ? col.format(row) : row[col.name] }}
+            </span>
             <QIcon v-else :name="col.chip.icon" color="primary-light" />
         </QChip>
     </span>
diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index d86dd87da..9f6c6d53d 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -147,7 +147,7 @@ const col = computed(() => {
     }
     if (
         (newColumn.name.startsWith('is') || newColumn.name.startsWith('has')) &&
-        !newColumn.component
+        newColumn.component == null
     )
         newColumn.component = 'checkbox';
     if ($props.default && !newColumn.component) newColumn.component = $props.default;
@@ -158,7 +158,7 @@ const col = computed(() => {
 const components = computed(() => $props.components ?? defaultComponents);
 </script>
 <template>
-    <div class="row no-wrap" :style="$props.column.style">
+    <div class="row no-wrap">
         <VnComponent
             v-if="col.before"
             :prop="col.before"
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 15e1cc947..e6eeb713c 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -64,6 +64,7 @@ const components = {
         attrs: {
             ...defaultAttrs,
             clearable: true,
+            type: 'number',
         },
         forceAttrs,
     },
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 1e1dc9e01..98c7ab392 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useArrayData } from 'composables/useArrayData';
-const model = defineModel({ type: Object, required: true });
+const model = defineModel({ type: Object });
 const $props = defineProps({
     name: {
         type: String,
@@ -56,7 +56,7 @@ defineExpose({ orderBy });
         <span :title="label">{{ label }}</span>
         <QChip
             v-if="name"
-            :label="!vertical && model?.index"
+            :label="!vertical ? model?.index : ''"
             :icon="
                 (model?.index || hover) && !vertical
                     ? model?.direction == 'DESC'
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4592a60cc..4e5a97b2e 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -96,9 +96,9 @@ const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();
 
-const DEFAULT_MODE = 'card';
+const CARD_MODE = 'card';
 const TABLE_MODE = 'table';
-const mode = ref(DEFAULT_MODE);
+const mode = ref(CARD_MODE);
 const selected = ref([]);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
 const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
@@ -117,13 +117,16 @@ const tableModes = [
     {
         icon: 'grid_view',
         title: t('grid view'),
-        value: DEFAULT_MODE,
+        value: CARD_MODE,
         disable: $props.disableOption?.card,
     },
 ];
 
 onMounted(() => {
-    mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
+    mode.value =
+        quasar.platform.is.mobile && !$props.disableOption?.card
+            ? CARD_MODE
+            : $props.defaultMode;
     stateStore.rightDrawer = true;
     setUserParams(route.query[$props.searchUrl]);
     columnsVisibilitySkiped.value = [
@@ -212,6 +215,7 @@ function stopEventPropagation(event) {
 }
 
 function reload(params) {
+    selected.value = [];
     CrudModelRef.value.reload(params);
 }
 
@@ -360,7 +364,7 @@ function handleOnDataSaved(_, res) {
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh v-if="col.visible ?? true" auto-width>
+                        <QTh v-if="col.visible ?? true" :class="[col.columnClass]">
                             <div
                                 class="column self-start q-ml-xs ellipsis"
                                 :class="`text-${col?.align ?? 'left'}`"
@@ -385,6 +389,7 @@ function handleOnDataSaved(_, res) {
                                     :data-key="$attrs['data-key']"
                                     v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
+                                    class="full-width"
                                 />
                             </div>
                         </QTh>
@@ -409,7 +414,7 @@ function handleOnDataSaved(_, res) {
                         <QTd
                             auto-width
                             class="no-margin q-px-xs"
-                            :class="[getColAlign(col), col.class, col.columnField?.class]"
+                            :class="[getColAlign(col), col.columnClass]"
                             v-if="col.visible ?? true"
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
@@ -432,6 +437,7 @@ function handleOnDataSaved(_, res) {
                         >
                             <QBtn
                                 v-for="(btn, index) of col.actions"
+                                v-show="btn.show ? btn.show(row) : true"
                                 :key="index"
                                 :title="btn.title"
                                 :icon="btn.icon"
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index d7719034a..f512b846a 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -17,15 +17,17 @@ const $props = defineProps({
     },
 });
 
+let mixed;
 const componentArray = computed(() => {
     if (typeof $props.prop === 'object') return [$props.prop];
     return $props.prop;
 });
 
 function mix(toComponent) {
+    if (mixed) return mixed;
     const { component, attrs, event } = toComponent;
     const customComponent = $props.components[component];
-    return {
+    mixed = {
         component: customComponent?.component ?? component,
         attrs: {
             ...toValueAttrs(attrs),
@@ -35,6 +37,7 @@ function mix(toComponent) {
         },
         event: event ?? customComponent?.event,
     };
+    return mixed;
 }
 
 function toValueAttrs(attrs) {
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 875aba0b9..a9fa19509 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -98,6 +98,7 @@ watch(
             :class="{ required: $attrs.required }"
             :rules="$attrs.required ? [requiredFieldRule] : null"
             :clearable="false"
+            @click="isPopupOpen = true"
         >
             <template #append>
                 <QIcon
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index a2f89ff3f..642adedf1 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -1,18 +1,28 @@
+<script setup>
+defineProps({ wrap: { type: Boolean, default: false } });
+</script>
 <template>
-    <div class="vn-row q-gutter-md q-mb-md">
-        <slot></slot>
+    <div class="vn-row q-gutter-md q-mb-md" :class="{ wrap }">
+        <slot />
     </div>
 </template>
-<style lang="scss" scopped>
+<style lang="scss" scoped>
 .vn-row {
     display: flex;
-    > * {
-        flex: 1;
+    &.wrap {
+        flex-wrap: wrap;
+    }
+    &:not(.wrap) {
+        > :slotted(*) {
+            flex: 1;
+        }
     }
 }
 @media screen and (max-width: 800px) {
     .vn-row {
-        flex-direction: column;
+        &:not(.wrap) {
+            flex-direction: column;
+        }
     }
 }
 </style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 504718ff5..43ec730b9 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -233,27 +233,23 @@ input::-webkit-inner-spin-button {
 }
 
 .q-table {
-    thead,
-    tbody {
-        th {
-            .q-select {
-                max-width: 120px;
-            }
-        }
-        td {
-            padding: 1px 10px 1px 10px;
-            max-width: 100px;
-            div span {
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-            }
+    th,
+    td {
+        padding: 1px 10px 1px 10px;
+        max-width: 100px;
+        div span {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
         }
-        .expand {
-            max-width: 400px;
-        }
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+    .shrink {
+        min-width: 65px;
+    }
+    .expand {
+        max-width: 200px;
     }
 }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 6943252c9..5ea072d49 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1271,6 +1271,7 @@ components:
         active: Is active
         visible: Is visible
         floramondo: Is floramondo
+        showBadDates: Show future items
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f32562313..306a86d13 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1252,6 +1252,7 @@ components:
         active: Activo
         visible: Visible
         floramondo: Floramondo
+        showBadDates: Ver items a futuro
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 758594082..948cd1f23 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -9,13 +9,14 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
+import { useQuasar } from 'quasar';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
+import { tMobile } from 'src/composables/tMobile';
 
 import { useStateStore } from 'stores/useStateStore';
-import { dashIfEmpty, toDate } from 'src/filters';
+import { toDate } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useState } from 'src/composables/useState';
-import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { isLower, isBigger } from 'src/filters/date.js';
@@ -23,7 +24,6 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import { QCheckbox } from 'quasar';
 
-const checked = ref(false);
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
@@ -54,61 +54,6 @@ const exprBuilder = (param, value) => {
 };
 
 const params = reactive({});
-// const arrayData = useArrayData('ItemFixedPrices', {
-//     url: 'FixedPrices/filter',
-//     userParams: params,
-//     order: ['name ASC', 'itemFk'],
-//     exprBuilder: exprBuilder,
-// });
-// const store = arrayData.store;
-
-// const fetchFixedPrices = async () => {
-//     await arrayData.fetch({ append: false });
-// };
-
-// const onFixedPricesFetched = (data) => {
-//     data.forEach((item) => {
-//         console.log(item.hasMinPrice);
-//         item.hasMinPrice = `${item.hasMinPrice !== 0}`;
-//     });
-//     fixedPrices.value = data;
-//     // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
-//     fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
-// };
-
-// watch(
-//     () => store.data,
-//     (data) => onFixedPricesFetched(data)
-// );
-
-// const applyColumnFilter = async (col) => {
-//     try {
-//         const paramKey = col.columnFilter?.filterParamKey || col.field;
-//         params[paramKey] = col.columnFilter.filterValue;
-//         await arrayData.addFilter({ params });
-//     } catch (err) {
-//         console.error('Error applying column filter', err);
-//     }
-// };
-
-// const getColumnInputEvents = (col) => {
-//     return col.columnFilter.type === 'select'
-//         ? { 'update:modelValue': () => applyColumnFilter(col) }
-//         : {
-//               'keyup.enter': () => applyColumnFilter(col),
-//           };
-// };
-
-// const defaultColumnFilter = {
-//     component: VnInput,
-//     type: 'text',
-//     filterValue: null,
-//     event: getColumnInputEvents,
-//     attrs: {
-//         dense: true,
-//     },
-// };
-
 const defaultColumnAttrs = {
     align: 'left',
     sortable: true,
@@ -123,6 +68,7 @@ const columns = computed(() => [
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
+        columnClass: 'shrink',
         columnField: {
             component: 'input',
             type: 'number',
@@ -131,6 +77,7 @@ const columns = computed(() => [
     {
         label: t('globals.name'),
         field: 'name',
+        columnClass: 'shrink',
         name: 'description',
         ...defaultColumnAttrs,
         create: true,
@@ -142,9 +89,6 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
-        class: 'expand',
-
-        style: 'max-width: 80px',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -152,12 +96,11 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
-        class: 'expand',
-        style: 'max-width: 80px',
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
+        class: 'expand',
         field: 'minPrice',
         name: 'minPrice',
         ...defaultColumnAttrs,
@@ -172,16 +115,17 @@ const columns = computed(() => [
         label: t('item.fixedPrice.started'),
         field: 'started',
         name: 'started',
-        ...defaultColumnAttrs,
+        format: ({ started }) => toDate(started),
         cardVisible: true,
+        ...defaultColumnAttrs,
         component: 'date',
-        format: (row) => toDate(row.started),
     },
     {
         label: t('item.fixedPrice.ended'),
         field: 'ended',
         name: 'ended',
         ...defaultColumnAttrs,
+        columnClass: 'expand',
         cardVisible: true,
         component: 'date',
         format: (row) => toDate(row.ended),
@@ -270,29 +214,7 @@ async function saveOnRowChange(row) {
     else if (rowsSelected.value.length === 1)
         await upsertFixedPrice(rowsSelected.value[0]);
     rowsSelected.value = [row];
-    // if (rowsSelected.value.length > 0) {
-    //     disableUnselectedRows();
-    // } else {
-    //     resetRowStates();
-    // }
-    // if (lastRow.value && lastRow.value !== row.id) {
-    //     console.log('update');
-    //     // await upsertPrice(row);
-    // }
-    // lastRow.value = row.id;
 }
-// function disableUnselectedRows() {
-//     fixedPrices.value.forEach((row) => {
-//         row.disabled = !rowsSelected.value.includes(row.id);
-//     });
-// }
-// function resetRowStates() {
-//     fixedPrices.value.forEach((row) => {
-//         row.disable = false;
-//     });
-//     // Aquí puedes guardar los cambios si es necesario
-//     console.log('Guardando cambios...');
-// }
 const tableRef = ref();
 function checkLastVisibleRow() {
     const rows = document
@@ -367,25 +289,6 @@ const openEditTableCellDialog = () => {
 const onEditCellDataSaved = async () => {
     rowsSelected.value = [];
 };
-/*const lastRow = ref(null);
-async function saveOnRowChange(row) {
-    if (lastRow.value && lastRow.value !== row.id) {
-        console.log('update');
-        await upsertPrice(row);
-        return;
-    }
-    lastRow.value = row.id;
-}*/
-
-// const onWarehousesFetched = (data) => {
-//     warehousesOptions.value = data;
-//     // Actualiza las 'options' del elemento con field 'warehouseFk' en 'editTableFieldsOptions'.
-//     const warehouseField = editTableFieldsOptions.find(
-//         (field) => field.field === 'warehouseFk'
-//     );
-//     warehouseField.attrs.options = data;
-// };
-import { useQuasar } from 'quasar';
 const removeFuturePrice = async () => {
     try {
         rowsSelected.value.forEach(({ id }) => {
@@ -405,11 +308,21 @@ function confirmRemove(item) {
         component: VnConfirm,
         componentProps: {
             title: t('This row will be removed'),
-            message: t('Do you want to clone this item?'),
+            message: t('Do you want to remove?'),
             promise: async () => removePrice(item.id),
         },
     });
 }
+function confirmRemoveFuturePrice(item) {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('This row will be removed'),
+            message: t('Do you want to remove?'),
+            promise: async () => removeFuturePrice(item.id),
+        },
+    });
+}
 
 const removePrice = async (id) => {
     try {
@@ -433,7 +346,6 @@ function handleOnDataSave(CrudModelRef) {
     nextTick(() => {
         highlightNewRow(checkLastVisibleRow());
     });
-    // CrudModelRef.value.insert(lastItem);
 }
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
@@ -465,12 +377,20 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     {{ t('Edit fixed price(s)') }}
                 </QTooltip>
             </QBtn>
+            <QBtn
+                :label="tMobile('globals.remove')"
+                color="primary"
+                icon="delete"
+                flat
+                @click="confirmRemoveFuturePrice"
+                :title="t('globals.remove')"
+                v-if="rowsSelected.length"
+            />
         </template>
     </VnSubToolbar>
     <QPage>
-        {{ lastRow }}
-        {{ rowsSelected }}
         <VnTable
+            :default-remove="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
             :filter="{ where: exprBuilder }"
@@ -500,14 +420,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-selection="scope">
                 {{ scope }}
-                <QCheckbox
-                    flat
-                    style="width: 10px; margin-left: -20px"
-                    v-model="scope.selected"
-                />
-                <!--:disable="
-                        rowsSelected.length > 0 && rowsSelected[0].id !== scope.row.id
-                    "-->
+                <QCheckbox flat v-model="scope.selected" />
             </template>
 
             <template #column-itemId="props">
@@ -538,13 +451,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ row.name }}
                     </span>
                     <ItemDescriptorProxy :id="row.itemFk" />
-                    <FetchedTags style="max-width: 220px" :item="row" :max-length="6" />
+                    <FetchedTags
+                        style="width: max-content; max-width: 220px"
+                        :item="row"
+                        :max-length="6"
+                    />
                 </QTd>
             </template>
             <template #column-rate2="props">
                 <QTd class="col">
                     <VnInput
-                        style="max-width: 80px"
                         mask="###.##"
                         v-model.number="props.row.rate2"
                         v-on="getRowUpdateInputEvents(props)"
@@ -556,7 +472,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #column-rate3="props">
                 <QTd class="col">
                     <VnInput
-                        style="width: 80px"
                         mask="###.##"
                         v-model.number="props.row.rate3"
                         v-on="getRowUpdateInputEvents(props)"
@@ -577,12 +492,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <VnInput
                             class="col"
                             mask="###.##"
-                            style="width: 80px"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
                         >
-                            <template #append>€{{ props.row.hasMinPrice }}</template>
+                            <template #append>€</template>
                         </VnInput>
                     </div>
                 </QTd>
@@ -590,6 +504,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #column-started="props">
                 <QTd class="col">
                     <VnInputDate
+                        style="min-width: 147px"
                         :show-event="true"
                         v-model="props.row.started"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
@@ -607,6 +522,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #column-ended="props">
                 <QTd class="col">
                     <VnInputDate
+                        style="min-width: 147px"
                         :show-event="true"
                         v-model="props.row.ended"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
@@ -691,7 +607,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 .q-field__append {
     padding: 0;
 }
-/* height or max-height is important */
 
 tbody tr.highlight .q-td {
     animation: highlight-animation 4s ease-in-out;
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 61bac2a6e..81d9fe308 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -24,8 +24,7 @@ const route = useRoute();
 
 const itemTypeWorkersOptions = ref([]);
 const sanitizeParam = (param) => {
-    if (!route?.query?.params) return 'false';
-    const params = JSON.parse(route?.query?.params);
+    const params = JSON.parse(route?.query?.table);
     return params[param] ?? 'false';
 };
 const $params = ref({});
@@ -110,19 +109,16 @@ const pushParam = (param) => ({
                         :false-value="'false'"
                         @update:model-value="searchFn(pushParam('mine'))"
                     />
-                </QItemSection>
-                <QItemSection>
+
                     <QCheckbox
-                        size="sm"
-                        v-model="checked"
-                        :label="t(`Show future items`)"
+                        v-model="$params.showBadDates"
+                        :label="t(`components.itemsFilterPanel.showBadDates`)"
                         :true-value="'true'"
                         :false-value="'false'"
                         @update:model-value="searchFn(pushParam('showBadDates'))"
                     >
                     </QCheckbox>
-                </QItemSection>
-                <QItemSection>
+
                     <QCheckbox
                         :label="t('components.itemsFilterPanel.hasMinPrice')"
                         v-model="$params.hasMinPrice"

From 351c2a07dc85a553a976fa37928cc57d4fd631a8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 09:15:35 +0200
Subject: [PATCH 027/162] chore: refs #4074 wip replace useRole for useAcl

---
 src/components/ui/VnPaginate.vue                 |  4 ++--
 src/pages/Account/AccountList.vue                |  4 ++--
 src/pages/Customer/Card/CustomerBalance.vue      |  6 +++---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 15 +++++++--------
 src/pages/Worker/Card/WorkerLocker.vue           |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c27111df4..42fa4f766 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -115,8 +115,8 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter],
-    ([url, filter]) => fetch({ url, filter })
+    () => [props.url, props.filter, props.userParams],
+    ([url, filter, userParams]) => fetch({ url, filter, userParams })
 );
 
 const addFilter = async (filter, params) => {
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index dee019fed..79c77a3c1 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -13,7 +13,7 @@ import AccountCreate from './AccountCreate.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useStateStore } from 'stores/useStateStore';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { QDialog } from 'quasar';
 
 const stateStore = useStateStore();
@@ -21,7 +21,7 @@ const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const accountCreateDialogRef = ref(null);
-const showNewUserBtn = computed(() => useRole().hasAny(['itManagement']));
+const showNewUserBtn = computed(() => useAcl().hasAny('Account', '*', 'WRITE'));
 
 const filter = {
     fields: ['id', 'nickname', 'name', 'role'],
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 411c44ad3..2dc0c5564 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -2,7 +2,7 @@
 import { computed, onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
 
@@ -25,7 +25,7 @@ import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescr
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail } = usePrintService();
 const { t } = useI18n();
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 
 const session = useSession();
 const tokenMultimedia = session.getTokenMultimedia();
@@ -317,7 +317,7 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAny(['administrative'])"
+                    :disable="!hasAny('Receipt','*', 'WRITE')"
                     @keypress.enter="scope.set"
                     autofocus
                 />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index da24e50fa..17e5133ab 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
@@ -24,7 +24,7 @@ const $props = defineProps({ id: { type: Number, default: null } });
 const { push, currentRoute } = useRouter();
 
 const quasar = useQuasar();
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const arrayData = useArrayData();
@@ -195,10 +195,9 @@ async function cloneInvoice() {
     push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const isAdministrative = () => hasAny(['administrative']);
+const canEditProp = (prop) => hasAny('InvoiceIn', prop, 'WRITE');
 
 const isAgricultural = () => {
-    console.error(config);
     if (!config.value) return false;
     return (
         invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
@@ -284,7 +283,7 @@ const createInvoiceInCorrection = async () => {
             <InvoiceInToBook>
                 <template #content="{ book }">
                     <QItem
-                        v-if="!entity?.isBooked && isAdministrative()"
+                        v-if="!entity?.isBooked && canEditProp('toBook')"
                         v-ripple
                         clickable
                         @click="book(entityId)"
@@ -294,7 +293,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </InvoiceInToBook>
             <QItem
-                v-if="entity?.isBooked && isAdministrative()"
+                v-if="entity?.isBooked && canEditProp('toUnBook')"
                 v-ripple
                 clickable
                 @click="triggerMenu('unbook')"
@@ -304,7 +303,7 @@ const createInvoiceInCorrection = async () => {
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('deleteById')"
                 v-ripple
                 clickable
                 @click="triggerMenu('delete')"
@@ -312,7 +311,7 @@ const createInvoiceInCorrection = async () => {
                 <QItemSection>{{ t('Delete invoice') }}</QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('clone')"
                 v-ripple
                 clickable
                 @click="triggerMenu('clone')"
diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index f19fc8ae6..ba5c0de97 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -3,13 +3,13 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import FetchData from 'components/FetchData.vue';
 
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const fetchData = ref();
 const originaLockerId = ref();
@@ -57,7 +57,7 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAny(['productionBoss', 'hr'])"
+                :readonly="!hasAny('Worker','__get__locker','READ')"
             />
         </template>
     </FormModel>

From c766110bd90016c3de35ff3d1d33067b0247b940 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:13:37 +0200
Subject: [PATCH 028/162] chore: refs #4074 wip replace useRole for useAcl

---
 src/components/common/VnSelectDialog.vue      |  7 +++
 src/pages/Item/Card/ItemSummary.vue           | 55 ++++++++-----------
 src/pages/Supplier/Card/SupplierSummary.vue   | 13 ++---
 .../Travel/Card/TravelDescriptorMenuItems.vue |  9 +--
 src/pages/Worker/Card/WorkerTimeControl.vue   | 18 +++---
 .../Worker/Card/WorkerTimeReasonForm.vue      |  4 +-
 src/pages/Worker/WorkerList.vue               |  2 +-
 7 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 7f7c29f5d..6f2be4bfe 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
@@ -11,6 +12,10 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
+    acls: {
+        type: Array,
+        default: () => [],
+    },
     actionIcon: {
         type: String,
         default: 'add',
@@ -22,9 +27,11 @@ const $props = defineProps({
 });
 
 const role = useRole();
+const acl = useAcl()
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
+    if ($props.acls.length) console.log(acl.hasAny($props.acls));
     return role.hasAny($props.rolesAllowedToCreate);
 });
 
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 7af3e0fa0..1571a903e 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -9,6 +9,7 @@ import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 const $props = defineProps({
     id: {
@@ -19,21 +20,13 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const roleState = useRole();
 
 const entityId = computed(() => $props.id || route.params.id);
 
-const isBuyer = computed(() => {
-    return roleState.hasAny(['buyer']);
-});
+const canEdit = computed(() => useAcl().hasAny('Item', '*', 'WRITE'));
 
-const isReplenisher = computed(() => {
-    return roleState.hasAny(['replenisher']);
-});
+const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
 
-const isAdministrative = computed(() => {
-    return roleState.hasAny(['administrative']);
-});
 </script>
 
 <template>
@@ -66,13 +59,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.basicData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
@@ -105,13 +98,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.otherData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
@@ -138,13 +131,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
                     :to="{ name: 'ItemTags', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                    :class="{ 'header-link': canEdit || isReplenisher }"
                 >
                     {{ t('item.summary.tags') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
                 </component>
                 <VnLv
                     v-for="(tag, index) in tags"
@@ -155,13 +148,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="item.description">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.description') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <p>
                     {{ item.description }}
@@ -169,13 +162,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isAdministrative ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemTax', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isAdministrative }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.tax') }}
-                    <QIcon v-if="isBuyer || isAdministrative" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv
                     v-for="(tax, index) in item.taxes"
@@ -186,13 +179,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBotanical', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.botanical') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
                 <VnLv
@@ -202,13 +195,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBarcode', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                    :class="{ 'header-link': canEdit || isReplenisher }"
                 >
                     {{ t('item.summary.barcode') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
                 </component>
                 <p v-for="(barcode, index) in item.itemBarcode" :key="index">
                     {{ barcode.code }}
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 822586b47..04f763c15 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -4,13 +4,12 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
-const roleState = useRole();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -32,13 +31,11 @@ async function setData(data) {
     }
 }
 
-const isAdministrative = computed(() => {
-    return roleState.hasAny(['administrative']);
-});
 
-function getUrl(section) {
-    return isAdministrative.value && `#/supplier/${entityId.value}/${section}`;
-}
+
+const getUrl = (section) => 
+    useAcl().hasAny('Supplier','*','WRITE') ? `#/supplier/${entityId.value}/${section}`:'';
+
 </script>
 
 <template>
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index bd2561211..47b6f0aa6 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -8,7 +8,7 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 const $props = defineProps({
     travel: {
@@ -21,7 +21,6 @@ const { t } = useI18n();
 const router = useRouter();
 const quasar = useQuasar();
 const { notify } = useNotify();
-const role = useRole();
 
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
@@ -42,9 +41,7 @@ const cloneTravelWithEntries = async () => {
     }
 };
 
-const isBuyer = computed(() => {
-    return role.hasAny(['buyer']);
-});
+const canDelete = computed(() => useAcl().hasAny('Travel','*','WRITE'));
 
 const openDeleteEntryDialog = (id) => {
     quasar
@@ -81,7 +78,7 @@ const deleteTravel = async (id) => {
         </QItemSection>
     </QItem>
     <QItem
-        v-if="isBuyer && travel.totalEntries === 0"
+        v-if="canDelete && travel.totalEntries === 0"
         v-ripple
         clickable
         @click="openDeleteEntryDialog(travel.id)"
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 7bce5983c..1081cba61 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -13,6 +13,7 @@ import WorkerTimeControlCalendar from 'pages/Worker/Card/WorkerTimeControlCalend
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
@@ -26,7 +27,6 @@ import { date } from 'quasar';
 const route = useRoute();
 const { t, locale } = useI18n();
 const { notify } = useNotify();
-const { hasAny } = useRole();
 const _state = useState();
 const user = _state.getUser();
 const stateStore = useStateStore();
@@ -62,9 +62,11 @@ const arrayData = useArrayData('workerData');
 
 const worker = computed(() => arrayData.store?.data);
 
-const isHr = computed(() => hasAny(['hr']));
+const isHr = computed(() => useRole().hasAny(['hr']));
 
-const isHimSelf = computed(() => user.value.id === Number(route.params.id));
+const canSend = computed(() => useAcl().hasAny('WorkerTimeControl', 'sendMail', 'WRITE'));
+
+const isHimself = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
     return weekdayStore.getLocales?.map((day, index) => {
@@ -443,7 +445,7 @@ onMounted(async () => {
         <div>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtn
-                    v-if="isHimSelf && state"
+                    v-if="isHimself && state"
                     :label="t('Satisfied')"
                     color="primary"
                     type="submit"
@@ -451,7 +453,7 @@ onMounted(async () => {
                     @click="isSatisfied()"
                 />
                 <QBtn
-                    v-if="isHimSelf && state"
+                    v-if="isHimself && state"
                     :label="t('Not satisfied')"
                     color="primary"
                     type="submit"
@@ -462,14 +464,14 @@ onMounted(async () => {
             </QBtnGroup>
             <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
-                    v-if="reason && state && (isHimSelf || isHr)"
+                    v-if="reason && state && (isHimself || isHr)"
                     :label="t('Reason')"
                     color="primary"
                     type="submit"
                     @click="showReasonForm()"
                 />
                 <QBtn
-                    v-if="isHr && state !== 'CONFIRMED' && canResend"
+                    v-if="canSend && state !== 'CONFIRMED' && canResend"
                     :label="state ? t('Resend') : t('globals.send')"
                     color="primary"
                     type="submit"
@@ -596,7 +598,7 @@ onMounted(async () => {
             <WorkerTimeReasonForm
                 @on-submit="isUnsatisfied($event)"
                 :reason="reason"
-                :is-him-self="isHimSelf"
+                :is-himself="isHimself"
             />
         </QDialog>
     </QPage>
diff --git a/src/pages/Worker/Card/WorkerTimeReasonForm.vue b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
index 5c1ab9118..23bdba15e 100644
--- a/src/pages/Worker/Card/WorkerTimeReasonForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
@@ -9,7 +9,7 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    isHimSelf: {
+    isHimself: {
         type: Boolean,
         default: false,
     },
@@ -40,7 +40,7 @@ const closeForm = () => {
                 v-model="reasonFormData"
                 type="textarea"
                 autogrow
-                :disable="!isHimSelf"
+                :disable="!isHimself"
             />
         </template>
     </FormPopup>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 0c2656597..45bc41856 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -269,7 +269,7 @@ function uppercaseStreetModel(data) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :acls="[]"
                         :disable="data.isFreelance"
                     >
                         <template #form>

From dcc2f4dfde6ba958c59938c316f57327ca8a2a66 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:14:28 +0200
Subject: [PATCH 029/162] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 46aaa3c25..be6dbc241 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,10 +16,11 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, prop, accessType) {
+    function hasAny(model, props = [], accessType) {
         const acls = state.getAcls().value[model];
+        Array.isArray(props) || (props = [props]);
         if (acls) 
-            return ['*', prop].some((key) => {
+            return ['*', ...props].some((key) => {
                 const acl = acls[key];
                 return acl && (acl['*'] || acl[accessType]);
             });

From 27034d1dc249513d7b33f7fb589f7a9167cbae99 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:46:04 +0200
Subject: [PATCH 030/162] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index be6dbc241..f746b6677 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,9 +16,8 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, props = [], accessType) {
+    function hasAny(model, props, accessType) {
         const acls = state.getAcls().value[model];
-        Array.isArray(props) || (props = [props]);
         if (acls) 
             return ['*', ...props].some((key) => {
                 const acl = acls[key];

From fb496d7fc6af75774a8574f06e16d1a26778d6a4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:08:40 +0200
Subject: [PATCH 031/162] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index f746b6677..bebeda039 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -18,6 +18,7 @@ export function useAcl() {
 
     function hasAny(model, props, accessType) {
         const acls = state.getAcls().value[model];
+        Array.isArray(props) || (props = [props]);
         if (acls) 
             return ['*', ...props].some((key) => {
                 const acl = acls[key];

From db18e8c937c0f2684232fd162541f6f43acbf1ab Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:10:26 +0200
Subject: [PATCH 032/162] fix: refs #4074 workerCard data-key

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

diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 1a5bacf2f..fb9ab9666 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -5,7 +5,7 @@ import WorkerFilter from '../WorkerFilter.vue';
 </script>
 <template>
     <VnCard
-        data-key="Workers"
+        data-key="Worker"
         base-url="Workers"
         :descriptor="WorkerDescriptor"
         :filter-panel="WorkerFilter"

From 199ed8021211338361b8b9d8f6ed345699d05623 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:39:20 +0200
Subject: [PATCH 033/162] Merge branch 'dev' of
 https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

---
 src/pages/Account/AccountList.vue | 185 ++++++++++++------------------
 1 file changed, 72 insertions(+), 113 deletions(-)

diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 79c77a3c1..ecb027e49 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -1,33 +1,66 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { computed, ref } from 'vue';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import { ref, computed } from 'vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import AccountSummary from './Card/AccountSummary.vue';
-import AccountFilter from './AccountFilter.vue';
-import AccountCreate from './AccountCreate.vue';
-
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useStateStore } from 'stores/useStateStore';
-import { useAcl } from 'src/composables/useAcl';
-import { QDialog } from 'quasar';
 
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const accountCreateDialogRef = ref(null);
-const showNewUserBtn = computed(() => useAcl().hasAny('Account', '*', 'WRITE'));
-
-const filter = {
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
+const tableRef = ref();
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('id'),
+        isId: true,
+        field: 'id',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'username',
+        label: t('nickname'),
+        isTitle: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('name'),
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('View Summary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, AccountSummary),
+            },
+        ],
+    },
+]);
 const exprBuilder = (param, value) => {
     switch (param) {
         case 'search':
@@ -46,99 +79,25 @@ const exprBuilder = (param, value) => {
             return { [param]: value };
     }
 };
-
-const getApiUrl = () => new URL(window.location).origin;
-
-const navigate = (event, id) => {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/account/${id}/summary`);
-    router.push({ path: `/account/${id}` });
-};
-
-const openCreateModal = () => accountCreateDialogRef.value.show();
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountList"
-                url="VnUsers/preview"
-                :expr-builder="exprBuilder"
-                :label="t('account.search')"
-                :info="t('account.searchInfo')"
-            />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <AccountFilter data-key="AccountList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                :filter="filter"
-                data-key="AccountList"
-                url="VnUsers/preview"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.nickname"
-                        @click="navigate($event, row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('account.card.name')" :value="row.nickname">
-                            </VnLv>
-                            <VnLv
-                                :label="t('account.card.nickname')"
-                                :value="row.username"
-                            >
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AccountSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            ref="accountCreateDialogRef"
-            transition-hide="scale"
-            transition-show="scale"
-        >
-            <AccountCreate />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]" v-if="showNewUserBtn">
-            <QBtn @click="openCreateModal" color="primary" fab icon="add" />
-            <QTooltip class="text-no-wrap">
-                {{ t('account.card.newUser') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <VnSearchbar
+        :label="t('account.search')"
+        data-key="AccountUsers"
+        :expr-builder="exprBuilder"
+        :info="t('account.searchInfo')"
+    />
+
+    <VnTable
+        ref="tableRef"
+        data-key="AccountUsers"
+        url="VnUsers/preview"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        redirect="account"
+        :use-model="true"
+    />
 </template>

From 53aec247904b6117a08cdb28438b36d5ef46aaba Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 09:04:16 +0200
Subject: [PATCH 034/162] chore: refs #4074 drop workerCreate

---
 src/pages/Worker/WorkerCreate.vue | 245 ------------------------------
 src/router/modules/worker.js      |   9 --
 2 files changed, 254 deletions(-)
 delete mode 100644 src/pages/Worker/WorkerCreate.vue

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
deleted file mode 100644
index a1ded2bfd..000000000
--- a/src/pages/Worker/WorkerCreate.vue
+++ /dev/null
@@ -1,245 +0,0 @@
-<script setup>
-import { onBeforeMount, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-import { useUserConfig } from 'src/composables/useUserConfig';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-
-const { t } = useI18n();
-
-const companiesOptions = ref([]);
-const workersOptions = ref([]);
-const payMethodsOptions = ref([]);
-const bankEntitiesOptions = ref([]);
-const formData = ref({ isFreelance: false });
-const defaultPayMethod = ref(0);
-
-function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postcode = code;
-    data.city = town;
-    data.provinceFk = provinceFk;
-    data.countryFk = countryFk;
-}
-
-onBeforeMount(async () => {
-    const userInfo = await useUserConfig().fetch();
-    formData.value.companyFk = userInfo.companyFk;
-
-    const { data } = await axios.get('WorkerConfigs/findOne', {
-        params: { field: ['payMethodFk'] },
-    });
-    defaultPayMethod.value = data.payMethodFk;
-    formData.value.payMethodFk = defaultPayMethod.value;
-});
-</script>
-<template>
-    <FetchData
-        url="Companies"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Paymethods"
-        @on-fetch="(data) => (payMethodsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="BankEntities"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        auto-load
-    />
-    <QPage>
-        <VnSubToolbar>
-            <template #st-data>
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="false"
-                    :label="`${t('Internal')}`"
-                    @update:model-value="formData.payMethodFk = defaultPayMethod"
-                />
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="true"
-                    :label="`${t('External')}`"
-                    @update:model-value="delete formData.payMethodFk"
-                />
-            </template>
-        </VnSubToolbar>
-        <FormModel
-            url-create="Workers/new"
-            model="worker"
-            :form-initial-data="formData"
-            @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
-        >
-            <template #form="{ data, validate }">
-                <VnRow>
-                    <VnInput
-                        v-model="data.firstName"
-                        :label="t('worker.create.name')"
-                        :rules="validate('Worker.firstName')"
-                    />
-                    <VnInput
-                        v-model="data.lastNames"
-                        :label="t('worker.create.lastName')"
-                        :rules="validate('Worker.lastNames')"
-                    />
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('worker.create.code')"
-                        :rules="validate('Worker.code')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('worker.create.webUser')"
-                        :rules="validate('Worker.name')"
-                    />
-                    <VnInput
-                        v-model="data.email"
-                        :label="t('worker.create.personalEmail')"
-                        :rules="validate('Worker.email')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        hide-selected
-                        :rules="validate('Worker.company')"
-                    />
-                    <VnSelect
-                        :label="t('worker.create.boss')"
-                        v-model="data.bossFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        :rules="validate('Worker.boss')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                    <QItemLabel caption
-                                        >{{ scope.opt.nickname }},
-                                        {{ scope.opt.code }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.fi"
-                        :label="t('worker.create.fi')"
-                        :rules="validate('Worker.fi')"
-                    />
-                    <VnInputDate
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :rules="validate('Worker.birth')"
-                        :disable="formData.isFreelance"
-                    />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('worker.create.phone')"
-                        :rules="validate('Worker.phone')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                        :disable="formData.isFreelance"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        :label="t('worker.create.street')"
-                        v-model="data.street"
-                        :rules="validate('Worker.street')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.payMethods')"
-                        v-model="data.payMethodFk"
-                        :options="payMethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        :rules="validate('Worker.payMethodFk')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="(val) => !val && delete formData.payMethodFk"
-                    />
-                    <VnInput
-                        v-model="data.iban"
-                        :label="t('worker.create.iban')"
-                        :rules="validate('Worker.iban')"
-                        :disable="formData.isFreelance"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                    <VnSelectDialog
-                        :label="t('worker.create.bankEntity')"
-                        v-model="data.bankEntityFk"
-                        :options="bankEntitiesOptions"
-                        option-label="name"
-                        option-value="id"
-                        hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
-                        :rules="validate('Worker.bankEntity')"
-                        :disable="formData.isFreelance"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index f80df5e06..b40c411c2 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -52,15 +52,6 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                 },
-                {
-                    path: 'create',
-                    name: 'WorkerCreate',
-                    meta: {
-                        title: 'workerCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
-                },
             ],
         },
         {

From 6c3c03722f263203f5707f72ca021533e97dd3d4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 09:37:48 +0200
Subject: [PATCH 035/162] feat: refs #4074 useAcl in vnSelectDialog

---
 src/components/common/VnSelectDialog.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 6f2be4bfe..0ade82bda 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -27,17 +27,17 @@ const $props = defineProps({
 });
 
 const role = useRole();
-const acl = useAcl()
+const acl = useAcl();
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
-    if ($props.acls.length) console.log(acl.hasAny($props.acls));
-    return role.hasAny($props.rolesAllowedToCreate);
+    const hasMissingAcl = $props.acls.some(
+        (x) => !acl.hasAny(x.model, x.props, x.accessType)
+    );
+    const hasRequiredRole = role.hasAny($props.rolesAllowedToCreate);
+    if ($props.acls.length) return !hasMissingAcl;
+    return hasRequiredRole;
 });
-
-const toggleForm = () => {
-    showForm.value = !showForm.value;
-};
 </script>
 
 <template>
@@ -48,7 +48,7 @@ const toggleForm = () => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="toggleForm()"
+                @click.stop.prevent="showForm = true"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"

From 51fec906071e3f62300c780ecd48259aa66c2120 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 12:04:19 +0200
Subject: [PATCH 036/162] feat: refs #4074 useAcl in vnSelectDialog

---
 src/components/CreateNewPostcodeForm.vue                | 2 +-
 src/components/VnSelectProvince.vue                     | 2 +-
 src/pages/Customer/Card/CustomerBillingData.vue         | 2 +-
 src/pages/Customer/Card/CustomerFiscalData.vue          | 2 +-
 src/pages/Customer/CustomerCreate.vue                   | 2 +-
 src/pages/Customer/CustomerList.vue                     | 2 +-
 src/pages/Customer/components/CustomerAddressCreate.vue | 2 +-
 src/pages/Customer/components/CustomerAddressEdit.vue   | 2 +-
 src/pages/Supplier/Card/SupplierAddressesCreate.vue     | 2 +-
 src/pages/Supplier/Card/SupplierFiscalData.vue          | 2 +-
 src/pages/Worker/WorkerList.vue                         | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index e6247226e..14f629c42 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -104,7 +104,7 @@ async function setProvince(id, data) {
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
                     clearable
                 >
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index ea10ace19..2f08db611 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -38,7 +38,7 @@ async function onProvinceCreated(_, data) {
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
-        :roles-allowed-to-create="['deliveryAssistant']"
+        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
     >
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index b01dc4523..495b871df 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -70,7 +70,7 @@ const getBankEntities = (data, formData) => {
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     :options="bankEntitiesOptions"
-                    :roles-allowed-to-create="['salesAssistant', 'hr']"
+                    :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                     :rules="validate('Worker.bankEntity')"
                     hide-selected
                     option-label="name"
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..c2adace5e 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,7 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     v-model="data.postcode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..79da63283 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -86,7 +86,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..3c66b1281 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -412,7 +412,7 @@ function handleLocation(data, location) {
     >
         <template #more-create-dialog="{ data }">
             <VnLocation
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..88204cbaa 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -92,7 +92,7 @@ function handleLocation(data, location) {
 
             <VnLocation
                 :rules="validate('Worker.postcode')"
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..0be7e475a 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -176,7 +176,7 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.postalCode"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..6e51ee94e 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -83,7 +83,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index fd9667112..65c34c4ed 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -129,7 +129,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     v-model="data.postCode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 45bc41856..6a039b269 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -221,7 +221,7 @@ function uppercaseStreetModel(data) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
@@ -269,7 +269,7 @@ function uppercaseStreetModel(data) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :acls="[]"
+                        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                         :disable="data.isFreelance"
                     >
                         <template #form>

From c8ab5b3bfd64fe7a41a09d542705fa881e6e8f32 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 Aug 2024 14:57:09 +0200
Subject: [PATCH 037/162] feat: refs #7663 add setWeight menu opt (wip)

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

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index c7784bc2a..6ffae48ee 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -44,6 +44,7 @@ const actions = {
                 push({ name: 'TicketSummary', params: { id: clonedTicketId } });
         }
     },
+    setWeight: async () => {},
     remove: async () => {
         try {
             await axios.post(`Tickets/${ticketId}/setDeleted`);
@@ -146,10 +147,15 @@ async function sendSms(body) {
 }
 
 function openConfirmDialog(callback) {
+    const message =
+        callback == 'setWeight'
+            ? t('Es posible que se facture este ticket, desea continuar?')
+            : undefined;
     dialog({
         component: VnConfirm,
         componentProps: {
             promise: actions[callback],
+            message,
         },
     });
 }
@@ -253,6 +259,12 @@ function openConfirmDialog(callback) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem @click="openConfirmDialog('setWeight')" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="weight" />
+        </QItemSection>
+        <QItemSection>{{ t('Set weight') }}</QItemSection>
+    </QItem>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -282,4 +294,6 @@ es:
     To clone ticket: Clonar ticket
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
+    Set weight: Establecer peso
+    This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
 </i18n>

From 40e46f5a72917d6a5b3201eb862aaa714f04dab2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 18:13:46 +0200
Subject: [PATCH 038/162] fix: refs #7830 customer credit

---
 src/components/FetchData.vue                                | 2 +-
 src/pages/Customer/Card/CustomerCreditContracts.vue         | 3 +++
 src/pages/Customer/Card/CustomerCreditOpinion.vue           | 5 +++++
 .../Customer/components/CustomerCreditContractsCreate.vue   | 6 ++++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 2a0864d3e..3038aa88e 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -44,7 +44,7 @@ onMounted(async () => {
 
 async function fetch(fetchFilter = {}) {
     try {
-        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
+        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
         if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 568adcf0b..1110b9f65 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -53,6 +53,8 @@ const openDialog = (item) => {
             promise: updateData,
         },
     });
+    updateData();
+    showQPageSticky.value = true;
 };
 
 const openViewCredit = (credit) => {
@@ -65,6 +67,7 @@ const openViewCredit = (credit) => {
 };
 
 const updateData = () => {
+    console.log('entrando');
     vnPaginateRef.value?.fetch();
 };
 </script>
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 9c060b1a5..2b85cbd7d 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -71,6 +71,10 @@ watch(
         clientInformasRef.value?.fetch();
     }
 );
+
+const onDataSaved = () => {
+    clientInformasRef.value?.fetch();
+};
 </script>
 
 <template>
@@ -86,6 +90,7 @@ watch(
         :form-initial-data="{}"
         :observe-form-changes="false"
         :url-create="`Clients/${route.params.id}/setRating`"
+        @on-data-saved="onDataSaved"
     >
         <template #form="{ data }">
             <VnRow>
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c4434e870..c25e59e1a 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive } from 'vue';
+import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -10,10 +10,12 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const routeId = computed(() => route.params.id);
 const router = useRouter();
 
 const initialData = reactive({
-    clientFK: Number(route.params.id),
+    started: Date.vnNew(),
+    clientFk: routeId.value,
 });
 
 const toCustomerCreditContracts = () => {

From c31aa3258ff2f679fcb363d745a73e61a4285d3c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 18:15:16 +0200
Subject: [PATCH 039/162] fix: refs #7830 remove console.log

---
 src/pages/Customer/Card/CustomerCreditContracts.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 1110b9f65..7b72a4d6d 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -67,7 +67,6 @@ const openViewCredit = (credit) => {
 };
 
 const updateData = () => {
-    console.log('entrando');
     vnPaginateRef.value?.fetch();
 };
 </script>

From bd83a959f7895c0c032d41053f1659678a523a54 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 14 Aug 2024 10:11:52 +0200
Subject: [PATCH 040/162] fix: customer credit opinion

---
 .../Customer/Card/CustomerCreditOpinion.vue   | 50 +++++++------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 2b85cbd7d..c164ab450 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -16,7 +16,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { t } = useI18n();
 const route = useRoute();
 
-const clientInformasRef = ref(null);
+const clientInformasRef = ref();
 const rows = ref([]);
 
 const filter = {
@@ -71,45 +71,35 @@ watch(
         clientInformasRef.value?.fetch();
     }
 );
-
-const onDataSaved = () => {
-    clientInformasRef.value?.fetch();
-};
 </script>
 
 <template>
     <FetchData
+        ref="clientInformasRef"
+        url="ClientInformas"
         :filter="filter"
         @on-fetch="(data) => (rows = data)"
         auto-load
-        ref="clientInformasRef"
-        url="ClientInformas"
     />
-
     <FormModel
         :form-initial-data="{}"
-        :observe-form-changes="false"
         :url-create="`Clients/${route.params.id}/setRating`"
-        @on-data-saved="onDataSaved"
+        @on-data-saved="clientInformasRef.fetch()"
     >
         <template #form="{ data }">
             <VnRow>
-                <div class="col">
-                    <VnInput
-                        :label="t('Rating')"
-                        clearable
-                        type="number"
-                        v-model.number="data.rating"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Recommended credit')"
-                        clearable
-                        type="number"
-                        v-model.number="data.recommendedCredit"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Rating')"
+                    clearable
+                    type="number"
+                    v-model.number="data.rating"
+                />
+                <VnInput
+                    :label="t('Recommended credit')"
+                    clearable
+                    type="number"
+                    v-model.number="data.recommendedCredit"
+                />
             </VnRow>
         </template>
     </FormModel>
@@ -125,17 +115,13 @@ const onDataSaved = () => {
             class="card-width q-px-lg"
         >
             <template #body-cell-employee="{ row }">
-                <QTd auto-width @click.stop>
-                    <QBtn color="blue" flat no-caps>{{ row.worker.user.nickname }}</QBtn>
+                <QTd @click.stop>
+                    <span class="link">{{ row.worker.user.nickname }}</span>
                     <WorkerDescriptorProxy :id="row.clientFk" />
                 </QTd>
             </template>
         </QTable>
     </div>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
 </template>
 
 <i18n>

From e45e551526313668bfb315f5649e4dbd2943b9ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 Aug 2024 15:16:35 +0200
Subject: [PATCH 041/162] feat: customer consumption

---
 src/components/VnTable/VnTable.vue            |   4 +-
 src/components/ui/CatalogItem.vue             |   5 -
 src/components/ui/VnFilterPanel.vue           |   2 +
 src/composables/useArrayData.js               |  18 +-
 src/css/app.scss                              |   5 +
 src/i18n/locale/en.yml                        |   4 +
 src/i18n/locale/es.yml                        |   4 +
 src/pages/Customer/Card/CustomerCard.vue      |   8 +-
 .../Customer/Card/CustomerConsumption.vue     | 176 +++++++++++++++++-
 .../Card/CustomerConsumptionFilter.vue        |   2 +-
 src/pages/Customer/Card/CustomerSamples.vue   |  88 ++++-----
 src/pages/Login/ResetPassword.vue             |   1 -
 12 files changed, 249 insertions(+), 68 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d6b35d4da..6f22a4dd9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -67,7 +67,7 @@ const $props = defineProps({
     },
     hasSubToolbar: {
         type: Boolean,
-        default: true,
+        default: null,
     },
     disableOption: {
         type: Object,
@@ -341,7 +341,7 @@ defineExpose({
             :search-url="searchUrl"
             :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
-            :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
+            :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
         >
             <template
diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index ef722483b..545bfbbb4 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -127,11 +127,6 @@ const dialog = ref(null);
     flex-direction: column;
     gap: 4px;
 
-    .subName {
-        color: var(--vn-label-color);
-        text-transform: uppercase;
-    }
-
     p {
         margin-bottom: 0;
     }
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index e3019663c..045f45bec 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -3,6 +3,7 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
+import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -190,6 +191,7 @@ async function remove(key) {
 }
 
 function formatValue(value) {
+    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..446816788 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,12 +86,26 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        if (filter?.where || store.filter?.where)
-            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        // ARRAY DATA FALLA AL JUNTAR WHERE'S
+        console.log(
+            'userParams?.filter?.where: ',
+            userParams?.filter?.where,
+            filter?.where,
+            store.filter?.where
+        );
+        if ((userParams?.filter?.where, filter?.where || store.filter?.where))
+            where = Object.assign(
+                userParams?.filter?.where ?? {},
+                filter?.where ?? {},
+                store.filter?.where ?? {}
+            );
         Object.assign(filter, store.filter);
         filter.where = where;
+        console.log('where: ', where);
         const params = { filter };
+        console.log('params: ', params);
 
+        delete userParams?.filter;
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
         if (store.order && store.order.length) params.filter.order = store.order;
diff --git a/src/css/app.scss b/src/css/app.scss
index c233b14f0..85a39b480 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -268,3 +268,8 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+
+.subName {
+    color: var(--vn-label-color);
+    text-transform: uppercase;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7d3682525..69373e23b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -93,6 +93,10 @@ globals:
     since: Since
     from: From
     to: To
+    quantity: Quantity
+    item: Item
+    ticket: Ticket
+    campaign: Campaign
     pageTitles:
         logIn: Login
         summary: Summary
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8157f1803..48b2d3ad4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -93,6 +93,10 @@ globals:
     since: Desde
     from: Desde
     to: Hasta
+    quantity: Cantidad
+    item: Artículo
+    ticket: Ticket
+    campaign: Campaña
     pageTitles:
         logIn: Inicio de sesión
         summary: Resumen
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 229946ea2..9562be001 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,14 +1,20 @@
 <script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import CustomerFilter from '../CustomerFilter.vue';
+const route = useRoute();
+
+const routeName = computed(() => route.name);
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        :filter-panel="CustomerFilter"
+        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
             url: 'Clients/extendedListFilter',
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 98a3115da..835223488 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,17 +1,183 @@
 <script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
-import { useStateStore } from 'src/stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useRoute } from 'vue-router';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
 const { t } = useI18n();
+const route = useRoute();
+const campaignList = ref();
+const columns = computed(() => [
+    {
+        name: 'search',
+        align: 'left',
+        label: t('globals.search'),
+        visible: false,
+    },
+    {
+        name: 'itemFk',
+        align: 'left',
+        label: t('globals.item'),
+        columnClass: 'shrink',
+        columnFilter: {
+            name: 'itemId',
+        },
+    },
+    {
+        name: 'ticketFk',
+        align: 'left',
+        label: t('globals.ticket'),
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        name: 'shipped',
+        align: 'left',
+        label: t('globals.shipped'),
+        format: ({ shipped }) => toDate(shipped),
+        columnFilter: false,
+    },
+    {
+        name: 'description',
+        align: 'left',
+        label: t('globals.description'),
+    },
+    {
+        name: 'quantity',
+        label: t('globals.quantity'),
+    },
+    {
+        name: 'grouped',
+        label: t('Group by items'),
+        component: 'checkbox',
+        visible: false,
+        orderBy: false,
+    },
+]);
+
+onBeforeMount(async () => {
+    campaignList.value = (await axios('Campaigns/latest')).data;
+});
+
+const filter = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        campaign: campaignList.value[0]?.id,
+        from: minDate,
+        to: maxDate,
+        filter: {
+            where: {
+                clientFk: route.params.id,
+            },
+        },
+    };
+});
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </Teleport>
+    <VnTable
+        v-if="campaignList"
+        data-key="CustomerConsumption"
+        url="Clients/consumption"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :columns="columns"
+        search-url="consumption"
+        :user-params="filter"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :has-sub-toolbar="true"
+        auto-load
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                color="primary"
+                icon="delete"
+                flat
+                @click="remove(selected)"
+                :disable="!selected?.length"
+                :title="t('globals.remove')"
+            />
+        </template>
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-description="{ row }">
+            <div>{{ row.concept }}</div>
+            <div v-if="row.subName" class="subName">
+                {{ row.subName }}
+            </div>
+            <FetchedTags :item="row" :max-length="3" />
+        </template>
+        <template #moreFilterPanel="{ params }">
+            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
+                <VnSelect
+                    v-model="params.campaign"
+                    :options="campaignList"
+                    :label="t('globals.campaign')"
+                    :filled="true"
+                    class="q-px-sm q-pt-none fit"
+                    dense
+                    option-label="code"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }}
+                                    {{
+                                        new Date(scope.opt?.dated).getFullYear()
+                                    }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInputDate
+                    v-model="params.to"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+                <VnInputDate
+                    v-model="params.from"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+            </div>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
     Enter a new search: Introduce una nueva búsqueda
+    Group by items: Agrupar por artículos
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..31289c007 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
 </script>
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" search-url="consumption">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index de998d8d3..e28e290f4 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -26,27 +26,20 @@ const filter = {
     limit: 20,
 };
 
+const basicSpan = {
+    component: 'span',
+    props: () => {},
+    event: () => {},
+};
 const tableColumnComponents = {
-    sent: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    description: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
+    sent: basicSpan,
+    description: basicSpan,
     worker: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    company: {
         component: 'span',
-        props: () => {},
+        props: () => ({ class: 'link' }),
         event: () => {},
     },
+    company: basicSpan,
 };
 
 const columns = computed(() => [
@@ -90,41 +83,34 @@ const toCustomerSamplesCreate = () => {
         url="ClientSamples"
     />
 
-    <div class="full-width flex justify-center">
-        <QPage class="card-width q-pa-lg">
-            <QTable
-                :columns="columns"
-                :pagination="{ rowsPerPage: 12 }"
-                :rows="rows"
-                class="full-width q-mt-md"
-                row-key="id"
-                :no-data-label="t('globals.noResults')"
-            >
-                <template #body-cell="props">
-                    <QTd :props="props">
-                        <QTr :props="props" class="cursor-pointer">
-                            <component
-                                :is="tableColumnComponents[props.col.name].component"
-                                class="col-content"
-                                v-bind="
-                                    tableColumnComponents[props.col.name].props(props)
-                                "
-                                @click="
-                                    tableColumnComponents[props.col.name].event(props)
-                                "
-                            >
-                                {{ props.value }}
-                                <WorkerDescriptorProxy
-                                    :id="props.row.userFk"
-                                    v-if="props.col.name === 'worker'"
-                                />
-                            </component>
-                        </QTr>
-                    </QTd>
-                </template>
-            </QTable>
-        </QPage>
-    </div>
+    <QTable
+        :columns="columns"
+        :pagination="{ rowsPerPage: 12 }"
+        :rows="rows"
+        class="full-width q-mt-md"
+        row-key="id"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell="props">
+            <QTd auto-width :props="props">
+                <span :props="props" class="cursor-pointer">
+                    <component
+                        :is="tableColumnComponents[props.col.name].component"
+                        class="col-content"
+                        v-bind="tableColumnComponents[props.col.name].props(props)"
+                        @click="tableColumnComponents[props.col.name].event(props)"
+                        :title="props.value"
+                    >
+                        {{ props.value }}
+                        <WorkerDescriptorProxy
+                            :id="props.row.userFk"
+                            v-if="props.col.name === 'worker'"
+                        />
+                    </component>
+                </span>
+            </QTd>
+        </template>
+    </QTable>
 
     <QPageSticky :offset="[18, 18]">
         <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue
index eff718e97..2751f1ceb 100644
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@@ -33,7 +33,6 @@ async function onSubmit() {
     };
 
     try {
-        console.log('newPassword: ', newPassword);
         await axios.post(
             'VnUsers/reset-password',
             { newPassword: newPassword.value },

From f927e9b722e7c470487f4c711ba67aff0fc156f7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 19 Aug 2024 14:31:52 +0200
Subject: [PATCH 042/162] fix: #6943 fix customerSummaryTable

---
 .../components/CustomerSummaryTable.vue       | 31 +++++++++----------
 .../CustomerSummaryTableActions.vue           | 10 +++++-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index dc9969b61..c25870fd8 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -162,7 +162,8 @@ const navigateToticketSummary = (id) => {
         params: { id },
     });
 };
-const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
+const commonColumns = (col) =>
+    ['date', 'state', 'total', 'route', 'nickname'].includes(col);
 </script>
 
 <template>
@@ -190,13 +191,19 @@ const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
                             v-bind="tableColumnComponents[props.col.name].props(props)"
                         >
                             <template v-if="!commonColumns(props.col.name)">
-                                <span
-                                    :class="{
-                                        link:
-                                            props.col.name === 'route' ||
-                                            props.col.name === 'nickname',
-                                    }"
-                                >
+                                <span>
+                                    {{ props.value }}
+                                </span>
+                            </template>
+                            <template v-if="props.col.name === 'route'">
+                                <span class="link" @click.stop>
+                                    <RouteDescriptorProxy :id="props.row.routeFk" />
+                                    {{ props.value }}
+                                </span>
+                            </template>
+                            <template v-if="props.col.name === 'nickname'">
+                                <span class="link" @click.stop>
+                                    <CustomerDescriptorProxy :id="props.row.clientFk" />
                                     {{ props.value }}
                                 </span>
                             </template>
@@ -220,14 +227,6 @@ const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
                                 </QBadge>
                                 <div v-else>{{ toCurrency(props.value) }}</div>
                             </template>
-                            <CustomerDescriptorProxy
-                                :id="props.row.clientFk"
-                                v-if="props.col.name === 'nickname'"
-                            />
-                            <RouteDescriptorProxy
-                                :id="props.row.routeFk"
-                                v-if="props.col.name === 'route'"
-                            />
                         </component>
                     </QTr>
                 </QTd>
diff --git a/src/pages/Customer/components/CustomerSummaryTableActions.vue b/src/pages/Customer/components/CustomerSummaryTableActions.vue
index 6e9038374..154a37d22 100644
--- a/src/pages/Customer/components/CustomerSummaryTableActions.vue
+++ b/src/pages/Customer/components/CustomerSummaryTableActions.vue
@@ -1,10 +1,12 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
 
 const { t } = useI18n();
+const router = useRouter();
 
 defineProps({
     id: {
@@ -18,7 +20,13 @@ const { viewSummary } = useSummaryDialog();
 
 <template>
     <div>
-        <QIcon color="primary" name="vn:lines" size="sm">
+        {{ id }}
+        <QIcon
+            color="primary"
+            name="vn:lines"
+            size="sm"
+            @click.stop="router.push({ params: { id }, name: 'TicketSale' })"
+        >
             <QTooltip>
                 {{ t('Go to lines') }}
             </QTooltip>

From bc1ea611cede24ec2ac8ad95e17ef10d97862866 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 10:34:54 +0200
Subject: [PATCH 043/162] feat: CustomerConsumptionFilter

---
 .../Card/CustomerConsumptionFilter.vue        | 93 ++++++++++++++++++-
 .../Card/SupplierConsumptionFilter.vue        | 52 +++--------
 2 files changed, 102 insertions(+), 43 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..91536e954 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -5,6 +5,8 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { QItem } from 'quasar';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
 
 const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
@@ -33,6 +35,8 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.buyerId"
                         url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         :label="t('params.buyer')"
                         option-value="id"
                         option-label="nickname"
@@ -48,30 +52,93 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.typeId"
                         url="ItemTypes"
-                        :label="t('params.type')"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
                         option-label="name"
                         option-value="id"
                         dense
                         outlined
                         rounded
                     >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
                     </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
+                        v-model="params.categoryId"
                         url="ItemCategories"
-                        :label="t('params.category')"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
                         option-label="name"
                         option-value="id"
-                        v-model="params.categoryId"
                         dense
                         outlined
                         rounded
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <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>
         </template>
     </VnFilterPanel>
 </template>
@@ -82,10 +149,30 @@ en:
         buyer: Buyer
         type: Type
         category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
 es:
     params:
         item: Id artículo
         buyer: Comprador
         type: Tipo
         category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
 </i18n>
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 3fc61b15e..401bde8fa 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -1,56 +1,21 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 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({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const buyersOptions = ref([]);
-const itemTypesOptions = ref([]);
-const itemCategoriesOptions = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        :filter="{
-            fields: ['id', 'nickname'],
-            order: 'nickname ASC',
-        }"
-        @on-fetch="(data) => (buyersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemTypes"
-        :filter="{
-            fields: ['id', 'name', 'categoryFk'],
-            include: 'category',
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemTypesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemCategories"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemCategoriesOptions = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -82,7 +47,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
                         @update:model-value="searchFn()"
-                        :options="buyersOptions"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
@@ -98,7 +65,10 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.typeId')"
                         v-model="params.typeId"
                         @update:model-value="searchFn()"
-                        :options="itemTypesOptions"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -125,7 +95,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
                         @update:model-value="searchFn()"
-                        :options="itemCategoriesOptions"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 0d99c5f609ce7e7a73b995669f028bfddeca4d01 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 15:30:22 +0200
Subject: [PATCH 044/162] feat: CustomerConsumptionFilter

---
 src/composables/usePrintService.js            |   1 +
 .../Customer/Card/CustomerConsumption.vue     | 166 ++++++++++++++++++
 .../Card/CustomerConsumptionFilter.vue        |  15 +-
 3 files changed, 180 insertions(+), 2 deletions(-)

diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index edf9598b2..ff43c65a1 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -17,6 +17,7 @@ export function usePrintService() {
     }
 
     function openReport(path, params) {
+        if (typeof params === 'string') params = JSON.parse(params);
         params = Object.assign(
             {
                 access_token: getTokenMultimedia(),
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 4d3da1116..a8c34991a 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,15 +1,181 @@
 <script setup>
+import { computed, ref, watch } from 'vue';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import { toDate } from 'src/filters';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
+import { usePrintService } from 'src/composables/usePrintService';
+import SendEmailDialog from 'src/components/common/SendEmailDialog.vue';
+
+const { openReport, sendEmail } = usePrintService();
+const arrayData = useArrayData('Client');
+const { t } = useI18n();
+const quasar = useQuasar();
+
+const route = useRoute();
+const tableRef = ref();
+const filter = computed(() => ({
+    where: { and: [{ isPackaging: false }, { clientFk: route.params.id }] },
+    limit: 30,
+    skip: 10,
+}));
+
+const showActionBtns = computed(() => handleQueryParams());
+function handleQueryParams() {
+    const query = JSON.parse(route.query.table);
+    return query.from && query.to;
+}
+watch(
+    () => route.query,
+    () => {
+        showActionBtns.value = handleQueryParams();
+    }
+);
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'ticketFk',
+        label: t('Ticket'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('Creation date'),
+        format: ({ shipped }) => toDate(shipped),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+
+    {
+        align: 'left',
+        name: 'description',
+        label: t('Description'),
+        class: 'extend',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'quantity',
+        label: t('Quantity'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+]);
+function getParams() {
+    const query = JSON.parse(route.query.table);
+    return {
+        from: query.from,
+        to: query.to,
+        recipient: arrayData.store.data.email,
+        recipientId: arrayData.store.data.id,
+    };
+}
+const openReportPdf = () => {
+    openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
+};
+
+const openSendEmailDialog = async () => {
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: arrayData.store.data.email,
+            },
+            promise: sendCampaignMetricsEmail,
+        },
+    });
+};
+const sendCampaignMetricsEmail = ({ address }) => {
+    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+        recipient: address,
+        ...getParams().value,
+    });
+};
 </script>
 
 <template>
     <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
         <CustomerConsumptionFilter data-key="CustomerConsumption" />
     </Teleport>
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn
+                color="primary"
+                icon-right="picture_as_pdf"
+                @click="openReportPdf()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                color="primary"
+                icon-right="email"
+                @click="openSendEmailDialog()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
+    <VnTable
+        data-key="CustomerConsumption"
+        ref="tableRef"
+        :filter="filter"
+        url="Clients/Consumption"
+        :columns="columns"
+        :right-search="false"
+        :use-model="true"
+        auto-load
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+    >
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+            <!-- <FetchedTags :item="row" :max-length="6" /> -->
+        </template>
+        <template #column-description="{ row }">
+            <FetchedTags :item="row" :max-length="6" />
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span> </template
+    ></VnTable>
 </template>
 
 <i18n>
 es:
+    Group by item: Agrupar por artículo
+
     Enter a new search: Introduce una nueva búsqueda
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 91536e954..0f5148007 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -12,14 +12,23 @@ const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
 </script>
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection
+                    ><QCheckbox
+                        v-model="params.grouped"
+                        :label="t('Group by item')"
+                        @update:model-value="searchFn()"
+                        dense
+                /></QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -145,6 +154,7 @@ defineProps({ dataKey: { type: String, required: true } });
 <i18n>
 en:
     params:
+        grouped: Group by item
         item: Item id
         buyer: Buyer
         type: Type
@@ -161,6 +171,7 @@ en:
         allSaints: All Saints' Day
 es:
     params:
+        grouped: Agrupar por artículo
         item: Id artículo
         buyer: Comprador
         type: Tipo

From 56f687ce3603e2383b4066c48b9445132e6fc4e9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 21:06:15 +0200
Subject: [PATCH 045/162] perf: sendEmail customerConsumption

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Customer/Card/CustomerConsumption.vue     | 38 ++++----
 .../Card/CustomerConsumptionFilter.vue        |  2 +-
 src/pages/Ticket/Card/TicketTransfer.vue      | 29 ++-----
 src/pages/Ticket/Card/TicketTransferForm.vue  | 86 +++++++++++++++++++
 6 files changed, 111 insertions(+), 46 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketTransferForm.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index aa7e83fb3..0c0ede5f7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -2,6 +2,7 @@ globals:
     lang:
         es: Spanish
         en: English
+    quantity: Quantity
     language: Language
     entity: Entity
     user: User
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 100bf54ad..e4392627c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -3,6 +3,7 @@ globals:
         es: Español
         en: Inglés
     language: Idioma
+    quantity: Cantidad
     entity: Entidad
     user: Usuario
     details: Detalles
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index a8c34991a..eddabc154 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { computed, ref, watch } from 'vue';
-import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
 import { useStateStore } from 'src/stores/useStateStore';
@@ -13,12 +12,12 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
-import SendEmailDialog from 'src/components/common/SendEmailDialog.vue';
+import { useVnConfirm } from 'src/composables/useVnConfirm';
 
+const { openConfirmationModal } = useVnConfirm();
 const { openReport, sendEmail } = usePrintService();
 const arrayData = useArrayData('Client');
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const route = useRoute();
 const tableRef = ref();
@@ -61,7 +60,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
-        label: t('Creation date'),
+        label: t('shipped'),
         format: ({ shipped }) => toDate(shipped),
         cardVisible: true,
         columnFilter: {
@@ -72,7 +71,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'description',
-        label: t('Description'),
+        label: t('globals.description'),
         class: 'extend',
         columnFilter: {
             inWhere: true,
@@ -81,7 +80,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'quantity',
-        label: t('Quantity'),
+        label: t('globals.quantity'),
         cardVisible: true,
         columnFilter: {
             inWhere: true,
@@ -102,20 +101,16 @@ const openReportPdf = () => {
 };
 
 const openSendEmailDialog = async () => {
-    quasar.dialog({
-        component: SendEmailDialog,
-        componentProps: {
-            data: {
-                address: arrayData.store.data.email,
-            },
-            promise: sendCampaignMetricsEmail,
-        },
-    });
+    openConfirmationModal(
+        t('The consumption report will be sent'),
+        t('Please, confirm'),
+        () => sendCampaignMetricsEmail({ address: arrayData.store.data.email })
+    );
 };
 const sendCampaignMetricsEmail = ({ address }) => {
-    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+    sendEmail(`Clients/${route.params.id}/campaign-metrics-email`, {
         recipient: address,
-        ...getParams().value,
+        ...getParams(),
     });
 };
 </script>
@@ -140,7 +135,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 @click="openSendEmailDialog()"
                 :disabled="!showActionBtns"
             >
-                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+                <QTooltip>{{ t('Send to email') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -160,7 +155,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
-            <!-- <FetchedTags :item="row" :max-length="6" /> -->
         </template>
         <template #column-description="{ row }">
             <FetchedTags :item="row" :max-length="6" />
@@ -175,7 +169,9 @@ const sendCampaignMetricsEmail = ({ address }) => {
 
 <i18n>
 es:
-    Group by item: Agrupar por artículo
-
+    Send to email: Enviar por email
+    Search by item id or name: Buscar por id de artículo o nombre
+    The consumption report will be sent: Se enviará el informe de consumo
+    Please, confirm: Por favor, confirma
     Enter a new search: Introduce una nueva búsqueda
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 0f5148007..52e6cdc79 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -24,7 +24,7 @@ defineProps({ dataKey: { type: String, required: true } });
                 <QItemSection
                     ><QCheckbox
                         v-model="params.grouped"
-                        :label="t('Group by item')"
+                        :label="t('params.grouped')"
                         @update:model-value="searchFn()"
                         dense
                 /></QItemSection>
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 9a22c764c..1944b80f4 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
+import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
@@ -135,9 +136,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :columns="destinationTicketColumns"
                 :title="t('Destination ticket')"
                 row-key="id"
-                :pagination="{ rowsPerPage: 0 }"
                 class="full-width q-mt-md"
-                :no-data-label="t('globals.noResults')"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,29 +157,11 @@ onMounted(() => (_transfer.value = $props.transfer));
                     </QTd>
                 </template>
 
+                <template #no-data>
+                    <TicketTransferForm v-bind="$props" />
+                </template>
                 <template #bottom>
-                    <QForm class="q-mt-lg full-width">
-                        <VnInput
-                            v-model.number="_transfer.ticketId"
-                            :label="t('Transfer to ticket')"
-                            :clearable="false"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="keyboard_arrow_right"
-                                    color="primary"
-                                    @click="transferSales(_transfer.ticketId)"
-                                    style="width: 30px"
-                                />
-                            </template>
-                        </VnInput>
-                        <QBtn
-                            :label="t('New ticket')"
-                            color="primary"
-                            class="full-width q-my-lg"
-                            @click="transferSales()"
-                        />
-                    </QForm>
+                    <TicketTransferForm v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
new file mode 100644
index 000000000..9507429e6
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+
+const $props = defineProps({
+    mana: {
+        type: Number,
+        default: null,
+    },
+    newPrice: {
+        type: Number,
+        default: 0,
+    },
+    transfer: {
+        type: Object,
+        default: () => {},
+    },
+    ticket: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['refreshData']);
+
+const router = useRouter();
+const { t } = useI18n();
+
+const _transfer = ref(null);
+
+const transferSales = async (ticketId) => {
+    const params = {
+        ticketId: ticketId,
+        sales: $props.transfer.sales,
+    };
+
+    const { data } = await axios.post(
+        `tickets/${$props.ticket.id}/transferSales`,
+        params
+    );
+
+    if (data && data.id === $props.ticket.id) emit('refreshData');
+    else router.push({ name: 'TicketSale', params: { id: data.id } });
+};
+
+onMounted(() => (_transfer.value = $props.transfer));
+</script>
+
+<template>
+    {{ _transfer }}
+    <QForm class="q-mt-lg full-width">
+        <VnInput
+            v-model.number="_transfer.ticketId"
+            :label="t('Transfer to ticket')"
+            :clearable="false"
+        >
+            <template #append>
+                <QBtn
+                    icon="keyboard_arrow_right"
+                    color="primary"
+                    @click="transferSales(_transfer.ticketId)"
+                    style="width: 30px"
+                />
+            </template>
+        </VnInput>
+        <QBtn
+            :label="t('New ticket')"
+            color="primary"
+            class="full-width q-my-lg"
+            @click="transferSales()"
+        />
+    </QForm>
+</template>
+
+<i18n>
+es:
+    Sales to transfer: Líneas a transferir
+    Destination ticket: Ticket destinatario
+    Transfer to ticket: Transferir a ticket
+    New ticket: Nuevo ticket
+</i18n>

From 6c887c36b10f302d419d794b644e45069111fb9d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Aug 2024 12:26:21 +0200
Subject: [PATCH 046/162] fix: CustomerDescriptor.bussinessTypeFk

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

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 0e76bcfed..ed68d1ce6 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -68,7 +68,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
             </VnLv>
             <VnLv
                 :label="t('customer.card.businessTypeFk')"
-                :value="entity.businessTypeFk"
+                :value="entity.businessType.description"
             />
         </template>
         <template #icons="{ entity }">

From 9a48cb07428c23769e72b0074bc55fcfac39c3e1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Aug 2024 12:26:31 +0200
Subject: [PATCH 047/162] feat: VnImg draggable

---
 src/components/ui/VnImg.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 9585b81d8..7dbc3ac2a 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -52,6 +52,7 @@ defineExpose({
 </script>
 <template>
     <QImg
+        :draggable="true"
         :class="{ zoomIn: zoom }"
         :src="getUrl()"
         v-bind="$attrs"
@@ -60,6 +61,7 @@ defineExpose({
     />
     <QDialog v-if="$props.zoom" v-model="show">
         <QImg
+            :draggable="true"
             :src="getUrl(true)"
             v-bind="$attrs"
             spinner-color="primary"

From 10747d7a4ff49d7057e3d49425e5075871dc2958 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:28 +0200
Subject: [PATCH 048/162] perf: customerSummaryTable

---
 src/components/VnTable/VnTable.vue            |  16 +-
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   2 +
 src/pages/Customer/Card/CustomerSummary.vue   |  32 ++-
 .../components/CustomerSummaryTable.vue       | 249 ++++++++----------
 .../CustomerSummaryTableActions.vue           |  52 ----
 6 files changed, 139 insertions(+), 213 deletions(-)
 delete mode 100644 src/pages/Customer/components/CustomerSummaryTableActions.vue

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6c77d44df..1708f9b6c 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -65,6 +65,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    disableInfiniteScroll: {
+        type: Boolean,
+        default: false,
+    },
     hasSubToolbar: {
         type: Boolean,
         default: true,
@@ -335,11 +339,13 @@ defineExpose({
     <div class="q-px-md">
         <CrudModel
             v-bind="$attrs"
-            :limit="20"
+            :limit="$attrs['limit'] ?? 20"
             ref="CrudModelRef"
             @on-fetch="(...args) => emit('onFetch', ...args)"
             :search-url="searchUrl"
-            :disable-infinite-scroll="isTableMode"
+            :disable-infinite-scroll="
+                $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+            "
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
@@ -486,11 +492,7 @@ defineExpose({
                                 :icon="btn.icon"
                                 class="q-px-sm"
                                 flat
-                                :class="
-                                    btn.isPrimary
-                                        ? 'text-primary-light'
-                                        : 'color-vn-text '
-                                "
+                                :class="'text-primary-light'"
                                 :style="`visibility: ${
                                     (btn.show && btn.show(row)) ?? true
                                         ? 'visible'
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0c0ede5f7..7bb4dcd64 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -375,6 +375,7 @@ customer:
         averageInvoiced: Average invoiced
         claimRate: Claming rate
         risk: Risk
+        maximumRisk: Solunion's maximum risk
         riskInfo: Invoices minus payments plus orders not yet invoiced
         credit: Credit
         creditInfo: Company's maximum risk
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e4392627c..bc0934e6d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -373,6 +373,8 @@ customer:
         priceIncreasingRate: Ratio de incremento de precio
         averageInvoiced: Facturación media
         claimRate: Ratio de reclamaciones
+        maximumRisk: Riesgo máximo asumido por Solunion
+
         risk: Riesgo
         riskInfo: Facturas menos recibos mas pedidos sin facturar
         credit: Crédito
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 15bf19b48..cee8b7c0a 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -2,6 +2,8 @@
 import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -40,11 +42,11 @@ const balanceDue = computed(() => {
 const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
-    return customer.value.claimsRatio.claimingRate;
+    return customer.value.claimsRatio?.claimingRate ?? 0;
 });
 
 const priceIncreasingRate = computed(() => {
-    return customer.value.claimsRatio.priceIncreasing / 100;
+    return customer.value.claimsRatio?.priceIncreasing ?? 0 / 100;
 });
 
 const debtWarning = computed(() => {
@@ -91,7 +93,13 @@ const creditWarning = computed(() => {
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
                     :value="entity?.salesPersonUser?.name"
-                />
+                >
+                    <template #value>
+                        <VnUserLink
+                            :name="entity.salesPersonUser?.name"
+                            :worker-id="entity.salesPersonFk"
+                        /> </template
+                ></VnLv>
                 <VnLv
                     :label="t('customer.summary.contactChannel')"
                     :value="entity?.contactChannel?.name"
@@ -131,7 +139,7 @@ const creditWarning = computed(() => {
                     :url="`#/customer/${entityId}/fiscal-data`"
                     :text="t('customer.summary.fiscalData')"
                 />
-                <VnRow>
+                <VnRow class="block">
                     <VnLv
                         :label="t('customer.summary.isEqualizated')"
                         :value="entity.isEqualizated"
@@ -140,8 +148,8 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.isActive')"
                         :value="entity.isActive"
                     />
-                </VnRow>
-                <VnRow>
+                    <!-- </VnRow>
+                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.verifiedData')"
                         :value="entity.isTaxDataChecked"
@@ -150,8 +158,8 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.hasToInvoice')"
                         :value="entity.hasToInvoice"
                     />
-                </VnRow>
-                <VnRow>
+                    <!-- </VnRow>
+                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
@@ -170,7 +178,7 @@ const creditWarning = computed(() => {
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
-                <VnRow class="q-mt-sm" wrap>
+                <VnRow class="q-mt-sm block">
                     <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
                     <VnLv
                         :label="t('customer.summary.hasCoreVnl')"
@@ -227,7 +235,6 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.mana?.mana)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.priceIncreasingRate')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
@@ -236,7 +243,6 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.averageInvoiced?.invoiced)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
@@ -262,12 +268,10 @@ const creditWarning = computed(() => {
                 />
 
                 <VnLv
-                    v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
                     :value="toCurrency(entity.creditInsurance)"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
-
                 <VnLv
                     :label="t('customer.summary.balance')"
                     :value="toCurrency(entity.sumRisk) || toCurrency(0)"
@@ -297,7 +301,7 @@ const creditWarning = computed(() => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard>
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index c25870fd8..da310934d 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -1,22 +1,25 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { QBtn, date } from 'quasar';
+import { date } from 'quasar';
+import { toDateFormat } from 'src/filters/date.js';
 
 import { toCurrency } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
-import CustomerSummaryTableActions from './CustomerSummaryTableActions.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
+
+import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+// import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-
-const rows = ref([]);
+const { viewSummary } = useSummaryDialog();
 
 const filter = {
     include: [
@@ -32,57 +35,6 @@ const filter = {
     ],
     where: { clientFk: route.params.id },
     order: ['shipped DESC', 'id'],
-    limit: 10,
-};
-
-const tableColumnComponents = {
-    id: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    nickname: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    agency: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    route: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: () => {},
-    },
-    packages: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    date: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    state: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    total: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    actions: {
-        component: CustomerSummaryTableActions,
-        props: (prop) => ({
-            id: prop.row.id,
-        }),
-        event: () => {},
-    },
 };
 
 const columns = computed(() => [
@@ -94,21 +46,18 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'nickname',
         label: t('Nickname'),
         name: 'nickname',
     },
     {
         align: 'left',
-        field: (row) => row?.agencyMode?.name,
+        format: (row) => row.agencyMode.name,
         label: t('Agency'),
-        name: 'agency',
     },
     {
         align: 'left',
-        field: 'routeFk',
+        name: 'routeFk',
         label: t('Route'),
-        name: 'route',
     },
     {
         align: 'left',
@@ -118,13 +67,12 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: (row) => date.formatDate(row?.shipped, 'DD/MM/YYYY'),
+        format: ({ shipped }) => date.formatDate(shipped, 'DD/MM/YYYY'),
         label: t('Date'),
-        name: 'date',
+        name: 'shipped',
     },
     {
         align: 'left',
-        field: (row) => row?.ticketState?.state?.name,
         label: t('State'),
         name: 'state',
     },
@@ -134,11 +82,26 @@ const columns = computed(() => [
         label: t('Total'),
         name: 'total',
     },
+
     {
-        align: 'left',
-        field: 'totalWithVat',
+        align: 'right',
         label: '',
-        name: 'actions',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'vn:lines',
+                action: ({ id }) =>
+                    router.push({ params: { id }, name: 'TicketSummary' }),
+                isPrimary: true,
+            },
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row.id, TicketSummary),
+            },
+        ],
     },
 ]);
 
@@ -156,83 +119,89 @@ const setTotalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const navigateToticketSummary = (id) => {
-    router.push({
-        name: 'TicketSummary',
-        params: { id },
-    });
+const setShippedColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    const ticketShipped = new Date(date);
+    ticketShipped.setHours(0, 0, 0, 0);
+
+    const difference = today - ticketShipped;
+
+    if (difference == 0) return 'warning';
+    if (difference < 0) return 'success';
 };
-const commonColumns = (col) =>
-    ['date', 'state', 'total', 'route', 'nickname'].includes(col);
 </script>
 
 <template>
-    <FetchData
+    <VnTable
+        data-key="CustomerTickets"
         :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
         url="Tickets"
-    />
-    <QCard class="vn-one q-py-sm flex justify-between">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width"
-            row-key="id"
-        >
-            <template #body-cell="props">
-                <QTd :props="props" @click="navigateToticketSummary(props.row.id)">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                            class="rounded-borders"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                        >
-                            <template v-if="!commonColumns(props.col.name)">
-                                <span>
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'route'">
-                                <span class="link" @click.stop>
-                                    <RouteDescriptorProxy :id="props.row.routeFk" />
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'nickname'">
-                                <span class="link" @click.stop>
-                                    <CustomerDescriptorProxy :id="props.row.clientFk" />
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'date'">
-                                <QBadge class="q-pa-sm" color="warning">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'state'">
-                                <QBadge :color="setStateColor(props.row)" class="q-pa-sm">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'total'">
-                                <QBadge
-                                    :color="setTotalPriceColor(props.row)"
-                                    class="q-pa-sm"
-                                    v-if="setTotalPriceColor(props.row)"
-                                >
-                                    {{ toCurrency(props.value) }}
-                                </QBadge>
-                                <div v-else>{{ toCurrency(props.value) }}</div>
-                            </template>
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QCard>
+        :columns="columns"
+        search-url="tickets"
+        :without-header="true"
+        auto-load
+        order="shipped DESC, id"
+        limit="5"
+    >
+        <template #column-nickname="{ row }">
+            <span class="link">
+                {{ row.nickname }}
+                <TicketDescriptorProxy :id="row.nickname" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+
+        <template #column-routeFk="{ row }">
+            <span class="link">
+                {{ row.routeFk }}
+                <RouteDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-total="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                v-if="setTotalPriceColor(row)"
+                :color="setTotalPriceColor(row)"
+            >
+                <!-- {{ setTotalPriceColor(row) }} -->
+                {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
+            <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
+        </template>
+        <template #column-state="{ row }">
+            <span v-if="row.invoiceOut">
+                <span :class="{ link: row.invoiceOut.ref }">
+                    {{ row.invoiceOut.ref }}
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />
+                </span>
+            </span>
+            <QBadge
+                class="q-pa-sm"
+                :color="setStateColor(row)"
+                v-else-if="setStateColor(row)"
+            >
+                {{ row?.ticketState?.state.name }}
+            </QBadge>
+            <span v-else> {{ row?.ticketState?.state.name }}</span>
+        </template>
+        <template #column-shipped="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                :color="setShippedColor(row.shipped)"
+                v-if="setShippedColor(row.shipped)"
+            >
+                {{ toDateFormat(row.shipped) }}
+            </QBadge>
+            <span v-else> {{ toDateFormat(row.shipped) }}</span>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/components/CustomerSummaryTableActions.vue b/src/pages/Customer/components/CustomerSummaryTableActions.vue
deleted file mode 100644
index 154a37d22..000000000
--- a/src/pages/Customer/components/CustomerSummaryTableActions.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
-
-const { t } = useI18n();
-const router = useRouter();
-
-defineProps({
-    id: {
-        type: Number,
-        required: true,
-    },
-});
-
-const { viewSummary } = useSummaryDialog();
-</script>
-
-<template>
-    <div>
-        {{ id }}
-        <QIcon
-            color="primary"
-            name="vn:lines"
-            size="sm"
-            @click.stop="router.push({ params: { id }, name: 'TicketSale' })"
-        >
-            <QTooltip>
-                {{ t('Go to lines') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            @click.stop="viewSummary(id, TicketSummary)"
-            class="q-ml-md"
-            color="primary"
-            name="preview"
-            size="sm"
-        >
-            <QTooltip>
-                {{ t('Preview') }}
-            </QTooltip>
-        </QIcon>
-    </div>
-</template>
-
-<i18n>
-es:
-    Go to lines: Ir a lineas
-    Preview: Vista previa
-</i18n>

From db97e8322e5a895c73e8b4e2d8221b86b27cd6f6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:40 +0200
Subject: [PATCH 049/162] feat: change url CustomerList

---
 src/pages/Customer/CustomerList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..12580a06f 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -359,6 +359,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
             },
         ],
@@ -395,7 +396,7 @@ function handleLocation(data, location) {
     <VnTable
         ref="tableRef"
         data-key="Customer"
-        url="Clients/extendedListFilter"
+        url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
             title: 'Create client',

From 61c7c622f72fd05071115c12ff766874b811c964 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:54 +0200
Subject: [PATCH 050/162] perf: update CustommerDescriptor

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index ed68d1ce6..274e0f376 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -57,7 +57,11 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.creditInsurance)"
             />
 
-            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
+            <VnLv
+                :label="t('customer.card.debt')"
+                :value="toCurrency(entity.debt)"
+                :info="t('customer.summary.riskInfo')"
+            />
             <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink

From 452b084cafcdc7b463c258a0e4b6ef2079d15c5a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:13:49 +0200
Subject: [PATCH 051/162] feat: change QBadge color

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index da310934d..fd41cdd35 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -48,15 +48,18 @@ const columns = computed(() => [
         align: 'left',
         label: t('Nickname'),
         name: 'nickname',
+        columnClass: 'expand',
     },
     {
         align: 'left',
         format: (row) => row.agencyMode.name,
+        columnClass: 'expand',
         label: t('Agency'),
     },
     {
         align: 'left',
         name: 'routeFk',
+        columnClass: 'shrink',
         label: t('Route'),
     },
     {
@@ -64,6 +67,7 @@ const columns = computed(() => [
         field: 'packages',
         label: t('Packages'),
         name: 'packages',
+        columnClass: 'shrink',
     },
     {
         align: 'left',
@@ -169,8 +173,8 @@ const setShippedColor = (date) => {
                 class="q-pa-sm"
                 v-if="setTotalPriceColor(row)"
                 :color="setTotalPriceColor(row)"
+                text-color="black"
             >
-                <!-- {{ setTotalPriceColor(row) }} -->
                 {{ toCurrency(row.totalWithVat) }}
             </QBadge>
             <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
@@ -185,6 +189,7 @@ const setShippedColor = (date) => {
             <QBadge
                 class="q-pa-sm"
                 :color="setStateColor(row)"
+                text-color="black"
                 v-else-if="setStateColor(row)"
             >
                 {{ row?.ticketState?.state.name }}
@@ -195,6 +200,7 @@ const setShippedColor = (date) => {
             <QBadge
                 class="q-pa-sm"
                 :color="setShippedColor(row.shipped)"
+                text-color="black"
                 v-if="setShippedColor(row.shipped)"
             >
                 {{ toDateFormat(row.shipped) }}

From b481876e819708f154b3aad6a65cc552a68dd083 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:37:30 +0200
Subject: [PATCH 052/162] fix: CustommerSummaryTable Proxy

---
 .../Customer/components/CustomerSummaryTable.vue   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index fd41cdd35..cd519eb54 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -15,6 +15,7 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 // import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -141,31 +142,28 @@ const setShippedColor = (date) => {
     <VnTable
         data-key="CustomerTickets"
         :filter="filter"
+        :right-search="false"
+        :column-search="false"
         url="Tickets"
         :columns="columns"
         search-url="tickets"
         :without-header="true"
         auto-load
         order="shipped DESC, id"
+        :disable-option="{ card: true, table: true }"
         limit="5"
     >
         <template #column-nickname="{ row }">
             <span class="link">
                 {{ row.nickname }}
-                <TicketDescriptorProxy :id="row.nickname" />
-            </span>
-        </template>
-        <template #column-ticketFk="{ row }">
-            <span class="link">
-                {{ row.ticketFk }}
-                <TicketDescriptorProxy :id="row.ticketFk" />
+                <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
 
         <template #column-routeFk="{ row }">
             <span class="link">
                 {{ row.routeFk }}
-                <RouteDescriptorProxy :id="row.ticketFk" />
+                <RouteDescriptorProxy :id="row.routeFk" />
             </span>
         </template>
         <template #column-total="{ row }">

From 20ddabcc0183971eee3edc3c87771d85b7b4b737 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 16:30:32 +0200
Subject: [PATCH 053/162] Merge remote-tracking branch
 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable

---
 src/i18n/locale/en.yml                        |   1 -
 src/i18n/locale/es.yml                        |   1 -
 .../Customer/Card/CustomerConsumption.vue     | 201 ++++++++++++------
 .../Card/CustomerConsumptionFilter.vue        | 189 ----------------
 4 files changed, 138 insertions(+), 254 deletions(-)
 delete mode 100644 src/pages/Customer/Card/CustomerConsumptionFilter.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 048be1d30..5a72fb812 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -95,7 +95,6 @@ globals:
     from: From
     to: To
     notes: Notes
-    quantity: Quantity
     item: Item
     ticket: Ticket
     campaign: Campaign
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8c68299da..e5b0d24ee 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -95,7 +95,6 @@ globals:
     from: Desde
     to: Hasta
     notes: Notas
-    quantity: Cantidad
     item: Artículo
     ticket: Ticket
     campaign: Campaña
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 9ea809cef..6d4da3a28 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,84 +1,76 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
-import { useStateStore } from 'src/stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useRoute } from 'vue-router';
+
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import { toDate } from 'src/filters';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
 import { useVnConfirm } from 'src/composables/useVnConfirm';
 
 const { openConfirmationModal } = useVnConfirm();
 const { openReport, sendEmail } = usePrintService();
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
 const arrayData = useArrayData('Client');
 const { t } = useI18n();
-
 const route = useRoute();
-const tableRef = ref();
-const filter = computed(() => ({
-    where: { and: [{ isPackaging: false }, { clientFk: route.params.id }] },
-    limit: 30,
-    skip: 10,
-}));
-
+const campaignList = ref();
 const showActionBtns = computed(() => handleQueryParams());
 function handleQueryParams() {
-    const query = JSON.parse(route.query.table);
+    const query = getQueryParams();
     return query.from && query.to;
 }
-watch(
-    () => route.query,
-    () => {
-        showActionBtns.value = handleQueryParams();
-    }
-);
 const columns = computed(() => [
     {
+        name: 'search',
         align: 'left',
+        label: t('globals.search'),
+        visible: false,
+    },
+    {
         name: 'itemFk',
-        label: t('Item'),
+        align: 'left',
+        label: t('globals.item'),
+        columnClass: 'shrink',
         cardVisible: true,
         columnFilter: {
-            inWhere: true,
+            name: 'itemId',
         },
     },
     {
-        align: 'left',
         name: 'ticketFk',
-        label: t('Ticket'),
+        align: 'left',
+        label: t('globals.ticket'),
         cardVisible: true,
         columnFilter: {
             inWhere: true,
         },
     },
     {
-        align: 'left',
         name: 'shipped',
-        label: t('shipped'),
+        align: 'left',
+        label: t('globals.shipped'),
         format: ({ shipped }) => toDate(shipped),
+        columnFilter: false,
         cardVisible: true,
-        columnFilter: {
-            inWhere: true,
-        },
     },
-
     {
-        align: 'left',
         name: 'description',
+        align: 'left',
         label: t('globals.description'),
-        class: 'extend',
+        columnClass: 'expand',
         columnFilter: {
             inWhere: true,
         },
     },
     {
-        align: 'left',
         name: 'quantity',
         label: t('globals.quantity'),
         cardVisible: true,
@@ -86,9 +78,24 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
+    {
+        name: 'grouped',
+        label: t('Group by items'),
+        component: 'checkbox',
+        visible: false,
+        orderBy: false,
+    },
 ]);
+
+onBeforeMount(async () => {
+    campaignList.value = (await axios('Campaigns/latest')).data;
+});
+
+function getQueryParams() {
+    return JSON.parse(route.query.consumption);
+}
 function getParams() {
-    const query = JSON.parse(route.query.table);
+    const query = getQueryParams();
     return {
         from: query.from,
         to: query.to,
@@ -96,6 +103,25 @@ function getParams() {
         recipientId: arrayData.store.data.id,
     };
 }
+const filter = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        campaign: campaignList.value[0]?.id,
+        from: minDate,
+        to: maxDate,
+        filter: {
+            where: {
+                clientFk: route.params.id,
+            },
+        },
+    };
+});
 const openReportPdf = () => {
     openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
 };
@@ -116,13 +142,32 @@ const sendCampaignMetricsEmail = ({ address }) => {
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </Teleport>
-    <VnSubToolbar>
-        <template #st-actions>
+    <VnTable
+        v-if="campaignList"
+        data-key="CustomerConsumption"
+        url="Clients/consumption"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :columns="columns"
+        search-url="consumption"
+        :user-params="filter"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :has-sub-toolbar="true"
+        auto-load
+    >
+        <template #moreBeforeActions>
+            <!-- <QBtn
+                color="primary"
+                icon="delete"
+                flat
+                @click="remove(selected)"
+                :disable="!selected?.length"
+                :title="t('globals.remove')"
+            /> -->
             <QBtn
                 color="primary"
+                flat
                 icon-right="picture_as_pdf"
                 @click="openReportPdf()"
                 :disabled="!showActionBtns"
@@ -131,6 +176,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
             </QBtn>
             <QBtn
                 color="primary"
+                flat
                 icon-right="email"
                 @click="openSendEmailDialog()"
                 :disabled="!showActionBtns"
@@ -138,41 +184,70 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 <QTooltip>{{ t('Send to email') }}</QTooltip>
             </QBtn>
         </template>
-    </VnSubToolbar>
-    <VnTable
-        data-key="CustomerConsumption"
-        ref="tableRef"
-        :filter="filter"
-        url="Clients/Consumption"
-        :columns="columns"
-        :right-search="false"
-        :use-model="true"
-        auto-load
-        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
-    >
         <template #column-itemFk="{ row }">
             <span class="link">
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
         </template>
-        <template #column-description="{ row }">
-            <FetchedTags :item="row" :max-length="6" />
-        </template>
         <template #column-ticketFk="{ row }">
             <span class="link">
                 {{ row.ticketFk }}
                 <TicketDescriptorProxy :id="row.ticketFk" />
-            </span> </template
-    ></VnTable>
+            </span>
+        </template>
+        <template #column-description="{ row }">
+            <div>{{ row.concept }}</div>
+            <div v-if="row.subName" class="subName">
+                {{ row.subName }}
+            </div>
+            <FetchedTags :item="row" :max-length="3" />
+        </template>
+        <template #moreFilterPanel="{ params }">
+            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
+                <VnSelect
+                    v-model="params.campaign"
+                    :options="campaignList"
+                    :label="t('globals.campaign')"
+                    :filled="true"
+                    class="q-px-sm q-pt-none fit"
+                    dense
+                    option-label="code"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }}
+                                    {{
+                                        new Date(scope.opt?.dated).getFullYear()
+                                    }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInputDate
+                    v-model="params.to"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+                <VnInputDate
+                    v-model="params.from"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+            </div>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
-    Send to email: Enviar por email
-    Search by item id or name: Buscar por id de artículo o nombre
-    The consumption report will be sent: Se enviará el informe de consumo
-    Please, confirm: Por favor, confirma
     Enter a new search: Introduce una nueva búsqueda
     Group by items: Agrupar por artículos
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
deleted file mode 100644
index b960186f4..000000000
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import { QItem } from 'quasar';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { QItemSection } from 'quasar';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import { toDate } from 'src/filters';
-
-const { t } = useI18n();
-defineProps({ dataKey: { type: String, required: true } });
-</script>
-<template>
-    <VnFilterPanel :data-key="dataKey" search-url="consumption" :redirect="false">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection
-                    ><QCheckbox
-                        v-model="params.grouped"
-                        :label="t('params.grouped')"
-                        @update:model-value="searchFn()"
-                        dense
-                /></QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.item')"
-                        v-model="params.itemId"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.buyerId"
-                        url="TicketRequests/getItemTypeWorker"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname ASC"
-                        :label="t('params.buyer')"
-                        option-value="id"
-                        option-label="nickname"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <!--It's required to include the relation category !! There's 413 records in production-->
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.typeId"
-                        url="ItemTypes"
-                        :include="['category']"
-                        :fields="['id', 'name', 'categoryFk']"
-                        sort-by="name ASC"
-                        :label="t('params.typeId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.category?.name
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.categoryId"
-                        url="ItemCategories"
-                        :fields="['id', 'name']"
-                        sort-by="name ASC"
-                        :label="t('params.categoryId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.campaignId"
-                        url="Campaigns/latest"
-                        sort-by="dated DESC"
-                        :label="t('params.campaignId')"
-                        option-label="code"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.code}`)
-                                    }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        toDate(scope.opt.dated)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <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>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-en:
-    params:
-        grouped: Group by item
-        item: Item id
-        buyer: Buyer
-        type: Type
-        category: Category
-        itemId: Item id
-        buyerId: Buyer
-        typeId: Type
-        categoryId: Category
-        from: From
-        to: To
-        campaignId: Campaña
-        valentinesDay: Valentine's Day
-        mothersDay: Mother's Day
-        allSaints: All Saints' Day
-es:
-    params:
-        grouped: Agrupar por artículo
-        item: Id artículo
-        buyer: Comprador
-        type: Tipo
-        category: Categoría
-        itemId: Id Artículo
-        buyerId: Comprador
-        typeId: Tipo
-        categoryId: Reino
-        from: Desde
-        to: Hasta
-        campaignId: Campaña
-        valentinesDay: Día de San Valentín
-        mothersDay: Día de la Madre
-        allSaints: Día de Todos los Santos
-</i18n>

From ca74ad85b44e95894c9505a3ec4b5e5cd1c4d275 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 20:46:51 +0200
Subject: [PATCH 054/162] fix: Customerconsumption

---
 .../Customer/Card/CustomerConsumption.vue     | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 6d4da3a28..27c1b746c 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onBeforeMount } from 'vue';
+import { ref, computed, onBeforeMount, onMounted } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters/index';
@@ -90,9 +90,12 @@ const columns = computed(() => [
 onBeforeMount(async () => {
     campaignList.value = (await axios('Campaigns/latest')).data;
 });
+// onMounted(() => {
+//     showActionBtns.value = handleQueryParams();
+// });
 
 function getQueryParams() {
-    return JSON.parse(route.query.consumption);
+    return JSON.parse(route.query.consumption ?? '{}');
 }
 function getParams() {
     const query = getQueryParams();
@@ -103,7 +106,7 @@ function getParams() {
         recipientId: arrayData.store.data.id,
     };
 }
-const filter = computed(() => {
+const userParams = computed(() => {
     const minDate = Date.vnNew();
     minDate.setHours(0, 0, 0, 0);
     minDate.setMonth(minDate.getMonth() - 2);
@@ -115,11 +118,6 @@ const filter = computed(() => {
         campaign: campaignList.value[0]?.id,
         from: minDate,
         to: maxDate,
-        filter: {
-            where: {
-                clientFk: route.params.id,
-            },
-        },
     };
 });
 const openReportPdf = () => {
@@ -149,7 +147,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
         :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
         :columns="columns"
         search-url="consumption"
-        :user-params="filter"
+        :filter="filter"
+        :user-params="userParams"
         :default-remove="false"
         :default-reset="false"
         :default-save="false"
@@ -157,14 +156,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
         auto-load
     >
         <template #moreBeforeActions>
-            <!-- <QBtn
-                color="primary"
-                icon="delete"
-                flat
-                @click="remove(selected)"
-                :disable="!selected?.length"
-                :title="t('globals.remove')"
-            /> -->
             <QBtn
                 color="primary"
                 flat
@@ -228,15 +219,15 @@ const sendCampaignMetricsEmail = ({ address }) => {
                     </template>
                 </VnSelect>
                 <VnInputDate
-                    v-model="params.to"
+                    v-model="params.from"
                     :label="t('globals.from')"
                     :filled="true"
                     class="q-px-xs q-pt-none fit"
                     dense
                 />
                 <VnInputDate
-                    v-model="params.from"
-                    :label="t('globals.from')"
+                    v-model="params.to"
+                    :label="t('globals.to')"
                     :filled="true"
                     class="q-px-xs q-pt-none fit"
                     dense

From e8f660ea3750c1993560142544575836a5601d33 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 20:32:13 +0200
Subject: [PATCH 055/162] perf: CustomerBasicData

---
 src/pages/Customer/Card/CustomerBasicData.vue | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 87a3b08f7..e4c9ab062 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -38,7 +38,7 @@ const title = ref();
                     clearable
                     v-model="data.name"
                 />
-                <QSelect
+                <VnSelect
                     :input-debounce="0"
                     :label="t('customer.basicData.businessType')"
                     :options="businessTypes"
@@ -89,15 +89,18 @@ const title = ref();
             </VnRow>
             <VnRow>
                 <VnSelect
-                    url="Workers/activeWithInheritedRole"
-                    :filter="{ where: { role: 'salesPerson' } }"
-                    option-filter="firstName"
+                    url="Workers/search"
                     v-model="data.salesPersonFk"
                     :label="t('customer.basicData.salesPerson')"
+                    :params="{
+                        departmentCodes: ['VT', 'shopping'],
+                    }"
+                    :fields="['id', 'nickname']"
+                    sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
                     :use-like="false"
-                    :emit-value="false"
-                    @update:model-value="(val) => (title = val?.nickname)"
+                    emit-value
+                    auto-load
                 >
                     <template #prepend>
                         <VnAvatar
@@ -106,8 +109,19 @@ const title = ref();
                             :title="title"
                         />
                     </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption
+                                    >{{ scope.opt?.nickname }},
+                                    {{ scope.opt?.code }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.contactChannelFk"
                     :options="contactChannels"
                     option-value="id"
@@ -120,7 +134,9 @@ const title = ref();
                 />
             </VnRow>
             <VnRow>
-                <QSelect
+                <VnSelect
+                    url="Clients"
+                    :where="{ id: { neq: $route.params.id } }"
                     :input-debounce="0"
                     :label="t('customer.basicData.previousClient')"
                     :options="clients"
@@ -129,7 +145,9 @@ const title = ref();
                     map-options
                     option-label="name"
                     option-value="id"
+                    sort-by="name ASC"
                     v-model="data.transferorFk"
+                    :fields="['id', 'name']"
                 >
                     <template #append>
                         <QIcon name="info" class="cursor-pointer">
@@ -140,7 +158,7 @@ const title = ref();
                             }}</QTooltip>
                         </QIcon>
                     </template>
-                </QSelect>
+                </VnSelect>
             </VnRow>
         </template>
     </FormModel>

From 7d526f4aa42305ebf55425036a5f51f6e325ac7b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 20:33:22 +0200
Subject: [PATCH 056/162] fix: CusomerSummary to Address

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

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index cee8b7c0a..e02f63347 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -193,7 +193,7 @@ const creditWarning = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="entity.defaultAddress">
                 <VnTitle
-                    :url="`#/customer/${entityId}/consignees`"
+                    :url="`#/customer/${entityId}/address`"
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv

From 375e65aed0c4fff39c47a3db6258b813cccedd6b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 12:20:34 +0200
Subject: [PATCH 057/162] fix: CustomerDescriptorAccount

---
 .../Customer/Card/CustomerDescriptor.vue      | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 274e0f376..dcd106873 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -11,6 +11,10 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
+import { useState } from 'src/composables/useState';
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
 
 const $props = defineProps({
     id: {
@@ -43,7 +47,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
         :subtitle="data.subtitle"
         @on-fetch="setData"
         :summary="$props.summary"
-        data-key="customerData"
+        data-key="customer"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
@@ -75,21 +79,26 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="entity.businessType.description"
             />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons>
+            <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!entity.isActive"
+                    v-if="!customer.isActive"
                     name="vn:disabled"
                     size="xs"
                     color="primary"
                 >
                     <QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isFreezed" name="vn:frozen" size="xs" color="primary">
+                <QIcon
+                    v-if="customer.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.account.active"
+                    v-if="!customer.account.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
@@ -97,7 +106,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.debt > entity.credit"
+                    v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
                     color="primary"
@@ -105,7 +114,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.isTaxDataChecked"
+                    v-if="!customer.isTaxDataChecked"
                     name="vn:no036"
                     size="xs"
                     color="primary"
@@ -113,7 +122,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
                 <QBtn
-                    v-if="entity.unpaid"
+                    v-if="customer.unpaid"
                     flat
                     size="sm"
                     icon="vn:Client_unpaid"
@@ -125,13 +134,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(entity.unpaid.dated),
+                                dated: toDate(customer.unpaid.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(entity.unpaid.amount),
+                                amount: toCurrency(customer.unpaid.amount),
                             })
                         }}
                     </QTooltip>
@@ -165,7 +174,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 <QBtn
                     :to="{
                         name: 'OrderCreate',
-                        query: { clientId: entity.id },
+                        query: { table: JSON.stringify({ clientFk: entity.id }) },
                     }"
                     size="md"
                     icon="vn:basketadd"
@@ -175,12 +184,8 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'AccountList',
-                        query: {
-                            table: JSON.stringify({
-                                filter: { where: { id: entity.id } },
-                            }),
-                        },
+                        name: 'AccountSummary',
+                        params: { id: entity.id },
                     }"
                     size="md"
                     icon="face"

From c727e5f66908db89ff50c5b53a70606d6bc36679 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 14:23:18 +0200
Subject: [PATCH 058/162] feat: copy customer countryFk

---
 src/components/CreateBankEntityForm.vue         | 9 +++++++--
 src/pages/Customer/Card/CustomerBasicData.vue   | 1 +
 src/pages/Customer/Card/CustomerBillingData.vue | 5 ++---
 src/pages/Customer/Card/CustomerDescriptor.vue  | 2 +-
 src/pages/Customer/CustomerList.vue             | 7 ++++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index c46ac7752..1117225c7 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref, onMounted, nextTick } from 'vue';
+import { reactive, ref, onMounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -7,16 +7,21 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
+import { useState } from 'src/composables/useState';
 
 defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: null,
+    countryFk: customer.value.countryFk,
     id: null,
 });
 
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index e4c9ab062..8cc59ef3c 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -25,6 +25,7 @@ const title = ref();
     />
     <FetchData
         url="BusinessTypes"
+        :filter="{ fields: ['code', 'description'], order: 'description ASC ' }"
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index b01dc4523..290bde909 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -85,9 +85,8 @@ const getBankEntities = (data, formData) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection v-if="scope.opt">
-                                <QItemLabel
-                                    >{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
-                                >
+                                <QItemLabel>{{ scope.opt.bic }} </QItemLabel>
+                                <QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index dcd106873..9ae453df0 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -98,7 +98,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!customer.account.active"
+                    v-if="!customer.account?.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 12580a06f..25cac5361 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -353,7 +353,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:ticket',
-                action: redirectToCreateView,
+                action: redirectToTicketsList,
                 isPrimary: true,
             },
             {
@@ -367,11 +367,12 @@ const columns = computed(() => [
 ]);
 
 const { viewSummary } = useSummaryDialog();
-const redirectToCreateView = (row) => {
+const redirectToTicketsList = (row) => {
     router.push({
         name: 'TicketList',
+
         query: {
-            params: JSON.stringify({
+            table: JSON.stringify({
                 clientFk: row.id,
             }),
         },

From b66ff783be7e0d354c56a254e78a4d9ee4f468c5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 15:29:57 +0200
Subject: [PATCH 059/162] feat: CustomerBalance

---
 src/components/ui/VnUserLink.vue              | 12 +++---
 src/pages/Customer/Card/CustomerBalance.vue   |  7 +---
 src/pages/Customer/CustomerList.vue           | 42 +++++++++++++++++--
 .../components/CustomerSummaryTable.vue       |  4 +-
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index b04ea7476..8fb571c80 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,20 +1,18 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import { useI18n } from 'vue-i18n';
 
-const $props = defineProps({
+defineProps({
     name: { type: String, default: null },
+    tag: { type: String, default: null },
     workerId: { type: Number, default: null },
     defaultName: { type: Boolean, default: false },
 });
-
-const { t } = useI18n();
 </script>
 <template>
     <slot name="link">
-        <span :class="{ link: $props.workerId }">
-            {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
+        <span :class="{ link: workerId }">
+            {{ defaultName ? name ?? $t('globals.system') : tag ?? name }}
         </span>
     </slot>
-    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
+    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
 </template>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 346e76681..52edecea5 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -95,12 +95,7 @@ const columns = computed(() => [
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => {
-                return {
-                    workerId: row.workerFk,
-                    name: row.userName,
-                };
-            },
+            attrs: ({ row }) => ({ workerId: row.workerFk, tag: row.userName }),
         },
         cardVisible: true,
     },
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 25cac5361..e0a786174 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,6 +2,7 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -69,7 +70,7 @@ const columns = computed(() => [
             optionFilter: 'firstName',
             useLike: false,
         },
-        create: true,
+        create: false,
         columnField: {
             component: null,
         },
@@ -195,6 +196,8 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'BusinessTypes',
+            fields: ['code', 'description'],
+            sortBy: 'description ASC ',
             optionLabel: 'description',
             optionValue: 'code',
         },
@@ -357,7 +360,7 @@ const columns = computed(() => [
                 isPrimary: true,
             },
             {
-                title: t('Client ticket list'),
+                title: t('Preview'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
@@ -400,7 +403,7 @@ function handleLocation(data, location) {
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
-            title: 'Create client',
+            title: t('globals.pageTitles.customerCreate'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -413,6 +416,39 @@ function handleLocation(data, location) {
         auto-load
     >
         <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Workers/search"
+                v-model="data.salesPersonFk"
+                :label="t('customer.basicData.salesPerson')"
+                :params="{
+                    departmentCodes: ['VT', 'shopping'],
+                }"
+                :fields="['id', 'nickname']"
+                sort-by="nickname ASC"
+                :use-like="false"
+                emit-value
+                auto-load
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
+                    />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+
             <VnLocation
                 :roles-allowed-to-create="['deliveryAssistant']"
                 v-model="data.location"
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index cd519eb54..25db561c5 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -12,7 +12,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
 
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-// import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
@@ -96,8 +95,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:lines',
-                action: ({ id }) =>
-                    router.push({ params: { id }, name: 'TicketSummary' }),
+                action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
                 isPrimary: true,
             },
             {

From 8b4fcbd888bd5b5fcc25c05a93cb0fe152976d38 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 15:30:09 +0200
Subject: [PATCH 060/162] feat: CustomerGreuges

---
 src/pages/Customer/Card/CustomerGreuges.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 12173727f..2909bcaaf 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -52,9 +52,8 @@ const columns = computed(() => [
         component: 'userLink',
         attrs: ({ row }) => {
             return {
-                defaultName: true,
                 workerId: row.user?.id,
-                name: row.user?.name,
+                tag: row.user?.name,
             };
         },
     },
@@ -73,6 +72,7 @@ const columns = computed(() => [
         columnCreate: {
             component: 'select',
             url: 'greugeTypes',
+            sortBy: 'name ASC ',
             limit: 0,
         },
     },
@@ -107,7 +107,7 @@ const setRows = (data) => {
         @on-fetch="(data) => setRows(data)"
         :create="{
             urlCreate: `Greuges`,
-            title: t('New credit'),
+            title: t('New greuge'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: { shipped: new Date(), clientFk: route.params.id },
         }"

From 77cb0ed7a8f64fce14eea6a9bbc99a2af4bec3f8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 29 Aug 2024 16:02:39 +0200
Subject: [PATCH 061/162] feat: refs #7909 add scroll

---
 src/components/common/VnLog.vue | 510 +++++++++++++++++---------------
 1 file changed, 274 insertions(+), 236 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 2163d54d4..640be2c0a 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -14,6 +14,7 @@ import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
+import VnPaginate from '../ui/VnPaginate.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -68,7 +69,6 @@ const filter = {
     ],
 };
 
-const workers = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -235,9 +235,9 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree() {
+async function setLogTree(data) {
     filter.where = { and: [{ originFk: route.params.id }] };
-    const { data } = await getLogs(filter);
+    // const { data } = await getLogs(filter);
     logTree.value = getLogTree(data);
 }
 
@@ -377,8 +377,6 @@ async function clearFilter() {
     await applyFilter();
 }
 
-setLogTree();
-
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
@@ -391,16 +389,6 @@ watch(
 );
 </script>
 <template>
-    <FetchData
-        :url="`${props.model}Logs/${route.params.id}/editors`"
-        :filter="{
-            fields: ['id', 'nickname', 'name', 'image'],
-            order: 'nickname',
-            limit: 30,
-        }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
     <FetchData
         :url="`${props.model}Logs/${route.params.id}/models`"
         :filter="{ order: ['changedModel'] }"
@@ -418,231 +406,282 @@ watch(
         "
         auto-load
     />
-    <div
-        class="column items-center logs origin-log q-mt-md"
-        v-for="(originLog, originLogIndex) in logTree"
-        :key="originLogIndex"
+    <VnPaginate
+        :data-key="`${model}Log`"
+        :url="`${model}Logs`"
+        :filter="filter"
+        :skeleton="false"
+        auto-load
+        @on-fetch="setLogTree"
     >
-        <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
-            <h6 class="origin-id text-grey">
-                {{ useCapitalize(validations[props.model].locale.name) }}
-                #{{ originLog.originFk }}
-            </h6>
-            <div class="line bg-grey"></div>
-        </QItem>
-        <div
-            class="user-log q-mb-sm"
-            v-for="(userLog, userIndex) in originLog.logs"
-            :key="userIndex"
-        >
-            <div class="timeline">
-                <div class="user-avatar">
-                    <VnUserLink :worker-id="userLog?.user?.id">
-                        <template #link>
-                            <VnAvatar
-                                :class="{ 'cursor-pointer': userLog?.user?.id }"
-                                :worker-id="userLog?.user?.id"
-                                :title="userLog?.user?.nickname"
-                                :show-letter="!userLog?.user"
-                                size="lg"
-                            />
-                        </template>
-                    </VnUserLink>
-                </div>
-                <div class="arrow bg-panel" v-if="byRecord"></div>
-                <div class="line"></div>
-            </div>
-            <QList class="user-changes" v-if="userLog">
-                <QItem
-                    class="model-log column q-px-none q-py-xs"
-                    v-for="(modelLog, modelLogIndex) in userLog.logs"
-                    :key="modelLogIndex"
+        <template #body>
+            <div
+                class="column items-center logs origin-log q-mt-md"
+                v-for="(originLog, originLogIndex) in logTree"
+                :key="originLogIndex"
+            >
+                <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
+                    <h6 class="origin-id text-grey">
+                        {{ useCapitalize(validations[props.model].locale.name) }}
+                        #{{ originLog.originFk }}
+                    </h6>
+                    <div class="line bg-grey"></div>
+                </QItem>
+                <div
+                    class="user-log q-mb-sm"
+                    v-for="(userLog, userIndex) in originLog.logs"
+                    :key="userIndex"
                 >
-                    <QItemSection>
-                        <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
-                            <QChip
-                                dense
-                                size="md"
-                                class="model-name q-mr-xs text-white"
-                                v-if="
-                                    !(modelLog.changedModel && modelLog.changedModelId) &&
-                                    modelLog.model
-                                "
-                                :style="{
-                                    backgroundColor: useColor(modelLog.model),
-                                }"
-                                :title="`${modelLog.model} #${modelLog.id}`"
-                            >
-                                {{ t(modelLog.modelI18n) }}
-                            </QChip>
-
-                            <span
-                                class="model-id q-mr-xs"
-                                v-if="modelLog.summaryId"
-                                v-text="`#${modelLog.summaryId}`"
-                            />
-                            <span
-                                class="model-value"
-                                :title="modelLog.showValue"
-                                v-text="modelLog.showValue"
-                            />
-                            <QBtn
-                                flat
-                                round
-                                color="grey"
-                                class="q-mr-xs q-ml-auto"
-                                size="sm"
-                                icon="filter_alt"
-                                :title="t('recordChanges')"
-                                @click.stop="filterByRecord(modelLog)"
-                            />
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QCard
-                            class="changes-log q-py-none q-mb-xs"
-                            v-for="(log, logIndex) in modelLog.logs"
-                            :key="logIndex"
+                    <div class="timeline">
+                        <div class="user-avatar">
+                            <VnUserLink :worker-id="userLog?.user?.id">
+                                <template #link>
+                                    <VnAvatar
+                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                        :worker-id="userLog?.user?.id"
+                                        :title="userLog?.user?.nickname"
+                                        :show-letter="!userLog?.user"
+                                        size="lg"
+                                    />
+                                </template>
+                            </VnUserLink>
+                        </div>
+                        <div class="arrow bg-panel" v-if="byRecord"></div>
+                        <div class="line"></div>
+                    </div>
+                    <QList class="user-changes" v-if="userLog">
+                        <QItem
+                            class="model-log column q-px-none q-py-xs"
+                            v-for="(modelLog, modelLogIndex) in userLog.logs"
+                            :key="modelLogIndex"
                         >
-                            <QCardSection class="change-info q-pa-none">
-                                <QItem
-                                    class="q-px-sm q-py-xs justify-between items-center"
-                                >
-                                    <div
-                                        class="date text-grey text-caption q-mr-sm"
-                                        :title="
-                                            date.formatDate(
-                                                log.creationDate,
-                                                'DD/MM/YYYY hh:mm:ss'
-                                            ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                            <QItemSection>
+                                <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
+                                    <QChip
+                                        dense
+                                        size="md"
+                                        class="model-name q-mr-xs text-white"
+                                        v-if="
+                                            !(
+                                                modelLog.changedModel &&
+                                                modelLog.changedModelId
+                                            ) && modelLog.model
                                         "
+                                        :style="{
+                                            backgroundColor: useColor(modelLog.model),
+                                        }"
+                                        :title="`${modelLog.model} #${modelLog.id}`"
                                     >
-                                        {{ toRelativeDate(log.creationDate) }}
-                                    </div>
-                                    <div>
-                                        <QBtn
-                                            color="grey"
-                                            class="pit"
-                                            icon="preview"
-                                            flat
-                                            round
-                                            :title="t('pointRecord')"
-                                            padding="none"
-                                            v-if="log.action != 'insert'"
-                                            @click.stop="
-                                                openPointRecord(log.id, modelLog)
-                                            "
-                                        >
-                                            <QPopupProxy>
-                                                <QCard v-if="pointRecord">
-                                                    <div
-                                                        class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                                                    >
-                                                        {{ modelLog.modelI18n }}
-                                                        <span v-if="modelLog.id"
-                                                            >#{{ modelLog.id }}</span
-                                                        >
-                                                    </div>
-                                                    <QCardSection
-                                                        class="change-detail q-pa-sm"
-                                                    >
-                                                        <QItem
-                                                            v-for="(
-                                                                value, index
-                                                            ) in pointRecord"
-                                                            :key="index"
-                                                            class="q-pa-none"
-                                                        >
-                                                            <span
-                                                                class="json-field q-mr-xs text-grey"
-                                                                :title="value.name"
-                                                            >
-                                                                {{ value.nameI18n }}:
-                                                            </span>
-                                                            <VnJsonValue
-                                                                :value="value.val.val"
-                                                            />
-                                                        </QItem>
-                                                    </QCardSection>
-                                                </QCard>
-                                            </QPopupProxy>
-                                        </QBtn>
-                                        <QIcon
-                                            class="action q-ml-xs"
-                                            :class="actionsClass[log.action]"
-                                            :name="actionsIcon[log.action]"
-                                            :title="
-                                                t(`actions.${actionsText[log.action]}`)
-                                            "
-                                        />
-                                    </div>
-                                </QItem>
-                            </QCardSection>
-                            <QCardSection
-                                class="change-detail q-px-sm q-py-xs"
-                                :class="{ expanded: log.expand }"
-                                v-if="log.props.length || log.description"
-                            >
-                                <QIcon
-                                    class="cursor-pointer q-mr-md"
-                                    color="grey"
-                                    name="expand_more"
-                                    :title="t('globals.details')"
-                                    size="sm"
-                                    @click="log.expand = !log.expand"
-                                />
-                                <span v-if="log.props.length" class="attributes">
-                                    <span v-if="!log.expand" class="q-pa-none text-grey">
-                                        <span
-                                            v-for="(prop, propIndex) in log.props"
-                                            :key="propIndex"
-                                            class="basic-json"
-                                        >
-                                            <span class="json-field" :title="prop.name">
-                                                {{ prop.nameI18n }}:
-                                            </span>
-                                            <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="propIndex < log.props.length - 1"
-                                                >,&nbsp;
-                                            </span>
-                                        </span>
-                                    </span>
+                                        {{ t(modelLog.modelI18n) }}
+                                    </QChip>
+
                                     <span
-                                        v-if="log.expand"
-                                        class="expanded-json column q-pa-none"
-                                    >
-                                        <div
-                                            v-for="(prop, prop2Index) in log.props"
-                                            :key="prop2Index"
-                                            class="q-pa-none text-grey"
+                                        class="model-id q-mr-xs"
+                                        v-if="modelLog.summaryId"
+                                        v-text="`#${modelLog.summaryId}`"
+                                    />
+                                    <span
+                                        class="model-value"
+                                        :title="modelLog.showValue"
+                                        v-text="modelLog.showValue"
+                                    />
+                                    <QBtn
+                                        flat
+                                        round
+                                        color="grey"
+                                        class="q-mr-xs q-ml-auto"
+                                        size="sm"
+                                        icon="filter_alt"
+                                        :title="t('recordChanges')"
+                                        @click.stop="filterByRecord(modelLog)"
+                                    />
+                                </QItemLabel>
+                            </QItemSection>
+                            <QItemSection>
+                                <QCard
+                                    class="changes-log q-py-none q-mb-xs"
+                                    v-for="(log, logIndex) in modelLog.logs"
+                                    :key="logIndex"
+                                >
+                                    <QCardSection class="change-info q-pa-none">
+                                        <QItem
+                                            class="q-px-sm q-py-xs justify-between items-center"
                                         >
-                                            <span class="json-field" :title="prop.name">
-                                                {{ prop.nameI18n }}:
-                                            </span>
-                                            <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="prop.val.id" class="id-value">
-                                                #{{ prop.val.id }}
-                                            </span>
-                                            <span v-if="log.action == 'update'">
-                                                ←
-                                                <VnJsonValue :value="prop.old.val" />
-                                                <span v-if="prop.old.id" class="id-value">
-                                                    #{{ prop.old.id }}
+                                            <div
+                                                class="date text-grey text-caption q-mr-sm"
+                                                :title="
+                                                    date.formatDate(
+                                                        log.creationDate,
+                                                        'DD/MM/YYYY hh:mm:ss'
+                                                    ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                                                "
+                                            >
+                                                {{ toRelativeDate(log.creationDate) }}
+                                            </div>
+                                            <div>
+                                                <QBtn
+                                                    color="grey"
+                                                    class="pit"
+                                                    icon="preview"
+                                                    flat
+                                                    round
+                                                    :title="t('pointRecord')"
+                                                    padding="none"
+                                                    v-if="log.action != 'insert'"
+                                                    @click.stop="
+                                                        openPointRecord(log.id, modelLog)
+                                                    "
+                                                >
+                                                    <QPopupProxy>
+                                                        <QCard v-if="pointRecord">
+                                                            <div
+                                                                class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
+                                                            >
+                                                                {{ modelLog.modelI18n }}
+                                                                <span v-if="modelLog.id"
+                                                                    >#{{
+                                                                        modelLog.id
+                                                                    }}</span
+                                                                >
+                                                            </div>
+                                                            <QCardSection
+                                                                class="change-detail q-pa-sm"
+                                                            >
+                                                                <QItem
+                                                                    v-for="(
+                                                                        value, index
+                                                                    ) in pointRecord"
+                                                                    :key="index"
+                                                                    class="q-pa-none"
+                                                                >
+                                                                    <span
+                                                                        class="json-field q-mr-xs text-grey"
+                                                                        :title="
+                                                                            value.name
+                                                                        "
+                                                                    >
+                                                                        {{
+                                                                            value.nameI18n
+                                                                        }}:
+                                                                    </span>
+                                                                    <VnJsonValue
+                                                                        :value="
+                                                                            value.val.val
+                                                                        "
+                                                                    />
+                                                                </QItem>
+                                                            </QCardSection>
+                                                        </QCard>
+                                                    </QPopupProxy>
+                                                </QBtn>
+                                                <QIcon
+                                                    class="action q-ml-xs"
+                                                    :class="actionsClass[log.action]"
+                                                    :name="actionsIcon[log.action]"
+                                                    :title="
+                                                        t(
+                                                            `actions.${
+                                                                actionsText[log.action]
+                                                            }`
+                                                        )
+                                                    "
+                                                />
+                                            </div>
+                                        </QItem>
+                                    </QCardSection>
+                                    <QCardSection
+                                        class="change-detail q-px-sm q-py-xs"
+                                        :class="{ expanded: log.expand }"
+                                        v-if="log.props.length || log.description"
+                                    >
+                                        <QIcon
+                                            class="cursor-pointer q-mr-md"
+                                            color="grey"
+                                            name="expand_more"
+                                            :title="t('globals.details')"
+                                            size="sm"
+                                            @click="log.expand = !log.expand"
+                                        />
+                                        <span v-if="log.props.length" class="attributes">
+                                            <span
+                                                v-if="!log.expand"
+                                                class="q-pa-none text-grey"
+                                            >
+                                                <span
+                                                    v-for="(prop, propIndex) in log.props"
+                                                    :key="propIndex"
+                                                    class="basic-json"
+                                                >
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
+                                                        {{ prop.nameI18n }}:
+                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="
+                                                            propIndex <
+                                                            log.props.length - 1
+                                                        "
+                                                        >,&nbsp;
+                                                    </span>
                                                 </span>
                                             </span>
-                                        </div>
-                                    </span>
-                                </span>
-                                <span v-if="!log.props.length" class="description">
-                                    {{ log.description }}
-                                </span>
-                            </QCardSection>
-                        </QCard>
-                    </QItemSection>
-                </QItem>
-            </QList>
-        </div>
-    </div>
+                                            <span
+                                                v-if="log.expand"
+                                                class="expanded-json column q-pa-none"
+                                            >
+                                                <div
+                                                    v-for="(
+                                                        prop, prop2Index
+                                                    ) in log.props"
+                                                    :key="prop2Index"
+                                                    class="q-pa-none text-grey"
+                                                >
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
+                                                        {{ prop.nameI18n }}:
+                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="prop.val.id"
+                                                        class="id-value"
+                                                    >
+                                                        #{{ prop.val.id }}
+                                                    </span>
+                                                    <span v-if="log.action == 'update'">
+                                                        ←
+                                                        <VnJsonValue
+                                                            :value="prop.old.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                        >
+                                                            #{{ prop.old.id }}
+                                                        </span>
+                                                    </span>
+                                                </div>
+                                            </span>
+                                        </span>
+                                        <span
+                                            v-if="!log.props.length"
+                                            class="description"
+                                        >
+                                            {{ log.description }}
+                                        </span>
+                                    </QCardSection>
+                                </QCard>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </div>
+            </div>
+        </template>
+    </VnPaginate>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QList dense>
             <QSeparator />
@@ -691,17 +730,16 @@ watch(
                 </QOptionGroup>
             </QItem>
             <QItem class="q-mt-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers && userRadio !== null">
+                <QItemSection v-if="userRadio !== null">
                     <VnSelect
                         class="full-width"
                         :label="t('globals.user')"
                         v-model="userSelect"
                         option-label="name"
                         option-value="id"
-                        :options="workers"
+                        :url="`${model}Logs/${$route.params.id}/editors`"
+                        :fields="['id', 'nickname', 'name', 'image']"
+                        sort-by="nickname"
                         @update:model-value="selectFilter('userSelect')"
                         hide-selected
                     >

From c7bb0333bd055a01dd8d39a7239c0485979cc074 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 29 Aug 2024 16:28:59 +0200
Subject: [PATCH 062/162] refactor: refs #7909 improve applyFilter

---
 src/components/common/VnLog.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 640be2c0a..1d5b2c182 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -69,6 +69,7 @@ const filter = {
     ],
 };
 
+const paginate = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -237,7 +238,6 @@ async function openPointRecord(id, modelLog) {
 }
 async function setLogTree(data) {
     filter.where = { and: [{ originFk: route.params.id }] };
-    // const { data } = await getLogs(filter);
     logTree.value = getLogTree(data);
 }
 
@@ -266,15 +266,7 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    const { data } = await getLogs(filter);
-
-    logTree.value = getLogTree(data);
-}
-
-async function getLogs(filter) {
-    return axios.get(props.url ?? `${props.model}Logs`, {
-        params: { filter: JSON.stringify(filter) },
-    });
+    paginate.value.fetch(filter);
 }
 
 function setDate(type) {
@@ -407,6 +399,7 @@ watch(
         auto-load
     />
     <VnPaginate
+        ref="paginate"
         :data-key="`${model}Log`"
         :url="`${model}Logs`"
         :filter="filter"

From 0314ca83974ded83e367bb47df9c2cfa38eecebb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 12:41:03 +0200
Subject: [PATCH 063/162] fix: customerSummaryToTicketList button

---
 .../Customer/Card/CustomerDescriptor.vue      |  8 +++++++-
 src/pages/Ticket/Card/TicketSummary.vue       |  3 ++-
 src/pages/Ticket/TicketList.vue               | 20 ++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 9ae453df0..4980e5495 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -152,7 +152,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 <QBtn
                     :to="{
                         name: 'TicketList',
-                        query: { table: JSON.stringify({ clientFk: entity.id }) },
+                        query: {
+                            from: undefined,
+                            to: undefined,
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
                     icon="vn:ticket"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 177384663..feebe85a6 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -162,8 +162,9 @@ async function changeState(value) {
                     :value="ticket.warehouse?.name"
                 />
                 <VnLv
+                    v-if="ticket?.ticketCollections?.length > 0"
                     :label="t('ticket.summary.collection')"
-                    :value="ticket.ticketCollections[0]?.collectionFk"
+                    :value="ticket?.ticketCollections[0]?.collectionFk"
                 >
                     <template #value>
                         <a
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index cbd102317..f3e0e5c06 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -14,6 +14,8 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 
+import { useRoute } from 'vue-router';
+const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -27,8 +29,17 @@ const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
 
 const userParams = {
-    from: from.toISOString(),
-    to: to.toISOString(),
+    from: null,
+    to: null,
+};
+// Método para inicializar las variables desde la query string
+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+
+    // Asigna los valores a las variables correspondientes
+    from.value = query.from || from.toISOString();
+    to.value = query.to || to.toISOString();
+    Object.assign(userParams, { from, to });
 };
 
 const columns = computed(() => [
@@ -200,7 +211,10 @@ const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
 
-onMounted(() => (stateStore.rightDrawer = true));
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+});
 </script>
 
 <template>

From d155b40bde5fe32df7bd448b8e655bd16f630739 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 12:41:59 +0200
Subject: [PATCH 064/162] revert: vnUSerLink change

---
 src/components/VnTable/VnTable.vue          | 1 +
 src/components/ui/VnUserLink.vue            | 2 +-
 src/pages/Customer/Card/CustomerGreuges.vue | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 510f63360..c63973f20 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -741,6 +741,7 @@ es:
     }
     .q-table__top {
         top: 0;
+        padding: 12px 0;
     }
     tbody {
         .q-checkbox {
diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index 8fb571c80..00c50ee34 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -11,7 +11,7 @@ defineProps({
 <template>
     <slot name="link">
         <span :class="{ link: workerId }">
-            {{ defaultName ? name ?? $t('globals.system') : tag ?? name }}
+            {{ defaultName ? name ?? $t('globals.system') : name }}
         </span>
     </slot>
     <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 2909bcaaf..a670329b5 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -47,13 +47,14 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'userFk',
+        // name: 'userFk',
         label: t('Created by'),
         component: 'userLink',
         attrs: ({ row }) => {
             return {
+                defaultName: true,
                 workerId: row.user?.id,
-                tag: row.user?.name,
+                name: row.user?.name,
             };
         },
     },

From 1cdbc0fcc1b4f690ab64eb5941da9c3dcd0c1f7a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 30 Aug 2024 12:51:25 +0200
Subject: [PATCH 065/162] fix: refs #7831 add locale & hide table params

---
 src/components/ui/VnFilterPanel.vue     | 7 +++++--
 src/pages/Item/Card/ItemCard.vue        | 2 +-
 src/pages/Item/Card/ItemLastEntries.vue | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index ab4e2e0da..65cd32a37 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -201,8 +201,11 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value == 'object')
-            params[key] = Object.values(value)[0].replaceAll('%', '');
+        if (typeof value === 'object' && value !== null) {
+            sanitizer(value);
+        } else if (typeof value === 'string') {
+            params[key] = value.replaceAll('%', '');
+        }
     }
     return params;
 }
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 1162327c1..2412f2bf9 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue';
         search-data-key="ItemList"
         :searchbar-props="{
             url: 'Items/filter',
-            label: 'searchbar.labelr',
+            label: 'searchbar.label',
             info: 'searchbar.info',
         }"
     />
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index b211790ca..4a84fdb55 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -42,6 +42,7 @@ const to = ref();
 const arrayData = useArrayData('ItemLastEntries', {
     url: 'Items/lastEntriesFilter',
     order: ['landed DESC', 'buyFk DESC'],
+    searchUrl: 'itemLastEntries',
     exprBuilder: exprBuilder,
     userFilter: {
         where: {

From 4762c9fa53e23b72d11be2a6a117f3d751231b3e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 13:02:39 +0200
Subject: [PATCH 066/162] perf: disable card option

---
 src/pages/Customer/Card/CustomerBalance.vue    | 1 +
 src/pages/Customer/Card/CustomerGreuges.vue    | 1 +
 src/pages/Customer/Card/CustomerRecoveries.vue | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 52edecea5..4e01b9ac5 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -254,6 +254,7 @@ const showBalancePdf = ({ id }) => {
         :is-editable="false"
         :column-search="false"
         @on-fetch="onFetch"
+        :disable-option="{ card: true }"
         auto-load
     >
         <template #column-balance="{ rowIndex }">
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index a670329b5..8a83d49db 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -106,6 +106,7 @@ const setRows = (data) => {
         :use-model="true"
         :column-search="false"
         @on-fetch="(data) => setRows(data)"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: `Greuges`,
             title: t('New greuge'),
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 8d3d05702..3ea8998e9 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -89,6 +89,7 @@ function setFinished(id) {
         :columns="columns"
         :use-model="true"
         :right-search="false"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: 'Recoveries',
             title: 'New recovery',

From 00acd5b0ab3e992a3748b93fc30c29c611e64362 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 14:24:25 +0200
Subject: [PATCH 067/162] feat: CustomerCredit section

---
 src/pages/Customer/Card/CustomerCard.vue      |  2 +-
 .../Customer/Card/CustomerCreditContracts.vue | 23 +++++
 .../Customer/Card/CustomerCreditOpinion.vue   | 91 ++++++++++---------
 .../CustomerCreditContractsCreate.vue         |  1 +
 .../CustomerCreditContractsInsurance.vue      | 78 ++++------------
 5 files changed, 88 insertions(+), 107 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 9562be001..139917d05 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -17,7 +17,7 @@ const routeName = computed(() => route.name);
         :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
-            url: 'Clients/extendedListFilter',
+            url: 'Clients/filter',
             label: 'Search customer',
             info: 'You can search by customer id or name',
         }"
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 7b72a4d6d..38c08f4ce 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
@@ -72,6 +73,28 @@ const updateData = () => {
 </script>
 
 <template>
+    <!-- <VnTable
+        ref="tableRef"
+        data-key="Greuges"
+        url="Greuges"
+        search-url="greuges"
+        :filter="filter"
+        :order="['shipped DESC', 'amount']"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        @on-fetch="(data) => setRows(data)"
+        :disable-option="{ card: true }"
+        :create="{
+            urlCreate: `Greuges`,
+            title: t('New greuge'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: { shipped: new Date(), clientFk: route.params.id },
+        }"
+        auto-load
+    ></VnTable> -->
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index c164ab450..af1b0138e 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -3,9 +3,8 @@ import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { QBtn } from 'quasar';
-
 import { toCurrency, toDateHourMin } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
@@ -16,8 +15,8 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { t } = useI18n();
 const route = useRoute();
 
-const clientInformasRef = ref();
-const rows = ref([]);
+const tableRef = ref();
+// const rows = ref([]);
 
 const filter = {
     include: [
@@ -37,10 +36,9 @@ const filter = {
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
-        format: (value) => toDateHourMin(value),
+        format: ({ created }) => toDateHourMin(created),
         label: t('Since'),
-        name: 'since',
+        name: 'created',
     },
     {
         align: 'left',
@@ -53,59 +51,63 @@ const columns = computed(() => [
         field: 'rating',
         label: t('Rating'),
         name: 'rating',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
     {
         align: 'right',
         field: 'recommendedCredit',
-        format: (value) => toCurrency(value),
+        format: ({ recommendedCredit }) => toCurrency(recommendedCredit),
         label: t('Recommended credit'),
         name: 'recommendedCredit',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
 ]);
 
-watch(
-    () => route.params.id,
-    (newValue) => {
-        if (!newValue) return;
-        filter.where.clientFk = newValue;
-        clientInformasRef.value?.fetch();
-    }
-);
+// watch(
+//     () => route.params.id,
+//     (newValue) => {
+//         if (!newValue) return;
+//         filter.where.clientFk = newValue;
+//         clientInformasRef.value?.fetch();
+//     }
+// );
 </script>
 
 <template>
-    <FetchData
-        ref="clientInformasRef"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientInformas"
         url="ClientInformas"
         :filter="filter"
-        @on-fetch="(data) => (rows = data)"
+        :order="['created DESC']"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
         auto-load
-    />
-    <FormModel
-        :form-initial-data="{}"
-        :url-create="`Clients/${route.params.id}/setRating`"
-        @on-data-saved="clientInformasRef.fetch()"
+        :create="{
+            urlCreate: `Clients/${route.params.id}/setRating`,
+            title: 'Create rating',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
     >
-        <template #form="{ data }">
-            <VnRow>
-                <VnInput
-                    :label="t('Rating')"
-                    clearable
-                    type="number"
-                    v-model.number="data.rating"
-                />
-                <VnInput
-                    :label="t('Recommended credit')"
-                    clearable
-                    type="number"
-                    v-model.number="data.recommendedCredit"
-                />
-            </VnRow>
+        <template #column-employee="{ row }">
+            <span class="link" @click.stop>{{ row.worker.user.nickname }}</span>
+            <WorkerDescriptorProxy :id="row.clientFk" />
         </template>
-    </FormModel>
-
-    <div class="full-width flex justify-center" v-if="rows.length">
-        <QTable
+    </VnTable>
+    <!-- <QTable
             :columns="columns"
             :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
@@ -120,8 +122,7 @@ watch(
                     <WorkerDescriptorProxy :id="row.clientFk" />
                 </QTd>
             </template>
-        </QTable>
-    </div>
+        </QTable> -->
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c25e59e1a..24f3746dc 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -48,6 +48,7 @@ const toCustomerCreditContracts = () => {
                         clearable
                         type="number"
                         v-model.number="data.credit"
+                        autofocus
                     />
                 </div>
                 <div class="col">
diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
index ce880d4b5..70f7cf046 100644
--- a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
@@ -1,47 +1,26 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { toCurrency, toDateHourMinSec } from 'src/filters';
+import { toCurrency, toDate } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const rows = ref([]);
-
 const filter = {
     where: {
         creditClassificationFk: `${route.params.creditId}`,
     },
     limit: 20,
 };
-
-const tableColumnComponents = {
-    created: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    grade: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    credit: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
         field: 'created',
-        format: (value) => toDateHourMinSec(value),
+        format: ({ created }) => toDate(created),
         label: t('Created'),
         name: 'created',
     },
@@ -53,8 +32,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'credit',
-        format: (value) => toCurrency(value),
+        format: ({ credit }) => toCurrency(credit),
         label: t('Credit'),
         name: 'credit',
     },
@@ -62,41 +40,19 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
+    <VnTable
         url="CreditInsurances"
-    />
-
-    <QPage class="column items-center q-pa-md" v-if="rows.length">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-        >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                        >
-                            {{ props.value }}
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
+        ref="tableRef"
+        data-key="creditInsurances"
+        :filter="filter"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        auto-load
+    ></VnTable>
 </template>
 
 <i18n>

From be63c8a7fa273e9915420ca997c2f94e40661d8c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 08:43:32 +0200
Subject: [PATCH 068/162] fix: refs #6900 fine tunning wip

---
 src/composables/getTotal.js                   | 10 ++++
 src/i18n/locale/en.yml                        | 51 +----------------
 src/i18n/locale/es.yml                        | 49 +---------------
 .../InvoiceIn/Card/InvoiceInBasicData.vue     |  8 +--
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    |  5 +-
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue  | 17 ++++--
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     |  6 +-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 57 ++++++++++---------
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 31 +++++++---
 src/pages/InvoiceIn/InvoiceInFilter.vue       | 48 +++++-----------
 src/pages/InvoiceIn/InvoiceInList.vue         | 10 +---
 src/pages/InvoiceIn/locale/en.yml             | 49 ++++++++++++++++
 src/pages/InvoiceIn/locale/es.yml             | 47 +++++++++++++++
 13 files changed, 195 insertions(+), 193 deletions(-)
 create mode 100644 src/composables/getTotal.js
 create mode 100644 src/pages/InvoiceIn/locale/en.yml
 create mode 100644 src/pages/InvoiceIn/locale/es.yml

diff --git a/src/composables/getTotal.js b/src/composables/getTotal.js
new file mode 100644
index 000000000..41c4330c4
--- /dev/null
+++ b/src/composables/getTotal.js
@@ -0,0 +1,10 @@
+import { toCurrency } from 'src/filters';
+
+export function getTotal(rows, key, opts = {}) {
+    const { currency, cb } = opts;
+    const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
+
+    return currency
+        ? toCurrency(total, currency == 'default' ? undefined : currency)
+        : total;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fae22b06d..0c416a046 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -252,6 +252,7 @@ globals:
         ldap: LDAP
         samba: Samba
         serial: Serial
+    supplier: Supplier
     created: Created
     worker: Worker
     now: Now
@@ -738,56 +739,6 @@ parking:
     searchBar:
         info: You can search by parking code
         label: Search parking...
-invoiceIn:
-    list:
-        ref: Reference
-        supplier: Supplier
-        supplierRef: Supplier ref.
-        serialNumber: Serial number
-        serial: Serial
-        file: File
-        issued: Issued
-        isBooked: Is booked
-        awb: AWB
-        amount: Amount
-    card:
-        issued: Issued
-        amount: Amount
-        client: Client
-        company: Company
-        customerCard: Customer card
-        ticketList: Ticket List
-        vat: Vat
-        dueDay: Due day
-        intrastat: Intrastat
-    summary:
-        supplier: Supplier
-        supplierRef: Supplier ref.
-        currency: Currency
-        docNumber: Doc number
-        issued: Expedition date
-        operated: Operation date
-        bookEntried: Entry date
-        bookedDate: Booked date
-        sage: Sage withholding
-        vat: Undeductible VAT
-        company: Company
-        booked: Booked
-        expense: Expense
-        taxableBase: Taxable base
-        rate: Rate
-        sageVat: Sage vat
-        sageTransaction: Sage transaction
-        dueDay: Date
-        bank: Bank
-        amount: Amount
-        foreignValue: Foreign value
-        dueTotal: Due day
-        noMatch: Do not match
-        code: Code
-        net: Net
-        stems: Stems
-        country: Country
 order:
     field:
         salesPersonFk: Sales Person
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e1946515c..946ee5e54 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -254,6 +254,7 @@ globals:
         ldap: LDAP
         samba: Samba
         serial: Facturas por serie
+    supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -782,54 +783,6 @@ parking:
     searchBar:
         info: Puedes buscar por código de parking
         label: Buscar parking...
-invoiceIn:
-    list:
-        ref: Referencia
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
-        serialNumber: Num. serie
-        shortIssued: F. emisión
-        serial: Serie
-        file: Fichero
-        issued: Fecha emisión
-        isBooked: Conciliada
-        awb: AWB
-        amount: Importe
-    card:
-        issued: Fecha emisión
-        amount: Importe
-        client: Cliente
-        company: Empresa
-        customerCard: Ficha del cliente
-        ticketList: Listado de tickets
-        vat: Iva
-        dueDay: Fecha de vencimiento
-    summary:
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
-        currency: Divisa
-        docNumber: Número documento
-        issued: Fecha de expedición
-        operated: Fecha operación
-        bookEntried: Fecha asiento
-        bookedDate: Fecha contable
-        sage: Retención sage
-        vat: Iva no deducible
-        company: Empresa
-        booked: Contabilizada
-        expense: Gasto
-        taxableBase: Base imp.
-        rate: Tasa
-        sageTransaction: Sage transación
-        dueDay: Fecha
-        bank: Caja
-        amount: Importe
-        foreignValue: Divisa
-        dueTotal: Vencimiento
-        code: Código
-        net: Neto
-        stems: Tallos
-        country: País
 department:
     pageTitles:
         basicData: Basic data
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index ede9af825..045517a3f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -223,6 +223,10 @@ async function onSubmit() {
                     autofocus
                 />
             </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
+                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
+            </VnRow>
             <VnRow>
                 <VnSelect
                     :label="t('Undeductible VAT')"
@@ -285,10 +289,6 @@ async function onSubmit() {
                     </template>
                 </VnInput>
             </VnRow>
-            <VnRow>
-                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
-                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
-            </VnRow>
             <VnRow>
                 <VnSelect
                     :label="t('Currency')"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index cba2a31d2..e9a7eafee 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -356,10 +356,7 @@ const createInvoiceInCorrection = async () => {
         <template #body="{ entity }">
             <VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
-            <VnLv
-                :label="t('invoiceIn.card.amount')"
-                :value="toCurrency(totalAmount, entity.currency?.code)"
-            />
+            <VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />
             <VnLv :label="t('invoiceIn.summary.supplier')">
                 <template #value>
                     <span class="link">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 7dbd0fe9e..f5e1d835d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
+import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -71,7 +72,7 @@ async function insert() {
     await invoiceInFormRef.value.reload();
     notify(t('globals.dataSaved'), 'positive');
 }
-const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount, 0);
+// const getTotal = (rows, key) => rows.reduce((acc, row) => acc + +row[key], 0);
 </script>
 <template>
     <FetchData
@@ -154,11 +155,17 @@ const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount,
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{
-                                toCurrency(getTotalAmount(rows), invoiceIn.currency.code)
-                            }}
+                            {{ getTotal(rows, 'amount', { currency: 'default' }) }}
+                        </QTd>
+                        <QTd>
+                            <template v-if="isNotEuro(invoiceIn.currency.code)">
+                                {{
+                                    getTotal(rows, 'foreignValue', {
+                                        currency: invoiceIn.currency.code,
+                                    })
+                                }}
+                            </template>
                         </QTd>
-                        <QTd />
                     </QTr>
                 </template>
                 <template #item="props">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 481698832..18630dba9 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -3,6 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
+import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -72,9 +73,6 @@ const columns = computed(() => [
     },
 ]);
 
-const getTotal = (data, key) =>
-    data.reduce((acc, cur) => acc + +String(cur[key] || 0).replace(',', '.'), 0);
-
 const formatOpt = (row, { model, options }, prop) => {
     const obj = row[model];
     const option = options.find(({ id }) => id == obj);
@@ -154,7 +152,7 @@ const formatOpt = (row, { model, options }, prop) => {
                             <QTd />
                             <QTd />
                             <QTd>
-                                {{ toCurrency(getTotal(rows, 'amount'), currency) }}
+                                {{ getTotal(rows, 'amount', { currency: 'default' }) }}
                             </QTd>
                             <QTd>
                                 {{ getTotal(rows, 'net') }}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 644b472e2..bf2e7db48 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -35,7 +35,7 @@ const vatColumns = ref([
         name: 'landed',
         label: 'invoiceIn.summary.taxableBase',
         field: (row) => row.taxableBase,
-        format: (value) => toCurrency(value, currency.value),
+        format: (value) => toCurrency(value),
         sortable: true,
         align: 'left',
     },
@@ -64,7 +64,7 @@ const vatColumns = ref([
         name: 'rate',
         label: 'invoiceIn.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
-        format: (value) => toCurrency(value, currency.value),
+        format: (value) => toCurrency(value),
         sortable: true,
         align: 'left',
     },
@@ -72,7 +72,7 @@ const vatColumns = ref([
         name: 'currency',
         label: 'invoiceIn.summary.currency',
         field: (row) => row.foreignValue,
-        format: (value) => value,
+        format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
         align: 'left',
     },
@@ -97,7 +97,7 @@ const dueDayColumns = ref([
         name: 'amount',
         label: 'invoiceIn.summary.amount',
         field: (row) => row.amount,
-        format: (value) => toCurrency(value, currency.value),
+        format: (value) => toCurrency(value),
         sortable: true,
         align: 'left',
     },
@@ -105,7 +105,7 @@ const dueDayColumns = ref([
         name: 'landed',
         label: 'invoiceIn.summary.foreignValue',
         field: (row) => row.foreignValue,
-        format: (value) => value,
+        format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
         align: 'left',
     },
@@ -124,7 +124,7 @@ const intrastatColumns = ref([
     {
         name: 'amount',
         label: 'invoiceIn.summary.amount',
-        field: (row) => toCurrency(row.amount, currency.value),
+        field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
     },
@@ -179,7 +179,6 @@ const getTotalTax = (tax) =>
 
 const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
 </script>
-
 <template>
     <CardSummary
         data-key="InvoiceInSummary"
@@ -229,10 +228,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                <VnLv
-                    :label="t('invoiceIn.summary.docNumber')"
-                    :value="`${entity.serial}/${entity.serialNumber}`"
-                />
+                <VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -293,12 +289,9 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnLv
                         :label="t('invoiceIn.summary.taxableBase')"
-                        :value="toCurrency(entity.totals.totalTaxableBase, currency)"
-                    />
-                    <VnLv
-                        label="Total"
-                        :value="toCurrency(entity.totals.totalVat, currency)"
+                        :value="toCurrency(entity.totals.totalTaxableBase)"
                     />
+                    <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
                     <VnLv :label="t('invoiceIn.summary.dueTotal')">
                         <template #value>
                             <QChip
@@ -311,7 +304,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                         : t('invoiceIn.summary.dueTotal')
                                 "
                             >
-                                {{ toCurrency(entity.totals.totalDueDay, currency) }}
+                                {{ toCurrency(entity.totals.totalDueDay) }}
                             </QChip>
                         </template>
                     </VnLv>
@@ -350,15 +343,17 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     <template #bottom-row>
                         <QTr class="bg">
                             <QTd></QTd>
+                            <QTd>{{ toCurrency(entity.totals.totalTaxableBase) }}</QTd>
+                            <QTd></QTd>
+                            <QTd></QTd>
+                            <QTd>{{ toCurrency(getTotalTax(entity.invoiceInTax)) }}</QTd>
                             <QTd>{{
-                                toCurrency(entity.totals.totalTaxableBase, currency)
+                                entity.totals.totalTaxableBaseForeignValue &&
+                                toCurrency(
+                                    entity.totals.totalTaxableBaseForeignValue,
+                                    currency
+                                )
                             }}</QTd>
-                            <QTd></QTd>
-                            <QTd></QTd>
-                            <QTd>{{
-                                toCurrency(getTotalTax(entity.invoiceInTax, currency))
-                            }}</QTd>
-                            <QTd></QTd>
                         </QTr>
                     </template>
                 </QTable>
@@ -384,9 +379,17 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             <QTd></QTd>
                             <QTd></QTd>
                             <QTd>
-                                {{ toCurrency(entity.totals.totalDueDay, currency) }}
+                                {{ toCurrency(entity.totals.totalDueDay) }}
+                            </QTd>
+                            <QTd>
+                                {{
+                                    entity.totals.totalDueDayForeignValue &&
+                                    toCurrency(
+                                        entity.totals.totalDueDayForeignValue,
+                                        currency
+                                    )
+                                }}
                             </QTd>
-                            <QTd></QTd>
                         </QTr>
                     </template>
                 </QTable>
@@ -421,7 +424,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     <template #bottom-row>
                         <QTr class="bg">
                             <QTd></QTd>
-                            <QTd>{{ toCurrency(intrastatTotals.amount, currency) }}</QTd>
+                            <QTd>{{ toCurrency(intrastatTotals.amount) }}</QTd>
                             <QTd>{{ intrastatTotals.net }}</QTd>
                             <QTd>{{ intrastatTotals.stems }}</QTd>
                             <QTd></QTd>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 4dac5058e..4428f3c80 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
+import { getTotal } from 'src/composables/getTotal';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -56,7 +57,7 @@ const columns = computed(() => [
     {
         name: 'taxablebase',
         label: t('Taxable base'),
-        field: (row) => toCurrency(row.taxableBase, currency.value),
+        field: (row) => row.taxableBase,
         model: 'taxableBase',
         sortable: true,
         tabIndex: 2,
@@ -91,7 +92,7 @@ const columns = computed(() => [
         label: t('Rate'),
         sortable: true,
         tabIndex: 5,
-        field: (row) => toCurrency(taxRate(row, row.taxTypeSageFk), currency.value),
+        field: (row) => taxRate(row, row.taxTypeSageFk),
         align: 'left',
     },
     {
@@ -162,9 +163,11 @@ async function addExpense() {
         });
     }
 }
-const getTotalTaxableBase = (rows) =>
-    rows.reduce((acc, { taxableBase }) => acc + +(taxableBase || 0), 0);
-const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0);
+
+const formatTotal = (rows, key, cb) => {
+    const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
+    return toCurrency(total, key == 'foreignValue' ? currency.value : undefined);
+};
 
 const formatOpt = (row, { model, options }, prop) => {
     const obj = row[model];
@@ -324,12 +327,24 @@ const formatOpt = (row, { model, options }, prop) => {
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{ toCurrency(getTotalTaxableBase(rows), currency) }}
+                            {{ getTotal(rows, 'taxableBase', { currency: 'default' }) }}
                         </QTd>
                         <QTd />
                         <QTd />
-                        <QTd> {{ toCurrency(getTotalRate(rows), currency) }}</QTd>
-                        <QTd />
+                        <QTd>
+                            {{
+                                getTotal(rows, null, { cb: taxRate, currency: 'default' })
+                            }}</QTd
+                        >
+                        <QTd>
+                            <template v-if="isNotEuro(invoiceIn.currency.code)">
+                                {{
+                                    getTotal(rows, 'foreignValue', {
+                                        currency: invoiceIn.currency.code,
+                                    })
+                                }}
+                            </template>
+                        </QTd>
                     </QTr>
                 </template>
                 <template #item="props">
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 2f87c2b2e..bf4e023a9 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -28,6 +28,16 @@ const activities = ref([]);
             </div>
         </template>
         <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('From')" v-model="params.from" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
@@ -64,16 +74,6 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.serialNumber')"
-                        v-model="params.serialNumber"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -84,15 +84,6 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('Issued')"
-                        v-model="params.issued"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -140,22 +131,6 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('From')"
-                            v-model="params.from"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
-                    </QItemSection>
-                </QItem>
-            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -179,6 +154,7 @@ en:
         correctedFk: Rectified
         issued: Issued
         to: To
+        from: From
         awbCode: AWB
         correctingFk: Rectificative
         supplierActivityFk: Supplier activity
@@ -201,6 +177,8 @@ es:
         correctedFk: Rectificada
         correctingFk: Rectificativa
         supplierActivityFk: Actividad proveedor
+        from: Desde
+        to: Hasta
     From: Desde
     To: Hasta
     Amount: Importe
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 234cfb50f..0cad09378 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -47,12 +47,6 @@ const cols = computed(() => [
         name: 'supplierRef',
         label: t('invoiceIn.list.supplierRef'),
     },
-
-    {
-        align: 'left',
-        name: 'serialNumber',
-        label: t('invoiceIn.list.serialNumber'),
-    },
     {
         align: 'left',
         name: 'serial',
@@ -141,7 +135,7 @@ const cols = computed(() => [
                 v-model="data.supplierFk"
                 url="Suppliers"
                 :fields="['id', 'nickname']"
-                :label="t('Supplier')"
+                :label="t('globals.supplier')"
                 option-value="id"
                 option-label="nickname"
                 :filter-options="['id', 'name']"
@@ -162,7 +156,7 @@ const cols = computed(() => [
             />
             <VnSelect
                 url="Companies"
-                :label="t('Company')"
+                :label="t('globals.company')"
                 :fields="['id', 'code']"
                 v-model="data.companyFk"
                 option-value="id"
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
new file mode 100644
index 000000000..824fd6e12
--- /dev/null
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -0,0 +1,49 @@
+invoiceIn:
+    serial: Serial
+    list:
+        ref: Reference
+        supplier: Supplier
+        supplierRef: Supplier ref.
+        serial: Serial
+        file: File
+        issued: Issued
+        isBooked: Is booked
+        awb: AWB
+        amount: Amount
+    card:
+        issued: Issued
+        amount: Amount
+        client: Client
+        company: Company
+        customerCard: Customer card
+        ticketList: Ticket List
+        vat: Vat
+        dueDay: Due day
+        intrastat: Intrastat
+    summary:
+        supplier: Supplier
+        supplierRef: Supplier ref.
+        currency: Currency
+        issued: Expedition date
+        operated: Operation date
+        bookEntried: Entry date
+        bookedDate: Booked date
+        sage: Sage withholding
+        vat: Undeductible VAT
+        company: Company
+        booked: Booked
+        expense: Expense
+        taxableBase: Taxable base
+        rate: Rate
+        sageVat: Sage vat
+        sageTransaction: Sage transaction
+        dueDay: Date
+        bank: Bank
+        amount: Amount
+        foreignValue: Foreign value
+        dueTotal: Due day
+        noMatch: Do not match
+        code: Code
+        net: Net
+        stems: Stems
+        country: Country
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
new file mode 100644
index 000000000..944708364
--- /dev/null
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -0,0 +1,47 @@
+invoiceIn:
+    serial: Serie
+    list:
+        ref: Referencia
+        supplier: Proveedor
+        supplierRef: Ref. proveedor
+        shortIssued: F. emisión
+        file: Fichero
+        issued: Fecha emisión
+        isBooked: Conciliada
+        awb: AWB
+        amount: Importe
+    card:
+        issued: Fecha emisión
+        amount: Importe
+        client: Cliente
+        company: Empresa
+        customerCard: Ficha del cliente
+        ticketList: Listado de tickets
+        vat: Iva
+        dueDay: Fecha de vencimiento
+    summary:
+        supplier: Proveedor
+        supplierRef: Ref. proveedor
+        currency: Divisa
+        docNumber: Número documento
+        issued: Fecha de expedición
+        operated: Fecha operación
+        bookEntried: Fecha asiento
+        bookedDate: Fecha contable
+        sage: Retención sage
+        vat: Iva no deducible
+        company: Empresa
+        booked: Contabilizada
+        expense: Gasto
+        taxableBase: Base imp.
+        rate: Tasa
+        sageTransaction: Sage transación
+        dueDay: Fecha
+        bank: Caja
+        amount: Importe
+        foreignValue: Divisa
+        dueTotal: Vencimiento
+        code: Código
+        net: Neto
+        stems: Tallos
+        country: País

From cfa5b84f4ec9f2fa06d94aef3e8586e0f1139c9c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Sep 2024 09:56:52 +0200
Subject: [PATCH 069/162] feat

---
 src/pages/Item/ItemFixedPriceFilter.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 81d9fe308..9b3c7f052 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -23,16 +23,16 @@ import { useRoute } from 'vue-router';
 const route = useRoute();
 
 const itemTypeWorkersOptions = ref([]);
-const sanitizeParam = (param) => {
-    const params = JSON.parse(route?.query?.table);
-    return params[param] ?? 'false';
-};
+// const sanitizeParam = (param) => {
+//     const params = JSON.parse(route?.query?.table);
+//     return params[param] ?? 'false';
+// };
 const $params = ref({});
-onMounted(() => {
-    ['mine', 'hasMinPrice', 'showBadDates'].forEach(
-        (tag) => ($params.value[tag] = sanitizeParam(tag))
-    );
-});
+// onMounted(() => {
+//     ['mine', 'hasMinPrice', 'showBadDates'].forEach(
+//         (tag) => ($params.value[tag] = sanitizeParam(tag))
+//     );
+// });
 const pushParam = (param) => ({
     param: { [param]: $params.value[param] },
 });

From 970c8473a218bc41b0ac2848be82ba534985e3a3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Sep 2024 11:28:13 +0200
Subject: [PATCH 070/162] fet: updates

---
 src/components/VnTable/VnTable.vue |  1 +
 src/pages/Item/ItemFixedPrice.vue  | 75 ++++++++++++++++++++----------
 2 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 23099698c..ab4702722 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -278,6 +278,7 @@ function parseOrder(urlOrders) {
 
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
+    create: createForm,
     reload,
     redirect: redirectFn,
     selected,
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 948cd1f23..cfd2d91fb 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -68,7 +68,6 @@ const columns = computed(() => [
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
-        columnClass: 'shrink',
         columnField: {
             component: 'input',
             type: 'number',
@@ -77,7 +76,6 @@ const columns = computed(() => [
     {
         label: t('globals.name'),
         field: 'name',
-        columnClass: 'shrink',
         name: 'description',
         ...defaultColumnAttrs,
         create: true,
@@ -119,13 +117,14 @@ const columns = computed(() => [
         cardVisible: true,
         ...defaultColumnAttrs,
         component: 'date',
+        columnClass: 'shrink',
     },
     {
         label: t('item.fixedPrice.ended'),
         field: 'ended',
         name: 'ended',
         ...defaultColumnAttrs,
-        columnClass: 'expand',
+        columnClass: 'shrink',
         cardVisible: true,
         component: 'date',
         format: (row) => toDate(row.ended),
@@ -254,22 +253,49 @@ const addRow = (fixedPrice = null) => {
     //     fixedPrices.value.push({ ...newPrice });
     //     return;
     // }
-    if (fixedPrice) {
-        lastItem.value = fixedPrice;
+    if (!fixedPrice) {
+        const today = Date.vnNew();
+        const millisecsInDay = 86400000;
+        const daysInWeek = 7;
+        const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
+
+        // lastItem.value = {
+        lastItem.value = {
+            started: today,
+            ended: nextWeek,
+            hasMinPrice: 0,
+        };
+
         return;
     }
 
-    const lastItemCopy = JSON.parse(
-        JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
-    );
-    lastItem.value = lastItemCopy;
-    tableRef.value.create.formInitialData = lastItem;
-    delete lastItemCopy.id;
-    fixedPricesOriginalData.value.splice(lastvisible, 0, lastItemCopy);
-    fixedPrices.value.unshift(lastItemCopy);
-    nextTick(() => {
-        highlightNewRow(lastvisible);
-    });
+    const lastItemCopy = {
+        itemFk: fixedPrice.itemFk,
+        name: fixedPrice.name,
+        subName: fixedPrice.subName,
+        value5: fixedPrice.value5,
+        value6: fixedPrice.value6,
+        value7: fixedPrice.value7,
+        value8: fixedPrice.value8,
+        value9: fixedPrice.value9,
+        value10: fixedPrice.value10,
+        warehouseFk: fixedPrice.warehouseFk,
+        rate2: fixedPrice.rate2,
+        rate3: fixedPrice.rate3,
+        hasMinPrice: fixedPrice.hasMinPrice,
+        minPrice: fixedPrice.minPrice,
+        started: fixedPrice.started,
+        ended: fixedPrice.ended,
+    };
+    // lastItem.value = lastItemCopy;
+    // tableRef.value.create.onDataSaved(lastItem);
+    return lastItemCopy;
+    // delete lastItemCopy.id;
+    // fixedPricesOriginalData.value.splice(lastvisible, 0, lastItemCopy);
+    // fixedPrices.value.unshift(lastItemCopy);
+    // nextTick(() => {
+    //     highlightNewRow(lastvisible);
+    // });
 };
 const lastItem = ref(null);
 function highlightNewRow(index) {
@@ -338,11 +364,9 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
-function handleOnDataSave(CrudModelRef) {
-    addRow(
-        CrudModelRef.CrudModelRef.formData[CrudModelRef.CrudModelRef.formData.length - 1]
-    );
-    CrudModelRef.CrudModelRef.formData.unshift(lastItem);
+function handleOnDataSave({ CrudModelRef }) {
+    const roww = addRow(CrudModelRef.formData[CrudModelRef.formData.length - 1]);
+    CrudModelRef.formData.unshift(lastItem);
     nextTick(() => {
         highlightNewRow(checkLastVisibleRow());
     });
@@ -426,7 +450,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #column-itemId="props">
                 <QTd>
                     <VnSelect
-                        style="max-width: 125px"
+                        style="max-width: 100px"
                         url="Items/withName"
                         hide-selected
                         option-label="id"
@@ -504,7 +528,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #column-started="props">
                 <QTd class="col">
                     <VnInputDate
-                        style="min-width: 147px"
+                        class="vnInputDate"
                         :show-event="true"
                         v-model="props.row.started"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
@@ -522,7 +546,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #column-ended="props">
                 <QTd class="col">
                     <VnInputDate
-                        style="min-width: 147px"
+                        class="vnInputDate"
                         :show-event="true"
                         v-model="props.row.ended"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
@@ -591,6 +615,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     max-width: none;
 
     .q-td.col {
+        & .vnInputDate {
+            min-width: 130px;
+        }
         & div.row {
             & .q-checkbox {
                 & .q-checkbox__inner {

From f24daa4ebdeb01009f80950d7f8f3b8ebd5fe9fd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 13:15:06 +0200
Subject: [PATCH 071/162] feat: refs #6900 hide menu item

---
 src/components/LeftMenu.vue                | 13 +++++++++++--
 src/components/common/VnCard.vue           |  2 +-
 src/pages/InvoiceIn/Card/InvoiceInCard.vue | 16 ++++++++++++++++
 src/router/modules/invoiceIn.js            | 17 +++++++++++++++++
 src/stores/useNavigationStore.js           |  1 +
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 213c08d7e..4261dad2f 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, ref, reactive } from 'vue';
+import { onMounted, watch, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -29,6 +29,15 @@ onMounted(async () => {
     getRoutes();
 });
 
+watch(
+    () => route.matched,
+    () => {
+        items.value = [];
+        getRoutes();
+    },
+    { deep: true }
+);
+
 function findMatches(search, item) {
     const matches = [];
     function findRoute(search, item) {
@@ -52,7 +61,7 @@ function addChildren(module, route, parent) {
         const matches = findMatches(mainMenus, route);
 
         for (const child of matches) {
-            navigation.addMenuItem(module, child, parent);
+            if (!child.meta.hidden) navigation.addMenuItem(module, child, parent);
         }
     }
 }
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 94adbf6cf..902b57e16 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -72,7 +72,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView />
+                <RouterView :key="$route.path" />
             </div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index a95f289b0..be92b6a8b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -3,6 +3,8 @@ import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import InvoiceInFilter from '../InvoiceInFilter.vue';
 import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
+import axios from 'axios';
+import { onBeforeRouteUpdate } from 'vue-router';
 
 const filter = {
     include: [
@@ -20,6 +22,20 @@ const filter = {
         { relation: 'currency' },
     ],
 };
+
+onBeforeRouteUpdate(async (to) => {
+    const card = to.matched.find((route) => route.name === 'InvoiceInCard');
+    const corrective = card.children.find(
+        (route) => route.name === 'InvoiceInCorrective'
+    );
+
+    const isRectificative = !!(
+        await axios.get('InvoiceInCorrections', {
+            params: { filter: { where: { correctingFk: to.params.id } } },
+        })
+    ).data.length;
+    corrective.meta.hidden = !isRectificative;
+});
 </script>
 <template>
     <VnCard
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 906db8a58..d2091f230 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -1,4 +1,5 @@
 import { RouterView } from 'vue-router';
+import axios from 'axios';
 
 export default {
     path: '/invoice-in',
@@ -63,6 +64,22 @@ export default {
             path: ':id',
             component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
             redirect: { name: 'InvoiceInSummary' },
+            beforeEnter: async (to, from, next) => {
+                const isRectificative = !!(
+                    await axios.get('InvoiceInCorrections', {
+                        params: { filter: { where: { correctingFk: to.params.id } } },
+                    })
+                ).data.length;
+
+                const card = to.matched.find((route) => route.name === 'InvoiceInCard');
+                const corrective = card.children.find(
+                    (route) => route.name === 'InvoiceInCorrective'
+                );
+
+                corrective.meta.hidden = !isRectificative;
+
+                next();
+            },
             children: [
                 {
                     name: 'InvoiceInSummary',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 961e80377..ad671a7f9 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -56,6 +56,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
     function addMenuItem(module, route, parent) {
         const { meta } = route;
         let { menuChildren = null } = meta;
+        if (meta.hidden) return;
         if (menuChildren)
             menuChildren = menuChildren.map(({ name, title, icon }) => ({
                 name,

From 8ea9742068d6699de2ea5778ade6a52f732a61ae Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 13:32:20 +0200
Subject: [PATCH 072/162] chore: refs #6900 rollback

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

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 902b57e16..94adbf6cf 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -72,7 +72,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="$route.path" />
+                <RouterView />
             </div>
         </QPage>
     </QPageContainer>

From 136f9abeff245e2f03b963597e5e1703b640c6a8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 13:39:13 +0200
Subject: [PATCH 073/162] chore: refs #6900 rollback

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

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 4261dad2f..03fe11a85 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -61,7 +61,7 @@ function addChildren(module, route, parent) {
         const matches = findMatches(mainMenus, route);
 
         for (const child of matches) {
-            if (!child.meta.hidden) navigation.addMenuItem(module, child, parent);
+            navigation.addMenuItem(module, child, parent);
         }
     }
 }

From 0faa42867d0cb9c65e58ce83ff45f20afc47e2ba Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 13:52:13 +0200
Subject: [PATCH 074/162] chore: refs #6900 drop comment

---
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 2 --
 src/pages/InvoiceIn/Card/InvoiceInVat.vue    | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index f5e1d835d..e475bc4ed 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -9,7 +9,6 @@ import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { toCurrency } from 'src/filters';
 import useNotify from 'src/composables/useNotify.js';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
@@ -72,7 +71,6 @@ async function insert() {
     await invoiceInFormRef.value.reload();
     notify(t('globals.dataSaved'), 'positive');
 }
-// const getTotal = (rows, key) => rows.reduce((acc, row) => acc + +row[key], 0);
 </script>
 <template>
     <FetchData
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 4428f3c80..6142e3a15 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -164,11 +164,6 @@ async function addExpense() {
     }
 }
 
-const formatTotal = (rows, key, cb) => {
-    const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
-    return toCurrency(total, key == 'foreignValue' ? currency.value : undefined);
-};
-
 const formatOpt = (row, { model, options }, prop) => {
     const obj = row[model];
     const option = options.find(({ id }) => id == obj);

From 7892e68e1b433f33e15fa524c3e5c961a18220c4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 2 Sep 2024 15:03:47 +0200
Subject: [PATCH 075/162] feat: updates

---
 src/pages/Item/ItemFixedPrice.vue | 68 +++++++++++++++++--------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index cfd2d91fb..41cfa0676 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -233,8 +233,9 @@ function checkLastVisibleRow() {
         return lastVisibleRow;
     }
 }
-const addRow = (fixedPrice = null) => {
-    const lastvisible = checkLastVisibleRow();
+const addRow = (original = null) => {
+    // const original = checkLastVisibleRow();
+    let copy = null;
     // if (!fixedPrices.value || fixedPrices.value.length === 0) {
     //     fixedPrices.value = [];
 
@@ -253,52 +254,53 @@ const addRow = (fixedPrice = null) => {
     //     fixedPrices.value.push({ ...newPrice });
     //     return;
     // }
-    if (!fixedPrice) {
+    if (!original) {
         const today = Date.vnNew();
         const millisecsInDay = 86400000;
         const daysInWeek = 7;
         const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
 
         // lastItem.value = {
-        lastItem.value = {
+        copy = {
             started: today,
             ended: nextWeek,
             hasMinPrice: 0,
         };
 
-        return;
+        // return;
     }
 
-    const lastItemCopy = {
-        itemFk: fixedPrice.itemFk,
-        name: fixedPrice.name,
-        subName: fixedPrice.subName,
-        value5: fixedPrice.value5,
-        value6: fixedPrice.value6,
-        value7: fixedPrice.value7,
-        value8: fixedPrice.value8,
-        value9: fixedPrice.value9,
-        value10: fixedPrice.value10,
-        warehouseFk: fixedPrice.warehouseFk,
-        rate2: fixedPrice.rate2,
-        rate3: fixedPrice.rate3,
-        hasMinPrice: fixedPrice.hasMinPrice,
-        minPrice: fixedPrice.minPrice,
-        started: fixedPrice.started,
-        ended: fixedPrice.ended,
+    copy = {
+        $index: original.$index - 1,
+        itemFk: original.itemFk,
+        name: original.name,
+        subName: original.subName,
+        value5: original.value5,
+        value6: original.value6,
+        value7: original.value7,
+        value8: original.value8,
+        value9: original.value9,
+        value10: original.value10,
+        warehouseFk: original.warehouseFk,
+        rate2: original.rate2,
+        rate3: original.rate3,
+        hasMinPrice: original.hasMinPrice,
+        minPrice: original.minPrice,
+        started: Date.vnNew(),
+        ended: Date.vnNew(),
     };
     // lastItem.value = lastItemCopy;
     // tableRef.value.create.onDataSaved(lastItem);
-    return lastItemCopy;
+    // nextTick(() => {
+    //     highlightNewRow(fixedPrice);
+    // });
     // delete lastItemCopy.id;
     // fixedPricesOriginalData.value.splice(lastvisible, 0, lastItemCopy);
     // fixedPrices.value.unshift(lastItemCopy);
-    // nextTick(() => {
-    //     highlightNewRow(lastvisible);
-    // });
+    return { original, copy };
 };
 const lastItem = ref(null);
-function highlightNewRow(index) {
+function highlightNewRow({ $index: index }) {
     const row = document
         .getElementsByClassName('q-table')[0]
         .querySelectorAll('tr.cursor-pointer')[index];
@@ -365,10 +367,11 @@ onMounted(async () => {
     params.warehouseFk = user.value.warehouseFk;
 });
 function handleOnDataSave({ CrudModelRef }) {
-    const roww = addRow(CrudModelRef.formData[CrudModelRef.formData.length - 1]);
-    CrudModelRef.formData.unshift(lastItem);
+    const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
+    // CrudModelRef.formData.unshift(roww);
+    CrudModelRef.formData.splice(original.$index, 0, copy);
     nextTick(() => {
-        highlightNewRow(checkLastVisibleRow());
+        highlightNewRow(original);
     });
 }
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -415,10 +418,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <QPage>
         <VnTable
             :default-remove="false"
+            :default-reset="false"
+            :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :filter="{ where: exprBuilder }"
             :order="['name ASC', 'itemFk DESC']"
+            save-url="FixedPrices/crud"
+            :filter="{ where: { warehouseFk: user.warehouseFk } }"
             ref="tableRef"
             dense
             :columns="columns"

From b42385d7d6113455def4ab4fc024d440e439f1bd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 16:47:54 +0200
Subject: [PATCH 076/162] refactor: refs #6900 create new expense form

---
 src/components/CreateNewExpenseForm.vue       |  52 ++++++++
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 118 ++----------------
 .../invoiceIn/invoiceInBasicData.spec.js      |   3 +-
 .../invoiceIn/invoiceInVat.spec.js            |  20 ++-
 4 files changed, 73 insertions(+), 120 deletions(-)
 create mode 100644 src/components/CreateNewExpenseForm.vue

diff --git a/src/components/CreateNewExpenseForm.vue b/src/components/CreateNewExpenseForm.vue
new file mode 100644
index 000000000..a04033540
--- /dev/null
+++ b/src/components/CreateNewExpenseForm.vue
@@ -0,0 +1,52 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+const { t } = useI18n();
+</script>
+<template>
+    <FormModelPopup
+        url-create="Expenses"
+        model="Expense"
+        :title="t('New expense')"
+        :form-initial-data="{ id: null, isWithheld: false, name: null }"
+        @on-data-saved="emit('onDataSaved', $event)"
+    >
+        <template #form-inputs="{ data, validate }">
+            <VnRow>
+                <VnInput
+                    :label="`${t('Code')}`"
+                    v-model="data.id"
+                    :required="true"
+                    :rules="validate('expense.code')"
+                />
+                <QCheckbox
+                    dense
+                    size="sm"
+                    :label="`${t('It\'s a withholding')}`"
+                    v-model="data.isWithheld"
+                    :rules="validate('expense.isWithheld')"
+                />
+            </VnRow>
+            <VnRow>
+                <VnInput
+                    :label="`${t('Description')}`"
+                    v-model="data.name"
+                    :required="true"
+                    :rules="validate('expense.description')"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New expense: Nuevo gasto
+    Code: Código
+    It's a withholding: Es una retención
+    Description: Descripción
+</i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 6142e3a15..f0f637a5c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -2,19 +2,17 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
 
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
@@ -24,15 +22,7 @@ const expenses = ref([]);
 const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
-const newExpense = ref({
-    code: undefined,
-    isWithheld: false,
-    description: undefined,
-});
-
 const invoiceInFormRef = ref();
-const expensesRef = ref();
-const newExpenseRef = ref();
 
 defineProps({
     actionIcon: {
@@ -133,37 +123,6 @@ function taxRate(invoiceInTax) {
     return (taxTypeSage / 100) * taxableBase;
 }
 
-async function addExpense() {
-    try {
-        if (!newExpense.value.code) throw new Error(t(`The code can't be empty`));
-        if (isNaN(newExpense.value.code))
-            throw new Error(t(`The code have to be a number`));
-        if (!newExpense.value.description)
-            throw new Error(t(`The description can't be empty`));
-
-        const data = [
-            {
-                id: newExpense.value.code,
-                isWithheld: newExpense.value.isWithheld,
-                name: newExpense.value.description,
-            },
-        ];
-
-        await axios.post(`Expenses`, data);
-        await expensesRef.value.fetch();
-        quasar.notify({
-            type: 'positive',
-            message: t('globals.dataSaved'),
-        });
-        newExpenseRef.value.hide();
-    } catch (error) {
-        quasar.notify({
-            type: 'negative',
-            message: t(`${error.message}`),
-        });
-    }
-}
-
 const formatOpt = (row, { model, options }, prop) => {
     const obj = row[model];
     const option = options.find(({ id }) => id == obj);
@@ -205,7 +164,7 @@ const formatOpt = (row, { model, options }, prop) => {
             >
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
-                        <VnSelect
+                        <VnSelectDialog
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -217,25 +176,12 @@ const formatOpt = (row, { model, options }, prop) => {
                                     {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                 </QItem>
                             </template>
-                            <template #append>
-                                <QIcon
-                                    name="close"
-                                    @click.stop="value = null"
-                                    class="cursor-pointer"
-                                    size="xs"
+                            <template #form>
+                                <CreateNewExpenseForm
+                                    @on-data-saved="$refs.expensesRef.fetch()"
                                 />
-                                <QIcon
-                                    @click.stop.prevent="newExpenseRef.show()"
-                                    :name="actionIcon"
-                                    size="xs"
-                                    class="default-icon"
-                                >
-                                    <QTooltip>
-                                        {{ t('Create expense') }}
-                                    </QTooltip>
-                                </QIcon>
                             </template>
-                        </VnSelect>
+                        </VnSelectDialog>
                     </QTd>
                 </template>
                 <template #body-cell-taxablebase="{ row }">
@@ -351,7 +297,7 @@ const formatOpt = (row, { model, options }, prop) => {
                             <QSeparator />
                             <QList>
                                 <QItem>
-                                    <VnSelect
+                                    <VnSelectDialog
                                         :label="t('Expense')"
                                         class="full-width"
                                         v-model="props.row['expenseFk']"
@@ -365,7 +311,10 @@ const formatOpt = (row, { model, options }, prop) => {
                                                 {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                             </QItem>
                                         </template>
-                                    </VnSelect>
+                                        <template #form>
+                                            <CreateNewExpenseForm />
+                                        </template>
+                                    </VnSelectDialog>
                                 </QItem>
                                 <QItem>
                                     <VnInputNumber
@@ -452,44 +401,6 @@ const formatOpt = (row, { model, options }, prop) => {
             </QTable>
         </template>
     </CrudModel>
-    <QDialog ref="newExpenseRef">
-        <QCard>
-            <QCardSection class="q-pb-none">
-                <QItem class="q-pa-none">
-                    <span class="text-primary text-h6 full-width">
-                        <QIcon name="edit" class="q-mr-xs" />
-                        {{ t('New expense') }}
-                    </span>
-                    <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
-            </QCardSection>
-            <QCardSection class="q-pt-none">
-                <QItem>
-                    <VnInput
-                        :label="`${t('Code')}*`"
-                        v-model="newExpense.code"
-                        :required="true"
-                    />
-                    <QCheckbox
-                        dense
-                        size="sm"
-                        :label="`${t('It\'s a withholding')}`"
-                        v-model="newExpense.isWithheld"
-                    />
-                </QItem>
-                <QItem>
-                    <VnInput
-                        :label="`${t('Descripction')}*`"
-                        v-model="newExpense.description"
-                    />
-                </QItem>
-            </QCardSection>
-            <QCardActions class="justify-end">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="addExpense" />
-            </QCardActions>
-        </QCard>
-    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn
             color="primary"
@@ -544,10 +455,7 @@ es:
     Sage transaction: Sage transacción
     Rate: Tasa
     Foreign value: Divisa
-    New expense: Nuevo gasto
-    Code: Código
-    It's a withholding: Es una retención
-    Descripction: Descripción
+   
     The code can't be empty: El código no puede estar vacío
     The description can't be empty: La descripción no puede estar vacía
     The code have to be a number: El código debe ser un número.
diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 77a11969b..e1939fe5a 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -36,8 +36,7 @@ describe('InvoiceInBasicData', () => {
     });
 
     it('should throw an error creating a new dms if a file is not attached', () => {
-        cy.get(formInputs).eq(5).click();
-        cy.get(formInputs).eq(5).type('{selectall}{backspace}');
+        cy.get(formInputs).eq(7).type('{selectall}{backspace}');
         cy.get(documentBtns).eq(0).click();
         cy.get(dialogActionBtns).eq(1).click();
         cy.get('.q-notification__message').should(
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 018ae7a53..b84d743d1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -3,13 +3,14 @@ describe('InvoiceInVat', () => {
     const thirdRow = 'tbody > :nth-child(3)';
     const firstLineVat = 'tbody > :nth-child(1) > :nth-child(4)';
     const dialogInputs = '.q-dialog label input';
-    const dialogBtns = '.q-dialog button';
-    const acrossInput = 'tbody tr:nth-child(1) td:nth-child(2) .default-icon';
+    const addBtn = 'tbody tr:nth-child(1) td:nth-child(2) .--add-icon';
     const randomInt = Math.floor(Math.random() * 100);
 
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/invoice-in/1/vat`);
+        cy.intercept('GET', '/api/InvoiceIns/1/getTotals').as('lastCall');
+        cy.wait('@lastCall');
     });
 
     it('should edit the sage iva', () => {
@@ -26,22 +27,15 @@ describe('InvoiceInVat', () => {
     });
 
     it('should remove the first line', () => {
-        cy.removeRow(2);
-    });
-
-    it('should throw an error if there are fields undefined', () => {
-        cy.get(acrossInput).click();
-        cy.get(dialogBtns).eq(2).click();
-        cy.get('.q-notification__message').should('have.text', "The code can't be empty");
+        cy.removeRow(1);
     });
 
     it('should correctly handle expense addition', () => {
-        cy.get(acrossInput).click();
+        cy.get(addBtn).click();
         cy.get(dialogInputs).eq(0).type(randomInt);
-        cy.get(dialogInputs).eq(1).click();
         cy.get(dialogInputs).eq(1).type('This is a dummy expense');
 
-        cy.get(dialogBtns).eq(2).click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+        cy.get('button[type="submit"]').click();
+        cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 });

From 3df86d20d22838998e22054e007b88aa31a71ae0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 2 Sep 2024 16:48:15 +0200
Subject: [PATCH 077/162] chore: refs #6900 drop useless locale

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index f0f637a5c..ec1f7d774 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -455,8 +455,4 @@ es:
     Sage transaction: Sage transacción
     Rate: Tasa
     Foreign value: Divisa
-   
-    The code can't be empty: El código no puede estar vacío
-    The description can't be empty: La descripción no puede estar vacía
-    The code have to be a number: El código debe ser un número.
 </i18n>

From 84076309a564764f0a9e0da69a6e3c41bc6c986f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 3 Sep 2024 08:04:42 +0200
Subject: [PATCH 078/162] feat: update changelog.md

---
 CHANGELOG.md | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86ffce3fd..e23465173 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,149 @@
+# Version 24.36 - 2024-09-03
+
+### Added 🆕
+
+-   feat(FormModel): trim data by default by:alexm
+-   feat(orderBasicData): add notes by:alexm
+-   feat(orderList): correct create order by:alexm
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra
+-   feat: add recover password and reset password by:alexm
+-   feat: refs #7346 add seriaType option by:jgallego
+-   feat: refs #7346 elimino === by:jgallego
+-   feat: refs #7346 formdata uses serialType by:jgallego
+-   feat: refs #7346 refactor by:jgallego
+-   feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego
+-   feat: refs #7710 uses cloneAll by:jgallego
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+
+### Changed 📦
+
+-   feat: refs #7346 refactor by:jgallego
+-   perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra
+-   perf: refs #7717 right menu filter by:Jon
+-   perf: use ref at component start by:Javier Segarra
+-   refactor: refs #7717 delete useless function and import by:Jon
+-   refactor: refs #7717 deleted useless code by:Jon
+
+### Fixed 🛠️
+
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   fix(VnTable): orderBy v-model by:alexm
+-   fix(account_card): redirection by:carlossa
+-   fix(orderLines): reload when delete and redirect when confirm by:alexm
+-   fix: #6336 ClaimListStates by:Javier Segarra
+-   fix: account subsections cards by:carlossa
+-   fix: duplicate key by:Jon
+-   fix: order description to vnTable by:alexm
+-   fix: orderCatalogFilter order by:alexm
+-   fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra
+-   fix: refs #7524 add sort-by (origin/7524-useLimit) by:jorgep
+-   fix: refs #7524 dynamic fetching by:jorgep
+-   fix: refs #7524 use id by:jorgep
+-   fix: refs #7524 use limit entry Section wip by:jorgep
+-   fix: refs #7524 use limit item Section by:jorgep
+-   fix: refs #7524 use limit shelving Section by:jorgep
+-   fix: refs #7524 use limit ticket section by:jorgep
+-   fix: refs #7524 use limit travels section by:jorgep
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+-   fix: refs #7717 fix basic data form & minor errors by:Jon
+-   fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon
+-   fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon
+-   fix: refs #7717 fix order sections by:Jon
+-   fix: refs #7717 fix volume and lines redirect by:Jon
+-   fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon
+-   fix: test by:alexm
+-   fix: ticketDescriptorMenu by:Javier Segarra
+-   refs #7355 account fixes by:carlossa
+
+# Version 24.34 - 2024-08-20
+
+### Added 🆕
+
+-   chore: #6900 order params by:jorgep
+-   chore: refs #6900 drop console log by:jorgep
+-   chore: refs #6900 drop vnCurrency by:jorgep
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #6900 mv rectificative logic by:jorgep
+-   chore: refs #6900 responsive code by:jorgep
+-   chore: refs #7283 drop array types by:jorgep
+-   chore: refs #7283 drop import by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7283 update VnAvatar title handling by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   chore: refs #7323 remove unused import by:jorgep
+-   chore: refs #7323drop commented code by:jorgep
+-   feat(VnCard): use props searchbar by:alexm
+-   feat(customer): improve basicData to balance by:alexm
+-   feat(customer_balance): refs #6943 add functionality from salix by:alexm
+-   feat(customer_balance): refs #6943 translations by:alexm
+-   feat: refs #6130 husky commitLint config by:pablone
+-   feat: refs #6130 husky hooks by:pablone
+-   feat: refs #6900 add InvoiceInSerial by:jorgep
+-   feat: refs #6900 add locale by:jorgep
+-   feat: refs #6900 use VnTable & sort filter fields by:jorgep
+-   feat: refs #7323 add flex-wrap by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   feat: refs #7323 improve test by:jorgep
+
+### Changed 📦
+
+-   refactor(customer_log: use VnLog by:alexm
+-   refactor(customer_recovery): to vnTable by:alexm
+-   refactor(customer_webAccess): FormModel by:alexm
+-   refactor: refs #7283 update avatar size and color by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   fix #7355 fix acls list by:carlossa
+-   fix(VnFilterPanel): emit userParams better by:alexm
+-   fix(claim_summary): url links (HEAD -> 7864_testToMaster_2434, origin/test, origin/7864_testToMaster_2434, test) by:alexm
+-   fix(customer_sms: fix reload by:alexm
+-   fix(twoFactor): unify code login and twoFactor by:alexm
+-   fix: VnCard VnSearchbar props by:alexm
+-   fix: accountMailAlias by:alexm
+-   fix: refs #6130 add commit lint modules by:pablone
+-   fix: refs #6130 pnpm-lock.yml by:pablone
+-   fix: refs #6900 improve loading by:jorgep
+-   fix: refs #6900 improve logic (origin/6900-addSerial) by:jorgep
+-   fix: refs #6900 improve logic by:jorgep
+-   fix: refs #6900 rectificative btn reactivity by:jorgep
+-   fix: refs #6900 use type number by:jorgep
+-   fix: refs #6900 vat & dueday by:jorgep
+-   fix: refs #6900 vat, dueday & intrastat by:jorgep
+-   fix: refs #6989 show entity name & default time from config table by:jorgep
+-   fix: refs #7283 basicData locale by:jorgep
+-   fix: refs #7283 itemLastEntries filter by:jorgep
+-   fix: refs #7283 itemTags & VnImg by:jorgep
+-   fix: refs #7283 locale by:jorgep
+-   fix: refs #7283 min-width vnImg by:jorgep
+-   fix: refs #7283 use vnAvatar & add optional zoom by:jorgep
+-   fix: refs #7283 userPanel pic by:jorgep
+-   fix: refs #7323 add department popup by:jorgep
+-   fix: refs #7323 add locale by:jorgep
+-   fix: refs #7323 css righ menu by:jorgep
+-   fix: refs #7323 data-key & add select by:jorgep
+-   fix: refs #7323 load all opts by:jorgep
+-   fix: refs #7323 righ menu bug by:jorgep
+-   fix: refs #7323 use global locale by:jorgep
+-   fix: refs #7323 use workerFilter (origin/7323-warmfix-fixErrors) by:jorgep
+-   fix: refs #7323 vnsubtoolbar css by:jorgep
+-   fix: refs #7323 wrong css by:jorgep
+-   refs #7355 fix Rol, alias by:carlossa
+-   refs #7355 fix accountAlias by:carlossa
+-   refs #7355 fix alias summary by:carlossa
+-   refs #7355 fix conflicts by:carlossa
+-   refs #7355 fix create Rol by:carlossa
+-   refs #7355 fix list by:carlossa
+-   refs #7355 fix lists redirects summary by:carlossa
+-   refs #7355 fix roles by:carlossa
+-   refs #7355 fix search exprBuilder by:carlossa
+-   refs #7355 fix vnTable by:carlos
+
 # Version 24.32 - 2024-08-06
 
 ### Added 🆕

From c4c4285b4b7035041f9f402b8bf6d6567af47492 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 3 Sep 2024 08:16:01 +0200
Subject: [PATCH 079/162] fix: remove unnecessary console.log

---
 src/pages/Login/ResetPassword.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue
index eff718e97..2751f1ceb 100644
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@@ -33,7 +33,6 @@ async function onSubmit() {
     };
 
     try {
-        console.log('newPassword: ', newPassword);
         await axios.post(
             'VnUsers/reset-password',
             { newPassword: newPassword.value },

From ecba084f8be0995c4987318b6be10520d67863a8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 3 Sep 2024 08:31:27 +0200
Subject: [PATCH 080/162] feat: reduce changelog.md lines

---
 CHANGELOG.md | 65 +++++++++++++++-------------------------------------
 1 file changed, 18 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e23465173..6a973777a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,64 +2,35 @@
 
 ### Added 🆕
 
--   feat(FormModel): trim data by default by:alexm
--   feat(orderBasicData): add notes by:alexm
--   feat(orderList): correct create order by:alexm
--   feat(orderList): use orderFilter and fixed this by:alexm
--   feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra
--   feat: add recover password and reset password by:alexm
--   feat: refs #7346 add seriaType option by:jgallego
--   feat: refs #7346 elimino === by:jgallego
--   feat: refs #7346 formdata uses serialType by:jgallego
--   feat: refs #7346 refactor by:jgallego
--   feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego
--   feat: refs #7710 uses cloneAll by:jgallego
--   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+-   Cesta → Se añaden notas
+-   Trabajadore → Se puede modificar la foto
+-   General → Recuperar y restaurar contraseña
 
 ### Changed 📦
 
--   feat: refs #7346 refactor by:jgallego
--   perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra
--   perf: refs #7717 right menu filter by:Jon
--   perf: use ref at component start by:Javier Segarra
--   refactor: refs #7717 delete useless function and import by:Jon
--   refactor: refs #7717 deleted useless code by:Jon
+-   (General) Modificado filtro lateral
 
 ### Fixed 🛠️
 
--   feat(orderList): use orderFilter and fixed this by:alexm
--   fix(VnTable): orderBy v-model by:alexm
--   fix(account_card): redirection by:carlossa
--   fix(orderLines): reload when delete and redirect when confirm by:alexm
--   fix: #6336 ClaimListStates by:Javier Segarra
--   fix: account subsections cards by:carlossa
--   fix: duplicate key by:Jon
--   fix: order description to vnTable by:alexm
--   fix: orderCatalogFilter order by:alexm
--   fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra
--   fix: refs #7524 add sort-by (origin/7524-useLimit) by:jorgep
--   fix: refs #7524 dynamic fetching by:jorgep
--   fix: refs #7524 use id by:jorgep
--   fix: refs #7524 use limit entry Section wip by:jorgep
--   fix: refs #7524 use limit item Section by:jorgep
--   fix: refs #7524 use limit shelving Section by:jorgep
--   fix: refs #7524 use limit ticket section by:jorgep
--   fix: refs #7524 use limit travels section by:jorgep
--   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
--   fix: refs #7717 fix basic data form & minor errors by:Jon
--   fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon
--   fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon
--   fix: refs #7717 fix order sections by:Jon
--   fix: refs #7717 fix volume and lines redirect by:Jon
--   fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon
--   fix: test by:alexm
--   fix: ticketDescriptorMenu by:Javier Segarra
--   refs #7355 account fixes by:carlossa
+-   Cesta → Mejoras varias
+-   Reclamaciones → Mejoras varias
+-   Usuarios → Mejoras varias
 
 # Version 24.34 - 2024-08-20
 
 ### Added 🆕
 
+## Changed 📦
+
+-   General → Trabajadores: Migrado de Salix a Lilium
+
+## Fixed 🛠️
+
+-   Artículos → General: Arreglados fallos de interfaz
+-   Fact. Recibidas → General: Arreglados fallos de interfaz
+-   Trabajadores → General: Arreglados fallos de interfaz
+-   Usuarios → General: Arreglados fallos de interfaz
+
 -   chore: #6900 order params by:jorgep
 -   chore: refs #6900 drop console log by:jorgep
 -   chore: refs #6900 drop vnCurrency by:jorgep

From 64eeeb67fadcf8b1298c2423a55d26d0d8b83c7c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 3 Sep 2024 10:00:44 +0200
Subject: [PATCH 081/162] refs #6899 fix InvoiceOut

---
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index e9d5a2f1f..5db802065 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -176,7 +176,7 @@ const ticketsColumns = ref([
                         <QTd>
                             <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
-                                <CustomerDescriptorProxy :id="row.id" />
+                                <CustomerDescriptorProxy :id="row.clientFk" />
                             </QBtn>
                         </QTd>
                     </template>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 9423c28f6..f6dc0c674 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -205,7 +205,7 @@ watchEffect(selectedRows);
             },
         }"
         v-model:selected="selectedRows"
-        order="id DESC"
+        order="issued DESC, id DESC"
         :columns="columns"
         redirect="invoice-out"
         auto-load

From 6eb5435e25bb85d1ebfe9502601e00576468d162 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 3 Sep 2024 13:03:38 +0200
Subject: [PATCH 082/162] chore: refs #6900 drop useless code

---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 18630dba9..717f30b7f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -2,19 +2,15 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toCurrency } from 'src/filters';
 import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 
 const route = useRoute();
-const arrayData = useArrayData();
-const currency = computed(() => arrayData.store.data?.currency?.code);
 const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);

From 00beeaf51bc45de0e16aa4352781c54e98a82d0b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 3 Sep 2024 14:37:24 +0200
Subject: [PATCH 083/162] feat: refs #6900 add tooltip

---
 src/components/CreateNewExpenseForm.vue   | 6 ++----
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 8 ++++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/CreateNewExpenseForm.vue b/src/components/CreateNewExpenseForm.vue
index a04033540..7088cec03 100644
--- a/src/components/CreateNewExpenseForm.vue
+++ b/src/components/CreateNewExpenseForm.vue
@@ -18,7 +18,7 @@ const { t } = useI18n();
         <template #form-inputs="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="`${t('Code')}`"
+                    :label="`${t('globals.code')}`"
                     v-model="data.id"
                     :required="true"
                     :rules="validate('expense.code')"
@@ -33,7 +33,7 @@ const { t } = useI18n();
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="`${t('Description')}`"
+                    :label="`${t('globals.description')}`"
                     v-model="data.name"
                     :required="true"
                     :rules="validate('expense.description')"
@@ -46,7 +46,5 @@ const { t } = useI18n();
 <i18n>
 es:
     New expense: Nuevo gasto
-    Code: Código
     It's a withholding: Es una retención
-    Description: Descripción
 </i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index ec1f7d774..78cf65871 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -170,6 +170,7 @@ const formatOpt = (row, { model, options }, prop) => {
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
+                            :tooltip="t('Create a new expense')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -305,6 +306,7 @@ const formatOpt = (row, { model, options }, prop) => {
                                         option-value="id"
                                         option-label="name"
                                         :filter-options="['id', 'name']"
+                                        :tooltip="t('Create a new expense')"
                                     >
                                         <template #option="scope">
                                             <QItem v-bind="scope.itemProps">
@@ -408,7 +410,9 @@ const formatOpt = (row, { model, options }, prop) => {
             size="lg"
             round
             @click="invoiceInFormRef.insert()"
-        />
+        >
+            <QTooltip>{{ t('Add tax') }}</QTooltip>
+        </QBtn>
     </QPageSticky>
 </template>
 
@@ -448,7 +452,7 @@ const formatOpt = (row, { model, options }, prop) => {
 <i18n>
 es:
     Expense: Gasto
-    Create expense: Crear gasto
+    Create a new expense: Crear nuevo gasto
     Add tax: Crear gasto
     Taxable base: Base imp.
     Sage tax: Sage iva

From 50cdb053f8836e5c9c92a017098d1a5bb14199ac Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 3 Sep 2024 17:33:17 +0200
Subject: [PATCH 084/162] feat: refs #7663 fine tunning

---
 src/components/ui/VnConfirm.vue               |  5 +-
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Ticket/Card/TicketDescriptorMenu.vue      | 47 ++++++++++-
 src/pages/Ticket/Card/TicketSummary.vue       | 84 +++++++++----------
 5 files changed, 87 insertions(+), 51 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index fd4860107..4fa374b62 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -31,6 +31,7 @@ const props = defineProps({
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
@@ -68,8 +69,10 @@ async function confirm() {
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row items-center">
+            <QCardSection class="q-pb-none">
                 <span v-if="message !== false" v-html="message" />
+            </QCardSection>
+            <QCardSection class="row items-center q-pt-none">
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ef5e02b12..4e1c4f406 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -96,6 +96,7 @@ globals:
     to: To
     notes: Notes
     refresh: Refresh
+    weight: Weight
     pageTitles:
         logIn: Login
         summary: Summary
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 7143bf96f..6415a2930 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -98,6 +98,7 @@ globals:
     to: Hasta
     notes: Notas
     refresh: Actualizar
+    weight: Peso
     pageTitles:
         logIn: Inicio de sesión
         summary: Resumen
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 441b547ed..9491579f8 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -9,6 +9,8 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const props = defineProps({
     ticket: {
@@ -21,9 +23,10 @@ const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-
+const ticketSummary = useArrayData('TicketSummary');
 const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
+const weight = ref();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -46,7 +49,25 @@ const actions = {
                 push({ name: 'TicketSummary', params: { id: clonedTicketId } });
         }
     },
-    setWeight: async () => {},
+    setWeight: async () => {
+        try {
+            const invoiceIds = (
+                await axios.post(`Tickets/${ticketId}/setWeight`, {
+                    weight: weight.value,
+                })
+            ).data;
+
+            notify({ message: t('Weight set'), type: 'positive' });
+            if (invoiceIds.length)
+                notify({
+                    message: t('invoiceIds', { invoiceIds: invoiceIds.join() }),
+                    type: 'positive',
+                });
+            await ticketSummary.fetch({ updateRouter: false });
+        } catch (e) {
+            notify({ message: e.message, type: 'negative' });
+        }
+    },
     remove: async () => {
         try {
             await axios.post(`Tickets/${ticketId}/setDeleted`);
@@ -261,7 +282,7 @@ function openConfirmDialog(callback) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
-    <QItem @click="openConfirmDialog('setWeight')" v-ripple clickable>
+    <QItem @click="$refs.weightDialog.show()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="weight" />
         </QItemSection>
@@ -276,9 +297,25 @@ function openConfirmDialog(callback) {
             <QItemSection>{{ t('Delete ticket') }}</QItemSection>
         </QItem>
     </template>
+    <VnConfirm
+        ref="weightDialog"
+        :title="t('Set weight')"
+        :message="t('This ticket may be invoiced, do you want to continue?')"
+        :promise="actions.setWeight"
+    >
+        <template #customHTML>
+            <VnInputNumber
+                :label="t('globals.weight')"
+                v-model="weight"
+                class="full-width"
+            />
+        </template>
+    </VnConfirm>
 </template>
-
 <i18n>
+en:
+    invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
+
 es:
     Open Delivery Note...: Abrir albarán...
     Send Delivery Note...: Enviar albarán...
@@ -297,5 +334,7 @@ es:
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
     Set weight: Establecer peso
+    Weight set: Peso establecido
     This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
+    invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 177384663..a7a541e6d 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -31,8 +31,7 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 
 const summaryRef = ref();
-const ticket = ref();
-const salesLines = ref(null);
+const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
@@ -40,12 +39,6 @@ const grafanaUrl = 'https://grafana.verdnatura.es';
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
 });
-async function setData(data) {
-    if (data) {
-        ticket.value = data;
-        salesLines.value = data.sales;
-    }
-}
 
 function formattedAddress() {
     if (!ticket.value) return '';
@@ -89,7 +82,6 @@ async function changeState(value) {
     <CardSummary
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
-        @on-fetch="(data) => setData(data)"
         data-key="TicketSummary"
     >
         <template #header="{ entity }">
@@ -131,7 +123,7 @@ async function changeState(value) {
                 </QList>
             </QBtnDropdown>
         </template>
-        <template #body>
+        <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
                     :url="ticketUrl + 'basic-data/step-one'"
@@ -139,57 +131,57 @@ async function changeState(value) {
                 />
                 <VnLv :label="t('ticket.summary.state')">
                     <template #value>
-                        <QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'">
-                            {{ ticket.ticketState?.state?.name }}
+                        <QChip :color="entity.ticketState?.state?.classColor ?? 'dark'">
+                            {{ entity.ticketState?.state?.name }}
                         </QChip>
                     </template>
                 </VnLv>
                 <VnLv :label="t('ticket.summary.salesPerson')">
                     <template #value>
                         <VnUserLink
-                            :name="ticket.client?.salesPersonUser?.name"
-                            :worker-id="ticket.client?.salesPersonFk"
+                            :name="entity.client?.salesPersonUser?.name"
+                            :worker-id="entity.client?.salesPersonFk"
                         />
                     </template>
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.agency')"
-                    :value="ticket.agencyMode?.name"
+                    :value="entity.agencyMode?.name"
                 />
-                <VnLv :label="t('ticket.summary.zone')" :value="ticket?.zone?.name" />
+                <VnLv :label="t('ticket.summary.zone')" :value="entity?.zone?.name" />
                 <VnLv
                     :label="t('ticket.summary.warehouse')"
-                    :value="ticket.warehouse?.name"
+                    :value="entity.warehouse?.name"
                 />
                 <VnLv
                     :label="t('ticket.summary.collection')"
-                    :value="ticket.ticketCollections[0]?.collectionFk"
+                    :value="entity.ticketCollections[0]?.collectionFk"
                 >
                     <template #value>
                         <a
-                            :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${ticket.ticketCollections[0]?.collectionFk}`"
+                            :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${entity.ticketCollections[0]?.collectionFk}`"
                             target="_blank"
                             class="grafana"
                         >
-                            {{ ticket.ticketCollections[0]?.collectionFk }}
+                            {{ entity.ticketCollections[0]?.collectionFk }}
                         </a>
                     </template>
                 </VnLv>
-                <VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
+                <VnLv :label="t('ticket.summary.route')" :value="entity.routeFk" />
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
-                        <span :class="{ link: ticket.refFk }">
-                            {{ dashIfEmpty(ticket.refFk) }}
+                        <span :class="{ link: entity.refFk }">
+                            {{ dashIfEmpty(entity.refFk) }}
                             <InvoiceOutDescriptorProxy
-                                :id="ticket.invoiceOut.id"
-                                v-if="ticket.refFk"
+                                :id="entity.invoiceOut.id"
+                                v-if="entity.refFk"
                             />
                         </span>
                     </template>
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.weight')"
-                    :value="dashIfEmpty(ticket.weight)"
+                    :value="dashIfEmpty(entity.weight)"
                 />
             </QCard>
             <QCard class="vn-one">
@@ -199,35 +191,35 @@ async function changeState(value) {
                 />
                 <VnLv
                     :label="t('ticket.summary.shipped')"
-                    :value="toDate(ticket.shipped)"
+                    :value="toDate(entity.shipped)"
                 />
                 <VnLv
                     :label="t('ticket.summary.landed')"
-                    :value="toDate(ticket.landed)"
+                    :value="toDate(entity.landed)"
                 />
-                <VnLv :label="t('globals.packages')" :value="ticket.packages" />
-                <VnLv :value="ticket.address.phone">
+                <VnLv :label="t('globals.packages')" :value="entity.packages" />
+                <VnLv :value="entity.address.phone">
                     <template #label>
                         {{ t('ticket.summary.consigneePhone') }}
-                        <VnLinkPhone :phone-number="ticket.address.phone" />
+                        <VnLinkPhone :phone-number="entity.address.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="ticket.address.mobile">
+                <VnLv :value="entity.address.mobile">
                     <template #label>
                         {{ t('ticket.summary.consigneeMobile') }}
-                        <VnLinkPhone :phone-number="ticket.address.mobile" />
+                        <VnLinkPhone :phone-number="entity.address.mobile" />
                     </template>
                 </VnLv>
-                <VnLv :value="ticket.client.phone">
+                <VnLv :value="entity.client.phone">
                     <template #label>
                         {{ t('ticket.summary.clientPhone') }}
-                        <VnLinkPhone :phone-number="ticket.client.phone" />
+                        <VnLinkPhone :phone-number="entity.client.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="ticket.client.mobile">
+                <VnLv :value="entity.client.mobile">
                     <template #label>
                         {{ t('ticket.summary.clientMobile') }}
-                        <VnLinkPhone :phone-number="ticket.client.mobile" />
+                        <VnLinkPhone :phone-number="entity.client.mobile" />
                     </template>
                 </VnLv>
                 <VnLv
@@ -235,13 +227,13 @@ async function changeState(value) {
                     :value="formattedAddress()"
                 />
             </QCard>
-            <QCard class="vn-one" v-if="ticket.notes.length">
+            <QCard class="vn-one" v-if="entity.notes.length">
                 <VnTitle
                     :url="ticketUrl + 'observation'"
                     :text="t('ticket.pageTitles.notes')"
                 />
                 <VnLv
-                    v-for="note in ticket.notes"
+                    v-for="note in entity.notes"
                     :key="note.id"
                     :label="note.observationType.description"
                     :value="note.description"
@@ -262,15 +254,15 @@ async function changeState(value) {
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
-                        :value="toCurrency(ticket.totalWithoutVat)"
+                        :value="toCurrency(entity.totalWithoutVat)"
                     />
                     <VnLv
                         :label="t('ticket.summary.vat')"
-                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
+                        :value="toCurrency(entity.totalWithVat - entity.totalWithoutVat)"
                     />
                     <VnLv
                         :label="t('ticket.summary.total')"
-                        :value="toCurrency(ticket.totalWithVat)"
+                        :value="toCurrency(entity.totalWithVat)"
                     />
                 </div>
             </QCard>
@@ -279,7 +271,7 @@ async function changeState(value) {
                     :url="ticketUrl + 'sale'"
                     :text="t('ticket.summary.saleLines')"
                 />
-                <QTable :rows="ticket.sales" style="text-align: center">
+                <QTable :rows="entity.sales" style="text-align: center">
                     <template #body-cell="{ value }">
                         <QTd>{{ value }}</QTd>
                     </template>
@@ -420,10 +412,10 @@ async function changeState(value) {
             </QCard>
             <QCard
                 class="vn-max"
-                v-if="ticket.packagings.length > 0 || ticket.services.length > 0"
+                v-if="entity.packagings.length || entity.services.length"
             >
                 <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
-                <QTable :rows="ticket.packagings" flat>
+                <QTable :rows="entity.packagings" flat>
                     <template #header="props">
                         <QTr :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
@@ -443,7 +435,7 @@ async function changeState(value) {
                     :url="ticketUrl + 'service'"
                     :text="t('ticket.summary.service')"
                 />
-                <QTable :rows="ticket.services" flat>
+                <QTable :rows="entity.services" flat>
                     <template #header="props">
                         <QTr :props="props">
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>

From 1f9d1b79ab0acadbba0922f186b8fe5624ecae52 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 10:17:57 +0200
Subject: [PATCH 085/162] refs #7283 refactor ItexDescriptor

---
 src/pages/Item/Card/ItemDescriptor.vue      | 2 ++
 src/pages/Item/Card/ItemDescriptorImage.vue | 6 +++++-
 src/pages/Item/Card/ItemDescriptorProxy.vue | 5 +++++
 src/pages/Ticket/Card/TicketSummary.vue     | 6 +++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 8381f0624..e649b8c45 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -52,6 +52,7 @@ const available = ref(null);
 const visible = ref(null);
 const _warehouseFk = ref(null);
 const salixUrl = ref();
+console.log('warehouseItemDescriptor', _warehouseFk.value);
 const warehouseFk = computed({
     get() {
         return _warehouseFk.value;
@@ -82,6 +83,7 @@ const updateStock = async () => {
             warehouseFk: warehouseFk.value,
             dated: $props.dated,
         };
+        console.log('params', params);
 
         const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
             params,
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index d83f534b8..71977fb24 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -48,7 +48,11 @@ const getWarehouseName = async (warehouseFk) => {
         where: { id: warehouseFk },
     };
 
-    const { data } = await axios.get('Warehouses/findOne', { filter });
+    const { data } = await axios.get('Warehouses/findOne', {
+        params: {
+            filter: JSON.stringify(filter),
+        },
+    });
     if (!data) return;
     warehouseName.value = data.name;
 };
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index 2b7b39a65..2ffc9080f 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -15,6 +15,10 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    warehouseFk: {
+        type: Number,
+        default: null,
+    },
 });
 </script>
 
@@ -26,6 +30,7 @@ const $props = defineProps({
             :summary="ItemSummary"
             :dated="dated"
             :sale-fk="saleFk"
+            :warehouse-fk="warehouseFk"
         />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 177384663..2d02ad5ed 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -383,7 +383,11 @@ async function changeState(value) {
                             <QTd>
                                 <QBtn class="link" flat>
                                     {{ props.row.itemFk }}
-                                    <ItemDescriptorProxy :id="props.row.itemFk" />
+                                    <ItemDescriptorProxy
+                                        :id="props.row.itemFk"
+                                        :sale-fk="props.row.id"
+                                        :warehouse-fk="ticket.warehouseFk"
+                                    />
                                 </QBtn>
                             </QTd>
                             <QTd>{{ props.row.visible }}</QTd>

From 763cf2e3459ed7dbd6bf97fceca1963730bb024b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 4 Sep 2024 10:30:14 +0200
Subject: [PATCH 086/162] refactor: refs #6900 create setRectificative
 composable

---
 src/pages/InvoiceIn/Card/InvoiceInCard.vue      | 16 ++--------------
 .../InvoiceIn/composables/setRectificative.js   | 14 ++++++++++++++
 src/router/modules/invoiceIn.js                 | 17 ++---------------
 3 files changed, 18 insertions(+), 29 deletions(-)
 create mode 100644 src/pages/InvoiceIn/composables/setRectificative.js

diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index be92b6a8b..0fe2a2368 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -3,8 +3,8 @@ import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import InvoiceInFilter from '../InvoiceInFilter.vue';
 import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
-import axios from 'axios';
 import { onBeforeRouteUpdate } from 'vue-router';
+import { setRectificative } from '../composables/setRectificative';
 
 const filter = {
     include: [
@@ -23,19 +23,7 @@ const filter = {
     ],
 };
 
-onBeforeRouteUpdate(async (to) => {
-    const card = to.matched.find((route) => route.name === 'InvoiceInCard');
-    const corrective = card.children.find(
-        (route) => route.name === 'InvoiceInCorrective'
-    );
-
-    const isRectificative = !!(
-        await axios.get('InvoiceInCorrections', {
-            params: { filter: { where: { correctingFk: to.params.id } } },
-        })
-    ).data.length;
-    corrective.meta.hidden = !isRectificative;
-});
+onBeforeRouteUpdate(async (to) => await setRectificative(to));
 </script>
 <template>
     <VnCard
diff --git a/src/pages/InvoiceIn/composables/setRectificative.js b/src/pages/InvoiceIn/composables/setRectificative.js
new file mode 100644
index 000000000..a1afb8fb0
--- /dev/null
+++ b/src/pages/InvoiceIn/composables/setRectificative.js
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+export async function setRectificative(route) {
+    const card = route.matched.find((route) => route.name === 'InvoiceInCard');
+    const corrective = card.children.find(
+        (route) => route.name === 'InvoiceInCorrective'
+    );
+
+    corrective.meta.hidden = !(
+        await axios.get('InvoiceInCorrections', {
+            params: { filter: { where: { correctingFk: route.params.id } } },
+        })
+    ).data.length;
+}
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index d2091f230..64c7b23e9 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -1,6 +1,5 @@
 import { RouterView } from 'vue-router';
-import axios from 'axios';
-
+import { setRectificative } from 'src/pages/InvoiceIn/composables/setRectificative';
 export default {
     path: '/invoice-in',
     name: 'InvoiceIn',
@@ -65,19 +64,7 @@ export default {
             component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
             redirect: { name: 'InvoiceInSummary' },
             beforeEnter: async (to, from, next) => {
-                const isRectificative = !!(
-                    await axios.get('InvoiceInCorrections', {
-                        params: { filter: { where: { correctingFk: to.params.id } } },
-                    })
-                ).data.length;
-
-                const card = to.matched.find((route) => route.name === 'InvoiceInCard');
-                const corrective = card.children.find(
-                    (route) => route.name === 'InvoiceInCorrective'
-                );
-
-                corrective.meta.hidden = !isRectificative;
-
+                await setRectificative(to);
                 next();
             },
             children: [

From b29a56d7ddcb855239308df488fa9dfedb41753b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:37:39 +0200
Subject: [PATCH 087/162] refs #6943 remake, refactor, clean code Samples

---
 .../components/CustomerSamplesCreate.vue      | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 0470dc176..50a2c17d5 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
+import { usePrintService } from 'composables/usePrintService';
 import { useQuasar } from 'quasar';
 
 import { useState } from 'src/composables/useState';
@@ -27,7 +28,7 @@ const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const stateStore = useStateStore();
-
+const { sendEmail } = usePrintService();
 const client = ref({});
 const hasChanged = ref(false);
 const isLoading = ref(false);
@@ -156,22 +157,25 @@ const onSubmit = async () => {
     }
 };
 
-const onDataSaved = async ({
-    addressId,
-    companyFk,
-    companyId,
-    from,
-    recipient,
-    replyTo,
-}) => {
-    await axios.post(`Clients/${route.params.id}/incoterms-authorization-email`, {
-        addressId,
-        companyFk,
-        companyId,
-        from,
-        recipient,
-        replyTo,
+const getSamples = async () => {
+    const filter = { where: { id: initialData.typeFk } };
+    let { data } = await axios.get('Samples', {
+        params: { filter: JSON.stringify(filter) },
     });
+    return data[0];
+};
+
+getSamples();
+const onDataSaved = async () => {
+    const params = {
+        recipientId: initialData.recipientId,
+        recipient: initialData.recipient,
+        replyTo: initialData.replyTo,
+    };
+    setParams(params);
+    const samplesData = await getSamples();
+    const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+    await sendEmail(path, params);
     toCustomerSamples();
 };
 
@@ -327,7 +331,6 @@ const toCustomerSamples = () => {
                             option-value="id"
                             required="true"
                             v-model="initialData.addressId"
-                            v-if="sampleType.id === 20"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">

From d08748b1a4aa6ba3ea1c92625e1ee67ef8f53f06 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:41:35 +0200
Subject: [PATCH 088/162] refs #6943 fix sampleType

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

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 50a2c17d5..e3dac3214 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -331,6 +331,7 @@ const toCustomerSamples = () => {
                             option-value="id"
                             required="true"
                             v-model="initialData.addressId"
+                            v-if="sampleType.id === 20"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">

From bcdd6965e647b00fff8278fb57fd8185f1ea7f15 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:43:48 +0200
Subject: [PATCH 089/162] refs #6943 add try catch

---
 .../components/CustomerSamplesCreate.vue      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index e3dac3214..3e5891ef4 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -167,15 +167,19 @@ const getSamples = async () => {
 
 getSamples();
 const onDataSaved = async () => {
-    const params = {
-        recipientId: initialData.recipientId,
-        recipient: initialData.recipient,
-        replyTo: initialData.replyTo,
-    };
-    setParams(params);
-    const samplesData = await getSamples();
-    const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
-    await sendEmail(path, params);
+    try {
+        const params = {
+            recipientId: initialData.recipientId,
+            recipient: initialData.recipient,
+            replyTo: initialData.replyTo,
+        };
+        setParams(params);
+        const samplesData = await getSamples();
+        const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+        await sendEmail(path, params);
+    } catch (error) {
+        notify('errors.create', 'negative');
+    }
     toCustomerSamples();
 };
 

From 61c0f63eafcbbcf790424ba9aaacce08f7a131b3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 14:46:21 +0200
Subject: [PATCH 090/162] refs #6943 add try catch get

---
 .../Customer/components/CustomerSamplesCreate.vue  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 3e5891ef4..79f4fe449 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -158,11 +158,15 @@ const onSubmit = async () => {
 };
 
 const getSamples = async () => {
-    const filter = { where: { id: initialData.typeFk } };
-    let { data } = await axios.get('Samples', {
-        params: { filter: JSON.stringify(filter) },
-    });
-    return data[0];
+    try {
+        const filter = { where: { id: initialData.typeFk } };
+        let { data } = await axios.get('Samples', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        return data[0];
+    } catch (error) {
+        notify('errors.create', 'negative');
+    }
 };
 
 getSamples();

From cf3b9b2ef8d7d737b9ba6458963053def389214a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 4 Sep 2024 17:55:27 +0200
Subject: [PATCH 091/162] perf: CustomerSummary

---
 src/i18n/locale/en.yml                        | 130 -----------------
 src/i18n/locale/es.yml                        | 130 -----------------
 .../Customer/Card/CustomerDescriptor.vue      |   8 +-
 src/pages/Customer/Card/CustomerSummary.vue   |  11 +-
 .../components/CustomerSummaryTable.vue       |   4 +-
 src/pages/Customer/locale/en.yml              | 131 ++++++++++++++++++
 src/pages/Customer/locale/es.yml              | 131 ++++++++++++++++++
 7 files changed, 277 insertions(+), 268 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3935cead4..4bfde9ea1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -309,136 +309,6 @@ resetPassword:
     repeatPassword: Repeat password
     passwordNotMatch: Passwords don't match
     passwordChanged: Password changed
-customer:
-    list:
-        phone: Phone
-        email: Email
-        customerOrders: Display customer orders
-        moreOptions: More options
-    card:
-        customerList: Customer list
-        customerId: Claim ID
-        salesPerson: Sales person
-        credit: Credit
-        risk: Risk
-        securedCredit: Secured credit
-        payMethod: Pay method
-        debt: Debt
-        isFrozen: Customer frozen
-        hasDebt: Customer has debt
-        isDisabled: Customer inactive
-        notChecked: Customer no checked
-        webAccountInactive: Web account inactive
-        noWebAccess: Web access is disabled
-        businessType: Business type
-        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
-        businessTypeFk: Business type
-    summary:
-        basicData: Basic data
-        fiscalAddress: Fiscal address
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignee: Default consignee
-        businessData: Business data
-        financialData: Financial data
-        customerId: Customer ID
-        name: Name
-        contact: Contact
-        phone: Phone
-        mobile: Mobile
-        email: Email
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        socialName: Social name
-        fiscalId: Fiscal ID
-        postcode: Postcode
-        province: Province
-        country: Country
-        street: Address
-        isEqualizated: Is equalizated
-        isActive: Is active
-        invoiceByAddress: Invoice by address
-        verifiedData: Verified data
-        hasToInvoice: Has to invoice
-        notifyByEmail: Notify by email
-        vies: VIES
-        payMethod: Pay method
-        bankAccount: Bank account
-        dueDay: Due day
-        hasLcr: Has LCR
-        hasCoreVnl: Has core VNL
-        hasB2BVnl: Has B2B VNL
-        addressName: Address name
-        addressCity: City
-        addressStreet: Street
-        username: Username
-        webAccess: Web access
-        totalGreuge: Total greuge
-        mana: Mana
-        priceIncreasingRate: Price increasing rate
-        averageInvoiced: Average invoiced
-        claimRate: Claming rate
-        risk: Risk
-        maximumRisk: Solunion's maximum risk
-        riskInfo: Invoices minus payments plus orders not yet invoiced
-        credit: Credit
-        creditInfo: Company's maximum risk
-        securedCredit: Secured credit
-        securedCreditInfo: Solunion's maximum risk
-        balance: Balance
-        balanceInfo: Invoices minus payments
-        balanceDue: Balance due
-        balanceDueInfo: Deviated invoices minus payments
-        recoverySince: Recovery since
-        businessType: Business Type
-        city: City
-        descriptorInfo: Invoices minus payments plus orders not yet
-        rating: Rating
-        recommendCredit: Recommended credit
-    basicData:
-        socialName: Fiscal name
-        businessType: Business type
-        contact: Contact
-        youCanSaveMultipleEmails: You can save multiple emails
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        previousClient: Previous client
-    extendedList:
-        tableVisibleColumns:
-            id: Identifier
-            name: Name
-            socialName: Social name
-            fi: Tax number
-            salesPersonFk: Salesperson
-            credit: Credit
-            creditInsurance: Credit insurance
-            phone: Phone
-            mobile: Mobile
-            street: Street
-            countryFk: Country
-            provinceFk: Province
-            city: City
-            postcode: Postcode
-            email: Email
-            created: Created
-            businessTypeFk: Business type
-            payMethodFk: Billing data
-            sageTaxTypeFk: Sage tax type
-            sageTransactionTypeFk: Sage tr. type
-            isActive: Active
-            isVies: Vies
-            isTaxDataChecked: Verified data
-            isEqualizated: Is equalizated
-            isFreezed: Freezed
-            hasToInvoice: Invoice
-            hasToInvoiceByAddress: Invoice by address
-            isToBeMailed: Mailing
-            hasLcr: Received LCR
-            hasCoreVnl: VNL core received
-            hasSepaVnl: VNL B2B received
 entry:
     list:
         newEntry: New entry
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f319f9430..14064ddcf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -309,136 +309,6 @@ resetPassword:
     repeatPassword: Repetir contraseña
     passwordNotMatch: Las contraseñas no coinciden
     passwordChanged: Contraseña cambiada
-customer:
-    list:
-        phone: Teléfono
-        email: Email
-        customerOrders: Mostrar órdenes del cliente
-        moreOptions: Más opciones
-    card:
-        customerId: ID cliente
-        salesPerson: Comercial
-        credit: Crédito
-        risk: Riesgo
-        securedCredit: Crédito asegurado
-        payMethod: Método de pago
-        debt: Riesgo
-        isFrozen: Cliente congelado
-        hasDebt: Cliente con riesgo
-        isDisabled: Cliente inactivo
-        notChecked: Cliente no comprobado
-        webAccountInactive: Sin acceso web
-        noWebAccess: El acceso web está desactivado
-        businessType: Tipo de negocio
-        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
-        businessTypeFk: Tipo de negocio
-    summary:
-        basicData: Datos básicos
-        fiscalAddress: Dirección fiscal
-        fiscalData: Datos fiscales
-        billingData: Datos de facturación
-        consignee: Consignatario pred.
-        businessData: Datos comerciales
-        financialData: Datos financieros
-        customerId: ID cliente
-        name: Nombre
-        contact: Contacto
-        phone: Teléfono
-        mobile: Móvil
-        email: Email
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        socialName: Razón social
-        fiscalId: NIF/CIF
-        postcode: Código postal
-        province: Provincia
-        country: País
-        street: Calle
-        isEqualizated: Recargo de equivalencia
-        isActive: Activo
-        invoiceByAddress: Facturar por consignatario
-        verifiedData: Datos verificados
-        hasToInvoice: Facturar
-        notifyByEmail: Notificar por email
-        vies: VIES
-        payMethod: Método de pago
-        bankAccount: Cuenta bancaria
-        dueDay: Día de pago
-        hasLcr: Recibido LCR
-        hasCoreVnl: Recibido core VNL
-        hasB2BVnl: Recibido B2B VNL
-        addressName: Nombre de la dirección
-        addressCity: Ciudad
-        addressStreet: Calle
-        username: Usuario
-        webAccess: Acceso web
-        totalGreuge: Greuge total
-        mana: Maná
-        priceIncreasingRate: Ratio de incremento de precio
-        averageInvoiced: Facturación media
-        claimRate: Ratio de reclamaciones
-        maximumRisk: Riesgo máximo asumido por Solunion
-
-        risk: Riesgo
-        riskInfo: Facturas menos recibos mas pedidos sin facturar
-        credit: Crédito
-        creditInfo: Riesgo máximo asumido por la empresa
-        securedCredit: Crédito asegurado
-        securedCreditInfo: Riesgo máximo asumido por Solunion
-        balance: Balance
-        balanceInfo: Facturas menos recibos
-        balanceDue: Saldo vencido
-        balanceDueInfo: Facturas fuera de plazo menos recibos
-        recoverySince: Recobro desde
-        businessType: Tipo de negocio
-        city: Población
-        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
-        rating: Clasificación
-        recommendCredit: Crédito recomendado
-    basicData:
-        socialName: Nombre fiscal
-        businessType: Tipo de negocio
-        contact: Contacto
-        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        previousClient: Cliente anterior
-    extendedList:
-        tableVisibleColumns:
-            id: Identificador
-            name: Nombre
-            socialName: Razón social
-            fi: NIF / CIF
-            salesPersonFk: Comercial
-            credit: Crédito
-            creditInsurance: Crédito asegurado
-            phone: Teléfono
-            mobile: Móvil
-            street: Dirección fiscal
-            countryFk: País
-            provinceFk: Provincia
-            city: Población
-            postcode: Código postal
-            email: Email
-            created: Fecha creación
-            businessTypeFk: Tipo de negocio
-            payMethodFk: Forma de pago
-            sageTaxTypeFk: Tipo de impuesto Sage
-            sageTransactionTypeFk: Tipo tr. sage
-            isActive: Activo
-            isVies: Vies
-            isTaxDataChecked: Datos comprobados
-            isEqualizated: Recargo de equivalencias
-            isFreezed: Congelado
-            hasToInvoice: Factura
-            hasToInvoiceByAddress: Factura por consigna
-            isToBeMailed: Env. emails
-            hasLcr: Recibido LCR
-            hasCoreVnl: Recibido core VNL
-            hasSepaVnl: Recibido B2B VNL
 entry:
     list:
         newEntry: Nueva entrada
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 4980e5495..5cab825a9 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import { toCurrency, toDate } from 'src/filters';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
@@ -66,12 +66,14 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.debt)"
                 :info="t('customer.summary.riskInfo')"
             />
-            <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
+            <VnLv :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink
-                        :name="entity.salesPersonUser?.name"
+                        v-if="entity.salesPersonUser"
+                        :name="entity.salesPersonUser.name"
                         :worker-id="entity.salesPersonFk"
                     />
+                    <span v-else>{{ dashIfEmpty(entity.salesPersonUser) }}</span>
                 </template>
             </VnLv>
             <VnLv
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index e02f63347..c0ac562c0 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -60,6 +60,11 @@ const creditWarning = computed(() => {
 
     return tooMuchInsurance || noCreditInsurance ? 'negative' : '';
 });
+const sumRisk = ({ clientRisks }) => {
+    let total = clientRisks.reduce((acc, risk) => acc + risk.amount, 0);
+
+    return total;
+};
 </script>
 
 <template>
@@ -170,7 +175,7 @@ const creditWarning = computed(() => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
@@ -250,7 +255,7 @@ const creditWarning = computed(() => {
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
                     :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
-                    :text="t('customer.summary.financialData')"
+                    :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
                 />
                 <VnLv
@@ -274,7 +279,7 @@ const creditWarning = computed(() => {
                 />
                 <VnLv
                     :label="t('customer.summary.balance')"
-                    :value="toCurrency(entity.sumRisk) || toCurrency(0)"
+                    :value="toCurrency(sumRisk(entity)) || toCurrency(0)"
                     :info="t('customer.summary.balanceInfo')"
                 />
 
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 25db561c5..e2fb61322 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -93,13 +93,13 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Client ticket list'),
+                title: t('customer.summary.goToLines'),
                 icon: 'vn:lines',
                 action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
                 isPrimary: true,
             },
             {
-                title: t('Client ticket list'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row.id, TicketSummary),
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 6eb7cfa85..4d5e7dfb1 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -2,3 +2,134 @@ customerFilter:
     filter:
         name: Name
         socialName: Social name
+customer:
+    list:
+        phone: Phone
+        email: Email
+        customerOrders: Display customer orders
+        moreOptions: More options
+    card:
+        customerList: Customer list
+        customerId: Claim ID
+        salesPerson: Sales person
+        credit: Credit
+        risk: Risk
+        securedCredit: Secured credit
+        payMethod: Pay method
+        debt: Debt
+        isFrozen: Customer frozen
+        hasDebt: Customer has debt
+        isDisabled: Customer inactive
+        notChecked: Customer no checked
+        webAccountInactive: Web account inactive
+        noWebAccess: Web access is disabled
+        businessType: Business type
+        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
+        businessTypeFk: Business type
+    summary:
+        basicData: Basic data
+        fiscalAddress: Fiscal address
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignee: Default consignee
+        businessData: Business data
+        financialData: Financial data
+        customerId: Customer ID
+        name: Name
+        contact: Contact
+        phone: Phone
+        mobile: Mobile
+        email: Email
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        socialName: Social name
+        fiscalId: Fiscal ID
+        postcode: Postcode
+        province: Province
+        country: Country
+        street: Address
+        isEqualizated: Is equalizated
+        isActive: Is active
+        invoiceByAddress: Invoice by address
+        verifiedData: Verified data
+        hasToInvoice: Has to invoice
+        notifyByEmail: Notify by email
+        vies: VIES
+        payMethod: Pay method
+        bankAccount: Bank account
+        dueDay: Due day
+        hasLcr: Has LCR
+        hasCoreVnl: Has core VNL
+        hasB2BVnl: Has B2B VNL
+        addressName: Address name
+        addressCity: City
+        addressStreet: Street
+        username: Username
+        webAccess: Web access
+        totalGreuge: Total greuge
+        mana: Mana
+        priceIncreasingRate: Price increasing rate
+        averageInvoiced: Average invoiced
+        claimRate: Claming rate
+        risk: Risk
+        maximumRisk: Solunion's maximum risk
+        riskInfo: Invoices minus payments plus orders not yet invoiced
+        credit: Credit
+        creditInfo: Company's maximum risk
+        securedCredit: Secured credit
+        securedCreditInfo: Solunion's maximum risk
+        balance: Balance
+        balanceInfo: Invoices minus payments
+        balanceDue: Balance due
+        balanceDueInfo: Deviated invoices minus payments
+        recoverySince: Recovery since
+        businessType: Business Type
+        city: City
+        descriptorInfo: Invoices minus payments plus orders not yet
+        rating: Rating
+        recommendCredit: Recommended credit
+        goToLines: Go to lines
+    basicData:
+        socialName: Fiscal name
+        businessType: Business type
+        contact: Contact
+        youCanSaveMultipleEmails: You can save multiple emails
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        previousClient: Previous client
+    extendedList:
+        tableVisibleColumns:
+            id: Identifier
+            name: Name
+            socialName: Social name
+            fi: Tax number
+            salesPersonFk: Salesperson
+            credit: Credit
+            creditInsurance: Credit insurance
+            phone: Phone
+            mobile: Mobile
+            street: Street
+            countryFk: Country
+            provinceFk: Province
+            city: City
+            postcode: Postcode
+            email: Email
+            created: Created
+            businessTypeFk: Business type
+            payMethodFk: Billing data
+            sageTaxTypeFk: Sage tax type
+            sageTransactionTypeFk: Sage tr. type
+            isActive: Active
+            isVies: Vies
+            isTaxDataChecked: Verified data
+            isEqualizated: Is equalizated
+            isFreezed: Freezed
+            hasToInvoice: Invoice
+            hasToInvoiceByAddress: Invoice by address
+            isToBeMailed: Mailing
+            hasLcr: Received LCR
+            hasCoreVnl: VNL core received
+            hasSepaVnl: VNL B2B received
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 111696f21..4fcbe3fa2 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -4,3 +4,134 @@ customerFilter:
     filter:
         name: Nombre
         socialName: Razón Social
+customer:
+    list:
+        phone: Teléfono
+        email: Email
+        customerOrders: Mostrar órdenes del cliente
+        moreOptions: Más opciones
+    card:
+        customerId: ID cliente
+        salesPerson: Comercial
+        credit: Crédito
+        risk: Riesgo
+        securedCredit: Crédito asegurado
+        payMethod: Método de pago
+        debt: Riesgo
+        isFrozen: Cliente congelado
+        hasDebt: Cliente con riesgo
+        isDisabled: Cliente inactivo
+        notChecked: Cliente no comprobado
+        webAccountInactive: Sin acceso web
+        noWebAccess: El acceso web está desactivado
+        businessType: Tipo de negocio
+        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
+        businessTypeFk: Tipo de negocio
+    summary:
+        basicData: Datos básicos
+        fiscalAddress: Dirección fiscal
+        fiscalData: Datos fiscales
+        billingData: Datos de facturación
+        consignee: Consignatario pred.
+        businessData: Datos comerciales
+        financialData: Datos financieros
+        customerId: ID cliente
+        name: Nombre
+        contact: Contacto
+        phone: Teléfono
+        mobile: Móvil
+        email: Email
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        socialName: Razón social
+        fiscalId: NIF/CIF
+        postcode: Código postal
+        province: Provincia
+        country: País
+        street: Calle
+        isEqualizated: Recargo de equivalencia
+        isActive: Activo
+        invoiceByAddress: Facturar por consignatario
+        verifiedData: Datos verificados
+        hasToInvoice: Facturar
+        notifyByEmail: Notificar por email
+        vies: VIES
+        payMethod: Método de pago
+        bankAccount: Cuenta bancaria
+        dueDay: Día de pago
+        hasLcr: Recibido LCR
+        hasCoreVnl: Recibido core VNL
+        hasB2BVnl: Recibido B2B VNL
+        addressName: Nombre de la dirección
+        addressCity: Ciudad
+        addressStreet: Calle
+        username: Usuario
+        webAccess: Acceso web
+        totalGreuge: Greuge total
+        mana: Maná
+        priceIncreasingRate: Ratio de incremento de precio
+        averageInvoiced: Facturación media
+        claimRate: Ratio de reclamaciones
+        maximumRisk: Riesgo máximo asumido por Solunion
+        payMethodFk: Forma de pago
+        risk: Riesgo
+        riskInfo: Facturas menos recibos mas pedidos sin facturar
+        credit: Crédito
+        creditInfo: Riesgo máximo asumido por la empresa
+        securedCredit: Crédito asegurado
+        securedCreditInfo: Riesgo máximo asumido por Solunion
+        balance: Balance
+        balanceInfo: Facturas menos recibos
+        balanceDue: Saldo vencido
+        balanceDueInfo: Facturas fuera de plazo menos recibos
+        recoverySince: Recobro desde
+        businessType: Tipo de negocio
+        city: Población
+        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
+        rating: Clasificación
+        recommendCredit: Crédito recomendado
+        goToLines: Ir a líneas
+    basicData:
+        socialName: Nombre fiscal
+        businessType: Tipo de negocio
+        contact: Contacto
+        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
+        email: Email
+        phone: Teléfono
+        mobile: Móvil
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        previousClient: Cliente anterior
+    extendedList:
+        tableVisibleColumns:
+            id: Identificador
+            name: Nombre
+            socialName: Razón social
+            fi: NIF / CIF
+            salesPersonFk: Comercial
+            credit: Crédito
+            creditInsurance: Crédito asegurado
+            phone: Teléfono
+            mobile: Móvil
+            street: Dirección fiscal
+            countryFk: País
+            provinceFk: Provincia
+            city: Población
+            postcode: Código postal
+            email: Email
+            created: Fecha creación
+            businessTypeFk: Tipo de negocio
+            payMethodFk: Forma de pago
+            sageTaxTypeFk: Tipo de impuesto Sage
+            sageTransactionTypeFk: Tipo tr. sage
+            isActive: Activo
+            isVies: Vies
+            isTaxDataChecked: Datos comprobados
+            isEqualizated: Recargo de equivalencias
+            isFreezed: Congelado
+            hasToInvoice: Factura
+            hasToInvoiceByAddress: Factura por consigna
+            isToBeMailed: Env. emails
+            hasLcr: Recibido LCR
+            hasCoreVnl: Recibido core VNL
+            hasSepaVnl: Recibido B2B VNL

From fc5eb20dba0e96fa31733b6e3c0f6244a4f59acb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 5 Sep 2024 08:56:38 +0200
Subject: [PATCH 092/162] chore: refs #7663 create test wip

---
 .../ticket/ticketDescriptor.spec.js           | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 882aab157..ace3831dd 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,12 +1,13 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
     const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
+    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
+    const weight = 25;
+    const ticketId = 1;
 
     beforeEach(() => {
-        const ticketId = 1;
-
         cy.login('developer');
         cy.visit(`/#/ticket/${ticketId}/summary`);
     });
@@ -24,4 +25,21 @@ describe('Ticket descriptor', () => {
                 cy.wrap(owner.trim()).should('eq', 'Bruce Wayne (1101)');
             });
     });
+
+    it('should set the weight of the ticket', () => {
+        cy.openLeftMenu();
+        cy.openActionsDescriptor();
+        cy.get(setWeightOpt).click();
+        cy.get('.q-dialog input').type(25);
+        cy.clickConfirm();
+
+        cy.get('.q-notification').should('contain', 'Peso establecido');
+
+        cy.intercept('POST', /\/api\/Tickets\/\d+/).as('worker');
+        cy.wait('@worker').then(() =>
+            cy.get(descriptorTitle).should('include.text', 'Jessica')
+        );
+
+        cy.get('@fetchSpy').should('have.been.called');
+    });
 });

From 95b19b5cce6939e655193213ddff9574e7a60303 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 5 Sep 2024 10:04:58 +0200
Subject: [PATCH 093/162] refs #7283 refactor fix ItemDescriptor

---
 src/pages/Item/Card/ItemDescriptor.vue | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index e649b8c45..5d7f1481f 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -35,6 +35,10 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    warehouseFk: {
+        type: Number,
+        default: null,
+    },
 });
 
 const quasar = useQuasar();
@@ -47,24 +51,14 @@ const user = state.getUser();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
 const regularizeStockFormDialog = ref(null);
 const available = ref(null);
 const visible = ref(null);
-const _warehouseFk = ref(null);
 const salixUrl = ref();
-console.log('warehouseItemDescriptor', _warehouseFk.value);
-const warehouseFk = computed({
-    get() {
-        return _warehouseFk.value;
-    },
-    set(val) {
-        _warehouseFk.value = val;
-        if (val) updateStock();
-    },
-});
 
 onMounted(async () => {
-    warehouseFk.value = user.value.warehouseFk;
+    updateStock();
     salixUrl.value = await getUrl('');
 });
 
@@ -80,10 +74,12 @@ const updateStock = async () => {
         visible.value = null;
 
         const params = {
-            warehouseFk: warehouseFk.value,
+            warehouseFk: $props.warehouseFk,
             dated: $props.dated,
         };
-        console.log('params', params);
+        if (!params.warehouseFk) {
+            params.warehouseFk = user.value.warehouseFk;
+        }
 
         const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
             params,

From 83969f1d576f20ebcd765f6c7070c57d621e6464 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 5 Sep 2024 12:05:53 +0200
Subject: [PATCH 094/162] fix traduction

---
 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 0159abd63..5a8edf226 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -83,7 +83,7 @@ globals:
     description: Descripción
     id: Id
     order: Orden
-    original: Original
+    original: Doc. física
     file: Fichero
     selectFile: Seleccione un fichero
     copyClipboard: Copiar en portapapeles

From fc7cc8636265b0fe49fab5bf1252d9fe4f29d004 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 5 Sep 2024 12:39:55 +0200
Subject: [PATCH 095/162] fix branch

---
 CHANGELOG.md                      | 62 ++++++++++++++++++++-----------
 src/pages/Login/ResetPassword.vue |  1 +
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31b8831f0..8e1d4c433 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,36 +1,57 @@
-# Version 24.36 - 2024-09-03
+# Version 24.36 - 2024-08-27
 
 ### Added 🆕
 
--   Cesta → Se añaden notas
--   Trabajadore → Se puede modificar la foto
--   General → Recuperar y restaurar contraseña
+-   feat(FormModel): trim data by default by:alexm
+-   feat(orderBasicData): add notes by:alexm
+-   feat(orderList): correct create order by:alexm
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra
+-   feat: add recover password and reset password by:alexm
+-   feat: refs #7346 add seriaType option by:jgallego
+-   feat: refs #7346 elimino === by:jgallego
+-   feat: refs #7346 formdata uses serialType by:jgallego
+-   feat: refs #7346 refactor by:jgallego
+-   feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego
+-   feat: refs #7710 uses cloneAll by:jgallego
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
 
 ### Changed 📦
 
--   (General) Modificado filtro lateral
+-   feat: refs #7346 refactor by:jgallego
+-   perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra
+-   perf: refs #7717 right menu filter by:Jon
+-   perf: use ref at component start by:Javier Segarra
+-   refactor: refs #7717 delete useless function and import by:Jon
+-   refactor: refs #7717 deleted useless code by:Jon
 
 ### Fixed 🛠️
 
--   Cesta → Mejoras varias
--   Reclamaciones → Mejoras varias
--   Usuarios → Mejoras varias
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   fix(VnTable): orderBy v-model by:alexm
+-   fix(account_card): redirection by:carlossa
+-   fix(orderLines): reload when delete and redirect when confirm by:alexm
+-   fix: #6336 ClaimListStates by:Javier Segarra
+-   fix: account subsections cards by:carlossa
+-   fix: duplicate key by:Jon
+-   fix: order description to vnTable by:alexm
+-   fix: orderCatalogFilter order by:alexm
+-   fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+-   fix: refs #7717 fix basic data form & minor errors by:Jon
+-   fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon
+-   fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon
+-   fix: refs #7717 fix order sections by:Jon
+-   fix: refs #7717 fix volume and lines redirect by:Jon
+-   fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon
+-   fix: test by:alexm
+-   fix: ticketDescriptorMenu by:Javier Segarra
+-   refs #7355 account fixes by:carlossa
 
 # Version 24.34 - 2024-08-20
 
 ### Added 🆕
 
-## Changed 📦
-
--   General → Trabajadores: Migrado de Salix a Lilium
-
-## Fixed 🛠️
-
--   Artículos → General: Arreglados fallos de interfaz
--   Fact. Recibidas → General: Arreglados fallos de interfaz
--   Trabajadores → General: Arreglados fallos de interfaz
--   Usuarios → General: Arreglados fallos de interfaz
-
 -   chore: #6900 order params by:jorgep
 -   chore: refs #6900 drop console log by:jorgep
 -   chore: refs #6900 drop vnCurrency by:jorgep
@@ -113,10 +134,7 @@
 -   refs #7355 fix lists redirects summary by:carlossa
 -   refs #7355 fix roles by:carlossa
 -   refs #7355 fix search exprBuilder by:carlossa
-    <<<<<<< HEAD
--   # refs #7355 fix vnTable by:carlos
 -   refs #7355 fix vnTable by:carlossa
-    > > > > > > > 1b8a72175cc1dbae0590217b03d855bf2ff6d07d
 
 # Version 24.32 - 2024-08-06
 
diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue
index 2751f1ceb..eff718e97 100644
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@@ -33,6 +33,7 @@ async function onSubmit() {
     };
 
     try {
+        console.log('newPassword: ', newPassword);
         await axios.post(
             'VnUsers/reset-password',
             { newPassword: newPassword.value },

From 99b65c564c8c8cda9b08f60050b2caeb62d6fb1c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 5 Sep 2024 12:41:21 +0200
Subject: [PATCH 096/162] fix branch

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 2 +-
 src/pages/Item/Card/ItemCard.vue        | 2 +-
 src/pages/Item/Card/ItemLastEntries.vue | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 63d93e074..915b58b15 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -204,7 +204,7 @@ watchEffect(selectedRows);
             },
         }"
         v-model:selected="selectedRows"
-        order="issued DESC, id DESC"
+        order="id DESC"
         :columns="columns"
         redirect="invoice-out"
         auto-load
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 2412f2bf9..1162327c1 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue';
         search-data-key="ItemList"
         :searchbar-props="{
             url: 'Items/filter',
-            label: 'searchbar.label',
+            label: 'searchbar.labelr',
             info: 'searchbar.info',
         }"
     />
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index 4a84fdb55..b211790ca 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -42,7 +42,6 @@ const to = ref();
 const arrayData = useArrayData('ItemLastEntries', {
     url: 'Items/lastEntriesFilter',
     order: ['landed DESC', 'buyFk DESC'],
-    searchUrl: 'itemLastEntries',
     exprBuilder: exprBuilder,
     userFilter: {
         where: {

From d4da8fc69f9097b83095295be4d3c2aa9717a454 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 5 Sep 2024 12:48:31 +0200
Subject: [PATCH 097/162] fix branch

---
 src/components/ui/VnFilterPanel.vue             | 7 +++----
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 998211c39..931767516 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -204,10 +204,9 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value === 'object' && value !== null) {
-            sanitizer(value);
-        } else if (typeof value === 'string') {
-            params[key] = value.replaceAll('%', '');
+        if (value && typeof value === 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }
     }
     return params;
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5db802065..e9d5a2f1f 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -176,7 +176,7 @@ const ticketsColumns = ref([
                         <QTd>
                             <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
-                                <CustomerDescriptorProxy :id="row.clientFk" />
+                                <CustomerDescriptorProxy :id="row.id" />
                             </QBtn>
                         </QTd>
                     </template>

From c8d6a6701120679f7f599d50344371cb14ddd0f6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 5 Sep 2024 12:49:17 +0200
Subject: [PATCH 098/162] fix tootltip

---
 src/components/common/VnDmsList.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index c42de6690..134297f59 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -135,6 +135,7 @@ const columns = computed(() => [
         field: 'hasFile',
         label: t('globals.original'),
         name: 'hasFile',
+        toolTip: t('the documentation is available in paper form'),
         component: QCheckbox,
         props: (prop) => ({
             disable: true,
@@ -297,6 +298,14 @@ defineExpose({
                 row-key="clientFk"
                 :grid="$q.screen.lt.sm"
             >
+                <template #header="props">
+                    <QTr :props="props" class="bg">
+                        <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                            <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip
+                            >{{ col.label }}
+                        </QTh>
+                    </QTr>
+                </template>
                 <template #body-cell="props">
                     <QTd :props="props">
                         <QTr :props="props">
@@ -401,4 +410,5 @@ es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
     Upload file: Subir fichero
+    the documentation is available in paper form: Se tiene la documentación en papel
 </i18n>

From 62cdc1d52733b629cc438567f84eddebdc5d266b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 14:56:50 +0200
Subject: [PATCH 099/162] feat: CustomerCreateTicket

---
 .../Customer/Card/CustomerDescriptorMenu.vue  |  23 +-
 src/pages/Ticket/TicketCreateDialog.vue       | 226 ++++++++++++++++++
 2 files changed, 239 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/Ticket/TicketCreateDialog.vue

diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 560ee51c8..2d8cceda3 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import axios from 'axios';
 import { useQuasar } from 'quasar';
@@ -8,6 +9,8 @@ import { useQuasar } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
+import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import { ref } from 'vue';
 
 const $props = defineProps({
     customer: {
@@ -40,20 +43,20 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
+const ticketCreateFormDialog = ref(null);
+
+const openTicketCreateForm = () => {
+    ticketCreateFormDialog.value.show();
+};
 </script>
 
 <template>
-    <QItem v-ripple clickable>
+    <QItem v-ripple clickable @click="openTicketCreateForm()">
         <QItemSection>
-            <RouterLink
-                :to="{
-                    name: 'TicketCreate',
-                    query: { clientFk: customer.id },
-                }"
-                class="color-vn-text"
-            >
-                {{ t('Simple ticket') }}
-            </RouterLink>
+            {{ t('globals.pageTitles.createTicket') }}
+            <QDialog ref="ticketCreateFormDialog">
+                <TicketCreateDialog />
+            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable>
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
new file mode 100644
index 000000000..1493adc53
--- /dev/null
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -0,0 +1,226 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { onBeforeMount, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useDialogPluginComponent } from 'quasar';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+import { useState } from 'composables/useState';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const state = useState();
+const user = state.getUser();
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const initialFormState = reactive({
+    clientId: Number(route.query?.clientFk) || null,
+    addressId: null,
+    agencyModeId: null,
+    warehouseId: user.value.warehouseFk,
+    landed: null,
+});
+const clientOptions = ref([]);
+const agenciesOptions = ref([]);
+const addressesOptions = ref([]);
+const warehousesOptions = ref([]);
+const selectedClient = ref(null);
+
+onBeforeMount(async () => {
+    await onClientSelected(initialFormState);
+});
+
+const fetchClient = async (formData) => {
+    try {
+        const filter = {
+            include: {
+                relation: 'defaultAddress',
+                scope: {
+                    fields: ['id', 'agencyModeFk'],
+                },
+            },
+            where: { id: formData.clientId },
+        };
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get('Clients', { params });
+        const [client] = data;
+        selectedClient.value = client;
+    } catch (err) {
+        console.error('Error fetching client');
+    }
+};
+
+const fetchAddresses = async (formData) => {
+    try {
+        if (!formData.clientId) return;
+
+        const filter = {
+            fields: ['nickname', 'street', 'city', 'id'],
+            where: { isActive: true },
+            order: 'nickname ASC',
+        };
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
+            params,
+        });
+        addressesOptions.value = data;
+
+        const { defaultAddress } = selectedClient.value;
+        formData.addressId = defaultAddress.id;
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+
+const onClientSelected = async (formData) => {
+    await fetchClient(formData);
+    await fetchAddresses(formData);
+};
+
+const fetchAvailableAgencies = async (formData) => {
+    if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
+    let params = {
+        warehouseFk: formData.warehouseId,
+        addressFk: formData.addressId,
+        landed: formData.landed,
+    };
+
+    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+
+    agenciesOptions.value = data;
+
+    const defaultAgency = agenciesOptions.value.find(
+        (agency) =>
+            agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
+    );
+
+    if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
+};
+
+const redirectToTicketList = (_, { id }) => {
+    router.push({ name: 'TicketSummary', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Clients"
+        @on-fetch="(data) => (clientOptions = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        order="name"
+        auto-load
+    />
+
+    <FormModelPopup
+        :title="t('globals.pageTitles.createTicket')"
+        url-create="Tickets/new"
+        model="ticket"
+        :form-initial-data="initialFormState"
+        @on-data-saved="redirectToTicketList"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.client')"
+                        v-model="data.clientId"
+                        :options="clientOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="(client) => onClientSelected(data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.name }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt.id}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.address')"
+                        v-model="data.addressId"
+                        :options="addressesOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :disable="!data.clientId"
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.nickname }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `${scope.opt.street}, ${scope.opt.city}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnInputDate
+                        placeholder="dd-mm-aaa"
+                        :label="t('ticket.create.landed')"
+                        v-model="data.landed"
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.warehouse')"
+                        v-model="data.warehouseId"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.agency')"
+                        v-model="data.agencyModeId"
+                        :options="agenciesOptions"
+                        option-value="agencyModeFk"
+                        option-label="agencyMode"
+                        hide-selected
+                        :disable="!data.clientId || !data.landed || !data.warehouseId"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>

From 6476a8307a75dca74aa7da9722474f8dfacb840e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 15:08:59 +0200
Subject: [PATCH 100/162] perf: i18n

---
 src/pages/Customer/locale/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 4d5e7dfb1..545c3f274 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -71,6 +71,7 @@ customer:
         priceIncreasingRate: Price increasing rate
         averageInvoiced: Average invoiced
         claimRate: Claming rate
+        payMethodFk: Billing data
         risk: Risk
         maximumRisk: Solunion's maximum risk
         riskInfo: Invoices minus payments plus orders not yet invoiced

From b3391ab522b2f8f6a562b8bac31eb7b3d025106c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 20:51:33 +0200
Subject: [PATCH 101/162] perf: minor comments

---
 src/components/VnTable/VnTable.vue            | 535 +++++++++---------
 src/composables/useArrayData.js               |  18 +-
 .../Customer/Card/CustomerConsumption.vue     |   5 +-
 .../Customer/Card/CustomerCreditContracts.vue |  23 -
 .../Customer/Card/CustomerCreditOpinion.vue   |  16 +-
 .../Customer/Card/CustomerDescriptorMenu.vue  |   1 -
 src/pages/Customer/Card/CustomerSummary.vue   |  10 +-
 .../CustomerCreditContractsCreate.vue         |   1 -
 8 files changed, 271 insertions(+), 338 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 898e9c193..44b430e86 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -346,302 +346,281 @@ defineExpose({
         </QScrollArea>
     </QDrawer>
     <!-- class in div to fix warn-->
-    <div class="q-px-md">
-        <CrudModel
-            v-bind="$attrs"
-            :class="$attrs['class'] ?? 'q-px-md'"
-            :limit="$attrs['limit'] ?? 20"
-            ref="CrudModelRef"
-            @on-fetch="(...args) => emit('onFetch', ...args)"
-            :search-url="searchUrl"
-            :disable-infinite-scroll="
-                $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
-            "
-            @save-changes="reload"
-            :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
-            :auto-load="hasParams || $attrs['auto-load']"
-        >
-            <template
-                v-for="(_, slotName) in $slots"
-                #[slotName]="slotData"
-                :key="slotName"
+    <CrudModel
+        v-bind="$attrs"
+        :class="$attrs['class']"
+        :limit="$attrs['limit'] ?? 20"
+        ref="CrudModelRef"
+        @on-fetch="(...args) => emit('onFetch', ...args)"
+        :search-url="searchUrl"
+        :disable-infinite-scroll="
+            $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+        "
+        @save-changes="reload"
+        :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
+        :auto-load="hasParams || $attrs['auto-load']"
+    >
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
+        <template #body="{ rows }">
+            <QTable
+                v-bind="table"
+                class="vnTable"
+                :columns="splittedColumns.columns"
+                :rows="rows"
+                v-model:selected="selected"
+                :grid="!isTableMode"
+                table-header-class="bg-header"
+                card-container-class="grid-three"
+                flat
+                :style="isTableMode && `max-height: ${tableHeight}`"
+                virtual-scroll
+                @virtual-scroll="
+                    (event) =>
+                        event.index > rows.length - 2 &&
+                        CrudModelRef.vnPaginateRef.paginate()
+                "
+                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
+                @update:selected="emit('update:selected', $event)"
             >
-                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-            </template>
-            <template #body="{ rows }">
-                <QTable
-                    v-bind="table"
-                    class="vnTable"
-                    :columns="splittedColumns.columns"
-                    :rows="rows"
-                    v-model:selected="selected"
-                    :grid="!isTableMode"
-                    table-header-class="bg-header"
-                    card-container-class="grid-three"
-                    flat
-                    :style="isTableMode && `max-height: ${tableHeight}`"
-                    virtual-scroll
-                    @virtual-scroll="
-                        (event) =>
-                            event.index > rows.length - 2 &&
-                            CrudModelRef.vnPaginateRef.paginate()
-                    "
-                    @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
-                    @update:selected="emit('update:selected', $event)"
-                >
-                    <template #top-left v-if="!$props.withoutHeader">
-                        <slot name="top-left"></slot>
-                    </template>
-                    <template #top-right v-if="!$props.withoutHeader">
-                        <VnVisibleColumn
-                            v-if="isTableMode"
-                            v-model="splittedColumns.columns"
-                            :table-code="tableCode ?? route.name"
-                            :skip="columnsVisibilitySkipped"
-                        />
-                        <QBtnToggle
-                            v-model="mode"
-                            toggle-color="primary"
-                            class="bg-vn-section-color"
-                            dense
-                            :options="tableModes.filter((mode) => !mode.disable)"
-                        />
-                        <QBtn
-                            v-if="$props.rightSearch"
-                            icon="filter_alt"
-                            class="bg-vn-section-color q-ml-md"
-                            dense
-                            @click="stateStore.toggleRightDrawer()"
-                        />
-                    </template>
-                    <template #header-cell="{ col }">
-                        <QTh v-if="col.visible ?? true">
-                            <div
-                                class="column self-start q-ml-xs ellipsis"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                :style="$props.columnSearch ? 'height: 75px' : ''"
-                            >
-                                <div
-                                    class="row items-center no-wrap"
-                                    style="height: 30px"
-                                >
-                                    <QTooltip v-if="col.toolTip">{{
-                                        col.toolTip
-                                    }}</QTooltip>
-                                    <VnTableOrder
-                                        v-model="orders[col.orderBy ?? col.name]"
-                                        :name="col.orderBy ?? col.name"
-                                        :label="col?.label"
-                                        :data-key="$attrs['data-key']"
-                                        :search-url="searchUrl"
-                                    />
-                                </div>
-                                <VnTableFilter
-                                    v-if="$props.columnSearch"
-                                    :column="col"
-                                    :show-title="true"
+                <template #top-left v-if="!$props.withoutHeader">
+                    <slot name="top-left"></slot>
+                </template>
+                <template #top-right v-if="!$props.withoutHeader">
+                    <VnVisibleColumn
+                        v-if="isTableMode"
+                        v-model="splittedColumns.columns"
+                        :table-code="tableCode ?? route.name"
+                        :skip="columnsVisibilitySkipped"
+                    />
+                    <QBtnToggle
+                        v-model="mode"
+                        toggle-color="primary"
+                        class="bg-vn-section-color"
+                        dense
+                        :options="tableModes.filter((mode) => !mode.disable)"
+                    />
+                    <QBtn
+                        v-if="$props.rightSearch"
+                        icon="filter_alt"
+                        class="bg-vn-section-color q-ml-md"
+                        dense
+                        @click="stateStore.toggleRightDrawer()"
+                    />
+                </template>
+                <template #header-cell="{ col }">
+                    <QTh v-if="col.visible ?? true">
+                        <div
+                            class="column self-start q-ml-xs ellipsis"
+                            :class="`text-${col?.align ?? 'left'}`"
+                            :style="$props.columnSearch ? 'height: 75px' : ''"
+                        >
+                            <div class="row items-center no-wrap" style="height: 30px">
+                                <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
+                                <VnTableOrder
+                                    v-model="orders[col.orderBy ?? col.name]"
+                                    :name="col.orderBy ?? col.name"
+                                    :label="col?.label"
                                     :data-key="$attrs['data-key']"
-                                    v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
-                                    class="full-width"
                                 />
                             </div>
-                        </QTh>
-                    </template>
-                    <template #header-cell-tableActions>
-                        <QTh auto-width class="sticky" />
-                    </template>
-                    <template #body-cell-tableStatus="{ col, row }">
-                        <QTd auto-width :class="getColAlign(col)">
-                            <VnTableChip
-                                :columns="splittedColumns.columnChips"
+                            <VnTableFilter
+                                v-if="$props.columnSearch"
+                                :column="col"
+                                :show-title="true"
+                                :data-key="$attrs['data-key']"
+                                v-model="params[columnName(col)]"
+                                :search-url="searchUrl"
+                                class="full-width"
+                            />
+                        </div>
+                    </QTh>
+                </template>
+                <template #header-cell-tableActions>
+                    <QTh auto-width class="sticky" />
+                </template>
+                <template #body-cell-tableStatus="{ col, row }">
+                    <QTd auto-width :class="getColAlign(col)">
+                        <VnTableChip :columns="splittedColumns.columnChips" :row="row">
+                            <template #afterChip>
+                                <slot name="afterChip" :row="row"></slot>
+                            </template>
+                        </VnTableChip>
+                    </QTd>
+                </template>
+                <template #body-cell="{ col, row, rowIndex }">
+                    <!-- Columns -->
+                    <QTd
+                        auto-width
+                        class="no-margin q-px-xs"
+                        :class="[getColAlign(col), col.columnClass]"
+                        v-if="col.visible ?? true"
+                        @click.ctrl="
+                            ($event) =>
+                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
+                        "
+                    >
+                        <slot
+                            :name="`column-${col.name}`"
+                            :col="col"
+                            :row="row"
+                            :row-index="rowIndex"
+                        >
+                            <VnTableColumn
+                                :column="col"
                                 :row="row"
-                            >
-                                <template #afterChip>
-                                    <slot name="afterChip" :row="row"></slot>
-                                </template>
-                            </VnTableChip>
-                        </QTd>
-                    </template>
-                    <template #body-cell="{ col, row, rowIndex }">
-                        <!-- Columns -->
-                        <QTd
-                            auto-width
-                            class="no-margin q-px-xs"
-                            :class="[getColAlign(col), col.columnClass]"
-                            v-if="col.visible ?? true"
-                            @click.ctrl="
-                                ($event) =>
-                                    rowCtrlClickFunction &&
-                                    rowCtrlClickFunction($event, row)
+                                :is-editable="col.isEditable ?? isEditable"
+                                v-model="row[col.name]"
+                                component-prop="columnField"
+                            />
+                        </slot>
+                    </QTd>
+                </template>
+                <template #body-cell-tableActions="{ col, row }">
+                    <QTd
+                        auto-width
+                        :class="getColAlign(col)"
+                        class="sticky no-padding"
+                        @click="stopEventPropagation($event)"
+                    >
+                        <QBtn
+                            v-for="(btn, index) of col.actions"
+                            :key="index"
+                            :title="btn.title"
+                            :icon="btn.icon"
+                            class="q-px-sm"
+                            flat
+                            :class="
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                            "
+                            :style="`visibility: ${
+                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
+                            }`"
+                            @click="btn.action(row)"
+                        />
+                    </QTd>
+                </template>
+                <template #item="{ row, colsMap }">
+                    <component
+                        :is="$props.redirect ? 'router-link' : 'span'"
+                        :to="`/${$props.redirect}/` + row.id"
+                    >
+                        <QCard
+                            bordered
+                            flat
+                            class="row no-wrap justify-between cursor-pointer"
+                            @click="
+                                (_, row) => {
+                                    $props.rowClick && $props.rowClick(row);
+                                }
                             "
                         >
-                            <slot
-                                :name="`column-${col.name}`"
-                                :col="col"
-                                :row="row"
-                                :row-index="rowIndex"
-                            >
-                                <VnTableColumn
-                                    :column="col"
-                                    :row="row"
-                                    :is-editable="col.isEditable ?? isEditable"
-                                    v-model="row[col.name]"
-                                    component-prop="columnField"
-                                />
-                            </slot>
-                        </QTd>
-                    </template>
-                    <template #body-cell-tableActions="{ col, row }">
-                        <QTd
-                            auto-width
-                            :class="getColAlign(col)"
-                            class="sticky no-padding"
-                            @click="stopEventPropagation($event)"
-                        >
-                            <QBtn
-                                v-for="(btn, index) of col.actions"
-                                :key="index"
-                                :title="btn.title"
-                                :icon="btn.icon"
-                                class="q-px-sm"
-                                flat
-                                :class="
-                                    btn.isPrimary
-                                        ? 'text-primary-light'
-                                        : 'color-vn-text '
-                                "
-                                :style="`visibility: ${
-                                    (btn.show && btn.show(row)) ?? true
-                                        ? 'visible'
-                                        : 'hidden'
-                                }`"
-                                @click="btn.action(row)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #item="{ row, colsMap }">
-                        <component
-                            :is="$props.redirect ? 'router-link' : 'span'"
-                            :to="`/${$props.redirect}/` + row.id"
-                        >
-                            <QCard
-                                bordered
-                                flat
-                                class="row no-wrap justify-between cursor-pointer"
-                                @click="
-                                    (_, row) => {
-                                        $props.rowClick && $props.rowClick(row);
-                                    }
-                                "
+                            <QCardSection
+                                vertical
+                                class="no-margin no-padding"
+                                :class="colsMap.tableActions ? 'w-80' : 'fit'"
                             >
+                                <!-- Chips -->
                                 <QCardSection
-                                    vertical
-                                    class="no-margin no-padding"
-                                    :class="colsMap.tableActions ? 'w-80' : 'fit'"
+                                    v-if="splittedColumns.chips.length"
+                                    class="no-margin q-px-xs q-py-none"
                                 >
-                                    <!-- Chips -->
-                                    <QCardSection
-                                        v-if="splittedColumns.chips.length"
-                                        class="no-margin q-px-xs q-py-none"
+                                    <VnTableChip
+                                        :columns="splittedColumns.chips"
+                                        :row="row"
                                     >
-                                        <VnTableChip
-                                            :columns="splittedColumns.chips"
-                                            :row="row"
-                                        >
-                                            <template #afterChip>
-                                                <slot name="afterChip" :row="row"></slot>
-                                            </template>
-                                        </VnTableChip>
-                                    </QCardSection>
-                                    <!-- Title -->
-                                    <QCardSection
-                                        v-if="splittedColumns.title"
-                                        class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
+                                        <template #afterChip>
+                                            <slot name="afterChip" :row="row"></slot>
+                                        </template>
+                                    </VnTableChip>
+                                </QCardSection>
+                                <!-- Title -->
+                                <QCardSection
+                                    v-if="splittedColumns.title"
+                                    class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
+                                >
+                                    <span
+                                        :title="row[splittedColumns.title.name]"
+                                        @click="stopEventPropagation($event)"
+                                        class="cursor-text"
                                     >
-                                        <span
-                                            :title="row[splittedColumns.title.name]"
-                                            @click="stopEventPropagation($event)"
-                                            class="cursor-text"
-                                        >
-                                            {{ row[splittedColumns.title.name] }}
-                                        </span>
-                                    </QCardSection>
-                                    <!-- Fields -->
-                                    <QCardSection
-                                        class="q-pl-sm q-pr-lg q-py-xs"
-                                        :class="$props.cardClass"
+                                        {{ row[splittedColumns.title.name] }}
+                                    </span>
+                                </QCardSection>
+                                <!-- Fields -->
+                                <QCardSection
+                                    class="q-pl-sm q-pr-lg q-py-xs"
+                                    :class="$props.cardClass"
+                                >
+                                    <div
+                                        v-for="(
+                                            col, index
+                                        ) of splittedColumns.cardVisible"
+                                        :key="col.name"
+                                        class="fields"
                                     >
-                                        <div
-                                            v-for="(
-                                                col, index
-                                            ) of splittedColumns.cardVisible"
-                                            :key="col.name"
-                                            class="fields"
+                                        <VnLv
+                                            :label="
+                                                !col.component && col.label
+                                                    ? `${col.label}:`
+                                                    : ''
+                                            "
                                         >
-                                            <VnLv
-                                                :label="
-                                                    !col.component && col.label
-                                                        ? `${col.label}:`
-                                                        : ''
-                                                "
-                                            >
-                                                <template #value>
-                                                    <span
-                                                        @click="
-                                                            stopEventPropagation($event)
-                                                        "
+                                            <template #value>
+                                                <span
+                                                    @click="stopEventPropagation($event)"
+                                                >
+                                                    <slot
+                                                        :name="`column-${col.name}`"
+                                                        :col="col"
+                                                        :row="row"
+                                                        :row-index="index"
                                                     >
-                                                        <slot
-                                                            :name="`column-${col.name}`"
-                                                            :col="col"
+                                                        <VnTableColumn
+                                                            :column="col"
                                                             :row="row"
-                                                            :row-index="index"
-                                                        >
-                                                            <VnTableColumn
-                                                                :column="col"
-                                                                :row="row"
-                                                                :is-editable="false"
-                                                                v-model="row[col.name]"
-                                                                component-prop="columnField"
-                                                                :show-label="true"
-                                                            />
-                                                        </slot>
-                                                    </span>
-                                                </template>
-                                            </VnLv>
-                                        </div>
-                                    </QCardSection>
+                                                            :is-editable="false"
+                                                            v-model="row[col.name]"
+                                                            component-prop="columnField"
+                                                            :show-label="true"
+                                                        />
+                                                    </slot>
+                                                </span>
+                                            </template>
+                                        </VnLv>
+                                    </div>
                                 </QCardSection>
-                                <!-- Actions -->
-                                <QCardSection
-                                    v-if="colsMap.tableActions"
-                                    class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
-                                    @click="stopEventPropagation($event)"
-                                >
-                                    <QBtn
-                                        v-for="(btn, index) of splittedColumns.actions
-                                            .actions"
-                                        :key="index"
-                                        :title="btn.title"
-                                        :icon="btn.icon"
-                                        class="q-pa-xs"
-                                        flat
-                                        :class="
-                                            btn.isPrimary
-                                                ? 'text-primary-light'
-                                                : 'color-vn-text '
-                                        "
-                                        @click="btn.action(row)"
-                                    />
-                                </QCardSection>
-                            </QCard>
-                        </component>
-                    </template>
-                </QTable>
-            </template>
-        </CrudModel>
-    </div>
+                            </QCardSection>
+                            <!-- Actions -->
+                            <QCardSection
+                                v-if="colsMap.tableActions"
+                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
+                                @click="stopEventPropagation($event)"
+                            >
+                                <QBtn
+                                    v-for="(btn, index) of splittedColumns.actions
+                                        .actions"
+                                    :key="index"
+                                    :title="btn.title"
+                                    :icon="btn.icon"
+                                    class="q-pa-xs"
+                                    flat
+                                    :class="
+                                        btn.isPrimary
+                                            ? 'text-primary-light'
+                                            : 'color-vn-text '
+                                    "
+                                    @click="btn.action(row)"
+                                />
+                            </QCardSection>
+                        </QCard>
+                    </component>
+                </template>
+            </QTable>
+        </template>
+    </CrudModel>
     <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
         <QBtn @click="showForm = !showForm" color="primary" fab icon="add" shortcut="+" />
         <QTooltip>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 446816788..32b91b115 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,13 +86,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        // ARRAY DATA FALLA AL JUNTAR WHERE'S
-        console.log(
-            'userParams?.filter?.where: ',
-            userParams?.filter?.where,
-            filter?.where,
-            store.filter?.where
-        );
+        //FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
+        // console.log(
+        //     'userParams?.filter?.where: ',
+        //     userParams?.filter?.where,
+        //     filter?.where,
+        //     store.filter?.where
+        // );
         if ((userParams?.filter?.where, filter?.where || store.filter?.where))
             where = Object.assign(
                 userParams?.filter?.where ?? {},
@@ -101,9 +101,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             );
         Object.assign(filter, store.filter);
         filter.where = where;
-        console.log('where: ', where);
+        // console.log('where: ', where);
         const params = { filter };
-        console.log('params: ', params);
+        // console.log('params: ', params);
 
         delete userParams?.filter;
         Object.assign(params, userParams);
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 27c1b746c..35f366e47 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onBeforeMount, onMounted } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters/index';
@@ -90,9 +90,6 @@ const columns = computed(() => [
 onBeforeMount(async () => {
     campaignList.value = (await axios('Campaigns/latest')).data;
 });
-// onMounted(() => {
-//     showActionBtns.value = handleQueryParams();
-// });
 
 function getQueryParams() {
     return JSON.parse(route.query.consumption ?? '{}');
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 8519e88f3..0ff074793 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
@@ -73,28 +72,6 @@ const updateData = () => {
 </script>
 
 <template>
-    <!-- <VnTable
-        ref="tableRef"
-        data-key="Greuges"
-        url="Greuges"
-        search-url="greuges"
-        :filter="filter"
-        :order="['shipped DESC', 'amount']"
-        :columns="columns"
-        :right-search="false"
-        :is-editable="false"
-        :use-model="true"
-        :column-search="false"
-        @on-fetch="(data) => setRows(data)"
-        :disable-option="{ card: true }"
-        :create="{
-            urlCreate: `Greuges`,
-            title: t('New greuge'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: { shipped: new Date(), clientFk: route.params.id },
-        }"
-        auto-load
-    ></VnTable> -->
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index af1b0138e..6a839ff3f 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -1,22 +1,17 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { toCurrency, toDateHourMin } from 'src/filters';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
 const tableRef = ref();
-// const rows = ref([]);
 
 const filter = {
     include: [
@@ -70,15 +65,6 @@ const columns = computed(() => [
         },
     },
 ]);
-
-// watch(
-//     () => route.params.id,
-//     (newValue) => {
-//         if (!newValue) return;
-//         filter.where.clientFk = newValue;
-//         clientInformasRef.value?.fetch();
-//     }
-// );
 </script>
 
 <template>
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 2d8cceda3..88eec33a4 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import axios from 'axios';
 import { useQuasar } from 'quasar';
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 1a1ae0e46..1c511b45d 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -61,7 +61,7 @@ const creditWarning = computed(() => {
     return tooMuchInsurance || noCreditInsurance ? 'negative' : '';
 });
 const sumRisk = ({ clientRisks }) => {
-    let total = clientRisks.reduce((acc, risk) => acc + risk.amount, 0);
+    let total = clientRisks.reduce((acc, { amount }) => acc + amount, 0);
 
     return total;
 };
@@ -153,8 +153,6 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.isActive')"
                         :value="entity.isActive"
                     />
-                    <!-- </VnRow>
-                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.verifiedData')"
                         :value="entity.isTaxDataChecked"
@@ -163,8 +161,6 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.hasToInvoice')"
                         :value="entity.hasToInvoice"
                     />
-                    <!-- </VnRow>
-                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
@@ -231,7 +227,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
+                    :url="`${grafanaUrl}/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.businessData')"
                     icon="vn:grafana"
                 />
@@ -258,7 +254,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
+                    :url="`${grafanaUrl}/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
                 />
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index 24f3746dc..c25e59e1a 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -48,7 +48,6 @@ const toCustomerCreditContracts = () => {
                         clearable
                         type="number"
                         v-model.number="data.credit"
-                        autofocus
                     />
                 </div>
                 <div class="col">

From 1f96f5c09af8fc9df520b1760c2d448066d09054 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 22:20:57 +0200
Subject: [PATCH 102/162] feat: orderCreateDialog

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Customer/Card/CustomerDescriptor.vue      |  12 -
 .../Customer/Card/CustomerDescriptorMenu.vue  |  15 +-
 src/pages/Order/Card/OrderCreateDialog.vue    | 220 ++++++++++++++++++
 5 files changed, 236 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/Order/Card/OrderCreateDialog.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 364cc74c7..82ecc4378 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -126,6 +126,7 @@ globals:
         notifications: Notifications
         defaulter: Defaulter
         customerCreate: New customer
+        createOrder: New order
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ac83b499d..85f106d5f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -123,6 +123,7 @@ globals:
         inheritedRoles: Roles heredados
         customers: Clientes
         customerCreate: Nuevo cliente
+        createOrder: Nuevo pedido
         list: Listado
         webPayments: Pagos Web
         extendedList: Listado extendido
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 5cab825a9..b18f90d20 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -179,17 +179,6 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'OrderCreate',
-                        query: { table: JSON.stringify({ clientFk: entity.id }) },
-                    }"
-                    size="md"
-                    icon="vn:basketadd"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('New order') }}</QTooltip>
-                </QBtn>
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
@@ -214,7 +203,6 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
     Go to user: Ir al usuario
     Customer unpaid: Cliente impago
     Unpaid: Impagado
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 88eec33a4..89b10a4fe 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -9,6 +9,7 @@ import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
 import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
 import { ref } from 'vue';
 
 const $props = defineProps({
@@ -42,11 +43,15 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
-const ticketCreateFormDialog = ref(null);
 
+const ticketCreateFormDialog = ref(null);
 const openTicketCreateForm = () => {
     ticketCreateFormDialog.value.show();
 };
+const orderCreateFormDialog = ref(null);
+const openOrderCreateForm = () => {
+    orderCreateFormDialog.value.show();
+};
 </script>
 
 <template>
@@ -58,6 +63,14 @@ const openTicketCreateForm = () => {
             </QDialog>
         </QItemSection>
     </QItem>
+    <QItem v-ripple clickable @click="openOrderCreateForm()">
+        <QItemSection>
+            {{ t('globals.pageTitles.createOrder') }}
+            <QDialog ref="orderCreateFormDialog">
+                <OrderCreateDialog :client-fk="customer.id" />
+            </QDialog>
+        </QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
new file mode 100644
index 000000000..9d5c9281e
--- /dev/null
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -0,0 +1,220 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useState } from 'composables/useState';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import { useDialogPluginComponent } from 'quasar';
+import { reactive } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const state = useState();
+const ORDER_MODEL = 'order';
+
+const router = useRouter();
+const clientList = ref([]);
+const agencyList = ref([]);
+const addressList = ref([]);
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const fetchAddressList = async (addressId) => {
+    try {
+        const { data } = await axios.get('addresses', {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['id', 'nickname', 'street', 'city'],
+                    where: { id: addressId },
+                }),
+            },
+        });
+        addressList.value = data;
+        if (addressList.value?.length === 1) {
+            state.get(ORDER_MODEL).addressId = addressList.value[0].id;
+        }
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+
+const fetchAgencyList = async (landed, addressFk) => {
+    if (!landed || !addressFk) {
+        return;
+    }
+    try {
+        const { data } = await axios.get('Agencies/landsThatDay', {
+            params: {
+                addressFk,
+                landed: new Date(landed).toISOString(),
+            },
+        });
+        agencyList.value = data;
+    } catch (err) {
+        console.error(`Error fetching agencies`, err);
+        return err.response;
+    }
+};
+
+// const fetchOrderDetails = (order) => {
+//     fetchAddressList(order?.addressFk);
+//     fetchAgencyList(order?.landed, order?.addressFk);
+// };
+const $props = defineProps({
+    clientFk: {
+        type: Number,
+        default: null,
+    },
+});
+const initialFormState = reactive({
+    active: true,
+    addressId: null,
+    clientFk: $props.clientFk,
+});
+// const orderMapper = (order) => {
+//     return {
+//         addressId: order.addressFk,
+//         agencyModeId: order.agencyModeFk,
+//         landed: new Date(order.landed).toISOString(),
+//     };
+// };
+// const orderFilter = {
+//     include: [
+//         { relation: 'agencyMode', scope: { fields: ['name'] } },
+//         {
+//             relation: 'address',
+//             scope: { fields: ['nickname'] },
+//         },
+//         { relation: 'rows', scope: { fields: ['id'] } },
+//         {
+//             relation: 'client',
+//             scope: {
+//                 fields: [
+//                     'salesPersonFk',
+//                     'name',
+//                     'isActive',
+//                     'isFreezed',
+//                     'isTaxDataChecked',
+//                 ],
+//                 include: {
+//                     relation: 'salesPersonUser',
+//                     scope: { fields: ['id', 'name'] },
+//                 },
+//             },
+//         },
+//     ],
+// };
+
+const onClientChange = async (clientId = $props.clientFk) => {
+    try {
+        const { data } = await axios.get(`Clients/${clientId}`);
+        await fetchAddressList(data.defaultAddressFk);
+    } catch (error) {
+        console.error('Error al cambiar el cliente:', error);
+    }
+};
+
+async function onDataSaved(_, id) {
+    await router.push({ path: `/order/${id}/catalog` });
+}
+onMounted(async () => {
+    await onClientChange();
+});
+</script>
+
+<template>
+    <FetchData
+        url="addresses"
+        @on-fetch="(data) => (clientOptions = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
+        auto-load
+    />
+    <FormModelPopup
+        url-create="Orders/new"
+        :title="t('Create Order')"
+        @on-data-saved="onDataSaved"
+        :model="ORDER_MODEL"
+        :filter="orderFilter"
+        :form-initial-data="initialFormState"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    url="Clients"
+                    :label="t('order.form.clientFk')"
+                    v-model="data.clientFk"
+                    option-value="id"
+                    option-label="name"
+                    :filter="{
+                        fields: ['id', 'name', 'defaultAddressFk'],
+                    }"
+                    hide-selected
+                    @update:model-value="onClientChange"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('order.form.addressFk')"
+                    v-model="data.addressId"
+                    :options="addressList"
+                    option-value="id"
+                    option-label="street"
+                    hide-selected
+                    :disable="!addressList?.length"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{
+                                        `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                    }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate
+                    placeholder="dd-mm-aaa"
+                    :label="t('order.form.landed')"
+                    v-model="data.landed"
+                    @update:model-value="
+                        () => fetchAgencyList(data.landed, data.addressId)
+                    "
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    :label="t('order.form.agencyModeFk')"
+                    v-model="data.agencyModeId"
+                    :options="agencyList"
+                    option-value="agencyModeFk"
+                    option-label="agencyMode"
+                    hide-selected
+                    :disable="!agencyList?.length"
+                >
+                </VnSelect>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        No default address found for the client: No hay ninguna dirección asociada a este cliente.
+</i18n>

From 6db1c8f083fbd438fee7fe9763ad86437720e8ae Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 6 Sep 2024 07:50:39 +0200
Subject: [PATCH 103/162] fix traduction

---
 src/components/common/VnDmsList.vue | 3 ++-
 src/i18n/locale/en.yml              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 134297f59..68ff0e359 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -135,7 +135,7 @@ const columns = computed(() => [
         field: 'hasFile',
         label: t('globals.original'),
         name: 'hasFile',
-        toolTip: t('the documentation is available in paper form'),
+        toolTip: t('The documentation is available in paper form'),
         component: QCheckbox,
         props: (prop) => ({
             disable: true,
@@ -406,6 +406,7 @@ defineExpose({
 <i18n>
 en:
     contentTypesInfo: Allowed file types {allowedContentTypes}
+    The documentation is available in paper form: The documentation is available in paper form
 es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 548981de1..52fc73f2f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -84,7 +84,7 @@ globals:
     description: Description
     id: Id
     order: Order
-    original: Original
+    original: Phys. Doc
     file: File
     selectFile: Select a file
     copyClipboard: Copy on clipboard

From 585919a4d957b9d6cc03e8f34b47ea682b7eaf32 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 09:19:38 +0200
Subject: [PATCH 104/162] feat: refs #7889 added shortcuts to modules

---
 src/boot/mainShortcutMixin.js         | 1 -
 src/pages/Dashboard/DashboardMain.vue | 6 ++++++
 src/router/modules/Supplier.js        | 2 ++
 src/router/modules/account.js         | 2 ++
 src/router/modules/claim.js           | 2 ++
 src/router/modules/customer.js        | 2 ++
 src/router/modules/entry.js           | 2 ++
 src/router/modules/item.js            | 2 ++
 src/router/modules/monitor.js         | 2 ++
 src/router/modules/order.js           | 2 ++
 src/router/modules/route.js           | 1 -
 src/router/modules/ticket.js          | 2 ++
 src/router/modules/worker.js          | 2 ++
 src/router/modules/zone.js            | 2 ++
 src/stores/useNavigationStore.js      | 1 +
 15 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/boot/mainShortcutMixin.js b/src/boot/mainShortcutMixin.js
index 3b5c604b7..c684fc924 100644
--- a/src/boot/mainShortcutMixin.js
+++ b/src/boot/mainShortcutMixin.js
@@ -15,7 +15,6 @@ export default {
 
         const handleKeyDown = (event) => {
             const { ctrlKey, altKey, key } = event;
-
             if (ctrlKey && altKey && keyBindingMap[key] && !isNotified) {
                 event.preventDefault();
                 router.push(keyBindingMap[key]);
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index 6da39ce25..eaeddb682 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -55,6 +55,12 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                 >
                                     <div class="text-center text-primary button-text">
                                         {{ t(item.title) }}
+                                        <div v-if="item.subtitle">
+                                            {{ '(' + item.subtitle + ')' }}
+                                            <QTooltip>
+                                                {{ 'Ctrl + Alt + ' + item.subtitle }}
+                                            </QTooltip>
+                                        </div>
                                     </div>
                                 </QBtn>
                             </div>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index b711066b2..e620e485c 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -5,8 +5,10 @@ export default {
     name: 'Supplier',
     meta: {
         title: 'suppliers',
+        subtitle: 'P',
         icon: 'vn:supplier',
         moduleName: 'Supplier',
+        keyBinding: 'p',
     },
     component: RouterView,
     redirect: { name: 'SupplierMain' },
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index cfec2b95d..dbf641c4a 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -5,8 +5,10 @@ export default {
     name: 'Account',
     meta: {
         title: 'users',
+        subtitle: 'U',
         icon: 'face',
         moduleName: 'Account',
+        keyBinding: 'u',
     },
     component: RouterView,
     redirect: { name: 'AccountMain' },
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index cced9e24d..eb7a348fe 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -5,8 +5,10 @@ export default {
     path: '/claim',
     meta: {
         title: 'claims',
+        subtitle: 'R',
         icon: 'vn:claims',
         moduleName: 'Claim',
+        keyBinding: 'r',
     },
     component: RouterView,
     redirect: { name: 'ClaimMain' },
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 684b83b0f..1e74b77bd 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -5,8 +5,10 @@ export default {
     name: 'Customer',
     meta: {
         title: 'customers',
+        subtitle: 'C',
         icon: 'vn:client',
         moduleName: 'Customer',
+        keyBinding: 'c',
     },
     component: RouterView,
     redirect: { name: 'CustomerMain' },
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 0d38ed626..d3639e2f1 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -5,8 +5,10 @@ export default {
     name: 'Entry',
     meta: {
         title: 'entries',
+        subtitle: 'E',
         icon: 'vn:entry',
         moduleName: 'Entry',
+        keyBinding: '€',
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 4bd5df4e2..80dcf4ae0 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -5,8 +5,10 @@ export default {
     name: 'Item',
     meta: {
         title: 'items',
+        subtitle: 'A',
         icon: 'vn:item',
         moduleName: 'Item',
+        keyBinding: 'a',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },
diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js
index 3353da3cf..74a2826e2 100644
--- a/src/router/modules/monitor.js
+++ b/src/router/modules/monitor.js
@@ -5,8 +5,10 @@ export default {
     name: 'Monitor',
     meta: {
         title: 'monitors',
+        subtitle: 'M',
         icon: 'grid_view',
         moduleName: 'Monitor',
+        keyBinding: 'm',
     },
     component: RouterView,
     redirect: { name: 'MonitorMain' },
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 9ccdb820b..861eb7938 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -5,8 +5,10 @@ export default {
     name: 'Order',
     meta: {
         title: 'order',
+        subtitle: 'O',
         icon: 'vn:basket',
         moduleName: 'Order',
+        keyBinding: 'o',
     },
     component: RouterView,
     redirect: { name: 'OrderMain' },
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 955fc9098..3c5c860cf 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -7,7 +7,6 @@ export default {
         title: 'routes',
         icon: 'vn:delivery',
         moduleName: 'Route',
-        keyBinding: 'r',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 4074f089f..9c9b2cbf3 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -5,8 +5,10 @@ export default {
     path: '/ticket',
     meta: {
         title: 'tickets',
+        subtitle: 'T',
         icon: 'vn:ticket',
         moduleName: 'Ticket',
+        keyBinding: 't',
     },
     component: RouterView,
     redirect: { name: 'TicketMain' },
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 2a523e7fe..4395319bf 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -5,8 +5,10 @@ export default {
     name: 'Worker',
     meta: {
         title: 'workers',
+        subtitle: 'W',
         icon: 'vn:worker',
         moduleName: 'Worker',
+        keyBinding: 'w',
     },
     component: RouterView,
     redirect: { name: 'WorkerMain' },
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 40358c58e..c82616286 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -5,8 +5,10 @@ export default {
     name: 'Zone',
     meta: {
         title: 'zones',
+        subtitle: 'Z',
         icon: 'vn:zone',
         moduleName: 'Zone',
+        keyBinding: 'z',
     },
     component: RouterView,
     redirect: { name: 'ZoneMain' },
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 961e80377..67b632b00 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -72,6 +72,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         if (meta) {
             item.title = `globals.pageTitles.${meta.title}`;
             item.icon = meta.icon;
+            item.subtitle = meta.subtitle;
         }
 
         parent.push(item);

From 5d91b03f9ae0488ee159d1b0119a9462ab785758 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 09:27:55 +0200
Subject: [PATCH 105/162] fix: dynamic fetch

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

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 6e66f4ce7..903b691b0 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -26,7 +26,6 @@ const { notify } = useNotify();
 
 const rowsSelected = ref([]);
 const entryBuysPaginateRef = ref(null);
-const packagingsOptions = ref(null);
 const originalRowDataCopy = ref(null);
 
 const getInputEvents = (colField, props) => {
@@ -66,7 +65,10 @@ const tableColumnComponents = computed(() => ({
             'map-options': true,
             'use-input': true,
             'hide-selected': true,
-            options: packagingsOptions.value,
+            url: 'Packagings',
+            fields: ['id'],
+            where: { freightItemFk: true },
+            'sort-by': 'id ASC',
             dense: true,
         },
         event: getInputEvents,
@@ -304,13 +306,6 @@ const lockIconType = (groupingMode, mode) => {
 </script>
 
 <template>
-    <FetchData
-        ref="expensesRef"
-        url="Packagings"
-        :filter="{ fields: ['id'], where: { freightItemFk: true }, order: 'id ASC' }"
-        auto-load
-        @on-fetch="(data) => (packagingsOptions = data)"
-    />
     <VnSubToolbar>
         <template #st-actions>
             <QBtnGroup push style="column-gap: 10px">

From 5d78f564ddc3f4a64e2627c6108e32fc388005e2 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 10:00:07 +0200
Subject: [PATCH 106/162] refactor: refs #7889 deleted subtitle attr and use
 keyBinding instead

---
 src/boot/mainShortcutMixin.js         |  1 +
 src/pages/Dashboard/DashboardMain.vue | 17 ++++++++++++++---
 src/router/modules/Supplier.js        |  1 -
 src/router/modules/account.js         |  1 -
 src/router/modules/claim.js           |  1 -
 src/router/modules/customer.js        |  1 -
 src/router/modules/entry.js           |  1 -
 src/router/modules/item.js            |  1 -
 src/router/modules/monitor.js         |  1 -
 src/router/modules/order.js           |  1 -
 src/router/modules/ticket.js          |  1 -
 src/router/modules/worker.js          |  1 -
 src/router/modules/zone.js            |  1 -
 src/stores/useNavigationStore.js      |  2 +-
 14 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/boot/mainShortcutMixin.js b/src/boot/mainShortcutMixin.js
index c684fc924..3b5c604b7 100644
--- a/src/boot/mainShortcutMixin.js
+++ b/src/boot/mainShortcutMixin.js
@@ -15,6 +15,7 @@ export default {
 
         const handleKeyDown = (event) => {
             const { ctrlKey, altKey, key } = event;
+
             if (ctrlKey && altKey && keyBindingMap[key] && !isNotified) {
                 event.preventDefault();
                 router.push(keyBindingMap[key]);
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index eaeddb682..22073c6d8 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -55,10 +55,21 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                 >
                                     <div class="text-center text-primary button-text">
                                         {{ t(item.title) }}
-                                        <div v-if="item.subtitle">
-                                            {{ '(' + item.subtitle + ')' }}
+                                        <div v-if="item.keyBinding">
+                                            {{
+                                                '(' +
+                                                (item.keyBinding == '€'
+                                                    ? 'E'
+                                                    : item.keyBinding) +
+                                                ')'
+                                            }}
                                             <QTooltip>
-                                                {{ 'Ctrl + Alt + ' + item.subtitle }}
+                                                {{
+                                                    'Ctrl + Alt + ' +
+                                                    (item.keyBinding == '€'
+                                                        ? 'E'
+                                                        : item.keyBinding.toUpperCase())
+                                                }}
                                             </QTooltip>
                                         </div>
                                     </div>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index e620e485c..143d7c824 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -5,7 +5,6 @@ export default {
     name: 'Supplier',
     meta: {
         title: 'suppliers',
-        subtitle: 'P',
         icon: 'vn:supplier',
         moduleName: 'Supplier',
         keyBinding: 'p',
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index dbf641c4a..34f804b18 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -5,7 +5,6 @@ export default {
     name: 'Account',
     meta: {
         title: 'users',
-        subtitle: 'U',
         icon: 'face',
         moduleName: 'Account',
         keyBinding: 'u',
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index eb7a348fe..d597267b2 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -5,7 +5,6 @@ export default {
     path: '/claim',
     meta: {
         title: 'claims',
-        subtitle: 'R',
         icon: 'vn:claims',
         moduleName: 'Claim',
         keyBinding: 'r',
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 1e74b77bd..5b73ddc84 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -5,7 +5,6 @@ export default {
     name: 'Customer',
     meta: {
         title: 'customers',
-        subtitle: 'C',
         icon: 'vn:client',
         moduleName: 'Customer',
         keyBinding: 'c',
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index d3639e2f1..3dd97a7a6 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -5,7 +5,6 @@ export default {
     name: 'Entry',
     meta: {
         title: 'entries',
-        subtitle: 'E',
         icon: 'vn:entry',
         moduleName: 'Entry',
         keyBinding: '€',
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 80dcf4ae0..48e19dd54 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -5,7 +5,6 @@ export default {
     name: 'Item',
     meta: {
         title: 'items',
-        subtitle: 'A',
         icon: 'vn:item',
         moduleName: 'Item',
         keyBinding: 'a',
diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js
index 74a2826e2..7342a5904 100644
--- a/src/router/modules/monitor.js
+++ b/src/router/modules/monitor.js
@@ -5,7 +5,6 @@ export default {
     name: 'Monitor',
     meta: {
         title: 'monitors',
-        subtitle: 'M',
         icon: 'grid_view',
         moduleName: 'Monitor',
         keyBinding: 'm',
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 861eb7938..bfa37fce5 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -5,7 +5,6 @@ export default {
     name: 'Order',
     meta: {
         title: 'order',
-        subtitle: 'O',
         icon: 'vn:basket',
         moduleName: 'Order',
         keyBinding: 'o',
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 9c9b2cbf3..0f6fc9b22 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -5,7 +5,6 @@ export default {
     path: '/ticket',
     meta: {
         title: 'tickets',
-        subtitle: 'T',
         icon: 'vn:ticket',
         moduleName: 'Ticket',
         keyBinding: 't',
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 4395319bf..b2716474b 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -5,7 +5,6 @@ export default {
     name: 'Worker',
     meta: {
         title: 'workers',
-        subtitle: 'W',
         icon: 'vn:worker',
         moduleName: 'Worker',
         keyBinding: 'w',
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index c82616286..1f27cc76f 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -5,7 +5,6 @@ export default {
     name: 'Zone',
     meta: {
         title: 'zones',
-        subtitle: 'Z',
         icon: 'vn:zone',
         moduleName: 'Zone',
         keyBinding: 'z',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 67b632b00..4589426f8 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -72,7 +72,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         if (meta) {
             item.title = `globals.pageTitles.${meta.title}`;
             item.icon = meta.icon;
-            item.subtitle = meta.subtitle;
+            item.keyBinding = meta.keyBinding;
         }
 
         parent.push(item);

From ef98f6048679fbcae010ce2f2ee05270211f9ea3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 10:30:32 +0200
Subject: [PATCH 107/162] refactor: refs #7889 modified shortcut and dashboard,
 and added tootlip in LeftMenu

---
 src/boot/mainShortcutMixin.js                 |  8 ++---
 src/components/LeftMenuItem.vue               |  7 +++-
 src/pages/Dashboard/DashboardMain.vue         | 12 ++-----
 src/router/modules/entry.js                   |  2 +-
 .../vnComponent/VnShortcut.spec.js            | 33 +++++++++++++++++++
 5 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 test/cypress/integration/vnComponent/VnShortcut.spec.js

diff --git a/src/boot/mainShortcutMixin.js b/src/boot/mainShortcutMixin.js
index 3b5c604b7..8e5f147db 100644
--- a/src/boot/mainShortcutMixin.js
+++ b/src/boot/mainShortcutMixin.js
@@ -9,16 +9,16 @@ export default {
         const keyBindingMap = routes
             .filter((route) => route.meta.keyBinding)
             .reduce((map, route) => {
-                map[route.meta.keyBinding.toLowerCase()] = route.path;
+                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
                 return map;
             }, {});
 
         const handleKeyDown = (event) => {
-            const { ctrlKey, altKey, key } = event;
+            const { ctrlKey, altKey, code } = event;
 
-            if (ctrlKey && altKey && keyBindingMap[key] && !isNotified) {
+            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
                 event.preventDefault();
-                router.push(keyBindingMap[key]);
+                router.push(keyBindingMap[code]);
                 isNotified = true;
             }
         };
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index f3f2315a3..9fe66e278 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -33,7 +33,12 @@ const itemComputed = computed(() => {
         <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
+        <QItemSection>
+            {{ t(itemComputed.title) }}
+            <QTooltip>
+                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+            </QTooltip>
+        </QItemSection>
         <QItemSection side>
             <slot name="side" :item="itemComputed" />
         </QItemSection>
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index 22073c6d8..a339120e2 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -56,19 +56,11 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                     <div class="text-center text-primary button-text">
                                         {{ t(item.title) }}
                                         <div v-if="item.keyBinding">
-                                            {{
-                                                '(' +
-                                                (item.keyBinding == '€'
-                                                    ? 'E'
-                                                    : item.keyBinding) +
-                                                ')'
-                                            }}
+                                            {{ '(' + item.keyBinding + ')' }}
                                             <QTooltip>
                                                 {{
                                                     'Ctrl + Alt + ' +
-                                                    (item.keyBinding == '€'
-                                                        ? 'E'
-                                                        : item.keyBinding.toUpperCase())
+                                                    item.keyBinding.toUpperCase()
                                                 }}
                                             </QTooltip>
                                         </div>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 3dd97a7a6..365615b87 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -7,7 +7,7 @@ export default {
         title: 'entries',
         icon: 'vn:entry',
         moduleName: 'Entry',
-        keyBinding: '€',
+        keyBinding: 'e',
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
diff --git a/test/cypress/integration/vnComponent/VnShortcut.spec.js b/test/cypress/integration/vnComponent/VnShortcut.spec.js
new file mode 100644
index 000000000..3ab95340e
--- /dev/null
+++ b/test/cypress/integration/vnComponent/VnShortcut.spec.js
@@ -0,0 +1,33 @@
+/// <reference types="cypress" />
+describe('VnShortcuts', () => {
+    const modules = {
+        item: 'a',
+        customer: 'c',
+        ticket: 't',
+        claim: 'r',
+        worker: 'w',
+        monitor: 'm',
+        order: 'p',
+        supplier: 'p',
+        entry: '€',
+        zone: 'z',
+        account: 'u',
+    };
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit('/');
+    });
+
+    it('should visit each module', () => {
+        Object.keys(modules).forEach((module) => {
+            const shortcut = modules[module];
+
+            cy.get('body').type(`{ctrl}{alt}${shortcut}`);
+
+            cy.url().should('include', module);
+            cy.get('body').should('be.visible');
+
+            cy.visit('/');
+        });
+    });
+});

From 6f98f249263745e6236b238a9405d71cf5a6d706 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 11:55:39 +0200
Subject: [PATCH 108/162] chore: refs #7663 add test

---
 .../ticket/ticketDescriptor.spec.js           | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index ace3831dd..516b0f13d 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -5,15 +5,14 @@ describe('Ticket descriptor', () => {
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
-    const ticketId = 1;
-
+    const weightValue = ':nth-child(10) > .value > span';
     beforeEach(() => {
         cy.login('developer');
-        cy.visit(`/#/ticket/${ticketId}/summary`);
+        cy.viewport(1920, 1080);
     });
 
     it('should clone the ticket without warehouse', () => {
-        cy.openLeftMenu();
+        cy.visit('/#/ticket/1/summary');
         cy.openActionsDescriptor();
         cy.get(toCloneOpt).click();
         cy.clickConfirm();
@@ -27,19 +26,13 @@ describe('Ticket descriptor', () => {
     });
 
     it('should set the weight of the ticket', () => {
-        cy.openLeftMenu();
+        cy.visit('/#/ticket/10/summary');
         cy.openActionsDescriptor();
         cy.get(setWeightOpt).click();
-        cy.get('.q-dialog input').type(25);
+        cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
+        cy.get('.q-dialog input').type(weight);
         cy.clickConfirm();
-
-        cy.get('.q-notification').should('contain', 'Peso establecido');
-
-        cy.intercept('POST', /\/api\/Tickets\/\d+/).as('worker');
-        cy.wait('@worker').then(() =>
-            cy.get(descriptorTitle).should('include.text', 'Jessica')
-        );
-
-        cy.get('@fetchSpy').should('have.been.called');
+        cy.wait('@weight');
+        cy.get(weightValue).contains(weight);
     });
 });

From 9bb298bbebf6dfe3c099a284e2866f0d8d8c82cb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 6 Sep 2024 13:14:46 +0200
Subject: [PATCH 109/162] feat: handle create row

---
 src/components/CrudModel.vue                 |   4 +-
 src/components/VnTable/VnTable.vue           |   6 ++
 src/i18n/locale/en.yml                       |   2 +
 src/i18n/locale/es.yml                       |   2 +
 src/pages/Item/ItemFixedPrice.vue            | 107 +++++++++++--------
 src/pages/Item/ItemFixedPriceFilter.vue      |  10 +-
 src/pages/Order/Card/OrderDescriptorMenu.vue |   4 +-
 7 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 33c831e3f..0386e037b 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -189,11 +189,11 @@ async function saveChanges(data) {
     });
 }
 
-async function insert() {
+async function insert(pushData = $props.dataRequired) {
     const $index = formData.value.length
         ? formData.value[formData.value.length - 1].$index + 1
         : 0;
-    formData.value.push(Object.assign({ $index }, $props.dataRequired));
+    formData.value.push(Object.assign({ $index }, pushData));
     hasChanges.value = true;
 }
 
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2f173cd85..20482c494 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -89,6 +89,10 @@ const $props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    crudModel: {
+        type: Object,
+        default: () => ({}),
+    },
     tableHeight: {
         type: String,
         default: '90vh',
@@ -369,6 +373,7 @@ function handleOnDataSaved(_, res) {
             <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
         <template #body="{ rows }">
+            {{ rows }}
             <QTable
                 v-bind="table"
                 class="vnTable"
@@ -384,6 +389,7 @@ function handleOnDataSaved(_, res) {
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&
+                        ($props.crudModel?.paginate ?? true) &&
                         CrudModelRef.vnPaginateRef.paginate()
                 "
                 @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0b0737332..ec2627e61 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -40,6 +40,8 @@ globals:
     noChanges: No changes to save
     changesToSave: You have changes pending to save
     confirmRemove: You are about to delete this row. Are you sure?
+    rowWillBeRemoved: This row will be removed
+    sureToContinue: Are you sure you want to continue?
     rowAdded: Row added
     rowRemoved: Row removed
     pleaseWait: Please wait...
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 819510cf6..5eb703021 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -39,6 +39,8 @@ globals:
     noChanges: Sin cambios que guardar
     changesToSave: Tienes cambios pendientes de guardar
     confirmRemove: Vas a eliminar este registro. ¿Continuar?
+    rowWillBeRemoved: Esta linea se eliminará
+    sureToContinue: ¿Seguro que quieres continuar?
     rowAdded: Fila añadida
     rowRemoved: Fila eliminada
     pleaseWait: Por favor espera...
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 537b9fe57..2085e7665 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -55,14 +55,12 @@ const exprBuilder = (param, value) => {
 
 const params = reactive({});
 const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
+    align: 'right',
+    sortable: false,
 };
 
 const columns = computed(() => [
     {
-        sortable: true,
-        align: 'left',
         label: t('item.fixedPrice.itemId'),
         name: 'itemId',
         ...defaultColumnAttrs,
@@ -72,6 +70,7 @@ const columns = computed(() => [
             component: 'input',
             type: 'number',
         },
+        columnClass: 'shrink',
     },
     {
         label: t('globals.name'),
@@ -98,8 +97,8 @@ const columns = computed(() => [
 
     {
         label: t('item.fixedPrice.minPrice'),
-        class: 'expand',
         field: 'minPrice',
+        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
         cardVisible: true,
@@ -116,17 +115,23 @@ const columns = computed(() => [
         format: ({ started }) => toDate(started),
         cardVisible: true,
         ...defaultColumnAttrs,
-        component: 'date',
-        columnClass: 'shrink',
+        columnField: {
+            component: 'date',
+            class: 'shrink',
+        },
+        columnClass: 'expand',
     },
     {
         label: t('item.fixedPrice.ended'),
         field: 'ended',
         name: 'ended',
         ...defaultColumnAttrs,
-        columnClass: 'shrink',
         cardVisible: true,
-        component: 'date',
+        columnField: {
+            component: 'date',
+            class: 'shrink',
+        },
+        columnClass: 'expand',
         format: (row) => toDate(row.ended),
     },
 
@@ -135,7 +140,14 @@ const columns = computed(() => [
         field: 'warehouseFk',
         name: 'warehouseFk',
         ...defaultColumnAttrs,
-        component: 'select',
+        columnClass: 'shrink',
+        columnFilter: {
+            component: 'select',
+        },
+        columnField: {
+            component: 'select',
+            class: 'expand',
+        },
         attrs: {
             options: warehousesOptions,
         },
@@ -230,8 +242,8 @@ function checkLastVisibleRow() {
 
     if (lastVisibleRow) {
         console.log('Última fila visible:', lastVisibleRow);
-        return lastVisibleRow;
     }
+    return lastVisibleRow;
 }
 const addRow = (original = null) => {
     // const original = checkLastVisibleRow();
@@ -262,33 +274,34 @@ const addRow = (original = null) => {
 
         // lastItem.value = {
         copy = {
+            id: 0,
             started: today,
             ended: nextWeek,
             hasMinPrice: 0,
+            $index: 0,
         };
 
         // return;
-    }
-
-    copy = {
-        $index: original.$index - 1,
-        itemFk: original.itemFk,
-        name: original.name,
-        subName: original.subName,
-        value5: original.value5,
-        value6: original.value6,
-        value7: original.value7,
-        value8: original.value8,
-        value9: original.value9,
-        value10: original.value10,
-        warehouseFk: original.warehouseFk,
-        rate2: original.rate2,
-        rate3: original.rate3,
-        hasMinPrice: original.hasMinPrice,
-        minPrice: original.minPrice,
-        started: Date.vnNew(),
-        ended: Date.vnNew(),
-    };
+    } else
+        copy = {
+            $index: original.$index - 1,
+            itemFk: original.itemFk,
+            name: original.name,
+            subName: original.subName,
+            value5: original.value5,
+            value6: original.value6,
+            value7: original.value7,
+            value8: original.value8,
+            value9: original.value9,
+            value10: original.value10,
+            warehouseFk: original.warehouseFk,
+            rate2: original.rate2,
+            rate3: original.rate3,
+            hasMinPrice: original.hasMinPrice,
+            minPrice: original.minPrice,
+            started: Date.vnNew(),
+            ended: Date.vnNew(),
+        };
     // lastItem.value = lastItemCopy;
     // tableRef.value.create.onDataSaved(lastItem);
     // nextTick(() => {
@@ -330,13 +343,14 @@ const removeFuturePrice = async () => {
 const quasar = useQuasar();
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'src/components/FetchData.vue';
+import CrudModel from 'src/components/CrudModel.vue';
 
 function confirmRemove(item) {
     quasar.dialog({
         component: VnConfirm,
         componentProps: {
-            title: t('This row will be removed'),
-            message: t('Do you want to remove?'),
+            title: t('globals.rowWillBeRemoved'),
+            message: t('globals.confirmDeletion'),
             promise: async () => removePrice(item.id),
         },
     });
@@ -345,8 +359,8 @@ function confirmRemoveFuturePrice(item) {
     quasar.dialog({
         component: VnConfirm,
         componentProps: {
-            title: t('This row will be removed'),
-            message: t('Do you want to remove?'),
+            title: t('globals.rowWillBeRemoved'),
+            message: t('globals.confirmDeletion'),
             promise: async () => removeFuturePrice(item.id),
         },
     });
@@ -369,9 +383,14 @@ onMounted(async () => {
 function handleOnDataSave({ CrudModelRef }) {
     const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
     // CrudModelRef.formData.unshift(roww);
-    CrudModelRef.formData.splice(original.$index, 0, copy);
+    if (original) {
+        CrudModelRef.formData.splice(original?.$index ?? 0, 0, copy);
+    } else {
+        CrudModelRef.insert(copy);
+        // CrudModelRef.reload();
+    }
     nextTick(() => {
-        highlightNewRow(original);
+        highlightNewRow(original ?? { $index: 0 });
     });
 }
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -436,6 +455,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 'row-key': 'id',
                 selection: 'multiple',
             }"
+            :crud-model="{
+                paginate: false,
+            }"
             v-model:selected="rowsSelected"
             :row-click="saveOnRowChange"
             :create-as-dialog="false"
@@ -511,7 +533,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row" style="width: 130px">
+                    <div class="row" style="width: 115px">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -567,8 +589,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
             <template #column-warehouseFk="props">
-                <QTd class="col" style="max-width: 180px">
+                <QTd class="col">
                     <VnSelect
+                        style="max-width: 150px"
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
@@ -615,13 +638,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 .q-table th,
 .q-table td {
     padding-inline: 5px !important;
+    // text-align: -webkit-right;
 }
 .q-table tbody td {
     max-width: none;
 
     .q-td.col {
         & .vnInputDate {
-            min-width: 130px;
+            min-width: 90px;
         }
         & div.row {
             & .q-checkbox {
@@ -656,7 +680,6 @@ tbody tr.highlight .q-td {
 es:
     Add fixed price: Añadir precio fijado
     Edit fixed price(s): Editar precio(s) fijado(s)
-    This row will be removed: Esta linea se eliminará
     Are you sure you want to continue?: ¿Seguro que quieres continuar?
     Delete: Eliminar
 </i18n>
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 9b3c7f052..f2e83ba3a 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -14,10 +14,6 @@ defineProps({
         type: String,
         required: true,
     },
-    warehousesOptions: {
-        type: Array,
-        default: () => [],
-    },
 });
 import { useRoute } from 'vue-router';
 const route = useRoute();
@@ -39,6 +35,12 @@ const pushParam = (param) => ({
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+    />
     <FetchData
         url="TicketRequests/getItemTypeWorker"
         limit="30"
diff --git a/src/pages/Order/Card/OrderDescriptorMenu.vue b/src/pages/Order/Card/OrderDescriptorMenu.vue
index 2e36aa3c5..2695da4e5 100644
--- a/src/pages/Order/Card/OrderDescriptorMenu.vue
+++ b/src/pages/Order/Card/OrderDescriptorMenu.vue
@@ -23,7 +23,7 @@ function confirmRemove() {
         .dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('confirmDeletion'),
+                title: t('globals.confirmDeletion'),
                 message: t('confirmDeletionMessage'),
                 promise: remove,
             },
@@ -52,12 +52,10 @@ async function remove() {
 <i18n>
 en:
     deleteOrder: Delete order
-    confirmDeletion: Confirm deletion
     confirmDeletionMessage: Are you sure you want to delete this order?
 
 es:
     deleteOrder: Eliminar pedido
-    confirmDeletion: Confirmar eliminación
     confirmDeletionMessage: Seguro que quieres eliminar este pedido?
 
 </i18n>

From a8057b47dcde8623fa8b9902349884002a146409 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 6 Sep 2024 14:06:30 +0200
Subject: [PATCH 110/162] feat: updates

---
 src/components/VnTable/VnTable.vue      |   1 -
 src/pages/Item/ItemFixedPrice.vue       | 111 ++++++++----------------
 src/pages/Item/ItemFixedPriceFilter.vue |  46 +++++-----
 3 files changed, 63 insertions(+), 95 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 20482c494..6745a2f49 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -373,7 +373,6 @@ function handleOnDataSaved(_, res) {
             <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
         <template #body="{ rows }">
-            {{ rows }}
             <QTable
                 v-bind="table"
                 class="vnTable"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 2085e7665..e042cb859 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -2,7 +2,6 @@
 import { onMounted, ref, reactive, onUnmounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -12,7 +11,8 @@ import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
 import { useQuasar } from 'quasar';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
 import { tMobile } from 'src/composables/tMobile';
-
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import FetchData from 'src/components/FetchData.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
@@ -33,30 +33,13 @@ const { notify } = useNotify();
 const editTableCellDialogRef = ref(null);
 const user = state.getUser();
 const fixedPrices = ref([]);
-const fixedPricesOriginalData = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return { 'i.name': { like: `%${value}%` } };
-        case 'itemFk':
-        case 'warehouseFk':
-        case 'rate2':
-        case 'rate3':
-            param = `fp.${param}`;
-            return { [param]: value };
-        case 'minPrice':
-            param = `i.${param}`;
-            return { [param]: value };
-    }
-};
-
 const params = reactive({});
 const defaultColumnAttrs = {
-    align: 'right',
-    sortable: false,
+    align: 'left',
+    sortable: true,
 };
 
 const columns = computed(() => [
@@ -86,6 +69,16 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
+        columnField: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
+        columnFilter: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -93,6 +86,16 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
+        columnField: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
+        columnFilter: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
     },
 
     {
@@ -107,6 +110,11 @@ const columns = computed(() => [
             component: 'input',
             type: 'number',
         },
+        columnFilter: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
     },
     {
         label: t('item.fixedPrice.started'),
@@ -119,6 +127,9 @@ const columns = computed(() => [
             component: 'date',
             class: 'shrink',
         },
+        columnFilter: {
+            component: 'date',
+        },
         columnClass: 'expand',
     },
     {
@@ -131,6 +142,9 @@ const columns = computed(() => [
             component: 'date',
             class: 'shrink',
         },
+        columnFilter: {
+            component: 'date',
+        },
         columnClass: 'expand',
         format: (row) => toDate(row.ended),
     },
@@ -175,20 +189,6 @@ const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
         : { 'update:modelValue': () => upsertPrice(props, resetMinPrice) };
 };
 
-const validations = (row, rowIndex, col) => {
-    const isNew = !row.id;
-    // Si la row no tiene id significa que fue agregada con addRow y no se ha guardado en la base de datos
-    // Si isNew es falso no se checkea si el valor es igual a la original
-    if (!isNew)
-        // if (fixedPricesOriginalData.value[rowIndex][col.field] == row[col.field])
-        return false;
-
-    const requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
-    return requiredFields.every(
-        (field) => row[field] !== null && row[field] !== undefined
-    );
-};
-
 const updateMinPrice = async (value, props) => {
     // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
     // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
@@ -246,33 +246,13 @@ function checkLastVisibleRow() {
     return lastVisibleRow;
 }
 const addRow = (original = null) => {
-    // const original = checkLastVisibleRow();
     let copy = null;
-    // if (!fixedPrices.value || fixedPrices.value.length === 0) {
-    //     fixedPrices.value = [];
-
-    //     const today = Date.vnNew();
-    //     const millisecsInDay = 86400000;
-    //     const daysInWeek = 7;
-    //     const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
-
-    //     const newPrice = {
-    //         started: today,
-    //         ended: nextWeek,
-    //         hasMinPrice: 0,
-    //     };
-
-    //     fixedPricesOriginalData.value.push({ ...newPrice });
-    //     fixedPrices.value.push({ ...newPrice });
-    //     return;
-    // }
     if (!original) {
         const today = Date.vnNew();
         const millisecsInDay = 86400000;
         const daysInWeek = 7;
         const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
 
-        // lastItem.value = {
         copy = {
             id: 0,
             started: today,
@@ -280,8 +260,6 @@ const addRow = (original = null) => {
             hasMinPrice: 0,
             $index: 0,
         };
-
-        // return;
     } else
         copy = {
             $index: original.$index - 1,
@@ -302,17 +280,8 @@ const addRow = (original = null) => {
             started: Date.vnNew(),
             ended: Date.vnNew(),
         };
-    // lastItem.value = lastItemCopy;
-    // tableRef.value.create.onDataSaved(lastItem);
-    // nextTick(() => {
-    //     highlightNewRow(fixedPrice);
-    // });
-    // delete lastItemCopy.id;
-    // fixedPricesOriginalData.value.splice(lastvisible, 0, lastItemCopy);
-    // fixedPrices.value.unshift(lastItemCopy);
     return { original, copy };
 };
-const lastItem = ref(null);
 function highlightNewRow({ $index: index }) {
     const row = document
         .getElementsByClassName('q-table')[0]
@@ -341,9 +310,6 @@ const removeFuturePrice = async () => {
     }
 };
 const quasar = useQuasar();
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import FetchData from 'src/components/FetchData.vue';
-import CrudModel from 'src/components/CrudModel.vue';
 
 function confirmRemove(item) {
     quasar.dialog({
@@ -382,18 +348,17 @@ onMounted(async () => {
 });
 function handleOnDataSave({ CrudModelRef }) {
     const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
-    // CrudModelRef.formData.unshift(roww);
     if (original) {
         CrudModelRef.formData.splice(original?.$index ?? 0, 0, copy);
     } else {
         CrudModelRef.insert(copy);
-        // CrudModelRef.reload();
     }
     nextTick(() => {
         highlightNewRow(original ?? { $index: 0 });
     });
 }
 onUnmounted(() => (stateStore.rightDrawer = false));
+const itemFixedPriceFilterRef = ref();
 </script>
 
 <template>
@@ -407,7 +372,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #right-panel>
             <ItemFixedPriceFilter
                 data-key="ItemFixedPrices"
-                :warehouses-options="warehousesOptions"
+                ref="itemFixedPriceFilterRef"
             />
         </template>
     </RightMenu>
@@ -443,7 +408,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             url="FixedPrices/filter"
             :order="['name ASC', 'itemFk DESC']"
             save-url="FixedPrices/crud"
-            :filter="{ where: { warehouseFk: user.warehouseFk } }"
+            :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
             dense
             :columns="columns"
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index f2e83ba3a..b9fdc57be 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -9,38 +9,36 @@ import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
 
-defineProps({
+const props = defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-import { useRoute } from 'vue-router';
-const route = useRoute();
 
 const itemTypeWorkersOptions = ref([]);
-// const sanitizeParam = (param) => {
-//     const params = JSON.parse(route?.query?.table);
-//     return params[param] ?? 'false';
-// };
 const $params = ref({});
-// onMounted(() => {
-//     ['mine', 'hasMinPrice', 'showBadDates'].forEach(
-//         (tag) => ($params.value[tag] = sanitizeParam(tag))
-//     );
-// });
 const pushParam = (param) => ({
     param: { [param]: $params.value[param] },
 });
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return { 'i.name': { like: `%${value}%` } };
+        case 'itemFk':
+        case 'warehouseFk':
+        case 'rate2':
+        case 'rate3':
+            param = `fp.${param}`;
+            return { [param]: value };
+        case 'minPrice':
+            param = `i.${param}`;
+            return { [param]: value };
+    }
+};
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-        url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-    />
     <FetchData
         url="TicketRequests/getItemTypeWorker"
         limit="30"
@@ -48,7 +46,11 @@ const pushParam = (param) => ({
         :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
         @on-fetch="(data) => (itemTypeWorkersOptions = data)"
     />
-    <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
+    <ItemsFilterPanel
+        :data-key="props.dataKey"
+        :custom-tags="['tags']"
+        search-url="table"
+    >
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
                 <QItemSection>
@@ -69,9 +71,11 @@ const pushParam = (param) => ({
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
+                        url="Warehouses"
+                        auto-load
+                        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
                         :label="t('components.itemsFilterPanel.warehouseFk')"
                         v-model="params.warehouseFk"
-                        :options="warehousesOptions"
                         option-label="name"
                         option-value="id"
                         dense

From 31b8088b5f36bbf2af200e1be615dc7677249f54 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 6 Sep 2024 14:41:38 +0200
Subject: [PATCH 111/162] perf: improve ItemFixedPricefilterPanel

---
 src/components/ItemsFilterPanel.vue     |  4 ++--
 src/pages/Item/ItemFixedPriceFilter.vue | 31 ++++++++-----------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index 743c2c9d1..8449f9354 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -159,8 +159,8 @@ const removeTag = (index, params, search) => {
     />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :expr-builder="exprBuilder"
-        :custom-tags="customTags"
+        :expr-builder="props.exprBuilder"
+        :custom-tags="props.customTags"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index b9fdc57be..84eefaed3 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -17,10 +17,6 @@ const props = defineProps({
 });
 
 const itemTypeWorkersOptions = ref([]);
-const $params = ref({});
-const pushParam = (param) => ({
-    param: { [param]: $params.value[param] },
-});
 const exprBuilder = (param, value) => {
     switch (param) {
         case 'name':
@@ -46,11 +42,7 @@ const exprBuilder = (param, value) => {
         :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
         @on-fetch="(data) => (itemTypeWorkersOptions = data)"
     />
-    <ItemsFilterPanel
-        :data-key="props.dataKey"
-        :custom-tags="['tags']"
-        search-url="table"
-    >
+    <ItemsFilterPanel :data-key="props.dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
                 <QItemSection>
@@ -110,27 +102,24 @@ const exprBuilder = (param, value) => {
                 <QItemSection>
                     <QCheckbox
                         :label="t('components.itemsFilterPanel.mine')"
-                        v-model="$params.mine"
-                        :true-value="'true'"
-                        :false-value="'false'"
-                        @update:model-value="searchFn(pushParam('mine'))"
+                        v-model="params.mine"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
                     />
 
                     <QCheckbox
-                        v-model="$params.showBadDates"
+                        v-model="params.showBadDates"
                         :label="t(`components.itemsFilterPanel.showBadDates`)"
-                        :true-value="'true'"
-                        :false-value="'false'"
-                        @update:model-value="searchFn(pushParam('showBadDates'))"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
                     >
                     </QCheckbox>
 
                     <QCheckbox
                         :label="t('components.itemsFilterPanel.hasMinPrice')"
-                        v-model="$params.hasMinPrice"
-                        :true-value="'true'"
-                        :false-value="'false'"
-                        @update:model-value="searchFn(pushParam('hasMinPrice'))"
+                        v-model="params.hasMinPrice"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>

From 3276548f883cc9355d19ce839ba529dc781ab74b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 6 Sep 2024 14:47:29 +0200
Subject: [PATCH 112/162] fix: editTableOptions

---
 src/pages/Item/ItemFixedPrice.vue | 79 +++++++++++++++++++++++++------
 1 file changed, 64 insertions(+), 15 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index e042cb859..c5d7014f3 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -180,6 +180,61 @@ const columns = computed(() => [
     },
 ]);
 
+const editTableFieldsOptions = [
+    {
+        field: 'rate2',
+        label: t('item.fixedPrice.groupingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'rate3',
+        label: t('item.fixedPrice.packingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'minPrice',
+        label: t('item.fixedPrice.minPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'hasMinPrice',
+        label: t('item.fixedPrice.hasMinPrice'),
+        component: 'checkbox',
+        attrs: {
+            'false-value': 0,
+            'true-value': 1,
+        },
+    },
+    {
+        field: 'started',
+        label: t('item.fixedPrice.started'),
+        component: 'date',
+    },
+    {
+        field: 'ended',
+        label: t('item.fixedPrice.ended'),
+        component: 'date',
+    },
+    {
+        field: 'warehouseFk',
+        label: t('item.fixedPrice.warehouse'),
+        component: 'select',
+        attrs: {
+            options: [],
+            'option-label': 'name',
+            'option-value': 'id',
+        },
+    },
+];
 const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
     return inputType === 'text'
         ? {
@@ -298,11 +353,12 @@ const openEditTableCellDialog = () => {
 };
 const onEditCellDataSaved = async () => {
     rowsSelected.value = [];
+    tableRef.value.reload();
 };
 const removeFuturePrice = async () => {
     try {
         rowsSelected.value.forEach(({ id }) => {
-            const rowIndex = fixedPrices.value.findIndex((r) => r.id === id);
+            const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
             removePrice(id, rowIndex);
         });
     } catch (err) {
@@ -311,27 +367,18 @@ const removeFuturePrice = async () => {
 };
 const quasar = useQuasar();
 
-function confirmRemove(item) {
+function confirmRemove(item, isFuture) {
+    const promise = async () =>
+        isFuture ? removeFuturePrice(item.id) : removePrice(item.id);
     quasar.dialog({
         component: VnConfirm,
         componentProps: {
             title: t('globals.rowWillBeRemoved'),
             message: t('globals.confirmDeletion'),
-            promise: async () => removePrice(item.id),
+            promise,
         },
     });
 }
-function confirmRemoveFuturePrice(item) {
-    quasar.dialog({
-        component: VnConfirm,
-        componentProps: {
-            title: t('globals.rowWillBeRemoved'),
-            message: t('globals.confirmDeletion'),
-            promise: async () => removeFuturePrice(item.id),
-        },
-    });
-}
-
 const removePrice = async (id) => {
     try {
         await axios.delete(`FixedPrices/${id}`);
@@ -393,7 +440,7 @@ const itemFixedPriceFilterRef = ref();
                 color="primary"
                 icon="delete"
                 flat
-                @click="confirmRemoveFuturePrice"
+                @click="(row) => confirmRemove(row, true)"
                 :title="t('globals.remove')"
                 v-if="rowsSelected.length"
             />
@@ -597,6 +644,8 @@ const itemFixedPriceFilterRef = ref();
                 @on-data-saved="onEditCellDataSaved()"
             />
         </QDialog>
+        {{ rowsSelected }}
+        **{{ editTableFieldsOptions }}
     </QPage>
 </template>
 <style lang="scss">

From 27f25f611fe14eb3d1c9b0e44b393c90b380fb34 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 6 Sep 2024 14:57:10 +0200
Subject: [PATCH 113/162] refs #7283 fix ItemDescriptor warehouse

---
 src/pages/Item/Card/ItemDescriptor.vue      | 19 +++++++++++++------
 src/pages/Item/Card/ItemDescriptorImage.vue |  1 -
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 5d7f1481f..c9766944e 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -47,7 +47,7 @@ const router = useRouter();
 const { t } = useI18n();
 const state = useState();
 const user = state.getUser();
-
+const warehouseConfig = ref(null);
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -58,16 +58,23 @@ const visible = ref(null);
 const salixUrl = ref();
 
 onMounted(async () => {
-    updateStock();
     salixUrl.value = await getUrl('');
+    await getItemConfigs();
+    await updateStock();
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => {
+const setData = async (entity) => {
     if (!entity) return;
     data.value = useCardDescription(entity.name, entity.id);
+    await updateStock();
 };
 
+const getItemConfigs = async () => {
+    const { data } = await axios.get('ItemConfigs/findOne');
+    if (!data) return;
+    return (warehouseConfig.value = data.warehouseFk);
+};
 const updateStock = async () => {
     try {
         available.value = null;
@@ -77,10 +84,10 @@ const updateStock = async () => {
             warehouseFk: $props.warehouseFk,
             dated: $props.dated,
         };
-        if (!params.warehouseFk) {
-            params.warehouseFk = user.value.warehouseFk;
-        }
 
+        if (!params.warehouseFk) {
+            params.warehouseFk = warehouseConfig.value;
+        }
         const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
             params,
         });
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index 71977fb24..a4ef22ce3 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -47,7 +47,6 @@ const getWarehouseName = async (warehouseFk) => {
     const filter = {
         where: { id: warehouseFk },
     };
-
     const { data } = await axios.get('Warehouses/findOne', {
         params: {
             filter: JSON.stringify(filter),

From 3693ba0c995bf3467b760760e93747815a7301da Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 15:37:33 +0200
Subject: [PATCH 114/162] feat: refs #4074 drop useless code

---
 src/pages/Supplier/Card/SupplierSummary.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 04f763c15..5791db1eb 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useAcl } from 'src/composables/useAcl';
 import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
@@ -31,11 +30,7 @@ async function setData(data) {
     }
 }
 
-
-
-const getUrl = (section) => 
-    useAcl().hasAny('Supplier','*','WRITE') ? `#/supplier/${entityId.value}/${section}`:'';
-
+const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
 </script>
 
 <template>

From d0131dd5521ad83d16694ee55805c773c3b74274 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 15:52:06 +0200
Subject: [PATCH 115/162] fix: refs #4074 drop wrong acl

---
 src/router/modules/ticket.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 4074f089f..698f02554 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -53,7 +53,6 @@ export default {
                     meta: {
                         title: 'createTicket',
                         icon: 'vn:ticketAdd',
-                        roles: ['developer'],
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },

From b87e7ce75025020a72e5039097ee22e8583a51a4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 17:01:23 +0200
Subject: [PATCH 116/162] refactor: refs #4074 use VnTitle

---
 src/css/app.scss                    |   4 +
 src/pages/Item/Card/ItemSummary.vue | 125 +++++++++-------------------
 2 files changed, 44 insertions(+), 85 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 357c9ecdb..ecffd576c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -37,6 +37,10 @@ a {
 .link {
     color: $color-link;
     cursor: pointer;
+
+    &--white {
+        color: white;
+    }
 }
 
 .tx-color-link {
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 1571a903e..081eb2afb 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -7,9 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-
-import { useRole } from 'src/composables/useRole';
-import { useAcl } from 'src/composables/useAcl';
+import VnTitle from 'src/components/common/VnTitle.vue';
 
 const $props = defineProps({
     id: {
@@ -22,13 +20,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-
-const canEdit = computed(() => useAcl().hasAny('Item', '*', 'WRITE'));
-
-const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
-
 </script>
-
 <template>
     <CardSummary
         ref="summary"
@@ -37,13 +29,15 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
         data-key="ItemSummary"
     >
         <template #header-left>
-            <router-link
-                v-if="route.name !== 'ItemSummary'"
+            <QBtn
+                v-if="$route.name !== 'ItemSummary'"
                 :to="{ name: 'ItemSummary', params: { id: entityId } }"
-                class="header link"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
+                class="header link--white"
+                icon="open_in_new"
+                flat
+                dense
+                round
+            />
         </template>
         <template #header="{ entity: { item } }">
             {{ item.id }} - {{ item.name }}
@@ -58,15 +52,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.basicData') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.basicData')"
+                />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
                 <VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
@@ -97,15 +86,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.otherData') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.otherData')"
+                />
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
                     :value="item.intrastat.id"
@@ -130,15 +114,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTags', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit || isReplenisher }"
-                >
-                    {{ t('item.summary.tags') }}
-                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/tags`"
+                    :text="t('item.summary.tags')"
+                />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -147,29 +126,14 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one" v-if="item.description">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.description') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
-                <p>
-                    {{ item.description }}
-                </p>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.description')"
+                />
+                <p v-text="item.description" />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTax', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.tax') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
@@ -178,15 +142,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBotanical', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.botanical') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/botanical`"
+                    :text="t('item.summary.botanical')"
+                />
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
                 <VnLv
                     :label="t('item.summary.specie')"
@@ -194,23 +153,19 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBarcode', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit || isReplenisher }"
-                >
-                    {{ t('item.summary.barcode') }}
-                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
-                </component>
-                <p v-for="(barcode, index) in item.itemBarcode" :key="index">
-                    {{ barcode.code }}
-                </p>
+                <VnTitle
+                    :url="`#/item/${entityId}/barcode`"
+                    :text="t('item.summary.barcode')"
+                />
+                <p
+                    v-for="(barcode, index) in item.itemBarcode"
+                    :key="index"
+                    v-text="barcode.code"
+                />
             </QCard>
         </template>
     </CardSummary>
 </template>
-
 <i18n>
 en:
     Este artículo necesita una foto: Este artículo necesita una foto

From 754f04794396e9da4c9192497706bb6e977bbdce Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 7 Sep 2024 21:55:08 +0200
Subject: [PATCH 117/162] perf: order components

---
 src/pages/Item/ItemFixedPrice.vue | 41 ++++++++++++-------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index c5d7014f3..951dbf4b2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -24,24 +24,31 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import { QCheckbox } from 'quasar';
 
+const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const state = useState();
 const { notify } = useNotify();
-
+const tableRef = ref();
 const editTableCellDialogRef = ref(null);
 const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
 
+const itemFixedPriceFilterRef = ref();
+
 const params = reactive({});
 const defaultColumnAttrs = {
     align: 'left',
     sortable: true,
 };
-
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    params.warehouseFk = user.value.warehouseFk;
+});
+onUnmounted(() => (stateStore.rightDrawer = false));
 const columns = computed(() => [
     {
         label: t('item.fixedPrice.itemId'),
@@ -255,13 +262,12 @@ const updateMinPrice = async (value, props) => {
     });
 };
 
-const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
+const upsertPrice = async ({ row }, resetMinPrice = false) => {
     // if (!validations(row, rowIndex, col)) return;
 
     try {
         if (resetMinPrice) row.hasMinPrice = 0;
         row = await upsertFixedPrice(row);
-        // fixedPricesOriginalData.value[rowIndex][col.field] = row[col.field];
     } catch (err) {
         console.error('Error editing price', err);
     }
@@ -281,14 +287,11 @@ async function saveOnRowChange(row) {
         await upsertFixedPrice(rowsSelected.value[0]);
     rowsSelected.value = [row];
 }
-const tableRef = ref();
+
 function checkLastVisibleRow() {
-    const rows = document
-        .getElementsByClassName('q-table')[0]
-        .querySelectorAll('tr.cursor-pointer');
     let lastVisibleRow = null;
 
-    rows.forEach((row, index) => {
+    getTableRows().forEach((row, index) => {
         const rect = row.getBoundingClientRect();
         if (rect.top >= 0 && rect.bottom <= window.innerHeight) {
             lastVisibleRow = index;
@@ -337,10 +340,10 @@ const addRow = (original = null) => {
         };
     return { original, copy };
 };
+const getTableRows = () =>
+    document.getElementsByClassName('q-table')[0].querySelectorAll('tr.cursor-pointer');
 function highlightNewRow({ $index: index }) {
-    const row = document
-        .getElementsByClassName('q-table')[0]
-        .querySelectorAll('tr.cursor-pointer')[index];
+    const row = getTableRows()[index];
     if (row) {
         row.classList.add('highlight');
         setTimeout(() => {
@@ -365,8 +368,6 @@ const removeFuturePrice = async () => {
         console.error('Error removing price', err);
     }
 };
-const quasar = useQuasar();
-
 function confirmRemove(item, isFuture) {
     const promise = async () =>
         isFuture ? removeFuturePrice(item.id) : removePrice(item.id);
@@ -389,10 +390,6 @@ const removePrice = async (id) => {
     }
 };
 
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-    params.warehouseFk = user.value.warehouseFk;
-});
 function handleOnDataSave({ CrudModelRef }) {
     const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
     if (original) {
@@ -404,8 +401,6 @@ function handleOnDataSave({ CrudModelRef }) {
         highlightNewRow(original ?? { $index: 0 });
     });
 }
-onUnmounted(() => (stateStore.rightDrawer = false));
-const itemFixedPriceFilterRef = ref();
 </script>
 
 <template>
@@ -629,7 +624,7 @@ const itemFixedPriceFilterRef = ref();
                         "
                     >
                         <QTooltip class="text-no-wrap">
-                            {{ t('Delete') }}
+                            {{ t('globals.delete') }}
                         </QTooltip>
                     </QIcon>
                 </QTd>
@@ -644,8 +639,6 @@ const itemFixedPriceFilterRef = ref();
                 @on-data-saved="onEditCellDataSaved()"
             />
         </QDialog>
-        {{ rowsSelected }}
-        **{{ editTableFieldsOptions }}
     </QPage>
 </template>
 <style lang="scss">
@@ -694,6 +687,4 @@ tbody tr.highlight .q-td {
 es:
     Add fixed price: Añadir precio fijado
     Edit fixed price(s): Editar precio(s) fijado(s)
-    Are you sure you want to continue?: ¿Seguro que quieres continuar?
-    Delete: Eliminar
 </i18n>

From 53e6c67ff9b310b972e19ebfb6939233467704a6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 8 Sep 2024 12:56:40 +0200
Subject: [PATCH 118/162] perf: minor clean code

---
 src/pages/Item/ItemFixedPrice.vue | 41 ++++++++++++++-----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 951dbf4b2..59a3e74db 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -263,8 +263,6 @@ const updateMinPrice = async (value, props) => {
 };
 
 const upsertPrice = async ({ row }, resetMinPrice = false) => {
-    // if (!validations(row, rowIndex, col)) return;
-
     try {
         if (resetMinPrice) row.hasMinPrice = 0;
         row = await upsertFixedPrice(row);
@@ -272,6 +270,7 @@ const upsertPrice = async ({ row }, resetMinPrice = false) => {
         console.error('Error editing price', err);
     }
 };
+
 async function upsertFixedPrice(row) {
     try {
         const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
@@ -280,6 +279,7 @@ async function upsertFixedPrice(row) {
         console.error('Error editing price', err);
     }
 }
+
 async function saveOnRowChange(row) {
     if (rowsSelected.value.length > 1) return;
     if (rowsSelected.value[0]?.id === row.id) return;
@@ -298,11 +298,9 @@ function checkLastVisibleRow() {
         }
     });
 
-    if (lastVisibleRow) {
-        console.log('Última fila visible:', lastVisibleRow);
-    }
     return lastVisibleRow;
 }
+
 const addRow = (original = null) => {
     let copy = null;
     if (!original) {
@@ -340,8 +338,10 @@ const addRow = (original = null) => {
         };
     return { original, copy };
 };
+
 const getTableRows = () =>
     document.getElementsByClassName('q-table')[0].querySelectorAll('tr.cursor-pointer');
+
 function highlightNewRow({ $index: index }) {
     const row = getTableRows()[index];
     if (row) {
@@ -354,10 +354,12 @@ function highlightNewRow({ $index: index }) {
 const openEditTableCellDialog = () => {
     editTableCellDialogRef.value.show();
 };
+
 const onEditCellDataSaved = async () => {
     rowsSelected.value = [];
     tableRef.value.reload();
 };
+
 const removeFuturePrice = async () => {
     try {
         rowsSelected.value.forEach(({ id }) => {
@@ -368,6 +370,7 @@ const removeFuturePrice = async () => {
         console.error('Error removing price', err);
     }
 };
+
 function confirmRemove(item, isFuture) {
     const promise = async () =>
         isFuture ? removeFuturePrice(item.id) : removePrice(item.id);
@@ -380,6 +383,7 @@ function confirmRemove(item, isFuture) {
         },
     });
 }
+
 const removePrice = async (id) => {
     try {
         await axios.delete(`FixedPrices/${id}`);
@@ -389,6 +393,13 @@ const removePrice = async (id) => {
         console.error('Error removing price', err);
     }
 };
+const dateStyle = (date) =>
+    date
+        ? {
+              'bg-color': 'warning',
+              'is-outlined': true,
+          }
+        : {};
 
 function handleOnDataSave({ CrudModelRef }) {
     const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
@@ -566,14 +577,7 @@ function handleOnDataSave({ CrudModelRef }) {
                         :show-event="true"
                         v-model="props.row.started"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="
-                            isBigger(props.row.started)
-                                ? {
-                                      'bg-color': 'warning',
-                                      'is-outlined': true,
-                                  }
-                                : {}
-                        "
+                        v-bind="dateStyle(isBigger(props.row.started))"
                     />
                 </QTd>
             </template>
@@ -584,14 +588,7 @@ function handleOnDataSave({ CrudModelRef }) {
                         :show-event="true"
                         v-model="props.row.ended"
                         v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="
-                            isLower(props.row.started)
-                                ? {
-                                      'bg-color': 'warning',
-                                      'is-outlined': true,
-                                  }
-                                : {}
-                        "
+                        v-bind="dateStyle(isLower(props.row.started))"
                     />
                 </QTd>
             </template>
@@ -617,7 +614,7 @@ function handleOnDataSave({ CrudModelRef }) {
                         color="primary"
                         @click.stop="
                             openConfirmationModal(
-                                t('This row will be removed'),
+                                t('globals.rowWillBeRemoved'),
                                 t('Do you want to clone this item?'),
                                 () => removePrice(row.id, rowIndex)
                             )

From ba7497f055f9248b8bbf24032b6965abd3c4e8b0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 08:47:44 +0200
Subject: [PATCH 119/162] fix: refs #7889 fixed shortcut test

---
 .../integration/vnComponent/VnShortcut.spec.js   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/cypress/integration/vnComponent/VnShortcut.spec.js b/test/cypress/integration/vnComponent/VnShortcut.spec.js
index 3ab95340e..59dd397c3 100644
--- a/test/cypress/integration/vnComponent/VnShortcut.spec.js
+++ b/test/cypress/integration/vnComponent/VnShortcut.spec.js
@@ -9,23 +9,23 @@ describe('VnShortcuts', () => {
         monitor: 'm',
         order: 'p',
         supplier: 'p',
-        entry: '€',
+        entry: 'e',
         zone: 'z',
         account: 'u',
     };
-    beforeEach(() => {
-        cy.login('developer');
-        cy.visit('/');
-    });
 
     it('should visit each module', () => {
+        cy.login('developer');
+        cy.visit('/');
         Object.keys(modules).forEach((module) => {
             const shortcut = modules[module];
 
-            cy.get('body').type(`{ctrl}{alt}${shortcut}`);
+            cy.get('body').click();
+            cy.get('body').type(`{ctrl+alt+${shortcut}}`);
 
-            cy.url().should('include', module);
-            cy.get('body').should('be.visible');
+            if (shortcut != 'u' && shortcut != 'o') {
+                cy.get('.q-table__middle').should('be.visible');
+            }
 
             cy.visit('/');
         });

From 2bd80b2ee7abf9cc4a3973a20dde1226ad021574 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 09:45:30 +0200
Subject: [PATCH 120/162] perf: refs #7889 perf shortcut test

---
 .../vnComponent/VnShortcut.spec.js            | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/cypress/integration/vnComponent/VnShortcut.spec.js b/test/cypress/integration/vnComponent/VnShortcut.spec.js
index 59dd397c3..b49b4e964 100644
--- a/test/cypress/integration/vnComponent/VnShortcut.spec.js
+++ b/test/cypress/integration/vnComponent/VnShortcut.spec.js
@@ -1,4 +1,5 @@
 /// <reference types="cypress" />
+
 describe('VnShortcuts', () => {
     const modules = {
         item: 'a',
@@ -7,27 +8,26 @@ describe('VnShortcuts', () => {
         claim: 'r',
         worker: 'w',
         monitor: 'm',
-        order: 'p',
+        order: 'o',
         supplier: 'p',
         entry: 'e',
         zone: 'z',
         account: 'u',
     };
-
-    it('should visit each module', () => {
+    beforeEach(() => {
         cy.login('developer');
         cy.visit('/');
-        Object.keys(modules).forEach((module) => {
-            const shortcut = modules[module];
-
-            cy.get('body').click();
-            cy.get('body').type(`{ctrl+alt+${shortcut}}`);
-
-            if (shortcut != 'u' && shortcut != 'o') {
-                cy.get('.q-table__middle').should('be.visible');
-            }
-
-            cy.visit('/');
-        });
     });
+
+    for (const [module, shortcut] of Object.entries(modules)) {
+        it(`should visit ${module} module`, () => {
+            cy.get('body').trigger('keydown', {
+                ctrlKey: true,
+                altKey: true,
+                code: `Key${shortcut.toUpperCase()}`,
+            });
+
+            cy.url().should('include', module);
+        });
+    }
 });

From c978cca8c5c760f03c67d3cf1693a4f998d3d492 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 11:35:49 +0200
Subject: [PATCH 121/162] refactor: refs #4074 useAcl in navigationStore &
 router

---
 src/components/common/VnSelectDialog.vue |  8 ++------
 src/composables/useAcl.js                | 21 +++++++++++++--------
 src/router/index.js                      | 11 ++++-------
 src/router/modules/account.js            |  6 +++---
 src/stores/useNavigationStore.js         |  6 +++---
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 0ade82bda..7338e752d 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -31,12 +31,8 @@ const acl = useAcl();
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
-    const hasMissingAcl = $props.acls.some(
-        (x) => !acl.hasAny(x.model, x.props, x.accessType)
-    );
-    const hasRequiredRole = role.hasAny($props.rolesAllowedToCreate);
-    if ($props.acls.length) return !hasMissingAcl;
-    return hasRequiredRole;
+    if ($props.acls.length) return acl.hasAny($props.acls);
+    return role.hasAny($props.rolesAllowedToCreate);
 });
 </script>
 
diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index bebeda039..539e89622 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,14 +16,19 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, props, accessType) {
-        const acls = state.getAcls().value[model];
-        Array.isArray(props) || (props = [props]);
-        if (acls) 
-            return ['*', ...props].some((key) => {
-                const acl = acls[key];
-                return acl && (acl['*'] || acl[accessType]);
-            });
+    function hasAny(acls) {
+        if (!Array.isArray(acls)) acls = [acls];
+        for (const acl of acls) {
+            let { model, props, accessType } = acl;
+            const modelAcls = state.getAcls().value[model];
+            Array.isArray(props) || (props = [props]);
+            if (modelAcls)
+                return ['*', ...props].some((key) => {
+                    const acl = modelAcls[key];
+                    return acl && (acl['*'] || acl[accessType]);
+                });
+        }
+        return false;
     }
 
     return {
diff --git a/src/router/index.js b/src/router/index.js
index 686da2dde..18541c0b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,15 +60,12 @@ export default route(function (/* { store, ssrContext } */) {
                 await useTokenConfig().fetch();
             }
             const matches = to.matched;
-            const hasRequiredRoles = matches.every((route) => {
+            const hasRequiredAcls = matches.every((route) => {
                 const meta = route.meta;
-                if (meta && meta.roles) return useRole().hasAny(meta.roles);
-                return true;
+                if (!meta?.acls) return true;
+                return useAcl().hasAny(meta.acls);
             });
-
-            if (!hasRequiredRoles) {
-                return next({ path: '/' });
-            }
+            if (!hasRequiredAcls) return next({ path: '/' });
         }
 
         next();
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index cfec2b95d..bb1c38c8e 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -79,7 +79,7 @@ export default {
                     meta: {
                         title: 'accounts',
                         icon: 'accessibility',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'Account', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountAccounts.vue'),
                 },
@@ -89,7 +89,7 @@ export default {
                     meta: {
                         title: 'ldap',
                         icon: 'account_tree',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'LdapConfig', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountLdap.vue'),
                 },
@@ -99,7 +99,7 @@ export default {
                     meta: {
                         title: 'samba',
                         icon: 'preview',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'SambaConfig', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountSamba.vue'),
                 },
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 961e80377..784e5063a 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 import { toLowerCamel } from 'src/filters';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import routes from 'src/router/modules';
 
 export const useNavigationStore = defineStore('navigationStore', () => {
@@ -26,7 +26,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'zone',
     ];
     const pinnedModules = ref([]);
-    const role = useRole();
+    const acl = useAcl();
 
     function getModules() {
         const modulesRoutes = ref([]);
@@ -63,7 +63,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
                 title: `globals.pageTitles.${title}`,
             }));
 
-        if (meta && meta.roles && role.hasAny(meta.roles) === false) return;
+        if (meta && meta.acls && acl.hasAny(meta.acls) === false) return;
 
         const item = {
             name: route.name,

From 803ce3b909a0f1c515db0ff2350b94061011bf89 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 11:53:59 +0200
Subject: [PATCH 122/162] refactor: refs #4074 rollback

---
 src/router/modules/worker.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 6eebdddac..2a523e7fe 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -53,6 +53,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                 },
+                {
+                    path: 'create',
+                    name: 'WorkerCreate',
+                    meta: {
+                        title: 'workerCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
+                },
             ],
         },
         {

From 3004d77d3423aef478037289b2e5eed7a0ab3677 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 9 Sep 2024 12:05:08 +0200
Subject: [PATCH 123/162] refs #7283 fix ItemDescriptor warehouse

---
 src/pages/Item/Card/ItemDescriptor.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index c9766944e..f329d5de4 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -65,15 +65,23 @@ onMounted(async () => {
 
 const data = ref(useCardDescription());
 const setData = async (entity) => {
-    if (!entity) return;
-    data.value = useCardDescription(entity.name, entity.id);
-    await updateStock();
+    try {
+        if (!entity) return;
+        data.value = useCardDescription(entity.name, entity.id);
+        await updateStock();
+    } catch (err) {
+        console.error('Error item');
+    }
 };
 
 const getItemConfigs = async () => {
-    const { data } = await axios.get('ItemConfigs/findOne');
-    if (!data) return;
-    return (warehouseConfig.value = data.warehouseFk);
+    try {
+        const { data } = await axios.get('ItemConfigs/findOne');
+        if (!data) return;
+        return (warehouseConfig.value = data.warehouseFk);
+    } catch (err) {
+        console.error('Error item');
+    }
 };
 const updateStock = async () => {
     try {
@@ -85,13 +93,13 @@ const updateStock = async () => {
             dated: $props.dated,
         };
 
+        await getItemConfigs();
         if (!params.warehouseFk) {
             params.warehouseFk = warehouseConfig.value;
         }
         const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
             params,
         });
-
         available.value = data.available;
         visible.value = data.visible;
     } catch (err) {

From 2667d3afaee4e46ebd7b87b62704b82dafb1e0a2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 12:07:22 +0200
Subject: [PATCH 124/162] feat: show preparation field

---
 src/pages/Ticket/TicketAdvance.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 45bd8fd39..0ef6b5f46 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -133,6 +133,14 @@ const ticketColumns = computed(() => [
         sortable: true,
         columnFilter: null,
     },
+    {
+        label: t('advanceTickets.preparation'),
+        name: 'preparation',
+        field: 'preparation',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
     {
         label: t('advanceTickets.liters'),
         name: 'liters',
@@ -624,6 +632,7 @@ onMounted(async () => {
                     </QIcon>
                 </QTd>
             </template>
+
             <template #body-cell-ticketId="{ row }">
                 <QTd>
                     <QBtn flat class="link">

From 6438f36ecaa880f68aedf76b96fc51c5f16d460b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 12:28:14 +0200
Subject: [PATCH 125/162] refactor: refs #4074 accept array

---
 src/composables/useAcl.js                        | 1 -
 src/pages/Customer/Card/CustomerBalance.vue      | 4 +++-
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 539e89622..ede359186 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -17,7 +17,6 @@ export function useAcl() {
     }
 
     function hasAny(acls) {
-        if (!Array.isArray(acls)) acls = [acls];
         for (const acl of acls) {
             let { model, props, accessType } = acl;
             const modelAcls = state.getAcls().value[model];
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 501ea6d68..95f5f0981 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -284,7 +284,9 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAny('Receipt','*', 'WRITE')"
+                    :disable="
+                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
+                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index d431e1f96..b7f470b0c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -195,7 +195,8 @@ async function cloneInvoice() {
     push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const canEditProp = (prop) => hasAny('InvoiceIn', prop, 'WRITE');
+const canEditProp = (props) =>
+    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
 
 const isAgricultural = () => {
     if (!config.value) return false;

From 15a764d1cf29b36116a60dd6fafd322989f902c2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 9 Sep 2024 12:35:47 +0200
Subject: [PATCH 126/162] refs #7283 fix

---
 src/pages/Item/Card/ItemDescriptor.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index f329d5de4..baac0c608 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -10,8 +10,6 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
-
-import { useState } from 'src/composables/useState';
 import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
@@ -45,8 +43,6 @@ const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
 const warehouseConfig = ref(null);
 const entityId = computed(() => {
     return $props.id || route.params.id;

From 381b236a18bc0b3186bbd1e6145d2108200b2f50 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 12:56:37 +0200
Subject: [PATCH 127/162] refactor: refs #4074 use acl & drop useless roles

---
 src/router/modules/claim.js     | 10 ++++++++--
 src/router/modules/invoiceIn.js |  1 -
 src/router/modules/shelving.js  |  1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index cced9e24d..ae794448e 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -61,7 +61,7 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
+                        acls: [{ model: 'Claim', props: 'findById', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
                 },
@@ -98,7 +98,13 @@ export default {
                     meta: {
                         title: 'development',
                         icon: 'vn:traceability',
-                        roles: ['claimManager'],
+                        acls: [
+                            {
+                                model: 'ClaimDevelopment',
+                                props: '*',
+                                accessType: 'WRITE',
+                            },
+                        ],
                     },
                     component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
                 },
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 906db8a58..c8027ffbf 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -80,7 +80,6 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
                     component: () =>
                         import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 70145dfb4..b7f50a3b6 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -76,7 +76,6 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
                     component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
                 },

From 7bc288ad7197ebc5d515bb868b7cb33f8bbb16b2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 13:15:37 +0200
Subject: [PATCH 128/162] fix: state cell

---
 src/pages/Ticket/TicketAdvance.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 45bd8fd39..eb5b715ee 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -635,6 +635,7 @@ onMounted(async () => {
             <template #body-cell-state="{ row }">
                 <QTd>
                     <QBadge
+                        v-if="row.state"
                         text-color="black"
                         :color="row.classColor"
                         class="q-ma-none"
@@ -642,6 +643,7 @@ onMounted(async () => {
                     >
                         {{ row.state }}
                     </QBadge>
+                    <span v-else> {{ dashIfEmpty(row.state) }}</span>
                 </QTd>
             </template>
             <template #body-cell-import="{ row }">

From 52d8ff8ae2b5017d7f75ca8e1cf6d1dcdeb5bc75 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 13:15:45 +0200
Subject: [PATCH 129/162] fix: isFullMovable checkbox

---
 src/pages/Ticket/TicketAdvanceFilter.vue | 11 +++++------
 src/pages/Ticket/locale/es.yml           |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index ed61d9447..209a1a307 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -55,7 +55,7 @@ onMounted(async () => await getItemPackingTypes());
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        :un-removable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
+        :unremovable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -119,10 +119,9 @@ onMounted(async () => await getItemPackingTypes());
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.itemPackingTypes')"
-                        v-model="params.itemPackingTypes"
+                        :label="t('params.isFullMovable')"
+                        v-model="params.isFullMovable"
                         toggle-indeterminate
-                        :false-value="null"
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
@@ -155,7 +154,7 @@ en:
         dateToAdvance: Destination date
         futureIpt: Origin IPT
         ipt: Destination IPT
-        itemPackingTypes: 100% movable
+        isFullMovable: 100% movable
         warehouseFk: Warehouse
 es:
     Horizontal: Horizontal
@@ -166,6 +165,6 @@ es:
         dateToAdvance: Fecha destino
         futureIpt: IPT Origen
         ipt: IPT destino
-        itemPackingTypes: 100% movible
+        isFullMovable: 100% movible
         warehouseFk: Almacén
 </i18n>
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 20b4edf16..30c5550be 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -105,7 +105,7 @@ advanceTickets:
     futureLines: Líneas
     futureImport: Importe
     advanceTickets: Adelantar tickets con negativos
-    advanceTicketTitle: Advance tickets
+    advanceTicketTitle: Adelantar tickets
     advanceTitleSubtitle: '¿Desea adelantar {selectedTickets} tickets?'
     noDeliveryZone: No hay una zona de reparto disponible para la fecha de envío seleccionada
     moveTicketSuccess: 'Tickets movidos correctamente {ticketsNumber}'

From 9506ed695b12584987d1d908773803c1b2bd7f85 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 13:17:38 +0200
Subject: [PATCH 130/162] fix: refs #7909 rollback scroll

---
 src/components/common/VnLog.vue | 521 +++++++++++++++-----------------
 1 file changed, 245 insertions(+), 276 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 1d5b2c182..2163d54d4 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -14,7 +14,6 @@ import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
-import VnPaginate from '../ui/VnPaginate.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -69,7 +68,7 @@ const filter = {
     ],
 };
 
-const paginate = ref();
+const workers = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -236,8 +235,9 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree(data) {
+async function setLogTree() {
     filter.where = { and: [{ originFk: route.params.id }] };
+    const { data } = await getLogs(filter);
     logTree.value = getLogTree(data);
 }
 
@@ -266,7 +266,15 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    paginate.value.fetch(filter);
+    const { data } = await getLogs(filter);
+
+    logTree.value = getLogTree(data);
+}
+
+async function getLogs(filter) {
+    return axios.get(props.url ?? `${props.model}Logs`, {
+        params: { filter: JSON.stringify(filter) },
+    });
 }
 
 function setDate(type) {
@@ -369,6 +377,8 @@ async function clearFilter() {
     await applyFilter();
 }
 
+setLogTree();
+
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
@@ -381,6 +391,16 @@ watch(
 );
 </script>
 <template>
+    <FetchData
+        :url="`${props.model}Logs/${route.params.id}/editors`"
+        :filter="{
+            fields: ['id', 'nickname', 'name', 'image'],
+            order: 'nickname',
+            limit: 30,
+        }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
     <FetchData
         :url="`${props.model}Logs/${route.params.id}/models`"
         :filter="{ order: ['changedModel'] }"
@@ -398,283 +418,231 @@ watch(
         "
         auto-load
     />
-    <VnPaginate
-        ref="paginate"
-        :data-key="`${model}Log`"
-        :url="`${model}Logs`"
-        :filter="filter"
-        :skeleton="false"
-        auto-load
-        @on-fetch="setLogTree"
+    <div
+        class="column items-center logs origin-log q-mt-md"
+        v-for="(originLog, originLogIndex) in logTree"
+        :key="originLogIndex"
     >
-        <template #body>
-            <div
-                class="column items-center logs origin-log q-mt-md"
-                v-for="(originLog, originLogIndex) in logTree"
-                :key="originLogIndex"
-            >
-                <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
-                    <h6 class="origin-id text-grey">
-                        {{ useCapitalize(validations[props.model].locale.name) }}
-                        #{{ originLog.originFk }}
-                    </h6>
-                    <div class="line bg-grey"></div>
-                </QItem>
-                <div
-                    class="user-log q-mb-sm"
-                    v-for="(userLog, userIndex) in originLog.logs"
-                    :key="userIndex"
+        <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
+            <h6 class="origin-id text-grey">
+                {{ useCapitalize(validations[props.model].locale.name) }}
+                #{{ originLog.originFk }}
+            </h6>
+            <div class="line bg-grey"></div>
+        </QItem>
+        <div
+            class="user-log q-mb-sm"
+            v-for="(userLog, userIndex) in originLog.logs"
+            :key="userIndex"
+        >
+            <div class="timeline">
+                <div class="user-avatar">
+                    <VnUserLink :worker-id="userLog?.user?.id">
+                        <template #link>
+                            <VnAvatar
+                                :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                :worker-id="userLog?.user?.id"
+                                :title="userLog?.user?.nickname"
+                                :show-letter="!userLog?.user"
+                                size="lg"
+                            />
+                        </template>
+                    </VnUserLink>
+                </div>
+                <div class="arrow bg-panel" v-if="byRecord"></div>
+                <div class="line"></div>
+            </div>
+            <QList class="user-changes" v-if="userLog">
+                <QItem
+                    class="model-log column q-px-none q-py-xs"
+                    v-for="(modelLog, modelLogIndex) in userLog.logs"
+                    :key="modelLogIndex"
                 >
-                    <div class="timeline">
-                        <div class="user-avatar">
-                            <VnUserLink :worker-id="userLog?.user?.id">
-                                <template #link>
-                                    <VnAvatar
-                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
-                                        :worker-id="userLog?.user?.id"
-                                        :title="userLog?.user?.nickname"
-                                        :show-letter="!userLog?.user"
-                                        size="lg"
-                                    />
-                                </template>
-                            </VnUserLink>
-                        </div>
-                        <div class="arrow bg-panel" v-if="byRecord"></div>
-                        <div class="line"></div>
-                    </div>
-                    <QList class="user-changes" v-if="userLog">
-                        <QItem
-                            class="model-log column q-px-none q-py-xs"
-                            v-for="(modelLog, modelLogIndex) in userLog.logs"
-                            :key="modelLogIndex"
-                        >
-                            <QItemSection>
-                                <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
-                                    <QChip
-                                        dense
-                                        size="md"
-                                        class="model-name q-mr-xs text-white"
-                                        v-if="
-                                            !(
-                                                modelLog.changedModel &&
-                                                modelLog.changedModelId
-                                            ) && modelLog.model
-                                        "
-                                        :style="{
-                                            backgroundColor: useColor(modelLog.model),
-                                        }"
-                                        :title="`${modelLog.model} #${modelLog.id}`"
-                                    >
-                                        {{ t(modelLog.modelI18n) }}
-                                    </QChip>
+                    <QItemSection>
+                        <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
+                            <QChip
+                                dense
+                                size="md"
+                                class="model-name q-mr-xs text-white"
+                                v-if="
+                                    !(modelLog.changedModel && modelLog.changedModelId) &&
+                                    modelLog.model
+                                "
+                                :style="{
+                                    backgroundColor: useColor(modelLog.model),
+                                }"
+                                :title="`${modelLog.model} #${modelLog.id}`"
+                            >
+                                {{ t(modelLog.modelI18n) }}
+                            </QChip>
 
-                                    <span
-                                        class="model-id q-mr-xs"
-                                        v-if="modelLog.summaryId"
-                                        v-text="`#${modelLog.summaryId}`"
-                                    />
-                                    <span
-                                        class="model-value"
-                                        :title="modelLog.showValue"
-                                        v-text="modelLog.showValue"
-                                    />
-                                    <QBtn
-                                        flat
-                                        round
-                                        color="grey"
-                                        class="q-mr-xs q-ml-auto"
-                                        size="sm"
-                                        icon="filter_alt"
-                                        :title="t('recordChanges')"
-                                        @click.stop="filterByRecord(modelLog)"
-                                    />
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection>
-                                <QCard
-                                    class="changes-log q-py-none q-mb-xs"
-                                    v-for="(log, logIndex) in modelLog.logs"
-                                    :key="logIndex"
+                            <span
+                                class="model-id q-mr-xs"
+                                v-if="modelLog.summaryId"
+                                v-text="`#${modelLog.summaryId}`"
+                            />
+                            <span
+                                class="model-value"
+                                :title="modelLog.showValue"
+                                v-text="modelLog.showValue"
+                            />
+                            <QBtn
+                                flat
+                                round
+                                color="grey"
+                                class="q-mr-xs q-ml-auto"
+                                size="sm"
+                                icon="filter_alt"
+                                :title="t('recordChanges')"
+                                @click.stop="filterByRecord(modelLog)"
+                            />
+                        </QItemLabel>
+                    </QItemSection>
+                    <QItemSection>
+                        <QCard
+                            class="changes-log q-py-none q-mb-xs"
+                            v-for="(log, logIndex) in modelLog.logs"
+                            :key="logIndex"
+                        >
+                            <QCardSection class="change-info q-pa-none">
+                                <QItem
+                                    class="q-px-sm q-py-xs justify-between items-center"
                                 >
-                                    <QCardSection class="change-info q-pa-none">
-                                        <QItem
-                                            class="q-px-sm q-py-xs justify-between items-center"
-                                        >
-                                            <div
-                                                class="date text-grey text-caption q-mr-sm"
-                                                :title="
-                                                    date.formatDate(
-                                                        log.creationDate,
-                                                        'DD/MM/YYYY hh:mm:ss'
-                                                    ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
-                                                "
-                                            >
-                                                {{ toRelativeDate(log.creationDate) }}
-                                            </div>
-                                            <div>
-                                                <QBtn
-                                                    color="grey"
-                                                    class="pit"
-                                                    icon="preview"
-                                                    flat
-                                                    round
-                                                    :title="t('pointRecord')"
-                                                    padding="none"
-                                                    v-if="log.action != 'insert'"
-                                                    @click.stop="
-                                                        openPointRecord(log.id, modelLog)
-                                                    "
-                                                >
-                                                    <QPopupProxy>
-                                                        <QCard v-if="pointRecord">
-                                                            <div
-                                                                class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                                                            >
-                                                                {{ modelLog.modelI18n }}
-                                                                <span v-if="modelLog.id"
-                                                                    >#{{
-                                                                        modelLog.id
-                                                                    }}</span
-                                                                >
-                                                            </div>
-                                                            <QCardSection
-                                                                class="change-detail q-pa-sm"
-                                                            >
-                                                                <QItem
-                                                                    v-for="(
-                                                                        value, index
-                                                                    ) in pointRecord"
-                                                                    :key="index"
-                                                                    class="q-pa-none"
-                                                                >
-                                                                    <span
-                                                                        class="json-field q-mr-xs text-grey"
-                                                                        :title="
-                                                                            value.name
-                                                                        "
-                                                                    >
-                                                                        {{
-                                                                            value.nameI18n
-                                                                        }}:
-                                                                    </span>
-                                                                    <VnJsonValue
-                                                                        :value="
-                                                                            value.val.val
-                                                                        "
-                                                                    />
-                                                                </QItem>
-                                                            </QCardSection>
-                                                        </QCard>
-                                                    </QPopupProxy>
-                                                </QBtn>
-                                                <QIcon
-                                                    class="action q-ml-xs"
-                                                    :class="actionsClass[log.action]"
-                                                    :name="actionsIcon[log.action]"
-                                                    :title="
-                                                        t(
-                                                            `actions.${
-                                                                actionsText[log.action]
-                                                            }`
-                                                        )
-                                                    "
-                                                />
-                                            </div>
-                                        </QItem>
-                                    </QCardSection>
-                                    <QCardSection
-                                        class="change-detail q-px-sm q-py-xs"
-                                        :class="{ expanded: log.expand }"
-                                        v-if="log.props.length || log.description"
+                                    <div
+                                        class="date text-grey text-caption q-mr-sm"
+                                        :title="
+                                            date.formatDate(
+                                                log.creationDate,
+                                                'DD/MM/YYYY hh:mm:ss'
+                                            ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                                        "
                                     >
-                                        <QIcon
-                                            class="cursor-pointer q-mr-md"
+                                        {{ toRelativeDate(log.creationDate) }}
+                                    </div>
+                                    <div>
+                                        <QBtn
                                             color="grey"
-                                            name="expand_more"
-                                            :title="t('globals.details')"
-                                            size="sm"
-                                            @click="log.expand = !log.expand"
-                                        />
-                                        <span v-if="log.props.length" class="attributes">
-                                            <span
-                                                v-if="!log.expand"
-                                                class="q-pa-none text-grey"
-                                            >
-                                                <span
-                                                    v-for="(prop, propIndex) in log.props"
-                                                    :key="propIndex"
-                                                    class="basic-json"
-                                                >
-                                                    <span
-                                                        class="json-field"
-                                                        :title="prop.name"
+                                            class="pit"
+                                            icon="preview"
+                                            flat
+                                            round
+                                            :title="t('pointRecord')"
+                                            padding="none"
+                                            v-if="log.action != 'insert'"
+                                            @click.stop="
+                                                openPointRecord(log.id, modelLog)
+                                            "
+                                        >
+                                            <QPopupProxy>
+                                                <QCard v-if="pointRecord">
+                                                    <div
+                                                        class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
                                                     >
-                                                        {{ prop.nameI18n }}:
-                                                    </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="
-                                                            propIndex <
-                                                            log.props.length - 1
-                                                        "
-                                                        >,&nbsp;
-                                                    </span>
+                                                        {{ modelLog.modelI18n }}
+                                                        <span v-if="modelLog.id"
+                                                            >#{{ modelLog.id }}</span
+                                                        >
+                                                    </div>
+                                                    <QCardSection
+                                                        class="change-detail q-pa-sm"
+                                                    >
+                                                        <QItem
+                                                            v-for="(
+                                                                value, index
+                                                            ) in pointRecord"
+                                                            :key="index"
+                                                            class="q-pa-none"
+                                                        >
+                                                            <span
+                                                                class="json-field q-mr-xs text-grey"
+                                                                :title="value.name"
+                                                            >
+                                                                {{ value.nameI18n }}:
+                                                            </span>
+                                                            <VnJsonValue
+                                                                :value="value.val.val"
+                                                            />
+                                                        </QItem>
+                                                    </QCardSection>
+                                                </QCard>
+                                            </QPopupProxy>
+                                        </QBtn>
+                                        <QIcon
+                                            class="action q-ml-xs"
+                                            :class="actionsClass[log.action]"
+                                            :name="actionsIcon[log.action]"
+                                            :title="
+                                                t(`actions.${actionsText[log.action]}`)
+                                            "
+                                        />
+                                    </div>
+                                </QItem>
+                            </QCardSection>
+                            <QCardSection
+                                class="change-detail q-px-sm q-py-xs"
+                                :class="{ expanded: log.expand }"
+                                v-if="log.props.length || log.description"
+                            >
+                                <QIcon
+                                    class="cursor-pointer q-mr-md"
+                                    color="grey"
+                                    name="expand_more"
+                                    :title="t('globals.details')"
+                                    size="sm"
+                                    @click="log.expand = !log.expand"
+                                />
+                                <span v-if="log.props.length" class="attributes">
+                                    <span v-if="!log.expand" class="q-pa-none text-grey">
+                                        <span
+                                            v-for="(prop, propIndex) in log.props"
+                                            :key="propIndex"
+                                            class="basic-json"
+                                        >
+                                            <span class="json-field" :title="prop.name">
+                                                {{ prop.nameI18n }}:
+                                            </span>
+                                            <VnJsonValue :value="prop.val.val" />
+                                            <span v-if="propIndex < log.props.length - 1"
+                                                >,&nbsp;
+                                            </span>
+                                        </span>
+                                    </span>
+                                    <span
+                                        v-if="log.expand"
+                                        class="expanded-json column q-pa-none"
+                                    >
+                                        <div
+                                            v-for="(prop, prop2Index) in log.props"
+                                            :key="prop2Index"
+                                            class="q-pa-none text-grey"
+                                        >
+                                            <span class="json-field" :title="prop.name">
+                                                {{ prop.nameI18n }}:
+                                            </span>
+                                            <VnJsonValue :value="prop.val.val" />
+                                            <span v-if="prop.val.id" class="id-value">
+                                                #{{ prop.val.id }}
+                                            </span>
+                                            <span v-if="log.action == 'update'">
+                                                ←
+                                                <VnJsonValue :value="prop.old.val" />
+                                                <span v-if="prop.old.id" class="id-value">
+                                                    #{{ prop.old.id }}
                                                 </span>
                                             </span>
-                                            <span
-                                                v-if="log.expand"
-                                                class="expanded-json column q-pa-none"
-                                            >
-                                                <div
-                                                    v-for="(
-                                                        prop, prop2Index
-                                                    ) in log.props"
-                                                    :key="prop2Index"
-                                                    class="q-pa-none text-grey"
-                                                >
-                                                    <span
-                                                        class="json-field"
-                                                        :title="prop.name"
-                                                    >
-                                                        {{ prop.nameI18n }}:
-                                                    </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
-                                                        #{{ prop.val.id }}
-                                                    </span>
-                                                    <span v-if="log.action == 'update'">
-                                                        ←
-                                                        <VnJsonValue
-                                                            :value="prop.old.val"
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                        >
-                                                            #{{ prop.old.id }}
-                                                        </span>
-                                                    </span>
-                                                </div>
-                                            </span>
-                                        </span>
-                                        <span
-                                            v-if="!log.props.length"
-                                            class="description"
-                                        >
-                                            {{ log.description }}
-                                        </span>
-                                    </QCardSection>
-                                </QCard>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-            </div>
-        </template>
-    </VnPaginate>
+                                        </div>
+                                    </span>
+                                </span>
+                                <span v-if="!log.props.length" class="description">
+                                    {{ log.description }}
+                                </span>
+                            </QCardSection>
+                        </QCard>
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </div>
+    </div>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QList dense>
             <QSeparator />
@@ -723,16 +691,17 @@ watch(
                 </QOptionGroup>
             </QItem>
             <QItem class="q-mt-sm">
-                <QItemSection v-if="userRadio !== null">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers && userRadio !== null">
                     <VnSelect
                         class="full-width"
                         :label="t('globals.user')"
                         v-model="userSelect"
                         option-label="name"
                         option-value="id"
-                        :url="`${model}Logs/${$route.params.id}/editors`"
-                        :fields="['id', 'nickname', 'name', 'image']"
-                        sort-by="nickname"
+                        :options="workers"
                         @update:model-value="selectFilter('userSelect')"
                         hide-selected
                     >

From 7c22a5d0acb0a4cd269f4a10d840011f23a97d9a Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 9 Sep 2024 13:18:51 +0200
Subject: [PATCH 131/162] feat: fix refund parameters

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

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index 1b545103a..c21c892dd 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -33,6 +33,7 @@ const invoiceCorrectionTypesOptions = ref([]);
 const refund = async () => {
     const params = {
         id: invoiceParams.id,
+        withWarehouse: invoiceParams.inheritWarehouse,
         cplusRectificationTypeFk: invoiceParams.cplusRectificationTypeFk,
         siiTypeInvoiceOutFk: invoiceParams.siiTypeInvoiceOutFk,
         invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,

From 803c02b80d2e61f0786c73212d6bcae8faa5cb05 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 13:38:27 +0200
Subject: [PATCH 132/162] fix: refs #7909 rollback scroll

---
 src/components/common/VnLog.vue | 521 +++++++++++++++-----------------
 1 file changed, 245 insertions(+), 276 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 1d5b2c182..2163d54d4 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -14,7 +14,6 @@ import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
-import VnPaginate from '../ui/VnPaginate.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -69,7 +68,7 @@ const filter = {
     ],
 };
 
-const paginate = ref();
+const workers = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -236,8 +235,9 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree(data) {
+async function setLogTree() {
     filter.where = { and: [{ originFk: route.params.id }] };
+    const { data } = await getLogs(filter);
     logTree.value = getLogTree(data);
 }
 
@@ -266,7 +266,15 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    paginate.value.fetch(filter);
+    const { data } = await getLogs(filter);
+
+    logTree.value = getLogTree(data);
+}
+
+async function getLogs(filter) {
+    return axios.get(props.url ?? `${props.model}Logs`, {
+        params: { filter: JSON.stringify(filter) },
+    });
 }
 
 function setDate(type) {
@@ -369,6 +377,8 @@ async function clearFilter() {
     await applyFilter();
 }
 
+setLogTree();
+
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
@@ -381,6 +391,16 @@ watch(
 );
 </script>
 <template>
+    <FetchData
+        :url="`${props.model}Logs/${route.params.id}/editors`"
+        :filter="{
+            fields: ['id', 'nickname', 'name', 'image'],
+            order: 'nickname',
+            limit: 30,
+        }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
     <FetchData
         :url="`${props.model}Logs/${route.params.id}/models`"
         :filter="{ order: ['changedModel'] }"
@@ -398,283 +418,231 @@ watch(
         "
         auto-load
     />
-    <VnPaginate
-        ref="paginate"
-        :data-key="`${model}Log`"
-        :url="`${model}Logs`"
-        :filter="filter"
-        :skeleton="false"
-        auto-load
-        @on-fetch="setLogTree"
+    <div
+        class="column items-center logs origin-log q-mt-md"
+        v-for="(originLog, originLogIndex) in logTree"
+        :key="originLogIndex"
     >
-        <template #body>
-            <div
-                class="column items-center logs origin-log q-mt-md"
-                v-for="(originLog, originLogIndex) in logTree"
-                :key="originLogIndex"
-            >
-                <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
-                    <h6 class="origin-id text-grey">
-                        {{ useCapitalize(validations[props.model].locale.name) }}
-                        #{{ originLog.originFk }}
-                    </h6>
-                    <div class="line bg-grey"></div>
-                </QItem>
-                <div
-                    class="user-log q-mb-sm"
-                    v-for="(userLog, userIndex) in originLog.logs"
-                    :key="userIndex"
+        <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
+            <h6 class="origin-id text-grey">
+                {{ useCapitalize(validations[props.model].locale.name) }}
+                #{{ originLog.originFk }}
+            </h6>
+            <div class="line bg-grey"></div>
+        </QItem>
+        <div
+            class="user-log q-mb-sm"
+            v-for="(userLog, userIndex) in originLog.logs"
+            :key="userIndex"
+        >
+            <div class="timeline">
+                <div class="user-avatar">
+                    <VnUserLink :worker-id="userLog?.user?.id">
+                        <template #link>
+                            <VnAvatar
+                                :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                :worker-id="userLog?.user?.id"
+                                :title="userLog?.user?.nickname"
+                                :show-letter="!userLog?.user"
+                                size="lg"
+                            />
+                        </template>
+                    </VnUserLink>
+                </div>
+                <div class="arrow bg-panel" v-if="byRecord"></div>
+                <div class="line"></div>
+            </div>
+            <QList class="user-changes" v-if="userLog">
+                <QItem
+                    class="model-log column q-px-none q-py-xs"
+                    v-for="(modelLog, modelLogIndex) in userLog.logs"
+                    :key="modelLogIndex"
                 >
-                    <div class="timeline">
-                        <div class="user-avatar">
-                            <VnUserLink :worker-id="userLog?.user?.id">
-                                <template #link>
-                                    <VnAvatar
-                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
-                                        :worker-id="userLog?.user?.id"
-                                        :title="userLog?.user?.nickname"
-                                        :show-letter="!userLog?.user"
-                                        size="lg"
-                                    />
-                                </template>
-                            </VnUserLink>
-                        </div>
-                        <div class="arrow bg-panel" v-if="byRecord"></div>
-                        <div class="line"></div>
-                    </div>
-                    <QList class="user-changes" v-if="userLog">
-                        <QItem
-                            class="model-log column q-px-none q-py-xs"
-                            v-for="(modelLog, modelLogIndex) in userLog.logs"
-                            :key="modelLogIndex"
-                        >
-                            <QItemSection>
-                                <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
-                                    <QChip
-                                        dense
-                                        size="md"
-                                        class="model-name q-mr-xs text-white"
-                                        v-if="
-                                            !(
-                                                modelLog.changedModel &&
-                                                modelLog.changedModelId
-                                            ) && modelLog.model
-                                        "
-                                        :style="{
-                                            backgroundColor: useColor(modelLog.model),
-                                        }"
-                                        :title="`${modelLog.model} #${modelLog.id}`"
-                                    >
-                                        {{ t(modelLog.modelI18n) }}
-                                    </QChip>
+                    <QItemSection>
+                        <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
+                            <QChip
+                                dense
+                                size="md"
+                                class="model-name q-mr-xs text-white"
+                                v-if="
+                                    !(modelLog.changedModel && modelLog.changedModelId) &&
+                                    modelLog.model
+                                "
+                                :style="{
+                                    backgroundColor: useColor(modelLog.model),
+                                }"
+                                :title="`${modelLog.model} #${modelLog.id}`"
+                            >
+                                {{ t(modelLog.modelI18n) }}
+                            </QChip>
 
-                                    <span
-                                        class="model-id q-mr-xs"
-                                        v-if="modelLog.summaryId"
-                                        v-text="`#${modelLog.summaryId}`"
-                                    />
-                                    <span
-                                        class="model-value"
-                                        :title="modelLog.showValue"
-                                        v-text="modelLog.showValue"
-                                    />
-                                    <QBtn
-                                        flat
-                                        round
-                                        color="grey"
-                                        class="q-mr-xs q-ml-auto"
-                                        size="sm"
-                                        icon="filter_alt"
-                                        :title="t('recordChanges')"
-                                        @click.stop="filterByRecord(modelLog)"
-                                    />
-                                </QItemLabel>
-                            </QItemSection>
-                            <QItemSection>
-                                <QCard
-                                    class="changes-log q-py-none q-mb-xs"
-                                    v-for="(log, logIndex) in modelLog.logs"
-                                    :key="logIndex"
+                            <span
+                                class="model-id q-mr-xs"
+                                v-if="modelLog.summaryId"
+                                v-text="`#${modelLog.summaryId}`"
+                            />
+                            <span
+                                class="model-value"
+                                :title="modelLog.showValue"
+                                v-text="modelLog.showValue"
+                            />
+                            <QBtn
+                                flat
+                                round
+                                color="grey"
+                                class="q-mr-xs q-ml-auto"
+                                size="sm"
+                                icon="filter_alt"
+                                :title="t('recordChanges')"
+                                @click.stop="filterByRecord(modelLog)"
+                            />
+                        </QItemLabel>
+                    </QItemSection>
+                    <QItemSection>
+                        <QCard
+                            class="changes-log q-py-none q-mb-xs"
+                            v-for="(log, logIndex) in modelLog.logs"
+                            :key="logIndex"
+                        >
+                            <QCardSection class="change-info q-pa-none">
+                                <QItem
+                                    class="q-px-sm q-py-xs justify-between items-center"
                                 >
-                                    <QCardSection class="change-info q-pa-none">
-                                        <QItem
-                                            class="q-px-sm q-py-xs justify-between items-center"
-                                        >
-                                            <div
-                                                class="date text-grey text-caption q-mr-sm"
-                                                :title="
-                                                    date.formatDate(
-                                                        log.creationDate,
-                                                        'DD/MM/YYYY hh:mm:ss'
-                                                    ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
-                                                "
-                                            >
-                                                {{ toRelativeDate(log.creationDate) }}
-                                            </div>
-                                            <div>
-                                                <QBtn
-                                                    color="grey"
-                                                    class="pit"
-                                                    icon="preview"
-                                                    flat
-                                                    round
-                                                    :title="t('pointRecord')"
-                                                    padding="none"
-                                                    v-if="log.action != 'insert'"
-                                                    @click.stop="
-                                                        openPointRecord(log.id, modelLog)
-                                                    "
-                                                >
-                                                    <QPopupProxy>
-                                                        <QCard v-if="pointRecord">
-                                                            <div
-                                                                class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                                                            >
-                                                                {{ modelLog.modelI18n }}
-                                                                <span v-if="modelLog.id"
-                                                                    >#{{
-                                                                        modelLog.id
-                                                                    }}</span
-                                                                >
-                                                            </div>
-                                                            <QCardSection
-                                                                class="change-detail q-pa-sm"
-                                                            >
-                                                                <QItem
-                                                                    v-for="(
-                                                                        value, index
-                                                                    ) in pointRecord"
-                                                                    :key="index"
-                                                                    class="q-pa-none"
-                                                                >
-                                                                    <span
-                                                                        class="json-field q-mr-xs text-grey"
-                                                                        :title="
-                                                                            value.name
-                                                                        "
-                                                                    >
-                                                                        {{
-                                                                            value.nameI18n
-                                                                        }}:
-                                                                    </span>
-                                                                    <VnJsonValue
-                                                                        :value="
-                                                                            value.val.val
-                                                                        "
-                                                                    />
-                                                                </QItem>
-                                                            </QCardSection>
-                                                        </QCard>
-                                                    </QPopupProxy>
-                                                </QBtn>
-                                                <QIcon
-                                                    class="action q-ml-xs"
-                                                    :class="actionsClass[log.action]"
-                                                    :name="actionsIcon[log.action]"
-                                                    :title="
-                                                        t(
-                                                            `actions.${
-                                                                actionsText[log.action]
-                                                            }`
-                                                        )
-                                                    "
-                                                />
-                                            </div>
-                                        </QItem>
-                                    </QCardSection>
-                                    <QCardSection
-                                        class="change-detail q-px-sm q-py-xs"
-                                        :class="{ expanded: log.expand }"
-                                        v-if="log.props.length || log.description"
+                                    <div
+                                        class="date text-grey text-caption q-mr-sm"
+                                        :title="
+                                            date.formatDate(
+                                                log.creationDate,
+                                                'DD/MM/YYYY hh:mm:ss'
+                                            ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                                        "
                                     >
-                                        <QIcon
-                                            class="cursor-pointer q-mr-md"
+                                        {{ toRelativeDate(log.creationDate) }}
+                                    </div>
+                                    <div>
+                                        <QBtn
                                             color="grey"
-                                            name="expand_more"
-                                            :title="t('globals.details')"
-                                            size="sm"
-                                            @click="log.expand = !log.expand"
-                                        />
-                                        <span v-if="log.props.length" class="attributes">
-                                            <span
-                                                v-if="!log.expand"
-                                                class="q-pa-none text-grey"
-                                            >
-                                                <span
-                                                    v-for="(prop, propIndex) in log.props"
-                                                    :key="propIndex"
-                                                    class="basic-json"
-                                                >
-                                                    <span
-                                                        class="json-field"
-                                                        :title="prop.name"
+                                            class="pit"
+                                            icon="preview"
+                                            flat
+                                            round
+                                            :title="t('pointRecord')"
+                                            padding="none"
+                                            v-if="log.action != 'insert'"
+                                            @click.stop="
+                                                openPointRecord(log.id, modelLog)
+                                            "
+                                        >
+                                            <QPopupProxy>
+                                                <QCard v-if="pointRecord">
+                                                    <div
+                                                        class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
                                                     >
-                                                        {{ prop.nameI18n }}:
-                                                    </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="
-                                                            propIndex <
-                                                            log.props.length - 1
-                                                        "
-                                                        >,&nbsp;
-                                                    </span>
+                                                        {{ modelLog.modelI18n }}
+                                                        <span v-if="modelLog.id"
+                                                            >#{{ modelLog.id }}</span
+                                                        >
+                                                    </div>
+                                                    <QCardSection
+                                                        class="change-detail q-pa-sm"
+                                                    >
+                                                        <QItem
+                                                            v-for="(
+                                                                value, index
+                                                            ) in pointRecord"
+                                                            :key="index"
+                                                            class="q-pa-none"
+                                                        >
+                                                            <span
+                                                                class="json-field q-mr-xs text-grey"
+                                                                :title="value.name"
+                                                            >
+                                                                {{ value.nameI18n }}:
+                                                            </span>
+                                                            <VnJsonValue
+                                                                :value="value.val.val"
+                                                            />
+                                                        </QItem>
+                                                    </QCardSection>
+                                                </QCard>
+                                            </QPopupProxy>
+                                        </QBtn>
+                                        <QIcon
+                                            class="action q-ml-xs"
+                                            :class="actionsClass[log.action]"
+                                            :name="actionsIcon[log.action]"
+                                            :title="
+                                                t(`actions.${actionsText[log.action]}`)
+                                            "
+                                        />
+                                    </div>
+                                </QItem>
+                            </QCardSection>
+                            <QCardSection
+                                class="change-detail q-px-sm q-py-xs"
+                                :class="{ expanded: log.expand }"
+                                v-if="log.props.length || log.description"
+                            >
+                                <QIcon
+                                    class="cursor-pointer q-mr-md"
+                                    color="grey"
+                                    name="expand_more"
+                                    :title="t('globals.details')"
+                                    size="sm"
+                                    @click="log.expand = !log.expand"
+                                />
+                                <span v-if="log.props.length" class="attributes">
+                                    <span v-if="!log.expand" class="q-pa-none text-grey">
+                                        <span
+                                            v-for="(prop, propIndex) in log.props"
+                                            :key="propIndex"
+                                            class="basic-json"
+                                        >
+                                            <span class="json-field" :title="prop.name">
+                                                {{ prop.nameI18n }}:
+                                            </span>
+                                            <VnJsonValue :value="prop.val.val" />
+                                            <span v-if="propIndex < log.props.length - 1"
+                                                >,&nbsp;
+                                            </span>
+                                        </span>
+                                    </span>
+                                    <span
+                                        v-if="log.expand"
+                                        class="expanded-json column q-pa-none"
+                                    >
+                                        <div
+                                            v-for="(prop, prop2Index) in log.props"
+                                            :key="prop2Index"
+                                            class="q-pa-none text-grey"
+                                        >
+                                            <span class="json-field" :title="prop.name">
+                                                {{ prop.nameI18n }}:
+                                            </span>
+                                            <VnJsonValue :value="prop.val.val" />
+                                            <span v-if="prop.val.id" class="id-value">
+                                                #{{ prop.val.id }}
+                                            </span>
+                                            <span v-if="log.action == 'update'">
+                                                ←
+                                                <VnJsonValue :value="prop.old.val" />
+                                                <span v-if="prop.old.id" class="id-value">
+                                                    #{{ prop.old.id }}
                                                 </span>
                                             </span>
-                                            <span
-                                                v-if="log.expand"
-                                                class="expanded-json column q-pa-none"
-                                            >
-                                                <div
-                                                    v-for="(
-                                                        prop, prop2Index
-                                                    ) in log.props"
-                                                    :key="prop2Index"
-                                                    class="q-pa-none text-grey"
-                                                >
-                                                    <span
-                                                        class="json-field"
-                                                        :title="prop.name"
-                                                    >
-                                                        {{ prop.nameI18n }}:
-                                                    </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
-                                                        #{{ prop.val.id }}
-                                                    </span>
-                                                    <span v-if="log.action == 'update'">
-                                                        ←
-                                                        <VnJsonValue
-                                                            :value="prop.old.val"
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                        >
-                                                            #{{ prop.old.id }}
-                                                        </span>
-                                                    </span>
-                                                </div>
-                                            </span>
-                                        </span>
-                                        <span
-                                            v-if="!log.props.length"
-                                            class="description"
-                                        >
-                                            {{ log.description }}
-                                        </span>
-                                    </QCardSection>
-                                </QCard>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </div>
-            </div>
-        </template>
-    </VnPaginate>
+                                        </div>
+                                    </span>
+                                </span>
+                                <span v-if="!log.props.length" class="description">
+                                    {{ log.description }}
+                                </span>
+                            </QCardSection>
+                        </QCard>
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </div>
+    </div>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QList dense>
             <QSeparator />
@@ -723,16 +691,17 @@ watch(
                 </QOptionGroup>
             </QItem>
             <QItem class="q-mt-sm">
-                <QItemSection v-if="userRadio !== null">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers && userRadio !== null">
                     <VnSelect
                         class="full-width"
                         :label="t('globals.user')"
                         v-model="userSelect"
                         option-label="name"
                         option-value="id"
-                        :url="`${model}Logs/${$route.params.id}/editors`"
-                        :fields="['id', 'nickname', 'name', 'image']"
-                        sort-by="nickname"
+                        :options="workers"
                         @update:model-value="selectFilter('userSelect')"
                         hide-selected
                     >

From ac421344d01575a3db5d281bc4c4c28deaff17ce Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 13:41:04 +0200
Subject: [PATCH 133/162] fix: refs #7909 add originFk

---
 src/components/common/VnLog.vue | 523 +++++++++++++++++---------------
 1 file changed, 277 insertions(+), 246 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 2163d54d4..ab522cfde 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -14,6 +14,7 @@ import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
+import VnPaginate from '../ui/VnPaginate.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -66,9 +67,10 @@ const filter = {
             },
         },
     ],
+    where: { and: [{ originFk: route.params.id }] },
 };
 
-const workers = ref();
+const paginate = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -235,9 +237,7 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree() {
-    filter.where = { and: [{ originFk: route.params.id }] };
-    const { data } = await getLogs(filter);
+async function setLogTree(data) {
     logTree.value = getLogTree(data);
 }
 
@@ -266,15 +266,7 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    const { data } = await getLogs(filter);
-
-    logTree.value = getLogTree(data);
-}
-
-async function getLogs(filter) {
-    return axios.get(props.url ?? `${props.model}Logs`, {
-        params: { filter: JSON.stringify(filter) },
-    });
+    paginate.value.fetch(filter);
 }
 
 function setDate(type) {
@@ -377,8 +369,6 @@ async function clearFilter() {
     await applyFilter();
 }
 
-setLogTree();
-
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
@@ -391,16 +381,6 @@ watch(
 );
 </script>
 <template>
-    <FetchData
-        :url="`${props.model}Logs/${route.params.id}/editors`"
-        :filter="{
-            fields: ['id', 'nickname', 'name', 'image'],
-            order: 'nickname',
-            limit: 30,
-        }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
     <FetchData
         :url="`${props.model}Logs/${route.params.id}/models`"
         :filter="{ order: ['changedModel'] }"
@@ -418,231 +398,283 @@ watch(
         "
         auto-load
     />
-    <div
-        class="column items-center logs origin-log q-mt-md"
-        v-for="(originLog, originLogIndex) in logTree"
-        :key="originLogIndex"
+    <VnPaginate
+        ref="paginate"
+        :data-key="`${model}Log`"
+        :url="`${model}Logs`"
+        :filter="filter"
+        :skeleton="false"
+        auto-load
+        @on-fetch="setLogTree"
     >
-        <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
-            <h6 class="origin-id text-grey">
-                {{ useCapitalize(validations[props.model].locale.name) }}
-                #{{ originLog.originFk }}
-            </h6>
-            <div class="line bg-grey"></div>
-        </QItem>
-        <div
-            class="user-log q-mb-sm"
-            v-for="(userLog, userIndex) in originLog.logs"
-            :key="userIndex"
-        >
-            <div class="timeline">
-                <div class="user-avatar">
-                    <VnUserLink :worker-id="userLog?.user?.id">
-                        <template #link>
-                            <VnAvatar
-                                :class="{ 'cursor-pointer': userLog?.user?.id }"
-                                :worker-id="userLog?.user?.id"
-                                :title="userLog?.user?.nickname"
-                                :show-letter="!userLog?.user"
-                                size="lg"
-                            />
-                        </template>
-                    </VnUserLink>
-                </div>
-                <div class="arrow bg-panel" v-if="byRecord"></div>
-                <div class="line"></div>
-            </div>
-            <QList class="user-changes" v-if="userLog">
-                <QItem
-                    class="model-log column q-px-none q-py-xs"
-                    v-for="(modelLog, modelLogIndex) in userLog.logs"
-                    :key="modelLogIndex"
+        <template #body>
+            <div
+                class="column items-center logs origin-log q-mt-md"
+                v-for="(originLog, originLogIndex) in logTree"
+                :key="originLogIndex"
+            >
+                <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
+                    <h6 class="origin-id text-grey">
+                        {{ useCapitalize(validations[props.model].locale.name) }}
+                        #{{ originLog.originFk }}
+                    </h6>
+                    <div class="line bg-grey"></div>
+                </QItem>
+                <div
+                    class="user-log q-mb-sm"
+                    v-for="(userLog, userIndex) in originLog.logs"
+                    :key="userIndex"
                 >
-                    <QItemSection>
-                        <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
-                            <QChip
-                                dense
-                                size="md"
-                                class="model-name q-mr-xs text-white"
-                                v-if="
-                                    !(modelLog.changedModel && modelLog.changedModelId) &&
-                                    modelLog.model
-                                "
-                                :style="{
-                                    backgroundColor: useColor(modelLog.model),
-                                }"
-                                :title="`${modelLog.model} #${modelLog.id}`"
-                            >
-                                {{ t(modelLog.modelI18n) }}
-                            </QChip>
-
-                            <span
-                                class="model-id q-mr-xs"
-                                v-if="modelLog.summaryId"
-                                v-text="`#${modelLog.summaryId}`"
-                            />
-                            <span
-                                class="model-value"
-                                :title="modelLog.showValue"
-                                v-text="modelLog.showValue"
-                            />
-                            <QBtn
-                                flat
-                                round
-                                color="grey"
-                                class="q-mr-xs q-ml-auto"
-                                size="sm"
-                                icon="filter_alt"
-                                :title="t('recordChanges')"
-                                @click.stop="filterByRecord(modelLog)"
-                            />
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QCard
-                            class="changes-log q-py-none q-mb-xs"
-                            v-for="(log, logIndex) in modelLog.logs"
-                            :key="logIndex"
+                    <div class="timeline">
+                        <div class="user-avatar">
+                            <VnUserLink :worker-id="userLog?.user?.id">
+                                <template #link>
+                                    <VnAvatar
+                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                        :worker-id="userLog?.user?.id"
+                                        :title="userLog?.user?.nickname"
+                                        :show-letter="!userLog?.user"
+                                        size="lg"
+                                    />
+                                </template>
+                            </VnUserLink>
+                        </div>
+                        <div class="arrow bg-panel" v-if="byRecord"></div>
+                        <div class="line"></div>
+                    </div>
+                    <QList class="user-changes" v-if="userLog">
+                        <QItem
+                            class="model-log column q-px-none q-py-xs"
+                            v-for="(modelLog, modelLogIndex) in userLog.logs"
+                            :key="modelLogIndex"
                         >
-                            <QCardSection class="change-info q-pa-none">
-                                <QItem
-                                    class="q-px-sm q-py-xs justify-between items-center"
-                                >
-                                    <div
-                                        class="date text-grey text-caption q-mr-sm"
-                                        :title="
-                                            date.formatDate(
-                                                log.creationDate,
-                                                'DD/MM/YYYY hh:mm:ss'
-                                            ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                            <QItemSection>
+                                <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
+                                    <QChip
+                                        dense
+                                        size="md"
+                                        class="model-name q-mr-xs text-white"
+                                        v-if="
+                                            !(
+                                                modelLog.changedModel &&
+                                                modelLog.changedModelId
+                                            ) && modelLog.model
                                         "
+                                        :style="{
+                                            backgroundColor: useColor(modelLog.model),
+                                        }"
+                                        :title="`${modelLog.model} #${modelLog.id}`"
                                     >
-                                        {{ toRelativeDate(log.creationDate) }}
-                                    </div>
-                                    <div>
-                                        <QBtn
-                                            color="grey"
-                                            class="pit"
-                                            icon="preview"
-                                            flat
-                                            round
-                                            :title="t('pointRecord')"
-                                            padding="none"
-                                            v-if="log.action != 'insert'"
-                                            @click.stop="
-                                                openPointRecord(log.id, modelLog)
-                                            "
-                                        >
-                                            <QPopupProxy>
-                                                <QCard v-if="pointRecord">
-                                                    <div
-                                                        class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                                                    >
-                                                        {{ modelLog.modelI18n }}
-                                                        <span v-if="modelLog.id"
-                                                            >#{{ modelLog.id }}</span
-                                                        >
-                                                    </div>
-                                                    <QCardSection
-                                                        class="change-detail q-pa-sm"
-                                                    >
-                                                        <QItem
-                                                            v-for="(
-                                                                value, index
-                                                            ) in pointRecord"
-                                                            :key="index"
-                                                            class="q-pa-none"
-                                                        >
-                                                            <span
-                                                                class="json-field q-mr-xs text-grey"
-                                                                :title="value.name"
-                                                            >
-                                                                {{ value.nameI18n }}:
-                                                            </span>
-                                                            <VnJsonValue
-                                                                :value="value.val.val"
-                                                            />
-                                                        </QItem>
-                                                    </QCardSection>
-                                                </QCard>
-                                            </QPopupProxy>
-                                        </QBtn>
-                                        <QIcon
-                                            class="action q-ml-xs"
-                                            :class="actionsClass[log.action]"
-                                            :name="actionsIcon[log.action]"
-                                            :title="
-                                                t(`actions.${actionsText[log.action]}`)
-                                            "
-                                        />
-                                    </div>
-                                </QItem>
-                            </QCardSection>
-                            <QCardSection
-                                class="change-detail q-px-sm q-py-xs"
-                                :class="{ expanded: log.expand }"
-                                v-if="log.props.length || log.description"
-                            >
-                                <QIcon
-                                    class="cursor-pointer q-mr-md"
-                                    color="grey"
-                                    name="expand_more"
-                                    :title="t('globals.details')"
-                                    size="sm"
-                                    @click="log.expand = !log.expand"
-                                />
-                                <span v-if="log.props.length" class="attributes">
-                                    <span v-if="!log.expand" class="q-pa-none text-grey">
-                                        <span
-                                            v-for="(prop, propIndex) in log.props"
-                                            :key="propIndex"
-                                            class="basic-json"
-                                        >
-                                            <span class="json-field" :title="prop.name">
-                                                {{ prop.nameI18n }}:
-                                            </span>
-                                            <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="propIndex < log.props.length - 1"
-                                                >,&nbsp;
-                                            </span>
-                                        </span>
-                                    </span>
+                                        {{ t(modelLog.modelI18n) }}
+                                    </QChip>
+
                                     <span
-                                        v-if="log.expand"
-                                        class="expanded-json column q-pa-none"
-                                    >
-                                        <div
-                                            v-for="(prop, prop2Index) in log.props"
-                                            :key="prop2Index"
-                                            class="q-pa-none text-grey"
+                                        class="model-id q-mr-xs"
+                                        v-if="modelLog.summaryId"
+                                        v-text="`#${modelLog.summaryId}`"
+                                    />
+                                    <span
+                                        class="model-value"
+                                        :title="modelLog.showValue"
+                                        v-text="modelLog.showValue"
+                                    />
+                                    <QBtn
+                                        flat
+                                        round
+                                        color="grey"
+                                        class="q-mr-xs q-ml-auto"
+                                        size="sm"
+                                        icon="filter_alt"
+                                        :title="t('recordChanges')"
+                                        @click.stop="filterByRecord(modelLog)"
+                                    />
+                                </QItemLabel>
+                            </QItemSection>
+                            <QItemSection>
+                                <QCard
+                                    class="changes-log q-py-none q-mb-xs"
+                                    v-for="(log, logIndex) in modelLog.logs"
+                                    :key="logIndex"
+                                >
+                                    <QCardSection class="change-info q-pa-none">
+                                        <QItem
+                                            class="q-px-sm q-py-xs justify-between items-center"
                                         >
-                                            <span class="json-field" :title="prop.name">
-                                                {{ prop.nameI18n }}:
-                                            </span>
-                                            <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="prop.val.id" class="id-value">
-                                                #{{ prop.val.id }}
-                                            </span>
-                                            <span v-if="log.action == 'update'">
-                                                ←
-                                                <VnJsonValue :value="prop.old.val" />
-                                                <span v-if="prop.old.id" class="id-value">
-                                                    #{{ prop.old.id }}
+                                            <div
+                                                class="date text-grey text-caption q-mr-sm"
+                                                :title="
+                                                    date.formatDate(
+                                                        log.creationDate,
+                                                        'DD/MM/YYYY hh:mm:ss'
+                                                    ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                                                "
+                                            >
+                                                {{ toRelativeDate(log.creationDate) }}
+                                            </div>
+                                            <div>
+                                                <QBtn
+                                                    color="grey"
+                                                    class="pit"
+                                                    icon="preview"
+                                                    flat
+                                                    round
+                                                    :title="t('pointRecord')"
+                                                    padding="none"
+                                                    v-if="log.action != 'insert'"
+                                                    @click.stop="
+                                                        openPointRecord(log.id, modelLog)
+                                                    "
+                                                >
+                                                    <QPopupProxy>
+                                                        <QCard v-if="pointRecord">
+                                                            <div
+                                                                class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
+                                                            >
+                                                                {{ modelLog.modelI18n }}
+                                                                <span v-if="modelLog.id"
+                                                                    >#{{
+                                                                        modelLog.id
+                                                                    }}</span
+                                                                >
+                                                            </div>
+                                                            <QCardSection
+                                                                class="change-detail q-pa-sm"
+                                                            >
+                                                                <QItem
+                                                                    v-for="(
+                                                                        value, index
+                                                                    ) in pointRecord"
+                                                                    :key="index"
+                                                                    class="q-pa-none"
+                                                                >
+                                                                    <span
+                                                                        class="json-field q-mr-xs text-grey"
+                                                                        :title="
+                                                                            value.name
+                                                                        "
+                                                                    >
+                                                                        {{
+                                                                            value.nameI18n
+                                                                        }}:
+                                                                    </span>
+                                                                    <VnJsonValue
+                                                                        :value="
+                                                                            value.val.val
+                                                                        "
+                                                                    />
+                                                                </QItem>
+                                                            </QCardSection>
+                                                        </QCard>
+                                                    </QPopupProxy>
+                                                </QBtn>
+                                                <QIcon
+                                                    class="action q-ml-xs"
+                                                    :class="actionsClass[log.action]"
+                                                    :name="actionsIcon[log.action]"
+                                                    :title="
+                                                        t(
+                                                            `actions.${
+                                                                actionsText[log.action]
+                                                            }`
+                                                        )
+                                                    "
+                                                />
+                                            </div>
+                                        </QItem>
+                                    </QCardSection>
+                                    <QCardSection
+                                        class="change-detail q-px-sm q-py-xs"
+                                        :class="{ expanded: log.expand }"
+                                        v-if="log.props.length || log.description"
+                                    >
+                                        <QIcon
+                                            class="cursor-pointer q-mr-md"
+                                            color="grey"
+                                            name="expand_more"
+                                            :title="t('globals.details')"
+                                            size="sm"
+                                            @click="log.expand = !log.expand"
+                                        />
+                                        <span v-if="log.props.length" class="attributes">
+                                            <span
+                                                v-if="!log.expand"
+                                                class="q-pa-none text-grey"
+                                            >
+                                                <span
+                                                    v-for="(prop, propIndex) in log.props"
+                                                    :key="propIndex"
+                                                    class="basic-json"
+                                                >
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
+                                                        {{ prop.nameI18n }}:
+                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="
+                                                            propIndex <
+                                                            log.props.length - 1
+                                                        "
+                                                        >,&nbsp;
+                                                    </span>
                                                 </span>
                                             </span>
-                                        </div>
-                                    </span>
-                                </span>
-                                <span v-if="!log.props.length" class="description">
-                                    {{ log.description }}
-                                </span>
-                            </QCardSection>
-                        </QCard>
-                    </QItemSection>
-                </QItem>
-            </QList>
-        </div>
-    </div>
+                                            <span
+                                                v-if="log.expand"
+                                                class="expanded-json column q-pa-none"
+                                            >
+                                                <div
+                                                    v-for="(
+                                                        prop, prop2Index
+                                                    ) in log.props"
+                                                    :key="prop2Index"
+                                                    class="q-pa-none text-grey"
+                                                >
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
+                                                        {{ prop.nameI18n }}:
+                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="prop.val.id"
+                                                        class="id-value"
+                                                    >
+                                                        #{{ prop.val.id }}
+                                                    </span>
+                                                    <span v-if="log.action == 'update'">
+                                                        ←
+                                                        <VnJsonValue
+                                                            :value="prop.old.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                        >
+                                                            #{{ prop.old.id }}
+                                                        </span>
+                                                    </span>
+                                                </div>
+                                            </span>
+                                        </span>
+                                        <span
+                                            v-if="!log.props.length"
+                                            class="description"
+                                        >
+                                            {{ log.description }}
+                                        </span>
+                                    </QCardSection>
+                                </QCard>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </div>
+            </div>
+        </template>
+    </VnPaginate>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QList dense>
             <QSeparator />
@@ -691,17 +723,16 @@ watch(
                 </QOptionGroup>
             </QItem>
             <QItem class="q-mt-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers && userRadio !== null">
+                <QItemSection v-if="userRadio !== null">
                     <VnSelect
                         class="full-width"
                         :label="t('globals.user')"
                         v-model="userSelect"
                         option-label="name"
                         option-value="id"
-                        :options="workers"
+                        :url="`${model}Logs/${$route.params.id}/editors`"
+                        :fields="['id', 'nickname', 'name', 'image']"
+                        sort-by="nickname"
                         @update:model-value="selectFilter('userSelect')"
                         hide-selected
                     >

From bd00f86d74e9b52af56b34a126faaba11c6109e6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 14:09:29 +0200
Subject: [PATCH 134/162] chore: refs #4074 fix tests

---
 .../__tests__/composables/useAcl.spec.js      | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
index a2b44b5e7..6cb29984c 100644
--- a/test/vitest/__tests__/composables/useAcl.spec.js
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -48,40 +48,62 @@ describe('useAcl', () => {
 
     describe('hasAny', () => {
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', 'updateAttributes', 'WRITE')).toBeFalsy();
+            expect(
+                acl.hasAny([
+                    { model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
+                ])
+            ).toBeFalsy();
         });
 
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', 'holidays', 'READ')).toBeTruthy();
+            expect(
+                acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }])
+            ).toBeTruthy();
         });
 
         describe('*', () => {
             it('should return true if an acl matched', async () => {
-                expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy();
+                expect(
+                    acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }])
+                ).toBeTruthy();
             });
 
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('Worker', '*', 'READ')).toBeFalsy();
+                expect(
+                    acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }])
+                ).toBeFalsy();
             });
         });
 
         describe('$authenticated', () => {
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('Url', 'getByUser', '*')).toBeFalsy();
+                expect(
+                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }])
+                ).toBeFalsy();
             });
 
             it('should return true if an acl matched', async () => {
-                expect(acl.hasAny('Url', 'getByUser', 'READ')).toBeTruthy();
+                expect(
+                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }])
+                ).toBeTruthy();
             });
         });
 
         describe('$everyone', () => {
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('TpvTransaction', 'start', 'READ')).toBeFalsy();
+                expect(
+                    acl.hasAny([
+                        { model: 'TpvTransaction', props: 'start', accessType: 'READ' },
+                    ])
+                ).toBeFalsy();
             });
 
             it('should return false if an acl matched', async () => {
-                expect(acl.hasAny('TpvTransaction', 'start', 'WRITE')).toBeTruthy();
+                expect(
+                    acl.hasAny([
+                        { model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
+                    ])
+                ).toBeTruthy();
             });
         });
     });

From 67b2cd3a0b81a19109cc958e485d5b6800d0f152 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 14:58:26 +0200
Subject: [PATCH 135/162] feat: stateGroupedFilter

---
 src/pages/Ticket/TicketFuture.vue       | 19 +++++++++++--------
 src/pages/Ticket/TicketFutureFilter.vue | 18 +++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 14a4a5ac8..2078d0595 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -49,8 +49,8 @@ const exprBuilder = (param, value) => {
 };
 
 const userParams = reactive({
-    futureDated: Date.vnNew().toISOString(),
-    originDated: Date.vnNew().toISOString(),
+    futureScopeDays: Date.vnNew().toISOString(),
+    originScopeDays: Date.vnNew().toISOString(),
     warehouseFk: user.value.warehouseFk,
 });
 
@@ -62,8 +62,8 @@ const arrayData = useArrayData('FutureTickets', {
 const { store } = arrayData;
 
 const params = reactive({
-    futureDated: Date.vnNew(),
-    originDated: Date.vnNew(),
+    futureScopeDays: Date.vnNew(),
+    originScopeDays: Date.vnNew(),
     warehouseFk: user.value.warehouseFk,
 });
 
@@ -172,7 +172,7 @@ const ticketColumns = computed(() => [
         label: t('futureTickets.availableLines'),
         name: 'lines',
         field: 'lines',
-        align: 'left',
+        align: 'center',
         sortable: true,
         columnFilter: {
             component: VnInput,
@@ -234,7 +234,7 @@ const ticketColumns = computed(() => [
     {
         label: t('futureTickets.futureState'),
         name: 'futureState',
-        align: 'left',
+        align: 'right',
         sortable: true,
         columnFilter: null,
         format: (val) => dashIfEmpty(val),
@@ -458,7 +458,7 @@ onMounted(async () => {
                 </QTd>
             </template>
             <template #body-cell-shipped="{ row }">
-                <QTd>
+                <QTd class="shipped">
                     <QBadge
                         text-color="black"
                         :color="getDateQBadgeColor(row.shipped)"
@@ -505,7 +505,7 @@ onMounted(async () => {
                 </QTd>
             </template>
             <template #body-cell-futureShipped="{ row }">
-                <QTd>
+                <QTd class="shipped">
                     <QBadge
                         text-color="black"
                         :color="getDateQBadgeColor(row.futureShipped)"
@@ -532,6 +532,9 @@ onMounted(async () => {
 </template>
 
 <style scoped lang="scss">
+.shipped {
+    min-width: 132px;
+}
 .vertical-separator {
     border-left: 4px solid white !important;
 }
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index c5e647d64..bb597a525 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -68,7 +68,7 @@ onMounted(async () => {
     <VnFilterPanel
         :data-key="props.dataKey"
         :hidden-tags="['search']"
-        :un-removable-params="['warehouseFk', 'originDated', 'futureDated']"
+        :un-removable-params="['warehouseFk', 'originScopeDays ', 'futureScopeDays']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -80,8 +80,8 @@ onMounted(async () => {
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
-                        v-model="params.originDated"
-                        :label="t('params.originDated')"
+                        v-model="params.originScopeDays"
+                        :label="t('params.originScopeDays')"
                         is-outlined
                     />
                 </QItemSection>
@@ -89,8 +89,8 @@ onMounted(async () => {
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
-                        v-model="params.futureDated"
-                        :label="t('params.futureDated')"
+                        v-model="params.futureScopeDays"
+                        :label="t('params.futureScopeDays')"
                         is-outlined
                     />
                 </QItemSection>
@@ -214,8 +214,8 @@ onMounted(async () => {
 en:
     iptInfo: IPT
     params:
-        originDated: Origin date
-        futureDated: Destination date
+        originScopeDays: Origin date
+        futureScopeDays: Destination date
         futureIpt: Destination IPT
         ipt: Origin IPT
         warehouseFk: Warehouse
@@ -229,8 +229,8 @@ es:
     Vertical: Vertical
     iptInfo: Encajado
     params:
-        originDated: Fecha origen
-        futureDated: Fecha destino
+        originScopeDays: Fecha origen
+        futureScopeDays: Fecha destino
         futureIpt: IPT destino
         ipt: IPT Origen
         warehouseFk: Almacén

From 26c7dfde35095ad44f64be45d4be8de70fdd6002 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 16:44:43 +0200
Subject: [PATCH 136/162] chore: refs #4074 fix tests

---
 src/components/common/VnSelectDialog.vue         | 4 ++--
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 7338e752d..219e6dc98 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -44,7 +44,7 @@ const isAllowedToCreate = computed(() => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="showForm = true"
+                @click.stop.prevent="$refs.dialog.show()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
@@ -54,7 +54,7 @@ const isAllowedToCreate = computed(() => {
             >
                 <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
             </QIcon>
-            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+            <QDialog ref="dialog" transition-show="scale" transition-hide="scale">
                 <slot name="form" />
             </QDialog>
         </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index b7f470b0c..ee829ccdd 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -294,7 +294,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </InvoiceInToBook>
             <QItem
-                v-if="entity?.isBooked && canEditProp('toUnBook')"
+                v-if="entity?.isBooked && canEditProp('toUnbook')"
                 v-ripple
                 clickable
                 @click="triggerMenu('unbook')"

From 04aa96b798661a0d8bfe4b1f002eed4966ac1d95 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:01:36 +0200
Subject: [PATCH 137/162] chore: refs #4074 fix tests

---
 test/cypress/integration/outLogin/login.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/outLogin/login.spec.js b/test/cypress/integration/outLogin/login.spec.js
index f8a9f5c64..6757ba7d0 100755
--- a/test/cypress/integration/outLogin/login.spec.js
+++ b/test/cypress/integration/outLogin/login.spec.js
@@ -53,8 +53,8 @@ describe('Login', () => {
     });
 
     it(`should get redirected to dashboard since employee can't create tickets`, () => {
-        cy.visit('/#/ticket/create', { failOnStatusCode: false });
-        cy.url().should('contain', '/#/login?redirect=/ticket/create');
+        cy.visit('/#/account/ldap', { failOnStatusCode: false });
+        cy.url().should('contain', '/#/login?redirect=/account/ldap');
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();

From f8cbb0a7629d7ffd9dd6145c12722deb73411162 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:10:35 +0200
Subject: [PATCH 138/162] chore: refs #4074 fix tests

---
 src/pages/Worker/Card/WorkerLocker.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index ba5c0de97..4a19e472c 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -57,7 +57,11 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAny('Worker','__get__locker','READ')"
+                :readonly="
+                    !hasAny([
+                        { model: 'Worker', props: '__get__locker', accessType: 'READ' },
+                    ])
+                "
             />
         </template>
     </FormModel>

From f3471fe5ab683768331a2c6c566156d8954a4c2f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:20:16 +0200
Subject: [PATCH 139/162] fix: refs #4074 await to watch

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

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index d51b0fcef..441a8ff48 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -120,7 +120,7 @@ watch(
 
 watch(
     () => [props.url, props.filter, props.userParams],
-    ([url, filter, userParams]) => fetch({ url, filter, userParams })
+    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
 );
 
 const addFilter = async (filter, params) => {

From 7358dab1d00632aa6bc6ff86d16e5a4d60f8f84e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:16:01 +0200
Subject: [PATCH 140/162] fix: call upsert when crudModel haschanges

---
 src/components/VnTable/VnTable.vue | 1 +
 src/pages/Item/ItemFixedPrice.vue  | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6745a2f49..899e4d000 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -296,6 +296,7 @@ defineExpose({
     reload,
     redirect: redirectFn,
     selected,
+    CrudModelRef,
 });
 
 function handleOnDataSaved(_, res) {
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 59a3e74db..16091d473 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -262,10 +262,13 @@ const updateMinPrice = async (value, props) => {
     });
 };
 
-const upsertPrice = async ({ row }, resetMinPrice = false) => {
+const upsertPrice = async (props, resetMinPrice = false) => {
     try {
-        if (resetMinPrice) row.hasMinPrice = 0;
-        row = await upsertFixedPrice(row);
+        const { row } = props;
+        if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) {
+            if (resetMinPrice) row.hasMinPrice = 0;
+            await upsertFixedPrice(row);
+        }
     } catch (err) {
         console.error('Error editing price', err);
     }

From 9c86fd0ed50a6bc1821d2ab622cc08965bda7149 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:17:13 +0200
Subject: [PATCH 141/162] perf: order by

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

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 16091d473..4f78bd6ce 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -462,7 +462,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['name ASC', 'itemFk DESC']"
+            :order="['itemFk ASC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"

From 41939315be61ef17a5108ff61410d4b11b124239 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:17:39 +0200
Subject: [PATCH 142/162] style: show subName value

---
 src/pages/Item/ItemFixedPrice.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 4f78bd6ce..a195bc615 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -519,16 +519,12 @@ function handleOnDataSave({ CrudModelRef }) {
                 </QTd>
             </template>
             <template #column-description="{ row }">
-                <QTd class="col">
-                    <span class="link">
-                        {{ row.name }}
-                    </span>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                    <FetchedTags
-                        style="width: max-content; max-width: 220px"
-                        :item="row"
-                    />
-                </QTd>
+                <span class="link">
+                    {{ row.name }}
+                </span>
+                <span class="subName">{{ row.subName }}</span>
+                <ItemDescriptorProxy :id="row.itemFk" />
+                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
             </template>
             <template #column-rate2="props">
                 <QTd class="col">
@@ -682,6 +678,12 @@ tbody tr.highlight .q-td {
         background-color: transparent;
     }
 }
+.subName {
+    margin-left: 5%;
+    font-size: 0.75rem;
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
 </style>
 <i18n>
 es:

From b4b65ad0fd2c21a1a846d5fc9d68bf6926fd0a71 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:17:59 +0200
Subject: [PATCH 143/162] fix: minor error whit dates

---
 src/pages/Item/ItemFixedPrice.vue | 32 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index a195bc615..1d7a30dee 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -570,26 +570,22 @@ function handleOnDataSave({ CrudModelRef }) {
                 </QTd>
             </template>
             <template #column-started="props">
-                <QTd class="col">
-                    <VnInputDate
-                        class="vnInputDate"
-                        :show-event="true"
-                        v-model="props.row.started"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="dateStyle(isBigger(props.row.started))"
-                    />
-                </QTd>
+                <VnInputDate
+                    class="vnInputDate"
+                    :show-event="true"
+                    v-model="props.row.started"
+                    v-on="getRowUpdateInputEvents(props, false, 'date')"
+                    v-bind="dateStyle(isBigger(props.row.started))"
+                />
             </template>
             <template #column-ended="props">
-                <QTd class="col">
-                    <VnInputDate
-                        class="vnInputDate"
-                        :show-event="true"
-                        v-model="props.row.ended"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="dateStyle(isLower(props.row.started))"
-                    />
-                </QTd>
+                <VnInputDate
+                    class="vnInputDate"
+                    :show-event="true"
+                    v-model="props.row.ended"
+                    v-on="getRowUpdateInputEvents(props, false, 'date')"
+                    v-bind="dateStyle(isLower(props.row.ended))"
+                />
             </template>
             <template #column-warehouseFk="props">
                 <QTd class="col">

From d734674eb6c47c6e9af6a2954c69880a2a7293df Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 00:18:09 +0200
Subject: [PATCH 144/162] fix: minor changes

---
 src/pages/Item/ItemFixedPrice.vue | 149 ++++++++++++++----------------
 1 file changed, 67 insertions(+), 82 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 1d7a30dee..d91b5189e 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -212,15 +212,6 @@ const editTableFieldsOptions = [
             type: 'number',
         },
     },
-    {
-        field: 'hasMinPrice',
-        label: t('item.fixedPrice.hasMinPrice'),
-        component: 'checkbox',
-        attrs: {
-            'false-value': 0,
-            'true-value': 1,
-        },
-    },
     {
         field: 'started',
         label: t('item.fixedPrice.started'),
@@ -286,8 +277,7 @@ async function upsertFixedPrice(row) {
 async function saveOnRowChange(row) {
     if (rowsSelected.value.length > 1) return;
     if (rowsSelected.value[0]?.id === row.id) return;
-    else if (rowsSelected.value.length === 1)
-        await upsertFixedPrice(rowsSelected.value[0]);
+    else if (rowsSelected.value.length === 1) await upsertPrice(rowsSelected.value[0]);
     rowsSelected.value = [row];
 }
 
@@ -457,6 +447,12 @@ function handleOnDataSave({ CrudModelRef }) {
     </VnSubToolbar>
     <QPage>
         <VnTable
+            @on-fetch="
+                (data) =>
+                    data.forEach((item) => {
+                        item.hasMinPrice = `${item.hasMinPrice !== 0}`;
+                    })
+            "
             :default-remove="false"
             :default-reset="false"
             :default-save="false"
@@ -497,26 +493,24 @@ function handleOnDataSave({ CrudModelRef }) {
             </template>
 
             <template #column-itemId="props">
-                <QTd>
-                    <VnSelect
-                        style="max-width: 100px"
-                        url="Items/withName"
-                        hide-selected
-                        option-label="id"
-                        option-value="id"
-                        v-model="props.row.itemFk"
-                        v-on="getRowUpdateInputEvents(props, true, 'select')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QTd>
+                <VnSelect
+                    style="max-width: 100px"
+                    url="Items/withName"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="props.row.itemFk"
+                    v-on="getRowUpdateInputEvents(props, true, 'select')"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </template>
             <template #column-description="{ row }">
                 <span class="link">
@@ -527,26 +521,22 @@ function handleOnDataSave({ CrudModelRef }) {
                 <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
             </template>
             <template #column-rate2="props">
-                <QTd class="col">
-                    <VnInput
-                        mask="###.##"
-                        v-model.number="props.row.rate2"
-                        v-on="getRowUpdateInputEvents(props)"
-                    >
-                        <template #append>€</template>
-                    </VnInput>
-                </QTd>
+                <VnInput
+                    mask="###.##"
+                    v-model.number="props.row.rate2"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
             </template>
             <template #column-rate3="props">
-                <QTd class="col">
-                    <VnInput
-                        mask="###.##"
-                        v-model.number="props.row.rate3"
-                        v-on="getRowUpdateInputEvents(props)"
-                    >
-                        <template #append>€</template>
-                    </VnInput>
-                </QTd>
+                <VnInput
+                    mask="###.##"
+                    v-model.number="props.row.rate3"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
@@ -554,12 +544,11 @@ function handleOnDataSave({ CrudModelRef }) {
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
-                            :false-value="0"
-                            :true-value="1"
+                            :false-value="'false'"
+                            :true-value="'true'"
                         />
                         <VnInput
                             class="col"
-                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -588,38 +577,34 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <QTd class="col">
-                    <VnSelect
-                        style="max-width: 150px"
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="props.row.warehouseFk"
-                        v-on="getRowUpdateInputEvents(props, false, 'select')"
-                    />
-                </QTd>
+                <VnSelect
+                    style="max-width: 150px"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="props.row.warehouseFk"
+                    v-on="getRowUpdateInputEvents(props, false, 'select')"
+                />
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
-                <QTd class="col">
-                    <QIcon
-                        name="delete"
-                        size="sm"
-                        class="cursor-pointer fill-icon-on-hover"
-                        color="primary"
-                        @click.stop="
-                            openConfirmationModal(
-                                t('globals.rowWillBeRemoved'),
-                                t('Do you want to clone this item?'),
-                                () => removePrice(row.id, rowIndex)
-                            )
-                        "
-                    >
-                        <QTooltip class="text-no-wrap">
-                            {{ t('globals.delete') }}
-                        </QTooltip>
-                    </QIcon>
-                </QTd>
+                <QIcon
+                    name="delete"
+                    size="sm"
+                    class="cursor-pointer fill-icon-on-hover"
+                    color="primary"
+                    @click.stop="
+                        openConfirmationModal(
+                            t('globals.rowWillBeRemoved'),
+                            t('Do you want to clone this item?'),
+                            () => removePrice(row.id, rowIndex)
+                        )
+                    "
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('globals.delete') }}
+                    </QTooltip>
+                </QIcon>
             </template>
         </VnTable>
 

From 3fafb15eb8cd0da28757a9d1a20a5518b021824e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 09:18:57 +0200
Subject: [PATCH 145/162] refactor: refs #4074 use fn

---
 src/pages/Item/Card/ItemSummary.vue            | 18 ++++++++----------
 .../cypress/integration/outLogin/login.spec.js |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 081eb2afb..7b6015c30 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -20,6 +20,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
+const getUrl = (id, param) => `#/Item/${id}/${param}`;
 </script>
 <template>
     <CardSummary
@@ -53,7 +54,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.basicData')"
                 />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
@@ -87,7 +88,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.otherData')"
                 />
                 <VnLv
@@ -114,10 +115,7 @@ const entityId = computed(() => $props.id || route.params.id);
                 />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle
-                    :url="`#/item/${entityId}/tags`"
-                    :text="t('item.summary.tags')"
-                />
+                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('item.summary.tags')" />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -127,13 +125,13 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one" v-if="item.description">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.description')"
                 />
                 <p v-text="item.description" />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
+                <VnTitle :url="getUrl(entityId, 'tax')" :text="t('item.summary.tax')" />
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
@@ -143,7 +141,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/botanical`"
+                    :url="getUrl(entityId, 'botanical')"
                     :text="t('item.summary.botanical')"
                 />
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
@@ -154,7 +152,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/barcode`"
+                    :url="getUrl(entityId, 'barcode')"
                     :text="t('item.summary.barcode')"
                 />
                 <p
diff --git a/test/cypress/integration/outLogin/login.spec.js b/test/cypress/integration/outLogin/login.spec.js
index 6757ba7d0..3db223cdb 100755
--- a/test/cypress/integration/outLogin/login.spec.js
+++ b/test/cypress/integration/outLogin/login.spec.js
@@ -52,7 +52,7 @@ describe('Login', () => {
         cy.url().should('contain', '/login');
     });
 
-    it(`should get redirected to dashboard since employee can't create tickets`, () => {
+    it(`should be redirected to dashboard since the employee is not enabled to see ldap`, () => {
         cy.visit('/#/account/ldap', { failOnStatusCode: false });
         cy.url().should('contain', '/#/login?redirect=/account/ldap');
         cy.get('input[aria-label="Username"]').type('employee');

From 5cc1d0cec42a6c9cdcbf84d0e5a455d209105fcd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 10:04:40 +0200
Subject: [PATCH 146/162] chore: refs #7663 drop useless code

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 9491579f8..4cf4e633f 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -170,15 +170,10 @@ async function sendSms(body) {
 }
 
 function openConfirmDialog(callback) {
-    const message =
-        callback == 'setWeight'
-            ? t('Es posible que se facture este ticket, desea continuar?')
-            : undefined;
     dialog({
         component: VnConfirm,
         componentProps: {
             promise: actions[callback],
-            message,
         },
     });
 }

From 6d017d8c99aa3cc62ebc6a89d86b4828a4e174f6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 10 Sep 2024 10:33:55 +0200
Subject: [PATCH 147/162] build: init version 2440

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f25e570a3..eaffd8d85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.36.0",
+    "version": "24.40.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -62,4 +62,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}
\ No newline at end of file

From 8c57bca4e07138945686f88002aced5628214684 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 10 Sep 2024 10:36:41 +0200
Subject: [PATCH 148/162] hotfix cau #218919 accountPrivileges fix

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

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 1300f5018..513be7594 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -12,16 +12,21 @@ const route = useRoute();
 
 const rolesOptions = ref([]);
 const formModelRef = ref();
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset()
+);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
     <FormModel
         ref="formModelRef"
         model="AccountPrivileges"
-        :url="`VnUsers/${route.params.id}/privileges`"
-        :url-create="`VnUsers/${route.params.id}/privileges`"
+        url="VnUsers/preview"
+        :filter="{ where: { id: route.params.id } }"
+        :url-update="`VnUsers/${route.params.id}`"
+        :id="route.params.id"
         auto-load
-        @on-data-saved="formModelRef.fetch()"
     >
         <template #form="{ data }">
             <div class="q-gutter-y-sm">

From 7b2545798c4001621794e4bd0322780581988938 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 10 Sep 2024 12:38:09 +0200
Subject: [PATCH 149/162] fix(account_privileges): fix url update

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

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 513be7594..fea57105b 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -24,7 +24,7 @@ watch(
         model="AccountPrivileges"
         url="VnUsers/preview"
         :filter="{ where: { id: route.params.id } }"
-        :url-update="`VnUsers/${route.params.id}`"
+        :url-create="`VnUsers/${route.params.id}/privileges`"
         :id="route.params.id"
         auto-load
     >

From 070c9ca25f8c13dfc3e027db42a261cdc1329440 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 14:17:59 +0200
Subject: [PATCH 150/162] fix: refs #6900 e2e error

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

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..444022776 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>

From 77f2a4d8250764b2d99fc8ec3766fe8ebe99bd95 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 14:36:44 +0200
Subject: [PATCH 151/162] fix: refs #6900 rollback

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

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 444022776..9fe66e278 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding?.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>

From a41143b410d8d25ea401ec8e0dff057a53d28318 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 14:43:35 +0200
Subject: [PATCH 152/162] chore: refs #6772 fix e2e

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

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 5cee06582..7d29da232 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -79,7 +79,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.fullPath" />
+                <RouterView :key="route.path" />
             </div>
         </QPage>
     </QPageContainer>

From 622afca9be3859ef2777b241d2b3c82d5d4034b6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 15:17:10 +0200
Subject: [PATCH 153/162] feat: CustomerSample to VnTable

---
 src/components/LeftMenuItem.vue               |  2 +-
 src/components/VnTable/VnTable.vue            |  6 +-
 .../Customer/Card/CustomerBillingData.vue     |  4 +-
 src/pages/Customer/Card/CustomerGreuges.vue   |  1 -
 src/pages/Customer/Card/CustomerSamples.vue   | 80 ++++++-----------
 .../components/CustomerAddressCreate.vue      |  4 +-
 .../components/CustomerAddressEdit.vue        |  8 +-
 .../CustomerFileManagementCreate.vue          | 12 +--
 .../components/CustomerFileManagementEdit.vue | 10 +--
 .../components/CustomerSamplesCreate.vue      | 90 ++++++++-----------
 .../components/CustomerSummaryTable.vue       |  1 +
 src/pages/Dashboard/DashboardMain.vue         |  2 +-
 .../Department/Card/DepartmentBasicData.vue   |  4 +-
 13 files changed, 93 insertions(+), 131 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..2a6de5e2e 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4ba7d0227..964dafabe 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -363,7 +363,7 @@ function handleOnDataSaved(_, res) {
     <!-- class in div to fix warn-->
     <CrudModel
         v-bind="$attrs"
-        :class="$attrs['class']"
+        :class="$attrs['class'] ?? 'q-px-md'"
         :limit="$attrs['limit'] ?? 20"
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
@@ -638,7 +638,7 @@ function handleOnDataSaved(_, res) {
             </QTable>
         </template>
     </CrudModel>
-    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+    <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
         <QBtn
             @click="
                 () =>
@@ -650,7 +650,7 @@ function handleOnDataSaved(_, res) {
             shortcut="+"
         />
         <QTooltip>
-            {{ createForm.title }}
+            {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
     <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 290bde909..e375846c9 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -31,8 +31,8 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
+    <FetchData
         ref="bankEntitiesRef"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         :filter="filter"
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 8a83d49db..1c78392e7 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -47,7 +47,6 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        // name: 'userFk',
         label: t('Created by'),
         component: 'userLink',
         attrs: ({ row }) => {
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index e28e290f4..49697aab7 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -3,18 +3,18 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { QBtn } from 'quasar';
+import { QBtn, useQuasar } from 'quasar';
 
-import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
+import CustomerSamplesCreate from '../components/CustomerSamplesCreate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const rows = ref([]);
-
 const filter = {
     include: [
         { relation: 'type', scope: { fields: ['code', 'description'] } },
@@ -26,91 +26,67 @@ const filter = {
     limit: 20,
 };
 
-const basicSpan = {
-    component: 'span',
-    props: () => {},
-    event: () => {},
-};
-const tableColumnComponents = {
-    sent: basicSpan,
-    description: basicSpan,
-    worker: {
-        component: 'span',
-        props: () => ({ class: 'link' }),
-        event: () => {},
-    },
-    company: basicSpan,
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
+        name: 'created',
         label: t('Sent'),
-        name: 'sent',
-        format: (value) => toDateTimeFormat(value),
+        format: ({ created }) => toDateTimeFormat(created),
     },
     {
         align: 'left',
-        field: (value) => value.type.description,
+        format: (row) => row.type.description,
         label: t('Description'),
         name: 'description',
     },
     {
         align: 'left',
-        field: (value) => value.user.name,
         label: t('Worker'),
         name: 'worker',
     },
     {
         align: 'left',
-        field: (value) => value.company?.code,
+        format: ({ company }) => company?.code ?? dashIfEmpty(company),
         label: t('Company'),
         name: 'company',
     },
 ]);
+const quasar = useQuasar();
 
 const toCustomerSamplesCreate = () => {
-    router.push({ name: 'CustomerSamplesCreate' });
+    quasar
+        .dialog({
+            component: CustomerSamplesCreate,
+        })
+        .onOk(() => tableRef.value.reload());
 };
+const tableRef = ref();
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientSamples"
         auto-load
+        :filter="filter"
         url="ClientSamples"
-    />
-
-    <QTable
         :columns="columns"
         :pagination="{ rowsPerPage: 12 }"
+        :disable-option="{ card: true }"
         :rows="rows"
         class="full-width q-mt-md"
         row-key="id"
+        :create="false"
         :no-data-label="t('globals.noResults')"
     >
-        <template #body-cell="props">
-            <QTd auto-width :props="props">
-                <span :props="props" class="cursor-pointer">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                        :title="props.value"
-                    >
-                        {{ props.value }}
-                        <WorkerDescriptorProxy
-                            :id="props.row.userFk"
-                            v-if="props.col.name === 'worker'"
-                        />
-                    </component>
-                </span>
-            </QTd>
+        <template #column-worker="{ row }">
+            <div v-if="row.user">
+                <span class="link">{{ row.user?.name }}</span
+                ><WorkerDescriptorProxy :id="row.userFk" />
+            </div>
+            <span v-else>{{ dashIfEmpty(row.user) }}</span>
         </template>
-    </QTable>
+    </VnTable>
 
     <QPageSticky :offset="[18, 18]">
         <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..f93406185 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -57,12 +57,12 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
 
     <FormModel
         :form-initial-data="formInitialData"
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..ddcb8e2d6 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -113,18 +113,18 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData
         @on-fetch="(data) => (customsAgents = data)"
         auto-load
         url="CustomsAgents"
     />
-    <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
+    <FetchData @on-fetch="getData" auto-load url="ObservationTypes" />
 
     <FormModel
         :observe-form-changes="false"
diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
index 7c15e0b71..f33a47bcc 100644
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@@ -83,35 +83,35 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (client = data)"
         auto-load
         :url="`Clients/${route.params.id}/getCard`"
     />
-    <fetch-data
+    <FetchData
         :filter="filterFindOne"
         @on-fetch="(data) => (findOne = data)"
         auto-load
         url="DmsTypes/findOne"
     />
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load
diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
index 80eaa44f9..107f41330 100644
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@@ -69,25 +69,25 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
-    <fetch-data
+    <FetchData :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 79f4fe449..c7772ab4e 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 import { usePrintService } from 'composables/usePrintService';
-import { useQuasar } from 'quasar';
+import { useDialogPluginComponent, useQuasar } from 'quasar';
 
 import { useState } from 'src/composables/useState';
 import { useValidator } from 'src/composables/useValidator';
@@ -18,6 +18,10 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
 import { useStateStore } from 'stores/useStateStore';
+import FormPopup from 'src/components/FormPopup.vue';
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -181,6 +185,7 @@ const onDataSaved = async () => {
         const samplesData = await getSamples();
         const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
         await sendEmail(path, params);
+        onDialogOK(params);
     } catch (error) {
         notify('errors.create', 'negative');
     }
@@ -197,73 +202,54 @@ const toCustomerSamples = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         :filter="filterEmailUsers"
         @on-fetch="setEmailUser"
         auto-load
         url="EmailUsers"
     />
-    <fetch-data
+    <FetchData
         :filter="filterClientsAddresses"
         :url="`Clients/${route.params.id}/addresses`"
         @on-fetch="setClientsAddresses"
         auto-load
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterSamplesVisible"
         @on-fetch="(data) => (optionsSamplesVisible = data)"
         auto-load
         url="Samples/visible"
     />
 
-    <Teleport v-if="stateStore?.isSubToolbarShown()" to="#st-actions">
-        <QBtnGroup push class="q-gutter-x-sm">
-            <QBtn
-                :label="t('globals.cancel')"
-                @click="toCustomerSamples"
-                color="primary"
-                flat
-                icon="close"
-            />
-            <QBtn
-                :disabled="isLoading || !sampleType?.hasPreview"
-                :label="t('Preview')"
-                :loading="isLoading"
-                @click.stop="getPreview()"
-                color="primary"
-                flat
-                icon="preview"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.reset')"
-                :loading="isLoading"
-                @click="setInitialData"
-                color="primary"
-                flat
-                icon="restart_alt"
-                type="reset"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.save')"
-                :loading="isLoading"
-                @click="onSubmit"
-                color="primary"
-                icon="save"
-            />
-        </QBtnGroup>
-    </Teleport>
-
-    <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
-            <QForm>
+    <QDialog ref="dialogRef">
+        <FormPopup
+            :default-cancel-button="false"
+            :default-submit-button="false"
+            @on-submit="onSubmit()"
+        >
+            <template #custom-buttons>
+                <QBtn
+                    :disabled="isLoading || !sampleType?.hasPreview"
+                    :label="t('Preview')"
+                    :loading="isLoading"
+                    @click.stop="getPreview()"
+                    color="primary"
+                    flat
+                    icon="preview" /><QBtn
+                    :disabled="!hasChanged"
+                    :label="t('globals.save')"
+                    :loading="isLoading"
+                    @click="onSubmit"
+                    color="primary"
+                    icon="save"
+            /></template>
+            <template #form-inputs>
                 <div class="col">
                     <VnSelect
                         :label="t('Sample')"
@@ -371,15 +357,15 @@ const toCustomerSamples = () => {
                             required="true"
                             v-model="initialData.from"
                         />
-                    </div>
-                </VnRow>
-            </QForm>
-        </QCard>
-    </div>
+                    </div> </VnRow
+            ></template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
 es:
+    New sample: Crear plantilla
     Sample: Plantilla
     Recipient: Destinatario
     Reply to: Responder a
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index e2fb61322..87e4cffa7 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -150,6 +150,7 @@ const setShippedColor = (date) => {
         order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
         limit="5"
+        class="full-width"
     >
         <template #column-nickname="{ row }">
             <span class="link">
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index a339120e2..56054156a 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -60,7 +60,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                             <QTooltip>
                                                 {{
                                                     'Ctrl + Alt + ' +
-                                                    item.keyBinding.toUpperCase()
+                                                    item?.keyBinding?.toUpperCase()
                                                 }}
                                             </QTooltip>
                                         </div>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 4573f7b66..98abfd6b9 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -16,12 +16,12 @@ const workersOptions = ref([]);
 const clientsOptions = ref([]);
 </script>
 <template>
-    <fetch-data
+    <FetchData
         url="Workers/search"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
     />
-    <fetch-data url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
+    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FormModel
         :url="`Departments/${route.params.id}`"
         model="department"

From e7fb6a796328f291f7bb3939690ff280852216ae Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Sep 2024 08:32:59 +0200
Subject: [PATCH 154/162] hotFix: keyBinding toUpperCase if is null

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

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..2a6de5e2e 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>

From 97da1065221012baefe01a0900f7fc25110ce2bb Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Sep 2024 08:33:25 +0200
Subject: [PATCH 155/162] hotFix: keyBinding toUpperCase if is null

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

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..2a6de5e2e 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>

From 19eb77089365f497ee73860e21724a2dc93d2f85 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 08:41:16 +0200
Subject: [PATCH 156/162] feat: remove cli warnings

---
 src/components/VnTable/VnTable.vue            |  2 +-
 src/components/common/VnSelectDialog.vue      |  1 -
 src/pages/Customer/Card/CustomerUnpaid.vue    |  5 +-
 .../components/CustomerSamplesCreate.vue      | 56 +++++++------------
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 964dafabe..0ed3de261 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -303,7 +303,7 @@ defineExpose({
     CrudModelRef,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved(this);
     else $props.create.onDataSaved(_);
 }
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 219e6dc98..17f893255 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -28,7 +28,6 @@ const $props = defineProps({
 
 const role = useRole();
 const acl = useAcl();
-const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
     if ($props.acls.length) return acl.hasAny($props.acls);
diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index 5b9a6cde2..ad00cbf59 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -151,7 +151,10 @@ watch(
                             clearable
                             type="number"
                             v-model="amount"
-                        />
+                            autofocus
+                        >
+                            <template #append>€</template></VnInput
+                        >
                     </div>
                 </VnRow>
             </QForm>
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index c7772ab4e..3c9eb856b 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, reactive, ref } from 'vue';
+import { computed, onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -17,9 +17,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
-import { useStateStore } from 'stores/useStateStore';
 import FormPopup from 'src/components/FormPopup.vue';
-defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
@@ -31,17 +29,17 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const stateStore = useStateStore();
 const { sendEmail } = usePrintService();
-const client = ref({});
 const hasChanged = ref(false);
 const isLoading = ref(false);
-const optionsClientsAddressess = ref([]);
-const optionsCompanies = ref([]);
+const addressess = ref([]);
+const companies = ref([]);
 const optionsEmailUsers = ref([]);
 const optionsSamplesVisible = ref([]);
 const sampleType = ref({ hasPreview: false });
-
+const initialData = reactive({});
+const entityId = computed(() => route.params.id);
+const customer = computed(() => state.get('customer'));
 const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
@@ -63,14 +61,13 @@ const filterSamplesVisible = {
     ],
     order: ['description'],
 };
-const initialData = reactive({});
+
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 onBeforeMount(async () => {
-    const { data } = await axios.get(`Clients/1/getCard`);
-    client.value = data;
-    initialData.clientFk = route.params?.id;
-    initialData.recipient = data.email;
-    initialData.recipientId = data.id;
+    initialData.clientFk = customer.value.id;
+    initialData.recipient = customer.value.email;
+    initialData.recipientId = customer.value.id;
 });
 
 const setEmailUser = (data) => {
@@ -80,7 +77,7 @@ const setEmailUser = (data) => {
 
 const setClientsAddresses = (data) => {
     initialData.addressId = data[0].id;
-    optionsClientsAddressess.value = data;
+    addressess.value = data;
 };
 
 const setSampleType = (sampleId) => {
@@ -93,20 +90,6 @@ const setSampleType = (sampleId) => {
     initialData.companyId = companyFk;
 };
 
-const setInitialData = () => {
-    hasChanged.value = false;
-
-    initialData.addressId = optionsClientsAddressess.value[0].id;
-    initialData.companyFk = null;
-    initialData.from = null;
-    initialData.recipient = client.value.email;
-    initialData.recipientId = client.value.id;
-    initialData.replyTo = optionsEmailUsers.value[0]?.email;
-    initialData.typeFk = '';
-
-    sampleType.value = {};
-};
-
 const validateMessage = () => {
     if (!initialData.recipient) return 'Email cannot be blank';
     if (!sampleType.value) return 'Choose a sample';
@@ -125,14 +108,14 @@ const setParams = (params) => {
 const getPreview = async () => {
     try {
         const params = {
-            recipientId: route.params.id,
+            recipientId: entityId,
         };
         const validationMessage = validateMessage();
         if (validationMessage) return notify(t(validationMessage), 'negative');
 
         setParams(params);
 
-        const path = `${sampleType.value.model}/${route.params.id}/${sampleType.value.code}-html`;
+        const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`;
         const { data } = await axios.get(path, { params });
 
         if (!data) return;
@@ -173,7 +156,6 @@ const getSamples = async () => {
     }
 };
 
-getSamples();
 const onDataSaved = async () => {
     try {
         const params = {
@@ -183,7 +165,7 @@ const onDataSaved = async () => {
         };
         setParams(params);
         const samplesData = await getSamples();
-        const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+        const path = `${samplesData.model}/${entityId.value}/${samplesData.code}-email`;
         await sendEmail(path, params);
         onDialogOK(params);
     } catch (error) {
@@ -210,13 +192,13 @@ const toCustomerSamples = () => {
     />
     <FetchData
         :filter="filterClientsAddresses"
-        :url="`Clients/${route.params.id}/addresses`"
+        :url="`Clients/${entityId}/addresses`"
         @on-fetch="setClientsAddresses"
         auto-load
     />
     <FetchData
         :filter="filterCompanies"
-        @on-fetch="(data) => (optionsCompanies = data)"
+        @on-fetch="(data) => (companies = data)"
         auto-load
         url="Companies"
     />
@@ -306,7 +288,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Company')"
-                            :options="optionsCompanies"
+                            :options="companies"
                             :rules="validate('entry.companyFk')"
                             hide-selected
                             option-label="code"
@@ -319,7 +301,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Address')"
-                            :options="optionsClientsAddressess"
+                            :options="addressess"
                             hide-selected
                             option-label="nickname"
                             option-value="id"

From 2d8322c6da3f53e322fc0577889f42be32cf7a2f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 09:20:54 +0200
Subject: [PATCH 157/162] fix: remove FIXME

---
 src/composables/useArrayData.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 32b91b115..651bcefb0 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,26 +86,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        //FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
-        // console.log(
-        //     'userParams?.filter?.where: ',
-        //     userParams?.filter?.where,
-        //     filter?.where,
-        //     store.filter?.where
-        // );
-        if ((userParams?.filter?.where, filter?.where || store.filter?.where))
-            where = Object.assign(
-                userParams?.filter?.where ?? {},
-                filter?.where ?? {},
-                store.filter?.where ?? {}
-            );
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
         Object.assign(filter, store.filter);
         filter.where = where;
-        // console.log('where: ', where);
         const params = { filter };
-        // console.log('params: ', params);
 
-        delete userParams?.filter;
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
         if (store.order && store.order.length) params.filter.order = store.order;

From e2d3154878974fb8b4b8f83f34e0ffc10547e162 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Sep 2024 09:21:30 +0200
Subject: [PATCH 158/162] fix(ClaimLines): not reload when change quantity

---
 src/pages/Claim/Card/ClaimLines.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 52fbfca98..77c7dacf1 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -45,7 +45,7 @@ async function onFetchClaim(data) {
 
 const amount = ref();
 const amountClaimed = ref();
-async function onFetch(rows, newRows) {
+function onFetch(rows, newRows) {
     if (newRows) rows = newRows;
     amount.value = 0;
     amountClaimed.value = 0;
@@ -155,7 +155,7 @@ function showImportDialog() {
 async function saveWhenHasChanges() {
     if (claimLinesForm.value.getChanges().updates) {
         await claimLinesForm.value.onSubmit();
-        await claimLinesForm.value.reload();
+        onFetch(claimLinesForm.value.formData);
     }
 }
 </script>
@@ -211,7 +211,7 @@ async function saveWhenHasChanges() {
                     <template #body-cell-claimed="{ row }">
                         <QTd auto-width align="right" class="text-primary">
                             <QInput
-                                v-model="row.quantity"
+                                v-model.number="row.quantity"
                                 type="number"
                                 dense
                                 @keyup.enter="saveWhenHasChanges()"
@@ -266,7 +266,9 @@ async function saveWhenHasChanges() {
                                             <template v-if="column.name === 'claimed'">
                                                 <QItemLabel class="text-primary">
                                                     <QInput
-                                                        v-model="props.row.quantity"
+                                                        v-model.number="
+                                                            props.row.quantity
+                                                        "
                                                         type="number"
                                                         dense
                                                         autofocus

From 1c9e13fe15ebb1ec325e4aed137345a64b799874 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 11 Sep 2024 10:23:27 +0200
Subject: [PATCH 159/162] refs #7962 fix claimSummary

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

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 9538e753f..b66692e8a 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -95,8 +95,8 @@ const detailsColumns = ref([
     {
         name: 'total',
         label: 'claim.total',
-        field: ({ sale }) =>
-            toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
+        field: (row) =>
+            toCurrency(row.quantity * row.sale.price * ((100 - row.sale.discount) / 100)),
         sortable: true,
     },
 ]);

From 8d96539b240bd5cb809f691725df850fb1f39938 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 13:18:54 +0200
Subject: [PATCH 160/162] perf: solve reload CardSummary component

---
 src/components/common/VnCard.vue            | 2 +-
 src/pages/Customer/Card/CustomerSummary.vue | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 5cee06582..7d29da232 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -79,7 +79,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.fullPath" />
+                <RouterView :key="route.path" />
             </div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 1c511b45d..f049426e2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
@@ -25,11 +24,6 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const clientUrl = ref();
-
-onMounted(async () => {
-    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
-});
 
 const balanceDue = computed(() => {
     return (

From 18fc5e241c67a9080ae19b69550091d2fc022a2f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Sep 2024 14:07:31 +0200
Subject: [PATCH 161/162] fix: refs #7903 fixed ticket's search bar and
 keybinding tooltip

---
 src/components/LeftMenuItem.vue      |  2 +-
 src/pages/Ticket/Card/TicketCard.vue |  8 +-------
 src/pages/Ticket/TicketList.vue      | 27 ++++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 2a6de5e2e..ab74c1de5 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -35,7 +35,7 @@ const itemComputed = computed(() => {
         </QItemSection>
         <QItemSection>
             {{ t(itemComputed.title) }}
-            <QTooltip>
+            <QTooltip v-if="item.keyBinding">
                 {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index cf15cb7fa..73b6f5543 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,17 +1,11 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
 
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketFilter from '../TicketFilter.vue';
 
 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => routeName.value);
 </script>
 <template>
     <VnCard
@@ -21,7 +15,7 @@ const customRouteRedirectName = computed(() => routeName.value);
         :descriptor="TicketDescriptor"
         search-data-key="TicketList"
         :searchbar-props="{
-            customRouteRedirectName,
+            url: 'Tickets/filter',
             label: t('card.search'),
             info: t('card.searchInfo'),
         }"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index cbd102317..25315b5d1 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters/index';
@@ -22,8 +23,11 @@ const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
 const selectedClient = ref();
 const stateStore = useStateStore();
+const route = useRoute();
 const from = Date.vnNew();
+from.setHours(0, 0, 0, 0);
 const to = Date.vnNew();
+to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
 
 const userParams = {
@@ -31,6 +35,16 @@ const userParams = {
     to: to.toISOString(),
 };
 
+// Método para inicializar las variables desde la query string
+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+
+    // Asigna los valores a las variables correspondientes
+    from.value = query.from || from.toISOString();
+    to.value = query.to || to.toISOString();
+    Object.assign(userParams, { from, to });
+};
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -200,23 +214,26 @@ const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
 
-onMounted(() => (stateStore.rightDrawer = true));
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+});
 </script>
 
 <template>
     <VnSearchbar
-        data-key="Tickets"
+        data-key="Ticket"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Tickets" />
+            <TicketFilter data-key="Ticket" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Tickets"
+        data-key="Ticket"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
@@ -225,7 +242,7 @@ onMounted(() => (stateStore.rightDrawer = true));
             formInitialData: {},
         }"
         default-mode="table"
-        order="id DESC"
+        :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
         :columns="columns"
         :user-params="userParams"
         :right-search="false"

From 4a234dd875c1425bf5bf235d58110b3d4d3fea6f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 12 Sep 2024 08:31:57 +0200
Subject: [PATCH 162/162] fix: duplicate code

---
 src/pages/Ticket/TicketList.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 81e185014..bd0bda6e3 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -15,7 +15,6 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 
-import { useRoute } from 'vue-router';
 const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -25,7 +24,6 @@ const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
 const selectedClient = ref();
 const stateStore = useStateStore();
-const route = useRoute();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
 const to = Date.vnNew();
@@ -46,16 +44,6 @@ const initializeFromQuery = () => {
     Object.assign(userParams, { from, to });
 };
 
-// Método para inicializar las variables desde la query string
-const initializeFromQuery = () => {
-    const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
-    from.value = query.from || from.toISOString();
-    to.value = query.to || to.toISOString();
-    Object.assign(userParams, { from, to });
-};
-
 const columns = computed(() => [
     {
         align: 'left',