From 5ed2a821940bfa6258cc7fe530be34a0d2eb263c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 6 May 2024 14:50:15 +0200
Subject: [PATCH 01/72] feat: refs #6739 transferInvoice new checkbox and
 functionality

---
 src/components/TransferInvoiceForm.vue | 104 ++++++++++++++++++++++---
 1 file changed, 95 insertions(+), 9 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index de3196e2c..637ebda64 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -21,6 +21,8 @@ const $props = defineProps({
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
+const checked = ref(true);
+let skip = 0;
 
 const transferInvoiceParams = reactive({
     id: $props.invoiceOutData?.id,
@@ -36,15 +38,74 @@ const closeForm = () => {
     if (closeButton.value) closeButton.value.click();
 };
 
+onMounted(async () => {
+    await fetchClients();
+});
+
+const fetchClients = async () => {
+    try {
+        const filter = {
+            skip: skip,
+            order: 'id DESC',
+            limit: 10,
+        };
+        const { data } = await axios.get('http://localhost:9000/api/Clients/filter', {
+            params: {
+                filter: serializeFilter(filter),
+            },
+        });
+        clientsOptions.value = [...clientsOptions.value, ...data];
+        skip += 10;
+    } catch (error) {
+        console.error('Error fetching clients:', error);
+    }
+};
+
+const serializeFilter = (filter) => {
+    let serializedFilter = '{';
+    for (const key in filter) {
+        serializedFilter += `"${key}":${JSON.stringify(filter[key])},`;
+    }
+    serializedFilter = serializedFilter.slice(0, -1);
+    serializedFilter += '}';
+    return serializedFilter;
+};
+
+const handleScroll = async () => {
+    const selectEl = document.querySelector('.vn-select');
+    if (selectEl.scrollTop + selectEl.clientHeight >= selectEl.scrollHeight) {
+        await fetchClients();
+    }
+};
+
 const transferInvoice = async () => {
     try {
-        const { data } = await axios.post(
-            'InvoiceOuts/transferInvoice',
-            transferInvoiceParams
+        const clientDetails = await axios.get(
+            `Clients/${transferInvoiceParams.newClientFk}`
         );
-        notify(t('Transferred invoice'), 'positive');
-        closeForm();
-        router.push('InvoiceOutSummary', { id: data.id });
+        const hasToInvoiceByAddress = clientDetails.data.hasToInvoiceByAddress;
+
+        if (checked.value && hasToInvoiceByAddress) {
+            const confirmed = confirm(t('confirmationInfo'));
+
+            if (confirmed) {
+                const { data } = await axios.post(
+                    'InvoiceOuts/transferInvoice',
+                    transferInvoiceParams
+                );
+                notify(t('Transferred invoice'), 'positive');
+                closeForm();
+                router.push('InvoiceOutSummary', { id: data.id });
+            }
+        } else {
+            const { data } = await axios.post(
+                'InvoiceOuts/transferInvoice',
+                transferInvoiceParams
+            );
+            notify(t('Transferred invoice'), 'positive');
+            closeForm();
+            router.push('InvoiceOutSummary', { id: data.id });
+        }
     } catch (err) {
         console.error('Error transfering invoice', err);
     }
@@ -61,13 +122,23 @@ const transferInvoice = async () => {
     <FetchData
         url="CplusRectificationTypes"
         :filter="{ order: 'description' }"
-        @on-fetch="(data) => (rectificativeTypeOptions = data)"
+        @on-fetch="
+            (data) => (
+                (rectificativeTypeOptions = data),
+                (transferInvoiceParams.cplusRectificationTypeFk = data[1].id)
+            )
+        "
         auto-load
     />
     <FetchData
         url="SiiTypeInvoiceOuts"
         :filter="{ where: { code: { like: 'R%' } } }"
-        @on-fetch="(data) => (siiTypeInvoiceOutsOptions = data)"
+        @on-fetch="
+            (data) => (
+                (siiTypeInvoiceOutsOptions = data),
+                (transferInvoiceParams.siiTypeInvoiceOutFk = data[3].id)
+            )
+        "
         auto-load
     />
     <FetchData
@@ -92,6 +163,7 @@ const transferInvoice = async () => {
                         option-value="id"
                         v-model="transferInvoiceParams.newClientFk"
                         :required="true"
+                        @scroll="handleScroll"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -152,11 +224,22 @@ const transferInvoice = async () => {
                     />
                 </div>
             </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div>
+                    <QCheckbox :label="t('Bill destination client')" v-model="checked" />
+                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                        <QTooltip>{{ t('checkInfo') }}</QTooltip>
+                    </QIcon>
+                </div>
+            </VnRow>
         </template>
     </FormPopup>
 </template>
 
 <i18n>
+en:
+    checkInfo: New tickets from the destination customer will be generated in the consignee by default.
+    confirmationInfo: Destination customer is marked to bill in the consignee, do you want to continue?
 es:
     Transfer invoice: Transferir factura
     Transfer client: Transferir cliente
@@ -165,4 +248,7 @@ es:
     Class: Clase
     Type: Tipo
     Transferred invoice: Factura transferida
+    Bill destination client: Facturar cliente destino
+    checkInfo: Los nuevos tickets del cliente destino, serán generados en el consignatario por defecto.
+    confirmationInfo: El cliente destino tiene marcado facturar por consignatario, desea continuar?
 </i18n>

From 7befca94bda44686025779d90232b53152ee7e19 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 7 May 2024 10:35:48 +0200
Subject: [PATCH 02/72] refactor: refs #6739 new confirmation window

---
 src/components/TransferInvoiceForm.vue | 41 +++++++++++---------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index 637ebda64..b3c40b696 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -2,7 +2,8 @@
 import { ref, reactive, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
+import { useQuasar } from 'quasar';
+import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
@@ -18,6 +19,7 @@ const $props = defineProps({
     },
 });
 
+const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
@@ -77,35 +79,28 @@ const handleScroll = async () => {
         await fetchClients();
     }
 };
-
 const transferInvoice = async () => {
     try {
         const clientDetails = await axios.get(
             `Clients/${transferInvoiceParams.newClientFk}`
         );
-        const hasToInvoiceByAddress = clientDetails.data.hasToInvoiceByAddress;
 
-        if (checked.value && hasToInvoiceByAddress) {
-            const confirmed = confirm(t('confirmationInfo'));
+        if (checked.value && clientDetails.data.hasToInvoiceByAddress)
+            quasar.dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('Bill destination client'),
+                    message: t('confirmationInfo'),
+                },
+            });
 
-            if (confirmed) {
-                const { data } = await axios.post(
-                    'InvoiceOuts/transferInvoice',
-                    transferInvoiceParams
-                );
-                notify(t('Transferred invoice'), 'positive');
-                closeForm();
-                router.push('InvoiceOutSummary', { id: data.id });
-            }
-        } else {
-            const { data } = await axios.post(
-                'InvoiceOuts/transferInvoice',
-                transferInvoiceParams
-            );
-            notify(t('Transferred invoice'), 'positive');
-            closeForm();
-            router.push('InvoiceOutSummary', { id: data.id });
-        }
+        const { data } = await axios.post(
+            'InvoiceOuts/transferInvoice',
+            transferInvoiceParams
+        );
+        notify(t('Transferred invoice'), 'positive');
+        closeForm();
+        router.push('InvoiceOutSummary', { id: data.id });
     } catch (err) {
         console.error('Error transfering invoice', err);
     }

From bc1a79ac6853c26a1947db1635121616467cff0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 7 May 2024 11:27:39 +0200
Subject: [PATCH 03/72] refactor: refs #6739 updated transferInvoice function

---
 src/components/TransferInvoiceForm.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index b3c40b696..279ed822d 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -80,6 +80,16 @@ const handleScroll = async () => {
     }
 };
 const transferInvoice = async () => {
+    const params = {
+        id: transferInvoiceParams.id,
+        cplusRectificationTypeFk: transferInvoiceParams.cplusRectificationTypeFk,
+        invoiceCorrectionTypeFk: transferInvoiceParams.invoiceCorrectionTypeFk,
+        newClientFk: transferInvoiceParams.newClientFk,
+        refFk: transferInvoiceParams.refFk,
+        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
+        checked: checked.value,
+    };
+
     try {
         const clientDetails = await axios.get(
             `Clients/${transferInvoiceParams.newClientFk}`
@@ -94,10 +104,7 @@ const transferInvoice = async () => {
                 },
             });
 
-        const { data } = await axios.post(
-            'InvoiceOuts/transferInvoice',
-            transferInvoiceParams
-        );
+        const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
         notify(t('Transferred invoice'), 'positive');
         closeForm();
         router.push('InvoiceOutSummary', { id: data.id });

From a64d3339952fe463b48add4382d354a32c6d5d2f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 10 May 2024 07:04:03 +0200
Subject: [PATCH 04/72] refactor: refs #6739 requested changes

---
 src/components/TransferInvoiceForm.vue | 115 ++++++++++---------------
 1 file changed, 46 insertions(+), 69 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index 279ed822d..ecb99f55a 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
+import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -24,14 +24,12 @@ const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
 const checked = ref(true);
-let skip = 0;
-
 const transferInvoiceParams = reactive({
     id: $props.invoiceOutData?.id,
     refFk: $props.invoiceOutData?.ref,
 });
+
 const closeButton = ref(null);
-const clientsOptions = ref([]);
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
 const invoiceCorrectionTypesOptions = ref([]);
@@ -40,46 +38,14 @@ const closeForm = () => {
     if (closeButton.value) closeButton.value.click();
 };
 
-onMounted(async () => {
-    await fetchClients();
-});
-
-const fetchClients = async () => {
-    try {
-        const filter = {
-            skip: skip,
-            order: 'id DESC',
-            limit: 10,
-        };
-        const { data } = await axios.get('http://localhost:9000/api/Clients/filter', {
-            params: {
-                filter: serializeFilter(filter),
-            },
-        });
-        clientsOptions.value = [...clientsOptions.value, ...data];
-        skip += 10;
-    } catch (error) {
-        console.error('Error fetching clients:', error);
-    }
+const selectedClient = (client) => {
+    transferInvoiceParams.selectedClientData = client;
 };
 
-const serializeFilter = (filter) => {
-    let serializedFilter = '{';
-    for (const key in filter) {
-        serializedFilter += `"${key}":${JSON.stringify(filter[key])},`;
-    }
-    serializedFilter = serializedFilter.slice(0, -1);
-    serializedFilter += '}';
-    return serializedFilter;
-};
-
-const handleScroll = async () => {
-    const selectEl = document.querySelector('.vn-select');
-    if (selectEl.scrollTop + selectEl.clientHeight >= selectEl.scrollHeight) {
-        await fetchClients();
-    }
-};
 const transferInvoice = async () => {
+    const hasToInvoiceByAddress =
+        transferInvoiceParams.selectedClientData.hasToInvoiceByAddress;
+
     const params = {
         id: transferInvoiceParams.id,
         cplusRectificationTypeFk: transferInvoiceParams.cplusRectificationTypeFk,
@@ -91,18 +57,27 @@ const transferInvoice = async () => {
     };
 
     try {
-        const clientDetails = await axios.get(
-            `Clients/${transferInvoiceParams.newClientFk}`
-        );
-
-        if (checked.value && clientDetails.data.hasToInvoiceByAddress)
-            quasar.dialog({
-                component: VnConfirm,
-                componentProps: {
-                    title: t('Bill destination client'),
-                    message: t('confirmationInfo'),
-                },
+        if (checked.value && hasToInvoiceByAddress) {
+            const response = await new Promise((resolve) => {
+                quasar
+                    .dialog({
+                        component: VnConfirm,
+                        componentProps: {
+                            title: t('Bill destination client'),
+                            message: t('transferInvoiceInfo'),
+                        },
+                    })
+                    .onOk(() => {
+                        resolve(true);
+                    })
+                    .onCancel(() => {
+                        resolve(false);
+                    });
             });
+            if (!response) {
+                return;
+            }
+        }
 
         const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
         notify(t('Transferred invoice'), 'positive');
@@ -115,19 +90,15 @@ const transferInvoice = async () => {
 </script>
 
 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => (clientsOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'id', limit: 30 }"
-        auto-load
-    />
     <FetchData
         url="CplusRectificationTypes"
         :filter="{ order: 'description' }"
         @on-fetch="
             (data) => (
                 (rectificativeTypeOptions = data),
-                (transferInvoiceParams.cplusRectificationTypeFk = data[1].id)
+                (transferInvoiceParams.cplusRectificationTypeFk = data.filter(
+                    (type) => type.description == 'I – Por diferencias'
+                )[0].id)
             )
         "
         auto-load
@@ -138,7 +109,9 @@ const transferInvoice = async () => {
         @on-fetch="
             (data) => (
                 (siiTypeInvoiceOutsOptions = data),
-                (transferInvoiceParams.siiTypeInvoiceOutFk = data[3].id)
+                (transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
+                    (type) => type.code == 'R4'
+                )[0].id)
             )
         "
         auto-load
@@ -159,20 +132,23 @@ const transferInvoice = async () => {
                 <div class="col">
                     <VnSelect
                         :label="t('Client')"
-                        :options="clientsOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
                         v-model="transferInvoiceParams.newClientFk"
                         :required="true"
-                        @scroll="handleScroll"
+                        url="Clients"
+                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
+                        auto-load
                     >
                         <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
+                            <QItem
+                                v-bind="scope.itemProps"
+                                @click="selectedClient(scope.opt)"
+                            >
                                 <QItemSection>
                                     <QItemLabel>
-                                        #{{ scope.opt?.id }} -
-                                        {{ scope.opt?.name }}
+                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
@@ -230,7 +206,7 @@ const transferInvoice = async () => {
                 <div>
                     <QCheckbox :label="t('Bill destination client')" v-model="checked" />
                     <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                        <QTooltip>{{ t('checkInfo') }}</QTooltip>
+                        <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
                     </QIcon>
                 </div>
             </VnRow>
@@ -241,7 +217,8 @@ const transferInvoice = async () => {
 <i18n>
 en:
     checkInfo: New tickets from the destination customer will be generated in the consignee by default.
-    confirmationInfo: Destination customer is marked to bill in the consignee, do you want to continue?
+    transferInvoiceInfo: Destination customer is marked to bill in the consignee, do you want to continue?
+    confirmTransferInvoice: The destination customer has selected to bill in the consignee, do you want to continue?
 es:
     Transfer invoice: Transferir factura
     Transfer client: Transferir cliente
@@ -251,6 +228,6 @@ es:
     Type: Tipo
     Transferred invoice: Factura transferida
     Bill destination client: Facturar cliente destino
-    checkInfo: Los nuevos tickets del cliente destino, serán generados en el consignatario por defecto.
-    confirmationInfo: El cliente destino tiene marcado facturar por consignatario, desea continuar?
+    transferInvoiceInfo: Los nuevos tickets del cliente destino, serán generados en el consignatario por defecto.
+    confirmTransferInvoice: El cliente destino tiene marcado facturar por consignatario, desea continuar?
 </i18n>

From d73b5b6f4c8fe2df9d609f4f4975814bd16c7903 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 23 May 2024 15:06:57 +0200
Subject: [PATCH 05/72] refactor: refs #6739 changed router.push

---
 src/components/TransferInvoiceForm.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index 418257304..c79c23741 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -81,8 +81,7 @@ const transferInvoice = async () => {
 
         const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
         notify(t('Transferred invoice'), 'positive');
-        closeForm();
-        router.push('InvoiceOutSummary', { id: data.id });
+        if (data.id) router.push({ name: 'InvoiceOutSummary', params: { id: data.id } });
     } catch (err) {
         console.error('Error transfering invoice', err);
     }

From f0b1919157e565950e8fb686dfda53717b151d29 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 23 May 2024 15:08:03 +0200
Subject: [PATCH 06/72] refactor: refs #6739 deleted useless const

---
 src/components/TransferInvoiceForm.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index c79c23741..f69bf6b83 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -29,15 +29,10 @@ const transferInvoiceParams = reactive({
     refFk: $props.invoiceOutData?.ref,
 });
 
-const closeButton = ref(null);
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
 const invoiceCorrectionTypesOptions = ref([]);
 
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
-};
-
 const selectedClient = (client) => {
     transferInvoiceParams.selectedClientData = client;
 };

From d4fbd99473d75b94b2b7444294558217376f40eb Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 27 May 2024 09:40:48 +0200
Subject: [PATCH 07/72] refs #7406 table formation

---
 src/pages/Worker/Card/WorkerFormation.vue | 84 +++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 src/pages/Worker/Card/WorkerFormation.vue

diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
new file mode 100644
index 000000000..f8e458e1b
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -0,0 +1,84 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+const tableRef = ref();
+const { t } = useI18n();
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'course',
+        label: t('worker.formation.tableVisibleColumns.course'),
+        isTitle: true,
+        component: 'select',
+        attrs: {
+            url: 'Workers/trainingCourse',
+            fields: ['id', 'name'],
+        },
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'startDate',
+        label: t('worker.formation.tableVisibleColumns.startDate'),
+        isTitle: true,
+        component: VnInputDate,
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.started,
+        }),
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'endDate',
+        label: t('worker.formation.tableVisibleColumns.endDate'),
+        isTitle: true,
+        component: VnInputDate,
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.ended,
+        }),
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'center',
+        label: t('worker.formation.tableVisibleColumns.center'),
+        isTitle: true,
+        component: 'select',
+        attrs: {
+            url: 'Workers/trainingCenter',
+            fields: ['id', 'name'],
+        },
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'invoice',
+    },
+]);
+</script>
+<template>
+    <VnTable
+        ref="tableRef"
+        data-key="WorkerFormation"
+        url="Workers/trainingCourse"
+        url-create="Workers/trainingCourse"
+        :create="{
+            urlCreate: 'Workers/trainingCourse',
+            title: 'Create trainingCourse',
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {
+                active: true,
+                isEqualizated: false,
+            },
+        }"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+    ></VnTable>
+</template>

From c865bc2ed45331d4083aad3d0eaf7ec0bcc1c8aa Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 27 May 2024 10:07:32 +0200
Subject: [PATCH 08/72] refs #7406 fix props

---
 src/pages/Worker/Card/WorkerFormation.vue | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index f8e458e1b..312acf4f2 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -58,6 +58,44 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'invoice',
+        label: t('worker.formation.tableVisibleColumns.invoice'),
+        isTitle: true,
+        component: 'input',
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('worker.formation.tableVisibleColumns.amount'),
+        isTitle: true,
+        component: 'input',
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.amount,
+        }),
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'remark',
+        label: t('worker.formation.tableVisibleColumns.remark'),
+        isTitle: true,
+        component: 'checkbox',
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.remark,
+        }),
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'hasDiploma',
+        label: t('worker.formation.tableVisibleColumns.hasDiploma'),
+        isTitle: true,
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.hasDiploma,
+        }),
+        create: true,
     },
 ]);
 </script>

From ef52c9b0c0a6920c0dfd9d89c6beb18edc39f9a5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 27 May 2024 10:42:47 +0200
Subject: [PATCH 09/72] refs #7406 routes trad

---
 src/i18n/locale/en.yml       |  2 +-
 src/i18n/locale/es.yml       |  1 +
 src/router/modules/worker.js | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3853e3ab6..3eb464937 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -830,7 +830,7 @@ worker:
         calendar: Calendar
         timeControl: Time control
         locker: Locker
-
+        formation: Formation
     list:
         name: Name
         email: Email
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index a8b9ecd51..652fb7e6e 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -828,6 +828,7 @@ worker:
         calendar: Calendario
         timeControl: Control de horario
         locker: Taquilla
+        formation: Formación
     list:
         name: Nombre
         email: Email
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 384978d13..281ee08a0 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -23,6 +23,7 @@ export default {
             'WorkerDms',
             'WorkerTimeControl',
             'WorkerLocker',
+            'WorkerFormation',
         ],
         departmentCard: ['BasicData'],
     },
@@ -177,6 +178,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLocker.vue'),
                 },
+                {
+                    name: 'WorkerFormation',
+                    path: 'formation',
+                    meta: {
+                        title: 'formation',
+                        icon: 'clinical_notes',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerFormation.vue'),
+                },
             ],
         },
     ],

From d207482e3aae69529994c681f126a78650662caa Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 27 May 2024 11:27:33 +0200
Subject: [PATCH 10/72] refs #7406 fix url

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

diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 312acf4f2..2e27a2a96 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -103,8 +103,8 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="WorkerFormation"
-        url="Workers/trainingCourse"
-        url-create="Workers/trainingCourse"
+        url="`Workers/${entityId}/trainingCourse`"
+        url-create="`Workers/${entityId}/trainingCourse`"
         :create="{
             urlCreate: 'Workers/trainingCourse',
             title: 'Create trainingCourse',

From 947496e0a1b5efe32999e4b5438a1e20b2b0b11a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 27 May 2024 14:43:03 +0200
Subject: [PATCH 11/72] refs #7406 fix components

---
 src/pages/Worker/Card/WorkerFormation.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 2e27a2a96..8485f4a5b 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -2,10 +2,13 @@
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 const tableRef = ref();
 const { t } = useI18n();
+const route = useRoute();
+const entityId = computed(() => route.params.id);
 const columns = computed(() => [
     {
         align: 'left',
@@ -23,7 +26,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'startDate',
         label: t('worker.formation.tableVisibleColumns.startDate'),
-        isTitle: true,
         component: VnInputDate,
         props: (prop) => ({
             disable: true,
@@ -35,7 +37,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'endDate',
         label: t('worker.formation.tableVisibleColumns.endDate'),
-        isTitle: true,
         component: VnInputDate,
         props: (prop) => ({
             disable: true,
@@ -47,7 +48,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'center',
         label: t('worker.formation.tableVisibleColumns.center'),
-        isTitle: true,
         component: 'select',
         attrs: {
             url: 'Workers/trainingCenter',
@@ -59,14 +59,12 @@ const columns = computed(() => [
         align: 'left',
         name: 'invoice',
         label: t('worker.formation.tableVisibleColumns.invoice'),
-        isTitle: true,
         component: 'input',
     },
     {
         align: 'left',
         name: 'amount',
         label: t('worker.formation.tableVisibleColumns.amount'),
-        isTitle: true,
         component: 'input',
         props: (prop) => ({
             disable: true,
@@ -78,7 +76,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'remark',
         label: t('worker.formation.tableVisibleColumns.remark'),
-        isTitle: true,
         component: 'checkbox',
         props: (prop) => ({
             disable: true,
@@ -90,7 +87,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'hasDiploma',
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
-        isTitle: true,
         props: (prop) => ({
             disable: true,
             'model-value': prop.row.hasDiploma,
@@ -103,8 +99,8 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="WorkerFormation"
-        url="`Workers/${entityId}/trainingCourse`"
-        url-create="`Workers/${entityId}/trainingCourse`"
+        :url="`Workers/${entityId}/trainingCourse`"
+        :url-create="`Workers/${entityId}/trainingCourse`"
         :create="{
             urlCreate: 'Workers/trainingCourse',
             title: 'Create trainingCourse',

From d8512e2033cf9377485b72e232b142bb140848e3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 27 May 2024 18:23:33 +0200
Subject: [PATCH 12/72] refs #7406 fix trad

---
 src/i18n/locale/en.yml                    | 10 ++++++++++
 src/i18n/locale/es.yml                    | 10 ++++++++++
 src/pages/Worker/Card/WorkerFormation.vue |  3 ++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3eb464937..91d88f252 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -900,6 +900,16 @@ worker:
         payMethods: Pay method
         iban: IBAN
         bankEntity: Swift / BIC
+    formation:
+        tableVisibleColumns:
+            course: Curso
+            startDate: Fecha Inicio
+            endDate: Fecha Fin
+            center: Centro Formación
+            invoice: Factura
+            amount: Importe
+            remark: Bonficado
+            hasDiploma: Diploma
     imageNotFound: Image not found
 wagon:
     pageTitles:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 652fb7e6e..29fe52508 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -889,6 +889,16 @@ worker:
         payMethods: Método de pago
         iban: IBAN
         bankEntity: Swift / BIC
+    formation:
+        tableVisibleColumns:
+            course: Curso
+            startDate: Fecha Inicio
+            endDate: Fecha Fin
+            center: Centro Formación
+            invoice: Factura
+            amount: Importe
+            remark: Bonficado
+            hasDiploma: Diploma
     imageNotFound: No se ha encontrado la imagen
 wagon:
     pageTitles:
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 8485f4a5b..e68f7abf9 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -17,7 +17,7 @@ const columns = computed(() => [
         isTitle: true,
         component: 'select',
         attrs: {
-            url: 'Workers/trainingCourse',
+            url: 'TrainingCourse/trainingCourseType',
             fields: ['id', 'name'],
         },
         create: true,
@@ -114,5 +114,6 @@ const columns = computed(() => [
         :columns="columns"
         default-mode="table"
         auto-load
+        :right-search="false"
     ></VnTable>
 </template>

From ffe15da7cfe5bcc47b75b083c56726cea9acd847 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 28 May 2024 10:41:24 +0200
Subject: [PATCH 13/72] refs #7406 fix VnTable columns

---
 src/pages/Travel/Card/TravelThermographs.vue |  6 +-
 src/pages/Worker/Card/WorkerFormation.vue    | 64 +++++++++-----------
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index d2195beb4..1898a58d6 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -13,7 +13,7 @@ import useNotify from 'src/composables/useNotify.js';
 import { toDate } from 'src/filters';
 import { downloadFile } from 'src/composables/downloadFile';
 
-const route = useRoute();
+const {{id}} = useRoute();
 const quasar = useQuasar();
 const router = useRouter();
 const { t } = useI18n();
@@ -29,7 +29,7 @@ const thermographFilter = {
             fields: ['id', 'name'],
         },
     },
-    where: { travelFk: route.params.id },
+    where: { travelFk: id },
     order: ['created'],
 };
 
@@ -137,7 +137,7 @@ const removeThermograph = async (id) => {
         data-key="TravelThermographs"
         url="TravelThermographs"
         :filter="thermographFilter"
-        :params="{ travelFk: route.params.id }"
+        :params="{ travelFk: id }"
         auto-load
     >
         <template #body="{ rows }">
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index e68f7abf9..c8fd50303 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -1,7 +1,6 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -9,50 +8,54 @@ const tableRef = ref();
 const { t } = useI18n();
 const route = useRoute();
 const entityId = computed(() => route.params.id);
+const courseFilter = {
+    include: [
+        {
+            relation: 'trainingCourseType',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+        {
+            relation: 'trainingCenter',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+};
 const columns = computed(() => [
     {
         align: 'left',
-        name: 'course',
+        name: 'trainingCourseTypeFk',
         label: t('worker.formation.tableVisibleColumns.course'),
         isTitle: true,
         component: 'select',
-        attrs: {
-            url: 'TrainingCourse/trainingCourseType',
-            fields: ['id', 'name'],
-        },
+        field: 'trainingCourseTypeFk',
         create: true,
     },
     {
         align: 'left',
-        name: 'startDate',
+        name: 'started',
         label: t('worker.formation.tableVisibleColumns.startDate'),
         component: VnInputDate,
-        props: (prop) => ({
-            disable: true,
-            'model-value': prop.row.started,
-        }),
+        field: 'started',
         create: true,
     },
     {
         align: 'left',
-        name: 'endDate',
+        name: 'ended',
         label: t('worker.formation.tableVisibleColumns.endDate'),
         component: VnInputDate,
-        props: (prop) => ({
-            disable: true,
-            'model-value': prop.row.ended,
-        }),
+        field: 'ended',
         create: true,
     },
     {
         align: 'left',
-        name: 'center',
+        name: 'centerFk',
         label: t('worker.formation.tableVisibleColumns.center'),
         component: 'select',
-        attrs: {
-            url: 'Workers/trainingCenter',
-            fields: ['id', 'name'],
-        },
+        field: 'centerFk',
         create: true,
     },
     {
@@ -60,16 +63,14 @@ const columns = computed(() => [
         name: 'invoice',
         label: t('worker.formation.tableVisibleColumns.invoice'),
         component: 'input',
+        field: 'invoice',
     },
     {
         align: 'left',
         name: 'amount',
         label: t('worker.formation.tableVisibleColumns.amount'),
         component: 'input',
-        props: (prop) => ({
-            disable: true,
-            'model-value': prop.row.amount,
-        }),
+        field: 'amount',
         create: true,
     },
     {
@@ -77,20 +78,14 @@ const columns = computed(() => [
         name: 'remark',
         label: t('worker.formation.tableVisibleColumns.remark'),
         component: 'checkbox',
-        props: (prop) => ({
-            disable: true,
-            'model-value': prop.row.remark,
-        }),
+        field: 'remark',
         create: true,
     },
     {
         align: 'left',
         name: 'hasDiploma',
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
-        props: (prop) => ({
-            disable: true,
-            'model-value': prop.row.hasDiploma,
-        }),
+        field: 'hasDiploma',
         create: true,
     },
 ]);
@@ -101,6 +96,7 @@ const columns = computed(() => [
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
         :url-create="`Workers/${entityId}/trainingCourse`"
+        :filter="courseFilter"
         :create="{
             urlCreate: 'Workers/trainingCourse',
             title: 'Create trainingCourse',

From 264d887fb454c59cef294bb0b39cdb4e5c0e0eac Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 28 May 2024 12:09:03 +0200
Subject: [PATCH 14/72] refs #7406 fix Tb components create

---
 src/components/ui/VnPaginate.vue          |  5 +++
 src/pages/Worker/Card/WorkerFormation.vue | 38 ++++++++++++++++-------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 58dd0d313..d3000bc64 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -26,6 +26,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     where: {
         type: Object,
         default: null,
@@ -78,6 +82,7 @@ const arrayData = useArrayData(props.dataKey, {
     where: props.where,
     limit: props.limit,
     order: props.order,
+    userFilter: props.userFilter,
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
     keepOpts: props.keepOpts,
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index c8fd50303..02a3cdba2 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -30,9 +30,14 @@ const columns = computed(() => [
         name: 'trainingCourseTypeFk',
         label: t('worker.formation.tableVisibleColumns.course'),
         isTitle: true,
-        component: 'select',
-        field: 'trainingCourseTypeFk',
         create: true,
+        component: 'select',
+        attrs: {
+            url: 'TrainingCourseTypes',
+            fields: ['id', 'name'],
+        },
+        disable: false,
+        inWhere: true,
     },
     {
         align: 'left',
@@ -41,6 +46,7 @@ const columns = computed(() => [
         component: VnInputDate,
         field: 'started',
         create: true,
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -54,9 +60,15 @@ const columns = computed(() => [
         align: 'left',
         name: 'centerFk',
         label: t('worker.formation.tableVisibleColumns.center'),
-        component: 'select',
         field: 'centerFk',
         create: true,
+        component: 'select',
+        attrs: {
+            url: 'TrainingCenters',
+            fields: ['id', 'name'],
+        },
+        disable: false,
+        inWhere: true,
     },
     {
         align: 'left',
@@ -77,16 +89,21 @@ const columns = computed(() => [
         align: 'left',
         name: 'remark',
         label: t('worker.formation.tableVisibleColumns.remark'),
-        component: 'checkbox',
-        field: 'remark',
         create: true,
+        chip: {
+            color: null,
+            condition: (value) => value,
+        },
     },
     {
         align: 'left',
         name: 'hasDiploma',
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
-        field: 'hasDiploma',
         create: true,
+        chip: {
+            color: null,
+            condition: (value) => value,
+        },
     },
 ]);
 </script>
@@ -96,14 +113,13 @@ const columns = computed(() => [
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
         :url-create="`Workers/${entityId}/trainingCourse`"
-        :filter="courseFilter"
+        :user-filter="courseFilter"
         :create="{
-            urlCreate: 'Workers/trainingCourse',
+            urlCreate: 'trainingCourses',
             title: 'Create trainingCourse',
-            onDataSaved: ({ id }) => tableRef.redirect(id),
+            onDataSaved: () => tableRef.reload(),
             formInitialData: {
-                active: true,
-                isEqualizated: false,
+                workerFk: entityId,
             },
         }"
         order="id DESC"

From 18e3e611e9a9e543f4a687775a4eaf96662052b0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 3 Jun 2024 10:53:16 +0200
Subject: [PATCH 15/72] refactor: refs #6739 changed invoice functions' name

---
 src/components/TransferInvoiceForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index f69bf6b83..d60eb7a14 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -37,7 +37,7 @@ const selectedClient = (client) => {
     transferInvoiceParams.selectedClientData = client;
 };
 
-const transferInvoice = async () => {
+const makeInvoice = async () => {
     const hasToInvoiceByAddress =
         transferInvoiceParams.selectedClientData.hasToInvoiceByAddress;
 
@@ -116,7 +116,7 @@ const transferInvoice = async () => {
         auto-load
     />
     <FormPopup
-        @on-submit="transferInvoice()"
+        @on-submit="makeInvoice()"
         :title="t('Transfer invoice')"
         :custom-submit-button-label="t('Transfer client')"
         :default-cancel-button="false"

From aa2601ac456b35d1f991649e27288bd46f7b4a79 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 10 Jun 2024 09:15:17 +0200
Subject: [PATCH 16/72] feat(WorkerFormation): add columnFilter

---
 src/pages/Worker/Card/WorkerFormation.vue | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 02a3cdba2..97d829140 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -37,7 +37,9 @@ const columns = computed(() => [
             fields: ['id', 'name'],
         },
         disable: false,
-        inWhere: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -60,7 +62,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'centerFk',
         label: t('worker.formation.tableVisibleColumns.center'),
-        field: 'centerFk',
         create: true,
         component: 'select',
         attrs: {
@@ -68,7 +69,9 @@ const columns = computed(() => [
             fields: ['id', 'name'],
         },
         disable: false,
-        inWhere: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -90,20 +93,13 @@ const columns = computed(() => [
         name: 'remark',
         label: t('worker.formation.tableVisibleColumns.remark'),
         create: true,
-        chip: {
-            color: null,
-            condition: (value) => value,
-        },
+        component: 'checkbox',
     },
     {
         align: 'left',
         name: 'hasDiploma',
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
         create: true,
-        chip: {
-            color: null,
-            condition: (value) => value,
-        },
     },
 ]);
 </script>
@@ -113,7 +109,7 @@ const columns = computed(() => [
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
         :url-create="`Workers/${entityId}/trainingCourse`"
-        :user-filter="courseFilter"
+        :filter="courseFilter"
         :create="{
             urlCreate: 'trainingCourses',
             title: 'Create trainingCourse',

From 14e27f193e0c69e68d00b98c32677afb1be9f901 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 11 Jun 2024 15:00:03 +0200
Subject: [PATCH 17/72] =?UTF-8?q?feat:=20adapt=20tu=20VnTable=20=E2=86=92?=
 =?UTF-8?q?=20CrudModel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Worker/Card/WorkerFormation.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 97d829140..e2486a168 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -109,6 +109,7 @@ const columns = computed(() => [
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
         :url-create="`Workers/${entityId}/trainingCourse`"
+        save-url="TrainingCourses/crud"
         :filter="courseFilter"
         :create="{
             urlCreate: 'trainingCourses',
@@ -123,5 +124,5 @@ const columns = computed(() => [
         default-mode="table"
         auto-load
         :right-search="false"
-    ></VnTable>
+    />
 </template>

From 89f6873b03778d377d1d205e09e65a1ee48de83f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 11 Jun 2024 22:40:07 -0300
Subject: [PATCH 18/72] WIP

---
 src/pages/Ticket/Card/TicketEditMana.vue | 150 ++++++++
 src/pages/Ticket/Card/TicketSale.vue     | 456 ++++++++++++++++++++++-
 src/pages/Ticket/locale/en.yml           |  10 +
 src/pages/Ticket/locale/es.yml           |  10 +
 4 files changed, 625 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/Card/TicketEditMana.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
new file mode 100644
index 000000000..d563e49f7
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -0,0 +1,150 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { toCurrency } from 'src/filters';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+    type: {
+        type: String,
+        default: 'price', // 'discount' or 'price
+    },
+});
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const edit = ref({});
+const usesMana = ref(null);
+
+const inputLabel = computed(() => ($props.type === 'price' ? t('Price') : t('Discount')));
+
+const getUsesMana = async () => {
+    const { data } = await axios.get('Sales/usesMana');
+    usesMana.value = data;
+};
+
+const getMana = async () => {
+    const { data } = await axios.get(`Tickets/${$props.id}/getSalesPersonMana`);
+    edit.value.mana = data;
+    await getUsesMana();
+    console.log('edit', edit.value);
+    // this.$.$applyAsync(() => {
+    //     this.$.editDiscount.relocate();
+    //     this.$.editPricePopover.relocate();
+    // });
+};
+
+const updatePrice = async () => {
+    try {
+        const sale = edit.value.sale;
+        const newPrice = edit.value.price;
+        if (newPrice != null && newPrice != sale.price) {
+            await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+            sale.price = newPrice;
+            edit.value = null;
+            notify('globals.dataSaved', 'positive');
+
+            // this.$http
+            //     .post(query, { newPrice })
+            //     .then((res) => {
+            //         sale.price = res.data.price;
+            //         this.edit = null;
+            //         this.vnApp.showSuccess(this.$t('Data saved!'));
+            //     })
+            //     .finally(() => this.resetChanges());
+        }
+        await getMana();
+    } catch (err) {
+        console.error('Error updating price', err);
+    }
+};
+
+const getNewPrice = () => {
+    if (edit.value.sale) {
+        const sale = edit.value.sale;
+        let newDiscount = sale.discount;
+        let newPrice = edit.value.price || sale.price;
+
+        if (edit.value.discount != null) newDiscount = edit.value.discount;
+
+        if (edit.value.price != null) newPrice = edit.value.price;
+
+        const price = sale.quantity * newPrice;
+        const discount = (newDiscount * price) / 100;
+
+        return price - discount;
+    }
+
+    return 0;
+};
+onMounted(async () => {
+    await getMana();
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <div class="container">
+            <QSpinner v-if="!edit.mana" color="orange" size="md" />
+            <div v-else>
+                <div class="header">Mana: {{ toCurrency(edit.mana) }}</div>
+                <div class="q-pa-md">
+                    <VnInput
+                        v-model.number="edit.price"
+                        :label="inputLabel"
+                        @change="updatePrice(row)"
+                    />
+                    <div class="column items-center q-mt-lg">
+                        <span class="text-primary">{{ t('New price') }}</span>
+                        <span class="text-subtitle1">{{
+                            toCurrency(getNewPrice())
+                        }}</span>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <QBtn color="primary" class="no-border-radius" dense style="width: 50%">
+                    {{ t('globals.cancel') }}
+                </QBtn>
+                <QBtn color="primary" class="no-border-radius" dense style="width: 50%">
+                    {{ t('globals.save') }}
+                </QBtn>
+            </div>
+        </div>
+    </QPopupProxy>
+</template>
+
+<style lang="scss" scoped>
+.container {
+    background-color: $dark;
+    width: 230px;
+}
+
+.header {
+    height: 54px;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: $primary;
+    font-size: 1.2rem;
+    font-weight: bold;
+    min-width: 230px;
+}
+</style>
+
+<i18n>
+es:
+    Price: Precio
+    Discount: Descuento
+    New price: Nuevo precio
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 02cccaff2..ae737bfee 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -1 +1,455 @@
-<template>Ticket sale</template>
+<script setup>
+import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter, useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+// import ItemSummary from '../Item/Card/ItemSummary.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import TicketEditManaProxy from './TicketEditMana.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useSession } from 'composables/useSession';
+import { toCurrency, toPercentage } from 'src/filters';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import useNotify from 'src/composables/useNotify.js';
+
+const route = useRoute();
+const router = useRouter();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
+const salesDataRef = ref(null);
+
+const isLocked = ref(false);
+const isTicketEditable = ref(false);
+const salesOptions = ref([]);
+const allColumnNames = ref([]);
+const itemsWithNameOptions = ref([]);
+const manaCode = ref('mana');
+
+const columns = computed(() => [
+    {
+        label: '',
+        name: 'statusIcons',
+        align: 'left',
+    },
+    {
+        label: '',
+        name: 'picture',
+        align: 'left',
+    },
+    {
+        label: t('ticketSale.visible'),
+        name: 'visible',
+        field: 'visible',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSale.available'),
+        name: 'available',
+        field: 'available',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSale.id'),
+        name: 'itemFk',
+        field: 'itemFk',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSale.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSale.item'),
+        name: 'item',
+        field: 'item',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSale.price'),
+        name: 'price',
+        field: 'price',
+        align: 'left',
+        sortable: true,
+        format: (val) => toCurrency(val),
+    },
+    {
+        label: t('ticketSale.discount'),
+        name: 'discount',
+        field: 'discount',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSale.amount'),
+        name: 'amount',
+        field: 'amount',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSale.packaging'),
+        name: 'packaging',
+        field: 'packaging',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
+]);
+
+const redirectToItemCreate = () => {
+    router.push({ name: 'ItemCreate' });
+};
+
+// const redirectToItemSummary = (id) => {
+//     router.push({ name: 'ItemSummary', params: { id } });
+// };
+
+// const cloneItem = async (itemFk) => {
+//     try {
+//         const { data } = await axios.post(`Items/${itemFk}/clone`);
+//         if (!data) return;
+//         router.push({ name: 'ItemTags', params: { id: data.id } });
+//     } catch (err) {
+//         console.error('Error cloning item', err);
+//     }
+// };
+
+const resetChanges = async () => salesDataRef.value.fetch();
+
+const updateQuantity = async (sale) => {
+    console.log('updateQuantity');
+    try {
+        const payload = { quantity: sale.quantity };
+
+        await axios.post(`Sales/${sale.id}/updateQuantity`, payload);
+        notify('globals.dataSaved', 'positive');
+        await resetChanges();
+    } catch (err) {
+        console.error('Error updating quantity', err);
+    }
+};
+
+const addSale = async (sale) => {
+    try {
+        const payload = {
+            barcode: sale.itemFk,
+            quantity: sale.quantity,
+        };
+
+        const { data } = await axios.post(`tickets/${route.params.id}/addSale`, payload);
+
+        if (!data) return;
+
+        const newSale = data;
+        sale.id = newSale.id;
+        sale.image = newSale.item.image;
+        sale.subName = newSale.item.subName;
+        sale.concept = newSale.concept;
+        sale.quantity = newSale.quantity;
+        sale.discount = newSale.discount;
+        sale.price = newSale.price;
+        sale.item = newSale.item;
+
+        notify('globals.dataSaved', 'positive');
+        await resetChanges();
+    } catch (err) {
+        console.error('Error adding sale', err);
+    }
+};
+
+const changeQuantity = (sale) => {
+    if (!sale.itemFk || sale.quantity == null) return;
+
+    if (!sale.id) return addSale(sale);
+
+    updateQuantity(sale);
+};
+
+const updateConcept = async (sale) => {
+    try {
+        const data = { newConcept: sale.concept };
+        await axios.post(`Sales/${sale.id}/updateConcept`, data);
+        notify('globals.dataSaved', 'positive');
+        await resetChanges();
+    } catch (err) {
+        console.error('Error updating concept', err);
+    }
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    const filteredColumns = columns.value.filter(
+        (col) => col.name !== 'picture' && col.name !== 'actions'
+    );
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        :url="`Tickets/${route.params.id}/isEditable`"
+        auto-load
+        @on-fetch="(data) => (isTicketEditable = data)"
+    />
+    <FetchData
+        :url="`Tickets/${route.params.id}/isLocked`"
+        auto-load
+        @on-fetch="(data) => (isLocked = data)"
+    />
+    <FetchData
+        ref="salesDataRef"
+        :url="`Tickets/${route.params.id}/getSales`"
+        auto-load
+        @on-fetch="(data) => (salesOptions = data)"
+    />
+    <FetchData
+        url="Items/withName"
+        :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
+        auto-load
+        @on-fetch="(data) => (itemsWithNameOptions = data)"
+    />
+    <VnSubToolbar>
+        <template #st-data> </template>
+    </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
+            <ItemListFilter data-key="ItemList" />
+        </template>
+    </RightMenu>
+    <!-- <VnPaginate
+        ref="paginateRef"
+        data-key="ItemList"
+        url="Items/filter"
+        :order="['isActive DESC', 'name', 'id']"
+        :limit="12"
+        :expr-builder="exprBuilder"
+        :user-params="params"
+        :keep-opts="['userParams']"
+        :offset="50"
+        auto-load
+    >
+        <template #body="{ rows }"> -->
+    <QTable
+        :rows="salesOptions"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        selection="multiple"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell-statusIcons="{ row }">
+            <QTd class="q-gutter-x-xs">
+                <router-link
+                    v-if="row.claim?.claimFk"
+                    :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
+                >
+                    <QIcon color="primary" name="vn:claims" size="xs">
+                        <QTooltip>
+                            {{ t('ticket.summary.unavailable') }}:
+                            {{ row.claim?.claimFk }}
+                        </QTooltip>
+                    </QIcon>
+                </router-link>
+                <QIcon v-if="row.visible < 0" color="primary" name="warning" size="xs">
+                    <QTooltip>
+                        {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
+                    <QTooltip>
+                        {{ t('ticket.summary.reserved') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.itemShortage"
+                    color="primary"
+                    name="vn:unavailable"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('ticket.summary.itemShortage') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasComponentLack"
+                    color="primary"
+                    name="vn:components"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('ticket.summary.hasComponentLack') }}
+                    </QTooltip>
+                </QIcon>
+            </QTd>
+        </template>
+        <template #body-cell-picture="{ row }">
+            <QTd>
+                <QImg
+                    :src="`/api/Images/catalog/50x50/${row.itemFk}/download?access_token=${token}`"
+                    spinner-color="primary"
+                    :ratio="1"
+                    height="50px"
+                    width="50px"
+                    style="border-radius: 50%"
+                />
+            </QTd>
+        </template>
+        <template #body-cell-visible="{ row }">
+            <QTd @click.stop>
+                <QBadge :color="row.visible < 0 ? 'alert' : 'transparent'" dense>
+                    {{ row.visible }}
+                </QBadge>
+            </QTd>
+        </template>
+        <template #body-cell-available="{ row }">
+            <QTd @click.stop>
+                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+                    {{ row.available }}
+                </QBadge>
+            </QTd>
+        </template>
+        <template #body-cell-itemFk="{ row }">
+            <QTd @click.stop>
+                <div v-if="row.id">
+                    <QBtn flat color="primary" dense>
+                        {{ row.itemFk }}
+                    </QBtn>
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </div>
+                <VnSelect
+                    v-else
+                    :options="itemsWithNameOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="row.itemFk"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </QTd>
+        </template>
+        <template #body-cell-quantity="{ row }">
+            <QTd @click.stop>
+                <VnInput v-model.number="row.quantity" @change="changeQuantity(row)" />
+            </QTd>
+        </template>
+        <template #body-cell-item="{ row }">
+            <QTd class="col">
+                <div class="column">
+                    <span>{{ row.concept }}</span>
+                    <span class="color-vn-label">{{ row.item?.subName }}</span>
+                    <FetchedTags :item="row.item" :max-length="6" />
+                </div>
+                <QPopupProxy>
+                    <VnInput v-model="row.concept" @change="updateConcept(row)" />
+                </QPopupProxy>
+            </QTd>
+        </template>
+        <template #body-cell-price="{ row }">
+            <QTd @click.stop>
+                <QBtn flat color="primary" dense>
+                    {{ toCurrency(row.price) }}
+                </QBtn>
+                <TicketEditManaProxy
+                    :id="route.params.id"
+                    @reset-changes="resetChanges()"
+                />
+            </QTd>
+        </template>
+        <template #body-cell-discount="{ row }">
+            <QTd @click.stop>
+                <QBtn flat color="primary" dense>
+                    {{ toPercentage(row.discount) }}
+                </QBtn>
+                <TicketEditManaProxy
+                    :id="route.params.id"
+                    @reset-changes="resetChanges()"
+                />
+            </QTd>
+        </template>
+        <!-- <template #body-cell-actions="{ row }">
+                        <QTd>
+                            <QIcon
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t(`All it's properties will be copied`),
+                                        t('Do you want to clone this item?'),
+                                        () => cloneItem(row.id)
+                                    )
+                                "
+                                class="q-ml-sm"
+                                color="primary"
+                                name="vn:clone"
+                                size="sm"
+                            >
+                                <QTooltip>
+                                    {{ t('globals.clone') }}
+                                </QTooltip>
+                            </QIcon>
+                            <QIcon
+                                @click.stop="viewSummary(row.id, ItemSummary)"
+                                class="q-ml-md"
+                                color="primary"
+                                name="preview"
+                                size="sm"
+                            >
+                                <QTooltip class="text-no-wrap">
+                                    {{ t('Preview') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QTd>
+                    </template> -->
+    </QTable>
+    <pre>{{ salesOptions }}</pre>
+    <!-- </template>
+    </VnPaginate> -->
+
+    <QPageSticky :offset="[20, 20]">
+        <QBtn @click="redirectToItemCreate()" color="primary" fab icon="add" />
+        <QTooltip class="text-no-wrap">
+            {{ t('New item') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+
+<i18n>
+es:
+    New item: Nuevo artículo
+</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..2b59eefd4
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,10 @@
+ticketSale:
+    id: Id
+    visible: Visible
+    available: Available
+    quantity: Quantity
+    item: Item
+    price: Price
+    discount: Disc
+    amount: Amount
+    packaging: Packaging
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..2c2bb8b05 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,12 @@
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
+ticketSale:
+    id: Id
+    visible: Visible
+    available: Disponible
+    quantity: Cantidad
+    item: Artículo
+    price: Precio
+    discount: Dto
+    amount: Cantidad
+    packaging: Encajado

From d7237463ea6ad0902fc300e4884c7f00564f4f19 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 12 Jun 2024 11:00:10 +0200
Subject: [PATCH 19/72] feat(WorkerFormation): is-editable and use-model

---
 src/pages/Worker/Card/WorkerFormation.vue | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index e2486a168..52b22a295 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 const tableRef = ref();
 const { t } = useI18n();
 const route = useRoute();
@@ -36,16 +35,12 @@ const columns = computed(() => [
             url: 'TrainingCourseTypes',
             fields: ['id', 'name'],
         },
-        disable: false,
-        columnFilter: {
-            inWhere: true,
-        },
     },
     {
         align: 'left',
         name: 'started',
         label: t('worker.formation.tableVisibleColumns.startDate'),
-        component: VnInputDate,
+        component: 'date',
         field: 'started',
         create: true,
         cardVisible: true,
@@ -54,7 +49,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'ended',
         label: t('worker.formation.tableVisibleColumns.endDate'),
-        component: VnInputDate,
+        component: 'date',
         field: 'ended',
         create: true,
     },
@@ -68,10 +63,6 @@ const columns = computed(() => [
             url: 'TrainingCenters',
             fields: ['id', 'name'],
         },
-        disable: false,
-        columnFilter: {
-            inWhere: true,
-        },
     },
     {
         align: 'left',
@@ -92,8 +83,8 @@ const columns = computed(() => [
         align: 'left',
         name: 'remark',
         label: t('worker.formation.tableVisibleColumns.remark'),
-        create: true,
         component: 'checkbox',
+        create: true,
     },
     {
         align: 'left',
@@ -124,5 +115,7 @@ const columns = computed(() => [
         default-mode="table"
         auto-load
         :right-search="false"
+        :is-editable="true"
+        :use-model="true"
     />
 </template>

From 975e8f06c0a7b4c4d700bc58132dc366fe20da3b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 13 Jun 2024 13:56:19 -0300
Subject: [PATCH 20/72] WIP

---
 src/components/ui/ItemPicture.vue        |  34 ++
 src/filters/toPercentage.js              |  10 +-
 src/pages/Ticket/Card/TicketEditMana.vue | 124 ++----
 src/pages/Ticket/Card/TicketSale.vue     | 483 +++++++++++++++++------
 src/pages/Ticket/locale/en.yml           |   9 +
 src/pages/Ticket/locale/es.yml           |  11 +-
 6 files changed, 451 insertions(+), 220 deletions(-)
 create mode 100644 src/components/ui/ItemPicture.vue

diff --git a/src/components/ui/ItemPicture.vue b/src/components/ui/ItemPicture.vue
new file mode 100644
index 000000000..e76414618
--- /dev/null
+++ b/src/components/ui/ItemPicture.vue
@@ -0,0 +1,34 @@
+<script setup>
+defineProps({
+    url: { type: String, required: true },
+    width: { type: String, default: '50px' },
+    height: { type: String, default: '50px' },
+    iconSize: { type: String, default: 'md' },
+});
+</script>
+<template>
+    <QImg
+        :src="url"
+        :height="height"
+        :width="width"
+        :ratio="1"
+        spinner-color="primary"
+        style="border-radius: 50%"
+    >
+        <template #error>
+            <div class="icon-container">
+                <QIcon name="photo" :size="iconSize" style="opacity: 0.4" />
+            </div>
+        </template>
+    </QImg>
+</template>
+
+<style lang="scss" scoped>
+.icon-container {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+</style>
diff --git a/src/filters/toPercentage.js b/src/filters/toPercentage.js
index d701cb9e7..e2b49ce22 100644
--- a/src/filters/toPercentage.js
+++ b/src/filters/toPercentage.js
@@ -1,6 +1,7 @@
 import { useI18n } from 'vue-i18n';
 
 export default function (value, fractionSize = 2) {
+    console.log('toPercentage value: ', value);
     if (value == null || value === '') return;
 
     const { locale } = useI18n();
@@ -8,11 +9,8 @@ export default function (value, fractionSize = 2) {
     const options = {
         style: 'percent',
         minimumFractionDigits: fractionSize,
-        maximumFractionDigits: fractionSize
+        maximumFractionDigits: fractionSize,
     };
 
-    return new Intl.NumberFormat(locale, options)
-        .format(parseFloat(value));
-
-
-}
\ No newline at end of file
+    return new Intl.NumberFormat(locale, options).format(parseFloat(value));
+}
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index d563e49f7..dc082d660 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -1,121 +1,73 @@
 <script setup>
-import { ref, onMounted, computed } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { toCurrency } from 'src/filters';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
 
 const $props = defineProps({
     id: {
-        type: Number,
+        type: String,
         required: true,
     },
-    type: {
-        type: String,
-        default: 'price', // 'discount' or 'price
+    mana: {
+        type: Number,
+        default: null,
+    },
+    newPrice: {
+        type: Number,
+        default: 0,
     },
 });
 
+const emit = defineEmits(['save', 'cancel']);
+
 const { t } = useI18n();
-const { notify } = useNotify();
+const QPopupProxyRef = ref(null);
 
-const edit = ref({});
-const usesMana = ref(null);
-
-const inputLabel = computed(() => ($props.type === 'price' ? t('Price') : t('Discount')));
-
-const getUsesMana = async () => {
-    const { data } = await axios.get('Sales/usesMana');
-    usesMana.value = data;
+const save = () => {
+    emit('save');
+    QPopupProxyRef.value.hide();
 };
 
-const getMana = async () => {
-    const { data } = await axios.get(`Tickets/${$props.id}/getSalesPersonMana`);
-    edit.value.mana = data;
-    await getUsesMana();
-    console.log('edit', edit.value);
-    // this.$.$applyAsync(() => {
-    //     this.$.editDiscount.relocate();
-    //     this.$.editPricePopover.relocate();
-    // });
+const cancel = () => {
+    emit('cancel');
+    QPopupProxyRef.value.hide();
 };
-
-const updatePrice = async () => {
-    try {
-        const sale = edit.value.sale;
-        const newPrice = edit.value.price;
-        if (newPrice != null && newPrice != sale.price) {
-            await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-            sale.price = newPrice;
-            edit.value = null;
-            notify('globals.dataSaved', 'positive');
-
-            // this.$http
-            //     .post(query, { newPrice })
-            //     .then((res) => {
-            //         sale.price = res.data.price;
-            //         this.edit = null;
-            //         this.vnApp.showSuccess(this.$t('Data saved!'));
-            //     })
-            //     .finally(() => this.resetChanges());
-        }
-        await getMana();
-    } catch (err) {
-        console.error('Error updating price', err);
-    }
-};
-
-const getNewPrice = () => {
-    if (edit.value.sale) {
-        const sale = edit.value.sale;
-        let newDiscount = sale.discount;
-        let newPrice = edit.value.price || sale.price;
-
-        if (edit.value.discount != null) newDiscount = edit.value.discount;
-
-        if (edit.value.price != null) newPrice = edit.value.price;
-
-        const price = sale.quantity * newPrice;
-        const discount = (newDiscount * price) / 100;
-
-        return price - discount;
-    }
-
-    return 0;
-};
-onMounted(async () => {
-    await getMana();
-});
 </script>
 
 <template>
-    <QPopupProxy>
+    <QPopupProxy ref="QPopupProxyRef">
         <div class="container">
-            <QSpinner v-if="!edit.mana" color="orange" size="md" />
+            <QSpinner v-if="!$props.mana" color="orange" size="md" />
             <div v-else>
-                <div class="header">Mana: {{ toCurrency(edit.mana) }}</div>
+                <div class="header">Mana: {{ toCurrency($props.mana) }}</div>
                 <div class="q-pa-md">
-                    <VnInput
-                        v-model.number="edit.price"
-                        :label="inputLabel"
-                        @change="updatePrice(row)"
-                    />
+                    <slot />
                     <div class="column items-center q-mt-lg">
                         <span class="text-primary">{{ t('New price') }}</span>
                         <span class="text-subtitle1">{{
-                            toCurrency(getNewPrice())
+                            toCurrency($props.newPrice)
                         }}</span>
                     </div>
                 </div>
             </div>
             <div class="row">
-                <QBtn color="primary" class="no-border-radius" dense style="width: 50%">
+                <QBtn
+                    color="primary"
+                    class="no-border-radius"
+                    dense
+                    style="width: 50%"
+                    @click="cancel()"
+                >
                     {{ t('globals.cancel') }}
                 </QBtn>
-                <QBtn color="primary" class="no-border-radius" dense style="width: 50%">
+                <QBtn
+                    color="primary"
+                    class="no-border-radius"
+                    dense
+                    style="width: 50%"
+                    @click="save()"
+                >
                     {{ t('globals.save') }}
                 </QBtn>
             </div>
@@ -144,7 +96,5 @@ onMounted(async () => {
 
 <i18n>
 es:
-    Price: Precio
-    Discount: Descuento
     New price: Nuevo precio
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index ae737bfee..a093beafa 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { onMounted, ref, computed, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 
@@ -8,20 +8,18 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-// import ItemSummary from '../Item/Card/ItemSummary.vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import TicketEditManaProxy from './TicketEditMana.vue';
+import ItemPicture from 'src/components/ui/ItemPicture.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useSession } from 'composables/useSession';
-import { toCurrency, toPercentage } from 'src/filters';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { toCurrency, toPercentage, dashIfEmpty } from 'src/filters';
+import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
-import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
 
 const route = useRoute();
 const router = useRouter();
@@ -29,16 +27,23 @@ const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { openConfirmationModal } = useVnConfirm();
 const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
 const salesDataRef = ref(null);
+const editPriceProxyRef = ref(null);
 
+const arrayData = useArrayData('ticketData');
+const { store } = arrayData;
+
+const ticketConfig = ref(null);
 const isLocked = ref(false);
 const isTicketEditable = ref(false);
-const salesOptions = ref([]);
-const allColumnNames = ref([]);
+const sales = ref([]);
 const itemsWithNameOptions = ref([]);
+const selectedSales = ref([]);
+const mana = ref(null);
 const manaCode = ref('mana');
+const ticketState = computed(() => store.data?.ticketState?.state?.code);
 
 const columns = computed(() => [
     {
@@ -107,50 +112,56 @@ const columns = computed(() => [
         field: 'amount',
         align: 'left',
         sortable: true,
+        format: (val) => toCurrency(val),
     },
     {
         label: t('ticketSale.packaging'),
-        name: 'packaging',
-        field: 'packaging',
+        name: 'itemPackingTypeFk',
+        field: 'item',
         align: 'left',
         sortable: true,
+        format: (val) => dashIfEmpty(val?.itemPackingTypeFk),
     },
     {
         label: '',
-        name: 'actions',
+        name: 'history',
         align: 'left',
         columnFilter: null,
     },
 ]);
 
-const redirectToItemCreate = () => {
-    router.push({ name: 'ItemCreate' });
+const getConfig = async () => {
+    let filter = {
+        fields: ['daysForWarningClaim'],
+    };
+    const { data } = await axios.get(`TicketConfigs`, { filter });
+    ticketConfig.value = data;
 };
 
-// const redirectToItemSummary = (id) => {
-//     router.push({ name: 'ItemSummary', params: { id } });
-// };
+const getSaleTotal = (sale) => {
+    if (sale.quantity == null || sale.price == null) return null;
 
-// const cloneItem = async (itemFk) => {
-//     try {
-//         const { data } = await axios.post(`Items/${itemFk}/clone`);
-//         if (!data) return;
-//         router.push({ name: 'ItemTags', params: { id: data.id } });
-//     } catch (err) {
-//         console.error('Error cloning item', err);
-//     }
-// };
+    const price = sale.quantity * sale.price;
+    const discount = (sale.discount * price) / 100;
 
-const resetChanges = async () => salesDataRef.value.fetch();
+    return price - discount;
+};
+
+const onSalesFetched = (salesData) => {
+    sales.value = salesData;
+    for (let sale of salesData) sale.amount = getSaleTotal(sale);
+};
+
+const resetChanges = async () => {
+    arrayData.fetch({ append: false });
+    salesDataRef.value.fetch();
+};
 
 const updateQuantity = async (sale) => {
-    console.log('updateQuantity');
     try {
         const payload = { quantity: sale.quantity };
-
         await axios.post(`Sales/${sale.id}/updateQuantity`, payload);
         notify('globals.dataSaved', 'positive');
-        await resetChanges();
     } catch (err) {
         console.error('Error updating quantity', err);
     }
@@ -178,15 +189,15 @@ const addSale = async (sale) => {
         sale.item = newSale.item;
 
         notify('globals.dataSaved', 'positive');
-        await resetChanges();
     } catch (err) {
         console.error('Error adding sale', err);
     }
 };
 
 const changeQuantity = (sale) => {
+    console.log('edit.quantity', edit.value.quantity);
+    console.log('sale.quantity', sale.quantity);
     if (!sale.itemFk || sale.quantity == null) return;
-
     if (!sale.id) return addSale(sale);
 
     updateQuantity(sale);
@@ -197,18 +208,165 @@ const updateConcept = async (sale) => {
         const data = { newConcept: sale.concept };
         await axios.post(`Sales/${sale.id}/updateConcept`, data);
         notify('globals.dataSaved', 'positive');
-        await resetChanges();
     } catch (err) {
         console.error('Error updating concept', err);
     }
 };
 
+const DEFAULT_EDIT = { price: null, discount: null, sale: null, sales: null };
+const edit = ref({ ...DEFAULT_EDIT });
+const usesMana = ref(null);
+
+const getUsesMana = async () => {
+    const { data } = await axios.get('Sales/usesMana');
+    usesMana.value = data;
+};
+
+const getMana = async () => {
+    const { data } = await axios.get(`Tickets/${route.params.id}/getSalesPersonMana`);
+    mana.value = data;
+    await getUsesMana();
+};
+
+const selectedValidSales = () => {
+    if (!sales.value) return;
+    return selectedSales.value.filter((sale) => sale.id != undefined);
+};
+
+const onOpenEditPricePopover = async (sale) => {
+    await getMana();
+    edit.value = {
+        sale: JSON.parse(JSON.stringify(sale)),
+        price: sale.price,
+    };
+};
+
+const onOpenEditDiscountPopover = async (sale) => {
+    await getMana();
+    if (isLocked.value) return;
+    if (sale) {
+        edit.value = {
+            sale: JSON.parse(JSON.stringify(sale)),
+            discount: sale.discount,
+        };
+    } else {
+        edit.value = {
+            discount: null,
+            sales: selectedValidSales(),
+        };
+    }
+};
+
+const updatePrice = async (sale) => {
+    try {
+        const newPrice = edit.value.price;
+        if (newPrice != null && newPrice != sale.price) {
+            await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+            sale.price = newPrice;
+            edit.value = { ...DEFAULT_EDIT };
+            notify('globals.dataSaved', 'positive');
+        }
+        await getMana();
+    } catch (err) {
+        console.error('Error updating price', err);
+    }
+};
+
+const changeDiscount = (sale) => {
+    const newDiscount = edit.value.discount;
+    if (newDiscount != null && newDiscount != sale.discount) updateDiscount([sale]);
+};
+
+const updateDiscount = async (sales) => {
+    const saleIds = sales.map((sale) => sale.id);
+    const params = {
+        salesIds: saleIds,
+        newDiscount: edit.value.discount,
+        manaCode: manaCode.value,
+    };
+    await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
+    notify('globals.dataSaved', 'positive');
+    for (let sale of sales) sale.discount = edit.value.discount;
+    edit.value = { ...DEFAULT_EDIT };
+};
+
+const getNewPrice = computed(() => {
+    if (edit.value?.sale) {
+        const sale = edit.value.sale;
+        let newDiscount = sale.discount;
+        let newPrice = edit.value.price || sale.price;
+
+        if (edit.value.discount != null) newDiscount = edit.value.discount;
+
+        if (edit.value.price != null) newPrice = edit.value.price;
+
+        const price = sale.quantity * newPrice;
+        const discount = (newDiscount * price) / 100;
+        return price - discount;
+    }
+
+    return 0;
+});
+
+const newOrderFromTicket = async () => {
+    try {
+        const { data } = await axios.post(`Orders/newFromTicket`, {
+            ticketFk: Number(route.params.id),
+        });
+        const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
+        window.open(routeData.href, '_blank');
+    } catch (err) {
+        console.error('Error creating new order', err);
+    }
+};
+
+const goToLog = (saleId) => {
+    //TODO: Redireccionar cuando exista la vista TicketLog
+    // router.push({
+    //     name: 'TicketLog',
+    //     params: {
+    //         originId: route.params.id,
+    //         changedModel: 'Sale',
+    //         changedModelId: saleId,
+    //     },
+    // });
+};
+
+const changeTicketState = async (val) => {
+    try {
+        const params = { ticketFk: route.params.id, code: val };
+        await axios.post('Tickets/state', params);
+        notify('globals.dataSaved', 'positive');
+        await resetChanges();
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
+};
+
+const removeSelectedSales = () => {
+    selectedSales.value.forEach((sale) => {
+        const index = sales.value.indexOf(sale);
+        sales.value.splice(index, 1);
+    });
+};
+
+const removeSales = async () => {
+    try {
+        const sales = selectedValidSales();
+        const params = { sales: sales, ticketId: store.data.id };
+        await axios.post('Sales/deleteSales', params);
+        removeSelectedSales();
+        notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.error('Error deleting sales', err);
+    }
+};
+
+const insertRow = () => sales.value.push({ ...DEFAULT_EDIT });
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    const filteredColumns = columns.value.filter(
-        (col) => col.name !== 'picture' && col.name !== 'actions'
-    );
-    allColumnNames.value = filteredColumns.map((col) => col.name);
+    await getConfig();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -229,7 +387,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         ref="salesDataRef"
         :url="`Tickets/${route.params.id}/getSales`"
         auto-load
-        @on-fetch="(data) => (salesOptions = data)"
+        @on-fetch="(data) => onSalesFetched(data)"
     />
     <FetchData
         url="Items/withName"
@@ -238,33 +396,73 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (itemsWithNameOptions = data)"
     />
     <VnSubToolbar>
-        <template #st-data> </template>
+        <template #st-actions>
+            <QBtnGroup push class="q-gutter-x-sm" flat>
+                <QBtn
+                    color="primary"
+                    icon="delete"
+                    :disable="!isTicketEditable || !selectedSales.length"
+                    @click="
+                        openConfirmationModal(
+                            t('Continue anyway?'),
+                            t('You are going to delete lines of the ticket'),
+                            removeSales
+                        )
+                    "
+                >
+                    <QTooltip>{{ t('Remove lines') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    :label="t('ticketSale.ok')"
+                    color="primary"
+                    :disable="!isTicketEditable || ticketState === 'OK'"
+                    @click="changeTicketState('OK')"
+                >
+                    <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
+                </QBtn>
+            </QBtnGroup>
+        </template>
     </VnSubToolbar>
     <RightMenu>
         <template #right-panel>
-            <ItemListFilter data-key="ItemList" />
+            <div
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                style="border: 2px solid black"
+            >
+                <QCardSection class="justify-center text-subtitle1" horizontal>
+                    <span class="q-mr-xs color-vn-label"
+                        >{{ t('ticketSale.subtotal') }}:
+                    </span>
+                    <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
+                </QCardSection>
+                <QCardSection class="justify-center text-subtitle1" horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketSale.tax') }}:
+                    </span>
+                    <span>{{
+                        toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
+                    }}</span>
+                </QCardSection>
+                <QCardSection
+                    class="justify-center text-weight-bold text-subtitle1"
+                    horizontal
+                >
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketSale.total') }}:
+                    </span>
+                    <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
+                </QCardSection>
+            </div>
         </template>
     </RightMenu>
-    <!-- <VnPaginate
-        ref="paginateRef"
-        data-key="ItemList"
-        url="Items/filter"
-        :order="['isActive DESC', 'name', 'id']"
-        :limit="12"
-        :expr-builder="exprBuilder"
-        :user-params="params"
-        :keep-opts="['userParams']"
-        :offset="50"
-        auto-load
-    >
-        <template #body="{ rows }"> -->
     <QTable
-        :rows="salesOptions"
+        :rows="sales"
         :columns="columns"
         row-key="id"
         :pagination="{ rowsPerPage: 0 }"
         class="full-width q-mt-md"
         selection="multiple"
+        v-model:selected="selectedSales"
         :no-data-label="t('globals.noResults')"
     >
         <template #body-cell-statusIcons="{ row }">
@@ -275,7 +473,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 >
                     <QIcon color="primary" name="vn:claims" size="xs">
                         <QTooltip>
-                            {{ t('ticket.summary.unavailable') }}:
+                            {{ t('ticketSale.claim') }}:
                             {{ row.claim?.claimFk }}
                         </QTooltip>
                     </QIcon>
@@ -287,7 +485,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QIcon>
                 <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
                     <QTooltip>
-                        {{ t('ticket.summary.reserved') }}
+                        {{ t('ticketSale.reserved') }}
                     </QTooltip>
                 </QIcon>
                 <QIcon
@@ -297,7 +495,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     size="xs"
                 >
                     <QTooltip>
-                        {{ t('ticket.summary.itemShortage') }}
+                        {{ t('ticketSale.noVisible') }}
                     </QTooltip>
                 </QIcon>
                 <QIcon
@@ -307,20 +505,15 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     size="xs"
                 >
                     <QTooltip>
-                        {{ t('ticket.summary.hasComponentLack') }}
+                        {{ t('ticketSale.hasComponentLack') }}
                     </QTooltip>
                 </QIcon>
             </QTd>
         </template>
         <template #body-cell-picture="{ row }">
             <QTd>
-                <QImg
-                    :src="`/api/Images/catalog/50x50/${row.itemFk}/download?access_token=${token}`"
-                    spinner-color="primary"
-                    :ratio="1"
-                    height="50px"
-                    width="50px"
-                    style="border-radius: 50%"
+                <ItemPicture
+                    :url="`/api/Images/catalog/50x50/${row.itemFk}/download?access_token=${token}`"
                 />
             </QTd>
         </template>
@@ -352,6 +545,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     hide-selected
                     option-label="name"
                     option-value="id"
+                    @update:model-value="changeQuantity(row)"
                     v-model="row.itemFk"
                 >
                     <template #option="scope">
@@ -367,7 +561,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
         <template #body-cell-quantity="{ row }">
             <QTd @click.stop>
-                <VnInput v-model.number="row.quantity" @change="changeQuantity(row)" />
+                <VnInput
+                    v-if="isTicketEditable"
+                    v-model.number="row.quantity"
+                    @keyup.enter="changeQuantity(row)"
+                    @blur="changeQuantity(row)"
+                    @focus="edit.quantity = row.quantity"
+                />
+                <span v-else>{{ row.quantity }}</span>
             </QTd>
         </template>
         <template #body-cell-item="{ row }">
@@ -375,76 +576,100 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <div class="column">
                     <span>{{ row.concept }}</span>
                     <span class="color-vn-label">{{ row.item?.subName }}</span>
-                    <FetchedTags :item="row.item" :max-length="6" />
+                    <FetchedTags v-if="row.item" :item="row.item" :max-length="6" />
+                    <QPopupProxy v-if="row.id && isTicketEditable">
+                        <VnInput v-model="row.concept" @change="updateConcept(row)" />
+                    </QPopupProxy>
                 </div>
-                <QPopupProxy>
-                    <VnInput v-model="row.concept" @change="updateConcept(row)" />
-                </QPopupProxy>
             </QTd>
         </template>
         <template #body-cell-price="{ row }">
-            <QTd @click.stop>
-                <QBtn flat color="primary" dense>
-                    {{ toCurrency(row.price) }}
-                </QBtn>
-                <TicketEditManaProxy
-                    :id="route.params.id"
-                    @reset-changes="resetChanges()"
-                />
+            <QTd>
+                <template v-if="isTicketEditable && row.id">
+                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
+                        {{ toCurrency(row.price) }}
+                    </QBtn>
+                    <TicketEditManaProxy
+                        ref="editPriceProxyRef"
+                        :mana="mana"
+                        :new-price="getNewPrice"
+                        @save="updatePrice(row)"
+                        @cancel="updatePrice(row)"
+                    >
+                        <VnInput
+                            v-model.number="edit.price"
+                            :label="t('ticketSale.price')"
+                            type="number"
+                        />
+                    </TicketEditManaProxy>
+                </template>
+                <span v-else>{{ toCurrency(row.price) }}</span>
             </QTd>
         </template>
         <template #body-cell-discount="{ row }">
-            <QTd @click.stop>
-                <QBtn flat color="primary" dense>
-                    {{ toPercentage(row.discount) }}
-                </QBtn>
-                <TicketEditManaProxy
-                    :id="route.params.id"
-                    @reset-changes="resetChanges()"
-                />
+            <QTd>
+                <template v-if="!isLocked && row.id">
+                    <QBtn
+                        flat
+                        color="primary"
+                        dense
+                        @click="onOpenEditDiscountPopover(row)"
+                    >
+                        {{ toPercentage(row.discount / 100) }}
+                    </QBtn>
+                    <TicketEditManaProxy
+                        :mana="mana"
+                        :new-price="getNewPrice"
+                        @save="changeDiscount(row)"
+                        @cancel="changeDiscount(row)"
+                    >
+                        <VnInput
+                            v-model.number="edit.discount"
+                            :label="t('ticketSale.discount')"
+                            type="number"
+                        />
+                    </TicketEditManaProxy>
+                </template>
+                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
             </QTd>
         </template>
-        <!-- <template #body-cell-actions="{ row }">
-                        <QTd>
-                            <QIcon
-                                @click.stop="
-                                    openConfirmationModal(
-                                        t(`All it's properties will be copied`),
-                                        t('Do you want to clone this item?'),
-                                        () => cloneItem(row.id)
-                                    )
-                                "
-                                class="q-ml-sm"
-                                color="primary"
-                                name="vn:clone"
-                                size="sm"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.clone') }}
-                                </QTooltip>
-                            </QIcon>
-                            <QIcon
-                                @click.stop="viewSummary(row.id, ItemSummary)"
-                                class="q-ml-md"
-                                color="primary"
-                                name="preview"
-                                size="sm"
-                            >
-                                <QTooltip class="text-no-wrap">
-                                    {{ t('Preview') }}
-                                </QTooltip>
-                            </QIcon>
-                        </QTd>
-                    </template> -->
+        <template #body-cell-history="{ row }">
+            <QTd v-if="row.hasLogs">
+                <QBtn
+                    @click.stop="goToLog(row.id)"
+                    color="primary"
+                    icon="history"
+                    size="md"
+                    flat
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('ticketSale.history') }}
+                    </QTooltip>
+                </QBtn>
+            </QTd>
+        </template>
+        <template #bottom-row>
+            <QBtn
+                class="cursor-pointer fill-icon q-ml-md q-my-lg"
+                color="primary"
+                icon="add_circle"
+                size="md"
+                round
+                flat
+                :disable="!isTicketEditable"
+                @click="insertRow()"
+            >
+                <QTooltip>
+                    {{ t('Add item') }}
+                </QTooltip>
+            </QBtn>
+        </template>
     </QTable>
-    <pre>{{ salesOptions }}</pre>
-    <!-- </template>
-    </VnPaginate> -->
 
     <QPageSticky :offset="[20, 20]">
-        <QBtn @click="redirectToItemCreate()" color="primary" fab icon="add" />
+        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
         <QTooltip class="text-no-wrap">
-            {{ t('New item') }}
+            {{ t('Add item to basket') }}
         </QTooltip>
     </QPageSticky>
 </template>
@@ -452,4 +677,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 <i18n>
 es:
     New item: Nuevo artículo
+    Add item to basket: Añadir artículo a la cesta
+    Change ticket state to 'Ok': Cambiar estado del ticket a 'Ok'
+    Remove lines: Eliminar líneas
+    Continue anyway?: ¿Continuar de todas formas?
+    You are going to delete lines of the ticket: Vas a eliminar lineas del ticket
+    Add item: Añadir artículo
 </i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 2b59eefd4..a5819e4df 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -8,3 +8,12 @@ ticketSale:
     discount: Disc
     amount: Amount
     packaging: Packaging
+    subtotal: Subtotal
+    tax: VAT
+    total: Total
+    history: History
+    claim: Claim
+    reserved: Reserved
+    noVisible: Not visible
+    hasComponentLack: Component lack
+    ok: Ok
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 2c2bb8b05..15c19eb14 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -8,5 +8,14 @@ ticketSale:
     item: Artículo
     price: Precio
     discount: Dto
-    amount: Cantidad
+    amount: Importe
     packaging: Encajado
+    subtotal: Subtotal
+    tax: IVA
+    total: Total
+    history: Historial
+    claim: Reclamación
+    reserved: Reservado
+    noVisible: No visible
+    hasComponentLack: Faltan componentes
+    ok: Ok

From 531f4bb8cd621a42ea226a879a30d6b24923ab32 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 13 Jun 2024 14:14:46 -0300
Subject: [PATCH 21/72] Avoid firing request if quantity does not change

---
 src/filters/toPercentage.js          |  1 -
 src/pages/Ticket/Card/TicketSale.vue | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/filters/toPercentage.js b/src/filters/toPercentage.js
index e2b49ce22..9b5e953c0 100644
--- a/src/filters/toPercentage.js
+++ b/src/filters/toPercentage.js
@@ -1,7 +1,6 @@
 import { useI18n } from 'vue-i18n';
 
 export default function (value, fractionSize = 2) {
-    console.log('toPercentage value: ', value);
     if (value == null || value === '') return;
 
     const { locale } = useI18n();
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index a093beafa..4ae710d17 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -195,11 +195,13 @@ const addSale = async (sale) => {
 };
 
 const changeQuantity = (sale) => {
-    console.log('edit.quantity', edit.value.quantity);
-    console.log('sale.quantity', sale.quantity);
-    if (!sale.itemFk || sale.quantity == null) return;
+    if (
+        !sale.itemFk ||
+        sale.quantity == null ||
+        edit.value?.oldQuantity === sale.quantity
+    )
+        return;
     if (!sale.id) return addSale(sale);
-
     updateQuantity(sale);
 };
 
@@ -566,7 +568,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     v-model.number="row.quantity"
                     @keyup.enter="changeQuantity(row)"
                     @blur="changeQuantity(row)"
-                    @focus="edit.quantity = row.quantity"
+                    @focus="edit.oldQuantity = row.quantity"
                 />
                 <span v-else>{{ row.quantity }}</span>
             </QTd>

From 8c3262bcdf93555c7ff3e232f058424ce7336efd Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 13 Jun 2024 15:36:30 -0300
Subject: [PATCH 22/72] Add change state dropdown action

---
 src/components/common/VnSelect.vue   | 11 ++++++--
 src/pages/Ticket/Card/TicketSale.vue | 40 ++++++++++++++++++++++------
 src/pages/Ticket/locale/en.yml       |  1 +
 src/pages/Ticket/locale/es.yml       |  1 +
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 493f094ce..6d1ca762c 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,6 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch } from 'vue';
-import { onMounted } from 'vue';
+import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
@@ -58,6 +57,10 @@ const $props = defineProps({
         type: [Number, String],
         default: '30',
     },
+    focusOnMount: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const { t } = useI18n();
@@ -146,6 +149,10 @@ watch(modelValue, (newValue) => {
     if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
         fetchFilter(newValue);
 });
+
+onMounted(async () => {
+    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
 </script>
 
 <template>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 4ae710d17..823a7a439 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -31,6 +31,7 @@ const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 const salesDataRef = ref(null);
 const editPriceProxyRef = ref(null);
+const stateBtnDropdownRef = ref(null);
 
 const arrayData = useArrayData('ticketData');
 const { store } = arrayData;
@@ -40,6 +41,7 @@ const isLocked = ref(false);
 const isTicketEditable = ref(false);
 const sales = ref([]);
 const itemsWithNameOptions = ref([]);
+const editableStatesOptions = ref([]);
 const selectedSales = ref([]);
 const mana = ref(null);
 const manaCode = ref('mana');
@@ -336,6 +338,7 @@ const goToLog = (saleId) => {
 
 const changeTicketState = async (val) => {
     try {
+        stateBtnDropdownRef.value.hide();
         const params = { ticketFk: route.params.id, code: val };
         await axios.post('Tickets/state', params);
         notify('globals.dataSaved', 'positive');
@@ -397,9 +400,38 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (itemsWithNameOptions = data)"
     />
+    <FetchData
+        url="States/editableStates"
+        :filter="{ fields: ['code', 'name', 'id', 'alertLevel'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (editableStatesOptions = data)"
+    />
     <VnSubToolbar>
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
+                <QBtn
+                    :label="t('ticketSale.ok')"
+                    color="primary"
+                    :disable="!isTicketEditable || ticketState === 'OK'"
+                    @click="changeTicketState('OK')"
+                >
+                    <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
+                </QBtn>
+                <QBtnDropdown
+                    ref="stateBtnDropdownRef"
+                    color="primary"
+                    :label="t('ticketSale.state')"
+                >
+                    <VnSelect
+                        :options="editableStatesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        hide-dropdown-icon
+                        focus-on-mount
+                        @update:model-value="changeTicketState"
+                    />
+                </QBtnDropdown>
                 <QBtn
                     color="primary"
                     icon="delete"
@@ -414,14 +446,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 >
                     <QTooltip>{{ t('Remove lines') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :label="t('ticketSale.ok')"
-                    color="primary"
-                    :disable="!isTicketEditable || ticketState === 'OK'"
-                    @click="changeTicketState('OK')"
-                >
-                    <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
-                </QBtn>
             </QBtnGroup>
         </template>
     </VnSubToolbar>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index a5819e4df..34239f9b3 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -17,3 +17,4 @@ ticketSale:
     noVisible: Not visible
     hasComponentLack: Component lack
     ok: Ok
+    state: State
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 15c19eb14..75a8cc57c 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -19,3 +19,4 @@ ticketSale:
     noVisible: No visible
     hasComponentLack: Faltan componentes
     ok: Ok
+    state: Estado

From fe69521b0b600edac49c0324eb18856dc38eff64 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 14 Jun 2024 11:44:02 +0200
Subject: [PATCH 23/72] fix: refs #6739 changed checkbox field

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

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index d60eb7a14..b4f89fa74 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -48,7 +48,7 @@ const makeInvoice = async () => {
         newClientFk: transferInvoiceParams.newClientFk,
         refFk: transferInvoiceParams.refFk,
         siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
-        checked: checked.value,
+        makeInvoice: checked.value,
     };
 
     try {

From 0666aeb166b0921e1634f8a65bd0e56e14e13f21 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 14 Jun 2024 15:04:02 -0300
Subject: [PATCH 24/72] Btn dropdown more actions

---
 src/components/common/VnSmsDialog.vue         |   5 +-
 src/pages/Ticket/Card/TicketEditMana.vue      |  16 +-
 src/pages/Ticket/Card/TicketSale.vue          |  31 +-
 .../Ticket/Card/TicketSaleMoreActions.vue     | 289 ++++++++++++++++++
 src/pages/Ticket/locale/en.yml                |   1 +
 src/pages/Ticket/locale/es.yml                |   1 +
 6 files changed, 322 insertions(+), 21 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketSaleMoreActions.vue

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 5b192f95d..f04ea2cb6 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -184,6 +184,7 @@ en:
         minAmount: 'A minimum amount of 50€ (VAT excluded) is required for your order
             { orderId } of { shipped } to receive it without additional shipping costs.'
         orderChanges: 'Order {orderId} of { shipped }: { changes }'
+        productNotAvailable: 'Verdnatura communicates: Your order {ticketFk} with reception date on {landed}. {notAvailables} not available. Sorry for the inconvenience.'
     en: English
     es: Spanish
     fr: French
@@ -203,6 +204,7 @@ es:
             Te recomendamos amplíes para no generar costes extra, provocarán un incremento de tu tarifa.
             ¡Un saludo!'
         orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
+        productNotAvailable: 'Verdnatura le comunica: Pedido {ticketFk} con fecha de recepción {landed}. {notAvailables} no disponible/s. Disculpe las molestias.'
     en: Inglés
     es: Español
     fr: Francés
@@ -222,6 +224,7 @@ fr:
             Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
             Merci.'
         orderChanges: 'Commande {orderId} livraison {landing} indisponible/s. Désolés pour le dérangement.'
+        productNotAvailable: 'Verdnatura communique : Votre commande {ticketFk} avec date de réception le {landed}. {notAvailables} non disponible. Nous sommes désolés pour les inconvénients.'
     en: Anglais
     es: Espagnol
     fr: Français
@@ -240,7 +243,7 @@ pt:
         minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido
             { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
         orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
-    en: Inglês
+        productNotAvailable: 'Verdnatura comunica: Seu pedido {ticketFk} com data de recepção em {landed}. {notAvailables} não disponível/eis. Desculpe pelo transtorno.'
     es: Espanhol
     fr: Francês
     pt: Português
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index dc082d660..721057515 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -5,10 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 
 const $props = defineProps({
-    id: {
-        type: String,
-        required: true,
-    },
     mana: {
         type: Number,
         default: null,
@@ -38,16 +34,16 @@ const cancel = () => {
 <template>
     <QPopupProxy ref="QPopupProxyRef">
         <div class="container">
-            <QSpinner v-if="!$props.mana" color="orange" size="md" />
+            <QSpinner v-if="!mana" color="orange" size="md" />
             <div v-else>
-                <div class="header">Mana: {{ toCurrency($props.mana) }}</div>
+                <div class="header">Mana: {{ toCurrency(mana) }}</div>
                 <div class="q-pa-md">
                     <slot />
-                    <div class="column items-center q-mt-lg">
+                    <div v-if="newPrice" class="column items-center q-mt-lg">
                         <span class="text-primary">{{ t('New price') }}</span>
-                        <span class="text-subtitle1">{{
-                            toCurrency($props.newPrice)
-                        }}</span>
+                        <span class="text-subtitle1">
+                            {{ toCurrency($props.newPrice) }}
+                        </span>
                     </div>
                 </div>
             </div>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 823a7a439..685660782 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -12,6 +12,7 @@ import TicketEditManaProxy from './TicketEditMana.vue';
 import ItemPicture from 'src/components/ui/ItemPicture.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useSession } from 'composables/useSession';
@@ -232,10 +233,10 @@ const getMana = async () => {
     await getUsesMana();
 };
 
-const selectedValidSales = () => {
+const selectedValidSales = computed(() => {
     if (!sales.value) return;
     return selectedSales.value.filter((sale) => sale.id != undefined);
-};
+});
 
 const onOpenEditPricePopover = async (sale) => {
     await getMana();
@@ -256,7 +257,7 @@ const onOpenEditDiscountPopover = async (sale) => {
     } else {
         edit.value = {
             discount: null,
-            sales: selectedValidSales(),
+            sales: selectedValidSales.value,
         };
     }
 };
@@ -281,16 +282,17 @@ const changeDiscount = (sale) => {
     if (newDiscount != null && newDiscount != sale.discount) updateDiscount([sale]);
 };
 
-const updateDiscount = async (sales) => {
+const updateDiscount = async (sales, newDiscount = null) => {
     const saleIds = sales.map((sale) => sale.id);
+    const _newDiscount = newDiscount || edit.value.discount;
     const params = {
         salesIds: saleIds,
-        newDiscount: edit.value.discount,
+        newDiscount: _newDiscount,
         manaCode: manaCode.value,
     };
     await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
     notify('globals.dataSaved', 'positive');
-    for (let sale of sales) sale.discount = edit.value.discount;
+    for (let sale of sales) sale.discount = _newDiscount;
     edit.value = { ...DEFAULT_EDIT };
 };
 
@@ -357,8 +359,7 @@ const removeSelectedSales = () => {
 
 const removeSales = async () => {
     try {
-        const sales = selectedValidSales();
-        const params = { sales: sales, ticketId: store.data.id };
+        const params = { sales: selectedValidSales.value, ticketId: store.data.id };
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');
@@ -421,6 +422,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     ref="stateBtnDropdownRef"
                     color="primary"
                     :label="t('ticketSale.state')"
+                    :disable="!isTicketEditable"
                 >
                     <VnSelect
                         :options="editableStatesOptions"
@@ -432,6 +434,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         @update:model-value="changeTicketState"
                     />
                 </QBtnDropdown>
+                <TicketSaleMoreActions
+                    :ticket="store.data"
+                    :is-ticket-editable="isTicketEditable"
+                    :sales="selectedValidSales"
+                    :disable="!selectedSales.length"
+                    :mana="mana"
+                    :ticket-config="ticketConfig"
+                    @get-mana="getMana()"
+                    @update-discounts="updateDiscount"
+                />
                 <QBtn
                     color="primary"
                     icon="delete"
@@ -620,7 +632,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         :mana="mana"
                         :new-price="getNewPrice"
                         @save="updatePrice(row)"
-                        @cancel="updatePrice(row)"
                     >
                         <VnInput
                             v-model.number="edit.price"
@@ -647,7 +658,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         :mana="mana"
                         :new-price="getNewPrice"
                         @save="changeDiscount(row)"
-                        @cancel="changeDiscount(row)"
                     >
                         <VnInput
                             v-model.number="edit.discount"
@@ -709,4 +719,5 @@ es:
     Continue anyway?: ¿Continuar de todas formas?
     You are going to delete lines of the ticket: Vas a eliminar lineas del ticket
     Add item: Añadir artículo
+    Select lines to see the options: Selecciona líneas para ver las opciones
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
new file mode 100644
index 000000000..9ec6b303a
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -0,0 +1,289 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import { useRouter } from 'vue-router';
+
+import VnSmsDialog from 'components/common/VnSmsDialog.vue';
+import TicketEditManaProxy from './TicketEditMana.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+import { toDateFormat } from 'src/filters/date';
+import { useRole } from 'src/composables/useRole';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const emit = defineEmits(['updateDiscounts', 'getMana']);
+
+const props = defineProps({
+    disable: {
+        type: Boolean,
+        default: false,
+    },
+    isTicketEditable: {
+        type: Boolean,
+        default: false,
+    },
+    ticket: {
+        type: Object,
+        required: true,
+        default: () => {},
+    },
+    sales: {
+        type: Array,
+        default: () => [],
+    },
+    mana: {
+        type: Number,
+        default: null,
+    },
+    ticketConfig: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const router = useRouter();
+const { t } = useI18n();
+const { dialog } = useQuasar();
+const { notify } = useNotify();
+const role = useRole();
+const btnDropdownRef = ref(null);
+const { openConfirmationModal } = useVnConfirm();
+
+const newDiscount = ref(null);
+const ticket = computed(() => props.ticket);
+const isClaimable = computed(() => {
+    if (ticket.value) {
+        const landedPlusWeek = new Date(ticket.value.landed);
+        landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
+        const hasClaimManagerRole = role.hasAny('claimManager');
+        return landedPlusWeek >= Date.vnNew() || hasClaimManagerRole;
+    }
+    return false;
+});
+const hasReserves = computed(() => props.sales.some((sale) => sale.reserved == true));
+
+const sendSms = async (params) => {
+    await axios.post(`Tickets/${ticket.value.id}/sendSms`, params);
+    notify(t('SMS sent'), 'positive');
+};
+
+const showSmsDialog = (template) => {
+    const address = ticket.value.address;
+    const client = ticket.value.client;
+    const phone = address.mobile || address.phone || client.mobile || client.phone;
+    const items = props.sales.map((sale) => {
+        return `${sale.quantity} ${sale.concept}`;
+    });
+
+    const notAvailables = items.join(', ');
+
+    const data = {
+        ticketId: ticket.value.id,
+        destinationFk: ticket.value.clientFk,
+        destination: phone,
+        ticketFk: ticket.value.id,
+        created: ticket.value.updated,
+        landed: toDateFormat(ticket.value.landed),
+        notAvailables,
+    };
+
+    dialog({
+        component: VnSmsDialog,
+        componentProps: {
+            phone: phone,
+            template: template,
+            locale: client?.user?.lang ?? 'default_locale',
+            data: data,
+            promise: sendSms,
+        },
+    });
+};
+
+const calculateSalePrice = async () => {
+    if (!props.sales) return;
+
+    await axios.post(`Sales/recalculatePrice`, props.sales);
+    notify(t('globals.dataSaved'), 'positive');
+};
+
+const changeMultipleDiscount = () => {
+    const hasChanges = props.sales.some((sale) => {
+        return sale.discount != newDiscount.value;
+    });
+
+    if (newDiscount.value != null && hasChanges)
+        emit('updateDiscounts', props.sales, newDiscount.value);
+    btnDropdownRef.value.hide();
+};
+
+const createClaim = () => {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    const timeDifference = today.getTime() - new Date(ticket.value.landed).getTime();
+    const pastDays = Math.floor(timeDifference / 86400000);
+    if (pastDays >= props.ticketConfig[0].daysForWarningClaim)
+        openConfirmationModal(
+            t('Claim out of time'),
+            t('Do you want to continue?'),
+            onCreateClaimAccepted
+        );
+    else
+        openConfirmationModal(t('Do you want to create a claim?'), onCreateClaimAccepted);
+};
+
+const onCreateClaimAccepted = async () => {
+    try {
+        const params = { ticketId: ticket.value.id, sales: props.sales };
+        const { data } = await axios.post(`Claims/createFromSales`, params);
+        router.push({ name: 'ClaimBasicData', params: { id: data.id } });
+    } catch (error) {
+        console.error('Error creating claim: ', error);
+    }
+};
+
+const setReserved = async (reserved) => {
+    const params = { ticketId: ticket.value.id, sales: props.sales, reserved: reserved };
+    await axios.post(`Sales/reserve`, params);
+    props.sales.forEach((sale) => {
+        sale.reserved = reserved;
+    });
+};
+
+const createRefund = async (withWarehouse) => {
+    if (!props.sales) return;
+
+    const salesIds = props.sales.map((sale) => sale.id);
+    const params = { salesIds: salesIds, withWarehouse: withWarehouse, negative: true };
+    const { data } = await axios.post('Sales/clone', params);
+    const [refundTicket] = data;
+    notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+    router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+};
+</script>
+
+<template>
+    <QBtnDropdown
+        ref="btnDropdownRef"
+        color="primary"
+        :label="t('ticketSale.more')"
+        :disable="disable"
+    >
+        <template #label>
+            <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
+        </template>
+        <QList>
+            <QItem
+                v-if="ticket"
+                clickable
+                v-close-popup
+                v-ripple
+                @click="showSmsDialog('productNotAvailable')"
+            >
+                <QItemSection>
+                    <QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel>
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="isTicketEditable"
+                clickable
+                v-close-popup
+                v-ripple
+                @click="calculateSalePrice()"
+            >
+                <QItemSection>
+                    <QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
+                </QItemSection>
+            </QItem>
+            <QItem clickable v-ripple @click="emit('getMana')">
+                <QItemSection>
+                    <QItemLabel>{{ t('Update discount') }}</QItemLabel>
+                </QItemSection>
+                <TicketEditManaProxy :mana="props.mana" @save="changeMultipleDiscount()">
+                    <VnInput
+                        v-model.number="newDiscount"
+                        :label="t('ticketSale.discount')"
+                        type="number"
+                    />
+                </TicketEditManaProxy>
+            </QItem>
+            <QItem
+                v-if="isClaimable"
+                clickable
+                v-close-popup
+                v-ripple
+                @click="createClaim()"
+            >
+                <QItemSection>
+                    <QItemLabel>{{ t('Add claim') }}</QItemLabel>
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="isTicketEditable"
+                clickable
+                v-close-popup
+                v-ripple
+                @click="setReserved(true)"
+            >
+                <QItemSection>
+                    <QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="isTicketEditable && hasReserves"
+                clickable
+                v-close-popup
+                v-ripple
+                @click="setReserved(false)"
+            >
+                <QItemSection>
+                    <QItemLabel>{{ t('Unmark as reserved') }}</QItemLabel>
+                </QItemSection>
+            </QItem>
+            <QItem clickable v-ripple>
+                <QItemSection>
+                    <QItemLabel>{{ t('Refund...') }}</QItemLabel>
+                </QItemSection>
+                <QItemSection side>
+                    <QIcon name="keyboard_arrow_right" />
+                </QItemSection>
+                <QMenu anchor="top end" self="top start" auto-close bordered>
+                    <QList>
+                        <QItem v-ripple clickable @click="createRefund(true)">
+                            <QItemSection>
+                                {{ t('with warehouse') }}
+                            </QItemSection>
+                        </QItem>
+                        <QItem v-ripple clickable @click="createRefund(false)">
+                            <QItemSection>
+                                {{ t('without warehouse') }}
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </QMenu>
+            </QItem>
+        </QList>
+    </QBtnDropdown>
+</template>
+
+<i18n>
+en:
+    refundTicketCreated: 'The following refund ticket have been created {ticketId}'
+es:
+    SMS sent: SMS enviado
+    Send shortage SMS: Enviar SMS faltas
+    Recalculate price: Recalcular precio
+    Update discount: Actualizar descuento
+    Add claim: Crear reclamación
+    Mark as reserved: Marcar como reservado
+    Unmark as reserved: Desmarcar como reservado
+    Refund...: Abono...
+    with warehouse: con almacén
+    without warehouse: sin almacén
+    Claim out of time: Reclamación fuera de plazo
+    Do you want to continue?: ¿Desea continuar?
+    Do you want to create a claim?: ¿Quieres crear una reclamación?
+    refundTicketCreated: 'The following refund ticket have been created: {ticketId}'
+</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 34239f9b3..0a3c36636 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -18,3 +18,4 @@ ticketSale:
     hasComponentLack: Component lack
     ok: Ok
     state: State
+    more: More
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 75a8cc57c..2e6bc947e 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -20,3 +20,4 @@ ticketSale:
     hasComponentLack: Faltan componentes
     ok: Ok
     state: Estado
+    more: Más

From acc899b8510b86db1861e1e0a39943e27fb93d41 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sat, 15 Jun 2024 11:28:49 -0300
Subject: [PATCH 25/72] Transfer

---
 src/components/common/VnInput.vue        |   6 +-
 src/pages/Ticket/Card/TicketSale.vue     |  40 +++++
 src/pages/Ticket/Card/TicketTransfer.vue | 195 +++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml           |   3 +
 src/pages/Ticket/locale/es.yml           |   3 +
 5 files changed, 246 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/Card/TicketTransfer.vue

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index c84a55122..3e0a20f03 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -17,6 +17,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    clearable: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
@@ -84,7 +88,7 @@ const inputRules = [
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value && !$attrs.disabled"
+                    v-if="hover && value && !$attrs.disabled && $props.clearable"
                     @click="value = null"
                 ></QIcon>
                 <QIcon v-if="info" name="info">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 685660782..92b424505 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -13,6 +13,7 @@ import ItemPicture from 'src/components/ui/ItemPicture.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
+import TicketTransfer from './TicketTransfer.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useSession } from 'composables/useSession';
@@ -47,6 +48,10 @@ const selectedSales = ref([]);
 const mana = ref(null);
 const manaCode = ref('mana');
 const ticketState = computed(() => store.data?.ticketState?.state?.code);
+const transfer = ref({
+    lastActiveTickets: [],
+    sales: [],
+});
 
 const columns = computed(() => [
     {
@@ -370,6 +375,27 @@ const removeSales = async () => {
 
 const insertRow = () => sales.value.push({ ...DEFAULT_EDIT });
 
+const setTransferParams = async () => {
+    try {
+        const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
+        transfer.value = {
+            lastActiveTickets: [],
+            sales: checkedSales,
+        };
+
+        const params = { ticketId: store.data.id };
+        const { data } = await axios.get(
+            `clients/${store.data.clientFk}/lastActiveTickets`,
+            {
+                params,
+            }
+        );
+        transfer.value.lastActiveTickets = data;
+    } catch (err) {
+        console.error('Error setting transfer params', err);
+    }
+};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     await getConfig();
@@ -458,6 +484,19 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 >
                     <QTooltip>{{ t('Remove lines') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    color="primary"
+                    icon="vn:splitline"
+                    :disable="!isTicketEditable || !selectedSales.length"
+                    @click="setTransferParams()"
+                >
+                    <QTooltip>{{ t('Transfer lines') }}</QTooltip>
+                    <TicketTransfer
+                        :transfer="transfer"
+                        :ticket="store.data"
+                        @refresh-data="resetChanges()"
+                    />
+                </QBtn>
             </QBtnGroup>
         </template>
     </VnSubToolbar>
@@ -720,4 +759,5 @@ es:
     You are going to delete lines of the ticket: Vas a eliminar lineas del ticket
     Add item: Añadir artículo
     Select lines to see the options: Selecciona líneas para ver las opciones
+    Transfer lines: Transferir líneas
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
new file mode 100644
index 000000000..b4c5babc6
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -0,0 +1,195 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { toDateFormat } from 'src/filters/date.js';
+import axios from 'axios';
+
+const $props = defineProps({
+    mana: {
+        type: Number,
+        default: null,
+    },
+    newPrice: {
+        type: Number,
+        default: 0,
+    },
+    transfer: {
+        type: Object,
+        default: () => {},
+    },
+    ticket: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['refreshData']);
+
+const router = useRouter();
+const { t } = useI18n();
+const QPopupProxyRef = ref(null);
+
+const _transfer = ref(null);
+
+const transferLinesColumns = computed(() => [
+    {
+        label: t('ticketSale.id'),
+        name: 'itemFk',
+        field: 'itemFk',
+        align: 'left',
+    },
+    {
+        label: t('ticketSale.item'),
+        name: 'item',
+        field: 'concept',
+        align: 'left',
+    },
+    {
+        label: t('ticketSale.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+    },
+]);
+
+const destinationTicketColumns = computed(() => [
+    {
+        label: t('ticketSale.id'),
+        name: 'id',
+        field: 'id',
+        align: 'left',
+    },
+    {
+        label: t('ticketSale.shipped'),
+        name: 'item',
+        field: 'shipped',
+        align: 'left',
+        format: (val) => toDateFormat(val),
+    },
+    {
+        label: t('ticketSale.agency'),
+        name: 'agency',
+        field: 'agencyName',
+        align: 'left',
+    },
+    {
+        label: t('ticketSale.address'),
+        name: 'address',
+        field: 'address',
+        align: 'left',
+    },
+]);
+
+const transferSales = async (ticketId) => {
+    const params = {
+        ticketId: ticketId,
+        sales: $props.transfer.sales,
+    };
+
+    const { data } = await axios.post(
+        `tickets/${$props.ticket.id}/transferSales`,
+        params
+    );
+
+    if (data && data.id === $props.ticket.id) emit('refreshData');
+    else router.push({ name: 'TicketSale', params: { id: data.id } });
+};
+
+onMounted(() => (_transfer.value = $props.transfer));
+</script>
+
+<template>
+    <QPopupProxy ref="QPopupProxyRef">
+        <QCard class="q-px-md" style="display: flex">
+            <QTable
+                v-if="transfer.sales"
+                :rows="transfer.sales"
+                :columns="transferLinesColumns"
+                :title="t('Sales to transfer')"
+                row-key="id"
+                :pagination="{ rowsPerPage: 0 }"
+                class="full-width q-mt-md"
+                :no-data-label="t('globals.noResults')"
+            >
+                <template #body-cell-quantity="{ row }">
+                    <QTd @click.stop>
+                        <VnInput
+                            v-model.number="row.quantity"
+                            :clearable="false"
+                            @keyup.enter="changeQuantity(row)"
+                            @blur="changeQuantity(row)"
+                            @focus="edit.oldQuantity = row.quantity"
+                            style="max-width: 60px"
+                        />
+                    </QTd>
+                </template>
+            </QTable>
+            <QSeparator vertical spaced />
+            <div class="col">
+                <QTable
+                    v-if="transfer.lastActiveTickets"
+                    :rows="transfer.lastActiveTickets"
+                    :columns="destinationTicketColumns"
+                    :title="t('Destination ticket')"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :no-data-label="t('globals.noResults')"
+                >
+                    <template #body-cell-address="{ row }">
+                        <QTd @click.stop>
+                            <span>
+                                {{ row.nickname }}
+                                {{ row.name }}
+                                {{ row.street }}
+                                {{ row.postalCode }}
+                                {{ row.city }}
+                            </span>
+                            <QTooltip>
+                                {{ row.nickname }}
+                                {{ row.name }}
+                                {{ row.street }}
+                                {{ row.postalCode }}
+                                {{ row.city }}
+                            </QTooltip>
+                        </QTd>
+                    </template>
+                </QTable>
+                <QForm class="q-mt-lg">
+                    <VnInput
+                        v-model.number="_transfer.ticketId"
+                        :label="t('Transfer to ticket')"
+                        :clearable="false"
+                    >
+                        <template #append>
+                            <QBtn
+                                icon="keyboard_arrow_right"
+                                color="primary"
+                                @click="transferSales(_transfer.ticketId)"
+                                style="width: 30px"
+                            />
+                        </template>
+                    </VnInput>
+                    <QBtn
+                        :label="t('New ticket')"
+                        color="primary"
+                        class="full-width q-my-lg"
+                        @click="transferSales()"
+                    />
+                </QForm>
+            </div>
+        </QCard>
+    </QPopupProxy>
+</template>
+
+<i18n>
+es:
+    Sales to transfer: Líneas a transferir
+    Destination ticket: Ticket destinatario
+    Transfer to ticket: Transferir a ticket
+    New ticket: Nuevo ticket
+</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 0a3c36636..0b29bea6b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -19,3 +19,6 @@ ticketSale:
     ok: Ok
     state: State
     more: More
+    shipped: Shipped
+    agency: Agency
+    address: Address
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 2e6bc947e..fa0278c32 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -21,3 +21,6 @@ ticketSale:
     ok: Ok
     state: Estado
     more: Más
+    shipped: F. Envío
+    agency: Agencia
+    address: Consignatario

From c31e865faacaa7b3e62a38d338b7e4b289f2f52a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sat, 15 Jun 2024 12:04:31 -0300
Subject: [PATCH 26/72] Fix card searchbar routing

---
 src/pages/Ticket/Card/TicketCard.vue | 24 +++++++++----
 src/pages/Ticket/Card/TicketSale.vue | 52 +++++++++++++++++-----------
 src/pages/Ticket/locale/en.yml       |  3 ++
 src/pages/Ticket/locale/es.yml       |  3 ++
 src/pages/Zone/Card/ZoneCard.vue     |  1 +
 5 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 04363b506..0a0912703 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,17 +1,29 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketFilter from '../TicketFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const searchBarDataKeys = {
+    TicketSummary: 'TicketSummary',
+    TicketSale: 'TicketSale',
+};
 </script>
 <template>
     <VnCard
         data-key="Ticket"
-        base-url="Tickets"
-        :descriptor="TicketDescriptor"
         :filter-panel="TicketFilter"
-        search-data-key="TicketList"
-        search-url="Tickets/filter"
-        searchbar-label="Search ticket"
-        searchbar-info="You can search by ticket id or alias"
+        :descriptor="TicketDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="routeName"
+        :searchbar-label="t('card.search')"
+        :searchbar-info="t('card.searchInfo')"
     />
 </template>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 92b424505..3e2720ffa 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted } from 'vue';
+import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 
@@ -31,7 +31,6 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
-const salesDataRef = ref(null);
 const editPriceProxyRef = ref(null);
 const stateBtnDropdownRef = ref(null);
 
@@ -53,6 +52,11 @@ const transfer = ref({
     sales: [],
 });
 
+watch(
+    () => route.params.id,
+    async () => await getSales()
+);
+
 const columns = computed(() => [
     {
         label: '',
@@ -139,11 +143,29 @@ const columns = computed(() => [
 ]);
 
 const getConfig = async () => {
-    let filter = {
-        fields: ['daysForWarningClaim'],
-    };
-    const { data } = await axios.get(`TicketConfigs`, { filter });
-    ticketConfig.value = data;
+    try {
+        let filter = {
+            fields: ['daysForWarningClaim'],
+        };
+        const { data } = await axios.get(`TicketConfigs`, { filter });
+        ticketConfig.value = data;
+    } catch (err) {
+        console.error('Error getting ticket config', err);
+    }
+};
+
+const onSalesFetched = (salesData) => {
+    sales.value = salesData;
+    for (let sale of salesData) sale.amount = getSaleTotal(sale);
+};
+
+const getSales = async () => {
+    try {
+        const { data } = await axios.get(`Tickets/${route.params.id}/getSales`);
+        onSalesFetched(data);
+    } catch (err) {
+        console.error('Error fetching sales', err);
+    }
 };
 
 const getSaleTotal = (sale) => {
@@ -155,14 +177,9 @@ const getSaleTotal = (sale) => {
     return price - discount;
 };
 
-const onSalesFetched = (salesData) => {
-    sales.value = salesData;
-    for (let sale of salesData) sale.amount = getSaleTotal(sale);
-};
-
 const resetChanges = async () => {
     arrayData.fetch({ append: false });
-    salesDataRef.value.fetch();
+    getSales();
 };
 
 const updateQuantity = async (sale) => {
@@ -398,7 +415,8 @@ const setTransferParams = async () => {
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    await getConfig();
+    getConfig();
+    getSales();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -415,12 +433,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (isLocked = data)"
     />
-    <FetchData
-        ref="salesDataRef"
-        :url="`Tickets/${route.params.id}/getSales`"
-        auto-load
-        @on-fetch="(data) => onSalesFetched(data)"
-    />
     <FetchData
         url="Items/withName"
         :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 0b29bea6b..d63f1e29c 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -22,3 +22,6 @@ ticketSale:
     shipped: Shipped
     agency: Agency
     address: Address
+card:
+    search: Search tickets
+    searchInfo: You can search by ticket id or alias
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index fa0278c32..4b8b70c82 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -24,3 +24,6 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+card:
+    search: Buscar tickets
+    searchInfo: Buscar tickets por identificador o alias
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 1cbc01dd7..f92ee1e4e 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -22,6 +22,7 @@ const searchBarDataKeys = {
     ZoneEvents: 'ZoneEvents',
 };
 </script>
+
 <template>
     <VnCard
         data-key="Zone"

From c807b5feb278c6918bec7f02189d226c5810f9ee Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 17 Jun 2024 08:21:43 -0300
Subject: [PATCH 27/72] Weekly tickets

---
 src/i18n/locale/en.yml            |   1 +
 src/i18n/locale/es.yml            |   1 +
 src/pages/Ticket/TicketWeekly.vue | 327 ++++++++++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml    |   9 +
 src/pages/Ticket/locale/es.yml    |   9 +
 src/router/modules/ticket.js      |  11 +-
 6 files changed, 357 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/TicketWeekly.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 5ef3a5472..7f212ca30 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -442,6 +442,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        weeklyTickets: Weekly tickets
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index cfadd57b3..ff357492b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -440,6 +440,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        weeklyTickets: Tickets programados
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
new file mode 100644
index 000000000..50b4c0451
--- /dev/null
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -0,0 +1,327 @@
+<script setup>
+import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const router = useRouter();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
+
+const paginateRef = ref(null);
+const agencyModesOptions = ref([]);
+const visibleColumns = ref([]);
+const allColumnNames = ref([]);
+
+const arrayData = useArrayData('WeeklyTickets');
+const { store } = arrayData;
+
+const weekdays = [
+    { id: 0, name: t('weekdays.mon') },
+    { id: 1, name: t('weekdays.tue') },
+    { id: 2, name: t('weekdays.wed') },
+    { id: 3, name: t('weekdays.thu') },
+    { id: 4, name: t('weekdays.fri') },
+    { id: 5, name: t('weekdays.sat') },
+    { id: 6, name: t('weekdays.sun') },
+];
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'clientName':
+            return { 'c.name': value };
+        case 'nickName':
+            return { 'u.name': value };
+    }
+};
+
+const params = reactive({});
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        console.log('paramKey', paramKey, 'params', params);
+        await paginateRef.value.addFilter(null, params);
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getInputEvents = (col) => ({ 'update:modelValue': () => applyColumnFilter(col) });
+
+const columns = computed(() => [
+    {
+        label: t('weeklyTickets.id'),
+        name: 'id',
+        field: 'ticketFk',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.client'),
+        name: 'client',
+        field: 'clientName',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('weeklyTickets.shipment'),
+        name: 'shipment',
+        field: 'weekDay',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.agency'),
+        name: 'agency',
+        field: 'agencyModeFk',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.warehouse'),
+        name: 'warehouse',
+        field: 'warehouseName',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.salesperson'),
+        field: 'salesperson',
+        name: 'salesperson',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            filterParamKey: 'nickName',
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
+]);
+
+const redirectToTicketSummary = (ticketFk) =>
+    router.push({ name: 'TicketSummary', params: { id: ticketFk } });
+
+const deleteWeekly = async (ticketFk) => {
+    try {
+        await axios.delete(`TicketWeeklies/${ticketFk}`);
+        notify(t('globals.dataSaved'), 'positive');
+        const ticketIndex = store.data.findIndex((e) => e.ticketFk == ticketFk);
+        store.data.splice(ticketIndex, 1);
+    } catch (err) {
+        console.error('Error deleting weekly', err);
+    }
+};
+
+const onUpdate = async (ticketFk, field, value) => {
+    try {
+        const params = { ticketFk, [field]: value };
+        await axios.patch('TicketWeeklies', params);
+    } catch (err) {
+        console.error('Error updating weekly', err);
+    }
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    const filteredColumns = columns.value.filter((col) => col.name !== 'actions');
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="AgencyModes/isActive"
+        :filter="{ fields: ['id', 'name'], order: 'name' }"
+        auto-load
+        @on-fetch="(data) => (agencyModesOptions = data)"
+    />
+    <VnSearchbar
+        data-key="WeeklyTickets"
+        :label="t('weeklyTickets.search')"
+        :info="t('weeklyTickets.searchInfo')"
+    />
+    <VnSubToolbar>
+        <template #st-data>
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="itemsIndex"
+                labels-traductions-path="weeklyTickets"
+                @on-config-saved="visibleColumns = [...$event, 'actions']"
+            />
+        </template>
+    </VnSubToolbar>
+    <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            ref="paginateRef"
+            data-key="WeeklyTickets"
+            url="TicketWeeklies/filter"
+            :order="['weekDay', 'ticketFk']"
+            :limit="20"
+            :expr-builder="exprBuilder"
+            :user-params="params"
+            :offset="50"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :visible-columns="visibleColumns"
+                    :no-data-label="t('globals.noResults')"
+                    @row-click="(_, row) => redirectToTicketSummary(row.ticketFk)"
+                >
+                    <template #top-row="{ cols }">
+                        <QTr>
+                            <QTd
+                                v-for="(col, index) in cols"
+                                :key="index"
+                                style="max-width: 100px"
+                            >
+                                <component
+                                    :is="col.columnFilter.component"
+                                    v-if="col.columnFilter"
+                                    v-model="col.columnFilter.filterValue"
+                                    v-bind="col.columnFilter.attrs"
+                                    v-on="col.columnFilter.event(col)"
+                                    dense
+                                />
+                            </QTd>
+                        </QTr>
+                    </template>
+                    <template #body-cell-id="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.ticketFk }}
+                                <TicketDescriptorProxy :id="row.ticketFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-salesperson="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.userName }}
+                                <WorkerDescriptorProxy :id="row.workerFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-client="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary" dense>
+                                {{ row.clientName }}
+                                <CustomerDescriptorProxy :id="row.clientFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-shipment="{ row }">
+                        <QTd @click.stop>
+                            <VnSelect
+                                :options="weekdays"
+                                hide-selected
+                                option-label="name"
+                                option-value="id"
+                                v-model="row.weekDay"
+                                @update:model-value="
+                                    onUpdate(row.ticketFk, 'weekDay', $event)
+                                "
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-agency="{ row }">
+                        <QTd @click.stop>
+                            <VnSelect
+                                :options="agencyModesOptions"
+                                hide-selected
+                                option-label="name"
+                                option-value="id"
+                                v-model="row.agencyModeFk"
+                                @update:model-value="
+                                    onUpdate(row.ticketFk, 'agencyModeFk', $event)
+                                "
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-actions="{ row }">
+                        <QTd>
+                            <QIcon
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('You are going to delete this weekly ticket'),
+                                        t(
+                                            'This ticket will be removed from weekly tickets! Continue anyway?'
+                                        ),
+                                        () => deleteWeekly(row.ticketFk)
+                                    )
+                                "
+                                class="q-ml-sm cursor-pointer"
+                                color="primary"
+                                name="delete"
+                                size="sm"
+                            >
+                                <QTooltip>
+                                    {{ t('globals.delete') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    You are going to delete this weekly ticket: Vas a eliminar este ticket programado
+    This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas?
+</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..a4c5b78ac
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,9 @@
+weeklyTickets:
+    id: Ticket ID
+    client: Client
+    shipment: Shipment
+    agency: Agency
+    warehouse: Warehouse
+    salesperson: Salesperson
+    search: Search weekly tickets
+    searchInfo: Search weekly tickets by id or client id
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..0e2f77d73 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,11 @@
+weeklyTickets:
+    id: ID Ticket
+    client: Cliente
+    shipment: Salida
+    agency: Agencia
+    warehouse: Almacén
+    salesperson: Comercial
+    search: Buscar por tickets programados
+    searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..e92ba6650 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'TicketMain' },
     menus: {
-        main: ['TicketList'],
+        main: ['TicketList', 'TicketWeekly'],
         card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
     },
     children: [
@@ -40,6 +40,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },
+                {
+                    name: 'TicketWeekly',
+                    path: 'weekly',
+                    meta: {
+                        title: 'weeklyTickets',
+                        icon: 'access_time',
+                    },
+                    component: () => import('src/pages/Ticket/TicketWeekly.vue'),
+                },
             ],
         },
         {

From 06e8e819f4da8f4c5718d820ce39e73b5cfc6f13 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 17 Jun 2024 12:11:23 -0300
Subject: [PATCH 28/72] WIP

---
 src/i18n/locale/en.yml            |   1 +
 src/i18n/locale/es.yml            |   1 +
 src/pages/Ticket/TicketFuture.vue | 443 ++++++++++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml    |  22 ++
 src/pages/Ticket/locale/es.yml    |  22 ++
 src/router/modules/ticket.js      |  11 +-
 6 files changed, 499 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/TicketFuture.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 5ef3a5472..9a70e5eb7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -442,6 +442,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        futureTickets: Future tickets
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index cfadd57b3..1a307d3d1 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -440,6 +440,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        futureTickets: Tickets a futuro
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
new file mode 100644
index 000000000..ca3753424
--- /dev/null
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -0,0 +1,443 @@
+<script setup>
+import { onMounted, ref, computed, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+import { dashIfEmpty, toCurrency } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import useNotify from 'src/composables/useNotify.js';
+import { useState } from 'src/composables/useState';
+import { toDateTimeFormat } from 'src/filters/date.js';
+
+const state = useState();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
+const user = state.getUser();
+
+const agencyModesOptions = ref([]);
+const selectedTickets = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'id':
+            return { id: value };
+        case 'futureId':
+            return { futureId: value };
+        case 'liters':
+            return { liters: value };
+        case 'lines':
+            return { lines: value };
+        case 'ipt':
+            return { ipt: { like: `%${value}%` } };
+        case 'futureIpt':
+            return { futureIpt: { like: `%${value}%` } };
+        case 'totalWithVat':
+            return { totalWithVat: value };
+    }
+};
+
+const userParams = reactive({
+    futureDated: Date.vnNew(),
+    originDated: Date.vnNew(),
+    warehouseFk: user.value.warehouseFk,
+});
+
+const arrayData = useArrayData('FutureTickets', {
+    url: 'Tickets/getTicketsFuture',
+    userParams: userParams,
+    exprBuilder: exprBuilder,
+});
+const { store } = arrayData;
+
+const params = reactive({
+    futureDated: Date.vnNew(),
+    originDated: Date.vnNew(),
+    warehouseFk: user.value.warehouseFk,
+});
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        console.log('paramKey', paramKey, 'params', params);
+        await arrayData.applyFilter({ params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const ticketColumns = computed(() => [
+    {
+        label: t('futureTickets.problems'),
+        name: 'problems',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('futureTickets.ticketId'),
+        name: 'ticketId',
+        align: 'center',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'id',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('futureTickets.shipped'),
+        name: 'shipped',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('futureTickets.ipt'),
+        name: 'ipt',
+        field: 'ipt',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('futureTickets.state'),
+        name: 'state',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('futureTickets.liters'),
+        name: 'liters',
+        field: 'liters',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('futureTickets.import'),
+        field: 'import',
+        name: 'import',
+        align: 'left',
+        sortable: true,
+        // columnFilter: {
+        //     component: VnInput,
+        //     type: 'text',
+        //     filterValue: null,
+        //     event: getInputEvents,
+        //     filterParamKey: 'nickName',
+        //     attrs: {
+        //         dense: true,
+        //     },
+        // },
+    },
+    {
+        label: t('futureTickets.availableLines'),
+        name: 'lines',
+        field: 'lines',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('futureTickets.futureId'),
+        name: 'futureId',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('futureTickets.futureShipped'),
+        name: 'futureShipped',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
+    },
+
+    {
+        label: t('futureTickets.futureIpt'),
+        name: 'futureIpt',
+        field: 'futureIpt',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('futureTickets.futureState'),
+        name: 'futureState',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
+    },
+]);
+
+const isLessThan50 = (totalWithVat) =>
+    parseInt(totalWithVat) > 0 && parseInt(totalWithVat) < 50;
+
+const totalPriceColor = (totalWithVat) =>
+    isLessThan50(totalWithVat) ? 'warning' : 'transparent';
+
+onMounted(async () => {
+    await arrayData.fetch({ append: false });
+});
+</script>
+
+<template>
+    <FetchData
+        url="Tickets/getTicketsFuture"
+        :filter="{ fields: ['id', 'name'], order: 'name' }"
+        @on-fetch="(data) => (agencyModesOptions = data)"
+    />
+    <VnSearchbar
+        data-key="WeeklyTickets"
+        :label="t('weeklyTickets.search')"
+        :info="t('weeklyTickets.searchInfo')"
+    />
+    <VnSubToolbar>
+        <template #st-data>
+            <QBtn icon="keyboard_double_arrow_right" color="primary" />
+        </template>
+    </VnSubToolbar>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="store.data"
+            :columns="ticketColumns"
+            row-key="id"
+            selection="multiple"
+            v-model:selected="selectedTickets"
+            :pagination="{ rowsPerPage: 0 }"
+            :no-data-label="t('globals.noResults')"
+            style="max-width: 99%"
+        >
+            <template #header>
+                <QTr>
+                    <QTh class="horizontal-separator" />
+                    <QTh class="horizontal-separator" colspan="8" translate>
+                        {{ t('futureTickets.origin') }}
+                    </QTh>
+                    <QTh class="horizontal-separator" colspan="4" translate>
+                        {{ t('futureTickets.destination') }}
+                    </QTh>
+                </QTr>
+                <QTr>
+                    <QTh />
+                    <QTh
+                        v-for="(col, index) in ticketColumns"
+                        :key="index"
+                        :class="{ 'vertical-separator': col.name === 'futureId' }"
+                    >
+                        {{ col.label }}
+                    </QTh>
+                </QTr>
+            </template>
+            <template #top-row="{ cols }">
+                <QTr>
+                    <QTd />
+                    <QTd
+                        v-for="(col, index) in cols"
+                        :key="index"
+                        style="max-width: 100px"
+                    >
+                        <component
+                            :is="col.columnFilter.component"
+                            v-if="col.columnFilter"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
+            </template>
+            <template #header-cell-availableLines="{ col }">
+                <QTh class="vertical-separator">
+                    {{ col.label }}
+                </QTh>
+            </template>
+            <template #body-cell-problems="{ row }">
+                <QTd class="q-gutter-x-xs">
+                    <QIcon
+                        v-if="row.isTaxDataChecked === 0"
+                        color="primary"
+                        name="vn:no036"
+                        size="xs"
+                    >
+                        <QTooltip>
+                            {{ t('futureTickets.noVerified') }}
+                        </QTooltip>
+                    </QIcon>
+                    <QIcon
+                        v-if="row.hasTicketRequest"
+                        color="primary"
+                        name="vn:buyrequest"
+                        size="xs"
+                    >
+                        <QTooltip>
+                            {{ t('futureTickets.purchaseRequest') }}
+                        </QTooltip>
+                    </QIcon>
+                    <QIcon
+                        v-if="row.itemShortage"
+                        color="primary"
+                        name="vn:unavailable"
+                        size="xs"
+                    >
+                        <QTooltip>
+                            {{ t('futureTickets.noVisible') }}
+                        </QTooltip>
+                    </QIcon>
+                    <QIcon
+                        v-if="row.isFreezed"
+                        color="primary"
+                        name="vn:frozen"
+                        size="xs"
+                    >
+                        <QTooltip>
+                            {{ t('futureTickets.clientFrozen') }}
+                        </QTooltip>
+                    </QIcon>
+                    <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
+                        <QTooltip>
+                            {{ t('futureTickets.risk') }}: {{ row.risk }}
+                        </QTooltip>
+                    </QIcon>
+                    <QIcon
+                        v-if="row.hasComponentLack"
+                        color="primary"
+                        name="vn:components"
+                        size="xs"
+                    >
+                        <QTooltip>
+                            {{ t('futureTickets.componentLack') }}
+                        </QTooltip>
+                    </QIcon>
+                    <QIcon
+                        v-if="row.hasRounding"
+                        color="primary"
+                        name="sync_problem"
+                        size="xs"
+                    >
+                        <QTooltip>
+                            {{ t('futureTickets.rounding') }}
+                        </QTooltip>
+                    </QIcon>
+                </QTd>
+            </template>
+            <template #body-cell-ticketId="{ row }">
+                <QTd>
+                    <QBtn flat color="primary">
+                        {{ row.id }}
+                        <TicketDescriptorProxy :id="row.id" />
+                    </QBtn>
+                </QTd>
+            </template>
+            <template #body-cell-shipped="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="getDateQBadgeColor(row.shipped)"
+                        class="q-ma-none"
+                    >
+                        {{ toDateTimeFormat(row.shipped) }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-state="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.classColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.state }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-import="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="totalPriceColor(row.totalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.totalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-futureId="{ row }">
+                <QTd class="vertical-separator">
+                    <QBtn flat color="primary" dense>
+                        {{ row.futureId }}
+                        <TicketDescriptorProxy :id="row.futureId" />
+                    </QBtn>
+                </QTd>
+            </template>
+            <template #body-cell-futureShipped="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="getDateQBadgeColor(row.futureShipped)"
+                        class="q-ma-none"
+                    >
+                        {{ toDateTimeFormat(row.futureShipped) }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-futureState="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.futureClassColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.futureState }}
+                    </QBadge>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style scoped lang="scss">
+.vertical-separator {
+    border-left: 4px solid white !important;
+}
+
+.horizontal-separator {
+    border-bottom: 4px solid white !important;
+}
+</style>
+
+<i18n>
+es:
+</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..b421a07b9
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,22 @@
+futureTickets:
+    problems: Problems
+    ticketId: ID
+    shipped: Date
+    ipt: IPT
+    state: State
+    liters: Liters
+    import: Import
+    availableLines: Available lines
+    futureId: ID
+    futureShipped: Date
+    futureIpt: IPT
+    futureState: State
+    noVerified: No verified data
+    noVisible: Not visible
+    purchaseRequest: Purchase request
+    clientFrozen: Client frozen
+    componentLack: Component lack
+    rounding: Rounding
+    risk: Risk
+    origin: Origin
+    destination: Destination
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..52c1fbf04 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,24 @@
+futureTickets:
+    problems: Problemas
+    ticketId: ID
+    shipped: Fecha
+    ipt: IPT
+    state: Estado
+    liters: Litros
+    import: Importe
+    availableLines: Líneas disponibles
+    futureId: ID
+    futureShipped: Fecha
+    futureIpt: IPT
+    futureState: Estado
+    noVerified: Sin datos comprobados
+    noVisible: No visible
+    purchaseRequest: Petición de compra
+    clientFrozen: Cliente congelado
+    risk: Riesgo
+    componentLack: Faltan componentes
+    rounding: Redondeo
+    origin: Origen
+    destination: Destino
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..993934c64 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'TicketMain' },
     menus: {
-        main: ['TicketList'],
+        main: ['TicketList', 'TicketFuture'],
         card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
     },
     children: [
@@ -40,6 +40,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },
+                {
+                    name: 'TicketFuture',
+                    path: 'future',
+                    meta: {
+                        title: 'futureTickets',
+                        icon: 'keyboard_double_arrow_right',
+                    },
+                    component: () => import('src/pages/Ticket/TicketFuture.vue'),
+                },
             ],
         },
         {

From 6b7c76dde335559fd127377673d97ab642082cf8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 17 Jun 2024 12:19:44 -0300
Subject: [PATCH 29/72] mini change

---
 src/pages/Ticket/Card/TicketSale.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 3e2720ffa..9df6d5640 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -240,7 +240,13 @@ const updateConcept = async (sale) => {
     }
 };
 
-const DEFAULT_EDIT = { price: null, discount: null, sale: null, sales: null };
+const DEFAULT_EDIT = {
+    price: null,
+    discount: null,
+    sale: null,
+    sales: null,
+    oldQuantity: null,
+};
 const edit = ref({ ...DEFAULT_EDIT });
 const usesMana = ref(null);
 

From c289c247c4d941b7caec8a1875b29ce00546d4ba Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 17 Jun 2024 12:22:22 -0300
Subject: [PATCH 30/72] undo change in sms dialog

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

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index f04ea2cb6..064394445 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -244,6 +244,7 @@ pt:
             { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
         orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
         productNotAvailable: 'Verdnatura comunica: Seu pedido {ticketFk} com data de recepção em {landed}. {notAvailables} não disponível/eis. Desculpe pelo transtorno.'
+    en: Inglês
     es: Espanhol
     fr: Francês
     pt: Português

From c798874a9ebaced2c2a2f7486dc07aa193ca4d68 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 17 Jun 2024 17:27:06 -0300
Subject: [PATCH 31/72] Ticket future

---
 src/pages/Ticket/TicketFuture.vue | 123 +++++++++++++++++++++++-------
 src/pages/Ticket/locale/en.yml    |   3 +
 src/pages/Ticket/locale/es.yml    |   3 +
 3 files changed, 103 insertions(+), 26 deletions(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index ca3753424..6c635b98a 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -16,6 +16,7 @@ import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateTimeFormat } from 'src/filters/date.js';
+import axios from 'axios';
 
 const state = useState();
 const { t } = useI18n();
@@ -23,7 +24,7 @@ const { openConfirmationModal } = useVnConfirm();
 const { notify } = useNotify();
 const user = state.getUser();
 
-const agencyModesOptions = ref([]);
+const itemPackingTypesOptions = ref([]);
 const selectedTickets = ref([]);
 
 const exprBuilder = (param, value) => {
@@ -68,8 +69,7 @@ const applyColumnFilter = async (col) => {
     try {
         const paramKey = col.columnFilter?.filterParamKey || col.field;
         params[paramKey] = col.columnFilter.filterValue;
-        console.log('paramKey', paramKey, 'params', params);
-        await arrayData.applyFilter({ params });
+        await arrayData.addFilter({ params });
     } catch (err) {
         console.error('Error applying column filter', err);
     }
@@ -119,7 +119,19 @@ const ticketColumns = computed(() => [
         field: 'ipt',
         align: 'left',
         sortable: true,
-        columnFilter: null,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'ipt',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -135,7 +147,15 @@ const ticketColumns = computed(() => [
         field: 'liters',
         align: 'left',
         sortable: true,
-        columnFilter: null,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('futureTickets.import'),
@@ -143,16 +163,6 @@ const ticketColumns = computed(() => [
         name: 'import',
         align: 'left',
         sortable: true,
-        // columnFilter: {
-        //     component: VnInput,
-        //     type: 'text',
-        //     filterValue: null,
-        //     event: getInputEvents,
-        //     filterParamKey: 'nickName',
-        //     attrs: {
-        //         dense: true,
-        //     },
-        // },
     },
     {
         label: t('futureTickets.availableLines'),
@@ -160,7 +170,15 @@ const ticketColumns = computed(() => [
         field: 'lines',
         align: 'left',
         sortable: true,
-        columnFilter: null,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -168,7 +186,16 @@ const ticketColumns = computed(() => [
         name: 'futureId',
         align: 'left',
         sortable: true,
-        columnFilter: null,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'futureId',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('futureTickets.futureShipped'),
@@ -185,7 +212,19 @@ const ticketColumns = computed(() => [
         field: 'futureIpt',
         align: 'left',
         sortable: true,
-        columnFilter: null,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'futureIpt',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -204,6 +243,24 @@ const isLessThan50 = (totalWithVat) =>
 const totalPriceColor = (totalWithVat) =>
     isLessThan50(totalWithVat) ? 'warning' : 'transparent';
 
+const moveTicketsFuture = async () => {
+    try {
+        const ticketsToMove = selectedTickets.value.map((ticket) => ({
+            originId: ticket.id,
+            destinationId: ticket.futureId,
+            originShipped: ticket.shipped,
+            destinationShipped: ticket.futureShipped,
+            workerFk: ticket.workerFk,
+        }));
+
+        let params = { tickets: ticketsToMove };
+        await axios.post('Tickets/merge', params);
+        notify(t('futureTickets.moveTicketSuccess'), 'positive');
+        arrayData.fetch({ append: false });
+    } catch (error) {
+        console.error('Error moving tickets to future', error);
+    }
+};
 onMounted(async () => {
     await arrayData.fetch({ append: false });
 });
@@ -211,9 +268,14 @@ onMounted(async () => {
 
 <template>
     <FetchData
-        url="Tickets/getTicketsFuture"
-        :filter="{ fields: ['id', 'name'], order: 'name' }"
-        @on-fetch="(data) => (agencyModesOptions = data)"
+        url="itemPackingTypes"
+        :filter="{
+            fields: ['code', 'description'],
+            order: 'description ASC',
+            where: { isActive: true },
+        }"
+        auto-load
+        @on-fetch="(data) => (itemPackingTypesOptions = data)"
     />
     <VnSearchbar
         data-key="WeeklyTickets"
@@ -222,7 +284,20 @@ onMounted(async () => {
     />
     <VnSubToolbar>
         <template #st-data>
-            <QBtn icon="keyboard_double_arrow_right" color="primary" />
+            <QBtn
+                icon="keyboard_double_arrow_right"
+                color="primary"
+                :disable="!selectedTickets.length"
+                @click.stop="
+                    openConfirmationModal(
+                        t('futureTickets.moveTicketTitle'),
+                        t(`futureTickets.moveTicketDialogSubtitle`, {
+                            selectedTickets: selectedTickets.length,
+                        }),
+                        moveTicketsFuture
+                    )
+                "
+            />
         </template>
     </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
@@ -437,7 +512,3 @@ onMounted(async () => {
     border-bottom: 4px solid white !important;
 }
 </style>
-
-<i18n>
-es:
-</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index b421a07b9..16089a3cb 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -20,3 +20,6 @@ futureTickets:
     risk: Risk
     origin: Origin
     destination: Destination
+    moveTicketTitle: Move tickets
+    moveTicketDialogSubtitle: 'Do you want to move {selectedTickets} tickets to the future?'
+    moveTicketSuccess: Tickets moved successfully!
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 52c1fbf04..906522b21 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -20,5 +20,8 @@ futureTickets:
     rounding: Redondeo
     origin: Origen
     destination: Destino
+    moveTicketTitle: Mover tickets
+    moveTicketDialogSubtitle: '¿Desea mover {selectedTickets} tickets hacia el futuro?'
+    moveTicketSuccess: Tickets movidos correctamente
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From dfbc7df54db1a8c64ceb798567ded44b7d00c9c2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 18 Jun 2024 09:20:45 +0200
Subject: [PATCH 32/72] perf: Remove div.col

---
 src/pages/Ticket/Card/TicketTransfer.vue | 107 ++++++++++++-----------
 1 file changed, 54 insertions(+), 53 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index b4c5babc6..9a22c764c 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -129,59 +129,60 @@ onMounted(() => (_transfer.value = $props.transfer));
                 </template>
             </QTable>
             <QSeparator vertical spaced />
-            <div class="col">
-                <QTable
-                    v-if="transfer.lastActiveTickets"
-                    :rows="transfer.lastActiveTickets"
-                    :columns="destinationTicketColumns"
-                    :title="t('Destination ticket')"
-                    row-key="id"
-                    :pagination="{ rowsPerPage: 0 }"
-                    class="full-width q-mt-md"
-                    :no-data-label="t('globals.noResults')"
-                >
-                    <template #body-cell-address="{ row }">
-                        <QTd @click.stop>
-                            <span>
-                                {{ row.nickname }}
-                                {{ row.name }}
-                                {{ row.street }}
-                                {{ row.postalCode }}
-                                {{ row.city }}
-                            </span>
-                            <QTooltip>
-                                {{ row.nickname }}
-                                {{ row.name }}
-                                {{ row.street }}
-                                {{ row.postalCode }}
-                                {{ row.city }}
-                            </QTooltip>
-                        </QTd>
-                    </template>
-                </QTable>
-                <QForm class="q-mt-lg">
-                    <VnInput
-                        v-model.number="_transfer.ticketId"
-                        :label="t('Transfer to ticket')"
-                        :clearable="false"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="keyboard_arrow_right"
-                                color="primary"
-                                @click="transferSales(_transfer.ticketId)"
-                                style="width: 30px"
-                            />
-                        </template>
-                    </VnInput>
-                    <QBtn
-                        :label="t('New ticket')"
-                        color="primary"
-                        class="full-width q-my-lg"
-                        @click="transferSales()"
-                    />
-                </QForm>
-            </div>
+            <QTable
+                v-if="transfer.lastActiveTickets"
+                :rows="transfer.lastActiveTickets"
+                :columns="destinationTicketColumns"
+                :title="t('Destination ticket')"
+                row-key="id"
+                :pagination="{ rowsPerPage: 0 }"
+                class="full-width q-mt-md"
+                :no-data-label="t('globals.noResults')"
+            >
+                <template #body-cell-address="{ row }">
+                    <QTd @click.stop>
+                        <span>
+                            {{ row.nickname }}
+                            {{ row.name }}
+                            {{ row.street }}
+                            {{ row.postalCode }}
+                            {{ row.city }}
+                        </span>
+                        <QTooltip>
+                            {{ row.nickname }}
+                            {{ row.name }}
+                            {{ row.street }}
+                            {{ row.postalCode }}
+                            {{ row.city }}
+                        </QTooltip>
+                    </QTd>
+                </template>
+
+                <template #bottom>
+                    <QForm class="q-mt-lg full-width">
+                        <VnInput
+                            v-model.number="_transfer.ticketId"
+                            :label="t('Transfer to ticket')"
+                            :clearable="false"
+                        >
+                            <template #append>
+                                <QBtn
+                                    icon="keyboard_arrow_right"
+                                    color="primary"
+                                    @click="transferSales(_transfer.ticketId)"
+                                    style="width: 30px"
+                                />
+                            </template>
+                        </VnInput>
+                        <QBtn
+                            :label="t('New ticket')"
+                            color="primary"
+                            class="full-width q-my-lg"
+                            @click="transferSales()"
+                        />
+                    </QForm>
+                </template>
+            </QTable>
         </QCard>
     </QPopupProxy>
 </template>

From bb208040bb54d86e7786f4e30d67eec4be8a9ce8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 18 Jun 2024 11:47:35 -0300
Subject: [PATCH 33/72] Last changes

---
 src/components/common/VnProgressModal.vue |  97 +++
 src/i18n/locale/en.yml                    |   1 +
 src/i18n/locale/es.yml                    |   1 +
 src/pages/Ticket/TicketAdvance.vue        | 701 ++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml            |  28 +
 src/pages/Ticket/locale/es.yml            |  28 +
 src/router/modules/ticket.js              |  11 +-
 7 files changed, 866 insertions(+), 1 deletion(-)
 create mode 100644 src/components/common/VnProgressModal.vue
 create mode 100644 src/pages/Ticket/TicketAdvance.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue
new file mode 100644
index 000000000..e788dd20b
--- /dev/null
+++ b/src/components/common/VnProgressModal.vue
@@ -0,0 +1,97 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { computed, ref } from 'vue';
+
+const { t } = useI18n();
+
+const $props = defineProps({
+    progress: {
+        type: Number, //Progress value (1.0 > x > 0.0)
+        required: true,
+    },
+    showDialog: {
+        type: Boolean,
+        required: true,
+    },
+    cancelled: {
+        type: Boolean,
+        required: false,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['cancel', 'close']);
+
+const dialogRef = ref(null);
+
+const _showDialog = computed({
+    get: () => $props.showDialog,
+    set: (value) => {
+        if (value) dialogRef.value.show();
+    },
+});
+
+const _progress = computed(() => $props.progress);
+
+const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
+
+const cancel = () => {
+    dialogRef.value.hide();
+    emit('cancel');
+};
+</script>
+
+<template>
+    <QDialog ref="dialogRef" v-model="_showDialog" @hide="onDialogHide">
+        <QCard class="full-width dialog">
+            <QCardSection class="row">
+                <span class="text-h6">{{ t('Progress') }}</span>
+                <QSpace />
+                <QBtn icon="close" flat round dense @click="emit('close')" />
+            </QCardSection>
+            <QCardSection>
+                <div class="column">
+                    <span>{{ t('Total progress') }}:</span>
+                    <QLinearProgress
+                        size="30px"
+                        :value="_progress"
+                        color="primary"
+                        stripe
+                        class="q-mt-sm q-mb-md"
+                    >
+                        <div class="absolute-full flex flex-center">
+                            <QBadge
+                                v-if="cancelled"
+                                text-color="white"
+                                color="negative"
+                                :label="t('Cancelled')"
+                            />
+                            <span v-else class="text-white text-subtitle1">
+                                {{ progressLabel }}
+                            </span>
+                        </div>
+                    </QLinearProgress>
+                    <slot />
+                </div>
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn
+                    v-if="!cancelled"
+                    type="button"
+                    flat
+                    class="text-primary"
+                    @click="cancel()"
+                >
+                    {{ t('globals.cancel') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    Progress: Progreso
+    Total progress: Progreso total
+    Cancelled: Cancelado
+</i18n>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 5ef3a5472..17ffa9b2c 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -442,6 +442,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        ticketAdvance: Advance tickets
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index cfadd57b3..b134b0b9c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -440,6 +440,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        ticketAdvance: Adelantar tickets
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
new file mode 100644
index 000000000..fc323cbae
--- /dev/null
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -0,0 +1,701 @@
+<script setup>
+import { onMounted, ref, computed, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnProgress from 'src/components/common/VnProgressModal.vue';
+
+import { dashIfEmpty, toCurrency } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import { useState } from 'src/composables/useState';
+import { toDateFormat } from 'src/filters/date.js';
+import axios from 'axios';
+
+const state = useState();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
+const user = state.getUser();
+
+const itemPackingTypesOptions = ref([]);
+const zonesOptions = ref([]);
+const selectedTickets = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'id':
+        case 'futureId':
+        case 'liters':
+        case 'futureLiters':
+        case 'lines':
+        case 'futureLines':
+        case 'totalWithVat':
+        case 'futureTotalWithVat':
+        case 'futureZone':
+        case 'notMovableLines':
+        case 'futureZoneFk':
+            return { [param]: value };
+        case 'ipt':
+            return { ipt: { like: `%${value}%` } };
+        case 'futureIpt':
+            return { futureIpt: { like: `%${value}%` } };
+    }
+};
+
+const userParams = reactive({});
+
+const arrayData = useArrayData('AdvanceTickets', {
+    url: 'Tickets/getTicketsAdvance',
+    userParams: userParams,
+    exprBuilder: exprBuilder,
+});
+const { store } = arrayData;
+const tickets = computed(() =>
+    (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
+);
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        userParams[paramKey] = col.columnFilter.filterValue;
+        await arrayData.addFilter({ params: userParams });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const ticketColumns = computed(() => [
+    {
+        label: '',
+        name: 'icons',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('advanceTickets.ticketId'),
+        name: 'ticketId',
+        align: 'center',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'id',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('advanceTickets.ipt'),
+        name: 'ipt',
+        field: 'ipt',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'ipt',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.state'),
+        name: 'state',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('advanceTickets.liters'),
+        name: 'liters',
+        field: 'liters',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('advanceTickets.lines'),
+        name: 'lines',
+        field: 'lines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.import'),
+        field: 'import',
+        name: 'import',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('advanceTickets.futureId'),
+        name: 'futureId',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'futureId',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('advanceTickets.futureIpt'),
+        name: 'futureIpt',
+        field: 'futureIpt',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            filterParamKey: 'futureIpt',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.futureState'),
+        name: 'futureState',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.futureLiters'),
+        name: 'futureLiters',
+        field: 'futureLiters',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.futureZone'),
+        name: 'futureZoneName',
+        field: 'futureZoneName',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            type: 'select',
+            filterValue: null,
+            filterParamKey: 'futureZoneFk',
+            event: getInputEvents,
+            attrs: {
+                options: zonesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.notMovableLines'),
+        name: 'notMovableLines',
+        field: 'notMovableLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.futureLines'),
+        name: 'futureLines',
+        field: 'futureLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('advanceTickets.futureImport'),
+        name: 'futureImport',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+]);
+
+const isLessThan50 = (totalWithVat) =>
+    parseInt(totalWithVat) > 0 && parseInt(totalWithVat) < 50;
+
+const totalPriceColor = (totalWithVat) =>
+    isLessThan50(totalWithVat) ? 'warning' : 'transparent';
+
+const getLanded = async (params) => {
+    try {
+        const query = `Agencies/getLanded`;
+        const { data } = await axios.get(query, { params });
+        if (!data) return;
+        return data;
+    } catch (error) {
+        notify(t('advanceTickets.noDeliveryZone'), 'negative');
+        console.error('Error getting landed', error);
+    }
+};
+
+const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
+    const query = `tickets/${ticket.futureId}/componentUpdate`;
+    if (!ticket.landed) {
+        const newLanded = await getLanded({
+            shipped: userParams.dateToAdvance,
+            addressFk: ticket.futureAddressFk,
+            agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
+            warehouseFk: ticket.futureWarehouseFk,
+        });
+
+        if (!newLanded) {
+            notify(t('advanceTickets.noDeliveryZone'), 'negative');
+            return;
+        }
+
+        ticket.landed = newLanded.landed;
+        ticket.zoneFk = newLanded.zoneFk;
+    }
+
+    const params = {
+        clientFk: ticket.futureClientFk,
+        nickname: ticket.nickname,
+        agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
+        addressFk: ticket.futureAddressFk,
+        zoneFk: ticket.zoneFk ?? ticket.futureZoneFk,
+        warehouseFk: ticket.futureWarehouseFk,
+        companyFk: ticket.futureCompanyFk,
+        shipped: userParams.dateToAdvance,
+        landed: ticket.landed,
+        isDeleted: false,
+        isWithoutNegatives,
+        newTicket: ticket.id ?? undefined,
+        keepPrice: true,
+    };
+
+    return { query, params };
+};
+
+const moveTicketsAdvance = async () => {
+    try {
+        let ticketsToMove = [];
+        for (const ticket of selectedTickets.value) {
+            if (!ticket.id) {
+                try {
+                    const { query, params } = await requestComponentUpdate(ticket, false);
+                    axios.post(query, params);
+                } catch (e) {
+                    console.error('Error moving ticket', e);
+                }
+                continue;
+            }
+            ticketsToMove.push({
+                originId: ticket.futureId,
+                destinationId: ticket.id,
+                originShipped: ticket.futureShipped,
+                destinationShipped: ticket.shipped,
+                workerFk: ticket.workerFk,
+            });
+        }
+
+        const params = { tickets: ticketsToMove };
+        await axios.post('Tickets/merge', params);
+        arrayData.fetch({ append: false });
+        if (ticketsToMove.length)
+            notify(t('advanceTickets.moveTicketSuccess'), 'positive');
+    } catch (error) {
+        console.error('Error moving tickets', error);
+    }
+};
+
+const progressLength = ref(0);
+const progressPercentage = computed(() => {
+    if (progressLength.value === 0 || selectedTickets.value.length === 0) return 0;
+    return progressLength.value / selectedTickets.value.length;
+});
+const splitErrors = ref([]);
+const showProgressDialog = ref(false);
+const cancelProgress = ref(false);
+
+const progressAdd = () => {
+    progressLength.value++;
+    if (progressLength.value === selectedTickets.value.length) {
+        notify(
+            t('moveTicketSuccess', {
+                ticketsNumber: progressLength.value - splitErrors.value.length,
+            }),
+            'positive'
+        );
+    }
+};
+
+const splitTickets = async () => {
+    try {
+        showProgressDialog.value = true;
+        for (const ticket of selectedTickets.value) {
+            if (cancelProgress.value) break;
+            try {
+                const { query, params } = await requestComponentUpdate(ticket, true);
+                await axios.post(query, params);
+                progressAdd(ticket.futureId);
+            } catch (error) {
+                splitErrors.value.push({
+                    id: ticket.futureId,
+                    reason: error.response?.data?.error?.message,
+                });
+                progressAdd(ticket.futureId);
+            }
+        }
+    } catch (error) {
+        console.error('Error splitting tickets', error);
+    } finally {
+        arrayData.fetch({ append: false });
+    }
+};
+
+const resetProgressData = () => {
+    if (cancelProgress.value) cancelProgress.value = false;
+    progressLength.value = 0;
+    splitErrors.value = [];
+    selectedTickets.value = [];
+};
+
+const handleCloseProgressDialog = () => {
+    showProgressDialog.value = false;
+    resetProgressData();
+};
+
+const handleCancelProgress = () => (cancelProgress.value = true);
+
+onMounted(async () => {
+    let today = Date.vnNew();
+    const tomorrow = new Date(today);
+    tomorrow.setDate(tomorrow.getDate() + 1);
+    userParams.dateFuture = tomorrow;
+    userParams.dateToAdvance = today;
+    userParams.warehouseFk = user.value.warehouseFk;
+    await arrayData.addFilter({ userParams });
+});
+</script>
+
+<template>
+    <FetchData
+        url="itemPackingTypes"
+        :filter="{
+            fields: ['code', 'description'],
+            order: 'description ASC',
+            where: { isActive: true },
+        }"
+        auto-load
+        @on-fetch="(data) => (itemPackingTypesOptions = data)"
+    />
+    <FetchData
+        url="Zones"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (zonesOptions = data)"
+    />
+    <VnSearchbar
+        data-key="WeeklyTickets"
+        :label="t('weeklyTickets.search')"
+        :info="t('weeklyTickets.searchInfo')"
+    />
+    <VnSubToolbar>
+        <template #st-data>
+            <QBtn
+                icon="keyboard_double_arrow_left"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedTickets.length"
+                @click.stop="
+                    openConfirmationModal(
+                        t('advanceTickets.advanceTicketTitle'),
+                        t(`advanceTickets.advanceTitleSubtitle`, {
+                            selectedTickets: selectedTickets.length,
+                        }),
+                        moveTicketsAdvance
+                    )
+                "
+            >
+                <QTooltip>
+                    {{ t('advanceTickets.advanceTickets') }}
+                </QTooltip>
+            </QBtn>
+            <QBtn
+                icon="vn:splitline"
+                color="primary"
+                :disable="!selectedTickets.length"
+                @click.stop="
+                    openConfirmationModal(
+                        t('advanceTickets.advanceWithoutNegativeTitle'),
+                        t(`advanceTickets.advanceWithoutNegativeSubtitle`, {
+                            selectedTickets: selectedTickets.length,
+                        }),
+                        splitTickets
+                    )
+                "
+            >
+                <QTooltip>
+                    {{ t('advanceTickets.advanceTicketsWithoutNegatives') }}
+                </QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="tickets"
+            :columns="ticketColumns"
+            row-key="index"
+            selection="multiple"
+            v-model:selected="selectedTickets"
+            :pagination="{ rowsPerPage: 0 }"
+            :no-data-label="t('globals.noResults')"
+            style="max-width: 99%"
+        >
+            <template #header="props">
+                <QTr :props="props">
+                    <QTh class="horizontal-separator" colspan="7" translate>
+                        {{ t('advanceTickets.origin') }}
+                        {{ toDateFormat(userParams.dateToAdvance) }}
+                    </QTh>
+                    <QTh class="horizontal-separator" colspan="9" translate>
+                        {{ t('advanceTickets.destination') }}
+                        {{ toDateFormat(userParams.dateFuture) }}
+                    </QTh>
+                </QTr>
+                <QTr>
+                    <QTh>
+                        <QCheckbox v-model="props.selected" />
+                    </QTh>
+                    <QTh
+                        v-for="(col, index) in ticketColumns"
+                        :key="index"
+                        :class="{ 'vertical-separator': col.name === 'futureId' }"
+                    >
+                        {{ col.label }}
+                    </QTh>
+                </QTr>
+            </template>
+            <template #top-row="{ cols }">
+                <QTr>
+                    <QTd />
+                    <QTd
+                        v-for="(col, index) in cols"
+                        :key="index"
+                        style="max-width: 100px"
+                    >
+                        <component
+                            :is="col.columnFilter.component"
+                            v-if="col.columnFilter"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
+            </template>
+            <template #header-cell-availableLines="{ col }">
+                <QTh class="vertical-separator">
+                    {{ col.label }}
+                </QTh>
+            </template>
+            <template #body-cell-icons="{ row }">
+                <QTd class="q-gutter-x-xs">
+                    <QIcon
+                        v-if="row.futureAgency !== row.agency && row.agency"
+                        color="primary"
+                        name="vn:agency-term"
+                        size="xs"
+                    >
+                        <QTooltip class="column">
+                            <span>
+                                {{
+                                    t('advanceTickets.originAgency', {
+                                        agency: row.futureAgency,
+                                    })
+                                }}
+                            </span>
+                            <span>
+                                {{
+                                    t('advanceTickets.destinationAgency', {
+                                        agency: row.agency,
+                                    })
+                                }}
+                            </span>
+                        </QTooltip>
+                    </QIcon>
+                </QTd>
+            </template>
+            <template #body-cell-ticketId="{ row }">
+                <QTd>
+                    <QBtn flat color="primary">
+                        {{ row.id }}
+                        <TicketDescriptorProxy :id="row.id" />
+                    </QBtn>
+                </QTd>
+            </template>
+            <template #body-cell-state="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.classColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.state }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-import="{ row }">
+                <QTd>
+                    <QBadge
+                        :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
+                        :color="totalPriceColor(row.totalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.totalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-futureId="{ row }">
+                <QTd class="vertical-separator">
+                    <QBtn flat color="primary" dense>
+                        {{ row.futureId }}
+                        <TicketDescriptorProxy :id="row.futureId" />
+                    </QBtn>
+                </QTd>
+            </template>
+            <template #body-cell-futureState="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.futureClassColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.futureState }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-futureImport="{ row }">
+                <QTd>
+                    <QBadge
+                        :text-color="
+                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
+                        "
+                        :color="totalPriceColor(row.futureTotalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.futureTotalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
+            </template>
+        </QTable>
+        <VnProgress
+            :progress="progressPercentage"
+            :cancelled="cancelProgress"
+            v-model:show-dialog="showProgressDialog"
+            @cancel="handleCancelProgress()"
+            @close="handleCloseProgressDialog()"
+        >
+            <div v-if="splitErrors.length" class="column">
+                <span>{{ t('advanceTickets.errorsList') }}:</span>
+                <span v-for="(error, index) in splitErrors" :key="index">
+                    {{ error.id }}: {{ error.reason }}
+                </span>
+            </div>
+        </VnProgress>
+    </QPage>
+</template>
+
+<style scoped lang="scss">
+.vertical-separator {
+    border-left: 4px solid white !important;
+}
+
+.horizontal-separator {
+    border-bottom: 4px solid white !important;
+}
+</style>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..8d761a128
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,28 @@
+advanceTickets:
+    origin: Origin
+    destination: Destination
+    originAgency: 'Origin agency: {agency}'
+    destinationAgency: 'Destination agency: {agency}'
+    ticketId: ID
+    ipt: IPT
+    state: State
+    liters: Liters
+    lines: Lines
+    import: Import
+    futureId: ID
+    futureIpt: IPT
+    futureState: State
+    futureLiters: Liters
+    futureZone: Zone
+    notMovableLines: Not movable
+    futureLines: Lines
+    futureImport: Import
+    advanceTickets: Advance tickets with negatives
+    advanceTicketTitle: Advance tickets
+    advanceTitleSubtitle: Advance confirmation
+    noDeliveryZone: No delivery zone available for this landing date
+    moveTicketSuccess: 'Tickets moved successfully! {ticketsNumber}'
+    advanceTicketsWithoutNegatives: Advance tickets without negatives
+    advanceWithoutNegativeTitle: Advance tickets (without negatives)
+    advanceWithoutNegativeSubtitle: Advance confirmation
+    errorsList: Errors list
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..6134258b2 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,30 @@
+advanceTickets:
+    origin: Origen
+    destination: Destino
+    originAgency: 'Agencia origen: {agency}'
+    destinationAgency: 'Agencia destino: {agency}'
+    ticketId: ID
+    ipt: IPT
+    state: Estado
+    liters: Litros
+    lines: Líneas
+    import: Importe
+    futureId: ID
+    futureIpt: IPT
+    futureState: Estado
+    futureLiters: Litros
+    futureZone: Zona
+    notMovableLines: No movibles
+    futureLines: Líneas
+    futureImport: Importe
+    advanceTickets: Adelantar tickets con negativos
+    advanceTicketTitle: Advance tickets
+    advanceTitleSubtitle: '¿Desea adelantar {selectedTickets} tickets?'
+    noDeliveryZone: No hay una zona de reparto disponible para la fecha de envío seleccionada
+    moveTicketSuccess: 'Tickets movidos correctamente {ticketsNumber}'
+    advanceTicketsWithoutNegatives: Adelantar tickets sin negativos
+    advanceWithoutNegativeTitle: Adelantar tickets (sin negativos)
+    advanceWithoutNegativeSubtitle: '¿Desea adelantar {selectedTickets} tickets?'
+    errorsList: Lista de errores
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..2562bdd08 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'TicketMain' },
     menus: {
-        main: ['TicketList'],
+        main: ['TicketList', 'TicketAdvance'],
         card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
     },
     children: [
@@ -40,6 +40,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },
+                {
+                    name: 'TicketAdvance',
+                    path: 'advance',
+                    meta: {
+                        title: 'ticketAdvance',
+                        icon: 'keyboard_double_arrow_left',
+                    },
+                    component: () => import('src/pages/Ticket/TicketAdvance.vue'),
+                },
             ],
         },
         {

From d488a2d52391e12f4d1f89ddfdf5a86ba6ab1b4f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 18 Jun 2024 11:50:15 -0300
Subject: [PATCH 34/72] small change

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

diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index 50b4c0451..022f1bb30 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -67,7 +67,7 @@ const applyColumnFilter = async (col) => {
     }
 };
 
-const getInputEvents = (col) => ({ 'update:modelValue': () => applyColumnFilter(col) });
+const getInputEvents = (col) => ({ 'keyup.enter': () => applyColumnFilter(col) });
 
 const columns = computed(() => [
     {

From de0ef06d926b01293350fe5a4ce76ad16307464e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 18 Jun 2024 19:28:05 -0300
Subject: [PATCH 35/72] remove console.log

---
 src/pages/Ticket/TicketWeekly.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index 022f1bb30..5dbc99d22 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -60,7 +60,6 @@ const applyColumnFilter = async (col) => {
     try {
         const paramKey = col.columnFilter?.filterParamKey || col.field;
         params[paramKey] = col.columnFilter.filterValue;
-        console.log('paramKey', paramKey, 'params', params);
         await paginateRef.value.addFilter(null, params);
     } catch (err) {
         console.error('Error applying column filter', err);

From b3a4dd3f799c340f73c5e81af8aff7742d5f8bc9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 08:16:20 -0300
Subject: [PATCH 36/72] Ticket purchase request

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 src/pages/Ticket/Card/TicketCard.vue          |  24 +-
 src/pages/Ticket/Card/TicketCreateRequest.vue |  69 +++++
 .../Ticket/Card/TicketPurchaseRequest.vue     | 261 ++++++++++++++++++
 src/pages/Ticket/locale/en.yml                |  14 +
 src/pages/Ticket/locale/es.yml                |  14 +
 src/router/modules/ticket.js                  |  12 +-
 8 files changed, 389 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketCreateRequest.vue
 create mode 100644 src/pages/Ticket/Card/TicketPurchaseRequest.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b3a85eefa..3ebf23b3c 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        purchaseRequest: Purchase request
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..620b67a0a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        purchaseRequest: Petición de compra
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 04363b506..ecea3aab2 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,17 +1,29 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketFilter from '../TicketFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const searchBarDataKeys = {
+    TicketSummary: 'TicketSummary',
+    TicketPurchaseRequest: 'TicketPurchaseRequest',
+};
 </script>
 <template>
     <VnCard
         data-key="Ticket"
-        base-url="Tickets"
-        :descriptor="TicketDescriptor"
         :filter-panel="TicketFilter"
-        search-data-key="TicketList"
-        search-url="Tickets/filter"
-        searchbar-label="Search ticket"
-        searchbar-info="You can search by ticket id or alias"
+        :descriptor="TicketDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="routeName"
+        :searchbar-label="t('card.search')"
+        :searchbar-info="t('card.searchInfo')"
     />
 </template>
diff --git a/src/pages/Ticket/Card/TicketCreateRequest.vue b/src/pages/Ticket/Card/TicketCreateRequest.vue
new file mode 100644
index 000000000..6b436621f
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketCreateRequest.vue
@@ -0,0 +1,69 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+
+const emit = defineEmits(['onRequestCreated']);
+
+const route = useRoute();
+const { t } = useI18n();
+
+const attendersOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
+        auto-load
+        @on-fetch="(data) => (attendersOptions = data)"
+    />
+    <FormModelPopup
+        :title="t('Create request')"
+        url-create="TicketRequests"
+        model="CreateTicketRequest"
+        :form-initial-data="{ ticketFk: route.params.id }"
+        @on-data-saved="() => emit('onRequestCreated')"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-model="data.description"
+                    :label="t('purchaseRequest.description')"
+                />
+                <VnSelect
+                    :label="t('purchaseRequest.atender')"
+                    v-model="data.attenderFk"
+                    :options="attendersOptions"
+                    hide-selected
+                    option-label="nickname"
+                    option-value="id"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-model="data.quantity"
+                    :label="t('purchaseRequest.quantity')"
+                    type="number"
+                    min="1"
+                />
+                <VnInput
+                    v-model="data.price"
+                    :label="t('purchaseRequest.price')"
+                    type="number"
+                    min="0"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create request: Crear petición de compra
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
new file mode 100644
index 000000000..387a5baf1
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -0,0 +1,261 @@
+<script setup>
+import { ref, computed, watch, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import CrudModel from 'src/components/CrudModel.vue';
+import TicketCreateRequest from './TicketCreateRequest.vue';
+
+import { dashIfEmpty } from 'src/filters';
+import { toDateFormat } from 'src/filters/date.js';
+
+const route = useRoute();
+const { t } = useI18n();
+const createTicketRequestDialogRef = ref(null);
+const crudModelRef = ref(null);
+
+watch(
+    () => route.params.id,
+    async (val) => {
+        crudModelFilter.where.ticketFk = val;
+        crudModelRef.value.reload();
+    }
+);
+
+const crudModelFilter = reactive({
+    include: [
+        {
+            relation: 'atender',
+            scope: {
+                include: {
+                    relation: 'user',
+                    scope: {
+                        fields: ['nickname'],
+                    },
+                },
+            },
+        },
+        {
+            relation: 'requester',
+            scope: {
+                include: {
+                    relation: 'user',
+                    scope: {
+                        fields: ['nickname'],
+                    },
+                },
+            },
+        },
+        {
+            relation: 'sale',
+        },
+    ],
+    fields: [
+        'id',
+        'description',
+        'created',
+        'requesterFk',
+        'attenderFk',
+        'quantity',
+        'price',
+        'saleFk',
+        'isOk',
+    ],
+    order: ['created ASC'],
+    where: {
+        ticketFk: route.params.id,
+    },
+});
+
+const columns = computed(() => [
+    {
+        label: t('purchaseRequest.id'),
+        name: 'id',
+        field: 'id',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('purchaseRequest.description'),
+        name: 'description',
+        field: 'description',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('purchaseRequest.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        format: (val) => toDateFormat(val),
+    },
+    {
+        label: t('purchaseRequest.requester'),
+        name: 'requester',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('purchaseRequest.atender'),
+        name: 'atender',
+        align: 'left',
+    },
+    {
+        label: t('purchaseRequest.quantity'),
+        name: 'quantity',
+        align: 'left',
+    },
+    {
+        label: t('purchaseRequest.price'),
+        name: 'price',
+        align: 'left',
+    },
+    {
+        label: t('purchaseRequest.saleFk'),
+        name: 'saleFk',
+        align: 'left',
+    },
+    {
+        label: t('purchaseRequest.state'),
+        name: 'state',
+        field: 'isOk',
+        align: 'left',
+        format: (val) => getRequestState(val),
+    },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
+]);
+
+const getRequestState = (state) => {
+    switch (state) {
+        case null:
+            return 'New';
+        case false:
+            return 'Denied';
+        case true:
+            return 'Acepted';
+    }
+};
+
+const isEditable = (isOk) => isOk !== null;
+
+const removeLine = async (row) => crudModelRef.value.remove([row]);
+
+const openCreateModal = () => createTicketRequestDialogRef.value.show();
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <CrudModel
+            data-key="PurchaseRequests"
+            url="TicketRequests"
+            ref="crudModelRef"
+            :filter="crudModelFilter"
+            :order="['created ASC']"
+            :default-remove="false"
+            :default-save="false"
+            :default-reset="false"
+            :limit="0"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :no-data-label="t('globals.noResults')"
+                    @row-click="(_, row) => redirectToTicketSummary(row.ticketFk)"
+                >
+                    <template #body-cell-description="{ row }">
+                        <QTd @click.stop>
+                            <VnInput
+                                v-model="row.description"
+                                @blur="crudModelRef.saveChanges()"
+                                :disable="isEditable(row.isOk)"
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-requester="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.requester?.user?.nickname }}
+                                <WorkerDescriptorProxy :id="row.requesterFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-atender="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.atender?.user?.nickname }}
+                                <WorkerDescriptorProxy :id="row.attenderFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-quantity="{ row }">
+                        <QTd @click.stop>
+                            <VnInput
+                                v-model="row.quantity"
+                                @blur="crudModelRef.saveChanges()"
+                                :disable="isEditable(row.isOk)"
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-price="{ row }">
+                        <QTd @click.stop>
+                            <VnInput
+                                v-model="row.price"
+                                @blur="crudModelRef.saveChanges()"
+                                :disable="isEditable(row.isOk)"
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-saleFk="{ row }">
+                        <QTd @click.stop>
+                            <QBtn v-if="row.saleFk" flat color="primary">
+                                {{ row.requester?.user?.nickname }}
+                                <ItemDescriptorProxy :id="row.sale.itemFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-actions="{ row }">
+                        <QTd>
+                            <QIcon
+                                @click.stop="removeLine(row)"
+                                class="q-ml-sm cursor-pointer"
+                                color="primary"
+                                name="delete"
+                                size="sm"
+                            >
+                                <QTooltip>
+                                    {{ t('globals.delete') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </CrudModel>
+        <QDialog
+            ref="createTicketRequestDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <TicketCreateRequest @on-request-created="crudModelRef.reload()" />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn @click="openCreateModal()" color="primary" fab icon="add" />
+            <QTooltip class="text-no-wrap">
+                {{ t('purchaseRequest.newRequest') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..5930e3487
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,14 @@
+card:
+    search: Search tickets
+    searchInfo: You can search by ticket id or alias
+purchaseRequest:
+    id: Id
+    description: Description
+    created: Created
+    requester: Requester
+    atender: Atender
+    quantity: Quantity
+    price: Price
+    saleFk: Item id
+    state: State
+    newRequest: New request
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..80d32b4a5 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,16 @@
+card:
+    search: Buscar tickets
+    searchInfo: Buscar tickets por identificador o alias
+purchaseRequest:
+    Id: Id
+    description: Descripción
+    created: Fecha creación
+    requester: Solicitante
+    atender: Comprador
+    quantity: Cantidad
+    price: Precio
+    saleFk: Id artículo
+    state: Estado
+    newRequest: Crear petición
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..584fb9dc5 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketPurchaseRequest'],
     },
     children: [
         {
@@ -93,6 +93,16 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'request',
+                    name: 'TicketPurchaseRequest',
+                    meta: {
+                        title: 'purchaseRequest',
+                        icon: 'vn:buyrequest',
+                    },
+                    component: () =>
+                        import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
+                },
             ],
         },
     ],

From d63d3a9c773af90d2947e9bb3c94770a188a7b73 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 10:24:56 -0300
Subject: [PATCH 37/72] small change

---
 src/pages/Ticket/TicketFuture.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 6c635b98a..cfd05ed6c 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -459,7 +459,11 @@ onMounted(async () => {
             <template #body-cell-import="{ row }">
                 <QTd>
                     <QBadge
-                        text-color="black"
+                        :text-color="
+                            totalPriceColor(row.totalWithVat) === 'warning'
+                                ? 'black'
+                                : 'white'
+                        "
                         :color="totalPriceColor(row.totalWithVat)"
                         class="q-ma-none"
                         dense

From 45cf4498d387214d5b37126455ed456d7d962dd2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 19:46:27 -0300
Subject: [PATCH 38/72] Cancel button change

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

diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue
index e788dd20b..cfd948d5f 100644
--- a/src/components/common/VnProgressModal.vue
+++ b/src/components/common/VnProgressModal.vue
@@ -76,7 +76,7 @@ const cancel = () => {
             </QCardSection>
             <QCardActions align="right">
                 <QBtn
-                    v-if="!cancelled"
+                    v-if="!cancelled && progress < 1"
                     type="button"
                     flat
                     class="text-primary"

From 22bf0b459852c4cffe41bd7b8dda39a18f49aaff Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 20:38:23 -0300
Subject: [PATCH 39/72] Search bar changes

---
 src/pages/Ticket/TicketFuture.vue | 6 +++---
 src/pages/Ticket/locale/en.yml    | 1 +
 src/pages/Ticket/locale/es.yml    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index cfd05ed6c..2efa87909 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -278,9 +278,9 @@ onMounted(async () => {
         @on-fetch="(data) => (itemPackingTypesOptions = data)"
     />
     <VnSearchbar
-        data-key="WeeklyTickets"
-        :label="t('weeklyTickets.search')"
-        :info="t('weeklyTickets.searchInfo')"
+        data-key="FutureTickets"
+        :label="t('Search ticket')"
+        :info="t('futureTickets.searchInfo')"
     />
     <VnSubToolbar>
         <template #st-data>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 16089a3cb..9e9f1c7ad 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -23,3 +23,4 @@ futureTickets:
     moveTicketTitle: Move tickets
     moveTicketDialogSubtitle: 'Do you want to move {selectedTickets} tickets to the future?'
     moveTicketSuccess: Tickets moved successfully!
+    searchInfo: Search future tickets by date
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 906522b21..23a8dd345 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -23,5 +23,6 @@ futureTickets:
     moveTicketTitle: Mover tickets
     moveTicketDialogSubtitle: '¿Desea mover {selectedTickets} tickets hacia el futuro?'
     moveTicketSuccess: Tickets movidos correctamente
-Search ticket: Buscar ticket
+    searchInfo: Buscar tickets por fecha
+Search ticket: Buscar tickets
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From 4e7c09fa44fa60ff29bf3647711979e33bfb455e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 20:40:27 -0300
Subject: [PATCH 40/72] Add tooltip to button

---
 src/pages/Ticket/TicketFuture.vue | 6 +++++-
 src/pages/Ticket/locale/en.yml    | 1 +
 src/pages/Ticket/locale/es.yml    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 2efa87909..b33b3095b 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -297,7 +297,11 @@ onMounted(async () => {
                         moveTicketsFuture
                     )
                 "
-            />
+            >
+                <QTooltip>
+                    {{ t('futureTickets.futureTicket') }}
+                </QTooltip>
+            </QBtn>
         </template>
     </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 9e9f1c7ad..380a9bc71 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -24,3 +24,4 @@ futureTickets:
     moveTicketDialogSubtitle: 'Do you want to move {selectedTickets} tickets to the future?'
     moveTicketSuccess: Tickets moved successfully!
     searchInfo: Search future tickets by date
+    futureTicket: Future tickets
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 23a8dd345..d7301cde4 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -24,5 +24,6 @@ futureTickets:
     moveTicketDialogSubtitle: '¿Desea mover {selectedTickets} tickets hacia el futuro?'
     moveTicketSuccess: Tickets movidos correctamente
     searchInfo: Buscar tickets por fecha
+    futureTicket: Tickets a futuro
 Search ticket: Buscar tickets
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From 79c606fc7059c51c911d96348a7a5de96000fcb9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 20:43:21 -0300
Subject: [PATCH 41/72] Add checkbox

---
 src/pages/Ticket/TicketFuture.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index b33b3095b..5ec00a4cf 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -315,7 +315,7 @@ onMounted(async () => {
             :no-data-label="t('globals.noResults')"
             style="max-width: 99%"
         >
-            <template #header>
+            <template #header="props">
                 <QTr>
                     <QTh class="horizontal-separator" />
                     <QTh class="horizontal-separator" colspan="8" translate>
@@ -326,7 +326,9 @@ onMounted(async () => {
                     </QTh>
                 </QTr>
                 <QTr>
-                    <QTh />
+                    <QTh>
+                        <QCheckbox v-model="props.selected" />
+                    </QTh>
                     <QTh
                         v-for="(col, index) in ticketColumns"
                         :key="index"

From b6ec10994ae48a687198bf9d824bdcfa7bd7d699 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 20:45:08 -0300
Subject: [PATCH 42/72] Change header titles style

---
 src/pages/Ticket/TicketFuture.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 5ec00a4cf..c22ffd3bb 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -318,10 +318,18 @@ onMounted(async () => {
             <template #header="props">
                 <QTr>
                     <QTh class="horizontal-separator" />
-                    <QTh class="horizontal-separator" colspan="8" translate>
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="8"
+                        translate
+                    >
                         {{ t('futureTickets.origin') }}
                     </QTh>
-                    <QTh class="horizontal-separator" colspan="4" translate>
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="4"
+                        translate
+                    >
                         {{ t('futureTickets.destination') }}
                     </QTh>
                 </QTr>

From 6cd8a478fa39d39243e99efd191e386b666328e7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 20:58:31 -0300
Subject: [PATCH 43/72] Clean selectedTickets after moving tickets

---
 src/pages/Ticket/TicketFuture.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index c22ffd3bb..4db32de75 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -256,6 +256,7 @@ const moveTicketsFuture = async () => {
         let params = { tickets: ticketsToMove };
         await axios.post('Tickets/merge', params);
         notify(t('futureTickets.moveTicketSuccess'), 'positive');
+        selectedTickets.value = [];
         arrayData.fetch({ append: false });
     } catch (error) {
         console.error('Error moving tickets to future', error);

From 0ba415c0ea852cd9a2b3bd63f580149c81e6c167 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 20 Jun 2024 07:57:39 -0300
Subject: [PATCH 44/72] small changes

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

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index fc323cbae..59a9e448b 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -377,6 +377,7 @@ const moveTicketsAdvance = async () => {
         const params = { tickets: ticketsToMove };
         await axios.post('Tickets/merge', params);
         arrayData.fetch({ append: false });
+        selectedTickets.value = [];
         if (ticketsToMove.length)
             notify(t('advanceTickets.moveTicketSuccess'), 'positive');
     } catch (error) {
@@ -533,11 +534,19 @@ onMounted(async () => {
         >
             <template #header="props">
                 <QTr :props="props">
-                    <QTh class="horizontal-separator" colspan="7" translate>
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="7"
+                        translate
+                    >
                         {{ t('advanceTickets.origin') }}
                         {{ toDateFormat(userParams.dateToAdvance) }}
                     </QTh>
-                    <QTh class="horizontal-separator" colspan="9" translate>
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="9"
+                        translate
+                    >
                         {{ t('advanceTickets.destination') }}
                         {{ toDateFormat(userParams.dateFuture) }}
                     </QTh>

From 9f1dd4d74d7e89d890fce2be00cc385a49c78fb9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 20 Jun 2024 09:41:53 -0300
Subject: [PATCH 45/72] WIP

---
 src/pages/Ticket/Card/TicketBasicData.vue | 47 ++++++++++++++++++++++-
 src/pages/Ticket/locale/en.yml            |  4 ++
 src/pages/Ticket/locale/es.yml            |  4 ++
 src/router/modules/ticket.js              |  2 +-
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/pages/Ticket/Card/TicketBasicData.vue b/src/pages/Ticket/Card/TicketBasicData.vue
index 0c9a8b042..70382d0fb 100644
--- a/src/pages/Ticket/Card/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/TicketBasicData.vue
@@ -1,3 +1,48 @@
+<script setup>
+import { ref } from 'vue';
+
+const stepperRef = ref(null);
+const step = ref(1);
+</script>
 <template>
-    <QCard>Basic Data</QCard>
+    <QStepper v-model="step" ref="stepperRef" color="primary" header-nav animated>
+        <QStep
+            :name="1"
+            title="Select campaign settings"
+            icon="settings"
+            :error="step < 3"
+            :done="step > 1"
+        >
+            For each ad campaign that you create, you can control how much you're willing
+            to spend on clicks and conversions, which networks and geographical locations
+            you want your ads to show on, and more.
+        </QStep>
+        <QStep
+            :name="2"
+            title="Create an ad group"
+            caption="Optional"
+            icon="create_new_folder"
+            :done="step > 2"
+        >
+            An ad group contains one or more ads which target a shared set of keywords.
+        </QStep>
+
+        <template #navigation>
+            <QStepperNavigation>
+                <QBtn
+                    @click="stepperRef.next()"
+                    color="primary"
+                    :label="step === 3 ? 'Finish' : 'Continue'"
+                />
+                <QBtn
+                    v-if="step > 1"
+                    flat
+                    color="primary"
+                    @click="stepperRef.previous()"
+                    label="Back"
+                    class="q-ml-sm"
+                />
+            </QStepperNavigation>
+        </template>
+    </QStepper>
 </template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..4016973cc
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,4 @@
+basicData:
+    next: Next
+    back: Back
+    finalize: Finalize
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..da7c45cc0 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,6 @@
+basicData:
+    next: Siguiente
+    back: Anterior
+    finalize: Finalizar
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..3c60f40ab 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+        card: ['TicketBasicData', 'TicketBoxing', 'TicketSms', 'TicketSale'],
     },
     children: [
         {

From 633b13b07668366436b4cf66ba9c53c39303f7da Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 20 Jun 2024 16:51:07 -0300
Subject: [PATCH 46/72] Basic data form

---
 src/components/FormModel.vue              |   2 +-
 src/pages/Ticket/Card/TicketBasicData.vue | 522 +++++++++++++++++++++-
 src/pages/Ticket/locale/en.yml            |  13 +
 src/pages/Ticket/locale/es.yml            |  13 +
 4 files changed, 528 insertions(+), 22 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 336ea281e..11542ed65 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -246,7 +246,7 @@ function updateAndEmit(evt, val, res) {
     emit(evt, state.get(modelValue), res);
 }
 
-defineExpose({ save, isLoading, hasChanges });
+defineExpose({ save, isLoading, hasChanges, formData });
 </script>
 <template>
     <div class="column items-center full-width">
diff --git a/src/pages/Ticket/Card/TicketBasicData.vue b/src/pages/Ticket/Card/TicketBasicData.vue
index 70382d0fb..e4bf52a94 100644
--- a/src/pages/Ticket/Card/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/TicketBasicData.vue
@@ -1,29 +1,508 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
 
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+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';
+import { toTimeFormat } from 'filters/date.js';
+
+const { notify } = useNotify();
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
 const stepperRef = ref(null);
+const formModelRef = ref(null);
+const agencyFetchRef = ref(null);
+const zonesFetchRef = ref(null);
+
+const filter = {
+    include: [
+        { relation: 'address' },
+        {
+            relation: 'client',
+            scope: {
+                fields: [
+                    'salesPersonFk',
+                    'name',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                    'credit',
+                    'email',
+                    'phone',
+                    'mobile',
+                    'hasElectronicInvoice',
+                ],
+                include: {
+                    relation: 'salesPersonUser',
+                    scope: { fields: ['id', 'name'] },
+                },
+            },
+        },
+        { relation: 'invoiceOut' },
+    ],
+};
+
 const step = ref(1);
+const clientsOptions = ref([]);
+const warehousesOptions = ref([]);
+const companiesOptions = ref([]);
+const agenciesOptions = ref([]);
+const zonesOptions = ref([]);
+const addresses = ref([]);
+
+const agencyByWarehouseFilter = computed(() => ({
+    fields: ['id', 'name'],
+    order: 'name ASC',
+    where: {
+        warehouseFk: warehouseId.value,
+    },
+}));
+
+const zonesFilter = computed(() => ({
+    fields: ['id', 'name'],
+    order: 'name ASC',
+    where: formModelRef.value?.formData?.agencyModeFk
+        ? {
+              shipped: formModelRef.value?.formData?.shipped,
+              addressFk: formModelRef.value?.formData?.addressFk,
+              agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
+              warehouseFk: formModelRef.value?.formData?.warehouseFk,
+          }
+        : {},
+}));
+
+const getLanded = async (params) => {
+    try {
+        const validParams =
+            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
+        if (!validParams) {
+            // this.$q.resolve(); ???????
+            return;
+        }
+        formModelRef.value.formData.zoneFk = null;
+        const { data } = await axios.get(`Agencies/getLanded`, { params });
+        if (data) {
+            formModelRef.value.formData.zoneFk = data.zoneFk;
+            formModelRef.value.formData.landed = data.landed;
+            formModelRef.value.formData.shipped = params.shipped;
+        }
+    } catch (error) {
+        console.error(error);
+        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+    }
+};
+
+const getShipped = async (params) => {
+    try {
+        const validParams =
+            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
+        if (!validParams) return;
+
+        formModelRef.value.formData.zoneFk = null;
+        const { data } = await axios.get(`Agencies/getShipped`, { params });
+        if (data) {
+            formModelRef.value.formData.zoneFk = data.zoneFk;
+            formModelRef.value.formData.landed = params.landed;
+            formModelRef.value.formData.shipped = data.shipped;
+        } else {
+            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+        }
+    } catch (error) {
+        console.error(error);
+        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+    }
+};
+
+const onChangeZone = async (zoneId) => {
+    try {
+        formModelRef.value.formData.agencyModeFk = null;
+        const { data } = await axios.get(`Zones/${zoneId}`);
+        formModelRef.value.formData.agencyModeFk = data.agencyModeFk;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const onChangeAddress = async (addressId) => {
+    try {
+        formModelRef.value.formData.nickname = null;
+        const { data } = await axios.get(`Addresses/${addressId}`);
+        formModelRef.value.formData.nickname = data.nickname;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getClientDefaultAddress = async (clientId) => {
+    try {
+        const { data } = await axios.get(`Clients/${clientId}`);
+        if (data) addressId.value = data.defaultAddressFk;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clientAddressesList = async (value) => {
+    let filter = {
+        include: [
+            {
+                relation: 'province',
+                scope: {
+                    fields: ['name'],
+                },
+            },
+            {
+                relation: 'agencyMode',
+                scope: {
+                    fields: ['name'],
+                },
+            },
+        ],
+    };
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get(`Clients/${value}/addresses`, { params });
+    if (data) addresses.value = data;
+};
+
+const addressId = computed({
+    get: () => formModelRef.value?.formData?.addressFk,
+    set: (val) => {
+        if (val != formModelRef.value?.formData?.addressFk) {
+            formModelRef.value.formData.addressFk = val;
+            onChangeAddress(val);
+            getShipped({
+                landed: formModelRef.value?.formData?.landed,
+                addressFk: val,
+                agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
+                warehouseFk: formModelRef.value?.formData?.warehouseFk,
+            });
+        }
+    },
+});
+
+const clientId = computed({
+    get: () => formModelRef.value?.formData?.clientFk,
+    set: (val) => {
+        formModelRef.value.formData.clientFk = val;
+        formModelRef.value.formData.addressFk = null;
+        if (!val) return;
+        getClientDefaultAddress(val);
+        clientAddressesList(val);
+    },
+});
+
+const landed = computed({
+    get: () => formModelRef.value?.formData?.landed,
+    set: (val) => {
+        formModelRef.value.formData.landed = val;
+        getShipped({
+            landed: val,
+            addressFk: formModelRef.value?.formData?.addressFk,
+            agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
+            warehouseFk: formModelRef.value?.formData?.warehouseFk,
+        });
+    },
+});
+
+const agencyModeId = computed({
+    get: () => formModelRef.value?.formData?.agencyModeFk,
+    set: (val) => {
+        if (val != formModelRef.value?.formData?.agencyModeFk) {
+            formModelRef.value.formData.agencyModeFk = val;
+            if (!val) return;
+            const agencyMode = agenciesOptions.value.find((a) => a.id == val);
+            formModelRef.value.formData.warehouseFk = agencyMode.warehouseFk;
+
+            getLanded({
+                shipped: formModelRef.value?.formData?.shipped,
+                addressFk: formModelRef.value?.formData?.addressFk,
+                agencyModeFk: val,
+                warehouseFk: formModelRef.value?.formData?.warehouseFk,
+            });
+        }
+    },
+});
+
+const zoneId = computed({
+    get: () => formModelRef.value?.formData?.zoneFk,
+    set: (val) => {
+        if (val != formModelRef.value.formData.zoneFk) {
+            formModelRef.value.formData.zoneFk = val;
+            onChangeZone(val);
+        }
+    },
+});
+
+const warehouseId = computed({
+    get: () => formModelRef.value?.formData?.warehouseFk,
+    set: (val) => {
+        if (val != formModelRef.value.formData.warehouseFk) {
+            formModelRef.value.formData.warehouseFk = val;
+            getShipped({
+                landed: formModelRef.value.formData.landed,
+                addressFk: formModelRef.value.formData.addressFk,
+                agencyModeFk: formModelRef.value.formData.agencyModeFk,
+                warehouseFk: val,
+            }).then(() => {
+                if (zoneId.value == null) formModelRef.value.formData.agencyModeFk = null;
+            });
+        }
+    },
+});
+
+const shipped = computed({
+    get: () => formModelRef.value?.formData?.shipped,
+    set: (val) => {
+        if (
+            new Date(formModelRef.value?.formData?.shipped).toDateString() !=
+            val.toDateString()
+        )
+            val.setHours(0, 0, 0, 0);
+        formModelRef.value.formData.shipped = val;
+        getLanded({
+            shipped: val,
+            addressFk: formModelRef.value?.formData?.addressFk,
+            agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
+            warehouseFk: formModelRef.value?.formData?.warehouseFk,
+        });
+    },
+});
+
+const onFormModelInit = () => {
+    if (formModelRef.value.formData.clientFk)
+        clientAddressesList(formModelRef.value.formData.clientFk);
+};
+
+const redirectToCustomerAddress = () => {
+    router.push({
+        name: 'CustomerAddressEditCard',
+        params: { id: clientId.value, addressId: addressId.value },
+    });
+};
 </script>
 <template>
-    <QStepper v-model="step" ref="stepperRef" color="primary" header-nav animated>
-        <QStep
-            :name="1"
-            title="Select campaign settings"
-            icon="settings"
-            :error="step < 3"
-            :done="step > 1"
-        >
-            For each ad campaign that you create, you can control how much you're willing
-            to spend on clicks and conversions, which networks and geographical locations
-            you want your ads to show on, and more.
+    <FetchData
+        url="Clients"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id',
+        }"
+        @on-fetch="(data) => (clientsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        :filter="{
+            fields: ['id', 'code'],
+            order: 'code ASC',
+        }"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="agencyFetchRef"
+        url="AgencyModes/byWarehouse"
+        :filter="agencyByWarehouseFilter"
+        @on-fetch="(data) => (agenciesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="zonesFetchRef"
+        url="Zones/includingExpired"
+        :filter="zonesFilter"
+        @on-fetch="(data) => (zonesOptions = data)"
+        auto-load
+    />
+    <QStepper
+        v-model="step"
+        ref="stepperRef"
+        color="primary"
+        header-nav
+        animated
+        keep-alive
+    >
+        <QStep :name="1" title="Select campaign settings" :done="step > 1">
+            <FormModel
+                ref="formModelRef"
+                :url="`Tickets/${route.params.id}`"
+                :url-update="`Tickets/${route.params.id}`"
+                :filter="filter"
+                model="Ticket"
+                auto-load
+                :default-actions="false"
+                @on-fetch="onFormModelInit()"
+            >
+                <template #form="{ data }">
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <VnSelect
+                            :label="t('basicData.client')"
+                            v-model="clientId"
+                            option-value="id"
+                            option-label="name"
+                            :options="clientsOptions"
+                            hide-selected
+                            map-options
+                            :required="true"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel
+                                            >#{{ scope.opt?.id }}
+                                            {{ scope.opt?.name }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                        <VnSelect
+                            :label="t('basicData.warehouse')"
+                            v-model="warehouseId"
+                            option-value="id"
+                            option-label="name"
+                            :options="warehousesOptions"
+                            hide-selected
+                            map-options
+                            :required="true"
+                        />
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <VnSelect
+                            :label="t('basicData.address')"
+                            v-model="addressId"
+                            option-value="id"
+                            option-label="nickname"
+                            :options="addresses"
+                            hide-selected
+                            map-options
+                            :required="true"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel
+                                            :class="{
+                                                'color-vn-label': !scope.opt?.isActive,
+                                            }"
+                                        >
+                                            {{
+                                                `${
+                                                    !scope.opt?.isActive
+                                                        ? t('basicData.inactive')
+                                                        : ''
+                                                } `
+                                            }}
+                                            <span> {{ scope.opt?.nickname }}</span>
+                                            <span
+                                                v-if="
+                                                    scope.opt?.province ||
+                                                    scope.opt?.city ||
+                                                    scope.opt?.street
+                                                "
+                                                >, {{ scope.opt?.street }},
+                                                {{ scope.opt?.city }},
+                                                {{ scope.opt?.province?.name }} -
+                                                {{ scope.opt?.agencyMode?.name }}</span
+                                            >
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                            <template #append>
+                                <QIcon
+                                    name="edit"
+                                    color="primary"
+                                    size="sm"
+                                    class="fill-icon cursor-pointer"
+                                    @click.stop="redirectToCustomerAddress()"
+                                >
+                                    <QTooltip>{{ t('basicData.editAddress') }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </VnSelect>
+                        <VnInput :label="t('basicData.alias')" v-model="data.nickname" />
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <VnSelect
+                            :label="t('basicData.company')"
+                            v-model="data.companyFk"
+                            option-value="id"
+                            option-label="code"
+                            :options="companiesOptions"
+                            hide-selected
+                            map-options
+                            :required="true"
+                        />
+                        <VnSelect
+                            :label="t('basicData.agency')"
+                            v-model="agencyModeId"
+                            option-value="id"
+                            option-label="name"
+                            :options="agenciesOptions"
+                            hide-selected
+                            map-options
+                            :required="true"
+                            @focus="agencyFetchRef.fetch()"
+                        />
+                        <VnSelect
+                            :label="t('basicData.zone')"
+                            v-model="zoneId"
+                            option-value="id"
+                            option-label="name"
+                            :options="zonesOptions"
+                            hide-selected
+                            map-options
+                            :required="true"
+                            @focus="zonesFetchRef.fetch()"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel
+                                            >{{ scope.opt?.name }} - Max.
+                                            {{ toTimeFormat(scope.opt?.hour) }}
+                                            h.</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <VnInputDate
+                            :label="t('basicData.shipped')"
+                            v-model="data.shipped"
+                            :required="true"
+                        />
+                        <VnInputTime
+                            :label="t('basicData.shippedHour')"
+                            v-model="data.shipped"
+                        />
+                        <VnInputDate
+                            :label="t('basicData.landed')"
+                            v-model="data.landed"
+                            :required="true"
+                        />
+                    </VnRow>
+                </template>
+            </FormModel>
         </QStep>
-        <QStep
-            :name="2"
-            title="Create an ad group"
-            caption="Optional"
-            icon="create_new_folder"
-            :done="step > 2"
-        >
+        <QStep :name="2" title="Create an ad group" caption="Optional">
             An ad group contains one or more ads which target a shared set of keywords.
         </QStep>
 
@@ -32,17 +511,18 @@ const step = ref(1);
                 <QBtn
                     @click="stepperRef.next()"
                     color="primary"
-                    :label="step === 3 ? 'Finish' : 'Continue'"
+                    :label="step === 2 ? t('basicData.finalize') : t('basicData.next')"
                 />
                 <QBtn
                     v-if="step > 1"
                     flat
                     color="primary"
                     @click="stepperRef.previous()"
-                    label="Back"
+                    :label="t('basicData.back')"
                     class="q-ml-sm"
                 />
             </QStepperNavigation>
         </template>
     </QStepper>
+    <pre v-if="formModelRef">{{ formModelRef.formData }}</pre>
 </template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 4016973cc..643421ad4 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -2,3 +2,16 @@ basicData:
     next: Next
     back: Back
     finalize: Finalize
+    client: Client
+    warehouse: Warehouse
+    address: Address
+    inactive: (Inactive)
+    noDeliveryZoneAvailable: No delivery zone available for this landing date
+    editAddress: Edit address
+    alias: Alias
+    company: Company
+    agency: Agency
+    zone: Zone
+    shipped: Shipped
+    landed: Landed
+    shippedHour: Shipped hour
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index da7c45cc0..913d1935d 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -2,5 +2,18 @@ basicData:
     next: Siguiente
     back: Anterior
     finalize: Finalizar
+    client: Cliente
+    warehouse: Almacén
+    address: Consignatario
+    inactive: (Inactivo)
+    noDeliveryZoneAvailable: No hay una zona de reparto disponible para la fecha de envío seleccionada
+    editAddress: Editar dirección
+    alias: Alias
+    company: Empresa
+    agency: Agencia
+    zone: Zona
+    shipped: F. Envío
+    landed: F. Entrega
+    shippedHour: Hora de envío
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From 0faa663169ae459a514a45188413f2b631ad86b4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 21 Jun 2024 00:03:26 +0200
Subject: [PATCH 47/72] fix: comments

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

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 59a9e448b..8d73ccd9e 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -502,7 +502,7 @@ onMounted(async () => {
                 </QTooltip>
             </QBtn>
             <QBtn
-                icon="vn:splitline"
+                icon="alt_route"
                 color="primary"
                 :disable="!selectedTickets.length"
                 @click.stop="
@@ -539,7 +539,7 @@ onMounted(async () => {
                         colspan="7"
                         translate
                     >
-                        {{ t('advanceTickets.origin') }}
+                        {{ t('advanceTickets.destination') }}
                         {{ toDateFormat(userParams.dateToAdvance) }}
                     </QTh>
                     <QTh
@@ -547,7 +547,7 @@ onMounted(async () => {
                         colspan="9"
                         translate
                     >
-                        {{ t('advanceTickets.destination') }}
+                        {{ t('advanceTickets.origin') }}
                         {{ toDateFormat(userParams.dateFuture) }}
                     </QTh>
                 </QTr>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 8d761a128..9f7d96d4d 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -18,11 +18,11 @@ advanceTickets:
     futureLines: Lines
     futureImport: Import
     advanceTickets: Advance tickets with negatives
-    advanceTicketTitle: Advance tickets
-    advanceTitleSubtitle: Advance confirmation
+    advanceTicketTitle: Advance {selectedTickets} tickets
+    advanceTitleSubtitle: Advance {selectedTickets} tickets confirmation
     noDeliveryZone: No delivery zone available for this landing date
     moveTicketSuccess: 'Tickets moved successfully! {ticketsNumber}'
     advanceTicketsWithoutNegatives: Advance tickets without negatives
     advanceWithoutNegativeTitle: Advance tickets (without negatives)
-    advanceWithoutNegativeSubtitle: Advance confirmation
+    advanceWithoutNegativeSubtitle: Advance {selectedTickets} tickets confirmation
     errorsList: Errors list
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 6134258b2..bbb9220a1 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,6 +1,6 @@
 advanceTickets:
     origin: Origen
-    destination: Destino
+    destination: Destinatario
     originAgency: 'Agencia origen: {agency}'
     destinationAgency: 'Agencia destino: {agency}'
     ticketId: ID

From 159b386d2c05b8ad8c0d23a9381b726d6535ebe6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 21 Jun 2024 00:07:26 +0200
Subject: [PATCH 48/72] fix: comment 4

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

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 8d73ccd9e..8b0a426dd 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -398,7 +398,7 @@ const progressAdd = () => {
     progressLength.value++;
     if (progressLength.value === selectedTickets.value.length) {
         notify(
-            t('moveTicketSuccess', {
+            t('advanceTickets.moveTicketSuccess', {
                 ticketsNumber: progressLength.value - splitErrors.value.length,
             }),
             'positive'

From f41161a28e4be6a982a6a6c57ac3bd3050076da8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 21 Jun 2024 07:24:23 +0200
Subject: [PATCH 49/72] refactor: refs #6977 use VnImg

---
 src/components/UserPanel.vue                  |  7 ++-----
 src/components/ui/VnImg.vue                   |  9 ++++++---
 src/pages/Account/Card/AccountDescriptor.vue  | 12 ++++--------
 src/pages/Claim/Card/ClaimBasicData.vue       | 13 ++++++++-----
 src/pages/Customer/Card/CustomerBasicData.vue | 11 +++++------
 src/pages/Entry/EntryLatestBuys.vue           | 16 +++++-----------
 src/pages/Item/Card/ItemDescriptor.vue        | 10 ----------
 src/pages/Item/ItemList.vue                   | 11 ++++-------
 src/pages/Wagon/WagonCounter.vue              | 14 ++------------
 src/pages/Worker/Card/WorkerDescriptor.vue    | 12 +++---------
 10 files changed, 39 insertions(+), 76 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 691d3db8f..9c3b456b1 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -11,6 +11,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const state = useState();
 const session = useSession();
@@ -47,7 +48,6 @@ const darkMode = computed({
 });
 
 const user = state.getUser();
-const token = session.getTokenMultimedia();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
@@ -149,10 +149,7 @@ function saveUserData(param, value) {
 
             <div class="col column items-center q-mb-sm">
                 <QAvatar size="80px">
-                    <QImg
-                        :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                        spinner-color="white"
-                    />
+                    <VnImg :id="user.id" collection="user" size="160x160" />
                 </QAvatar>
 
                 <div class="text-subtitle1 q-mt-md">
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 37072a69e..3996e9ddc 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -3,10 +3,14 @@ import { ref, computed, onMounted } from 'vue';
 import { useSession } from 'src/composables/useSession';
 
 const $props = defineProps({
-    collection: {
+    storage: {
         type: [String, Number],
         default: 'Images',
     },
+    collection: {
+        type: String,
+        default: 'catalog',
+    },
     size: {
         type: String,
         default: '200x200',
@@ -26,9 +30,8 @@ const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
 const url = computed(
     () =>
-        `/api/${$props.collection}/catalog/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+        `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
 );
-const emits = defineEmits(['refresh']);
 const reload = (emit = false) => {
     timeStamp.value = `timestamp=${Date.now()}`;
 };
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 2ff8afa33..ddc7c077f 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -6,8 +6,8 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
-import { useSession } from 'src/composables/useSession';
 import FetchData from 'src/components/FetchData.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const $props = defineProps({
     id: {
@@ -19,7 +19,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -31,10 +30,6 @@ const filter = {
     fields: ['id', 'nickname', 'name', 'role'],
     include: { relation: 'role', scope: { fields: ['id', 'name'] } },
 };
-function getAccountAvatar() {
-    const token = getTokenMultimedia();
-    return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
-}
 const hasAccount = ref(false);
 </script>
 
@@ -72,7 +67,8 @@ const hasAccount = ref(false);
             <AccountDescriptorMenu :has-account="hasAccount" />
         </template>
         <template #before>
-            <QImg :src="getAccountAvatar()" class="photo">
+            <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
+            <VnImg :id="entityId" collection="user" size="160x160" class="photo">
                 <template #error>
                     <div
                         class="absolute-full picture text-center q-pa-md flex flex-center"
@@ -87,7 +83,7 @@ const hasAccount = ref(false);
                         </div>
                     </div>
                 </template>
-            </QImg>
+            </VnImg>
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('account.card.nickname')" :value="entity.nickname" />
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 50c9502d2..f1f6ada22 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -10,12 +10,13 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 import axios from 'axios';
-import { useSession } from 'src/composables/useSession';
+// import { useSession } from 'src/composables/useSession';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
+// const { getTokenMultimedia } = useSession();
+// const token = getTokenMultimedia();
 
 const claimFilter = {
     fields: [
@@ -118,9 +119,11 @@ const statesFilter = {
                 >
                     <template #before>
                         <QAvatar color="orange">
-                            <QImg
+                            <VnImg
                                 v-if="data.workerFk"
-                                :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
+                                :size="'160x160'"
+                                :id="data.workerFk"
+                                collection="user"
                                 spinner-color="white"
                             />
                         </QAvatar>
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index b0c2d60e3..805795522 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -3,16 +3,14 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import { useSession } from 'src/composables/useSession';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 
 const workers = ref([]);
 const workersCopy = ref([]);
@@ -143,10 +141,11 @@ const filterOptions = {
                 >
                     <template #prepend>
                         <QAvatar color="orange">
-                            <QImg
-                                :src="`/api/Images/user/160x160/${data.salesPersonFk}/download?access_token=${token}`"
-                                spinner-color="white"
+                            <VnImg
                                 v-if="data.salesPersonFk"
+                                :id="user.id"
+                                collection="user"
+                                spinner-color="white"
                             />
                         </QAvatar>
                     </template>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 291b828c9..5da3309d8 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -16,14 +16,15 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
-import { useSession } from 'composables/useSession';
+// import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const router = useRouter();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
+// const { getTokenMultimedia } = useSession();
+// const token = getTokenMultimedia();
 const stateStore = useStateStore();
 const { t } = useI18n();
 
@@ -695,14 +696,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-picture="{ row }">
                 <QTd>
-                    <QImg
-                        :src="`/api/Images/catalog/50x50/${row.itemFk}/download?access_token=${token}`"
-                        spinner-color="primary"
-                        :ratio="1"
-                        height="50px"
-                        width="50px"
-                        class="image"
-                    />
+                    <VnImg :id="row.itemFk" size="50x50" class="image" />
                 </QTd>
             </template>
             <template #body-cell-itemFk="{ row }">
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 155c9eb4c..f3eba8c82 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -13,7 +13,6 @@ import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 
 import { useState } from 'src/composables/useState';
 import useCardDescription from 'src/composables/useCardDescription';
-import { useSession } from 'src/composables/useSession';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
@@ -42,14 +41,12 @@ const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();
 const state = useState();
 const user = state.getUser();
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const image = ref(null);
 const regularizeStockFormDialog = ref(null);
 const item = ref(null);
 const available = ref(null);
@@ -67,17 +64,10 @@ const warehouseFk = computed({
 });
 
 onMounted(async () => {
-    await getItemAvatar();
     warehouseFk.value = user.value.warehouseFk;
     salixUrl.value = await getUrl('');
 });
 
-const getItemAvatar = async () => {
-    const token = getTokenMultimedia();
-    const timeStamp = `timestamp=${Date.now()}`;
-    image.value = `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}&${timeStamp}`;
-};
-
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 0e40740b9..f1e3629cd 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -16,17 +16,15 @@ import ItemListFilter from './ItemListFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDateFormat } from 'src/filters/date.js';
-import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const router = useRouter();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -491,10 +489,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </template>
                     <template #body-cell-picture="{ row }">
                         <QTd>
-                            <QImg
-                                :src="`/api/Images/catalog/50x50/${row.id}/download?access_token=${token}`"
-                                spinner-color="primary"
-                                :ratio="1"
+                            <VnImg
+                                size="50x50"
+                                :id="row.id"
                                 height="50px"
                                 width="50px"
                                 class="image"
diff --git a/src/pages/Wagon/WagonCounter.vue b/src/pages/Wagon/WagonCounter.vue
index 15a1ab7ba..70bbc9803 100644
--- a/src/pages/Wagon/WagonCounter.vue
+++ b/src/pages/Wagon/WagonCounter.vue
@@ -1,14 +1,12 @@
 <script setup>
 import { ref, onMounted } from 'vue';
-import { useSession } from 'src/composables/useSession';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const quasar = useQuasar();
 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 
 const counters = ref({
     alquilerBandeja: { count: 0, id: 96001, title: 'CC Bandeja', isTray: true },
@@ -35,10 +33,6 @@ onMounted(() => {
     }
 });
 
-function getUrl(id) {
-    return `/api/Images/catalog/200x200/${id}/download?access_token=${token}`;
-}
-
 async function handleEvent(type, action, amount) {
     const counter = counters.value[type].count;
     let isOk = true;
@@ -70,11 +64,7 @@ function confirm() {
     <QList class="row q-mx-auto q-mt-xl">
         <QItem v-for="(props, name) in counters" :key="name" class="col-6">
             <QItemSection>
-                <QImg
-                    :src="getUrl(props.id)"
-                    width="130px"
-                    @click="handleEvent(name, 'add')"
-                />
+                <VnImg :id="props.id" width="130px" @click="handleEvent(name, 'add')" />
                 <p class="title">{{ props.title }}</p>
             </QItemSection>
             <QItemSection class="q-ma-none">
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 86c846aca..6739b3356 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -2,7 +2,6 @@
 import { computed, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useSession } from 'src/composables/useSession';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@@ -10,6 +9,7 @@ import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePassword
 import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const $props = defineProps({
     id: {
@@ -25,7 +25,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();
 const state = useState();
 const user = state.getUser();
 const changePasswordFormDialog = ref(null);
@@ -73,11 +72,6 @@ watch(
     }
 );
 
-function getWorkerAvatar() {
-    const token = getTokenMultimedia();
-    return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
-}
-
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
@@ -155,7 +149,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
             </QItem>
         </template>
         <template #before>
-            <QImg :src="getWorkerAvatar()" class="photo">
+            <VnImg :id="entityId" collection="user" size="160x160" class="photo">
                 <template #error>
                     <div
                         class="absolute-full picture text-center q-pa-md flex flex-center"
@@ -170,7 +164,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                         </div>
                     </div>
                 </template>
-            </QImg>
+            </VnImg>
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('worker.card.name')" :value="entity.user?.nickname" />

From 5cf183607de779f485d50258e15aa3c592ef27d0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 21 Jun 2024 09:20:03 -0300
Subject: [PATCH 50/72] WIP

---
 .../Ticket/Card/BasicData/BasicDataTable.vue  | 245 ++++++++++++++++++
 .../Card/BasicData/TicketBasicDataForm.vue    |   0
 .../TicketBasicDataView.vue}                  |  46 +++-
 src/pages/Ticket/locale/en.yml                |  17 ++
 src/pages/Ticket/locale/es.yml                |  17 ++
 src/router/modules/ticket.js                  |   3 +-
 6 files changed, 323 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/Ticket/Card/BasicData/BasicDataTable.vue
 create mode 100644 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
 rename src/pages/Ticket/Card/{TicketBasicData.vue => BasicData/TicketBasicDataView.vue} (93%)

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
new file mode 100644
index 000000000..37c51fadf
--- /dev/null
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -0,0 +1,245 @@
+<script setup>
+import { ref, computed, onMounted, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import FetchData from 'components/FetchData.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency } from 'filters/index';
+import { useRole } from 'src/composables/useRole';
+
+const $props = defineProps({
+    ticketData: {
+        type: Object,
+        required: true,
+    },
+});
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { hasAny } = useRole();
+const { openConfirmationModal } = useVnConfirm();
+
+const _ticketData = ref($props.ticketData);
+const ticketUpdateActions = ref(null);
+const haveNegatives = ref(false);
+const rows = computed(() => _ticketData.value?.sale?.items || []);
+
+const columns = computed(() => [
+    {
+        label: t('basicData.item'),
+        name: 'item',
+        align: 'left',
+        format: (val) => val.name,
+    },
+    {
+        label: t('basicData.description'),
+        name: 'description',
+        align: 'left',
+    },
+    {
+        label: t('basicData.movable'),
+        name: 'movable',
+        align: 'left',
+    },
+    {
+        label: t('basicData.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+    },
+    {
+        label: t('basicData.pricePPU'),
+        name: 'price',
+        field: 'price',
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        label: t('basicData.newPricePPU'),
+        name: 'newPrice',
+        field: (row) => row.component.newPrice,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        label: t('basicData.difference'),
+        name: 'difference',
+        field: (row) => row.component.difference,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+]);
+
+const loadDefaultTicketAction = () => {
+    const isSalesAssistant = hasAny(['salesAssistant']);
+    _ticketData.value.option = isSalesAssistant ? 'mana' : 'renewPrices';
+};
+
+const totalPrice = computed(() => {
+    return rows.value.reduce((acc, item) => acc + item.price * item.quantity, 0);
+});
+
+const totalNewPrice = computed(() => {
+    return rows.value.reduce(
+        (acc, item) => acc + item.component.newPrice * item.quantity,
+        0
+    );
+});
+
+const totalDifference = computed(() => {
+    return rows.value.reduce(
+        (acc, item) => acc + item.component.difference * item.quantity,
+        0
+    );
+});
+
+const ticketHaveNegatives = () => {
+    let _haveNegatives = false;
+    let haveNotNegatives = false;
+    _ticketData.value.withoutNegatives = false;
+    const haveDifferences = _ticketData.value.sale.haveDifferences;
+
+    _ticketData.value.sale.items.forEach((item) => {
+        if (item.quantity > item.movable) _haveNegatives = true;
+        else haveNotNegatives = true;
+    });
+
+    haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences;
+    if (haveNegatives.value) _ticketData.value.withoutNegatives = true;
+};
+
+onMounted(() => {
+    stateStore.rightDrawer = true;
+    loadDefaultTicketAction();
+    ticketHaveNegatives();
+    console.log('ticketData: ', _ticketData.value);
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="TicketUpdateActions"
+        @on-fetch="(data) => (ticketUpdateActions = data)"
+        auto-load
+    />
+    <RightMenu>
+        <template #right-panel>
+            <QCard
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('basicData.total') }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.price') }}:
+                        {{ toCurrency(totalPrice) }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
+                    </span>
+                </QCardSection>
+            </QCard>
+            <QCard
+                v-if="totalDifference"
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('basicData.chargeDifference') }}
+                    </span>
+                </QCardSection>
+                <QCardSection
+                    v-for="(action, index) in ticketUpdateActions"
+                    :key="index"
+                    horizontal
+                >
+                    <QRadio
+                        v-model="_ticketData.option"
+                        :val="action.code"
+                        :label="action.description"
+                        dense
+                    />
+                </QCardSection>
+            </QCard>
+            <QCard
+                v-if="haveNegatives"
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal class="flex row items-center">
+                    <QCheckbox
+                        :label="t('basicData.withoutNegatives')"
+                        v-model="_ticketData.withoutNegatives"
+                        :toggle-indeterminate="false"
+                    />
+                    <QIcon name="info" size="xs" class="q-ml-sm">
+                        <QTooltip max-width="350px">
+                            {{ t('basicData.withoutNegativesInfo') }}
+                        </QTooltip>
+                    </QIcon>
+                </QCardSection>
+            </QCard>
+        </template>
+    </RightMenu>
+    <QTable
+        :rows="rows"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell-item="{ row }">
+            <QTd>
+                <QBtn flat color="primary">
+                    {{ row.itemFk }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd>
+                <div class="column">
+                    <span>{{ row.item.name }}</span>
+                    <span class="color-vn-label">{{ row.item.subName }}</span>
+                    <FetchedTags :item="row.item" :max-length="6" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-movable="{ row }">
+            <QTd>
+                <QBadge
+                    v-if="row.haveDifferences"
+                    :text-color="row.quantity > row.movable ? 'black' : 'white'"
+                    :color="row.quantity > row.movable ? 'negative' : 'transparent'"
+                    :label="row.movable"
+                />
+            </QTd>
+        </template>
+    </QTable>
+</template>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/pages/Ticket/Card/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
similarity index 93%
rename from src/pages/Ticket/Card/TicketBasicData.vue
rename to src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index e4bf52a94..bba90a35a 100644
--- a/src/pages/Ticket/Card/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -10,6 +10,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
+import BasicDataTable from './BasicDataTable.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -289,6 +290,43 @@ const redirectToCustomerAddress = () => {
         params: { id: clientId.value, addressId: addressId.value },
     });
 };
+
+const isFormInvalid = (formData) => {
+    return (
+        !formData.clientFk ||
+        !formData.addressFk ||
+        !formData.agencyModeFk ||
+        !formData.companyFk ||
+        !formData.shipped ||
+        !formData.landed ||
+        !formData.zoneFk
+    );
+};
+
+const onNextStep = async () => {
+    if (step.value === 1) {
+        const formData = formModelRef.value.formData;
+        if (isFormInvalid(formData))
+            return notify(t('basicData.someFieldsAreInvalid'), 'negative');
+
+        if (!formData.sale || formModelRef.value.hasChanges) {
+            const params = {
+                landed: formData.landed,
+                addressId: formData.addressFk,
+                agencyModeId: formData.agencyModeFk,
+                zoneId: formData.zoneFk,
+                warehouseId: formData.warehouseFk,
+                shipped: formData.shipped,
+            };
+            const { data } = await axios.post(
+                `tickets/${formData.id}/priceDifference`,
+                params
+            );
+            formData.sale = data;
+            stepperRef.value.next();
+        }
+    }
+};
 </script>
 <template>
     <FetchData
@@ -336,7 +374,7 @@ const redirectToCustomerAddress = () => {
         animated
         keep-alive
     >
-        <QStep :name="1" title="Select campaign settings" :done="step > 1">
+        <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
             <FormModel
                 ref="formModelRef"
                 :url="`Tickets/${route.params.id}`"
@@ -502,14 +540,14 @@ const redirectToCustomerAddress = () => {
                 </template>
             </FormModel>
         </QStep>
-        <QStep :name="2" title="Create an ad group" caption="Optional">
-            An ad group contains one or more ads which target a shared set of keywords.
+        <QStep :name="2" :title="t('basicData.priceDifference')">
+            <BasicDataTable :ticket-data="formModelRef.formData" />
         </QStep>
 
         <template #navigation>
             <QStepperNavigation>
                 <QBtn
-                    @click="stepperRef.next()"
+                    @click="onNextStep()"
                     color="primary"
                     :label="step === 2 ? t('basicData.finalize') : t('basicData.next')"
                 />
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 643421ad4..6fe813a2a 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -15,3 +15,20 @@ basicData:
     shipped: Shipped
     landed: Landed
     shippedHour: Shipped hour
+    priceDifference: Price difference
+    someFieldsAreInvalid: Some fields are invalid
+    item: Item
+    description: Description
+    movable: Movable
+    quantity: Quantity
+    pricePPU: Price (PPU)
+    newPricePPU: New (PPU)
+    difference: Difference
+    total: Total
+    price: Price
+    newPrice: New price
+    chargeDifference: Charge difference to
+    withoutNegatives: Create without negatives
+    withoutNegativesInfo: Clone this ticket with the changes and only sales availables
+    negativesConfirmTitle: Edit basic data
+    negativesConfirmMessage: Negatives are going to be generated, are you sure you want to advance all the lines?
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 913d1935d..8f9394a2e 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -15,5 +15,22 @@ basicData:
     shipped: F. Envío
     landed: F. Entrega
     shippedHour: Hora de envío
+    priceDifference: Diferencia de precio
+    someFieldsAreInvalid: Algunos campos no son válidos
+    item: Artículo
+    description: Descripción
+    movable: Movible
+    quantity: Cantidad
+    pricePPU: Precio (Ud.)
+    newPricePPU: Nuevo (Ud.)
+    difference: Diferencia
+    total: Total
+    price: Precio
+    newPrice: Nuevo precio
+    chargeDifference: Cargar diferencia a
+    withoutNegatives: Crear sin negativos
+    withoutNegativesInfo: Clonar este ticket con los cambios y solo ventas disponibles
+    negativesConfirmTitle: Editar datos básicos
+    negativesConfirmMessage: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 3c60f40ab..351ca5baa 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -64,7 +64,8 @@ export default {
                         title: 'basicData',
                         icon: 'vn:settings',
                     },
-                    component: () => import('src/pages/Ticket/Card/TicketBasicData.vue'),
+                    component: () =>
+                        import('src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue'),
                 },
                 {
                     name: 'TicketSale',

From dfb67f6f2b872cbf87b976d229d7e6dda8b69118 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 21 Jun 2024 16:51:29 -0300
Subject: [PATCH 51/72] refactor

---
 .../Ticket/Card/BasicData/BasicDataTable.vue  |  29 +-
 .../Card/BasicData/TicketBasicDataForm.vue    | 463 ++++++++++++++
 .../Card/BasicData/TicketBasicDataView.vue    | 586 ++++--------------
 src/pages/Ticket/locale/en.yml                |   2 +
 src/pages/Ticket/locale/es.yml                |   2 +
 5 files changed, 595 insertions(+), 487 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
index 37c51fadf..b7eed5fa8 100644
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -1,34 +1,47 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
-import { useVnConfirm } from 'composables/useVnConfirm';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toCurrency } from 'filters/index';
 import { useRole } from 'src/composables/useRole';
 
 const $props = defineProps({
-    ticketData: {
+    formData: {
         type: Object,
         required: true,
     },
+    haveNegatives: {
+        type: Boolean,
+        required: true,
+        default: false,
+    },
 });
 
+const emit = defineEmits(['updateForm', 'update:haveNegatives']);
+
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { hasAny } = useRole();
-const { openConfirmationModal } = useVnConfirm();
 
-const _ticketData = ref($props.ticketData);
+const _ticketData = ref($props.formData);
 const ticketUpdateActions = ref(null);
-const haveNegatives = ref(false);
+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)
+);
+
 const columns = computed(() => [
     {
         label: t('basicData.item'),
@@ -103,7 +116,6 @@ const ticketHaveNegatives = () => {
     let haveNotNegatives = false;
     _ticketData.value.withoutNegatives = false;
     const haveDifferences = _ticketData.value.sale.haveDifferences;
-
     _ticketData.value.sale.items.forEach((item) => {
         if (item.quantity > item.movable) _haveNegatives = true;
         else haveNotNegatives = true;
@@ -117,7 +129,6 @@ onMounted(() => {
     stateStore.rightDrawer = true;
     loadDefaultTicketAction();
     ticketHaveNegatives();
-    console.log('ticketData: ', _ticketData.value);
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -234,7 +245,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #body-cell-movable="{ row }">
             <QTd>
                 <QBadge
-                    v-if="row.haveDifferences"
+                    v-if="_ticketData?.sale?.haveDifferences"
                     :text-color="row.quantity > row.movable ? 'black' : 'white'"
                     :color="row.quantity > row.movable ? 'negative' : 'transparent'"
                     :label="row.movable"
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index e69de29bb..2412fad5c 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -0,0 +1,463 @@
+<script setup>
+import { ref, computed, onMounted, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+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';
+import { toTimeFormat } from 'filters/date.js';
+
+const $props = defineProps({
+    formData: {
+        type: Object,
+        required: true,
+        default: () => ({}),
+    },
+});
+
+const emit = defineEmits(['updateForm']);
+
+const { notify } = useNotify();
+const router = useRouter();
+const { t } = useI18n();
+const agencyFetchRef = ref(null);
+const zonesFetchRef = ref(null);
+
+const clientsOptions = ref([]);
+const warehousesOptions = ref([]);
+const companiesOptions = ref([]);
+const agenciesOptions = ref([]);
+const zonesOptions = ref([]);
+const addresses = ref([]);
+const _formData = ref($props.formData);
+
+watch(
+    () => _formData.value,
+    (val) => emit('updateForm', val)
+);
+
+const agencyByWarehouseFilter = computed(() => ({
+    fields: ['id', 'name'],
+    order: 'name ASC',
+    where: {
+        warehouseFk: warehouseId.value,
+    },
+}));
+
+const zonesFilter = computed(() => ({
+    fields: ['id', 'name'],
+    order: 'name ASC',
+    where: _formData.value?.agencyModeFk
+        ? {
+              shipped: _formData.value?.shipped,
+              addressFk: _formData.value?.addressFk,
+              agencyModeFk: _formData.value?.agencyModeFk,
+              warehouseFk: _formData.value?.warehouseFk,
+          }
+        : {},
+}));
+
+const getLanded = async (params) => {
+    try {
+        const validParams =
+            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
+        if (!validParams) return;
+
+        _formData.value.zoneFk = null;
+        zonesOptions.value = [];
+        const { data } = await axios.get(`Agencies/getLanded`, { params });
+        if (data) {
+            _formData.value.zoneFk = data.zoneFk;
+            _formData.value.landed = data.landed;
+            _formData.value.shipped = params.shipped;
+        }
+    } catch (error) {
+        console.error(error);
+        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+    }
+};
+
+const getShipped = async (params) => {
+    try {
+        const validParams =
+            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
+        if (!validParams) return;
+
+        _formData.value.zoneFk = null;
+        zonesOptions.value = [];
+        const { data } = await axios.get(`Agencies/getShipped`, { params });
+        if (data) {
+            _formData.value.zoneFk = data.zoneFk;
+            _formData.value.landed = params.landed;
+            _formData.value.shipped = data.shipped;
+        } else {
+            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+        }
+    } catch (error) {
+        console.error(error);
+        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+    }
+};
+
+const onChangeZone = async (zoneId) => {
+    try {
+        _formData.value.agencyModeFk = null;
+        const { data } = await axios.get(`Zones/${zoneId}`);
+        _formData.value.agencyModeFk = data.agencyModeFk;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const onChangeAddress = async (addressId) => {
+    try {
+        _formData.value.nickname = null;
+        const { data } = await axios.get(`Addresses/${addressId}`);
+        _formData.value.nickname = data.nickname;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getClientDefaultAddress = async (clientId) => {
+    try {
+        const { data } = await axios.get(`Clients/${clientId}`);
+        if (data) addressId.value = data.defaultAddressFk;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clientAddressesList = async (value) => {
+    let filter = {
+        include: [
+            {
+                relation: 'province',
+                scope: {
+                    fields: ['name'],
+                },
+            },
+            {
+                relation: 'agencyMode',
+                scope: {
+                    fields: ['name'],
+                },
+            },
+        ],
+    };
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get(`Clients/${value}/addresses`, { params });
+    if (data) addresses.value = data;
+};
+
+const addressId = computed({
+    get: () => _formData.value?.addressFk,
+    set: (val) => {
+        if (val != _formData.value?.addressFk) {
+            _formData.value.addressFk = val;
+            onChangeAddress(val);
+            getShipped({
+                landed: _formData.value?.landed,
+                addressFk: val,
+                agencyModeFk: _formData.value?.agencyModeFk,
+                warehouseFk: _formData.value?.warehouseFk,
+            });
+        }
+    },
+});
+
+const clientId = computed({
+    get: () => _formData.value?.clientFk,
+    set: (val) => {
+        _formData.value.clientFk = val;
+        _formData.value.addressFk = null;
+        if (!val) return;
+        getClientDefaultAddress(val);
+        clientAddressesList(val);
+    },
+});
+
+const landed = computed({
+    get: () => _formData.value?.landed,
+    set: (val) => {
+        _formData.value.landed = val;
+        getShipped({
+            landed: val,
+            addressFk: _formData.value?.addressFk,
+            agencyModeFk: _formData.value?.agencyModeFk,
+            warehouseFk: _formData.value?.warehouseFk,
+        });
+    },
+});
+
+const agencyModeId = computed({
+    get: () => _formData.value.agencyModeFk,
+    set: (val) => {
+        if (val != _formData.value.agencyModeFk) {
+            _formData.value.agencyModeFk = val;
+            if (!val) return;
+            const agencyMode = agenciesOptions.value.find((a) => a.id == val);
+            _formData.value.warehouseFk = agencyMode.warehouseFk;
+
+            getLanded({
+                shipped: _formData.value?.shipped,
+                addressFk: _formData.value?.addressFk,
+                agencyModeFk: val,
+                warehouseFk: _formData.value?.warehouseFk,
+            });
+        }
+    },
+});
+
+const zoneId = computed({
+    get: () => _formData.value?.zoneFk,
+    set: (val) => {
+        if (val != _formData.value?.zoneFk) {
+            _formData.value.zoneFk = val;
+            onChangeZone(val);
+        }
+    },
+});
+
+const warehouseId = computed({
+    get: () => _formData.value?.warehouseFk,
+    set: (val) => {
+        if (val != _formData.value?.warehouseFk) {
+            _formData.value.warehouseFk = val;
+            getShipped({
+                landed: _formData.value?.landed,
+                addressFk: _formData.value?.addressFk,
+                agencyModeFk: _formData.value?.agencyModeFk,
+                warehouseFk: val,
+            }).then(() => {
+                if (zoneId.value == null) _formData.value.agencyModeFk = null;
+            });
+        }
+    },
+});
+
+const shipped = computed({
+    get: () => _formData.value?.shipped,
+    set: (val) => {
+        if (new Date(_formData.value?.shipped).toDateString() != val.toDateString())
+            val.setHours(0, 0, 0, 0);
+        _formData.value.shipped = val;
+        getLanded({
+            shipped: val,
+            addressFk: _formData.value?.addressFk,
+            agencyModeFk: _formData.value?.agencyModeFk,
+            warehouseFk: _formData.value?.warehouseFk,
+        });
+    },
+});
+
+const onFormModelInit = () => {
+    if (_formData.value?.clientFk) clientAddressesList(_formData.value?.clientFk);
+};
+
+const redirectToCustomerAddress = () => {
+    router.push({
+        name: 'CustomerAddressEditCard',
+        params: { id: clientId.value, addressId: addressId.value },
+    });
+};
+
+onMounted(() => onFormModelInit());
+</script>
+<template>
+    <FetchData
+        url="Clients"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id',
+        }"
+        @on-fetch="(data) => (clientsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        :filter="{
+            fields: ['id', 'code'],
+            order: 'code ASC',
+        }"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="agencyFetchRef"
+        url="AgencyModes/byWarehouse"
+        :filter="agencyByWarehouseFilter"
+        @on-fetch="(data) => (agenciesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="zonesFetchRef"
+        url="Zones/includingExpired"
+        :filter="zonesFilter"
+        @on-fetch="(data) => (zonesOptions = data)"
+        auto-load
+    />
+    <QForm>
+        <VnRow class="row q-gutter-md q-mb-md">
+            <VnSelect
+                :label="t('basicData.client')"
+                v-model="clientId"
+                option-value="id"
+                option-label="name"
+                :options="clientsOptions"
+                hide-selected
+                map-options
+                :required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel
+                                >#{{ scope.opt?.id }} {{ scope.opt?.name }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                :label="t('basicData.warehouse')"
+                v-model="warehouseId"
+                option-value="id"
+                option-label="name"
+                :options="warehousesOptions"
+                hide-selected
+                map-options
+                :required="true"
+            />
+        </VnRow>
+        <VnRow class="row q-gutter-md q-mb-md">
+            <VnSelect
+                :label="t('basicData.address')"
+                v-model="addressId"
+                option-value="id"
+                option-label="nickname"
+                :options="addresses"
+                hide-selected
+                map-options
+                :required="true"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel
+                                :class="{
+                                    'color-vn-label': !scope.opt?.isActive,
+                                }"
+                            >
+                                {{
+                                    `${
+                                        !scope.opt?.isActive
+                                            ? t('basicData.inactive')
+                                            : ''
+                                    } `
+                                }}
+                                <span> {{ scope.opt?.nickname }}</span>
+                                <span
+                                    v-if="
+                                        scope.opt?.province ||
+                                        scope.opt?.city ||
+                                        scope.opt?.street
+                                    "
+                                    >, {{ scope.opt?.street }}, {{ scope.opt?.city }},
+                                    {{ scope.opt?.province?.name }} -
+                                    {{ scope.opt?.agencyMode?.name }}</span
+                                >
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+                <template #append>
+                    <QIcon
+                        name="edit"
+                        color="primary"
+                        size="sm"
+                        class="fill-icon cursor-pointer"
+                        @click.stop="redirectToCustomerAddress()"
+                    >
+                        <QTooltip>{{ t('basicData.editAddress') }}</QTooltip>
+                    </QIcon>
+                </template>
+            </VnSelect>
+            <VnInput :label="t('basicData.alias')" v-model="_formData.nickname" />
+        </VnRow>
+        <VnRow class="row q-gutter-md q-mb-md no-wrap">
+            <VnSelect
+                :label="t('basicData.company')"
+                v-model="_formData.companyFk"
+                option-value="id"
+                option-label="code"
+                :options="companiesOptions"
+                hide-selected
+                map-options
+                :required="true"
+            />
+            <VnSelect
+                :label="t('basicData.agency')"
+                v-model="agencyModeId"
+                option-value="id"
+                option-label="name"
+                :options="agenciesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                @focus="agencyFetchRef.fetch()"
+            />
+            <VnSelect
+                :label="t('basicData.zone')"
+                v-model="zoneId"
+                option-value="id"
+                option-label="name"
+                :options="zonesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                @focus="zonesFetchRef.fetch()"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel
+                                >{{ scope.opt?.name }} - Max.
+                                {{ toTimeFormat(scope.opt?.hour) }}
+                                h.</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+        </VnRow>
+        <VnRow class="row q-gutter-md q-mb-md">
+            <VnInputDate
+                :label="t('basicData.shipped')"
+                v-model="_formData.shipped"
+                :required="true"
+            />
+            <VnInputTime
+                :label="t('basicData.shippedHour')"
+                v-model="_formData.shipped"
+            />
+            <VnInputDate
+                :label="t('basicData.landed')"
+                v-model="_formData.landed"
+                :required="true"
+            />
+        </VnRow>
+    </QForm>
+</template>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index bba90a35a..e8ed8bc0f 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -1,31 +1,28 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-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 BasicDataTable from './BasicDataTable.vue';
+import TicketBasicDataForm from './TicketBasicDataForm.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { toTimeFormat } from 'filters/date.js';
 
 const { notify } = useNotify();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
 const stepperRef = ref(null);
-const formModelRef = ref(null);
-const agencyFetchRef = ref(null);
-const zonesFetchRef = ref(null);
+const { openConfirmationModal } = useVnConfirm();
 
-const filter = {
+const step = ref(1);
+const formData = ref({});
+const initialDataLoaded = ref(false);
+const haveNegatives = ref(false);
+
+const ticketFilter = {
     include: [
         { relation: 'address' },
         {
@@ -53,319 +50,108 @@ const filter = {
     ],
 };
 
-const step = ref(1);
-const clientsOptions = ref([]);
-const warehousesOptions = ref([]);
-const companiesOptions = ref([]);
-const agenciesOptions = ref([]);
-const zonesOptions = ref([]);
-const addresses = ref([]);
-
-const agencyByWarehouseFilter = computed(() => ({
-    fields: ['id', 'name'],
-    order: 'name ASC',
-    where: {
-        warehouseFk: warehouseId.value,
-    },
-}));
-
-const zonesFilter = computed(() => ({
-    fields: ['id', 'name'],
-    order: 'name ASC',
-    where: formModelRef.value?.formData?.agencyModeFk
-        ? {
-              shipped: formModelRef.value?.formData?.shipped,
-              addressFk: formModelRef.value?.formData?.addressFk,
-              agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
-              warehouseFk: formModelRef.value?.formData?.warehouseFk,
-          }
-        : {},
-}));
-
-const getLanded = async (params) => {
-    try {
-        const validParams =
-            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) {
-            // this.$q.resolve(); ???????
-            return;
-        }
-        formModelRef.value.formData.zoneFk = null;
-        const { data } = await axios.get(`Agencies/getLanded`, { params });
-        if (data) {
-            formModelRef.value.formData.zoneFk = data.zoneFk;
-            formModelRef.value.formData.landed = data.landed;
-            formModelRef.value.formData.shipped = params.shipped;
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-    }
+const getTicketData = async () => {
+    const params = { filter: JSON.stringify(ticketFilter) };
+    const { data } = await axios.get(`tickets/${route.params.id}`, { params });
+    formData.value = data;
+    initialDataLoaded.value = true;
 };
 
-const getShipped = async (params) => {
-    try {
-        const validParams =
-            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
-
-        formModelRef.value.formData.zoneFk = null;
-        const { data } = await axios.get(`Agencies/getShipped`, { params });
-        if (data) {
-            formModelRef.value.formData.zoneFk = data.zoneFk;
-            formModelRef.value.formData.landed = params.landed;
-            formModelRef.value.formData.shipped = data.shipped;
-        } else {
-            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-    }
-};
-
-const onChangeZone = async (zoneId) => {
-    try {
-        formModelRef.value.formData.agencyModeFk = null;
-        const { data } = await axios.get(`Zones/${zoneId}`);
-        formModelRef.value.formData.agencyModeFk = data.agencyModeFk;
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-const onChangeAddress = async (addressId) => {
-    try {
-        formModelRef.value.formData.nickname = null;
-        const { data } = await axios.get(`Addresses/${addressId}`);
-        formModelRef.value.formData.nickname = data.nickname;
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-const getClientDefaultAddress = async (clientId) => {
-    try {
-        const { data } = await axios.get(`Clients/${clientId}`);
-        if (data) addressId.value = data.defaultAddressFk;
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-const clientAddressesList = async (value) => {
-    let filter = {
-        include: [
-            {
-                relation: 'province',
-                scope: {
-                    fields: ['name'],
-                },
-            },
-            {
-                relation: 'agencyMode',
-                scope: {
-                    fields: ['name'],
-                },
-            },
-        ],
-    };
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(`Clients/${value}/addresses`, { params });
-    if (data) addresses.value = data;
-};
-
-const addressId = computed({
-    get: () => formModelRef.value?.formData?.addressFk,
-    set: (val) => {
-        if (val != formModelRef.value?.formData?.addressFk) {
-            formModelRef.value.formData.addressFk = val;
-            onChangeAddress(val);
-            getShipped({
-                landed: formModelRef.value?.formData?.landed,
-                addressFk: val,
-                agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
-                warehouseFk: formModelRef.value?.formData?.warehouseFk,
-            });
-        }
-    },
-});
-
-const clientId = computed({
-    get: () => formModelRef.value?.formData?.clientFk,
-    set: (val) => {
-        formModelRef.value.formData.clientFk = val;
-        formModelRef.value.formData.addressFk = null;
-        if (!val) return;
-        getClientDefaultAddress(val);
-        clientAddressesList(val);
-    },
-});
-
-const landed = computed({
-    get: () => formModelRef.value?.formData?.landed,
-    set: (val) => {
-        formModelRef.value.formData.landed = val;
-        getShipped({
-            landed: val,
-            addressFk: formModelRef.value?.formData?.addressFk,
-            agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
-            warehouseFk: formModelRef.value?.formData?.warehouseFk,
-        });
-    },
-});
-
-const agencyModeId = computed({
-    get: () => formModelRef.value?.formData?.agencyModeFk,
-    set: (val) => {
-        if (val != formModelRef.value?.formData?.agencyModeFk) {
-            formModelRef.value.formData.agencyModeFk = val;
-            if (!val) return;
-            const agencyMode = agenciesOptions.value.find((a) => a.id == val);
-            formModelRef.value.formData.warehouseFk = agencyMode.warehouseFk;
-
-            getLanded({
-                shipped: formModelRef.value?.formData?.shipped,
-                addressFk: formModelRef.value?.formData?.addressFk,
-                agencyModeFk: val,
-                warehouseFk: formModelRef.value?.formData?.warehouseFk,
-            });
-        }
-    },
-});
-
-const zoneId = computed({
-    get: () => formModelRef.value?.formData?.zoneFk,
-    set: (val) => {
-        if (val != formModelRef.value.formData.zoneFk) {
-            formModelRef.value.formData.zoneFk = val;
-            onChangeZone(val);
-        }
-    },
-});
-
-const warehouseId = computed({
-    get: () => formModelRef.value?.formData?.warehouseFk,
-    set: (val) => {
-        if (val != formModelRef.value.formData.warehouseFk) {
-            formModelRef.value.formData.warehouseFk = val;
-            getShipped({
-                landed: formModelRef.value.formData.landed,
-                addressFk: formModelRef.value.formData.addressFk,
-                agencyModeFk: formModelRef.value.formData.agencyModeFk,
-                warehouseFk: val,
-            }).then(() => {
-                if (zoneId.value == null) formModelRef.value.formData.agencyModeFk = null;
-            });
-        }
-    },
-});
-
-const shipped = computed({
-    get: () => formModelRef.value?.formData?.shipped,
-    set: (val) => {
-        if (
-            new Date(formModelRef.value?.formData?.shipped).toDateString() !=
-            val.toDateString()
-        )
-            val.setHours(0, 0, 0, 0);
-        formModelRef.value.formData.shipped = val;
-        getLanded({
-            shipped: val,
-            addressFk: formModelRef.value?.formData?.addressFk,
-            agencyModeFk: formModelRef.value?.formData?.agencyModeFk,
-            warehouseFk: formModelRef.value?.formData?.warehouseFk,
-        });
-    },
-});
-
-const onFormModelInit = () => {
-    if (formModelRef.value.formData.clientFk)
-        clientAddressesList(formModelRef.value.formData.clientFk);
-};
-
-const redirectToCustomerAddress = () => {
-    router.push({
-        name: 'CustomerAddressEditCard',
-        params: { id: clientId.value, addressId: addressId.value },
-    });
-};
-
-const isFormInvalid = (formData) => {
+const isFormInvalid = () => {
     return (
-        !formData.clientFk ||
-        !formData.addressFk ||
-        !formData.agencyModeFk ||
-        !formData.companyFk ||
-        !formData.shipped ||
-        !formData.landed ||
-        !formData.zoneFk
+        !formData.value.clientFk ||
+        !formData.value.addressFk ||
+        !formData.value.agencyModeFk ||
+        !formData.value.companyFk ||
+        !formData.value.shipped ||
+        !formData.value.landed ||
+        !formData.value.zoneFk
     );
 };
 
+const getPriceDifference = async () => {
+    try {
+        const params = {
+            landed: formData.value.landed,
+            addressId: formData.value.addressFk,
+            agencyModeId: formData.value.agencyModeFk,
+            zoneId: formData.value.zoneFk,
+            warehouseId: formData.value.warehouseFk,
+            shipped: formData.value.shipped,
+        };
+        const { data } = await axios.post(
+            `tickets/${formData.value.id}/priceDifference`,
+            params
+        );
+        formData.value.sale = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const submit = async () => {
+    try {
+        if (!formData.value.option)
+            return notify(t('basicData.chooseAnOption'), 'negative');
+
+        const params = {
+            clientFk: formData.value.clientFk,
+            nickname: formData.value.nickname,
+            agencyModeFk: formData.value.agencyModeFk,
+            addressFk: formData.value.addressFk,
+            zoneFk: formData.value.zoneFk,
+            warehouseFk: formData.value.warehouseFk,
+            companyFk: formData.value.companyFk,
+            shipped: formData.value.shipped,
+            landed: formData.value.landed,
+            isDeleted: formData.value.isDeleted,
+            option: formData.value.option,
+            isWithoutNegatives: formData.value.withoutNegatives,
+            withWarningAccept: formData.value.withWarningAccept,
+            keepPrice: false,
+        };
+
+        const { data } = await axios.post(
+            `tickets/${formData.value.id}/componentUpdate`,
+            params
+        );
+
+        if (!data) return;
+
+        const ticketToMove = data.id;
+        notify(t('basicData.unroutedTicket'), 'positive');
+        router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const submitWithNegatives = async () => {
+    formData.value.withWarningAccept = true;
+    submit();
+};
+
 const onNextStep = async () => {
     if (step.value === 1) {
-        const formData = formModelRef.value.formData;
-        if (isFormInvalid(formData))
+        if (isFormInvalid())
             return notify(t('basicData.someFieldsAreInvalid'), 'negative');
 
-        if (!formData.sale || formModelRef.value.hasChanges) {
-            const params = {
-                landed: formData.landed,
-                addressId: formData.addressFk,
-                agencyModeId: formData.agencyModeFk,
-                zoneId: formData.zoneFk,
-                warehouseId: formData.warehouseFk,
-                shipped: formData.shipped,
-            };
-            const { data } = await axios.post(
-                `tickets/${formData.id}/priceDifference`,
-                params
+        await getPriceDifference();
+        stepperRef.value.next();
+    } else if (step.value === 2) {
+        if (haveNegatives.value && !formData.value.withoutNegatives)
+            openConfirmationModal(
+                t('basicData.negativesConfirmTitle'),
+                t('basicData.negativesConfirmMessage'),
+                submitWithNegatives
             );
-            formData.sale = data;
-            stepperRef.value.next();
-        }
+        else submit();
     }
 };
+
+onBeforeMount(async () => await getTicketData());
 </script>
 <template>
-    <FetchData
-        url="Clients"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'id',
-        }"
-        @on-fetch="(data) => (clientsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Warehouses"
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Companies"
-        :filter="{
-            fields: ['id', 'code'],
-            order: 'code ASC',
-        }"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        ref="agencyFetchRef"
-        url="AgencyModes/byWarehouse"
-        :filter="agencyByWarehouseFilter"
-        @on-fetch="(data) => (agenciesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        ref="zonesFetchRef"
-        url="Zones/includingExpired"
-        :filter="zonesFilter"
-        @on-fetch="(data) => (zonesOptions = data)"
-        auto-load
-    />
     <QStepper
         v-model="step"
         ref="stepperRef"
@@ -373,177 +159,22 @@ const onNextStep = async () => {
         header-nav
         animated
         keep-alive
+        style="max-width: 800px; margin: auto"
     >
         <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
-            <FormModel
-                ref="formModelRef"
-                :url="`Tickets/${route.params.id}`"
-                :url-update="`Tickets/${route.params.id}`"
-                :filter="filter"
-                model="Ticket"
-                auto-load
-                :default-actions="false"
-                @on-fetch="onFormModelInit()"
-            >
-                <template #form="{ data }">
-                    <VnRow class="row q-gutter-md q-mb-md">
-                        <VnSelect
-                            :label="t('basicData.client')"
-                            v-model="clientId"
-                            option-value="id"
-                            option-label="name"
-                            :options="clientsOptions"
-                            hide-selected
-                            map-options
-                            :required="true"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >#{{ scope.opt?.id }}
-                                            {{ scope.opt?.name }}</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                        <VnSelect
-                            :label="t('basicData.warehouse')"
-                            v-model="warehouseId"
-                            option-value="id"
-                            option-label="name"
-                            :options="warehousesOptions"
-                            hide-selected
-                            map-options
-                            :required="true"
-                        />
-                    </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
-                        <VnSelect
-                            :label="t('basicData.address')"
-                            v-model="addressId"
-                            option-value="id"
-                            option-label="nickname"
-                            :options="addresses"
-                            hide-selected
-                            map-options
-                            :required="true"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel
-                                            :class="{
-                                                'color-vn-label': !scope.opt?.isActive,
-                                            }"
-                                        >
-                                            {{
-                                                `${
-                                                    !scope.opt?.isActive
-                                                        ? t('basicData.inactive')
-                                                        : ''
-                                                } `
-                                            }}
-                                            <span> {{ scope.opt?.nickname }}</span>
-                                            <span
-                                                v-if="
-                                                    scope.opt?.province ||
-                                                    scope.opt?.city ||
-                                                    scope.opt?.street
-                                                "
-                                                >, {{ scope.opt?.street }},
-                                                {{ scope.opt?.city }},
-                                                {{ scope.opt?.province?.name }} -
-                                                {{ scope.opt?.agencyMode?.name }}</span
-                                            >
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                            <template #append>
-                                <QIcon
-                                    name="edit"
-                                    color="primary"
-                                    size="sm"
-                                    class="fill-icon cursor-pointer"
-                                    @click.stop="redirectToCustomerAddress()"
-                                >
-                                    <QTooltip>{{ t('basicData.editAddress') }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </VnSelect>
-                        <VnInput :label="t('basicData.alias')" v-model="data.nickname" />
-                    </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
-                        <VnSelect
-                            :label="t('basicData.company')"
-                            v-model="data.companyFk"
-                            option-value="id"
-                            option-label="code"
-                            :options="companiesOptions"
-                            hide-selected
-                            map-options
-                            :required="true"
-                        />
-                        <VnSelect
-                            :label="t('basicData.agency')"
-                            v-model="agencyModeId"
-                            option-value="id"
-                            option-label="name"
-                            :options="agenciesOptions"
-                            hide-selected
-                            map-options
-                            :required="true"
-                            @focus="agencyFetchRef.fetch()"
-                        />
-                        <VnSelect
-                            :label="t('basicData.zone')"
-                            v-model="zoneId"
-                            option-value="id"
-                            option-label="name"
-                            :options="zonesOptions"
-                            hide-selected
-                            map-options
-                            :required="true"
-                            @focus="zonesFetchRef.fetch()"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ scope.opt?.name }} - Max.
-                                            {{ toTimeFormat(scope.opt?.hour) }}
-                                            h.</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
-                        <VnInputDate
-                            :label="t('basicData.shipped')"
-                            v-model="data.shipped"
-                            :required="true"
-                        />
-                        <VnInputTime
-                            :label="t('basicData.shippedHour')"
-                            v-model="data.shipped"
-                        />
-                        <VnInputDate
-                            :label="t('basicData.landed')"
-                            v-model="data.landed"
-                            :required="true"
-                        />
-                    </VnRow>
-                </template>
-            </FormModel>
+            <TicketBasicDataForm
+                v-if="initialDataLoaded"
+                @update-form="($event) => (formData = $event)"
+                :form-data="formData"
+            />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
-            <BasicDataTable :ticket-data="formModelRef.formData" />
+            <BasicDataTable
+                :form-data="formData"
+                v-model:haveNegatives="haveNegatives"
+                @update-form="($event) => (formData = $event)"
+            />
         </QStep>
-
         <template #navigation>
             <QStepperNavigation>
                 <QBtn
@@ -562,5 +193,4 @@ const onNextStep = async () => {
             </QStepperNavigation>
         </template>
     </QStepper>
-    <pre v-if="formModelRef">{{ formModelRef.formData }}</pre>
 </template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 6fe813a2a..88b73857b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -32,3 +32,5 @@ basicData:
     withoutNegativesInfo: Clone this ticket with the changes and only sales availables
     negativesConfirmTitle: Edit basic data
     negativesConfirmMessage: Negatives are going to be generated, are you sure you want to advance all the lines?
+    chooseAnOption: Choose an option
+    unroutedTicket: The ticket has been unrouted
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 8f9394a2e..087cacb45 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -32,5 +32,7 @@ basicData:
     withoutNegativesInfo: Clonar este ticket con los cambios y solo ventas disponibles
     negativesConfirmTitle: Editar datos básicos
     negativesConfirmMessage: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
+    chooseAnOption: Elige una opción
+    unroutedTicket: El ticket ha sido desenrutado
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From 3d9d41afcb7708c47d2dcacfa728b577768ac60e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 21 Jun 2024 16:55:33 -0300
Subject: [PATCH 52/72] Add deep true

---
 src/pages/Ticket/Card/BasicData/BasicDataTable.vue      | 3 ++-
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
index b7eed5fa8..ef7d10a46 100644
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -39,7 +39,8 @@ const rows = computed(() => _ticketData.value?.sale?.items || []);
 
 watch(
     () => _ticketData.value,
-    (val) => emit('updateForm', val)
+    (val) => emit('updateForm', val),
+    { deep: true }
 );
 
 const columns = computed(() => [
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 2412fad5c..678cbdf30 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -40,7 +40,8 @@ const _formData = ref($props.formData);
 
 watch(
     () => _formData.value,
-    (val) => emit('updateForm', val)
+    (val) => emit('updateForm', val),
+    { deep: true }
 );
 
 const agencyByWarehouseFilter = computed(() => ({

From 3d0cbcfd12b2f478e20fa5eef8f3e90b8da125c8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 21 Jun 2024 16:57:51 -0300
Subject: [PATCH 53/72] remove form model expose

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

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 11542ed65..336ea281e 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -246,7 +246,7 @@ function updateAndEmit(evt, val, res) {
     emit(evt, state.get(modelValue), res);
 }
 
-defineExpose({ save, isLoading, hasChanges, formData });
+defineExpose({ save, isLoading, hasChanges });
 </script>
 <template>
     <div class="column items-center full-width">

From 82cc844dddf412eb90b24102daea971ad9454f10 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 24 Jun 2024 08:30:06 +0200
Subject: [PATCH 54/72] refactor: refs #6977 refactor VnImg

---
 src/components/ui/VnImg.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 3996e9ddc..3904a4f48 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -44,7 +44,13 @@ onMounted(() => {});
 <template>
     <QImg :src="url" v-bind="$attrs" @click="show = !show" spinner-color="primary" />
     <QDialog v-model="show" v-if="$props.zoomSize">
-        <QImg :src="url" class="img_zoom" v-bind="$attrs" spinner-color="primary" />
+        <QImg
+            :src="url"
+            size="full"
+            class="img_zoom"
+            v-bind="$attrs"
+            spinner-color="primary"
+        />
     </QDialog>
 </template>
 
@@ -56,8 +62,6 @@ onMounted(() => {});
     border-radius: 50%;
 }
 .img_zoom {
-    width: 100%;
-    height: auto;
     border-radius: 0%;
 }
 </style>

From 50d135f282f185363957647008dd1dbfcd43658e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 24 Jun 2024 09:20:47 +0200
Subject: [PATCH 55/72] refactor: refs #6977 fix VnImg props

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

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 3904a4f48..b7c702d45 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -21,8 +21,8 @@ const $props = defineProps({
         default: 'lg',
     },
     id: {
-        type: Boolean,
-        default: false,
+        type: Number,
+        required: true,
     },
 });
 const show = ref(false);

From ea7ee97867f7feed2a11a7dacbeb6e29a69c7e0d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 09:35:21 +0200
Subject: [PATCH 56/72] proposals

---
 .../Ticket/Card/BasicData/BasicDataTable.vue  |   6 +-
 .../Card/BasicData/TicketBasicDataForm.vue    | 127 +++++++++---------
 2 files changed, 64 insertions(+), 69 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
index ef7d10a46..c14c95a70 100644
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -106,10 +106,7 @@ const totalNewPrice = computed(() => {
 });
 
 const totalDifference = computed(() => {
-    return rows.value.reduce(
-        (acc, item) => acc + item.component.difference * item.quantity,
-        0
-    );
+    return rows.value.reduce((acc, item) => acc + item.component.difference, 0);
 });
 
 const ticketHaveNegatives = () => {
@@ -225,6 +222,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :pagination="{ rowsPerPage: 0 }"
         class="full-width q-mt-md"
         :no-data-label="t('globals.noResults')"
+        flat
     >
         <template #body-cell-item="{ row }">
             <QTd>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 678cbdf30..07e7b8043 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -36,10 +36,10 @@ const companiesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
-const _formData = ref($props.formData);
+const formData = ref($props.formData);
 
 watch(
-    () => _formData.value,
+    () => formData.value,
     (val) => emit('updateForm', val),
     { deep: true }
 );
@@ -55,12 +55,12 @@ const agencyByWarehouseFilter = computed(() => ({
 const zonesFilter = computed(() => ({
     fields: ['id', 'name'],
     order: 'name ASC',
-    where: _formData.value?.agencyModeFk
+    where: formData.value?.agencyModeFk
         ? {
-              shipped: _formData.value?.shipped,
-              addressFk: _formData.value?.addressFk,
-              agencyModeFk: _formData.value?.agencyModeFk,
-              warehouseFk: _formData.value?.warehouseFk,
+              shipped: formData.value?.shipped,
+              addressFk: formData.value?.addressFk,
+              agencyModeFk: formData.value?.agencyModeFk,
+              warehouseFk: formData.value?.warehouseFk,
           }
         : {},
 }));
@@ -71,13 +71,13 @@ const getLanded = async (params) => {
             shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
         if (!validParams) return;
 
-        _formData.value.zoneFk = null;
+        formData.value.zoneFk = null;
         zonesOptions.value = [];
         const { data } = await axios.get(`Agencies/getLanded`, { params });
         if (data) {
-            _formData.value.zoneFk = data.zoneFk;
-            _formData.value.landed = data.landed;
-            _formData.value.shipped = params.shipped;
+            formData.value.zoneFk = data.zoneFk;
+            formData.value.landed = data.landed;
+            formData.value.shipped = params.shipped;
         }
     } catch (error) {
         console.error(error);
@@ -91,13 +91,13 @@ const getShipped = async (params) => {
             landed.value && addressId.value && agencyModeId.value && warehouseId.value;
         if (!validParams) return;
 
-        _formData.value.zoneFk = null;
+        formData.value.zoneFk = null;
         zonesOptions.value = [];
         const { data } = await axios.get(`Agencies/getShipped`, { params });
         if (data) {
-            _formData.value.zoneFk = data.zoneFk;
-            _formData.value.landed = params.landed;
-            _formData.value.shipped = data.shipped;
+            formData.value.zoneFk = data.zoneFk;
+            formData.value.landed = params.landed;
+            formData.value.shipped = data.shipped;
         } else {
             notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
         }
@@ -109,9 +109,9 @@ const getShipped = async (params) => {
 
 const onChangeZone = async (zoneId) => {
     try {
-        _formData.value.agencyModeFk = null;
+        formData.value.agencyModeFk = null;
         const { data } = await axios.get(`Zones/${zoneId}`);
-        _formData.value.agencyModeFk = data.agencyModeFk;
+        formData.value.agencyModeFk = data.agencyModeFk;
     } catch (error) {
         console.error(error);
     }
@@ -119,9 +119,9 @@ const onChangeZone = async (zoneId) => {
 
 const onChangeAddress = async (addressId) => {
     try {
-        _formData.value.nickname = null;
+        formData.value.nickname = null;
         const { data } = await axios.get(`Addresses/${addressId}`);
-        _formData.value.nickname = data.nickname;
+        formData.value.nickname = data.nickname;
     } catch (error) {
         console.error(error);
     }
@@ -159,26 +159,26 @@ const clientAddressesList = async (value) => {
 };
 
 const addressId = computed({
-    get: () => _formData.value?.addressFk,
+    get: () => formData.value?.addressFk,
     set: (val) => {
-        if (val != _formData.value?.addressFk) {
-            _formData.value.addressFk = val;
+        if (val != formData.value?.addressFk) {
+            formData.value.addressFk = val;
             onChangeAddress(val);
             getShipped({
-                landed: _formData.value?.landed,
+                landed: formData.value?.landed,
                 addressFk: val,
-                agencyModeFk: _formData.value?.agencyModeFk,
-                warehouseFk: _formData.value?.warehouseFk,
+                agencyModeFk: formData.value?.agencyModeFk,
+                warehouseFk: formData.value?.warehouseFk,
             });
         }
     },
 });
 
 const clientId = computed({
-    get: () => _formData.value?.clientFk,
+    get: () => formData.value?.clientFk,
     set: (val) => {
-        _formData.value.clientFk = val;
-        _formData.value.addressFk = null;
+        formData.value.clientFk = val;
+        formData.value.addressFk = null;
         if (!val) return;
         getClientDefaultAddress(val);
         clientAddressesList(val);
@@ -186,81 +186,81 @@ const clientId = computed({
 });
 
 const landed = computed({
-    get: () => _formData.value?.landed,
+    get: () => formData.value?.landed,
     set: (val) => {
-        _formData.value.landed = val;
+        formData.value.landed = val;
         getShipped({
             landed: val,
-            addressFk: _formData.value?.addressFk,
-            agencyModeFk: _formData.value?.agencyModeFk,
-            warehouseFk: _formData.value?.warehouseFk,
+            addressFk: formData.value?.addressFk,
+            agencyModeFk: formData.value?.agencyModeFk,
+            warehouseFk: formData.value?.warehouseFk,
         });
     },
 });
 
 const agencyModeId = computed({
-    get: () => _formData.value.agencyModeFk,
+    get: () => formData.value.agencyModeFk,
     set: (val) => {
-        if (val != _formData.value.agencyModeFk) {
-            _formData.value.agencyModeFk = val;
+        if (val != formData.value.agencyModeFk) {
+            formData.value.agencyModeFk = val;
             if (!val) return;
             const agencyMode = agenciesOptions.value.find((a) => a.id == val);
-            _formData.value.warehouseFk = agencyMode.warehouseFk;
+            formData.value.warehouseFk = agencyMode.warehouseFk;
 
             getLanded({
-                shipped: _formData.value?.shipped,
-                addressFk: _formData.value?.addressFk,
+                shipped: formData.value?.shipped,
+                addressFk: formData.value?.addressFk,
                 agencyModeFk: val,
-                warehouseFk: _formData.value?.warehouseFk,
+                warehouseFk: formData.value?.warehouseFk,
             });
         }
     },
 });
 
 const zoneId = computed({
-    get: () => _formData.value?.zoneFk,
+    get: () => formData.value?.zoneFk,
     set: (val) => {
-        if (val != _formData.value?.zoneFk) {
-            _formData.value.zoneFk = val;
+        if (val != formData.value?.zoneFk) {
+            formData.value.zoneFk = val;
             onChangeZone(val);
         }
     },
 });
 
 const warehouseId = computed({
-    get: () => _formData.value?.warehouseFk,
+    get: () => formData.value?.warehouseFk,
     set: (val) => {
-        if (val != _formData.value?.warehouseFk) {
-            _formData.value.warehouseFk = val;
+        if (val != formData.value?.warehouseFk) {
+            formData.value.warehouseFk = val;
             getShipped({
-                landed: _formData.value?.landed,
-                addressFk: _formData.value?.addressFk,
-                agencyModeFk: _formData.value?.agencyModeFk,
+                landed: formData.value?.landed,
+                addressFk: formData.value?.addressFk,
+                agencyModeFk: formData.value?.agencyModeFk,
                 warehouseFk: val,
             }).then(() => {
-                if (zoneId.value == null) _formData.value.agencyModeFk = null;
+                if (zoneId.value == null) formData.value.agencyModeFk = null;
             });
         }
     },
 });
 
 const shipped = computed({
-    get: () => _formData.value?.shipped,
+    get: () => formData.value?.shipped,
     set: (val) => {
-        if (new Date(_formData.value?.shipped).toDateString() != val.toDateString())
+        if (new Date(formData.value?.shipped).toDateString() != val.toDateString())
             val.setHours(0, 0, 0, 0);
-        _formData.value.shipped = val;
+        formData.value.shipped = val;
         getLanded({
             shipped: val,
-            addressFk: _formData.value?.addressFk,
-            agencyModeFk: _formData.value?.agencyModeFk,
-            warehouseFk: _formData.value?.warehouseFk,
+            addressFk: formData.value?.addressFk,
+            agencyModeFk: formData.value?.agencyModeFk,
+            warehouseFk: formData.value?.warehouseFk,
         });
     },
 });
 
 const onFormModelInit = () => {
-    if (_formData.value?.clientFk) clientAddressesList(_formData.value?.clientFk);
+    if (formData.value?.clientFk) clientAddressesList(formData.value?.clientFk);
 };
 
 const redirectToCustomerAddress = () => {
@@ -396,12 +396,12 @@ onMounted(() => onFormModelInit());
                     </QIcon>
                 </template>
             </VnSelect>
-            <VnInput :label="t('basicData.alias')" v-model="_formData.nickname" />
+            <VnInput :label="t('basicData.alias')" v-model="formData.nickname" />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
             <VnSelect
                 :label="t('basicData.company')"
-                v-model="_formData.companyFk"
+                v-model="formData.companyFk"
                 option-value="id"
                 option-label="code"
                 :options="companiesOptions"
@@ -447,16 +447,13 @@ onMounted(() => onFormModelInit());
         <VnRow class="row q-gutter-md q-mb-md">
             <VnInputDate
                 :label="t('basicData.shipped')"
-                v-model="_formData.shipped"
+                v-model="formData.shipped"
                 :required="true"
             />
-            <VnInputTime
-                :label="t('basicData.shippedHour')"
-                v-model="_formData.shipped"
-            />
+            <VnInputTime :label="t('basicData.shippedHour')" v-model="formData.shipped" />
             <VnInputDate
                 :label="t('basicData.landed')"
-                v-model="_formData.landed"
+                v-model="formData.landed"
                 :required="true"
             />
         </VnRow>

From 5a66af341f2f4d288fdef7f50e2afd2624ce4e05 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 10:07:36 +0200
Subject: [PATCH 57/72] fix: state translations

---
 src/pages/Ticket/Card/TicketPurchaseRequest.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 387a5baf1..ea81a445c 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -123,7 +123,7 @@ const columns = computed(() => [
         name: 'state',
         field: 'isOk',
         align: 'left',
-        format: (val) => getRequestState(val),
+        format: (val) => t(getRequestState(val)),
     },
     {
         label: '',
@@ -259,3 +259,9 @@ const openCreateModal = () => createTicketRequestDialogRef.value.show();
         </QPageSticky>
     </QPage>
 </template>
+<i18n>
+    es:
+        New: Nueva
+        Denied: Denegada
+        Accepted: Aceptada
+</i18n>

From d10f6b4d6c9e8c73f744c42deeb7349a3363f726 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 10:33:15 +0200
Subject: [PATCH 58/72] replace value sale.itemFk

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

diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index ea81a445c..281dc46a1 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -221,7 +221,7 @@ const openCreateModal = () => createTicketRequestDialogRef.value.show();
                     <template #body-cell-saleFk="{ row }">
                         <QTd @click.stop>
                             <QBtn v-if="row.saleFk" flat color="primary">
-                                {{ row.requester?.user?.nickname }}
+                                {{ row.sale.itemFk }}
                                 <ItemDescriptorProxy :id="row.sale.itemFk" />
                             </QBtn>
                         </QTd>

From a70524578392c26ffebddd65367ba957f708e24b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 25 Jun 2024 12:18:02 +0200
Subject: [PATCH 59/72] refs #7406 fix pr

---
 src/components/ui/VnPaginate.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 9af69fdbb..9a2c06b0c 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -26,10 +26,6 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    userFilter: {
-        type: Object,
-        default: null,
-    },
     where: {
         type: Object,
         default: null,
@@ -87,7 +83,6 @@ const arrayData = useArrayData(props.dataKey, {
     where: props.where,
     limit: props.limit,
     order: props.order,
-    userFilter: props.userFilter,
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
     keepOpts: props.keepOpts,

From 0c42bba7797782f00cb191368cae4db51cb868dc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 12:39:05 +0200
Subject: [PATCH 60/72] perf: remove ItemPicture

---
 src/components/ui/ItemPicture.vue | 34 -------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 src/components/ui/ItemPicture.vue

diff --git a/src/components/ui/ItemPicture.vue b/src/components/ui/ItemPicture.vue
deleted file mode 100644
index e76414618..000000000
--- a/src/components/ui/ItemPicture.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<script setup>
-defineProps({
-    url: { type: String, required: true },
-    width: { type: String, default: '50px' },
-    height: { type: String, default: '50px' },
-    iconSize: { type: String, default: 'md' },
-});
-</script>
-<template>
-    <QImg
-        :src="url"
-        :height="height"
-        :width="width"
-        :ratio="1"
-        spinner-color="primary"
-        style="border-radius: 50%"
-    >
-        <template #error>
-            <div class="icon-container">
-                <QIcon name="photo" :size="iconSize" style="opacity: 0.4" />
-            </div>
-        </template>
-    </QImg>
-</template>
-
-<style lang="scss" scoped>
-.icon-container {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-</style>

From 1eaa0c9ce2c262b62327d739ae2d310d870b289b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 12:39:21 +0200
Subject: [PATCH 61/72] perf: replace ItemPicture in favour of VnImg

---
 src/components/ui/VnImg.vue          |  3 ++-
 src/pages/Ticket/Card/TicketSale.vue | 12 +++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index b7c702d45..a88c02898 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     zoomSize: {
         type: String,
-        required: true,
+        required: false,
         default: 'lg',
     },
     id: {
@@ -57,6 +57,7 @@ onMounted(() => {});
 <style lang="scss" scoped>
 .q-img {
     cursor: zoom-in;
+    min-width: 50px;
 }
 .rounded {
     border-radius: 50%;
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 9df6d5640..7cc8539cf 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -9,14 +9,14 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketEditManaProxy from './TicketEditMana.vue';
-import ItemPicture from 'src/components/ui/ItemPicture.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
 import TicketTransfer from './TicketTransfer.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { useSession } from 'composables/useSession';
 import { toCurrency, toPercentage, dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
@@ -25,8 +25,6 @@ import axios from 'axios';
 
 const route = useRoute();
 const router = useRouter();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -607,9 +605,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
         <template #body-cell-picture="{ row }">
             <QTd>
-                <ItemPicture
-                    :url="`/api/Images/catalog/50x50/${row.itemFk}/download?access_token=${token}`"
-                />
+                <div class="image-wrapper">
+                    <VnImg :id="row.itemFk" class="rounded" />
+                </div>
             </QTd>
         </template>
         <template #body-cell-visible="{ row }">

From ff33923b7adfe212ff47d8a194dd9717a3aab376 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 25 Jun 2024 12:49:54 +0200
Subject: [PATCH 62/72] feat: refs #7578 add data-key attribute to CardSummary
 components

---
 src/components/ui/CardSummary.vue               |  2 +-
 src/pages/Account/Card/AccountSummary.vue       |  1 +
 src/pages/Agency/Card/AgencySummary.vue         |  2 +-
 src/pages/Claim/Card/ClaimSummary.vue           |  1 +
 src/pages/Customer/Card/CustomerSummary.vue     |  6 +++++-
 src/pages/Entry/Card/EntrySummary.vue           |  1 +
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue |  1 +
 src/pages/Item/ItemFixedPrice.vue               | 11 ++---------
 src/pages/Order/Card/OrderSummary.vue           |  6 +++++-
 src/pages/Parking/Card/ParkingSummary.vue       |  1 +
 src/pages/Route/Card/RouteSummary.vue           |  1 +
 src/pages/Shelving/Card/ShelvingSummary.vue     |  7 ++++++-
 src/pages/Supplier/Card/SupplierSummary.vue     |  1 +
 src/pages/Ticket/Card/TicketSummary.vue         |  1 +
 src/pages/Travel/Card/TravelSummary.vue         |  1 +
 src/pages/Worker/Card/WorkerSummary.vue         |  7 ++++++-
 16 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index cab5b98be..d1e827aee 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -26,7 +26,7 @@ const props = defineProps({
 const emit = defineEmits(['onFetch']);
 const route = useRoute();
 const isSummary = ref();
-const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
+const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
     skip: 0,
diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index 1c7f79f0e..1901f9cde 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -30,6 +30,7 @@ const filter = {
 
 <template>
     <CardSummary
+        data-key="AccountSummary"
         ref="AccountSummary"
         url="VnUsers/preview"
         :filter="filter"
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index 839d88200..f9a1c5ea0 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -14,7 +14,7 @@ const entityId = computed(() => $props.id || useRoute().params.id);
 
 <template>
     <div class="q-pa-md">
-        <CardSummary :url="`Agencies/${entityId}`">
+        <CardSummary :url="`Agencies/${entityId}`" data-key="Agency">
             <template #header="{ entity: agency }">{{ agency.name }}</template>
             <template #body="{ entity: agency }">
                 <QCard class="vn-one">
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 36a26008e..1a2d3c251 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -185,6 +185,7 @@ async function changeState(value) {
         :url="`Claims/${entityId}/getSummary`"
         :entity-id="entityId"
         @on-fetch="getClaimDms"
+        data-key="claimSummary"
     >
         <template #header="{ entity: { claim } }">
             {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 5a003dc85..1190f22fe 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -61,7 +61,11 @@ const creditWarning = computed(() => {
 </script>
 
 <template>
-    <CardSummary ref="summary" :url="`Clients/${entityId}/summary`">
+    <CardSummary
+        ref="summary"
+        :url="`Clients/${entityId}/summary`"
+        data-key="CustomerSummary"
+    >
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index d47c0f69c..d08b7eed2 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -161,6 +161,7 @@ const fetchEntryBuys = async () => {
         ref="summaryRef"
         :url="`Entries/${entityId}/getEntry`"
         @on-fetch="(data) => setEntryData(data)"
+        data-key="EntrySummary"
     >
         <template #header-left>
             <router-link
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index e98de6b30..c773c43cf 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -106,6 +106,7 @@ const ticketsColumns = ref([
         ref="summary"
         :url="`InvoiceOuts/${entityId}/summary`"
         :entity-id="entityId"
+        data-key="InvoiceOutSummary"
     >
         <template #header="{ entity: { invoiceOut } }">
             <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 97f40b84d..2ecd1f21b 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -33,7 +33,6 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const fixedPricesOriginalData = ref([]);
 const warehousesOptions = ref([]);
-const itemsWithNameOptions = ref([]);
 const rowsSelected = ref([]);
 
 const exprBuilder = (param, value) => {
@@ -371,12 +370,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => onWarehousesFetched(data)"
     />
-    <FetchData
-        url="Items/withName"
-        :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
-        auto-load
-        @on-fetch="(data) => (itemsWithNameOptions = data)"
-    />
     <RightMenu>
         <template #right-panel>
             <ItemFixedPriceFilter
@@ -419,7 +412,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <template #body-cell-itemId="props">
                 <QTd>
                     <VnSelect
-                        :options="itemsWithNameOptions"
+                        url="Items/withName"
                         hide-selected
                         option-label="id"
                         option-value="id"
@@ -562,7 +555,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
         </QTable>
-        <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
+        <QPageSticky v-if="rowsSelected.length" :offset="[20, 20]">
             <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
             <QTooltip>
                 {{ t('Edit fixed price(s)') }}
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index d26b799df..d82dbaa17 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -51,7 +51,11 @@ const detailsColumns = ref([
 
 <template>
     <div class="q-pa-md">
-        <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
+        <CardSummary
+            ref="summary"
+            :url="`Orders/${entityId}/summary`"
+            data-key="OrderSummary"
+        >
             <template #header="{ entity }">
                 {{ t('order.summary.basket') }} #{{ entity?.id }} -
                 {{ entity?.client?.name }} ({{ entity?.clientFk }})
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index ebc3a996b..7406856b9 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -30,6 +30,7 @@ const filter = {
             :url="`Parkings/${entityId}`"
             :filter="filter"
             @on-fetch="(data) => (parking = data)"
+            data-key="Parking"
         >
             <template #header>{{ parking.code }}</template>
             <template #body>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index ac03a8231..748c82d29 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -122,6 +122,7 @@ const ticketColumns = ref([
             ref="summary"
             :url="`Routes/${entityId}/summary`"
             :entity-id="entityId"
+            data-key="RouteSummary"
         >
             <template #header="{ entity }">
                 <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 168552832..08d05626e 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -36,7 +36,12 @@ const filter = {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary ref="summary" :url="`Shelvings/${entityId}`" :filter="filter">
+        <CardSummary
+            ref="summary"
+            :url="`Shelvings/${entityId}`"
+            :filter="filter"
+            data-key="ShelvingSummary"
+        >
             <template #header="{ entity }">
                 <div>{{ entity.code }}</div>
             </template>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 4cd1f46f5..d007ad08f 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -48,6 +48,7 @@ function getUrl(section) {
         ref="summaryRef"
         :url="`Suppliers/${entityId}/getSummary`"
         @on-fetch="(data) => setData(data)"
+        data-key="SupplierSummary"
     >
         <template #header>
             <span>{{ supplier.name }} - {{ supplier.id }}</span>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 0715cf7ba..295e8bca5 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -90,6 +90,7 @@ async function changeState(value) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         @on-fetch="(data) => setData(data)"
+        data-key="TicketSummary"
     >
         <template #header="{ entity }">
             <div>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 91b36f0cf..88ddee9a2 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -237,6 +237,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
         ref="summaryRef"
         :url="`Travels/${entityId}/getTravel`"
         @on-fetch="(data) => setTravelData(data)"
+        data-key="TravelSummary"
     >
         <template #header>
             <span>{{ travel.ref }} - {{ travel.id }}</span>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 6d6dde97b..319592fe9 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -66,7 +66,12 @@ const filter = {
 </script>
 
 <template>
-    <CardSummary ref="summary" :url="`Workers/${entityId}`" :filter="filter">
+    <CardSummary
+        ref="summary"
+        :url="`Workers/${entityId}`"
+        :filter="filter"
+        data-key="WorkerSummary"
+    >
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
         </template>

From 266657fab5bd31f330b4a18bfbbf66dc238bf5a5 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 08:35:11 -0300
Subject: [PATCH 63/72] Fix total difference

---
 src/pages/Ticket/Card/BasicData/BasicDataTable.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
index ef7d10a46..6faf7c9e5 100644
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -106,10 +106,7 @@ const totalNewPrice = computed(() => {
 });
 
 const totalDifference = computed(() => {
-    return rows.value.reduce(
-        (acc, item) => acc + item.component.difference * item.quantity,
-        0
-    );
+    return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
 });
 
 const ticketHaveNegatives = () => {

From 9817ae8c2c1a32cbb7270b8f9499174adb186eb4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 13:35:16 +0200
Subject: [PATCH 64/72] fix: column hidden v-if

---
 src/pages/Ticket/Card/BasicData/BasicDataTable.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
index c14c95a70..60aeeb4f9 100644
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -45,15 +45,18 @@ watch(
 
 const columns = computed(() => [
     {
+        required: true,
         label: t('basicData.item'),
         name: 'item',
         align: 'left',
         format: (val) => val.name,
     },
     {
+        required: true,
         label: t('basicData.description'),
         name: 'description',
         align: 'left',
+        hidden: true,
     },
     {
         label: t('basicData.movable'),
@@ -61,12 +64,14 @@ const columns = computed(() => [
         align: 'left',
     },
     {
+        required: true,
         label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
     },
     {
+        required: true,
         label: t('basicData.pricePPU'),
         name: 'price',
         field: 'price',
@@ -74,6 +79,7 @@ const columns = computed(() => [
         format: (val) => toCurrency(val),
     },
     {
+        required: true,
         label: t('basicData.newPricePPU'),
         name: 'newPrice',
         field: (row) => row.component.newPrice,
@@ -81,6 +87,7 @@ const columns = computed(() => [
         format: (val) => toCurrency(val),
     },
     {
+        required: true,
         label: t('basicData.difference'),
         name: 'difference',
         field: (row) => row.component.difference,
@@ -108,18 +115,18 @@ const totalNewPrice = computed(() => {
 const totalDifference = computed(() => {
     return rows.value.reduce((acc, item) => acc + item.component.difference, 0);
 });
-
+const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
+const haveDifferences = computed(() => _ticketData.value.sale.haveDifferences);
 const ticketHaveNegatives = () => {
     let _haveNegatives = false;
     let haveNotNegatives = false;
     _ticketData.value.withoutNegatives = false;
-    const haveDifferences = _ticketData.value.sale.haveDifferences;
     _ticketData.value.sale.items.forEach((item) => {
         if (item.quantity > item.movable) _haveNegatives = true;
         else haveNotNegatives = true;
     });
 
-    haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences;
+    haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences.value;
     if (haveNegatives.value) _ticketData.value.withoutNegatives = true;
 };
 
@@ -216,6 +223,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
     </RightMenu>
     <QTable
+        :visible-columns="showMovablecolumn"
         :rows="rows"
         :columns="columns"
         row-key="id"

From 54e3eb6f0d7de3726ffa6269e7d9c02b2b9faa5d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 08:40:21 -0300
Subject: [PATCH 65/72] Add required rule to VnInputTime and VnInputDate

---
 src/components/common/VnInputDate.vue                   | 6 ++++++
 src/components/common/VnInputTime.vue                   | 5 ++++-
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 8 ++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index fe0866292..a2ad54eda 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
 
 const props = defineProps({
@@ -24,6 +25,9 @@ const hover = ref(false);
 
 const emit = defineEmits(['update:modelValue']);
 
+const { t } = useI18n();
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+
 const joinDateAndTime = (date, time) => {
     if (!date) {
         return null;
@@ -91,6 +95,8 @@ const styleAttrs = computed(() => {
             readonly
             :model-value="displayDate(value)"
             v-bind="{ ...$attrs, ...styleAttrs }"
+            :class="{ required: $attrs.required }"
+            :rules="$attrs.required ? [requiredFieldRule] : null"
             @click="isPopupOpen = true"
         >
             <template #append>
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 4b436c136..5c84951cb 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -17,8 +17,9 @@ const props = defineProps({
         default: false,
     },
 });
-const { t } = useI18n();
 const emit = defineEmits(['update:modelValue']);
+const { t } = useI18n();
+const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
 const value = computed({
     get() {
@@ -71,6 +72,8 @@ const styleAttrs = computed(() => {
         readonly
         :model-value="formatTime(value)"
         v-bind="{ ...$attrs, ...styleAttrs }"
+        :class="{ required: $attrs.required }"
+        :rules="$attrs.required ? [requiredFieldRule] : null"
         @click="isPopupOpen = true"
     >
         <template #append>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 678cbdf30..f7e5f6836 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -396,7 +396,11 @@ onMounted(() => onFormModelInit());
                     </QIcon>
                 </template>
             </VnSelect>
-            <VnInput :label="t('basicData.alias')" v-model="_formData.nickname" />
+            <VnInput
+                :label="t('basicData.alias')"
+                v-model="_formData.nickname"
+                :required="true"
+            />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
             <VnSelect
@@ -417,7 +421,6 @@ onMounted(() => onFormModelInit());
                 :options="agenciesOptions"
                 hide-selected
                 map-options
-                :required="true"
                 @focus="agencyFetchRef.fetch()"
             />
             <VnSelect
@@ -453,6 +456,7 @@ onMounted(() => onFormModelInit());
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="_formData.shipped"
+                :required="true"
             />
             <VnInputDate
                 :label="t('basicData.landed')"

From 4de347d0e8f180a05035282ddf863fd8d5b3918b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 09:19:12 -0300
Subject: [PATCH 66/72] Rmove nav navigation and organize buttons

---
 .../Ticket/Card/BasicData/BasicDataTable.vue      |  4 ++--
 .../Ticket/Card/BasicData/TicketBasicDataView.vue | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
index 8ba56213b..48b8c882f 100644
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
@@ -116,12 +116,12 @@ 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 haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
 const ticketHaveNegatives = () => {
     let _haveNegatives = false;
     let haveNotNegatives = false;
     _ticketData.value.withoutNegatives = false;
-    _ticketData.value.sale.items.forEach((item) => {
+    _ticketData.value?.sale?.items.forEach((item) => {
         if (item.quantity > item.movable) _haveNegatives = true;
         else haveNotNegatives = true;
     });
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index e8ed8bc0f..af47761a2 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -156,7 +156,6 @@ onBeforeMount(async () => await getTicketData());
         v-model="step"
         ref="stepperRef"
         color="primary"
-        header-nav
         animated
         keep-alive
         style="max-width: 800px; margin: auto"
@@ -176,19 +175,19 @@ onBeforeMount(async () => await getTicketData());
             />
         </QStep>
         <template #navigation>
-            <QStepperNavigation>
+            <QStepperNavigation class="flex justify-between">
                 <QBtn
-                    @click="onNextStep()"
-                    color="primary"
-                    :label="step === 2 ? t('basicData.finalize') : t('basicData.next')"
-                />
-                <QBtn
-                    v-if="step > 1"
                     flat
                     color="primary"
                     @click="stepperRef.previous()"
                     :label="t('basicData.back')"
                     class="q-ml-sm"
+                    :class="{ invisible: step === 1 }"
+                />
+                <QBtn
+                    @click="onNextStep()"
+                    color="primary"
+                    :label="step === 2 ? t('basicData.finalize') : t('basicData.next')"
                 />
             </QStepperNavigation>
         </template>

From 0776db2e0fcebe291f8f4c6589012d2a37da7fc8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 25 Jun 2024 14:24:58 +0200
Subject: [PATCH 67/72] warmFix: correct id

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

diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 1898a58d6..9f224154c 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -13,7 +13,7 @@ import useNotify from 'src/composables/useNotify.js';
 import { toDate } from 'src/filters';
 import { downloadFile } from 'src/composables/downloadFile';
 
-const {{id}} = useRoute();
+const route = useRoute();
 const quasar = useQuasar();
 const router = useRouter();
 const { t } = useI18n();
@@ -29,7 +29,7 @@ const thermographFilter = {
             fields: ['id', 'name'],
         },
     },
-    where: { travelFk: id },
+    where: { travelFk: route.params.id },
     order: ['created'],
 };
 

From 31f8ab7c07a95a6127838de72c0dafd86366bf24 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 25 Jun 2024 14:41:11 +0200
Subject: [PATCH 68/72] refactor: refs #6739 fix redirect transferInvoice

---
 src/components/TransferInvoiceForm.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index b4f89fa74..1af23583d 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -70,13 +70,17 @@ const makeInvoice = async () => {
                     });
             });
             if (!response) {
+                console.log('entra cuando no checkbox');
                 return;
             }
         }
 
+        console.log('params: ', params);
         const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
+        console.log('data: ', data);
         notify(t('Transferred invoice'), 'positive');
-        if (data.id) router.push({ name: 'InvoiceOutSummary', params: { id: data.id } });
+        const id = data?.[0];
+        if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
     } catch (err) {
         console.error('Error transfering invoice', err);
     }
@@ -204,7 +208,7 @@ const makeInvoice = async () => {
 <i18n>
 en:
     checkInfo: New tickets from the destination customer will be generated in the consignee by default.
-    transferInvoiceInfo: Destination customer is marked to bill in the consignee, do you want to continue?
+    transferInvoiceInfo: Destination customer is marked to bill in the consignee
     confirmTransferInvoice: The destination customer has selected to bill in the consignee, do you want to continue?
 es:
     Transfer invoice: Transferir factura

From d29bf095358a62cd9db21719b65cbda66ec34531 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 14:48:39 +0200
Subject: [PATCH 69/72] remove warnings

---
 src/components/ui/VnImg.vue                 |  2 +-
 src/pages/Account/Card/AccountBasicData.vue |  1 -
 src/pages/Route/RouteList.vue               |  1 -
 src/pages/Route/RouteRoadmap.vue            |  2 +-
 src/pages/Ticket/Card/TicketSale.vue        | 17 ++++++++---------
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index a88c02898..37c1edefc 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -32,7 +32,7 @@ const url = computed(
     () =>
         `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
 );
-const reload = (emit = false) => {
+const reload = () => {
     timeStamp.value = `timestamp=${Date.now()}`;
 };
 defineExpose({
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index 3a9d5c9bf..42b77419f 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -3,7 +3,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { ref, watch } from 'vue';
 
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index edec43fec..de60d164e 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toHour } from 'src/filters';
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index bc4a7a3e7..2c9234c6e 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -128,7 +128,7 @@ function confirmRemove() {
         .onOk(() => refreshKey.value++);
 }
 
-function navigateToRoadmapSummary(event, { id }) {
+function navigateToRoadmapSummary(_, { id }) {
     router.push({ name: 'RoadmapSummary', params: { id } });
 }
 </script>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 7cc8539cf..9fdbd4738 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -353,15 +353,14 @@ const newOrderFromTicket = async () => {
 };
 
 const goToLog = (saleId) => {
-    //TODO: Redireccionar cuando exista la vista TicketLog
-    // router.push({
-    //     name: 'TicketLog',
-    //     params: {
-    //         originId: route.params.id,
-    //         changedModel: 'Sale',
-    //         changedModelId: saleId,
-    //     },
-    // });
+    router.push({
+        name: 'TicketLog',
+        params: {
+            originId: route.params.id,
+            changedModel: 'Sale',
+            changedModelId: saleId,
+        },
+    });
 };
 
 const changeTicketState = async (val) => {

From 6e6c6301d2bcdf9e4308b5a14044395585153804 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 15:27:48 -0300
Subject: [PATCH 70/72] fix log view not refreshing when changing id param

---
 src/pages/Ticket/Card/TicketLog.vue  | 5 ++++-
 src/pages/Ticket/Card/TicketSale.vue | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketLog.vue b/src/pages/Ticket/Card/TicketLog.vue
index 94b63a117..94cff4dfc 100644
--- a/src/pages/Ticket/Card/TicketLog.vue
+++ b/src/pages/Ticket/Card/TicketLog.vue
@@ -1,7 +1,10 @@
 <script setup>
 import VnLog from 'src/components/common/VnLog.vue';
+import { useRoute } from 'vue-router';
+
+const route = useRoute();
 </script>
 
 <template>
-    <VnLog model="Ticket" url="/TicketLogs"></VnLog>
+    <VnLog model="Ticket" url="/TicketLogs" :key="route.params.id"></VnLog>
 </template>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 9fdbd4738..32408bf67 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -724,8 +724,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QTd>
         </template>
         <template #body-cell-history="{ row }">
-            <QTd v-if="row.hasLogs">
+            <QTd>
                 <QBtn
+                    v-if="row.$hasLogs"
                     @click.stop="goToLog(row.id)"
                     color="primary"
                     icon="history"

From 4e4563d48110fec668862c43f28fe857a136f743 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 22:34:19 +0200
Subject: [PATCH 71/72] fix: merge dev

---
 src/pages/Ticket/locale/es.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 657be5512..ac09ed064 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -129,6 +129,3 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
-card:
-    search: Buscar tickets
-    searchInfo: Buscar tickets por identificador o alias

From 56560d4b507868f3a0133549159f0cb8eb05a9e3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 22:35:20 +0200
Subject: [PATCH 72/72] fix: merge dev

---
 src/pages/Ticket/locale/en.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 86e221e1f..1b67cec5c 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -22,9 +22,6 @@ ticketSale:
     shipped: Shipped
     agency: Agency
     address: Address
-card:
-    search: Search tickets
-    searchInfo: You can search by ticket id or alias
 advanceTickets:
     origin: Origin
     destination: Destination