From a17c6763770a76826747285c88f6afaab38874c1 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 30 Apr 2025 10:02:03 +0200
Subject: [PATCH 01/17] feat(TravelFilter): add isDelivered and isReceived
 fields to filter options

---
 src/pages/Travel/Card/TravelFilter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
index 0799e449c..f07f200a1 100644
--- a/src/pages/Travel/Card/TravelFilter.js
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -13,6 +13,8 @@ export default {
         'daysInForward',
         'availabled',
         'awbFk',
+        'isDelivered',
+        'isReceived',
     ],
     include: [
         {

From 2d17868e7cc2a411eaca1ce747f8ee6e391ede21 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 30 Apr 2025 10:06:49 +0200
Subject: [PATCH 02/17] fix: update recipient email access in resendEmail
 function

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

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 18ce64158..613002146 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -412,7 +412,7 @@ const isUnsatisfied = async (reason) => {
 
 const resendEmail = async () => {
     const params = {
-        recipient: worker.value[0]?.user?.emailUser?.email,
+        recipient: worker.value?.user?.emailUser?.email,
         week: selectedWeekNumber.value,
         year: selectedDateYear.value,
         workerId: Number(route.params.id),

From c518387e507ab2a58418604d90b8e2836c76250a Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Wed, 30 Apr 2025 16:31:06 +0200
Subject: [PATCH 03/17] feat: refs #8958 add button to ContractsInsurance to
 add credits

---
 .../Customer/Card/CustomerCreditContracts.vue | 185 ++++++++----------
 .../Card/CustomerCreditContractsInsurance.vue |  93 +++++++++
 .../CustomerCreditContractsCreate.vue         |  25 +--
 .../CustomerCreditContractsInsurance.vue      |  63 ------
 src/router/modules/customer.js                |   2 +-
 5 files changed, 182 insertions(+), 186 deletions(-)
 create mode 100644 src/pages/Customer/Card/CustomerCreditContractsInsurance.vue
 delete mode 100644 src/pages/Customer/components/CustomerCreditContractsInsurance.vue

diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index a49faeb8d..ca0960e2e 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -2,12 +2,13 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import { useQuasar } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
-import { toDate } from 'src/filters';
+import CustomerCreditContractsCreate from '../components/CustomerCreditContractsCreate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -16,6 +17,7 @@ const quasar = useQuasar();
 
 const vnPaginateRef = ref(null);
 const showQPageSticky = ref(true);
+const showForm = ref();
 
 const filter = {
     order: 'finished ASC, started DESC',
@@ -36,25 +38,21 @@ const fetch = (data) => {
     data.forEach((element) => {
         if (!element.finished) {
             showQPageSticky.value = false;
-            return;
         }
     });
 };
 
-const toCustomerCreditContractsCreate = () => {
-    router.push({ name: 'CustomerCreditContractsCreate' });
-};
-
 const openDialog = (item) => {
     quasar.dialog({
         component: ModalCloseContract,
         componentProps: {
             id: item.id,
-            promise: updateData,
+            promise: async () => {
+                await updateData();
+                showQPageSticky.value = true;
+            },
         },
     });
-    updateData();
-    showQPageSticky.value = true;
 };
 
 const openViewCredit = (credit) => {
@@ -66,14 +64,14 @@ const openViewCredit = (credit) => {
     });
 };
 
-const updateData = () => {
-    vnPaginateRef.value?.fetch();
+const updateData = async () => {
+    await vnPaginateRef.value?.fetch();
 };
 </script>
 
 <template>
-    <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
+    <section class="row justify-center">
+        <QCard class="q-pa-lg" style="width: 70%">
             <VnPaginate
                 :user-filter="filter"
                 @on-fetch="fetch"
@@ -84,100 +82,82 @@ const updateData = () => {
                 url="CreditClassifications"
             >
                 <template #body="{ rows }">
-                    <div v-if="rows.length">
+                    <div v-if="rows.length" class="q-gutter-y-md">
                         <QCard
                             v-for="(item, index) in rows"
                             :key="index"
-                            :class="{
-                                'customer-card': true,
-                                'q-mb-md': index < rows.length - 1,
-                                'is-active': !item.finished,
-                            }"
+                            :class="{ disabled: item.finished }"
                         >
                             <QCardSection
-                                class="full-width flex justify-between q-py-none"
+                                class="full-width"
+                                :class="{ 'row justify-between': $q.screen.gt.md }"
                             >
-                                <div class="width-state flex">
-                                    <div
-                                        class="flex items-center cursor-pointer q-mr-md"
-                                        v-if="!item.finished"
+                                <div class="width-state row no-wrap">
+                                    <QIcon
+                                        :style="{
+                                            visibility: item.finished
+                                                ? 'hidden'
+                                                : 'visible',
+                                        }"
+                                        @click.stop="openDialog(item)"
+                                        color="primary"
+                                        name="lock"
+                                        size="md"
+                                        class="fill-icon q-px-md"
                                     >
-                                        <QIcon
-                                            @click.stop="openDialog(item)"
-                                            color="primary"
-                                            name="lock"
-                                            size="md"
-                                            class="fill-icon"
-                                        >
-                                            <QTooltip>{{ t('Close contract') }}</QTooltip>
-                                        </QIcon>
-                                    </div>
+                                        <QTooltip>{{ t('Close contract') }}</QTooltip>
+                                    </QIcon>
 
-                                    <div>
-                                        <div class="flex q-mb-xs">
-                                            <div class="q-mr-sm color-vn-label">
-                                                {{ t('Since') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.started) }}
-                                            </div>
-                                        </div>
-                                        <div class="flex">
-                                            <div class="q-mr-sm color-vn-label">
-                                                {{ t('To') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.finished) }}
-                                            </div>
-                                        </div>
+                                    <div class="column">
+                                        <VnLv
+                                            :label="t('Since')"
+                                            :value="toDate(item.started)"
+                                        />
+                                        <VnLv
+                                            :label="t('To')"
+                                            :value="toDate(item.finished)"
+                                        />
                                     </div>
                                 </div>
 
                                 <QSeparator vertical />
 
-                                <div class="width-data flex">
+                                <div class="column width-data">
                                     <div
-                                        class="full-width flex justify-between items-center"
+                                        class="column"
                                         v-if="item?.insurances.length"
+                                        v-for="insurance in item.insurances"
+                                        :key="insurance.id"
                                     >
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Credit') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ item.insurances[0].credit }}
-                                            </div>
-                                        </div>
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Grade') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ item.insurances[0].grade || '-' }}
-                                            </div>
-                                        </div>
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Date') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.insurances[0].created) }}
-                                            </div>
-                                        </div>
-                                        <div class="flex items-center cursor-pointer">
-                                            <QIcon
-                                                @click.stop="openViewCredit(item)"
-                                                color="primary"
-                                                name="preview"
-                                                size="md"
-                                            >
-                                                <QTooltip>{{
-                                                    t('View credits')
-                                                }}</QTooltip>
-                                            </QIcon>
+                                        <div
+                                            :class="{
+                                                'row q-gutter-x-md': $q.screen.gt.sm,
+                                            }"
+                                            class="q-mb-sm"
+                                        >
+                                            <VnLv
+                                                :label="t('Credit')"
+                                                :value="toCurrency(insurance.credit)"
+                                            />
+                                            <VnLv
+                                                :label="t('Grade')"
+                                                :value="dashIfEmpty(insurance.grade)"
+                                            />
+                                            <VnLv
+                                                :label="t('Date')"
+                                                :value="toDate(insurance.created)"
+                                            />
                                         </div>
                                     </div>
                                 </div>
+                                <QBtn
+                                    @click.stop="openViewCredit(item)"
+                                    icon="preview"
+                                    size="md"
+                                    :title="t('View credits')"
+                                    color="primary"
+                                    flat
+                                />
                             </QCardSection>
                         </QCard>
                     </div>
@@ -187,11 +167,11 @@ const updateData = () => {
                 </template>
             </VnPaginate>
         </QCard>
-    </div>
+    </section>
 
     <QPageSticky :offset="[18, 18]" v-if="showQPageSticky">
         <QBtn
-            @click.stop="toCustomerCreditContractsCreate()"
+            @click.stop="showForm = !showForm"
             color="primary"
             fab
             icon="add"
@@ -201,24 +181,25 @@ const updateData = () => {
             {{ t('New contract') }}
         </QTooltip>
     </QPageSticky>
+
+    <QDialog v-model="showForm">
+        <CustomerCreditContractsCreate @on-data-saved="updateData()" />
+    </QDialog>
 </template>
 
 <style lang="scss" scoped>
-.customer-card {
-    border: 2px solid var(--vn-light-gray);
-    border-radius: 10px;
-    padding: 10px;
-    display: flex;
-    justify-content: space-between;
-}
-.is-active {
-    background-color: var(--vn-light-gray);
-}
 .width-state {
     width: 30%;
 }
 .width-data {
-    width: 65%;
+    width: 50%;
+}
+::v-deep(.label) {
+    margin-right: 5px;
+}
+::v-deep(.label)::after {
+    content: ':';
+    color: var(--vn-label-color);
 }
 </style>
 
diff --git a/src/pages/Customer/Card/CustomerCreditContractsInsurance.vue b/src/pages/Customer/Card/CustomerCreditContractsInsurance.vue
new file mode 100644
index 000000000..aac195b36
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditContractsInsurance.vue
@@ -0,0 +1,93 @@
+<script setup>
+import { computed, onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { toCurrency, toDate } from 'src/filters';
+
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const create = ref(null);
+const tableRef = ref();
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'created',
+        format: ({ created }) => toDate(created),
+        label: t('Created'),
+        name: 'created',
+        create: true,
+        columnCreate: {
+            component: 'date',
+        },
+    },
+    {
+        align: 'left',
+        field: 'grade',
+        label: t('Grade'),
+        name: 'grade',
+        create: true,
+    },
+    {
+        align: 'left',
+        format: ({ credit }) => toCurrency(credit),
+        label: t('Credit'),
+        name: 'credit',
+        create: true,
+    },
+]);
+
+onBeforeMount(async () => {
+    const query = `CreditClassifications/findOne?filter=${encodeURIComponent(
+        JSON.stringify({
+            fields: ['finished'],
+            where: { id: route.params.creditId },
+        }),
+    )}`;
+    const { data } = await axios(query);
+    create.value = data.finished
+        ? false
+        : {
+              urlCreate: 'CreditInsurances',
+              title: t('Create Insurance'),
+              onDataSaved: () => tableRef.value.reload(),
+              formInitialData: {
+                  created: Date.vnNew(),
+                  creditClassificationFk: route.params.creditId,
+              },
+          };
+});
+</script>
+
+<template>
+    <VnTable
+        v-if="create != null"
+        url="CreditInsurances"
+        ref="tableRef"
+        data-key="creditInsurances"
+        :filter="{
+            where: {
+                creditClassificationFk: `${route.params.creditId}`,
+            },
+            order: 'created DESC',
+        }"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        :create
+        auto-load
+    />
+</template>
+
+<i18n>
+es:
+    Created: Fecha creación
+    Grade: Grade
+    Credit: Crédito
+</i18n>
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c25e59e1a..f7d60ccb4 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -3,44 +3,29 @@ import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const routeId = computed(() => route.params.id);
-const router = useRouter();
 
 const initialData = reactive({
     started: Date.vnNew(),
     clientFk: routeId.value,
 });
-
-const toCustomerCreditContracts = () => {
-    router.push({ name: 'CustomerCreditContracts' });
-};
 </script>
 
 <template>
-    <FormModel
+    <FormModelPopup
+        v-on="$attrs"
         :form-initial-data="initialData"
         :observe-form-changes="false"
         url-create="creditClassifications/createWithInsurance"
-        @on-data-saved="toCustomerCreditContracts()"
     >
-        <template #moreActions>
-            <QBtn
-                :label="t('globals.cancel')"
-                @click="toCustomerCreditContracts"
-                color="primary"
-                flat
-                icon="close"
-            />
-        </template>
-
-        <template #form="{ data }">
+        <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
                     <VnInput
@@ -63,7 +48,7 @@ const toCustomerCreditContracts = () => {
                 </div>
             </VnRow>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
deleted file mode 100644
index 70f7cf046..000000000
--- a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-import { toCurrency, toDate } from 'src/filters';
-
-import VnTable from 'src/components/VnTable/VnTable.vue';
-
-const { t } = useI18n();
-const route = useRoute();
-
-const filter = {
-    where: {
-        creditClassificationFk: `${route.params.creditId}`,
-    },
-    limit: 20,
-};
-const columns = computed(() => [
-    {
-        align: 'left',
-        field: 'created',
-        format: ({ created }) => toDate(created),
-        label: t('Created'),
-        name: 'created',
-    },
-    {
-        align: 'left',
-        field: 'grade',
-        label: t('Grade'),
-        name: 'grade',
-    },
-    {
-        align: 'left',
-        format: ({ credit }) => toCurrency(credit),
-        label: t('Credit'),
-        name: 'credit',
-    },
-]);
-</script>
-
-<template>
-    <VnTable
-        url="CreditInsurances"
-        ref="tableRef"
-        data-key="creditInsurances"
-        :filter="filter"
-        :columns="columns"
-        :right-search="false"
-        :is-editable="false"
-        :use-model="true"
-        :column-search="false"
-        :disable-option="{ card: true }"
-        auto-load
-    ></VnTable>
-</template>
-
-<i18n>
-es:
-    Created: Fecha creación
-    Grade: Grade
-    Credit: Crédito
-</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index a33ed6be5..6d6f1f3b2 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -225,7 +225,7 @@ const customerCard = {
                             name: 'CustomerCreditContractsInsurance',
                             component: () =>
                                 import(
-                                    'src/pages/Customer/components/CustomerCreditContractsInsurance.vue'
+                                    'src/pages/Customer/Card/CustomerCreditContractsInsurance.vue'
                                 ),
                         },
                     ],

From bc7c20e6a685acd02366a6b2ac1bbdc57e831e11 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 07:28:30 +0200
Subject: [PATCH 04/17] fix: ticketBasicData step1

---
 .../Card/BasicData/TicketBasicDataForm.vue    | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index f682537f6..51de81bcc 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -59,11 +59,25 @@ const zoneWhere = computed(() => {
 });
 
 async function getLanded(params) {
-    getDate(`Agencies/getLanded`, params);
+    const data = await getDate(`Agencies/getLanded`, params);
+    formData.value.landed = data.landed;
+    const shippedDate = new Date(params.shipped);
+    const landedDate = new Date(data.hour);
+    shippedDate.setHours(
+        landedDate.getHours(),
+        landedDate.getMinutes(),
+        landedDate.getSeconds(),
+    );
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getShipped(params) {
-    getDate(`Agencies/getShipped`, params);
+    const data = await getDate(`Agencies/getShipped`, params);
+    formData.value.landed = params.landed;
+    const [hours, minutes, seconds] = data.hour.split(':').map(Number);
+    let shippedDate = new Date(data.shipped);
+    shippedDate.setHours(hours, minutes, seconds);
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getDate(query, params) {
@@ -75,15 +89,8 @@ async function getDate(query, params) {
     if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
     formData.value.zoneFk = data.zoneFk;
-    formData.value.landed = data.landed;
-    const shippedDate = new Date(params.shipped);
-    const landedDate = new Date(data.hour);
-    shippedDate.setHours(
-        landedDate.getHours(),
-        landedDate.getMinutes(),
-        landedDate.getSeconds(),
-    );
-    formData.value.shipped = shippedDate.toISOString();
+
+    return data;
 }
 
 const onChangeZone = async (zoneId) => {
@@ -422,14 +429,6 @@ async function getZone(options) {
                 :rules="validate('ticketList.shipped')"
                 @update:model-value="setShipped"
             />
-            <VnInputTime
-                :label="t('basicData.shippedHour')"
-                v-model="formData.shipped"
-                :required="true"
-                :rules="validate('basicData.shippedHour')"
-                disabled
-                @update:model-value="setShipped"
-            />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"

From 82976dd114e68f15f9393a9d810a9a76dcccce69 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 10:21:11 +0200
Subject: [PATCH 05/17] fix: minor bugs

---
 src/components/ui/CatalogItem.vue             |  3 +--
 .../Card/BasicData/TicketBasicDataForm.vue    | 19 +++++++++++++++++--
 src/pages/Ticket/TicketList.vue               |  4 ++--
 src/pages/Zone/ZoneDeliveryPanel.vue          |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 0ae890e37..7806562b2 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -132,8 +132,7 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-    white-space: nowrap;
-    width: 192px;
+
     p {
         margin-bottom: 0;
     }
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 51de81bcc..1316bcfd5 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -313,16 +313,28 @@ async function getZone(options) {
             <VnSelect
                 :label="t('basicData.address')"
                 v-model="addressId"
-                option-value="id"
                 option-label="nickname"
                 :options="addresses"
                 hide-selected
                 map-options
                 :required="true"
+                :sort-by="['isActive DESC']"
                 :rules="validate('basicData.address')"
             >
                 <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
+                    <QItem
+                        v-bind="scope.itemProps"
+                        :class="{ disabled: !scope.opt.isActive }"
+                    >
+                        <QItemSection style="min-width: min-content" avatar>
+                            <QIcon
+                                v-if="scope.opt.isActive && addressId === scope.opt.id"
+                                size="sm"
+                                color="grey"
+                                name="star"
+                                class="fill-icon"
+                            />
+                        </QItemSection>
                         <QItemSection>
                             <QItemLabel
                                 :class="{
@@ -348,6 +360,9 @@ async function getZone(options) {
                                     {{ scope.opt?.agencyMode?.name }}</span
                                 >
                             </QItemLabel>
+                            <QItemLabel caption>
+                                {{ `#${scope.opt?.id}` }}
+                            </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 096aa101c..456747cf8 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -579,7 +579,7 @@ function setReference(data) {
                             hide-selected
                             required
                             @update:model-value="() => onClientSelected(data)"
-                            :sort-by="'id ASC'"
+                            :sort-by="['id ASC']"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -605,7 +605,7 @@ function setReference(data) {
                             map-options
                             required
                             :disable="!data.clientId"
-                            :sort-by="'isActive DESC'"
+                            :sort-by="['isActive DESC']"
                             @update:model-value="() => fetchAvailableAgencies(data)"
                         >
                             <template #option="scope">
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index fc5c04b41..168065ec6 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -89,7 +89,7 @@ watch(
                 v-model="formData.geoFk"
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
-                :sort-by="'code ASC'"
+                :sort-by="['code ASC']"
                 option-value="geoFk"
                 option-label="code"
                 :filter-options="['code']"

From 7a2a5fd22d3eb4a7aab9fddb01efa4893d964db5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 10:42:26 +0200
Subject: [PATCH 06/17] feat: star defaultAddressFk instead selected address

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 8 ++++----
 src/pages/Ticket/Card/TicketFilter.js                   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 1316bcfd5..13f2a8a94 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -8,7 +8,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -277,8 +276,6 @@ async function getZone(options) {
             <VnSelect
                 :label="t('ticketList.client')"
                 v-model="clientId"
-                option-value="id"
-                option-label="name"
                 url="Clients"
                 :fields="['id', 'name']"
                 sort-by="id"
@@ -328,7 +325,10 @@ async function getZone(options) {
                     >
                         <QItemSection style="min-width: min-content" avatar>
                             <QIcon
-                                v-if="scope.opt.isActive && addressId === scope.opt.id"
+                                v-if="
+                                    scope.opt.isActive &&
+                                    formData.client.defaultAddressFk === scope.opt.id
+                                "
                                 size="sm"
                                 color="grey"
                                 name="star"
diff --git a/src/pages/Ticket/Card/TicketFilter.js b/src/pages/Ticket/Card/TicketFilter.js
index daa204a7a..0f12e98a3 100644
--- a/src/pages/Ticket/Card/TicketFilter.js
+++ b/src/pages/Ticket/Card/TicketFilter.js
@@ -20,6 +20,7 @@ export default {
                     'isFreezed',
                     'isTaxDataChecked',
                     'hasElectronicInvoice',
+                    'defaultAddressFk',
                     'credit',
                 ],
                 include: [

From 7eb02bee8c1a5b9d50492b1e588fb571c66cfb40 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 07:28:30 +0200
Subject: [PATCH 07/17] fix: ticketBasicData step1

---
 .../Card/BasicData/TicketBasicDataForm.vue    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 18af48283..b2e28f597 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -59,11 +59,25 @@ const zoneWhere = computed(() => {
 });
 
 async function getLanded(params) {
-    getDate(`Agencies/getLanded`, params);
+    const data = await getDate(`Agencies/getLanded`, params);
+    formData.value.landed = data.landed;
+    const shippedDate = new Date(params.shipped);
+    const landedDate = new Date(data.hour);
+    shippedDate.setHours(
+        landedDate.getHours(),
+        landedDate.getMinutes(),
+        landedDate.getSeconds(),
+    );
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getShipped(params) {
-    getDate(`Agencies/getShipped`, params);
+    const data = await getDate(`Agencies/getShipped`, params);
+    formData.value.landed = params.landed;
+    const [hours, minutes, seconds] = data.hour.split(':').map(Number);
+    let shippedDate = new Date(data.shipped);
+    shippedDate.setHours(hours, minutes, seconds);
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getDate(query, params) {
@@ -75,15 +89,8 @@ async function getDate(query, params) {
     if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
     formData.value.zoneFk = data.zoneFk;
-    formData.value.landed = data.landed;
-    const shippedDate = new Date(params.shipped);
-    const landedDate = new Date(data.hour);
-    shippedDate.setHours(
-        landedDate.getHours(),
-        landedDate.getMinutes(),
-        landedDate.getSeconds(),
-    );
-    formData.value.shipped = shippedDate.toISOString();
+
+    return data;
 }
 
 const onChangeZone = async (zoneId) => {

From eb0754b3d1e876581e25e42268568bdc5aea8dc9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 10:21:11 +0200
Subject: [PATCH 08/17] fix: minor bugs

---
 src/components/ui/CatalogItem.vue             |  3 +--
 .../Card/BasicData/TicketBasicDataForm.vue    | 19 +++++++++++++++++--
 src/pages/Ticket/TicketList.vue               |  4 ++--
 src/pages/Zone/ZoneDeliveryPanel.vue          |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 0ae890e37..7806562b2 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -132,8 +132,7 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-    white-space: nowrap;
-    width: 192px;
+
     p {
         margin-bottom: 0;
     }
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index b2e28f597..4f9d17a48 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -312,16 +312,28 @@ async function getZone(options) {
             <VnSelect
                 :label="t('basicData.address')"
                 v-model="addressId"
-                option-value="id"
                 option-label="nickname"
                 :options="addresses"
                 hide-selected
                 map-options
                 :required="true"
+                :sort-by="['isActive DESC']"
                 :rules="validate('basicData.address')"
             >
                 <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
+                    <QItem
+                        v-bind="scope.itemProps"
+                        :class="{ disabled: !scope.opt.isActive }"
+                    >
+                        <QItemSection style="min-width: min-content" avatar>
+                            <QIcon
+                                v-if="scope.opt.isActive && addressId === scope.opt.id"
+                                size="sm"
+                                color="grey"
+                                name="star"
+                                class="fill-icon"
+                            />
+                        </QItemSection>
                         <QItemSection>
                             <QItemLabel
                                 :class="{
@@ -347,6 +359,9 @@ async function getZone(options) {
                                     {{ scope.opt?.agencyMode?.name }}</span
                                 >
                             </QItemLabel>
+                            <QItemLabel caption>
+                                {{ `#${scope.opt?.id}` }}
+                            </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 096aa101c..456747cf8 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -579,7 +579,7 @@ function setReference(data) {
                             hide-selected
                             required
                             @update:model-value="() => onClientSelected(data)"
-                            :sort-by="'id ASC'"
+                            :sort-by="['id ASC']"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -605,7 +605,7 @@ function setReference(data) {
                             map-options
                             required
                             :disable="!data.clientId"
-                            :sort-by="'isActive DESC'"
+                            :sort-by="['isActive DESC']"
                             @update:model-value="() => fetchAvailableAgencies(data)"
                         >
                             <template #option="scope">
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index fc5c04b41..168065ec6 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -89,7 +89,7 @@ watch(
                 v-model="formData.geoFk"
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
-                :sort-by="'code ASC'"
+                :sort-by="['code ASC']"
                 option-value="geoFk"
                 option-label="code"
                 :filter-options="['code']"

From 18c18b56c96cd540292e7b4a241363b524dd690c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 1 May 2025 10:42:26 +0200
Subject: [PATCH 09/17] feat: star defaultAddressFk instead selected address

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 8 ++++----
 src/pages/Ticket/Card/TicketFilter.js                   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 4f9d17a48..01b76ac56 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -8,7 +8,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -276,8 +275,6 @@ async function getZone(options) {
             <VnSelect
                 :label="t('ticketList.client')"
                 v-model="clientId"
-                option-value="id"
-                option-label="name"
                 url="Clients"
                 :fields="['id', 'name']"
                 sort-by="id"
@@ -327,7 +324,10 @@ async function getZone(options) {
                     >
                         <QItemSection style="min-width: min-content" avatar>
                             <QIcon
-                                v-if="scope.opt.isActive && addressId === scope.opt.id"
+                                v-if="
+                                    scope.opt.isActive &&
+                                    formData.client.defaultAddressFk === scope.opt.id
+                                "
                                 size="sm"
                                 color="grey"
                                 name="star"
diff --git a/src/pages/Ticket/Card/TicketFilter.js b/src/pages/Ticket/Card/TicketFilter.js
index daa204a7a..0f12e98a3 100644
--- a/src/pages/Ticket/Card/TicketFilter.js
+++ b/src/pages/Ticket/Card/TicketFilter.js
@@ -20,6 +20,7 @@ export default {
                     'isFreezed',
                     'isTaxDataChecked',
                     'hasElectronicInvoice',
+                    'defaultAddressFk',
                     'credit',
                 ],
                 include: [

From 750ce68f974abe35080aee8cb7d046df26c10561 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 2 May 2025 10:10:31 +0200
Subject: [PATCH 10/17] perf: remove itemPackingType set values

---
 .../components/CustomerSummaryTable.vue       | 19 +------------
 .../__tests__/getItemPackagingType.spec.js    | 27 +++++++++++++++++++
 .../composables/getItemPackagingType.js       | 11 ++++++++
 3 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
 create mode 100644 src/pages/Customer/composables/getItemPackagingType.js

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index feb137065..cc0afdca7 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -15,7 +15,7 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
-
+import { getItemPackagingType } from '../composables/getItemPackagingType.js';
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
@@ -161,23 +161,6 @@ const setShippedColor = (date) => {
 };
 const rowClick = ({ id }) =>
     window.open(router.resolve({ params: { id }, name: 'TicketSummary' }).href, '_blank');
-
-const getItemPackagingType = (ticketSales) => {
-    if (!ticketSales?.length) return '-';
-
-    const packagingTypes = ticketSales.reduce((types, sale) => {
-        const { itemPackingTypeFk } = sale.item;
-        if (
-            !types.includes(itemPackingTypeFk) &&
-            (itemPackingTypeFk === 'H' || itemPackingTypeFk === 'V')
-        ) {
-            types.push(itemPackingTypeFk);
-        }
-        return types;
-    }, []);
-
-    return dashIfEmpty(packagingTypes.join(', ') || '-');
-};
 </script>
 
 <template>
diff --git a/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
new file mode 100644
index 000000000..37f626691
--- /dev/null
+++ b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
@@ -0,0 +1,27 @@
+import { describe, it, expect } from 'vitest';
+import { getItemPackagingType } from '../getItemPackagingType';
+
+describe('getItemPackagingType', () => {
+    it('should return "-" if ticketSales is null or undefined', () => {
+        expect(getItemPackagingType(null)).toBe('-');
+        expect(getItemPackagingType(undefined)).toBe('-');
+    });
+
+    it('should return "-" if ticketSales does not have a length property', () => {
+        const ticketSales = { someKey: 'someValue' }; // No tiene propiedad length
+        expect(getItemPackagingType(ticketSales)).toBe('-');
+    });
+
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } }, // Duplicado
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V');
+    });
+
+    it('should return "-" if ticketSales is an empty array', () => {
+        expect(getItemPackagingType([])).toBe('-');
+    });
+});
diff --git a/src/pages/Customer/composables/getItemPackagingType.js b/src/pages/Customer/composables/getItemPackagingType.js
new file mode 100644
index 000000000..eba4d62f5
--- /dev/null
+++ b/src/pages/Customer/composables/getItemPackagingType.js
@@ -0,0 +1,11 @@
+import { dashIfEmpty } from 'src/filters';
+
+export function getItemPackagingType(ticketSales) {
+    if (!ticketSales?.length) return '-';
+
+    const packagingTypes = Array.from(
+        new Set(ticketSales.map(({ item: { itemPackingTypeFk } }) => itemPackingTypeFk)),
+    );
+
+    return dashIfEmpty(packagingTypes.join(', '));
+}

From 68e1b2ed2776953b049c41a914577ef5a32f9498 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 2 May 2025 10:11:36 +0200
Subject: [PATCH 11/17] test: improve test

---
 .../__tests__/getItemPackagingType.spec.js            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
index 37f626691..0607f729f 100644
--- a/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
+++ b/src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js
@@ -16,10 +16,19 @@ describe('getItemPackagingType', () => {
         const ticketSales = [
             { item: { itemPackingTypeFk: 'H' } },
             { item: { itemPackingTypeFk: 'V' } },
-            { item: { itemPackingTypeFk: 'H' } }, // Duplicado
+            { item: { itemPackingTypeFk: 'H' } },
         ];
         expect(getItemPackagingType(ticketSales)).toBe('H, V');
     });
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'A' } },
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V, A');
+    });
 
     it('should return "-" if ticketSales is an empty array', () => {
         expect(getItemPackagingType([])).toBe('-');

From 3747e33d5f4ed8e3c00ca3f0c9460360a832a40a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 2 May 2025 14:47:30 +0200
Subject: [PATCH 12/17] fix: filters CustomerNotification

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

diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index cbbd6d205..79b9c9063 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -26,6 +26,7 @@ const columns = computed(() => [
                 url: 'Clients',
                 fields: ['id', 'socialName'],
                 optionLabel: 'socialName',
+                optionValue: 'socialName',
             },
         },
         columnClass: 'expand',
@@ -37,8 +38,11 @@ const columns = computed(() => [
         name: 'city',
         columnFilter: {
             component: 'select',
+            inWhere: true,
             attrs: {
                 url: 'Towns',
+                optionValue: 'name',
+                optionLabel: 'name',
             },
         },
         cardVisible: true,
@@ -95,7 +99,7 @@ const columns = computed(() => [
     </VnSubToolbar>
     <VnTable
         :data-key="dataKey"
-        url="Clients/filter"
+        url="Clients/extendedListFilter"
         :table="{
             'row-key': 'id',
             selection: 'multiple',

From f176221839dbdf9a00323ebee7439e3eba6a13b3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 5 May 2025 10:28:19 +0200
Subject: [PATCH 13/17] fix(ClaimSummary): fix description slot

---
 src/pages/Claim/Card/ClaimSummary.vue | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 67d57004f..196d24e07 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -346,17 +346,18 @@ function claimUrl(section) {
                     <template #body="props">
                         <QTr :props="props">
                             <QTd v-for="col in props.cols" :key="col.name" :props="props">
-                                <span v-if="col.name != 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <span class="link" v-if="col.name === 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <ItemDescriptorProxy
-                                    v-if="col.name == 'description'"
-                                    :id="props.row.sale.itemFk"
-                                    :sale-fk="props.row.saleFk"
-                                ></ItemDescriptorProxy>
+                                <template v-if="col.name === 'description'">
+                                    <span class="link">{{
+                                        dashIfEmpty(col.field(props.row))
+                                    }}</span>
+                                    <ItemDescriptorProxy
+                                        :id="props.row.sale.itemFk"
+                                        :sale-fk="props.row.saleFk"
+                                    />
+                                </template>
+                                <template v-else>
+                                    {{ dashIfEmpty(col.field(props.row)) }}
+                                </template>
                             </QTd>
                         </QTr>
                     </template>

From f8e0b9f1fdca569abca1c0593d4f2b4c11701501 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 5 May 2025 10:30:36 +0200
Subject: [PATCH 14/17] fix: revert claimSummary

---
 src/pages/Claim/Card/ClaimSummary.vue | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 196d24e07..67d57004f 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -346,18 +346,17 @@ function claimUrl(section) {
                     <template #body="props">
                         <QTr :props="props">
                             <QTd v-for="col in props.cols" :key="col.name" :props="props">
-                                <template v-if="col.name === 'description'">
-                                    <span class="link">{{
-                                        dashIfEmpty(col.field(props.row))
-                                    }}</span>
-                                    <ItemDescriptorProxy
-                                        :id="props.row.sale.itemFk"
-                                        :sale-fk="props.row.saleFk"
-                                    />
-                                </template>
-                                <template v-else>
-                                    {{ dashIfEmpty(col.field(props.row)) }}
-                                </template>
+                                <span v-if="col.name != 'description'">{{
+                                    t(col.value)
+                                }}</span>
+                                <span class="link" v-if="col.name === 'description'">{{
+                                    t(col.value)
+                                }}</span>
+                                <ItemDescriptorProxy
+                                    v-if="col.name == 'description'"
+                                    :id="props.row.sale.itemFk"
+                                    :sale-fk="props.row.saleFk"
+                                ></ItemDescriptorProxy>
                             </QTd>
                         </QTr>
                     </template>

From dc8dcdc7916de052ddc7d9c31461887210440cc2 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Mon, 5 May 2025 10:45:30 +0200
Subject: [PATCH 15/17] fix(ExtraCommunity): refs #8884 set max-width for
 package and physicKg columns

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

diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 849eeee5b..afa0663a8 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -182,6 +182,7 @@ const columns = computed(() => [
         align: 'left',
         showValue: false,
         sortable: true,
+        style: 'max-width: 200px;',
     },
     {
         label: t('globals.packages'),
@@ -206,6 +207,7 @@ const columns = computed(() => [
         align: 'left',
         showValue: false,
         sortable: true,
+        style: 'max-width: 75px;',
     },
     {
         label: t('extraCommunity.physicKg'),

From 2292ab8ad8883cfd6871d900f4ddccf4f45df096 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 5 May 2025 11:09:32 +0200
Subject: [PATCH 16/17] fix(ClaimSummary): fix description slot

---
 src/pages/Claim/Card/ClaimSummary.vue | 34 +++++++++++----------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 67d57004f..9eec79d96 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -54,7 +54,7 @@ const detailsColumns = ref([
     {
         name: 'item',
         label: 'claim.item',
-        field: (row) => row.sale.itemFk,
+        field: (row) => dashIfEmpty(row.sale.itemFk),
         sortable: true,
     },
     {
@@ -67,13 +67,13 @@ const detailsColumns = ref([
     {
         name: 'quantity',
         label: 'claim.quantity',
-        field: (row) => row.sale.quantity,
+        field: (row) => dashIfEmpty(row.sale.quantity),
         sortable: true,
     },
     {
         name: 'claimed',
         label: 'claim.claimed',
-        field: (row) => row.quantity,
+        field: (row) => dashIfEmpty(row.quantity),
         sortable: true,
     },
     {
@@ -84,7 +84,7 @@ const detailsColumns = ref([
     {
         name: 'price',
         label: 'claim.price',
-        field: (row) => row.sale.price,
+        field: (row) => dashIfEmpty(row.sale.price),
         sortable: true,
     },
     {
@@ -343,22 +343,16 @@ function claimUrl(section) {
                             </QTh>
                         </QTr>
                     </template>
-                    <template #body="props">
-                        <QTr :props="props">
-                            <QTd v-for="col in props.cols" :key="col.name" :props="props">
-                                <span v-if="col.name != 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <span class="link" v-if="col.name === 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <ItemDescriptorProxy
-                                    v-if="col.name == 'description'"
-                                    :id="props.row.sale.itemFk"
-                                    :sale-fk="props.row.saleFk"
-                                ></ItemDescriptorProxy>
-                            </QTd>
-                        </QTr>
+                    <template #body-cell-description="props">
+                        <QTd :props="props">
+                            <span class="link">
+                                {{ props.value }}
+                            </span>
+                            <ItemDescriptorProxy
+                                :id="props.row.sale.itemFk"
+                                :sale-fk="props.row.saleFk"
+                            />
+                        </QTd>
                     </template>
                 </QTable>
             </QCard>

From 83962f490204ba8370e6dfa9bd86a5d678004005 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Mon, 5 May 2025 12:04:06 +0200
Subject: [PATCH 17/17] feat: refs #8958 e2e test

---
 .../Customer/Card/CustomerCreditContracts.vue |  3 +++
 .../clientCreditContracts.spec.js             | 25 +++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index ca0960e2e..14b250127 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -102,6 +102,7 @@ const updateData = async () => {
                                         @click.stop="openDialog(item)"
                                         color="primary"
                                         name="lock"
+                                        data-cy="closeBtn"
                                         size="md"
                                         class="fill-icon q-px-md"
                                     >
@@ -155,6 +156,7 @@ const updateData = async () => {
                                     icon="preview"
                                     size="md"
                                     :title="t('View credits')"
+                                    data-cy="viewBtn"
                                     color="primary"
                                     flat
                                 />
@@ -171,6 +173,7 @@ const updateData = async () => {
 
     <QPageSticky :offset="[18, 18]" v-if="showQPageSticky">
         <QBtn
+            data-cy="createBtn"
             @click.stop="showForm = !showForm"
             color="primary"
             fab
diff --git a/test/cypress/integration/customer/credit-management/clientCreditContracts.spec.js b/test/cypress/integration/customer/credit-management/clientCreditContracts.spec.js
index 1c2f935fc..fb8e8219e 100644
--- a/test/cypress/integration/customer/credit-management/clientCreditContracts.spec.js
+++ b/test/cypress/integration/customer/credit-management/clientCreditContracts.spec.js
@@ -7,7 +7,28 @@ describe('Client credit contracts', () => {
             timeout: 5000,
         });
     });
-    it('Should load layout', () => {
-        cy.get('.q-page').should('be.visible');
+    it('Should add a new contract and an additional credit', () => {
+        cy.dataCy('createBtn').click();
+        cy.dataCy('Credit_input').type(123);
+        cy.dataCy('Grade_input').type(9);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.dataCy('createBtn').should('not.exist');
+    });
+
+    it('Should add an additional credit', () => {
+        cy.dataCy('viewBtn').eq(0).click();
+        cy.get('.q-page-sticky > div').click();
+        cy.dataCy('Credit_input').type(321);
+        cy.dataCy('Grade_input').type(89);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+
+    it('Should close a contract', () => {
+        cy.dataCy('closeBtn').eq(0).click();
+        cy.get('.q-btn--unelevated').click();
+        cy.checkNotification('Data saved');
+        cy.dataCy('createBtn').should('exist');
     });
 });