From 441876d53ed4491c209d24b6669d16fd779c2009 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 16 May 2025 12:59:24 +0200
Subject: [PATCH 1/3] fix: remove unnecessary blank line in VnColumn.vue

---
 src/components/VnTable/VnColumn.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index b6cc5665f..05c764d73 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -180,10 +180,10 @@ const col = computed(() => {
     )
         newColumn.component = 'checkbox';
     if ($props.default && !newColumn.component) newColumn.component = $props.default;
-    
+
     if (typeof newColumn.component !== 'string') {
-        newColumn.attrs = { ...newColumn.component.attrs, autofocus: $props.autofocus };
-        newColumn.event = { ...newColumn.component.event, ...$props?.eventHandlers };
+        newColumn.attrs = { ...newColumn.component?.attrs, autofocus: $props.autofocus };
+        newColumn.event = { ...newColumn.component?.event, ...$props?.eventHandlers };
     }
     return newColumn;
 });

From 8f01bfdcb3a7f819158816baf3e816f4f4b23c95 Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Sun, 18 May 2025 14:43:15 +0200
Subject: [PATCH 2/3] feat: refs #8944 dev to test changes to match back

---
 src/components/FormModel.vue                  |  8 ++-
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 src/pages/Item/ItemFixedPrice.vue             | 43 ++++++++++--
 src/pages/Item/ItemFixedPriceFilter.vue       | 69 +++++++++++--------
 .../Item/components/EditFixedPriceForm.vue    | 21 ++++--
 6 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 43a0d63f0..29f5f1a5a 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -102,6 +102,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    customMethod: {
+        type: String,
+        default: null,
+    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
 const modelValue = computed(
@@ -237,7 +241,9 @@ async function save() {
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
         const response = await Promise.resolve(
-            $props.saveFn ? $props.saveFn(body) : axios[method](url, body),
+            $props.saveFn
+                ? $props.saveFn(body)
+                : axios[$props.customMethod ?? method](url, body),
         );
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 581e57bde..8eda15537 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -896,6 +896,7 @@ components:
         rate3: Packing price
         minPrice: Min. Price
         itemFk: Item id
+        date: Date
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e5afdcda3..2a8f0ed23 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -980,6 +980,7 @@ components:
         rate3: Precio packing
         minPrice: Precio mínimo
         itemFk: Id item
+        date: Fecha
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index eb156ce9f..fa7364442 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,9 +1,11 @@
 <script setup>
 import { onMounted, ref, onUnmounted, computed, watch } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
-
 import { beforeSave } from 'src/composables/updateMinPriceBeforeSave';
 
 import FetchedTags from 'components/ui/FetchedTags.vue';
@@ -14,13 +16,13 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnColor from 'src/components/common/VnColor.vue';
 
-import { toDate } from 'src/filters';
+import { toDate, toCurrency } from 'src/filters';
 import { isLower, isBigger } from 'src/filters/date.js';
 import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
-import { toCurrency } from 'src/filters';
 
 const stateStore = useStateStore();
+const quasar = useQuasar();
 const { t } = useI18n();
 const tableRef = ref();
 const editFixedPriceForm = ref(null);
@@ -218,11 +220,36 @@ const dateStyle = (date) =>
           }
         : { color: dateColor, 'background-color': 'transparent' };
 
-const onDataSaved = () => {
-    tableRef.value.CrudModelRef.saveChanges();
+const onDataSaved = async (data) => {
+    for (const row of data) {
+        await axios.patch('FixedPrices/upsertFixedPrice', row);
+    }
     selectedRows.value = [];
+    tableRef.value.reload();
+    tableRef.value.CrudModelRef.reset();
 };
 
+async function saveData(data, getChanges) {
+    const changes = getChanges();
+    if (changes?.updates?.length) {
+        for (const change of changes.updates) {
+            const row = data.find((row) => row.id === change.where.id);
+            await axios.patch('FixedPrices/upsertFixedPrice', row);
+        }
+    }
+
+    if (data?.deletes?.length) {
+        for (const deleteItem of data.deletes) {
+            await axios.delete(`FixedPrices/${deleteItem}`);
+            quasar.notify({
+                message: t('globals.dataDeleted'),
+                color: 'positive',
+            });
+        }
+    }
+    tableRef.value.reload();
+}
+
 onMounted(() => {
     if (tableRef.value) {
         tableRef.value.showForm = false;
@@ -273,7 +300,8 @@ watch(
         data-key="ItemFixedPrices"
         url="FixedPrices/filter"
         :order="'name DESC'"
-        save-url="FixedPrices/crud"
+        save-url="FixedPrices/upsertFixedPrice"
+        :saveFn="saveData"
         :columns="columns"
         :is-editable="true"
         :right-search="false"
@@ -283,7 +311,8 @@ watch(
         }"
         v-model:selected="selectedRows"
         :create="{
-            urlCreate: 'FixedPrices',
+            urlCreate: 'FixedPrices/upsertFixedPrice',
+            customMethod: 'patch',
             title: t('Create fixed price'),
             formInitialData: { warehouseFk: warehouse },
             onDataSaved: () => tableRef.reload(),
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 9c11a2e69..ab0fe5b09 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -3,6 +3,7 @@ import { useI18n } from 'vue-i18n';
 
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
@@ -51,42 +52,41 @@ const props = defineProps({
                     />
                 </QItemSection>
             </QItem>
+            <QSeparator />
+            <QItemSection>
+                <QIcon name="info" size="sm" class="info-icon cursor-pointer">
+                    <QTooltip>{{ t('params.incompatibleFilters') }}</QTooltip>
+                </QIcon>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.dated"
+                            :label="t('params.date')"
+                            filled
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnCheckbox
+                            v-model="params.showBadDates"
+                            :label="t(`params.showBadDates`)"
+                            toggle-indeterminate
+                            @update:model-value="searchFn()"
+                        />
+                    </QItemSection>
+                </QItem>
+            </QItemSection>
+            <QSeparator />
             <QItem>
                 <QItemSection>
-                    <VnInputDate
-                        v-model="params.started"
-                        :label="t('params.started')"
-                        filled
-                        @update:model-value="searchFn()"
-                    />
-                </QItemSection>
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.ended"
-                        :label="t('params.ended')"
-                        filled
-                        @update:model-value="searchFn()"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
+                    <VnCheckbox
                         :label="t('params.mine')"
                         v-model="params.mine"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     />
-
-                    <QCheckbox
-                        v-model="params.showBadDates"
-                        :label="t(`params.showBadDates`)"
-                        toggle-indeterminate
-                        @update:model-value="searchFn()"
-                    >
-                    </QCheckbox>
-
-                    <QCheckbox
+                    <VnCheckbox
                         :label="t('params.hasMinPrice')"
                         v-model="params.hasMinPrice"
                         toggle-indeterminate
@@ -97,6 +97,13 @@ const props = defineProps({
         </template>
     </ItemsFilterPanel>
 </template>
+<style lang="scss" scoped>
+.info-icon {
+    position: relative;
+    top: 0;
+    left: 90%;
+}
+</style>
 <i18n>
 en:
     params:
@@ -107,6 +114,8 @@ en:
         mine: Mine
         showBadDates: Show future items
         hasMinPrice: Has Min Price
+        date: Date
+        incompatibleFilters: Cannot select "Date" and "Show future items" at the same time
 es:
     params:
         buyerFk: Comprador
@@ -116,4 +125,6 @@ es:
         mine: Para mi
         showBadDates: Ver items a futuro
         hasMinPrice: Precio mínimo
+        date: Fecha
+        incompatibleFilters: No se puede seleccionar "Fecha" y "Ver items a futuro" a la vez
  </i18n>
diff --git a/src/pages/Item/components/EditFixedPriceForm.vue b/src/pages/Item/components/EditFixedPriceForm.vue
index 9c6a63893..06e4aa647 100644
--- a/src/pages/Item/components/EditFixedPriceForm.vue
+++ b/src/pages/Item/components/EditFixedPriceForm.vue
@@ -26,7 +26,6 @@ const $props = defineProps({
         default: () => {},
     },
 });
-
 const { t } = useI18n();
 const emit = defineEmits(['onDataSaved']);
 
@@ -38,7 +37,7 @@ const inputs = {
     select: markRaw(VnSelect),
 };
 
-const newValue = ref(null);
+const newFieldValue = ref(null);
 const selectedField = ref(null);
 const closeButton = ref(null);
 const isLoading = ref(false);
@@ -46,7 +45,11 @@ const isLoading = ref(false);
 const onSubmit = async () => {
     isLoading.value = true;
     $props.rows.forEach((row) => {
-        row[selectedField.value.name] = newValue.value;
+        const newValue =
+            selectedField.value.component === 'number'
+                ? parseInt(newFieldValue.value)
+                : newFieldValue.value;
+        row[selectedField.value.name] = newValue;
     });
     emit('onDataSaved', $props.rows);
     closeForm();
@@ -77,11 +80,19 @@ const closeForm = () => {
                     data-cy="EditFixedPriceSelectOption"
                     @update:model-value="newValue = null"
                     :class="{ 'is-select': selectedField?.component === 'select' }"
-                />
+                >
+                    <template #option="{ opt, itemProps }">
+                        <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                            <QItemSection class="col-9 justify-center">
+                                <span>{{ opt?.label }}</span>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
                 <component
                     :is="inputs[selectedField?.component || 'input']"
                     v-bind="selectedField?.attrs || {}"
-                    v-model="newValue"
+                    v-model="newFieldValue"
                     :label="t('Value')"
                     data-cy="EditFixedPriceValueOption"
                     style="width: 200px"

From 9e3c7430e701282ecb1ff678233dac6331f61bd2 Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Mon, 19 May 2025 07:57:25 +0200
Subject: [PATCH 3/3] fix: refs #8944 zone calendar e2e

---
 .../integration/zone/zoneCalendar.spec.js     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/test/cypress/integration/zone/zoneCalendar.spec.js b/test/cypress/integration/zone/zoneCalendar.spec.js
index da2a52fda..aa745bd7c 100644
--- a/test/cypress/integration/zone/zoneCalendar.spec.js
+++ b/test/cypress/integration/zone/zoneCalendar.spec.js
@@ -40,7 +40,7 @@ describe('ZoneCalendar', { testIsolation: true }, () => {
     it('should exclude an event', () => {
         cy.get('.q-mb-sm > .q-radio__inner').click();
         cy.get('.q-current-day > .q-calendar-month__day--label__wrapper').click();
-        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.get(submitBtn).click();
         cy.get(
             '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
         ).click();
@@ -48,19 +48,15 @@ describe('ZoneCalendar', { testIsolation: true }, () => {
         cy.dataCy('VnConfirm_confirm').click();
     });
 
-    it(
-        'should not exclude an event if there are tickets for that zone and day',
-        { testIsoaltion: true },
-        () => {
-            cy.visit(`/#/zone/3/events`);
-            cy.get('.q-mb-sm > .q-radio__inner').click();
-            cy.get(
-                '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
-            ).click();
-            cy.get('.q-mt-lg > .q-btn--standard').click();
-            cy.checkNotification(
-                'Can not close this zone because there are tickets programmed for that day',
-            );
-        },
-    );
+    it('should not exclude an event if there are tickets for that zone and day', () => {
+        cy.get('[data-cy="vn-searchbar_input"]').type('3{enter}');
+        cy.get('[aria-label="Exclude"] > .q-radio__label').click();
+        cy.get(
+            '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
+        ).click();
+        cy.get(submitBtn).click();
+        cy.checkNotification(
+            'Can not close this zone because there are tickets programmed for that day',
+        );
+    });
 });