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 01/62] 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 02/62] 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 03/62] 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 04/62] 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 05/62] 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 06/62] 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 07/62] 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 08/62] 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 09/62] 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 10/62] 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 11/62] 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 12/62] 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 13/62] 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 14/62] 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 15/62] 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 16/62] 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 17/62] 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 18/62] 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 19/62] 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 20/62] 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 21/62] 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 22/62] 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 23/62] 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 24/62] 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 25/62] 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 26/62] 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 1cdbc0fcc1b4f690ab64eb5941da9c3dcd0c1f7a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 30 Aug 2024 12:51:25 +0200
Subject: [PATCH 27/62] 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 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 28/62] 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 29/62] 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 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 30/62] 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 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 31/62] 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 32/62] 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 33/62] 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 34/62] 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 1f9d1b79ab0acadbba0922f186b8fe5624ecae52 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 4 Sep 2024 10:17:57 +0200
Subject: [PATCH 35/62] 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 95b19b5cce6939e655193213ddff9574e7a60303 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 5 Sep 2024 10:04:58 +0200
Subject: [PATCH 36/62] 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 37/62] 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 38/62] 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 39/62] 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 40/62] 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 41/62] 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 6db1c8f083fbd438fee7fe9763ad86437720e8ae Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 6 Sep 2024 07:50:39 +0200
Subject: [PATCH 42/62] 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 43/62] 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 5d78f564ddc3f4a64e2627c6108e32fc388005e2 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 10:00:07 +0200
Subject: [PATCH 44/62] 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 45/62] 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 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 46/62] 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 47/62] 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 48/62] 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 49/62] 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 50/62] 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 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 51/62] 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 52/62] 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 53/62] 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 54/62] 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 3004d77d3423aef478037289b2e5eed7a0ab3677 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 9 Sep 2024 12:05:08 +0200
Subject: [PATCH 55/62] 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 15a764d1cf29b36116a60dd6fafd322989f902c2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 9 Sep 2024 12:35:47 +0200
Subject: [PATCH 56/62] 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 7c22a5d0acb0a4cd269f4a10d840011f23a97d9a Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 9 Sep 2024 13:18:51 +0200
Subject: [PATCH 57/62] 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 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 58/62] 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 59/62] 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 60/62] 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 61/62] 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 62/62] 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>