From 4a6f859a867021ce6ee3da7169b732d38ee44872 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 10 Dec 2024 13:15:03 +0100
Subject: [PATCH 01/13] fix(RouteExtendedList): fix cloneRoutes

---
 src/pages/Route/RouteExtendedList.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index dbf646935..38e907ce0 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -223,10 +223,10 @@ function navigate(id) {
     router.push({ path: `/route/${id}` });
 }
 
-const cloneRoutes = () => {
+const cloneRoutes = async () => {
     if (!selectedRows.value.length || !startingDate.value) return;
-    axios.post('Routes/clone', {
-        created: startingDate.value,
+    await axios.post('Routes/clone', {
+        dated: startingDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
     startingDate.value = null;
@@ -274,7 +274,6 @@ const openTicketsDialog = (id) => {
             <QCardSection>
                 <p class="text-h6 q-ma-none">{{ t('route.Select the starting date') }}</p>
             </QCardSection>
-
             <QCardSection class="q-pt-none">
                 <VnInputDate
                     :label="t('route.Stating date')"

From 854e72fe5191e0a5e8917647e5d292d4297ec65e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Dec 2024 13:17:31 +0100
Subject: [PATCH 02/13] perf: emit options from VnSelectProvince

---
 src/components/CreateNewPostcodeForm.vue | 18 +++++-------------
 src/components/VnSelectProvince.vue      |  3 ++-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index d3d6708f0..c656fcb2f 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -25,7 +25,6 @@ const townsFetchDataRef = ref(false);
 const townFilter = ref({});
 
 const countriesRef = ref(false);
-const provincesFetchDataRef = ref(false);
 const provincesOptions = ref([]);
 const townsOptions = ref([]);
 const town = ref({});
@@ -71,9 +70,6 @@ async function setProvince(id, data) {
     await fetchTowns();
 }
 async function onProvinceCreated(data) {
-    await provincesFetchDataRef.value.fetch({
-        where: { countryFk: postcodeFormData.countryFk },
-    });
     postcodeFormData.provinceFk = data.id;
 }
 function provinceByCountry(countryFk = postcodeFormData.countryFk) {
@@ -92,7 +88,6 @@ function setTown(newTown, data) {
     data.countryFk = newTown?.province?.countryFk ?? newTown;
 }
 async function onCityCreated(newTown, formData) {
-    await provincesFetchDataRef.value.fetch();
     newTown.province = provincesOptions.value.find(
         (province) => province.id === newTown.provinceFk
     );
@@ -125,14 +120,6 @@ async function filterTowns(name) {
 </script>
 
 <template>
-    <FetchData
-        ref="provincesFetchDataRef"
-        @on-fetch="handleProvinces"
-        :sort-by="['name ASC']"
-        :limit="30"
-        auto-load
-        url="Provinces/location"
-    />
     <FetchData
         ref="townsFetchDataRef"
         :sort-by="['name ASC']"
@@ -205,6 +192,11 @@ async function filterTowns(name) {
                     :country-fk="data.countryFk"
                     :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
+                    @update:options="
+                        (data) => {
+                            provincesOptions = data;
+                        }
+                    "
                     v-model="data.provinceFk"
                     @on-province-created="onProvinceCreated"
                     required
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index 7d1297abf..d73ee964e 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -7,7 +7,7 @@ import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 
-const emit = defineEmits(['onProvinceCreated', 'onProvinceFetched']);
+const emit = defineEmits(['onProvinceCreated', 'onProvinceFetched', 'update:options']);
 const $props = defineProps({
     countryFk: {
         type: Number,
@@ -41,6 +41,7 @@ async function onProvinceCreated(_, data) {
 }
 async function handleProvinces(data) {
     provincesOptions.value = data;
+    emit('update:options', data);
 }
 
 watch(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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