From 248e02f53008e6ad58dff144bbf81e7329caabc0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 5 Feb 2024 08:25:35 -0300
Subject: [PATCH 001/128] WIP

---
 src/i18n/en/index.js                          |   1 +
 src/i18n/es/index.js                          |   1 +
 .../InvoiceOut/Card/InvoiceOutSummary.vue     |  43 +++---
 src/pages/InvoiceOut/InvoiceOutList.vue       |  68 +++-------
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 123 +++---------------
 5 files changed, 67 insertions(+), 169 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index baaf414d6..9585bf7fb 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -531,6 +531,7 @@ export default {
             company: 'Company',
             dued: 'Due date',
             shortDued: 'Due date',
+            amount: 'Amount',
         },
         card: {
             issued: 'Issued',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0ea506b55..30e982ea2 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -531,6 +531,7 @@ export default {
             company: 'Empresa',
             dued: 'Fecha vencimineto',
             shortDued: 'F. vencimiento',
+            amount: 'Importe',
         },
         card: {
             issued: 'Fecha emisión',
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5a56a3957..afdc4ea7d 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -2,11 +2,15 @@
 import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-import { toCurrency, toDate } from 'src/filters';
+
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+
 import { getUrl } from 'src/composables/getUrl';
+import { toCurrency, toDate } from 'src/filters';
+import axios from 'axios';
 
 onMounted(async () => {
     fetch();
@@ -66,30 +70,34 @@ const taxColumns = ref([
 
 const ticketsColumns = ref([
     {
-        name: 'item',
-        label: 'invoiceOut.summary.ticketId',
+        name: 'id',
+        label: t('invoiceOut.summary.ticketId'),
         field: (row) => row.id,
         sortable: true,
+        align: 'left',
     },
     {
-        name: 'quantity',
-        label: 'invoiceOut.summary.nickname',
+        name: 'alias',
+        label: t('invoiceOut.summary.nickname'),
         field: (row) => row.nickname,
         sortable: true,
+        align: 'left',
     },
     {
         name: 'landed',
-        label: 'invoiceOut.summary.shipped',
+        label: t('invoiceOut.summary.shipped'),
         field: (row) => row.shipped,
         format: (value) => toDate(value),
         sortable: true,
+        align: 'left',
     },
     {
         name: 'landed',
-        label: 'invoiceOut.summary.totalWithVat',
+        label: t('invoiceOut.summary.totalWithVat'),
         field: (row) => row.totalWithVat,
         format: (value) => toCurrency(value),
         sortable: true,
+        align: 'left',
     },
 ]);
 </script>
@@ -139,17 +147,22 @@ const ticketsColumns = ref([
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-three">
+            <QCard class="vn-max">
                 <div class="header">
                     {{ t('invoiceOut.summary.tickets') }}
                 </div>
                 <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
+                    <template #body-cell-id="{ row }">
+                        <QTd>
+                            <QBtn flat dense color="blue"> {{ row.id }}</QBtn>
+                            <TicketDescriptorProxy :id="row.id" />
+                        </QTd>
+                    </template>
+                    <template #body-cell-alias="{ row }">
+                        <QTd>
+                            <QBtn flat dense color="blue"> {{ row.nickname }}</QBtn>
+                            <CustomerDescriptorProxy :id="row.clientFk" />
+                        </QTd>
                     </template>
                 </QTable>
             </QCard>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 8d3583da3..00e008af5 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,17 +1,20 @@
 <script setup>
-import { onMounted, onUnmounted, ref, watch } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { exportFile, useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
+
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import InvoiceOutSummaryDialog from './Card/InvoiceOutSummaryDialog.vue';
-import { toDate, toCurrency } from 'src/filters/index';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+
+import InvoiceOutFilter from './InvoiceOutFilter.vue';
+import { toDate, toCurrency } from 'src/filters/index';
+import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const selectedCards = ref(new Map());
@@ -139,39 +142,7 @@ const downloadCsv = () => {
                             :disable="selectedCards.size === 0"
                             :label="t('globals.download')"
                         />
-                        <!-- <QBtnDropdown
-                            class="q-mr-xl"
-                            color="primary"
-                            :disable="!manageCheckboxes && arrayElements.length < 1"
-                            :label="t('globals.download')"
-                            v-else
-                        >
-                            <QList>
-                                <QItem clickable v-close-popup @click="downloadCsv(rows)">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{
-                                                t('globals.allRows', {
-                                                    numberRows: rows.length,
-                                                })
-                                            }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
 
-                                <QItem clickable v-close-popup @click="downloadCsv(rows)">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{
-                                                t('globals.selectRows', {
-                                                    numberRows: rows.length,
-                                                })
-                                            }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </QList>
-                        </QBtnDropdown> -->
                         <QCheckbox
                             left-label
                             :label="t('globals.markAll')"
@@ -196,18 +167,24 @@ const downloadCsv = () => {
                         >
                             <template #list-items>
                                 <VnLv
-                                    :label="t('invoiceOut.list.shortIssued')"
-                                    :title-label="t('invoiceOut.list.issued')"
+                                    :label="t('invoiceOut.list.amount')"
                                     :value="toDate(row.issued)"
                                 />
                                 <VnLv
                                     :label="t('invoiceOut.list.amount')"
                                     :value="toCurrency(row.amount)"
                                 />
-                                <VnLv
-                                    :label="t('invoiceOut.list.client')"
-                                    :value="row.clientSocialName"
-                                />
+
+                                <VnLv :label="t('invoiceOut.list.client')">
+                                    <template #value>
+                                        <span class="link" @click.stop>
+                                            {{ row?.clientSocialName }}
+                                            <CustomerDescriptorProxy
+                                                :id="row?.clientFk"
+                                            />
+                                        </span>
+                                    </template>
+                                </VnLv>
                                 <VnLv
                                     :label="t('invoiceOut.list.shortCreated')"
                                     :title-label="t('invoiceOut.list.created')"
@@ -224,13 +201,6 @@ const downloadCsv = () => {
                                 />
                             </template>
                             <template #actions>
-                                <QBtn
-                                    :label="t('components.smartCard.openCard')"
-                                    @click.stop="navigate(row.id)"
-                                    class="bg-vn-dark"
-                                    outline
-                                    type="reset"
-                                />
                                 <QBtn
                                     :label="t('components.smartCard.openSummary')"
                                     @click.stop="viewSummary(row.id)"
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index c832d577c..8b7da4b9b 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,17 +1,17 @@
 <script setup>
 import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QCheckbox, QBtn } from 'quasar';
 
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 
 import { toCurrency } from 'src/filters';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
 const stateStore = useStateStore();
@@ -47,76 +47,6 @@ onBeforeMount(async () => {
 
 const rows = computed(() => arrayData.value.store.data);
 
-const selectedCustomerId = ref(0);
-const selectedWorkerId = ref(0);
-
-const tableColumnComponents = {
-    company: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    country: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    clientId: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectCustomerId(prop.value),
-    },
-    client: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    amount: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    base: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    ticketId: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    active: {
-        component: QCheckbox,
-        props: (prop) => ({
-            disable: true,
-            'model-value': Boolean(prop.value),
-        }),
-        event: () => {},
-    },
-    hasToInvoice: {
-        component: QCheckbox,
-        props: (prop) => ({
-            disable: true,
-            'model-value': Boolean(prop.value),
-        }),
-        event: () => {},
-    },
-    verifiedData: {
-        component: QCheckbox,
-        props: (prop) => ({
-            disable: true,
-            'model-value': Boolean(prop.value),
-        }),
-        event: () => {},
-    },
-    comercial: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectWorkerId(prop.row.comercialId),
-    },
-};
-
 const columns = computed(() => [
     {
         label: t('invoiceOut.negativeBases.company'),
@@ -205,14 +135,6 @@ const downloadCSV = async () => {
         params
     );
 };
-
-const selectCustomerId = (id) => {
-    selectedCustomerId.value = id;
-};
-
-const selectWorkerId = (id) => {
-    selectedWorkerId.value = id;
-};
 </script>
 
 <template>
@@ -236,31 +158,22 @@ const selectWorkerId = (id) => {
             :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
         >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <component
-                        :is="tableColumnComponents[props.col.name].component"
-                        class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
-                        @click="tableColumnComponents[props.col.name].event(props)"
-                    >
-                        <template
-                            v-if="
-                                props.col.name !== 'active' &&
-                                props.col.name !== 'hasToInvoice' &&
-                                props.col.name !== 'verifiedData'
-                            "
-                            >{{ props.value }}
-                        </template>
-                        <CustomerDescriptorProxy
-                            v-if="props.col.name === 'clientId'"
-                            :id="selectedCustomerId"
-                        />
-                        <VnUserLink
-                            v-if="props.col.name === 'comercial'"
-                            :worker-id="selectedWorkerId"
-                        />
-                    </component>
+            <template #body-cell-clientId="{ row }">
+                <QTd>
+                    <QBtn flat dense color="blue"> {{ row.clientId }}</QBtn>
+                    <CustomerDescriptorProxy :id="row.clientId" />
+                </QTd>
+            </template>
+            <template #body-cell-ticketId="{ row }">
+                <QTd>
+                    <QBtn flat dense color="blue"> {{ row.ticketFk }}</QBtn>
+                    <TicketDescriptorProxy :id="row.ticketFk" />
+                </QTd>
+            </template>
+            <template #body-cell-comercial="{ row }">
+                <QTd>
+                    <QBtn flat dense color="blue">{{ row.comercialName }}</QBtn>
+                    <WorkerDescriptorProxy :id="row.comercialId" />
                 </QTd>
             </template>
         </QTable>

From df620566ef36a875fd67ff4bb2b2a34fad244e5f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 12 Feb 2024 08:11:44 -0300
Subject: [PATCH 002/128] Invoice out globals corrections

---
 src/i18n/en/index.js                          |  2 +-
 src/i18n/es/index.js                          |  2 +-
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 17 ++---------
 src/stores/invoiceOutGlobal.js                | 30 ++++++++-----------
 4 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9585bf7fb..5d6b1f65b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -565,7 +565,7 @@ export default {
                 fillDates: 'Invoice date and the max date should be filled',
                 invoiceDateLessThanMaxDate: 'Invoice date can not be less than max date',
                 invoiceWithFutureDate: 'Exists an invoice with a future date',
-                noTicketsToInvoice: 'There are not clients to invoice',
+                noTicketsToInvoice: 'There are not tickets to invoice',
                 criticalInvoiceError: 'Critical invoicing error, process stopped',
             },
             table: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 30e982ea2..5c60e840d 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -567,7 +567,7 @@ export default {
                 invoiceDateLessThanMaxDate:
                     'La fecha de la factura no puede ser menor que la fecha máxima',
                 invoiceWithFutureDate: 'Existe una factura con una fecha futura',
-                noTicketsToInvoice: 'No hay clientes para facturar',
+                noTicketsToInvoice: 'No existen tickets para facturar',
                 criticalInvoiceError: 'Error crítico en la facturación, proceso detenido',
             },
             table: {
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index c61b9f7ff..a000d6d4f 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -13,13 +13,8 @@ const { t } = useI18n();
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
 
 // invoiceOutGlobalStore state and getters
-const {
-    initialDataLoading,
-    formInitialData,
-
-    invoicing,
-    status,
-} = storeToRefs(invoiceOutGlobalStore);
+const { initialDataLoading, formInitialData, invoicing, status } =
+    storeToRefs(invoiceOutGlobalStore);
 
 // invoiceOutGlobalStore actions
 const { makeInvoice, setStatusValue } = invoiceOutGlobalStore;
@@ -32,13 +27,7 @@ const printersOptions = ref([]);
 
 const clientsOptions = ref([]);
 
-const formData = ref({
-    companyFk: null,
-    invoiceDate: null,
-    maxShipped: null,
-    clientId: null,
-    printer: null,
-});
+const formData = ref({});
 
 const optionsInitialData = computed(() => {
     return (
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 7151aac5f..9929a0127 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -73,6 +73,9 @@ export const useInvoiceOutGlobalStore = defineStore({
                 const stringDate = data.issued.substring(0, 10);
                 this.minInvoicingDate = stringDate;
                 this.formInitialData.invoiceDate = stringDate;
+
+                this.minInvoicingDate = new Date(data.issued);
+                this.formInitialData.invoiceDate = this.minInvoicingDate;
             } catch (err) {
                 console.error('Error fetching invoice out global initial data');
                 throw new Error();
@@ -103,12 +106,9 @@ export const useInvoiceOutGlobalStore = defineStore({
 
                 if (clientsToInvoice == 'all') params.clientId = undefined;
 
-                const addressesResponse = await await axios.post(
-                    'InvoiceOuts/clientsToInvoice',
-                    params
-                );
+                const { data } = await axios.post('InvoiceOuts/clientsToInvoice', params);
 
-                this.addresses = addressesResponse.data;
+                this.addresses = data;
 
                 if (!this.addresses || !this.addresses.length > 0) {
                     notify(
@@ -118,9 +118,9 @@ export const useInvoiceOutGlobalStore = defineStore({
                     throw new Error("There aren't addresses to invoice");
                 }
 
-                this.addresses.forEach(async (address) => {
+                for (const address of this.addresses) {
                     await this.invoiceClient(address, formData);
-                });
+                }
             } catch (err) {
                 this.handleError(err);
             }
@@ -186,13 +186,10 @@ export const useInvoiceOutGlobalStore = defineStore({
                 this.status = 'invoicing';
                 this.invoicing = true;
 
-                const invoiceResponse = await axios.post(
-                    'InvoiceOuts/invoiceClient',
-                    params
-                );
+                const { data } = await axios.post('InvoiceOuts/invoiceClient', params);
 
-                if (invoiceResponse.data) {
-                    this.makePdfAndNotify(invoiceResponse.data, address);
+                if (data) {
+                    await this.makePdfAndNotify(data, address);
                 }
 
                 this.isInvoicing = false;
@@ -203,7 +200,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                     err.response.status >= 400 &&
                     err.response.status < 500
                 ) {
-                    this.invoiceClientError(address, err.response);
+                    this.invoiceClientError(address, err.response?.data?.error?.message);
                     this.addressIndex++;
                     return;
                 } else {
@@ -227,12 +224,11 @@ export const useInvoiceOutGlobalStore = defineStore({
                 this.nPdfs++;
                 this.nRequests--;
             } catch (err) {
-                this.invoiceClientError(client, err, true);
+                this.invoiceClientError(client, err.response?.data?.error?.message, true);
             }
         },
 
-        invoiceClientError(client, response, isWarning) {
-            const message = response.data?.error?.message || response.message;
+        invoiceClientError(client, message, isWarning) {
             this.errors.unshift({ client, message, isWarning });
         },
 

From 8adee21f2beba0b1be5164fc6ff777117461b46e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 14 Feb 2024 08:05:06 -0300
Subject: [PATCH 003/128] WIP

---
 .../Card/InvoiceOutDescriptorMenu.vue         | 69 +++++++++++++++----
 .../InvoiceOut/Card/InvoiceOutSummary.vue     |  4 +-
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index ab8b6470b..94c05f772 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -6,35 +6,80 @@ const { t } = useI18n();
 
 <template>
     <QItem v-ripple clickable>
-        <QItemSection>{{ t('Transfer invoice to') }}</QItemSection>
+        <QItemSection>{{ t('Transfer invoice to...') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
-        <QItemSection>{{ t('See invoice') }}</QItemSection>
+        <QItemSection>{{ t('Show invoice...') }}</QItemSection>
+        <QItemSection side>
+            <QIcon name="keyboard_arrow_right" />
+        </QItemSection>
+        <QMenu anchor="top end" self="top start">
+            <QList>
+                <QItem v-ripple clickable>
+                    <QItemSection>{{ t('As PDF') }}</QItemSection>
+                </QItem>
+                <QItem v-ripple clickable>
+                    <QItemSection>{{ t('As CSV') }}</QItemSection>
+                </QItem>
+            </QList>
+        </QMenu>
     </QItem>
     <QItem v-ripple clickable>
-        <QItemSection>{{ t('Send invoice') }}</QItemSection>
+        <QItemSection>{{ t('Send invoice...') }}</QItemSection>
+        <QItemSection side>
+            <QIcon name="keyboard_arrow_right" />
+        </QItemSection>
+        <QMenu anchor="top end" self="top start">
+            <QList>
+                <QItem v-ripple clickable>
+                    <QItemSection>{{ t('Send PDF') }}</QItemSection>
+                </QItem>
+                <QItem v-ripple clickable>
+                    <QItemSection>{{ t('Send CSV') }}</QItemSection>
+                </QItem>
+            </QList>
+        </QMenu>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection>{{ t('Delete invoice') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
-        <QItemSection>{{ t('Post invoice') }}</QItemSection>
+        <QItemSection>{{ t('Book invoice') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
-        <QItemSection>{{ t('Regenerate invoice PDF') }}</QItemSection>
+        <QItemSection>{{ t('Generate PDF invoice') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
-        <QItemSection>{{ t('Pass') }}</QItemSection>
+        <QItemSection>{{ t('Refund...') }}</QItemSection>
+        <QItemSection side>
+            <QIcon name="keyboard_arrow_right" />
+        </QItemSection>
+        <QMenu anchor="top end" self="top start">
+            <QList>
+                <QItem v-ripple clickable>
+                    <QItemSection>{{ t('With warehouse') }}</QItemSection>
+                </QItem>
+                <QItem v-ripple clickable>
+                    <QItemSection>{{ t('Without warehouse') }}</QItemSection>
+                </QItem>
+            </QList>
+        </QMenu>
     </QItem>
 </template>
 
 <i18n>
 es:
-    Transfer invoice to: Transferir factura a
-    See invoice: Ver factura
-    Send invoice: Enviar factura
+    Transfer invoice to...: Transferir factura a...
+    Show invoice...: Ver factura...
+    Send invoice...: Enviar factura...
     Delete invoice: Eliminar factura
-    Post invoice: Asentar factura
-    Regenerate invoice PDF: Regenerar PDF factura
-    Pass: Abono
+    Book invoice: Asentar factura
+    Generate PDF invoice: Generar PDF factura
+    Refund...: Abono
+    As PDF: como PDF
+    As CSV: como CSV
+    Send PDF: Enviar PDF
+    Send CSV: Enviar CSV
+    With warehouse: Con almacén
+    Without warehouse: Sin almacén
 </i18n>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index afdc4ea7d..5721818e4 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -154,13 +154,13 @@ const ticketsColumns = ref([
                 <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
                     <template #body-cell-id="{ row }">
                         <QTd>
-                            <QBtn flat dense color="blue"> {{ row.id }}</QBtn>
+                            <QBtn flat color="primary"> {{ row.id }}</QBtn>
                             <TicketDescriptorProxy :id="row.id" />
                         </QTd>
                     </template>
                     <template #body-cell-alias="{ row }">
                         <QTd>
-                            <QBtn flat dense color="blue"> {{ row.nickname }}</QBtn>
+                            <QBtn flat dense color="primary"> {{ row.nickname }}</QBtn>
                             <CustomerDescriptorProxy :id="row.clientFk" />
                         </QTd>
                     </template>

From ac555a01468560efa8a08841aa51299d9ff4c4bb Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 15 Feb 2024 11:36:53 -0300
Subject: [PATCH 004/128] Transfer invoice form

---
 src/components/TransferInvoiceForm.vue        | 190 ++++++++++++++++++
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  |  11 +-
 .../Card/InvoiceOutDescriptorMenu.vue         |  18 +-
 3 files changed, 214 insertions(+), 5 deletions(-)
 create mode 100644 src/components/TransferInvoiceForm.vue

diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
new file mode 100644
index 000000000..e62c7638c
--- /dev/null
+++ b/src/components/TransferInvoiceForm.vue
@@ -0,0 +1,190 @@
+<script setup>
+import { ref, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    invoiceOutData: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+
+const transferInvoiceParams = reactive({
+    id: $props.invoiceOutData?.id,
+    refFk: $props.invoiceOutData?.ref,
+});
+const closeButton = ref(null);
+const isLoading = ref(false);
+const clientsOptions = ref([]);
+const rectificativeTypeOptions = ref([]);
+const siiTypeInvoiceOutsOptions = ref([]);
+const invoiceCorrectionTypesOptions = ref([]);
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+
+const transferInvoice = async () => {
+    try {
+        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);
+    }
+};
+</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)"
+        auto-load
+    />
+    <FetchData
+        url="SiiTypeInvoiceOuts"
+        :filter="{ where: { code: { like: 'R%' } } }"
+        @on-fetch="(data) => (siiTypeInvoiceOutsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="InvoiceCorrectionTypes"
+        @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
+        auto-load
+    />
+    <QForm @submit="transferInvoice()" class="all-pointer-events">
+        <QCard class="column" style="padding: 32px; z-index: 100">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ t('Transfer invoice') }}</h1>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Client')"
+                        :options="clientsOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="transferInvoiceParams.newClientFk"
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        #{{ scope.opt?.id }} -
+                                        {{ scope.opt?.name }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Rectificative type')"
+                        :options="rectificativeTypeOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Class')"
+                        :options="siiTypeInvoiceOutsOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.code }} -
+                                        {{ scope.opt?.description }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Type')"
+                        :options="invoiceCorrectionTypesOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+            <div class="q-mt-lg row justify-end">
+                <QBtn
+                    :label="t('Transfer client')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
+            </div>
+        </QCard>
+    </QForm>
+</template>
+
+<i18n>
+es:
+    Transfer invoice: Transferir factura
+    Transfer client: Transferir cliente
+    Client: Cliente
+    Rectificative type: Tipo rectificativa
+    Class: Clase
+    Type: Tipo
+    Transferred invoice: Factura transferida
+</i18n>
+
+<style lang="scss" scoped>
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+</style>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 9c1bb3649..e01706e84 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -2,13 +2,15 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toCurrency, toDate } from 'src/filters';
+
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
 
+import useCardDescription from 'src/composables/useCardDescription';
+import { toCurrency, toDate } from 'src/filters';
+
 const $props = defineProps({
     id: {
         type: Number,
@@ -23,7 +25,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const descriptor = ref();
 
 const filter = {
     include: [
@@ -42,6 +43,8 @@ const filter = {
     ],
 };
 
+const descriptor = ref();
+
 function ticketFilter(invoice) {
     return JSON.stringify({ refFk: invoice.ref });
 }
@@ -61,7 +64,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         data-key="invoiceOutData"
     >
         <template #menu="{ entity }">
-            <InvoiceOutDescriptorMenu :invoice-out="entity" />
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 94c05f772..a7e94951a 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -1,11 +1,23 @@
 <script setup>
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import TransferInvoiceForm from 'src/components/TransferInvoiceForm.vue';
+
+const $props = defineProps({
+    invoiceOutData: {
+        type: Object,
+        default: () => {},
+    },
+});
+
 const { t } = useI18n();
+
+const transferInvoiceDialogRef = ref();
 </script>
 
 <template>
-    <QItem v-ripple clickable>
+    <QItem v-ripple clickable @click="transferInvoiceDialogRef.show()">
         <QItemSection>{{ t('Transfer invoice to...') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
@@ -65,6 +77,10 @@ const { t } = useI18n();
             </QList>
         </QMenu>
     </QItem>
+
+    <QDialog ref="transferInvoiceDialogRef">
+        <TransferInvoiceForm :invoice-out-data="invoiceOutData" />
+    </QDialog>
 </template>
 
 <i18n>

From af12512de9d2804f2176c8a68e04ddc11083b934 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 15 Feb 2024 18:10:54 -0300
Subject: [PATCH 005/128] WIP

---
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index a7e94951a..3521ba0d7 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -14,6 +14,10 @@ const $props = defineProps({
 const { t } = useI18n();
 
 const transferInvoiceDialogRef = ref();
+
+const showInvoicePdf = () => {};
+
+const showInvoiceCsv = () => {};
 </script>
 
 <template>
@@ -27,10 +31,10 @@ const transferInvoiceDialogRef = ref();
         </QItemSection>
         <QMenu anchor="top end" self="top start">
             <QList>
-                <QItem v-ripple clickable>
+                <QItem v-ripple clickable @click="showInvoicePdf()">
                     <QItemSection>{{ t('As PDF') }}</QItemSection>
                 </QItem>
-                <QItem v-ripple clickable>
+                <QItem v-ripple clickable @click="showInvoiceCsv()">
                     <QItemSection>{{ t('As CSV') }}</QItemSection>
                 </QItem>
             </QList>

From 41e5110a8a4bbf6b276e0ab16a4ec987834f0487 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 16 Feb 2024 08:10:47 -0300
Subject: [PATCH 006/128] Invoice out list and summary changes

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 69 ++++++++++++-------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 7d19359d4..7bdf2ffbd 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -2,7 +2,6 @@
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { exportFile, useQuasar } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
@@ -16,12 +15,14 @@ import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import { toDate, toCurrency } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useSession } from 'src/composables/useSession';
 
 const { t } = useI18n();
 const selectedCards = ref(new Map());
-const quasar = useQuasar();
 const router = useRouter();
 const stateStore = useStateStore();
+const session = useSession();
+const token = session.getToken();
 const { viewSummary } = useSummaryDialog();
 
 onMounted(() => (stateStore.rightDrawer = true));
@@ -55,35 +56,31 @@ const toggleAllCards = (cardsData) => {
     }
 };
 
-const downloadCsv = () => {
-    if (selectedCards.value.size === 0) return;
-    const selectedCardsArray = Array.from(selectedCards.value.values());
-    let file;
-    for (var i = 0; i < selectedCardsArray.length; i++) {
-        if (i == 0) file += Object.keys(selectedCardsArray[i]).join(';') + '\n';
-        file +=
-            Object.keys(selectedCardsArray[i])
-                .map(function (key) {
-                    return selectedCardsArray[i][key];
-                })
-                .join(';') + '\n';
-    }
-    const status = exportFile('file.csv', file, {
-        encoding: 'windows-1252',
-        mimeType: 'text/csv;charset=windows-1252;',
-    });
-    if (status === true) {
-        quasar.notify({
-            message: t('fileAllowed'),
-            color: 'positive',
-            icon: 'check',
-        });
-    } else {
-        quasar.notify({
-            message: t('fileDenied'),
-            color: 'negative',
-            icon: 'warning',
-        });
+const openPdf = () => {
+    try {
+        if (selectedCards.value.size === 0) return;
+        const selectedCardsArray = Array.from(selectedCards.value.values());
+
+        if (selectedCards.value.size === 1) {
+            const [invoiceOut] = selectedCardsArray;
+            const url = `api/InvoiceOuts/${invoiceOut.id}/download?access_token=${token}`;
+            window.open(url, '_blank');
+        } else {
+            const invoiceOutIdsArray = selectedCardsArray.map(
+                (invoiceOut) => invoiceOut.id
+            );
+            const invoiceOutIds = invoiceOutIdsArray.join(',');
+
+            const params = new URLSearchParams({
+                access_token: token,
+                ids: invoiceOutIds,
+            });
+
+            const url = `api/InvoiceOuts/downloadZip?${params}`;
+            window.open(url, '_blank');
+        }
+    } catch (err) {
+        console.error('Error opening PDF');
     }
 };
 </script>
@@ -129,13 +126,14 @@ const downloadCsv = () => {
                 <VnSubToolbar class="bg-vn-dark justify-end">
                     <template #st-actions>
                         <QBtn
-                            @click="downloadCsv()"
+                            @click="openPdf()"
                             class="q-mr-xl"
                             color="primary"
                             :disable="selectedCards.size === 0"
                             :label="t('globals.download')"
-                        />
-
+                        >
+                            <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+                        </QBtn>
                         <QCheckbox
                             left-label
                             :label="t('globals.markAll')"
@@ -167,7 +165,6 @@ const downloadCsv = () => {
                                     :label="t('invoiceOut.list.amount')"
                                     :value="toCurrency(row.amount)"
                                 />
-
                                 <VnLv :label="t('invoiceOut.list.client')">
                                     <template #value>
                                         <span class="link" @click.stop>
@@ -216,9 +213,11 @@ en:
     fileDenied: Browser denied file download...
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
+    downloadPdf: Download PDF
 es:
     searchInvoice: Buscar factura emitida
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
+    downloadPdf: Download PDF
 </i18n>

From ba9839bc4e4061123a7f8a58b392307a10f23750 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 24 Jan 2024 07:51:52 -0300
Subject: [PATCH 007/128] Implement routes report

---
 src/pages/Route/RouteList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0b4aa6795..c4ae6c8b6 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -2,7 +2,6 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { dashIfEmpty, toDate, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';

From c013c9054f1dd478305d1d4a163402afade9db91 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 24 Jan 2024 11:48:37 -0300
Subject: [PATCH 008/128] Implement routes tickets dialog

---
 .../Route/Card/RouteListTicketsDialog.vue     | 244 ++++++++++++++++++
 src/pages/Route/RouteList.vue                 |  30 ++-
 2 files changed, 268 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/Route/Card/RouteListTicketsDialog.vue

diff --git a/src/pages/Route/Card/RouteListTicketsDialog.vue b/src/pages/Route/Card/RouteListTicketsDialog.vue
new file mode 100644
index 000000000..9e3aad76d
--- /dev/null
+++ b/src/pages/Route/Card/RouteListTicketsDialog.vue
@@ -0,0 +1,244 @@
+<script setup>
+import { useDialogPluginComponent, useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { computed, ref } from 'vue';
+import FetchData from 'components/FetchData.vue';
+import axios from 'axios';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import TicketDescriptorProxy from "pages/Ticket/Card/TicketDescriptorProxy.vue";
+
+const { t } = useI18n();
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+const emit = defineEmits([...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+
+const columns = computed(() => [
+    {
+        name: 'ticket',
+        label: t('Ticket'),
+        field: (row) => row.id,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'client',
+        label: t('Client'),
+        field: (row) => row.nickname,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'province',
+        label: t('Province'),
+        field: (row) => row?.address?.province?.name,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'population',
+        label: t('Population'),
+        field: (row) => row?.address?.city,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'pc',
+        label: t('PC'),
+        field: (row) => row?.address?.postalCode,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'address',
+        label: t('Address'),
+        field: (row) => row?.address?.street,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'zone',
+        label: t('Zone'),
+        field: (row) => row?.zone?.name,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'actions',
+        label: '',
+        sortable: false,
+        align: 'right',
+    },
+]);
+
+const refreshKey = ref(0);
+const selectedRows = ref([]);
+const isLoading = ref(true);
+const ticketList = ref([]);
+
+const onDataFetched = (data) => {
+    ticketList.value = data;
+    isLoading.value = false;
+};
+
+const selectedTicket = ref(null);
+const unlinkZone = async (ticket) => {
+    await axios.post('Routes/unlink', {
+        agencyModeId: ticket?.agencyModeFk,
+        zoneId: ticket.zoneFk,
+    });
+    selectedTicket.value = null;
+    refreshKey.value++;
+};
+
+const setTicketsRoute = async () => {
+    if (!selectedRows.value?.length) {
+        return;
+    }
+
+    const updates = selectedRows.value?.map((ticket) => ({
+        where: {
+            id: ticket.id,
+            data: {
+                routeFk: $props.id,
+            },
+        },
+    }));
+
+    await axios.post(`Tickets/crud`, { updates });
+    await axios.post(`Routes/${$props.id}/updateVolume`);
+    emit('ok');
+    emit('hide');
+};
+</script>
+
+<template>
+    <FetchData
+        :key="refreshKey"
+        :url="`Routes/${$props.id}/getSuggestedTickets`"
+        @on-fetch="onDataFetched"
+        auto-load
+    />
+    <QDialog
+        :model-value="Boolean(selectedTicket)"
+        @update:model-value="(value) => (!value ? (selectedTicket = null) : null)"
+        class="confirmation-dialog"
+    >
+        <QCard style="min-width: 350px">
+            <QCardSection>
+                <p class="text-h6 q-ma-none">{{ t('Unlink selected zone?') }}</p>
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn
+                    flat
+                    :label="t('globals.cancel')"
+                    v-close-popup
+                    class="text-primary"
+                />
+                <QBtn color="primary" v-close-popup @click="unlinkZone(selectedTicket)">
+                    {{ t('Unlink') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <QCard class="full-width dialog">
+            <QCardSection class="row items-center q-pb-none">
+                <div class="text-h6">{{ t('Tickets to add') }}</div>
+                <QSpace />
+                <QBtn icon="close" flat round dense v-close-popup />
+            </QCardSection>
+            <QCardSection>
+                <QTable
+                    v-model:selected="selectedRows"
+                    :columns="columns"
+                    :loading="isLoading"
+                    :rows="ticketList"
+                    flat
+                    row-key="id"
+                    selection="multiple"
+                    :rows-per-page-options="[0]"
+                    hide-pagination
+                >
+                    <template #body-cell-ticket="props">
+                        <QTd :props="props">
+                            <span class="link">
+                                {{ props.value }}
+                                <TicketDescriptorProxy :id="props?.row?.id" />
+                            </span>
+                        </QTd>
+                    </template>
+                    <template #body-cell-client="props">
+                        <QTd :props="props">
+                            <span class="link">
+                                {{ props.value }}
+                                <CustomerDescriptorProxy :id="props?.row?.clientFk" />
+                            </span>
+                        </QTd>
+                    </template>
+                    <template #body-cell-actions="props">
+                        <QTd :props="props">
+                            <QIcon
+                                name="link_off"
+                                size="xs"
+                                color="primary"
+                                class="cursor-pointer"
+                                @click="selectedTicket = props?.row"
+                            >
+                                <QTooltip
+                                    >{{
+                                        t('Unlink zone', {
+                                            zone: props?.row?.zone?.name,
+                                            agency: props?.row?.agencyMode?.name,
+                                        })
+                                    }}
+                                </QTooltip>
+                            </QIcon>
+                        </QTd>
+                    </template>
+                </QTable>
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn flat v-close-popup class="text-primary"
+                    >{{ t('globals.cancel') }}
+                </QBtn>
+                <QBtn
+                    color="primary"
+                    :disable="!selectedRows?.length"
+                    @click="setTicketsRoute"
+                    >{{ t('globals.add') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<style lang="scss" scoped>
+.confirmation-dialog {
+    z-index: 6001 !important;
+}
+
+.dialog {
+    max-width: 1200px;
+}
+</style>
+<i18n>
+en:
+    Unlink zone: Unlink zone {zone} from agency {agency}
+es:
+    Tickets to add: Tickets a añadir
+    Client: Cliente
+    Province: Provincia
+    Population: Población
+    PC: CP
+    Address: Dirección
+    Zone: Zona
+    Unlink zone: Desvincular zona {zone} de agencia {agency}
+    Unlink: Desvincular
+</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index c4ae6c8b6..59803abbc 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -15,12 +15,15 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import {useSession} from "composables/useSession";
+import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
+import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
+const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
 
@@ -143,8 +146,8 @@ const cloneRoutes = () => {
 };
 
 const showRouteReport = () => {
-    const ids = selectedRows.value.map(row => row?.id)
-    const idString = ids.join(',')
+    const ids = selectedRows.value.map((row) => row?.id);
+    const idString = ids.join(',');
     let url;
 
     if (selectedRows.value.length <= 1) {
@@ -152,12 +155,12 @@ const showRouteReport = () => {
     } else {
         const params = new URLSearchParams({
             access_token: session.getToken(),
-            id: idString
-        })
+            id: idString,
+        });
         url = `api/Routes/downloadZip?${params.toString()}`;
     }
     window.open(url, '_blank');
-}
+};
 
 const markAsServed = () => {
     selectedRows.value.forEach((row) => {
@@ -168,6 +171,20 @@ const markAsServed = () => {
     refreshKey.value++;
     startingDate.value = null;
 };
+
+const openTicketsDialog = (id) => {
+    if (!id) {
+        return;
+    }
+    quasar
+        .dialog({
+            component: RouteListTicketsDialog,
+            componentProps: {
+                id,
+            },
+        })
+        .onOk(() => refreshKey.value++);
+};
 </script>
 
 <template>
@@ -470,6 +487,7 @@ const markAsServed = () => {
                                             size="xs"
                                             color="primary"
                                             class="cursor-pointer"
+                                            @click="openTicketsDialog(props?.row?.id)"
                                         >
                                             <QTooltip>{{ t('Add ticket') }}</QTooltip>
                                         </QIcon>

From 103e2f65dc246704bad2e74f371c7d3507314028 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 25 Jan 2024 00:03:26 -0400
Subject: [PATCH 009/128] Center ticket field

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

diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index a10ca088e..08dbadbcb 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -104,7 +104,7 @@ const ticketColumns = ref([
         label: t('route.summary.ticket'),
         field: (row) => row?.id,
         sortable: false,
-        align: 'right',
+        align: 'center',
     },
     {
         name: 'observations',
@@ -237,7 +237,7 @@ const openBuscaman = async (route, ticket) => {
                             </QTd>
                         </template>
                         <template #body-cell-ticket="{ value, row }">
-                            <QTd auto-width>
+                            <QTd auto-width class="text-center">
                                 <span class="text-primary cursor-pointer">
                                     {{ value }}
                                     <TicketDescriptorProxy :id="row?.id" />

From 6629a2d59a38d86df4e984ab392e60f6a163fe29 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 25 Jan 2024 08:09:43 -0300
Subject: [PATCH 010/128] Fix route summary dialog

---
 src/pages/Route/Card/RouteListTicketsDialog.vue | 2 +-
 src/pages/Route/Card/RouteSummary.vue           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/Card/RouteListTicketsDialog.vue b/src/pages/Route/Card/RouteListTicketsDialog.vue
index 9e3aad76d..1323224b3 100644
--- a/src/pages/Route/Card/RouteListTicketsDialog.vue
+++ b/src/pages/Route/Card/RouteListTicketsDialog.vue
@@ -225,7 +225,7 @@ const setTicketsRoute = async () => {
 }
 
 .dialog {
-    max-width: 1200px;
+    max-width: 1280px;
 }
 </style>
 <i18n>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 08dbadbcb..130f7be0d 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -131,7 +131,7 @@ const openBuscaman = async (route, ticket) => {
 </script>
 
 <template>
-    <div class="q-pa-md">
+    <div class="q-pa-md full-width">
         <CardSummary ref="summary" :url="`Routes/${entityId}/summary`">
             <template #header-left>
                 <RouterLink :to="{ name: `RouteSummary`, params: { id: entityId } }">

From 67f862ebe3e315afd2bf3180fd774bad418cafd4 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 25 Jan 2024 08:10:34 -0300
Subject: [PATCH 011/128] Create route tickets

---
 src/i18n/en/index.js             | 111 +----------
 src/i18n/es/index.js             |   1 +
 src/pages/Route/RouteTickets.vue | 325 +++++++++++++++++++++++++++++++
 src/router/modules/route.js      |  11 +-
 4 files changed, 339 insertions(+), 109 deletions(-)
 create mode 100644 src/pages/Route/RouteTickets.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9e0ad7c9b..de88ae6fc 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -62,14 +62,8 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
-        requiredField: 'Required field',
-        class: 'clase',
-        type: 'type',
-        reason: 'reason',
         noResults: 'No results',
         system: 'System',
-        fieldRequired: 'Field required',
-        allowedFilesText: 'Allowed file types: { allowedContentTypes }',
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -137,8 +131,6 @@ export default {
             log: 'Log',
             sms: 'Sms',
             creditManagement: 'Credit management',
-            creditContracts: 'Credit contracts',
-            creditOpinion: 'Credit opinion',
             others: 'Others',
         },
         list: {
@@ -274,8 +266,6 @@ export default {
             buys: 'Buys',
             notes: 'Notes',
             log: 'Log',
-            create: 'Create',
-            latestBuys: 'Latest buys',
         },
         list: {
             newEntry: 'New entry',
@@ -331,12 +321,6 @@ export default {
             booked: 'Booked',
             raid: 'Raid',
             excludedFromAvailable: 'Inventory',
-            agency: 'Agency',
-            warehouseOut: 'Warehouse Out',
-            warehouseIn: 'Warehouse In',
-            shipped: 'Shipped',
-            landed: 'Landed',
-            id: 'ID',
         },
         buys: {
             groupingPrice: 'Grouping price',
@@ -350,12 +334,6 @@ export default {
             grouping: 'Grouping',
             buyingValue: 'Buying value',
             packagingFk: 'Box',
-            file: 'File',
-            name: 'Name',
-            producer: 'Producer',
-            type: 'Type',
-            color: 'Color',
-            id: 'ID',
         },
         notes: {
             observationType: 'Observation type',
@@ -366,36 +344,6 @@ export default {
             landed: 'Landed',
             warehouseOut: 'Warehouse Out',
         },
-        latestBuys: {
-            picture: 'Picture',
-            itemFk: 'Item ID',
-            packing: 'Packing',
-            grouping: 'Grouping',
-            quantity: 'Quantity',
-            description: 'Description',
-            size: 'Size',
-            tags: 'Tags',
-            type: 'Type',
-            intrastat: 'Intrastat',
-            origin: 'Origin',
-            weightByPiece: 'Weight/Piece',
-            isActive: 'Active',
-            family: 'Family',
-            entryFk: 'Entry',
-            buyingValue: 'Buying value',
-            freightValue: 'Freight value',
-            comissionValue: 'Commission value',
-            packageValue: 'Package value',
-            isIgnored: 'Is ignored',
-            price2: 'Grouping',
-            price3: 'Packing',
-            minPrice: 'Min',
-            ektFk: 'Ekt',
-            weight: 'Weight',
-            packagingFk: 'Package',
-            packingOut: 'Package out',
-            landing: 'Landing',
-        },
     },
     ticket: {
         pageTitles: {
@@ -547,7 +495,6 @@ export default {
             responsible: 'Responsible',
             worker: 'Worker',
             redelivery: 'Redelivery',
-            returnOfMaterial: 'RMA',
         },
         basicData: {
             customer: 'Customer',
@@ -686,7 +633,6 @@ export default {
             vat: 'VAT',
             dueDay: 'Due day',
             intrastat: 'Intrastat',
-            corrective: 'Corrective',
             log: 'Logs',
         },
         list: {
@@ -941,6 +887,7 @@ export default {
             create: 'Create',
             basicData: 'Basic Data',
             summary: 'Summary',
+            tickets: 'Tickets'
         },
         cmr: {
             list: {
@@ -1070,7 +1017,6 @@ export default {
             m3Price: 'M3 Price',
             routePrice: 'Route price',
             minimumKm: 'Minimum Km',
-            addRow: 'Add row',
         },
         consumption: {
             entry: 'Entry',
@@ -1087,8 +1033,8 @@ export default {
             extraCommunity: 'Extra community',
             travelCreate: 'New travel',
             basicData: 'Basic data',
-            history: 'Log',
-            thermographs: 'Thermograph',
+            history: 'History',
+            thermographs: 'Termographs',
         },
         summary: {
             confirmed: 'Confirmed',
@@ -1100,10 +1046,7 @@ export default {
             entries: 'Entries',
             cloneShipping: 'Clone travel',
             CloneTravelAndEntries: 'Clone travel and his entries',
-            deleteTravel: 'Delete travel',
             AddEntry: 'Add entry',
-            thermographs: 'Thermographs',
-            hb: 'HB',
         },
         variables: {
             search: 'Id/Reference',
@@ -1115,50 +1058,6 @@ export default {
             continent: 'Continent out',
             totalEntries: 'Total entries',
         },
-        basicData: {
-            reference: 'Reference',
-            agency: 'Agency',
-            shipped: 'Shipped',
-            landed: 'Landed',
-            warehouseOut: 'Warehouse Out',
-            warehouseIn: 'Warehouse In',
-            delivered: 'Delivered',
-            received: 'Received',
-        },
-        thermographs: {
-            code: 'Code',
-            temperature: 'Temperature',
-            state: 'State',
-            destination: 'Destination',
-            created: 'Created',
-            thermograph: 'Thermograph',
-            reference: 'Reference',
-            type: 'Type',
-            company: 'Company',
-            warehouse: 'Warehouse',
-            travelFileDescription: 'Travel id { travelId }',
-            file: 'File',
-            description: 'Description',
-        },
-    },
-    item: {
-        pageTitles: {
-            items: 'Items',
-            list: 'List',
-            diary: 'Diary',
-            tags: 'Tags',
-        },
-        descriptor: {
-            item: 'Item',
-            buyer: 'Buyer',
-            color: 'Color',
-            category: 'Category',
-            stems: 'Stems',
-            visible: 'Visible',
-            available: 'Available',
-            warehouseText: 'Calculated on the warehouse of { warehouseName }',
-            itemDiary: 'Item diary',
-        },
     },
     components: {
         topbar: {},
@@ -1183,9 +1082,5 @@ export default {
             addToPinned: 'Add to pinned',
             removeFromPinned: 'Remove from pinned',
         },
-        VnLv: {
-            copyText: '{copyValue} has been copied to the clipboard',
-        },
-        iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6083dfad7..69c5ba170 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -941,6 +941,7 @@ export default {
             create: 'Crear',
             basicData: 'Datos básicos',
             summary: 'Summary',
+            tickets: 'Tickets'
         },
         cmr: {
             list: {
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
new file mode 100644
index 000000000..36f216fc3
--- /dev/null
+++ b/src/pages/Route/RouteTickets.vue
@@ -0,0 +1,325 @@
+<script setup>
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import { useI18n } from 'vue-i18n';
+import { computed, ref } from 'vue';
+import { dashIfEmpty } from 'src/filters';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+import axios from 'axios';
+import { QIcon, useQuasar } from 'quasar';
+import { useSession } from 'composables/useSession';
+import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
+import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import { useRoute } from 'vue-router';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const session = useSession();
+const route = useRoute();
+
+const selectedRows = ref([]);
+const columns = computed(() => [
+    {
+        name: 'order',
+        label: t('Order'),
+        field: (row) => dashIfEmpty(row?.priority),
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'street',
+        label: t('Street'),
+        field: (row) => row?.street,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'city',
+        label: t('City'),
+        field: (row) => row?.city,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'pc',
+        label: t('PC'),
+        field: (row) => row?.postalCode,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'client',
+        label: t('Client'),
+        field: (row) => row?.nickname,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'warehouse',
+        label: t('Warehouse'),
+        field: (row) => row?.warehouseName,
+        sortable: false,
+        align: 'left',
+    },
+    {
+        name: 'packages',
+        label: t('Packages'),
+        field: (row) => row?.packages,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'volume',
+        label: 'm³',
+        field: (row) => row?.volume,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'packaging',
+        label: t('Packaging'),
+        field: (row) => row?.ipt,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'ticket',
+        label: t('Ticket'),
+        field: (row) => row?.id,
+        sortable: false,
+        align: 'center',
+    },
+    {
+        name: 'observations',
+        label: '',
+        field: (row) => row?.ticketObservation,
+        sortable: false,
+        align: 'left',
+    },
+]);
+
+const refreshKey = ref(0);
+const confirmationDialog = ref(false);
+const startingDate = ref(null);
+
+const cloneRoutes = () => {
+    axios.post('Routes/clone', {
+        created: startingDate.value,
+        ids: selectedRows.value.map((row) => row?.id),
+    });
+    refreshKey.value++;
+    startingDate.value = null;
+};
+
+const showRouteReport = () => {
+    const ids = selectedRows.value.map((row) => row?.id);
+    const idString = ids.join(',');
+    let url;
+
+    if (selectedRows.value.length <= 1) {
+        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getToken()}`;
+    } else {
+        const params = new URLSearchParams({
+            access_token: session.getToken(),
+            id: idString,
+        });
+        url = `api/Routes/downloadZip?${params.toString()}`;
+    }
+    window.open(url, '_blank');
+};
+
+const markAsServed = () => {
+    selectedRows.value.forEach((row) => {
+        if (row?.id) {
+            axios.patch(`Routes/${row?.id}`, { isOk: true });
+        }
+    });
+    refreshKey.value++;
+    startingDate.value = null;
+};
+
+const openTicketsDialog = () => {
+    quasar
+        .dialog({
+            component: RouteListTicketsDialog,
+            componentProps: {
+                id: route.params.id,
+            },
+        })
+        .onOk(() => refreshKey.value++);
+};
+</script>
+
+<template>
+    <QDialog v-model="confirmationDialog">
+        <QCard style="min-width: 350px">
+            <QCardSection>
+                <p class="text-h6 q-ma-none">{{ t('Select the starting date') }}</p>
+            </QCardSection>
+
+            <QCardSection class="q-pt-none">
+                <VnInputDate
+                    :label="t('Stating date')"
+                    v-model="startingDate"
+                    autofocus
+                />
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
+                <QBtn color="primary" v-close-popup @click="cloneRoutes">
+                    {{ t('Clone') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+    <QPage class="column items-center">
+        <QToolbar class="bg-vn-dark justify-end">
+            <div id="st-actions" class="q-pa-sm">
+                <QBtn
+                    icon="vn:clone"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="confirmationDialog = true"
+                >
+                    <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    icon="cloud_download"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="showRouteReport"
+                >
+                    <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    icon="check"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="markAsServed"
+                >
+                    <QTooltip>{{ t('Mark as served') }}</QTooltip>
+                </QBtn>
+            </div>
+        </QToolbar>
+        <div class="route-list">
+            <VnPaginate
+                :key="refreshKey"
+                data-key="RouteTicketList"
+                url="Routes/getTickets"
+                :filter="{ id: route.params.id }"
+                :order="['priority ASC']"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <div class="q-pa-md">
+                        <QTable
+                            v-model:selected="selectedRows"
+                            :columns="columns"
+                            :rows="rows"
+                            :rows-per-page-options="[0]"
+                            row-key="id"
+                            flat
+                            hide-pagination
+                            selection="multiple"
+                        >
+                            <template #body-cell-order="{ row }">
+                                <QTd class="order-field">
+                                    <VnInput
+                                        v-model="row.priority"
+                                        is-outlined
+                                    />
+                                </QTd>
+                            </template>
+                            <template #body-cell-city="{ value, row }">
+                                <QTd auto-width>
+                                    <span
+                                        class="text-primary cursor-pointer"
+                                        @click="openBuscaman(entity?.route, row)"
+                                    >
+                                        {{ value }}
+                                    </span>
+                                </QTd>
+                            </template>
+                            <template #body-cell-client="{ value, row }">
+                                <QTd auto-width>
+                                    <span class="text-primary cursor-pointer">
+                                        {{ value }}
+                                        <CustomerDescriptorProxy :id="row?.clientFk" />
+                                    </span>
+                                </QTd>
+                            </template>
+                            <template #body-cell-ticket="{ value, row }">
+                                <QTd auto-width class="text-center">
+                                    <span class="text-primary cursor-pointer">
+                                        {{ value }}
+                                        <TicketDescriptorProxy :id="row?.id" />
+                                    </span>
+                                </QTd>
+                            </template>
+                            <template #body-cell-observations="{ value }">
+                                <QTd auto-width>
+                                    <div class="flex items-center no-wrap table-actions">
+                                        <QIcon
+                                            name="delete"
+                                            color="primary"
+                                            class="cursor-pointer"
+                                            size="xs"
+                                        >
+                                            <QTooltip>{{ t('globals.remove') }}</QTooltip>
+                                        </QIcon>
+                                        <QIcon
+                                            v-if="value"
+                                            name="vn:notes"
+                                            color="primary"
+                                            class="cursor-pointer"
+                                        >
+                                            <QTooltip>{{ value }}</QTooltip>
+                                        </QIcon>
+                                    </div>
+                                </QTd>
+                            </template>
+                        </QTable>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="openTicketsDialog">
+                <QTooltip>
+                    {{ t('newRoute') }}
+                </QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.route-list {
+    width: 100%;
+}
+
+.order-field {
+    max-width: 50px;
+}
+
+.table-actions {
+    gap: 12px;
+}
+</style>
+<i18n>
+en:
+    newRoute: New Route
+es:
+    Order: Orden
+    Street: Dirección fiscal
+    City: Población
+    PC: CP
+    Client: Cliente
+    Warehouse: Almacén
+    Packages: Bultos
+    Packaging: Encajado
+</i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 614345913..763fa9969 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'RouteMain' },
     menus: {
         main: ['RouteList', 'CmrList'],
-        card: ['RouteBasicData'],
+        card: ['RouteBasicData', 'RouteTickets'],
     },
     children: [
         {
@@ -72,6 +72,15 @@ export default {
                     },
                     component: () => import('pages/Route/Card/RouteSummary.vue'),
                 },
+                {
+                    path: 'tickets',
+                    name: 'RouteTickets',
+                    meta: {
+                        title: 'tickets',
+                        icon: 'vn:ticket',
+                    },
+                    component: () => import('src/pages/Route/RouteTickets.vue'),
+                },
             ],
         },
     ],

From b3f8d369eef53789f5a3eb91410f8f891f48b9c6 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 28 Jan 2024 12:49:56 -0300
Subject: [PATCH 012/128] Create route tickets actions

---
 src/components/common/SendSmsDialog.vue       | 153 +++++++++++++
 .../Route/Card/RouteListTicketsDialog.vue     |   8 +-
 src/pages/Route/RouteTickets.vue              | 203 ++++++++++++++----
 src/utils/buscaman.js                         |  22 ++
 4 files changed, 338 insertions(+), 48 deletions(-)
 create mode 100644 src/components/common/SendSmsDialog.vue
 create mode 100644 src/utils/buscaman.js

diff --git a/src/components/common/SendSmsDialog.vue b/src/components/common/SendSmsDialog.vue
new file mode 100644
index 000000000..a0d476ff0
--- /dev/null
+++ b/src/components/common/SendSmsDialog.vue
@@ -0,0 +1,153 @@
+<script setup>
+import { useDialogPluginComponent } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { computed, ref } from 'vue';
+import VnInput from 'components/common/VnInput.vue';
+import axios from 'axios';
+
+const MESSAGE_MAX_LENGTH = 160;
+
+const { t } = useI18n();
+const props = defineProps({
+    title: {
+        type: String,
+        required: true,
+    },
+    url: {
+        type: String,
+        required: true,
+    },
+    destination: {
+        type: String,
+        required: true,
+    },
+    destinationFk: {
+        type: String,
+        required: true,
+    },
+    data: {
+        type: Object,
+        default: () => ({}),
+    },
+});
+
+const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+
+const smsRules = [
+    (val) => (val && val.length > 0) || t("The message can't be empty"),
+    (val) =>
+        (val && new Blob([val]).size <= MESSAGE_MAX_LENGTH) ||
+        t("The message it's too long"),
+];
+
+const message = ref('');
+
+const charactersRemaining = computed(
+    () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size
+);
+
+const charactersChipColor = computed(() => {
+    if (charactersRemaining.value < 0) {
+        return 'negative';
+    }
+    if (charactersRemaining.value <= 25) {
+        return 'warning';
+    }
+    return 'primary';
+});
+
+const onSubmit = async () => {
+    if (!props.destination) {
+        throw new Error(`The destination can't be empty`);
+    }
+
+    if (!message.value) {
+        throw new Error(`The message can't be empty`);
+    }
+
+    if (charactersRemaining.value < 0) {
+        throw new Error(`The message it's too long`);
+    }
+
+    const response = await axios.post(props.url, {
+        destination: props.destination,
+        destinationFk: props.destinationFk,
+        message: message.value,
+        ...props.data,
+    });
+
+    if (response.data) {
+        emit('sent', response.data);
+    }
+    emit('ok', response.data);
+    emit('hide', response.data);
+};
+</script>
+
+<template>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <QCard class="full-width dialog">
+            <QCardSection class="row">
+                <span v-if="title" class="text-h6">{{ title }}</span>
+                <QSpace />
+                <QBtn icon="close" flat round dense v-close-popup />
+            </QCardSection>
+            <QForm @submit="onSubmit">
+                <QCardSection>
+                    <VnInput
+                        v-model="message"
+                        type="textarea"
+                        :rules="smsRules"
+                        :label="t('Message')"
+                        :placeholder="t('Message')"
+                        :rows="5"
+                        required
+                        clearable
+                        no-error-icon
+                    >
+                        <template #append>
+                            <QIcon name="info">
+                                <QTooltip>
+                                    {{
+                                        t(
+                                            'Special characters like accents counts as a multiple'
+                                        )
+                                    }}
+                                </QTooltip>
+                            </QIcon>
+                        </template>
+                    </VnInput>
+                    <p class="q-mb-none q-mt-md">
+                        {{ t('Characters remaining') }}:
+                        <QChip :color="charactersChipColor">
+                            {{ charactersRemaining }}
+                        </QChip>
+                    </p>
+                </QCardSection>
+                <QCardActions align="right">
+                    <QBtn type="button" flat v-close-popup class="text-primary">
+                        {{ t('globals.cancel') }}
+                    </QBtn>
+                    <QBtn type="submit" color="primary">{{ t('Send') }}</QBtn>
+                </QCardActions>
+            </QForm>
+        </QCard>
+    </QDialog>
+</template>
+
+<style lang="scss" scoped>
+.dialog {
+    max-width: 450px;
+}
+</style>
+<i18n>
+es:
+    Message: Mensaje
+    Send: Enviar
+    Characters remaining: Carácteres restantes
+    Special characters like accents counts as a multiple: Carácteres especiales como los acentos cuentan como varios
+    The destination can't be empty: El destinatario no puede estar vacio
+    The message can't be empty: El mensaje no puede estar vacio
+    The message it's too long: El mensaje es demasiado largo
+</i18n>
diff --git a/src/pages/Route/Card/RouteListTicketsDialog.vue b/src/pages/Route/Card/RouteListTicketsDialog.vue
index 1323224b3..e5a8ac2b9 100644
--- a/src/pages/Route/Card/RouteListTicketsDialog.vue
+++ b/src/pages/Route/Card/RouteListTicketsDialog.vue
@@ -1,11 +1,11 @@
 <script setup>
-import { useDialogPluginComponent, useQuasar } from 'quasar';
+import { useDialogPluginComponent } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import axios from 'axios';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import TicketDescriptorProxy from "pages/Ticket/Card/TicketDescriptorProxy.vue";
+import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 
 const { t } = useI18n();
 const $props = defineProps({
@@ -19,7 +19,7 @@ const emit = defineEmits([...useDialogPluginComponent.emits]);
 
 const { dialogRef, onDialogHide } = useDialogPluginComponent();
 
-const columns = computed(() => [
+const columns = ref([
     {
         name: 'ticket',
         label: t('Ticket'),
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 36f216fc3..4044fb543 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -7,15 +7,17 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import { QIcon, useQuasar } from 'quasar';
-import { useSession } from 'composables/useSession';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { useRoute } from 'vue-router';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import FetchData from 'components/FetchData.vue';
+import { openBuscaman } from 'src/utils/buscaman';
+import SendSmsDialog from 'components/common/SendSmsDialog.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
-const session = useSession();
 const route = useRoute();
 
 const selectedRows = ref([]);
@@ -102,6 +104,8 @@ const columns = computed(() => [
 const refreshKey = ref(0);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
+const routeEntity = ref(null);
+const ticketList = ref([]);
 
 const cloneRoutes = () => {
     axios.post('Routes/clone', {
@@ -112,31 +116,54 @@ const cloneRoutes = () => {
     startingDate.value = null;
 };
 
-const showRouteReport = () => {
-    const ids = selectedRows.value.map((row) => row?.id);
-    const idString = ids.join(',');
-    let url;
-
-    if (selectedRows.value.length <= 1) {
-        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getToken()}`;
-    } else {
-        const params = new URLSearchParams({
-            access_token: session.getToken(),
-            id: idString,
-        });
-        url = `api/Routes/downloadZip?${params.toString()}`;
+const deletePriorities = async () => {
+    try {
+        await Promise.all(
+            selectedRows.value.map((ticket) =>
+                axios.patch(`Tickets/${ticket?.id}/`, { priority: null })
+            )
+        );
+    } finally {
+        refreshKey.value++;
     }
-    window.open(url, '_blank');
 };
 
-const markAsServed = () => {
-    selectedRows.value.forEach((row) => {
-        if (row?.id) {
-            axios.patch(`Routes/${row?.id}`, { isOk: true });
-        }
-    });
+const setOrderedPriority = async () => {
+    try {
+        await Promise.all(
+            ticketList.value.map((ticket, index) =>
+                axios.patch(`Tickets/${ticket?.id}/`, { priority: index + 1 })
+            )
+        );
+    } finally {
+        refreshKey.value++;
+    }
+};
+
+const sortRoutes = async () => {
+    await axios.get(`Routes/${route.params?.id}/guessPriority/`);
     refreshKey.value++;
-    startingDate.value = null;
+};
+
+const updatePriority = async (ticket, priority = null) => {
+    return axios.patch(`Tickets/${ticket?.id}/`, {
+        priority: priority || ticket?.priority,
+    });
+};
+
+const setHighestPriority = async (ticket, ticketList) => {
+    const highestPriority = Math.max(...ticketList.map((item) => item.priority)) + 1;
+    if (highestPriority - 1 !== ticket.priority) {
+        const response = await updatePriority(ticket, highestPriority);
+        ticket.priority = response.data.priority;
+    }
+};
+
+const goToBuscaman = async (ticket = null) => {
+    await openBuscaman(
+        routeEntity.value?.vehicleFk,
+        ticket ? [ticket] : selectedRows.value
+    );
 };
 
 const openTicketsDialog = () => {
@@ -149,9 +176,57 @@ const openTicketsDialog = () => {
         })
         .onOk(() => refreshKey.value++);
 };
+
+const removeTicket = async (ticket) => {
+    await axios.patch(`Tickets/${ticket?.id}/`, { routeFk: null });
+    await axios.post(`Routes/${route?.params?.id}/updateVolume`);
+    refreshKey.value++;
+};
+
+const confirmRemove = (ticket) => {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('confirmDeletion'),
+                message: t('confirmDeletionMessage'),
+                promise: () => removeTicket(ticket),
+            },
+        })
+        .onOk(() => refreshKey.value++);
+};
+
+const openSmsDialog = async () => {
+    const clientsId = [];
+    const clientsPhone = [];
+
+    for (let ticket of selectedRows.value) {
+        clientsId.push(ticket?.clientFk);
+        const { data: client } = await axios.get(`Clients/${ticket?.clientFk}`);
+        clientsPhone.push(client.phone);
+    }
+
+    quasar.dialog({
+        component: SendSmsDialog,
+        componentProps: {
+            title: t('Send SMS to the selected tickets'),
+            url: 'Routes/sendSms',
+            destinationFk: clientsId.toString(),
+            destination: clientsPhone.toString(),
+        },
+    });
+};
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (routeEntity = data)"
+        auto-load
+        :url="`Routes/${route.params?.id}`"
+        :filter="{
+            fields: ['vehicleFk'],
+        }"
+    />
     <QDialog v-model="confirmationDialog">
         <QCard style="min-width: 350px">
             <QCardSection>
@@ -176,32 +251,47 @@ const openTicketsDialog = () => {
     <QPage class="column items-center">
         <QToolbar class="bg-vn-dark justify-end">
             <div id="st-actions" class="q-pa-sm">
-                <QBtn
-                    icon="vn:clone"
-                    color="primary"
-                    class="q-mr-sm"
-                    :disable="!selectedRows?.length"
-                    @click="confirmationDialog = true"
-                >
-                    <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+                <QBtn icon="vn:wand" color="primary" class="q-mr-sm" @click="sortRoutes">
+                    <QTooltip>{{ t('Sort routes') }}</QTooltip>
                 </QBtn>
                 <QBtn
-                    icon="cloud_download"
+                    icon="vn:buscaman"
                     color="primary"
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
-                    @click="showRouteReport"
+                    @click="goToBuscaman()"
                 >
-                    <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
+                    <QTooltip>{{ t('Open buscaman') }}</QTooltip>
                 </QBtn>
                 <QBtn
-                    icon="check"
+                    icon="filter_alt"
                     color="primary"
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
-                    @click="markAsServed"
+                    @click="deletePriorities"
                 >
-                    <QTooltip>{{ t('Mark as served') }}</QTooltip>
+                    <QTooltip>{{ t('Delete priority') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    icon="format_list_numbered"
+                    color="primary"
+                    class="q-mr-sm"
+                    @click="setOrderedPriority"
+                >
+                    <QTooltip
+                        >{{
+                            t('Renumber all tickets in the order you see on the screen')
+                        }}
+                    </QTooltip>
+                </QBtn>
+                <QBtn
+                    icon="sms"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="openSmsDialog"
+                >
+                    <QTooltip>{{ t('Send SMS to all clients') }}</QTooltip>
                 </QBtn>
             </div>
         </QToolbar>
@@ -213,6 +303,7 @@ const openTicketsDialog = () => {
                 :filter="{ id: route.params.id }"
                 :order="['priority ASC']"
                 auto-load
+                @on-fetch="(data) => (ticketList = data)"
             >
                 <template #body="{ rows }">
                     <div class="q-pa-md">
@@ -228,19 +319,30 @@ const openTicketsDialog = () => {
                         >
                             <template #body-cell-order="{ row }">
                                 <QTd class="order-field">
-                                    <VnInput
-                                        v-model="row.priority"
-                                        is-outlined
-                                    />
+                                    <div class="flex no-wrap items-center">
+                                        <QIcon
+                                            name="low_priority"
+                                            size="xs"
+                                            class="q-mr-md cursor-pointer"
+                                            color="primary"
+                                            @click="setHighestPriority(row, rows)"
+                                        />
+                                        <VnInput
+                                            v-model="row.priority"
+                                            is-outlined
+                                            @blur="updatePriority(row)"
+                                        />
+                                    </div>
                                 </QTd>
                             </template>
                             <template #body-cell-city="{ value, row }">
                                 <QTd auto-width>
                                     <span
                                         class="text-primary cursor-pointer"
-                                        @click="openBuscaman(entity?.route, row)"
+                                        @click="goToBuscaman(row)"
                                     >
                                         {{ value }}
+                                        <QTooltip>{{ t('Open buscaman') }}</QTooltip>
                                     </span>
                                 </QTd>
                             </template>
@@ -260,7 +362,7 @@ const openTicketsDialog = () => {
                                     </span>
                                 </QTd>
                             </template>
-                            <template #body-cell-observations="{ value }">
+                            <template #body-cell-observations="{ value, row }">
                                 <QTd auto-width>
                                     <div class="flex items-center no-wrap table-actions">
                                         <QIcon
@@ -268,6 +370,7 @@ const openTicketsDialog = () => {
                                             color="primary"
                                             class="cursor-pointer"
                                             size="xs"
+                                            @click="confirmRemove(row)"
                                         >
                                             <QTooltip>{{ t('globals.remove') }}</QTooltip>
                                         </QIcon>
@@ -303,7 +406,8 @@ const openTicketsDialog = () => {
 }
 
 .order-field {
-    max-width: 50px;
+    max-width: 140px;
+    min-width: 120px;
 }
 
 .table-actions {
@@ -313,6 +417,8 @@ const openTicketsDialog = () => {
 <i18n>
 en:
     newRoute: New Route
+    confirmDeletion: Confirm deletion
+    confirmDeletionMessage: Are you sure you want to delete this ticket?
 es:
     Order: Orden
     Street: Dirección fiscal
@@ -322,4 +428,13 @@ es:
     Warehouse: Almacén
     Packages: Bultos
     Packaging: Encajado
+    confirmDeletion: Confirmar eliminación
+    confirmDeletionMessage: Seguro que quieres eliminar este ticket?
+    Sort routes: Ordenar rutas
+    Open buscaman: Abrir buscaman
+    Delete priority: Borrar orden
+    Renumber all tickets in the order you see on the screen: Renumerar todos los tickets con el orden que ves por pantalla
+    Assign highest priority: Asignar máxima prioridad
+    Send SMS to all clients: Mandar sms a todos los clientes de las rutas
+    Send SMS to the selected tickets: Enviar SMS a los tickets seleccionados
 </i18n>
diff --git a/src/utils/buscaman.js b/src/utils/buscaman.js
new file mode 100644
index 000000000..0778a21e8
--- /dev/null
+++ b/src/utils/buscaman.js
@@ -0,0 +1,22 @@
+import axios from 'axios';
+
+const BUSCAMAN_URL = 'https://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=';
+
+export async function openBuscaman(vehicleId, tickets) {
+    if (!vehicleId) throw new Error(`The route doesn't have a vehicle`);
+
+    const response = await axios.get(`Routes/${vehicleId}/getDeliveryPoint`);
+
+    if (!response.data) {
+        throw new Error(`The route's vehicle doesn't have a delivery point`);
+    }
+
+    let addresses = response.data;
+    tickets.forEach((ticket, index) => {
+        const previousLine = tickets[index - 1] ? tickets[index - 1].street : null;
+        if (previousLine !== tickets.street) {
+            addresses += `+to:${ticket.postalCode} ${ticket.city} ${ticket.street}`;
+        }
+    });
+    window.open(BUSCAMAN_URL + encodeURI(addresses), '_blank');
+}

From 76dd84fd8704b362d07341234272b66b35dbf104 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 28 Jan 2024 12:58:19 -0300
Subject: [PATCH 013/128] Create route logs

---
 src/i18n/en/index.js         |  3 ++-
 src/i18n/es/index.js         |  3 ++-
 src/pages/Route/RouteLog.vue |  6 ++++++
 src/router/modules/route.js  | 11 ++++++++++-
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/Route/RouteLog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index de88ae6fc..1c2e168a7 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -887,7 +887,8 @@ export default {
             create: 'Create',
             basicData: 'Basic Data',
             summary: 'Summary',
-            tickets: 'Tickets'
+            tickets: 'Tickets',
+            log: 'Log'
         },
         cmr: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 69c5ba170..30cd21e85 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -941,7 +941,8 @@ export default {
             create: 'Crear',
             basicData: 'Datos básicos',
             summary: 'Summary',
-            tickets: 'Tickets'
+            tickets: 'Tickets',
+            log: 'Historial',
         },
         cmr: {
             list: {
diff --git a/src/pages/Route/RouteLog.vue b/src/pages/Route/RouteLog.vue
new file mode 100644
index 000000000..25fb28014
--- /dev/null
+++ b/src/pages/Route/RouteLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Route" url="/RouteLogs"></VnLog>
+</template>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 763fa9969..abd7db1e5 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'RouteMain' },
     menus: {
         main: ['RouteList', 'CmrList'],
-        card: ['RouteBasicData', 'RouteTickets'],
+        card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
         {
@@ -81,6 +81,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteTickets.vue'),
                 },
+                {
+                    path: 'log',
+                    name: 'RouteLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Route/RouteLog.vue'),
+                },
             ],
         },
     ],

From 97f373626c4eebc39512a6a59ef1cc8934a03909 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 28 Jan 2024 13:02:17 -0300
Subject: [PATCH 014/128] Fix route list last index

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

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 59803abbc..f114bb229 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -241,7 +241,7 @@ const openTicketsDialog = (id) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
-    <QPage class="column items-center">
+    <QPage class="column items-center q-mb-xl">
         <VnSubToolbar class="bg-vn-dark justify-end">
             <template #st-actions>
                 <QBtn

From 988362ab69197842023ca93116b8916178f0443f Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 7 Feb 2024 00:01:07 -0300
Subject: [PATCH 015/128] Fix route ticket sms event

---
 src/components/common/SendSmsDialog.vue | 13 ++++++++-----
 src/i18n/en/index.js                    |  1 +
 src/i18n/es/index.js                    |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/common/SendSmsDialog.vue b/src/components/common/SendSmsDialog.vue
index a0d476ff0..269a4ec9a 100644
--- a/src/components/common/SendSmsDialog.vue
+++ b/src/components/common/SendSmsDialog.vue
@@ -1,13 +1,15 @@
 <script setup>
-import { useDialogPluginComponent } from 'quasar';
-import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import {useDialogPluginComponent} from 'quasar';
+import {useI18n} from 'vue-i18n';
+import {computed, ref} from 'vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
+import useNotify from "composables/useNotify";
 
 const MESSAGE_MAX_LENGTH = 160;
 
-const { t } = useI18n();
+const {t} = useI18n();
+const {notify} = useNotify();
 const props = defineProps({
     title: {
         type: String,
@@ -32,7 +34,7 @@ const props = defineProps({
 });
 
 const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
-const { dialogRef, onDialogHide } = useDialogPluginComponent();
+const {dialogRef, onDialogHide} = useDialogPluginComponent();
 
 const smsRules = [
     (val) => (val && val.length > 0) || t("The message can't be empty"),
@@ -79,6 +81,7 @@ const onSubmit = async () => {
 
     if (response.data) {
         emit('sent', response.data);
+        notify('globals.smsSent', 'positive');
     }
     emit('ok', response.data);
     emit('hide', response.data);
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1c2e168a7..f8b912cd7 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -64,6 +64,7 @@ export default {
         markAll: 'Mark all',
         noResults: 'No results',
         system: 'System',
+        smsSent: 'SMS sent',
     },
     errors: {
         statusUnauthorized: 'Access denied',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 30cd21e85..5cf527d01 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -70,6 +70,7 @@ export default {
         system: 'Sistema',
         fieldRequired: 'Campo requerido',
         allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }',
+        smsSent: 'SMS enviado',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',

From e8465826066761babf4d8893552f6fc71d59ce5e Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 1 Feb 2024 23:08:59 -0300
Subject: [PATCH 016/128] Create route autonomous

---
 src/i18n/en/index.js                          |   3 +-
 src/i18n/es/index.js                          |   1 +
 .../Card/InvoiceInDescriptorProxy.vue         |  15 +
 .../Route/Card/RouteAutonomousFilter.vue      | 237 ++++++++++++++
 src/pages/Route/RouteAutonomous.vue           | 301 ++++++++++++++++++
 src/router/modules/route.js                   |  29 +-
 6 files changed, 575 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
 create mode 100644 src/pages/Route/Card/RouteAutonomousFilter.vue
 create mode 100644 src/pages/Route/RouteAutonomous.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index f8b912cd7..ce7fada9c 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -889,7 +889,8 @@ export default {
             basicData: 'Basic Data',
             summary: 'Summary',
             tickets: 'Tickets',
-            log: 'Log'
+            log: 'Log',
+            autonomous: 'Autonomous',
         },
         cmr: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 5cf527d01..44d282f44 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -944,6 +944,7 @@ export default {
             summary: 'Summary',
             tickets: 'Tickets',
             log: 'Historial',
+            autonomous: 'Autónomos',
         },
         cmr: {
             list: {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
new file mode 100644
index 000000000..a36656c1d
--- /dev/null
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
@@ -0,0 +1,15 @@
+<script setup>
+import InvoiceInDescriptor from "pages/InvoiceIn/Card/InvoiceInDescriptor.vue";
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+<template>
+    <QPopupProxy>
+        <InvoiceInDescriptor v-if="$props.id" :id="$props.id" />
+    </QPopupProxy>
+</template>
diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue
new file mode 100644
index 000000000..ec30458ce
--- /dev/null
+++ b/src/pages/Route/Card/RouteAutonomousFilter.vue
@@ -0,0 +1,237 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const emit = defineEmits(['search']);
+
+const agencyList = ref([]);
+const agencyAgreementList = ref([]);
+const supplierList = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'agencyModeFk':
+            return { 'a.agencyModeFk': value };
+        case 'supplierFk':
+            return { 'a.supplierName': value };
+        case 'routeFk':
+            return { 'a.routeFk': value };
+        case 'created':
+        case 'agencyFk':
+        case 'packages':
+        case 'm3':
+        case 'kmTotal':
+        case 'price':
+        case 'invoiceInFk':
+            return { [`a.${param}`]: value };
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'] }"
+        sort-by="name ASC"
+        limit="30"
+        @on-fetch="(data) => (agencyList = data)"
+        auto-load
+    />
+    <FetchData
+        url="Agencies"
+        :filter="{ fields: ['id', 'name'] }"
+        sort-by="name ASC"
+        limit="30"
+        @on-fetch="(data) => (agencyAgreementList = data)"
+        auto-load
+    />
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['name'] }"
+        sort-by="name ASC"
+        limit="30"
+        @on-fetch="(data) => (supplierList = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :expr-builder="exprBuilder"
+        search-button
+        @search="emit('search')"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QList dense>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput v-model="params.routeFk" :label="t('ID')" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm" v-if="agencyList">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('Agency route')"
+                            v-model="params.agencyModeFk"
+                            :options="agencyList"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            is-clearable
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm" v-if="agencyAgreementList">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('Agency agreement')"
+                            v-model="params.agencyFk"
+                            :options="agencyAgreementList"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            is-clearable
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm" v-if="supplierList">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('Autonomous')"
+                            v-model="params.supplierFk"
+                            :options="supplierList"
+                            option-value="name"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            emit-value
+                            map-options
+                            use-input
+                            is-clearable
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="t('Date')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.from"
+                            :label="t('From')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.to"
+                            :label="t('To')"
+                            is-outlined
+                            is-clearable
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput v-model="params.packages" :label="t('Packages')" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput v-model="params.m3" :label="t('m3')" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput v-model="params.kmTotal" :label="t('Km')" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput v-model="params.price" :label="t('Price')" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-my-sm">
+                    <QItemSection>
+                        <VnInput v-model="params.invoiceInFk" :label="t('Received')" is-outlined />
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        agencyModeFk: Agency route
+        m3: m³
+        from: From
+        to: To
+        date: Date
+        agencyFk: Agency agreement
+        packages: Packages
+        price: Price
+        invoiceInFk: Received
+        supplierFk: Autonomous
+es:
+    params:
+        agencyModeFk: Agencia ruta
+        m3: m³
+        from: Desde
+        to: Hasta
+        date: Fecha
+        agencyFk: Agencia Acuerdo
+        packages: Bultos
+        price: Precio
+        invoiceInFk: Recibida
+        supplierFk: Autónomos
+    From: Desde
+    To: Hasta
+    Date: Fecha
+    Agency route: Agencia Ruta
+    Agency agreement: Agencia Acuerdo
+    Packages: Bultos
+    Price: Precio
+    Received: Recibida
+    Autonomous: Autónomos
+</i18n>
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
new file mode 100644
index 000000000..00322386d
--- /dev/null
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -0,0 +1,301 @@
+<script setup>
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useI18n } from 'vue-i18n';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
+import RouteSummaryDialog from 'pages/Route/Card/RouteSummaryDialog.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
+import InvoiceInDescriptorProxy from 'pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import { useQuasar } from 'quasar';
+import useNotify from "composables/useNotify";
+import RouteAutonomousFilter from "pages/Route/Card/RouteAutonomousFilter.vue";
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const quasar = useQuasar();
+const { notify } = useNotify();
+
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+const selectedRows = ref([]);
+const columns = computed(() => [
+    {
+        name: 'ID',
+        label: t('ID'),
+        field: (row) => row.routeFk,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'date',
+        label: t('Date'),
+        field: (row) => toDate(row.created),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'agency-route',
+        label: t('Agency route'),
+        field: (row) => row?.agencyModeName,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'agency-agreement',
+        label: t('Agency agreement'),
+        field: (row) => row?.agencyAgreement,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'packages',
+        label: t('Packages'),
+        field: (row) => dashIfEmpty(row.packages),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'volume',
+        label: 'm³',
+        field: (row) => dashIfEmpty(row.m3),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'km',
+        label: t('Km'),
+        field: (row) => dashIfEmpty(row?.kmTotal),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('Price'),
+        field: (row) => (row?.price ? toCurrency(row.price) : '-'),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'received',
+        label: t('Received'),
+        field: (row) => row?.invoiceInFk,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'autonomous',
+        label: t('Autonomous'),
+        field: (row) => row?.supplierName,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'actions',
+        label: '',
+        sortable: false,
+        align: 'right',
+    },
+]);
+
+const refreshKey = ref(0);
+
+const total = computed(() => selectedRows.value.reduce((item) => item?.price || 0, 0));
+
+const openCreateInvoiceIn = () => {
+    const rowsToCreateInvoiceIn = selectedRows.value
+        .filter(
+            (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk
+        )
+        .map((agencyTerm) => ({
+            routeFk: agencyTerm.routeFk,
+            supplierFk: agencyTerm.supplierFk,
+            created: agencyTerm.created,
+            totalPrice: total.value,
+        }));
+
+    if (rowsToCreateInvoiceIn.length !== selectedRows.value.length) {
+        return notify(t('Two autonomous cannot be counted at the same time'), 'negative');
+    }
+
+    const params = JSON.stringify({
+        supplierName: selectedRows.value?.[0].supplierName,
+        rows: rowsToCreateInvoiceIn,
+    });
+
+    console.log(params);
+};
+
+function previewRoute(id) {
+    if (!id) {
+        return;
+    }
+    quasar.dialog({
+        component: RouteSummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
+}
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="RouteAutonomousList"
+                :label="t('Search autonomous')"
+                :info="t('You can search by autonomous reference')"
+            />
+        </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <RouteAutonomousFilter data-key="RouteAutonomousList" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center">
+        <div class="route-list">
+            <div class="q-pa-md">
+                <QCard class="vn-one q-py-sm q-px-lg">
+                    <VnLv class="flex">
+                        <template #label>
+                            <span class="text-h6">{{ t('Total') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
+                        </template>
+                    </VnLv>
+                </QCard>
+            </div>
+            <VnPaginate
+                :key="refreshKey"
+                data-key="RouteAutonomousList"
+                url="AgencyTerms/filter"
+                :limit="20"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <div class="q-pa-md">
+                        <QTable
+                            v-model:selected="selectedRows"
+                            :columns="columns"
+                            :rows="rows"
+                            flat
+                            row-key="routeFk"
+                            selection="multiple"
+                            :rows-per-page-options="[0]"
+                            hide-pagination
+                        >
+                            <template #body-cell-ID="props">
+                                <QTd :props="props">
+                                    <span class="link">
+                                        {{ props.value }}
+                                        <RouteDescriptorProxy :id="props.value" />
+                                    </span>
+                                </QTd>
+                            </template>
+                            <template #body-cell-received="props">
+                                <QTd :props="props">
+                                    <span :class="props.value && 'link'">
+                                        {{ dashIfEmpty(props.value) }}
+                                        <InvoiceInDescriptorProxy
+                                            v-if="props.value"
+                                            :id="props.value"
+                                        />
+                                    </span>
+                                </QTd>
+                            </template>
+                            <template #body-cell-autonomous="props">
+                                <QTd :props="props">
+                                    <span class="link">
+                                        {{ props.value }}
+                                        <SupplierDescriptorProxy
+                                            v-if="props.row?.supplierFk"
+                                            :id="props.row?.supplierFk"
+                                        />
+                                    </span>
+                                </QTd>
+                            </template>
+                            <template #body-cell-actions="props">
+                                <QTd :props="props">
+                                    <div class="table-actions">
+                                        <QIcon
+                                            name="preview"
+                                            size="xs"
+                                            color="primary"
+                                            @click="previewRoute(props?.row?.routeFk)"
+                                        >
+                                            <QTooltip>{{ t('Preview') }}</QTooltip>
+                                        </QIcon>
+                                    </div>
+                                </QTd>
+                            </template>
+                        </QTable>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky :offset="[20, 20]" v-if="selectedRows?.length">
+            <QBtn
+                fab
+                icon="vn:invoice-in-create"
+                color="primary"
+                @click="openCreateInvoiceIn"
+            >
+                <QTooltip>
+                    {{ t('Create invoiceIn') }}
+                </QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.route-list {
+    width: 100%;
+}
+
+.table-actions {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+
+    i {
+        cursor: pointer;
+    }
+}
+</style>
+<i18n>
+es:
+    Search autonomous: Buscar autónomos
+    You can search by autonomous reference: Puedes buscar por referencia del autónomo
+    Create invoiceIn: Crear factura recibida
+    Two autonomous cannot be counted at the same time: Dos autonónomos no pueden ser contabilizados al mismo tiempo
+    Date: Fecha
+    Agency route: Agencia Ruta
+    Agency agreement: Agencia Acuerdo
+    Packages: Bultos
+    Price: Precio
+    Received: Recibida
+    Autonomous: Autónomos
+</i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index abd7db1e5..297fcedf8 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'CmrList'],
+        main: ['RouteList', 'RouteAutonomous', 'CmrList'],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -20,15 +20,6 @@ export default {
             component: () => import('src/pages/Route/RouteMain.vue'),
             redirect: { name: 'RouteList' },
             children: [
-                {
-                    path: 'cmr',
-                    name: 'CmrList',
-                    meta: {
-                        title: 'cmrsList',
-                        icon: 'fact_check',
-                    },
-                    component: () => import('src/pages/Route/Cmr/CmrList.vue'),
-                },
                 {
                     path: 'list',
                     name: 'RouteList',
@@ -46,6 +37,24 @@ export default {
                     },
                     component: () => import('src/pages/Route/Card/RouteForm.vue'),
                 },
+                {
+                    path: 'agency-term',
+                    name: 'RouteAutonomous',
+                    meta: {
+                        title: 'autonomous',
+                        icon: 'vn:agency-term',
+                    },
+                    component: () => import('src/pages/Route/RouteAutonomous.vue'),
+                },
+                {
+                    path: 'cmr',
+                    name: 'CmrList',
+                    meta: {
+                        title: 'cmrsList',
+                        icon: 'fact_check',
+                    },
+                    component: () => import('src/pages/Route/Cmr/CmrList.vue'),
+                },
             ],
         },
         {

From 046ac0406b17c7ea05d0f580fc9501073143ac3b Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 13 Feb 2024 21:43:26 -0300
Subject: [PATCH 017/128] Create invoice in autonomous page

---
 src/pages/Route/Card/RouteForm.vue            |   2 +-
 src/pages/Route/RouteAutonomous.vue           |  12 +-
 .../Route/RouteAutonomousCreateInvoiceIn.vue  | 207 ++++++++++++++++++
 src/router/modules/route.js                   |   8 +
 4 files changed, 223 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/Route/RouteAutonomousCreateInvoiceIn.vue

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 604f04357..53f42145c 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -89,7 +89,7 @@ const onSave = (data, response) => {
     <FetchData
         url="AgencyModes/isActive"
         :filter="{ fields: ['id', 'name'] }"
-        sort-by="name ASC"
+        sort-by="name"
         limit="30"
         @on-fetch="(data) => (agencyList = data)"
         auto-load
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 00322386d..2ed024d29 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -11,13 +11,15 @@ import InvoiceInDescriptorProxy from 'pages/InvoiceIn/Card/InvoiceInDescriptorPr
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import { useQuasar } from 'quasar';
-import useNotify from "composables/useNotify";
-import RouteAutonomousFilter from "pages/Route/Card/RouteAutonomousFilter.vue";
+import useNotify from 'composables/useNotify';
+import RouteAutonomousFilter from 'pages/Route/Card/RouteAutonomousFilter.vue';
+import { useRouter } from 'vue-router';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const quasar = useQuasar();
 const { notify } = useNotify();
+const router = useRouter();
 
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -122,12 +124,12 @@ const openCreateInvoiceIn = () => {
         return notify(t('Two autonomous cannot be counted at the same time'), 'negative');
     }
 
-    const params = JSON.stringify({
+    const params = encodeURI(JSON.stringify({
         supplierName: selectedRows.value?.[0].supplierName,
         rows: rowsToCreateInvoiceIn,
-    });
+    }));
 
-    console.log(params);
+    router.push({ name: 'RouteAutonomousCreateInvoiceIn', query: { q: params } });
 };
 
 function previewRoute(id) {
diff --git a/src/pages/Route/RouteAutonomousCreateInvoiceIn.vue b/src/pages/Route/RouteAutonomousCreateInvoiceIn.vue
new file mode 100644
index 000000000..2f3f51143
--- /dev/null
+++ b/src/pages/Route/RouteAutonomousCreateInvoiceIn.vue
@@ -0,0 +1,207 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import FetchData from 'components/FetchData.vue';
+import { computed, onBeforeMount, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInput from 'components/common/VnInput.vue';
+import axios from 'axios';
+import { useState } from 'composables/useState';
+
+const state = useState();
+const user = state.getUser();
+
+const { t } = useI18n();
+const route = useRoute();
+
+const formData = ref({});
+const queryParams = JSON.parse(decodeURI(route.query.q || ''));
+
+const companyList = ref([]);
+const warehouseList = ref([]);
+const dmsList = ref([]);
+const file = ref(null);
+const validContentType = ref('');
+
+onBeforeMount(async () => {
+    const [allowedContentTypes, dmsType] = await Promise.all([
+        axios.get('DmsContainers/allowedContentTypes').then((res) => res.data),
+        axios
+            .get('DmsTypes/findOne', {
+                filter: {
+                    where: { code: 'invoiceIn' },
+                },
+            })
+            .then((res) => res.data),
+    ]);
+    validContentType.value = (allowedContentTypes || []).join(', ');
+    formData.value = {
+        warehouseId: user.value.warehouseFk,
+        companyId: user.value.companyFk,
+        dmsTypeId: dmsType.id,
+        description: queryParams.supplierName,
+        hasFileAttached: false,
+        hasFile: false,
+    };
+});
+
+const requestConfig = computed(() => {
+    console.log(file.value);
+    console.log(file.value?.name);
+    let requestBody = {};
+    if (file.value?.length >= 1) {
+        requestBody = new FormData();
+        requestBody.append('file', file.value[0], file.value[0].name);
+    }
+    return {
+        headers: {
+            'Content-Type': 'multipart/form-data',
+        },
+        params: {
+            ...formData.value,
+        },
+        data: requestBody,
+    };
+});
+
+const onSave = (...params) => {
+    console.log('onSave', ...params);
+};
+</script>
+
+<template>
+    <VnSubToolbar />
+    <FetchData
+        url="Companies"
+        sort-by="code"
+        limit="30"
+        @on-fetch="(data) => (companyList = data)"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        sort-by="name"
+        limit="30"
+        @on-fetch="(data) => (warehouseList = data)"
+        auto-load
+    />
+    <FetchData
+        url="DmsTypes"
+        sort-by="name"
+        limit="30"
+        @on-fetch="(data) => (dmsList = data)"
+        auto-load
+    />
+    <FormModel
+        url-create="dms/uploadFile"
+        model="dms"
+        :observe-form-changes="false"
+        :auto-load="false"
+        :form-initial-data="formData"
+        :request-config="requestConfig"
+        @on-data-saved="onSave"
+    >
+        <template #form>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="formData.reference"
+                        :label="t('Reference')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Company')"
+                        v-model="formData.companyId"
+                        :options="companyList"
+                        option-value="id"
+                        option-label="code"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Warehouse')"
+                        v-model="formData.warehouseId"
+                        :options="warehouseList"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Type')"
+                        v-model="formData.dmsTypeId"
+                        :options="dmsList"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="formData.description"
+                        :label="t('Description')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QFile
+                        v-model="file"
+                        :label="t('File')"
+                        clearable
+                        required
+                        :accept="validContentType"
+                        multiple
+                        :rules="[(value) => value || t('Enter a value')]"
+                        @update:model-value="
+                            (value) => {
+                                console.log(value);
+                                formData.hasFileAttached = Boolean(value);
+                            }
+                        "
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        v-model="formData.hasFile"
+                        :label="t('Generate identifier for original file')"
+                        multiple
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+<i18n>
+es:
+    Reference: Referencia
+    Company: Empresa
+    Warehouse: Almacén
+    Type: Tipo
+    Description: Descripción
+    File: Fichero
+    Generate identifier for original file: Generar identificador para archivo original
+</i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 297fcedf8..4430fd19e 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -46,6 +46,14 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteAutonomous.vue'),
                 },
+                {
+                    path: 'agency-term/createInvoiceIn',
+                    name: 'RouteAutonomousCreateInvoiceIn',
+                    meta: {
+                        title: 'autonomous',
+                    },
+                    component: () => import('src/pages/Route/RouteAutonomousCreateInvoiceIn.vue'),
+                },
                 {
                     path: 'cmr',
                     name: 'CmrList',

From 6ace34cbb15cdae23cd5ffa6b35ccb84effce71b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 19 Feb 2024 17:23:50 -0300
Subject: [PATCH 018/128] descriptor menu show invoice actions

---
 .../Card/InvoiceOutDescriptorMenu.vue           | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 3521ba0d7..ca2bf1304 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -4,6 +4,9 @@ import { useI18n } from 'vue-i18n';
 
 import TransferInvoiceForm from 'src/components/TransferInvoiceForm.vue';
 
+import { useSession } from 'src/composables/useSession';
+import { usePrintService } from 'composables/usePrintService';
+
 const $props = defineProps({
     invoiceOutData: {
         type: Object,
@@ -11,13 +14,23 @@ const $props = defineProps({
     },
 });
 
+const session = useSession();
+const token = session.getToken();
 const { t } = useI18n();
+const { openReport } = usePrintService();
 
 const transferInvoiceDialogRef = ref();
 
-const showInvoicePdf = () => {};
+const showInvoicePdf = () => {
+    const url = `api/InvoiceOuts/${$props.invoiceOutData.id}/download?access_token=${token}`;
+    window.open(url, '_blank');
+};
 
-const showInvoiceCsv = () => {};
+const showInvoiceCsv = () => {
+    openReport(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv`, {
+        recipientId: $props.invoiceOutData.client.id,
+    });
+};
 </script>
 
 <template>

From 8ffa3b76264f7a124467a89aabeb9e38a601920e Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 14 Feb 2024 23:01:19 -0300
Subject: [PATCH 019/128] Create roadmap list page

---
 src/i18n/en/index.js                      |   1 +
 src/i18n/es/index.js                      |   3 +-
 src/pages/Route/Roadmap/RoadmapFilter.vue | 183 ++++++++++++++
 src/pages/Route/RouteRoadmap.vue          | 291 ++++++++++++++++++++++
 src/router/modules/route.js               |  11 +-
 5 files changed, 487 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapFilter.vue
 create mode 100644 src/pages/Route/RouteRoadmap.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ce7fada9c..5bf4be887 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -888,6 +888,7 @@ export default {
             create: 'Create',
             basicData: 'Basic Data',
             summary: 'Summary',
+            RouteRoadmap: 'Roadmaps',
             tickets: 'Tickets',
             log: 'Log',
             autonomous: 'Autonomous',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 44d282f44..cea9c9a6c 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -941,7 +941,8 @@ export default {
             RouteList: 'Listado',
             create: 'Crear',
             basicData: 'Datos básicos',
-            summary: 'Summary',
+            summary: 'Resumen',
+            RouteRoadmap: 'Troncales',
             tickets: 'Tickets',
             log: 'Historial',
             autonomous: 'Autónomos',
diff --git a/src/pages/Route/Roadmap/RoadmapFilter.vue b/src/pages/Route/Roadmap/RoadmapFilter.vue
new file mode 100644
index 000000000..b3fb7bf34
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapFilter.vue
@@ -0,0 +1,183 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const emit = defineEmits(['search']);
+
+const supplierList = ref([]);
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'tractorPlate':
+        case 'trailerPlate':
+        case 'driverName':
+        case 'phone':
+            return { [param]: { like: `%${value}%` } };
+        case 'supplierFk':
+        case 'price':
+            return { [param]: value };
+        case 'from':
+            return { etd: { gte: value } };
+        case 'to':
+            return { etd: { lte: value } };
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['id', 'nickname'] }"
+        sort-by="nickname"
+        limit="30"
+        @on-fetch="(data) => (supplierList = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :expr-builder="exprBuilder"
+        @search="emit('search')"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.tractorPlate"
+                        :label="t('Tractor Plate')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.trailerPlate"
+                        :label="t('Trailer Plate')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="supplierList" class="q-my-sm">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('Carrier')"
+                        v-model="params.supplierFk"
+                        :options="supplierList"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ opt.id }} - {{ opt.nickname }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.price"
+                        :label="t('Price')"
+                        type="number"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.driverName"
+                        :label="t('Driver name')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.phone"
+                        :label="t('Phone')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        tractorPlate: Tractor Plate
+        trailerPlate: Trailer Plate
+        supplierFk: Carrier
+        price: Price
+        driverName: Driver name
+        phone: Phone
+        from: From
+        to: To
+es:
+    params:
+        tractorPlate: Matrícula del tractor
+        trailerPlate: Matrícula del trailer
+        supplierFk: Transportista
+        price: Precio
+        driverName: Nombre del conductor
+        phone: Teléfono
+        from: Desde
+        to: Hasta
+    From: Desde
+    To: Hasta
+    Tractor Plate: Matrícula del tractor
+    Trailer Plate: Matrícula del trailer
+    Carrier: Transportista
+    Price: Precio
+    Driver name: Nombre del conductor
+    Phone: Teléfono
+</i18n>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
new file mode 100644
index 000000000..6962176e4
--- /dev/null
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -0,0 +1,291 @@
+<script setup>
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useI18n } from 'vue-i18n';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { dashIfEmpty, toDateHour } from 'src/filters';
+import { useValidator } from 'composables/useValidator';
+import { useQuasar } from 'quasar';
+import { useSession } from 'composables/useSession';
+import toCurrency from 'filters/toCurrency';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import axios from 'axios';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { validate } = useValidator();
+const quasar = useQuasar();
+const session = useSession();
+
+const to = Date.vnNew();
+to.setDate(to.getDate() + 1);
+to.setHours(0, 0, 0, 0);
+
+const from = Date.vnNew();
+from.setDate(from.getDate());
+from.setHours(0, 0, 0, 0);
+
+const params = ref({ from, to });
+
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+const selectedRows = ref([]);
+const columns = computed(() => [
+    {
+        name: 'roadmap',
+        label: t('Roadmap'),
+        field: (row) => row.name,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'ETD',
+        label: t('ETD'),
+        field: (row) => toDateHour(row.etd),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'carrier',
+        label: t('Carrier'),
+        field: (row) => row.supplier?.nickname,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'plate',
+        label: t('Plate'),
+        field: (row) => row.tractorPlate,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('Price'),
+        field: (row) => toCurrency(row.price),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'observations',
+        label: t('Observations'),
+        field: (row) => dashIfEmpty(row.observations),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'actions',
+        label: '',
+        sortable: false,
+        align: 'right',
+    },
+]);
+
+const refreshKey = ref(0);
+const isCloneDialogOpen = ref(false);
+const etdDate = ref(null);
+const workers = ref([]);
+
+const filter = {
+    include: { relation: 'supplier', scope: { fields: ['nickname'] } },
+    where: {
+        and: [{ etd: { gte: from } }, { etd: { lte: to } }],
+    },
+};
+
+const cloneSelection = async () => {
+    await axios.post('Roadmaps/clone', {
+        etd: etdDate.value,
+        ids: selectedRows.value.map((row) => row?.id),
+    });
+    refreshKey.value++;
+    etdDate.value = null;
+};
+
+const removeSelection = async () => {
+    await Promise.all(
+        selectedRows.value.map((roadmap) => {
+            axios.delete(`Roadmaps/${roadmap.id}`);
+        })
+    );
+};
+
+function confirmRemove() {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Selected roadmaps will be removed'),
+                message: t('Are you sure you want to continue?'),
+                promise: removeSelection,
+            },
+        })
+        .onOk(() => refreshKey.value++);
+}
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="RoadmapList"
+                :label="t('Search roadmap')"
+                :info="t('You can search by roadmap reference')"
+            />
+        </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <RoadmapFilter data-key="RoadmapList" />
+        </QScrollArea>
+    </QDrawer>
+    <QDialog v-model="isCloneDialogOpen">
+        <QCard style="min-width: 350px">
+            <QCardSection>
+                <p class="text-h6 q-ma-none">
+                    {{ t('Select the estimated date of departure (ETD)') }}
+                </p>
+            </QCardSection>
+
+            <QCardSection class="q-pt-none">
+                <VnInputDate :label="t('ETD')" v-model="etdDate" autofocus />
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
+                <QBtn color="primary" v-close-popup @click="cloneSelection">
+                    {{ t('Clone') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+    <QPage class="column items-center">
+        <VnSubToolbar class="bg-vn-dark justify-end">
+            <template #st-actions>
+                <QBtn
+                    icon="vn:clone"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="isCloneDialogOpen = true"
+                >
+                    <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    icon="delete"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="confirmRemove"
+                >
+                    <QTooltip>{{ t('Delete roadmap(s)') }}</QTooltip>
+                </QBtn>
+            </template>
+        </VnSubToolbar>
+        <div class="route-list">
+            <VnPaginate
+                :key="refreshKey"
+                data-key="RoadmapList"
+                url="Roadmaps"
+                :limit="20"
+                :filter="filter"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <div class="q-pa-md">
+                        <QTable
+                            v-model:selected="selectedRows"
+                            :columns="columns"
+                            :rows="rows"
+                            flat
+                            row-key="id"
+                            selection="multiple"
+                            :rows-per-page-options="[0]"
+                            hide-pagination
+                            :pagination="{ sortBy: 'ID', descending: true }"
+                        >
+                            <template #body-cell-carrier="props">
+                                <QTd :props="props">
+                                    <span class="link">
+                                        {{ props.value }}
+                                        <SupplierDescriptorProxy
+                                            :id="props.row?.supplier?.id"
+                                        />
+                                    </span>
+                                </QTd>
+                            </template>
+                            <template #body-cell-actions="props">
+                                <QTd :props="props">
+                                    <div class="flex items-center table-actions">
+                                        <QIcon
+                                            name="preview"
+                                            size="xs"
+                                            color="primary"
+                                            @click="previewRoute(props?.row?.id)"
+                                            class="cursor-pointer"
+                                        >
+                                            <QTooltip>{{ t('Preview') }}</QTooltip>
+                                        </QIcon>
+                                    </div>
+                                </QTd>
+                            </template>
+                        </QTable>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+        <!--        <QPageSticky :offset="[20, 20]">-->
+        <!--            <RouterLink :to="{ name: 'RouteCreate' }">-->
+        <!--                <QBtn fab icon="add" color="primary" />-->
+        <!--                <QTooltip>-->
+        <!--                    {{ t('newRoute') }}-->
+        <!--                </QTooltip>-->
+        <!--            </RouterLink>-->
+        <!--        </QPageSticky>-->
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.route-list {
+    width: 100%;
+}
+
+.table-actions {
+    gap: 12px;
+}
+</style>
+<i18n>
+es:
+    Search roadmap: Buscar trocal
+    You can search by roadmap reference: Puedes buscar por referencia de la trocal
+    Delete roadmap(s): Eliminar trocal(es)
+    Selected roadmaps will be removed: Las trocales seleccionadas serán eliminadas
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    The date can't be empty: La fecha no puede estar vacía
+    Clone Selected Routes: Clonar rutas seleccionadas
+    Roadmap: Trocal
+    Carrier: Transportista
+    Plate: Placa
+    Price: Precio
+    Observations: Observaciones
+</i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 4430fd19e..32e4619ba 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'RouteAutonomous', 'CmrList'],
+        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList'],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -29,6 +29,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteList.vue'),
                 },
+                {
+                    path: 'roadmap',
+                    name: 'RouteRoadmap',
+                    meta: {
+                        title: 'RouteRoadmap',
+                        icon: 'vn:troncales',
+                    },
+                    component: () => import('src/pages/Route/RouteRoadmap.vue'),
+                },
                 {
                     path: 'create',
                     name: 'RouteCreate',

From 45d7b021a623dc2b6ffdfb3d73d0dc769cc81f47 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 14 Feb 2024 23:32:22 -0300
Subject: [PATCH 020/128] Create roadmap create page

---
 src/i18n/en/index.js                      |  1 +
 src/i18n/es/index.js                      |  1 +
 src/pages/Route/Roadmap/RoadmapCreate.vue | 56 +++++++++++++++++++++++
 src/pages/Route/RouteRoadmap.vue          | 19 ++++----
 src/router/modules/route.js               |  9 ++++
 5 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapCreate.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 5bf4be887..000cbf5e8 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -889,6 +889,7 @@ export default {
             basicData: 'Basic Data',
             summary: 'Summary',
             RouteRoadmap: 'Roadmaps',
+            RouteRoadmapCreate: 'Create roadmap',
             tickets: 'Tickets',
             log: 'Log',
             autonomous: 'Autonomous',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index cea9c9a6c..7d43aaa7f 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -943,6 +943,7 @@ export default {
             basicData: 'Datos básicos',
             summary: 'Resumen',
             RouteRoadmap: 'Troncales',
+            RouteRoadmapCreate: 'Crear troncal',
             tickets: 'Tickets',
             log: 'Historial',
             autonomous: 'Autónomos',
diff --git a/src/pages/Route/Roadmap/RoadmapCreate.vue b/src/pages/Route/Roadmap/RoadmapCreate.vue
new file mode 100644
index 000000000..214983dd3
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapCreate.vue
@@ -0,0 +1,56 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const defaultInitialData = {
+    etd: Date.vnNew().toISOString(),
+};
+const onSave = (data, response) => {
+    router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
+};
+</script>
+<template>
+    <VnSubToolbar />
+    <FormModel
+        :url="null"
+        url-create="Roadmaps"
+        model="roadmap"
+        :observe-form-changes="false"
+        :auto-load="false"
+        :form-initial-data="defaultInitialData"
+        @on-data-saved="onSave"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('Roadmap')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnInputDate v-model="data.etd" :label="t('ETD date')" />
+                </div>
+                <div class="col">
+                    <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+<i18n>
+es:
+    Roadmap: Troncal
+    ETD date: Fecha ETD
+    ETD hour: Hora ETD
+</i18n>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 6962176e4..fd4d52f62 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -226,7 +226,7 @@ function confirmRemove() {
                         >
                             <template #body-cell-carrier="props">
                                 <QTd :props="props">
-                                    <span class="link">
+                                    <span v-if="props.value" class="link">
                                         {{ props.value }}
                                         <SupplierDescriptorProxy
                                             :id="props.row?.supplier?.id"
@@ -254,14 +254,14 @@ function confirmRemove() {
                 </template>
             </VnPaginate>
         </div>
-        <!--        <QPageSticky :offset="[20, 20]">-->
-        <!--            <RouterLink :to="{ name: 'RouteCreate' }">-->
-        <!--                <QBtn fab icon="add" color="primary" />-->
-        <!--                <QTooltip>-->
-        <!--                    {{ t('newRoute') }}-->
-        <!--                </QTooltip>-->
-        <!--            </RouterLink>-->
-        <!--        </QPageSticky>-->
+        <QPageSticky :offset="[20, 20]">
+            <RouterLink :to="{ name: 'RouteRoadmapCreate' }">
+                <QBtn fab icon="add" color="primary" />
+                <QTooltip>
+                    {{ t('Create roadmap') }}
+                </QTooltip>
+            </RouterLink>
+        </QPageSticky>
     </QPage>
 </template>
 
@@ -283,6 +283,7 @@ es:
     Are you sure you want to continue?: ¿Seguro que quieres continuar?
     The date can't be empty: La fecha no puede estar vacía
     Clone Selected Routes: Clonar rutas seleccionadas
+    Create roadmap: Crear trocal
     Roadmap: Trocal
     Carrier: Transportista
     Plate: Placa
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 32e4619ba..f38601a26 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -38,6 +38,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteRoadmap.vue'),
                 },
+                {
+                    path: 'roadmap/create',
+                    name: 'RouteRoadmapCreate',
+                    meta: {
+                        title: 'RouteRoadmapCreate',
+                        icon: 'vn:troncales',
+                    },
+                    component: () => import('src/pages/Route/Roadmap/RoadmapCreate.vue'),
+                },
                 {
                     path: 'create',
                     name: 'RouteCreate',

From 343269fc02435cd518f9e0536662163266e14210 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 15 Feb 2024 01:02:01 -0300
Subject: [PATCH 021/128] Create roadmap summary page

---
 src/i18n/en/index.js                          |  12 ++
 src/i18n/es/index.js                          |  12 ++
 src/pages/Route/Roadmap/RoadmapCard.vue       |  21 +++
 src/pages/Route/Roadmap/RoadmapDescriptor.vue |  63 ++++++++
 .../Route/Roadmap/RoadmapDescriptorMenu.vue   |  57 ++++++++
 .../Route/Roadmap/RoadmapDescriptorProxy.vue  |  15 ++
 src/pages/Route/Roadmap/RoadmapSummary.vue    | 134 ++++++++++++++++++
 .../Route/Roadmap/RoadmapSummaryDialog.vue    |  29 ++++
 src/pages/Route/RouteRoadmap.vue              |  23 +--
 src/router/modules/index.js                   |   2 +
 src/router/modules/roadmap.js                 |  34 +++++
 src/router/routes.js                          |   2 +
 12 files changed, 396 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapCard.vue
 create mode 100644 src/pages/Route/Roadmap/RoadmapDescriptor.vue
 create mode 100644 src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue
 create mode 100644 src/pages/Route/Roadmap/RoadmapDescriptorProxy.vue
 create mode 100644 src/pages/Route/Roadmap/RoadmapSummary.vue
 create mode 100644 src/pages/Route/Roadmap/RoadmapSummaryDialog.vue
 create mode 100644 src/router/modules/roadmap.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 000cbf5e8..5889a1728 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -880,6 +880,18 @@ export default {
             uncompleteTrays: 'There are incomplete trays',
         },
     },
+    'route/roadmap': {
+        pageTitles: {
+            roadmap: 'Roadmap',
+            summary: 'Summary',
+        },
+    },
+    roadmap: {
+        pageTitles: {
+            roadmap: 'Roadmap',
+            summary: 'Summary',
+        },
+    },
     route: {
         pageTitles: {
             routes: 'Routes',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 7d43aaa7f..7fd58d82a 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -934,6 +934,18 @@ export default {
             uncompleteTrays: 'Hay bandejas sin completar',
         },
     },
+    'route/roadmap': {
+        pageTitles: {
+            roadmap: 'Troncales',
+            summary: 'Resumen',
+        },
+    },
+    roadmap: {
+        pageTitles: {
+            roadmap: 'Troncales',
+            summary: 'Resumen',
+        },
+    },
     route: {
         pageTitles: {
             routes: 'Rutas',
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
new file mode 100644
index 000000000..d6b02824b
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -0,0 +1,21 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+import RoadmapDescriptor from "pages/Route/Roadmap/RoadmapDescriptor.vue";
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <RoadmapDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <RouterView></RouterView>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
new file mode 100644
index 000000000..3396ce3f1
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -0,0 +1,63 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import useCardDescription from 'composables/useCardDescription';
+import {dashIfEmpty, toDateHour} from 'src/filters';
+import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import RoadmapDescriptorMenu from "pages/Route/Roadmap/RoadmapDescriptorMenu.vue";
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const filter = { include: [{ relation: 'supplier' }] };
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="Roadmap"
+        :url="`Roadmaps/${entityId}`"
+        :filter="filter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        data-key="Roadmap"
+        @on-fetch="setData"
+    >
+        <template #body="{ entity }">
+            <VnLv :label="t('Roadmap')" :value="entity?.name" />
+            <VnLv :label="t('ETD')" :value="toDateHour(entity?.etd)" />
+            <VnLv :label="t('Carrier')">
+                <template #value>
+                    <span class="link" v-if="entity?.supplier?.id">
+                        {{ dashIfEmpty(entity?.supplier?.nickname) }}
+                        <SupplierDescriptorProxy :id="entity?.supplier?.id" />
+                    </span>
+                </template>
+            </VnLv>
+        </template>
+        <template #menu="{ entity }">
+            <RoadmapDescriptorMenu :route="entity" />
+        </template>
+    </CardDescriptor>
+</template>
+<i18n>
+es:
+    Roadmap: Troncal
+    Carrier: Transportista
+</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue b/src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue
new file mode 100644
index 000000000..2c0099f28
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapDescriptorMenu.vue
@@ -0,0 +1,57 @@
+<script setup>
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+const props = defineProps({
+    route: {
+        type: Object,
+        required: true,
+    },
+});
+
+const router = useRouter();
+const quasar = useQuasar();
+const { t } = useI18n();
+
+function confirmRemove() {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Confirm deletion'),
+                message: t('Are you sure you want to delete this roadmap?'),
+                promise: remove,
+            },
+        })
+        .onOk(async () => await router.push({ name: 'RouteRoadmap' }));
+}
+
+async function remove() {
+    if (!props.route.id) {
+        return;
+    }
+    await axios.delete(`Roadmaps/${props.route.id}`);
+    quasar.notify({
+        message: t('globals.dataDeleted'),
+        type: 'positive',
+    });
+}
+</script>
+<template>
+    <QItem @click="confirmRemove" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="delete" />
+        </QItemSection>
+        <QItemSection>{{ t('Delete roadmap') }}</QItemSection>
+    </QItem>
+</template>
+
+<i18n>
+es:
+    Confirm deletion: Confirmar eliminación
+    Are you sure you want to delete this roadmap?: ¿Estás seguro de que quieres eliminar esta troncal?
+    Delete roadmap: Eliminar troncal
+</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptorProxy.vue b/src/pages/Route/Roadmap/RoadmapDescriptorProxy.vue
new file mode 100644
index 000000000..4e22ecd62
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapDescriptorProxy.vue
@@ -0,0 +1,15 @@
+<script setup>
+import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+<template>
+    <QPopupProxy>
+        <RoadmapDescriptor v-if="$props.id" :id="$props.id" />
+    </QPopupProxy>
+</template>
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
new file mode 100644
index 000000000..77d277666
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -0,0 +1,134 @@
+<script setup>
+import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import { QIcon } from 'quasar';
+import { dashIfEmpty, toDateHour } from 'src/filters';
+import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const route = useRoute();
+const stateStore = useStateStore();
+const { t } = useI18n();
+
+const entityId = computed(() => $props.id || route.params.id);
+const isDialog = Boolean($props.id);
+const hideRightDrawer = () => {
+    if (!isDialog) {
+        stateStore.rightDrawer = false;
+    }
+};
+onMounted(hideRightDrawer);
+onUnmounted(hideRightDrawer);
+
+const columns = ref([
+    {
+        name: 'warehouse',
+        label: t('Warehouse'),
+        field: (row) => dashIfEmpty(row?.warehouse?.name),
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'ETA',
+        label: t('ETA'),
+        field: (row) => toDateHour(row?.eta),
+        sortable: false,
+        align: 'left',
+    },
+]);
+const filter = {
+    include: [
+        { relation: 'supplier' },
+        { relation: 'worker' },
+        {
+            relation: 'expeditionTruck',
+            scope: { include: [{ relation: 'warehouse' }] },
+        },
+    ],
+};
+</script>
+
+<template>
+    <div class="q-pa-md full-width">
+        <CardSummary ref="summary" :url="`Roadmaps/${entityId}`" :filter="filter">
+            <template #header-left>
+                <RouterLink :to="{ name: `RoadmapSummary`, params: { id: entityId } }">
+                    <QIcon name="open_in_new" color="white" size="sm" />
+                </RouterLink>
+            </template>
+            <template #header="{ entity }">
+                <span>{{ `${entity?.id} - ${entity?.name}` }}</span>
+            </template>
+            <template #body="{ entity }">
+                <QCard class="vn-one">
+                    <VnLv :label="t('Carrier')">
+                        <template #value>
+                            <span class="link" v-if="entity?.supplier?.id">
+                                {{ dashIfEmpty(entity?.supplier?.nickname) }}
+                                <SupplierDescriptorProxy :id="entity?.supplier?.id" />
+                            </span>
+                        </template>
+                    </VnLv>
+                    <VnLv :label="t('ETD')" :value="toDateHour(entity?.etd)" />
+                    <VnLv
+                        :label="t('Tractor Plate')"
+                        :value="dashIfEmpty(entity?.tractorPlate)"
+                    />
+                    <VnLv
+                        :label="t('Trailer Plate')"
+                        :value="dashIfEmpty(entity?.trailerPlate)"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)" />
+                    <VnLv
+                        :label="t('Worker')"
+                        :value="
+                            entity?.worker?.firstName
+                                ? `${entity?.worker?.firstName} ${entity?.worker?.lastName}`
+                                : '-'
+                        "
+                    />
+                    <VnLv
+                        :label="t('Observations')"
+                        :value="dashIfEmpty(entity?.observations)"
+                    />
+                </QCard>
+                <QCard class="vn-max">
+                    <a class="header" :href="`#/route/roadmap/${entityId}/stops`">
+                        {{ t('Stops') }}
+                        <QIcon name="open_in_new" color="primary" />
+                    </a>
+                    <QTable
+                        :columns="columns"
+                        :rows="entity?.expeditionTruck"
+                        :rows-per-page-options="[0]"
+                        row-key="id"
+                        flat
+                        hide-pagination
+                    />
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>
+<i18n>
+es:
+    Carrier: Transportista
+    Tractor Plate: Placa tractor
+    Trailer Plate: Placa trailer
+    Phone: Teléfono
+    Worker: Trabajador
+    Observations: Observaciones
+    Stops: Paradas
+    Warehouse: Almacén
+</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapSummaryDialog.vue b/src/pages/Route/Roadmap/RoadmapSummaryDialog.vue
new file mode 100644
index 000000000..35cb5771a
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapSummaryDialog.vue
@@ -0,0 +1,29 @@
+<script setup>
+import { useDialogPluginComponent } from 'quasar';
+import RoadmapSummary from "pages/Route/Roadmap/RoadmapSummary.vue";
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+defineEmits([...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+</script>
+
+<template>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <div class="dialog full-width">
+            <RoadmapSummary v-if="$props.id" :id="$props.id" />
+        </div>
+    </QDialog>
+</template>
+
+<style lang="scss" scoped>
+.dialog {
+    max-width: 1280px;
+}
+</style>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index fd4d52f62..c7b12a417 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -4,9 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { dashIfEmpty, toDateHour } from 'src/filters';
-import { useValidator } from 'composables/useValidator';
 import { useQuasar } from 'quasar';
-import { useSession } from 'composables/useSession';
 import toCurrency from 'filters/toCurrency';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
@@ -15,12 +13,11 @@ import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import axios from 'axios';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import RoadmapSummaryDialog from "pages/Route/Roadmap/RoadmapSummaryDialog.vue";
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { validate } = useValidator();
 const quasar = useQuasar();
-const session = useSession();
 
 const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
@@ -30,8 +27,6 @@ const from = Date.vnNew();
 from.setDate(from.getDate());
 from.setHours(0, 0, 0, 0);
 
-const params = ref({ from, to });
-
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
@@ -90,7 +85,6 @@ const columns = computed(() => [
 const refreshKey = ref(0);
 const isCloneDialogOpen = ref(false);
 const etdDate = ref(null);
-const workers = ref([]);
 
 const filter = {
     include: { relation: 'supplier', scope: { fields: ['nickname'] } },
@@ -128,6 +122,18 @@ function confirmRemove() {
         })
         .onOk(() => refreshKey.value++);
 }
+
+function previewRoadmap(id) {
+    if (!id) {
+        return;
+    }
+    quasar.dialog({
+        component: RoadmapSummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
+}
 </script>
 
 <template>
@@ -223,6 +229,7 @@ function confirmRemove() {
                             :rows-per-page-options="[0]"
                             hide-pagination
                             :pagination="{ sortBy: 'ID', descending: true }"
+                            :on-row-click="(evt, row) => console.log(evt, row)"
                         >
                             <template #body-cell-carrier="props">
                                 <QTd :props="props">
@@ -241,7 +248,7 @@ function confirmRemove() {
                                             name="preview"
                                             size="xs"
                                             color="primary"
-                                            @click="previewRoute(props?.row?.id)"
+                                            @click="previewRoadmap(props?.row?.id)"
                                             class="cursor-pointer"
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 84a26798d..076605f24 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -13,6 +13,7 @@ import Travel from './travel';
 import Order from './order';
 import Department from './department';
 import Entry from './entry';
+import roadmap from "./roadmap";
 
 export default [
     Item,
@@ -30,4 +31,5 @@ export default [
     invoiceIn,
     Department,
     Entry,
+    roadmap
 ];
diff --git a/src/router/modules/roadmap.js b/src/router/modules/roadmap.js
new file mode 100644
index 000000000..9b3b8b9ca
--- /dev/null
+++ b/src/router/modules/roadmap.js
@@ -0,0 +1,34 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/route/roadmap',
+    name: 'Roadmap',
+    meta: {
+        title: 'roadmap',
+        icon: 'vn:troncales',
+    },
+    component: RouterView,
+    redirect: { name: 'RouteMain' },
+    menus: {
+        card: [],
+    },
+    children: [
+        {
+            name: 'RouteRoadmapCard',
+            path: ':id',
+            component: () => import('src/pages/Route/Roadmap/RoadmapCard.vue'),
+            redirect: { name: 'RoadmapSummary' },
+            children: [
+                {
+                    name: 'RoadmapSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'open_in_new',
+                    },
+                    component: () => import('pages/Route/Roadmap/RoadmapSummary.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index d1027955f..32f43965f 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -13,6 +13,7 @@ import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
+import roadmap from "src/router/modules/roadmap";
 
 const routes = [
     {
@@ -66,6 +67,7 @@ const routes = [
             supplier,
             travel,
             department,
+            roadmap,
             entry,
             {
                 path: '/:catchAll(.*)*',

From 0a03ef69ea044b1ce1750f6abfbc9476c80b0b76 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 15 Feb 2024 01:23:31 -0300
Subject: [PATCH 022/128] Create roadmap basic data page

---
 src/i18n/en/index.js                         |   2 +
 src/i18n/es/index.js                         |   2 +
 src/pages/Route/Roadmap/RoadmapBasicData.vue | 144 +++++++++++++++++++
 src/router/modules/roadmap.js                |  11 +-
 4 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapBasicData.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 5889a1728..8e7e8409a 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -884,12 +884,14 @@ export default {
         pageTitles: {
             roadmap: 'Roadmap',
             summary: 'Summary',
+            basicData: 'Basic Data',
         },
     },
     roadmap: {
         pageTitles: {
             roadmap: 'Roadmap',
             summary: 'Summary',
+            basicData: 'Basic Data',
         },
     },
     route: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 7fd58d82a..1e548362d 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -938,12 +938,14 @@ export default {
         pageTitles: {
             roadmap: 'Troncales',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
         },
     },
     roadmap: {
         pageTitles: {
             roadmap: 'Troncales',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
         },
     },
     route: {
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
new file mode 100644
index 000000000..5084eefa7
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -0,0 +1,144 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import {ref} from "vue";
+
+const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
+const entityId = route.params?.id || null;
+
+const supplierList = ref([]);
+const filter = { include: [{ relation: 'supplier' }] };
+const onSave = (data, response) => {
+    router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
+};
+</script>
+<template>
+    <VnSubToolbar />
+    <FetchData
+        url="Suppliers"
+        auto-load
+        :filter="{ fields: ['id', 'nickname'] }"
+        sort-by="nickname"
+        limit="30"
+        @on-fetch="(data) => (supplierList = data)"
+    />
+    <FormModel
+        :url="`Roadmaps/${entityId}`"
+        observe-form-changes
+        :filter="filter"
+        model="roadmap"
+        auto-load
+        @on-data-saved="onSave"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
+                </div>
+                <div class="col">
+                    <VnInputDate v-model="data.etd" :label="t('ETD date')" />
+                </div>
+                <div class="col">
+                    <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.tractorPlate"
+                        :label="t('Tractor plate')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.trailerPlate"
+                        :label="t('Trailer plate')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Carrier')"
+                        v-model="data.supplierFk"
+                        :options="supplierList"
+                        option-value="id"
+                        option-label="nickname"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ opt.id }} - {{ opt.nickname }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.price"
+                        :label="t('Price')"
+                        type="number"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.driverName"
+                        :label="t('Driver name')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.phone"
+                        :label="t('Phone')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.observations"
+                        :label="t('Observations')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+<i18n>
+es:
+    Roadmap: Troncal
+    ETD date: Fecha ETD
+    ETD hour: Hora ETD
+    Tractor plate: Placa tractor
+    Trailer plate: Placa trailer
+    Carrier: Transportista
+    Price: Precio
+    Driver name: Nombre del conductor
+    Phone: Teléfono
+    Observations: Observaciones
+</i18n>
diff --git a/src/router/modules/roadmap.js b/src/router/modules/roadmap.js
index 9b3b8b9ca..fa63dbd44 100644
--- a/src/router/modules/roadmap.js
+++ b/src/router/modules/roadmap.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        card: [],
+        card: ['RoadmapBasicData'],
     },
     children: [
         {
@@ -28,6 +28,15 @@ export default {
                     },
                     component: () => import('pages/Route/Roadmap/RoadmapSummary.vue'),
                 },
+                {
+                    name: 'RoadmapBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('pages/Route/Roadmap/RoadmapBasicData.vue'),
+                },
             ],
         },
     ],

From 616d8519fae295954415fa896026398dbe4e7a73 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 20 Feb 2024 08:14:31 -0300
Subject: [PATCH 023/128] Fix translations

---
 src/i18n/en/index.js | 110 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 8e7e8409a..8503fa696 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -62,8 +62,14 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
+        requiredField: 'Required field',
+        class: 'clase',
+        type: 'type',
+        reason: 'reason',
         noResults: 'No results',
         system: 'System',
+        fieldRequired: 'Field required',
+        allowedFilesText: 'Allowed file types: { allowedContentTypes }',
         smsSent: 'SMS sent',
     },
     errors: {
@@ -132,6 +138,8 @@ export default {
             log: 'Log',
             sms: 'Sms',
             creditManagement: 'Credit management',
+            creditContracts: 'Credit contracts',
+            creditOpinion: 'Credit opinion',
             others: 'Others',
         },
         list: {
@@ -267,6 +275,8 @@ export default {
             buys: 'Buys',
             notes: 'Notes',
             log: 'Log',
+            create: 'Create',
+            latestBuys: 'Latest buys',
         },
         list: {
             newEntry: 'New entry',
@@ -322,6 +332,12 @@ export default {
             booked: 'Booked',
             raid: 'Raid',
             excludedFromAvailable: 'Inventory',
+            agency: 'Agency',
+            warehouseOut: 'Warehouse Out',
+            warehouseIn: 'Warehouse In',
+            shipped: 'Shipped',
+            landed: 'Landed',
+            id: 'ID',
         },
         buys: {
             groupingPrice: 'Grouping price',
@@ -335,6 +351,12 @@ export default {
             grouping: 'Grouping',
             buyingValue: 'Buying value',
             packagingFk: 'Box',
+            file: 'File',
+            name: 'Name',
+            producer: 'Producer',
+            type: 'Type',
+            color: 'Color',
+            id: 'ID',
         },
         notes: {
             observationType: 'Observation type',
@@ -345,6 +367,36 @@ export default {
             landed: 'Landed',
             warehouseOut: 'Warehouse Out',
         },
+        latestBuys: {
+            picture: 'Picture',
+            itemFk: 'Item ID',
+            packing: 'Packing',
+            grouping: 'Grouping',
+            quantity: 'Quantity',
+            description: 'Description',
+            size: 'Size',
+            tags: 'Tags',
+            type: 'Type',
+            intrastat: 'Intrastat',
+            origin: 'Origin',
+            weightByPiece: 'Weight/Piece',
+            isActive: 'Active',
+            family: 'Family',
+            entryFk: 'Entry',
+            buyingValue: 'Buying value',
+            freightValue: 'Freight value',
+            comissionValue: 'Commission value',
+            packageValue: 'Package value',
+            isIgnored: 'Is ignored',
+            price2: 'Grouping',
+            price3: 'Packing',
+            minPrice: 'Min',
+            ektFk: 'Ekt',
+            weight: 'Weight',
+            packagingFk: 'Package',
+            packingOut: 'Package out',
+            landing: 'Landing',
+        },
     },
     ticket: {
         pageTitles: {
@@ -496,6 +548,7 @@ export default {
             responsible: 'Responsible',
             worker: 'Worker',
             redelivery: 'Redelivery',
+            returnOfMaterial: 'RMA',
         },
         basicData: {
             customer: 'Customer',
@@ -634,6 +687,7 @@ export default {
             vat: 'VAT',
             dueDay: 'Due day',
             intrastat: 'Intrastat',
+            corrective: 'Corrective',
             log: 'Logs',
         },
         list: {
@@ -1036,6 +1090,7 @@ export default {
             m3Price: 'M3 Price',
             routePrice: 'Route price',
             minimumKm: 'Minimum Km',
+            addRow: 'Add row',
         },
         consumption: {
             entry: 'Entry',
@@ -1052,8 +1107,8 @@ export default {
             extraCommunity: 'Extra community',
             travelCreate: 'New travel',
             basicData: 'Basic data',
-            history: 'History',
-            thermographs: 'Termographs',
+            history: 'Log',
+            thermographs: 'Thermograph',
         },
         summary: {
             confirmed: 'Confirmed',
@@ -1065,7 +1120,10 @@ export default {
             entries: 'Entries',
             cloneShipping: 'Clone travel',
             CloneTravelAndEntries: 'Clone travel and his entries',
+            deleteTravel: 'Delete travel',
             AddEntry: 'Add entry',
+            thermographs: 'Thermographs',
+            hb: 'HB',
         },
         variables: {
             search: 'Id/Reference',
@@ -1077,6 +1135,50 @@ export default {
             continent: 'Continent out',
             totalEntries: 'Total entries',
         },
+        basicData: {
+            reference: 'Reference',
+            agency: 'Agency',
+            shipped: 'Shipped',
+            landed: 'Landed',
+            warehouseOut: 'Warehouse Out',
+            warehouseIn: 'Warehouse In',
+            delivered: 'Delivered',
+            received: 'Received',
+        },
+        thermographs: {
+            code: 'Code',
+            temperature: 'Temperature',
+            state: 'State',
+            destination: 'Destination',
+            created: 'Created',
+            thermograph: 'Thermograph',
+            reference: 'Reference',
+            type: 'Type',
+            company: 'Company',
+            warehouse: 'Warehouse',
+            travelFileDescription: 'Travel id { travelId }',
+            file: 'File',
+            description: 'Description',
+        },
+    },
+    item: {
+        pageTitles: {
+            items: 'Items',
+            list: 'List',
+            diary: 'Diary',
+            tags: 'Tags',
+        },
+        descriptor: {
+            item: 'Item',
+            buyer: 'Buyer',
+            color: 'Color',
+            category: 'Category',
+            stems: 'Stems',
+            visible: 'Visible',
+            available: 'Available',
+            warehouseText: 'Calculated on the warehouse of { warehouseName }',
+            itemDiary: 'Item diary',
+        },
     },
     components: {
         topbar: {},
@@ -1101,5 +1203,9 @@ export default {
             addToPinned: 'Add to pinned',
             removeFromPinned: 'Remove from pinned',
         },
+        VnLv: {
+            copyText: '{copyValue} has been copied to the clipboard',
+        },
+        iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
 };

From 587baa645e37cc98d9a655f500411b0f412e4b15 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 20 Feb 2024 08:47:24 -0300
Subject: [PATCH 024/128] generic FormPopup creation and SendInvoiceForm
 creation

---
 src/components/FormPopup.vue                  | 93 +++++++++++++++++++
 .../Card/InvoiceOutDescriptorMenu.vue         | 15 ++-
 src/pages/InvoiceOut/Card/SendInvoiceForm.vue | 41 ++++++++
 3 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 src/components/FormPopup.vue
 create mode 100644 src/pages/InvoiceOut/Card/SendInvoiceForm.vue

diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
new file mode 100644
index 000000000..951d697d5
--- /dev/null
+++ b/src/components/FormPopup.vue
@@ -0,0 +1,93 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const emit = defineEmits(['onDataSaved']);
+
+const $props = defineProps({
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: String,
+        default: '',
+    },
+    defaultSaveButton: {
+        type: Boolean,
+        default: true,
+    },
+    defaultCancelButton: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const { t } = useI18n();
+
+const closeButton = ref(null);
+const isLoading = ref(false);
+
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+</script>
+
+<template>
+    <QForm
+        @submit="onDataSaved($event)"
+        class="all-pointer-events full-width"
+        style="max-width: 800px"
+    >
+        <QCard class="q-pa-lg">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ title }}</h1>
+            <p>{{ subtitle }}</p>
+            <slot name="form-inputs" />
+            <div class="q-mt-lg row justify-end">
+                <QBtn
+                    v-if="defaultSaveButton"
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
+                <QBtn
+                    v-if="defaultCancelButton"
+                    :label="t('globals.cancel')"
+                    type="reset"
+                    color="primary"
+                    flat
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    v-close-popup
+                />
+                <slot name="customButtons" />
+            </div>
+        </QCard>
+    </QForm>
+</template>
+
+<style lang="scss" scoped>
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+</style>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index ca2bf1304..76b9cefdc 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import TransferInvoiceForm from 'src/components/TransferInvoiceForm.vue';
+import SendInvoiceForm from './SendInvoiceForm.vue';
 
 import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
@@ -20,6 +21,8 @@ const { t } = useI18n();
 const { openReport } = usePrintService();
 
 const transferInvoiceDialogRef = ref();
+const sendInvoiceFormRef = ref();
+const invoiceFormType = ref(null);
 
 const showInvoicePdf = () => {
     const url = `api/InvoiceOuts/${$props.invoiceOutData.id}/download?access_token=${token}`;
@@ -31,6 +34,11 @@ const showInvoiceCsv = () => {
         recipientId: $props.invoiceOutData.client.id,
     });
 };
+
+const showSendInvoiceForm = (type) => {
+    invoiceFormType.value = type;
+    sendInvoiceFormRef.value.show();
+};
 </script>
 
 <template>
@@ -60,10 +68,10 @@ const showInvoiceCsv = () => {
         </QItemSection>
         <QMenu anchor="top end" self="top start">
             <QList>
-                <QItem v-ripple clickable>
+                <QItem v-ripple clickable @click="showSendInvoiceForm()">
                     <QItemSection>{{ t('Send PDF') }}</QItemSection>
                 </QItem>
-                <QItem v-ripple clickable>
+                <QItem v-ripple clickable @click="showSendInvoiceForm()">
                     <QItemSection>{{ t('Send CSV') }}</QItemSection>
                 </QItem>
             </QList>
@@ -98,6 +106,9 @@ const showInvoiceCsv = () => {
     <QDialog ref="transferInvoiceDialogRef">
         <TransferInvoiceForm :invoice-out-data="invoiceOutData" />
     </QDialog>
+    <QDialog ref="sendInvoiceFormRef">
+        <SendInvoiceForm />
+    </QDialog>
 </template>
 
 <i18n>
diff --git a/src/pages/InvoiceOut/Card/SendInvoiceForm.vue b/src/pages/InvoiceOut/Card/SendInvoiceForm.vue
new file mode 100644
index 000000000..3956dab08
--- /dev/null
+++ b/src/pages/InvoiceOut/Card/SendInvoiceForm.vue
@@ -0,0 +1,41 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormPopup from 'src/components/FormPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const email = ref(null);
+
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
+};
+</script>
+
+<template>
+    <FormPopup
+        :title="t('New thermograph')"
+        :subtitle="t('Are you sure you want to send it?')"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Email')" v-model="email" type="email" />
+                </div>
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>
+
+<i18n>
+es:
+    Email: Email
+    Confirm: Confirmar
+    Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
+</i18n>

From 75733fd5305cc2c05243d988559dfff4163ad2e9 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 20 Feb 2024 20:51:25 -0300
Subject: [PATCH 025/128] Fix autonomous route

---
 src/pages/Route/RouteAutonomous.vue | 20 ++++------------
 src/router/modules/route.js         | 36 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 2ed024d29..eee9ff9c5 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -4,22 +4,22 @@ import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
-import RouteSummaryDialog from 'pages/Route/Card/RouteSummaryDialog.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import InvoiceInDescriptorProxy from 'pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import { useQuasar } from 'quasar';
 import useNotify from 'composables/useNotify';
 import RouteAutonomousFilter from 'pages/Route/Card/RouteAutonomousFilter.vue';
 import { useRouter } from 'vue-router';
+import RouteSummary from "pages/Route/Card/RouteSummary.vue";
+import {useSummaryDialog} from "composables/useSummaryDialog";
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const quasar = useQuasar();
 const { notify } = useNotify();
 const router = useRouter();
+const { viewSummary } = useSummaryDialog();
 
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -131,18 +131,6 @@ const openCreateInvoiceIn = () => {
 
     router.push({ name: 'RouteAutonomousCreateInvoiceIn', query: { q: params } });
 };
-
-function previewRoute(id) {
-    if (!id) {
-        return;
-    }
-    quasar.dialog({
-        component: RouteSummaryDialog,
-        componentProps: {
-            id,
-        },
-    });
-}
 </script>
 
 <template>
@@ -245,7 +233,7 @@ function previewRoute(id) {
                                             name="preview"
                                             size="xs"
                                             color="primary"
-                                            @click="previewRoute(props?.row?.routeFk)"
+                                            @click="viewSummary(props?.row?.routeFk, RouteSummary)"
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
                                         </QIcon>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index f38601a26..abb6450d3 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -29,24 +29,6 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteList.vue'),
                 },
-                {
-                    path: 'roadmap',
-                    name: 'RouteRoadmap',
-                    meta: {
-                        title: 'RouteRoadmap',
-                        icon: 'vn:troncales',
-                    },
-                    component: () => import('src/pages/Route/RouteRoadmap.vue'),
-                },
-                {
-                    path: 'roadmap/create',
-                    name: 'RouteRoadmapCreate',
-                    meta: {
-                        title: 'RouteRoadmapCreate',
-                        icon: 'vn:troncales',
-                    },
-                    component: () => import('src/pages/Route/Roadmap/RoadmapCreate.vue'),
-                },
                 {
                     path: 'create',
                     name: 'RouteCreate',
@@ -72,6 +54,24 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteAutonomousCreateInvoiceIn.vue'),
                 },
+                {
+                    path: 'roadmap',
+                    name: 'RouteRoadmap',
+                    meta: {
+                        title: 'RouteRoadmap',
+                        icon: 'vn:troncales',
+                    },
+                    component: () => import('src/pages/Route/RouteRoadmap.vue'),
+                },
+                {
+                    path: 'roadmap/create',
+                    name: 'RouteRoadmapCreate',
+                    meta: {
+                        title: 'RouteRoadmapCreate',
+                        icon: 'vn:troncales',
+                    },
+                    component: () => import('src/pages/Route/Roadmap/RoadmapCreate.vue'),
+                },
                 {
                     path: 'cmr',
                     name: 'CmrList',

From c407566d676d707154438d3a4f9dc9365358d4f0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 21 Feb 2024 11:27:32 -0300
Subject: [PATCH 026/128] descriptor menu actions

---
 src/components/FormPopup.vue                  |  19 +-
 src/components/TransferInvoiceForm.vue        |  44 ++---
 src/composables/useVnConfirm.js               |  23 +++
 .../Card/InvoiceOutDescriptorMenu.vue         | 163 ++++++++++++++++--
 4 files changed, 192 insertions(+), 57 deletions(-)
 create mode 100644 src/composables/useVnConfirm.js

diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index 951d697d5..b6eff5d80 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-const emit = defineEmits(['onDataSaved']);
+const emit = defineEmits(['onSubmit']);
 
 const $props = defineProps({
     title: {
@@ -13,7 +13,7 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    defaultSaveButton: {
+    defaultSubmitButton: {
         type: Boolean,
         default: true,
     },
@@ -21,6 +21,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    customSubmitButtonLabel: {
+        type: String,
+        default: '',
+    },
 });
 
 const { t } = useI18n();
@@ -28,8 +32,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
+const onSubmit = () => {
+    emit('onSubmit');
     closeForm();
 };
 
@@ -40,7 +44,7 @@ const closeForm = () => {
 
 <template>
     <QForm
-        @submit="onDataSaved($event)"
+        @submit="onSubmit($event)"
         class="all-pointer-events full-width"
         style="max-width: 800px"
     >
@@ -53,8 +57,8 @@ const closeForm = () => {
             <slot name="form-inputs" />
             <div class="q-mt-lg row justify-end">
                 <QBtn
-                    v-if="defaultSaveButton"
-                    :label="t('globals.save')"
+                    v-if="defaultSubmitButton"
+                    :label="customSubmitButtonLabel || t('globals.save')"
                     type="submit"
                     color="primary"
                     :disabled="isLoading"
@@ -63,7 +67,6 @@ const closeForm = () => {
                 <QBtn
                     v-if="defaultCancelButton"
                     :label="t('globals.cancel')"
-                    type="reset"
                     color="primary"
                     flat
                     class="q-ml-sm"
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index e62c7638c..b7d8f3081 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -6,6 +6,8 @@ import { useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import FormPopup from './FormPopup.vue';
+
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -25,7 +27,6 @@ const transferInvoiceParams = reactive({
     refFk: $props.invoiceOutData?.ref,
 });
 const closeButton = ref(null);
-const isLoading = ref(false);
 const clientsOptions = ref([]);
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
@@ -74,12 +75,13 @@ const transferInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
-    <QForm @submit="transferInvoice()" class="all-pointer-events">
-        <QCard class="column" style="padding: 32px; z-index: 100">
-            <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="title">{{ t('Transfer invoice') }}</h1>
+    <FormPopup
+        @on-submit="transferInvoice()"
+        :title="t('Transfer invoice')"
+        :custom-submit-button-label="t('Transfer client')"
+        :default-cancel-button="false"
+    >
+        <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
@@ -150,17 +152,8 @@ const transferInvoice = async () => {
                     />
                 </div>
             </VnRow>
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('Transfer client')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
-            </div>
-        </QCard>
-    </QForm>
+        </template>
+    </FormPopup>
 </template>
 
 <i18n>
@@ -173,18 +166,3 @@ es:
     Type: Tipo
     Transferred invoice: Factura transferida
 </i18n>
-
-<style lang="scss" scoped>
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-</style>
diff --git a/src/composables/useVnConfirm.js b/src/composables/useVnConfirm.js
new file mode 100644
index 000000000..430a290be
--- /dev/null
+++ b/src/composables/useVnConfirm.js
@@ -0,0 +1,23 @@
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import { useQuasar } from 'quasar';
+
+export function useSummaryDialog() {
+    const quasar = useQuasar();
+
+    const openConfirmationModal = (title, message, promise, successFn) => {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: title,
+                    message: message,
+                    promise: promise,
+                },
+            })
+            .onOk(async () => {
+                if (successFn) successFn();
+            });
+    };
+
+    return { openConfirmationModal };
+}
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 76b9cefdc..fc84c042b 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -1,12 +1,17 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
 
 import TransferInvoiceForm from 'src/components/TransferInvoiceForm.vue';
-import SendInvoiceForm from './SendInvoiceForm.vue';
+import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
+import useNotify from 'src/composables/useNotify';
 import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
+import { useSummaryDialog } from 'composables/useVnConfirm';
+import axios from 'axios';
 
 const $props = defineProps({
     invoiceOutData: {
@@ -15,14 +20,18 @@ const $props = defineProps({
     },
 });
 
+const { notify } = useNotify();
+const router = useRouter();
 const session = useSession();
 const token = session.getToken();
 const { t } = useI18n();
-const { openReport } = usePrintService();
+const { openReport, sendEmail } = usePrintService();
+const { openConfirmationModal } = useSummaryDialog();
+const quasar = useQuasar();
 
 const transferInvoiceDialogRef = ref();
-const sendInvoiceFormRef = ref();
-const invoiceFormType = ref(null);
+const invoiceFormType = ref('pdf');
+const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
 const showInvoicePdf = () => {
     const url = `api/InvoiceOuts/${$props.invoiceOutData.id}/download?access_token=${token}`;
@@ -35,9 +44,86 @@ const showInvoiceCsv = () => {
     });
 };
 
-const showSendInvoiceForm = (type) => {
+const showSendInvoiceDialog = (type) => {
     invoiceFormType.value = type;
-    sendInvoiceFormRef.value.show();
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: defaultEmailAddress.value,
+            },
+            promise: sendEmailInvoice,
+        },
+    });
+};
+
+const sendEmailInvoice = async ({ address }) => {
+    try {
+        if (!address) notify(`The email can't be empty`, 'negative');
+
+        if (invoiceFormType.value === 'pdf') {
+            return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-email`, {
+                recipientId: $props.invoiceOutData.client.id,
+                recipient: address,
+            });
+        } else {
+            return sendEmail(
+                `InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv-email`,
+                {
+                    recipientId: $props.invoiceOutData.client.id,
+                    recipient: address,
+                }
+            );
+        }
+    } catch (err) {
+        console.error('Error sending email', err);
+    }
+};
+
+const redirectToInvoiceOutList = () => {
+    router.push({ name: 'InvoiceOutList' });
+};
+
+const deleteInvoice = async () => {
+    try {
+        await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/delete`);
+        notify(t('InvoiceOut deleted'), 'positive');
+    } catch (err) {
+        console.error('Error deleting invoice out', err);
+    }
+};
+
+const bookInvoice = async () => {
+    try {
+        await axios.post(`InvoiceOuts/${$props.invoiceOutData.ref}/book`);
+        notify(t('InvoiceOut booked'), 'positive');
+    } catch (err) {
+        console.error('Error booking invoice out', err);
+    }
+};
+
+const generateInvoicePdf = async () => {
+    try {
+        await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/createPdf`);
+        notify(t('The invoice PDF document has been regenerated'), 'positive');
+    } catch (err) {
+        console.error('Error generating invoice out pdf', err);
+    }
+};
+
+const refundInvoice = async (withWarehouse) => {
+    try {
+        const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
+        const { data } = await axios.post('InvoiceOuts/refund', params);
+        notify(
+            t('refundInvoiceSuccessMessage', {
+                refundTicket: data[0].id,
+            }),
+            'positive'
+        );
+    } catch (err) {
+        console.error('Error generating invoice out pdf', err);
+    }
 };
 </script>
 
@@ -68,22 +154,53 @@ const showSendInvoiceForm = (type) => {
         </QItemSection>
         <QMenu anchor="top end" self="top start">
             <QList>
-                <QItem v-ripple clickable @click="showSendInvoiceForm()">
+                <QItem v-ripple clickable @click="showSendInvoiceDialog('pdf')">
                     <QItemSection>{{ t('Send PDF') }}</QItemSection>
                 </QItem>
-                <QItem v-ripple clickable @click="showSendInvoiceForm()">
+                <QItem v-ripple clickable @click="showSendInvoiceDialog('csv')">
                     <QItemSection>{{ t('Send CSV') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
     </QItem>
-    <QItem v-ripple clickable>
+    <QItem
+        v-ripple
+        clickable
+        @click="
+            openConfirmationModal(
+                t('Confirm deletion'),
+                t('Are you sure you want to delete this invoice?'),
+                deleteInvoice,
+                redirectToInvoiceOutList
+            )
+        "
+    >
         <QItemSection>{{ t('Delete invoice') }}</QItemSection>
     </QItem>
-    <QItem v-ripple clickable>
+    <QItem
+        v-ripple
+        clickable
+        @click="
+            openConfirmationModal(
+                '',
+                t('Are you sure you want to book this invoice?'),
+                bookInvoice
+            )
+        "
+    >
         <QItemSection>{{ t('Book invoice') }}</QItemSection>
     </QItem>
-    <QItem v-ripple clickable>
+    <QItem
+        v-ripple
+        clickable
+        @click="
+            openConfirmationModal(
+                t('Generate PDF invoice document'),
+                t('Are you sure you want to generate/regenerate the PDF invoice?'),
+                generateInvoicePdf
+            )
+        "
+    >
         <QItemSection>{{ t('Generate PDF invoice') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
@@ -93,22 +210,22 @@ const showSendInvoiceForm = (type) => {
         </QItemSection>
         <QMenu anchor="top end" self="top start">
             <QList>
-                <QItem v-ripple clickable>
+                <QItem v-ripple clickable @click="refundInvoice(true)">
                     <QItemSection>{{ t('With warehouse') }}</QItemSection>
                 </QItem>
-                <QItem v-ripple clickable>
+                <QItem v-ripple clickable @click="refundInvoice(false)">
                     <QItemSection>{{ t('Without warehouse') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
+        <QTooltip>
+            {{ t('Create a single ticket with all the content of the current invoice') }}
+        </QTooltip>
     </QItem>
 
     <QDialog ref="transferInvoiceDialogRef">
         <TransferInvoiceForm :invoice-out-data="invoiceOutData" />
     </QDialog>
-    <QDialog ref="sendInvoiceFormRef">
-        <SendInvoiceForm />
-    </QDialog>
 </template>
 
 <i18n>
@@ -126,4 +243,18 @@ es:
     Send CSV: Enviar CSV
     With warehouse: Con almacén
     Without warehouse: Sin almacén
+    InvoiceOut deleted: Factura eliminada
+    Confirm deletion: Confirmar eliminación
+    Are you sure you want to delete this invoice?: Estas seguro de eliminar esta factura?
+    Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
+    InvoiceOut booked: Factura asentada
+    Generate PDF invoice document: Generar PDF de la factura
+    Are you sure you want to generate/regenerate the PDF invoice?: ¿Seguro que quieres generar/regenerar el PDF de la factura?
+    The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
+    Create a single ticket with all the content of the current invoice: Crear un ticket único con todo el contenido de la factura actual
+    refundInvoiceSuccessMessage: Se ha creado el siguiente ticket de abono {refundTicket}
+    The email can't be empty: El email no puede estar vacío
+
+en:
+    refundInvoiceSuccessMessage: The following refund ticket have been created {refundTicket}
 </i18n>

From 196d8dde208c08eed63c694f5b8994564f8d7c41 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 22 Feb 2024 11:05:40 -0300
Subject: [PATCH 027/128] Change isRaid icon

---
 src/pages/Entry/Card/EntryDescriptor.vue | 2 +-
 src/pages/Entry/EntryList.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 6680bdc46..6d166c431 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -136,7 +136,7 @@ const showEntryReport = () => {
                 >
                     <QTooltip>{{ t('Inventory entry') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isRaid" name="vn:web" color="primary" size="xs">
+                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>{{ t('Virtual entry') }}</QTooltip>
                 </QIcon>
             </QCardActions>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e8eff584b..6f146e21a 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -74,7 +74,7 @@ onMounted(async () => {
                             </QIcon>
                             <QIcon
                                 v-if="row.isRaid"
-                                name="vn:web"
+                                name="vn:net"
                                 color="primary"
                                 size="xs"
                             >

From 26570343605ad679fc5fcf606c7381b80f9d9c04 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 22 Feb 2024 15:07:11 -0300
Subject: [PATCH 028/128] Corrections

---
 src/pages/Entry/Card/EntryBuys.vue       | 24 +++++++++++++++++++-----
 src/pages/Entry/Card/EntryDescriptor.vue | 10 +++++++---
 src/pages/Entry/EntryLatestBuys.vue      |  4 ++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 679afff1b..64793eb70 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -43,7 +43,7 @@ const tableColumnComponents = computed(() => ({
     item: {
         component: QBtn,
         props: {
-            color: 'blue',
+            color: 'primary',
             flat: true,
         },
         event: () => ({}),
@@ -54,6 +54,7 @@ const tableColumnComponents = computed(() => ({
             type: 'number',
             min: 0,
             class: 'input-number',
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -67,6 +68,7 @@ const tableColumnComponents = computed(() => ({
             'use-input': true,
             'hide-selected': true,
             options: packagingsOptions.value,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -76,6 +78,7 @@ const tableColumnComponents = computed(() => ({
             type: 'number',
             min: 0,
             class: 'input-number',
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -84,6 +87,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -92,6 +96,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -100,6 +105,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -108,6 +114,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -116,6 +123,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -124,6 +132,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -320,17 +329,21 @@ const showLockIcon = (groupingMode, mode) => {
                 :columns="entriesTableColumns"
                 selection="multiple"
                 row-key="id"
-                hide-bottom
                 class="full-width q-mt-md"
                 :grid="$q.screen.lt.md"
                 v-model:selected="rowsSelected"
+                :no-results-label="t('No results')"
             >
                 <template #body="props">
                     <QTr>
                         <QTd>
                             <QCheckbox v-model="props.selected" />
                         </QTd>
-                        <QTd v-for="col in props.cols" :key="col.name">
+                        <QTd
+                            v-for="col in props.cols"
+                            :key="col.name"
+                            style="max-width: 100px"
+                        >
                             <component
                                 :is="tableColumnComponents[col.name].component"
                                 v-bind="tableColumnComponents[col.name].props"
@@ -353,7 +366,7 @@ const showLockIcon = (groupingMode, mode) => {
                                             showLockIcon(props.row.groupingMode, col.name)
                                         "
                                         @click="toggleGroupingMode(props.row, col.name)"
-                                        class="cursor-pointer"
+                                        class="cursor-pointer test"
                                         size="sm"
                                         flat
                                         dense
@@ -397,7 +410,7 @@ const showLockIcon = (groupingMode, mode) => {
                     </QTr>
                     <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
                     <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
-                        <QTd colspan="12" style="height: 24px" />
+                        <QTd colspan="12" style="height: 16px" />
                     </QTr>
                 </template>
                 <template #item="props">
@@ -464,4 +477,5 @@ es:
     Confirm deletion: Confirmar eliminación
     Are you sure you want to delete this buy?: Seguro que quieres eliminar esta compra?
     Are you sure you want to delete this buys?: Seguro que quieres eliminar estas compras?
+    No results: Sin resultados
 </i18n>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 6d166c431..d1df63c3b 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -7,6 +7,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 
+import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 
@@ -25,6 +26,7 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const { openReport } = usePrintService();
+const state = useState();
 
 const entryFilter = {
     include: [
@@ -71,6 +73,8 @@ const data = ref(useCardDescription());
 const setData = (entity) =>
     (data.value = useCardDescription(entity.supplier.nickname, entity.id));
 
+const currentEntry = computed(() => state.get('entry'));
+
 const getEntryRedirectionFilter = (entry) => {
     let entryTravel = entry && entry.travel;
 
@@ -126,17 +130,17 @@ const showEntryReport = () => {
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
-        <template #icons="{ entity }">
+        <template v-if="currentEntry" #icons>
             <QCardActions class="q-gutter-x-md">
                 <QIcon
-                    v-if="entity.isExcludedFromAvailable"
+                    v-if="currentEntry.isExcludedFromAvailable"
                     name="vn:inventory"
                     color="primary"
                     size="xs"
                 >
                     <QTooltip>{{ t('Inventory entry') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
+                <QIcon v-if="currentEntry.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>{{ t('Virtual entry') }}</QTooltip>
                 </QIcon>
             </QCardActions>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index f4a423f3b..6b2cb47ab 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -288,7 +288,7 @@ onMounted(async () => {
             </template>
             <template #body-cell-itemFk="{ row }">
                 <QTd @click.stop>
-                    <QBtn flat color="blue">
+                    <QBtn flat color="primary">
                         {{ row.itemFk }}
                     </QBtn>
                 </QTd>
@@ -300,7 +300,7 @@ onMounted(async () => {
             </template>
             <template #body-cell-entryFk="{ row }">
                 <QTd @click.stop>
-                    <QBtn flat color="blue">
+                    <QBtn flat color="primary">
                         <EntryDescriptorProxy :id="row.entryFk" />
                         {{ row.entryFk }}
                     </QBtn>

From 1546077a9201e85bcbbb16db6b42e60073f7b3f9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 22 Feb 2024 15:39:55 -0300
Subject: [PATCH 029/128] Remove auto-load from SupplierList

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

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index e8668fa08..138d353fb 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -42,7 +42,7 @@ const redirectToCreateView = () => {
             </QScrollArea>
         </QDrawer>
         <div class="vn-card-list">
-            <VnPaginate data-key="SuppliersList" url="Suppliers/filter" auto-load>
+            <VnPaginate data-key="SuppliersList" url="Suppliers/filter">
                 <template #body="{ rows }">
                     <CardList
                         v-for="row of rows"

From e0337340e74be3e8ba61d826543183cb1b98cffa Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 20:35:38 -0300
Subject: [PATCH 030/128] Fix route create page

---
 src/pages/Route/Card/RouteForm.vue      | 13 ++++++++++++-
 src/pages/Route/Card/RouteSearchbar.vue |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 53f42145c..5029ce4c0 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -11,10 +11,13 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import VnInputTime from 'components/common/VnInputTime.vue';
+import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
+import {useStateStore} from "stores/useStateStore";
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
+const stateStore = useStateStore();
 const shelvingId = route.params?.id || null;
 const isNew = Boolean(!shelvingId);
 const defaultInitialData = {
@@ -78,6 +81,11 @@ const onSave = (data, response) => {
 </script>
 <template>
     <VnSubToolbar />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <RouteSearchbar />
+        </Teleport>
+    </template>
     <FetchData
         url="Workers/search"
         :filter="{ fields: ['id', 'nickname'] }"
@@ -131,7 +139,7 @@ const onSave = (data, response) => {
                                 <QItemSection>
                                     <QItemLabel>{{ opt.name }}</QItemLabel>
                                     <QItemLabel caption>
-                                        {{ opt.nickname }},{{ opt.code }}
+                                        {{ opt.nickname }}, {{ opt.code }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
@@ -212,6 +220,8 @@ const onSave = (data, response) => {
                     <VnInput
                         v-model="data.description"
                         :label="t('Description')"
+                        type="textarea"
+                        :rows="3"
                         clearable
                     />
                 </div>
@@ -230,4 +240,5 @@ es:
     Hour finished: Hora fin
     Description: Descripción
     Is served: Se ha servido
+    Created: Creado
 </i18n>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
index 9ee4a602f..e3833d13c 100644
--- a/src/pages/Route/Card/RouteSearchbar.vue
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -9,6 +9,7 @@ const { t } = useI18n();
         data-key="RouteList"
         :label="t('Search route')"
         :info="t('You can search by route reference')"
+        custom-route-redirect-name="RouteList"
     />
 </template>
 

From aa535fb6c779ea5e9af8597fb17024e9d88913f3 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 20:41:19 -0300
Subject: [PATCH 031/128] Fix route list actions

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

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index f114bb229..aae562c4b 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -481,7 +481,7 @@ const openTicketsDialog = (id) => {
                             </template>
                             <template #body-cell-actions="props">
                                 <QTd :props="props">
-                                    <div class="flex items-center table-actions">
+                                    <div class="flex items-center no-wrap table-actions">
                                         <QIcon
                                             name="vn:ticketAdd"
                                             size="xs"

From 963c4ade831b1a27b62ce1caf31298771214d67b Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 20:53:17 -0300
Subject: [PATCH 032/128] Fix route tickets

---
 src/pages/Route/RouteTickets.vue | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 4044fb543..7e4c0a530 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -188,8 +188,8 @@ const confirmRemove = (ticket) => {
         .dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('confirmDeletion'),
-                message: t('confirmDeletionMessage'),
+                title: t('Confirm removal from route'),
+                message: t('Are you sure you want to remove this ticket from the route?'),
                 promise: () => removeTicket(ticket),
             },
         })
@@ -326,10 +326,14 @@ const openSmsDialog = async () => {
                                             class="q-mr-md cursor-pointer"
                                             color="primary"
                                             @click="setHighestPriority(row, rows)"
-                                        />
+                                        >
+                                            <QTooltip>
+                                                {{ t('Assign highest priority') }}
+                                            </QTooltip>
+                                        </QIcon>
                                         <VnInput
                                             v-model="row.priority"
-                                            is-outlined
+                                            dense
                                             @blur="updatePriority(row)"
                                         />
                                     </div>
@@ -393,7 +397,7 @@ const openSmsDialog = async () => {
         <QPageSticky :offset="[20, 20]">
             <QBtn fab icon="add" color="primary" @click="openTicketsDialog">
                 <QTooltip>
-                    {{ t('newRoute') }}
+                    {{ t('Add ticket') }}
                 </QTooltip>
             </QBtn>
         </QPageSticky>
@@ -415,10 +419,6 @@ const openSmsDialog = async () => {
 }
 </style>
 <i18n>
-en:
-    newRoute: New Route
-    confirmDeletion: Confirm deletion
-    confirmDeletionMessage: Are you sure you want to delete this ticket?
 es:
     Order: Orden
     Street: Dirección fiscal
@@ -428,8 +428,8 @@ es:
     Warehouse: Almacén
     Packages: Bultos
     Packaging: Encajado
-    confirmDeletion: Confirmar eliminación
-    confirmDeletionMessage: Seguro que quieres eliminar este ticket?
+    Confirm removal from route: Remover de la ruta
+    Are you sure you want to remove this ticket from the route?: ¿Seguro que quieres remover este ticket de la ruta?
     Sort routes: Ordenar rutas
     Open buscaman: Abrir buscaman
     Delete priority: Borrar orden
@@ -437,4 +437,5 @@ es:
     Assign highest priority: Asignar máxima prioridad
     Send SMS to all clients: Mandar sms a todos los clientes de las rutas
     Send SMS to the selected tickets: Enviar SMS a los tickets seleccionados
+    Add ticket: Añadir ticket
 </i18n>

From b76a021059c2721acbbe353f3fac4ba1313e9803 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 21:20:59 -0300
Subject: [PATCH 033/128] Fix route autonomous

---
 src/pages/Route/Card/RouteSummary.vue | 11 +++++++++--
 src/pages/Route/RouteAutonomous.vue   |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 130f7be0d..997618df1 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -11,6 +11,7 @@ import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import axios from 'axios';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
 
 const $props = defineProps({
     id: {
@@ -131,6 +132,11 @@ const openBuscaman = async (route, ticket) => {
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <RouteSearchbar />
+        </Teleport>
+    </template>
     <div class="q-pa-md full-width">
         <CardSummary ref="summary" :url="`Routes/${entityId}/summary`">
             <template #header-left>
@@ -207,9 +213,10 @@ const openBuscaman = async (route, ticket) => {
                 </QCard>
 
                 <QCard class="vn-max">
-                    <div class="header">
+                    <a class="header" :href="`#/route/${entityId}/tickets`">
                         {{ t('route.summary.tickets') }}
-                    </div>
+                        <QIcon name="open_in_new" color="primary" />
+                    </a>
                     <QTable
                         :columns="ticketColumns"
                         :rows="entity?.tickets"
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index eee9ff9c5..0c504ba9f 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -288,4 +288,5 @@ es:
     Price: Precio
     Received: Recibida
     Autonomous: Autónomos
+    Preview: Vista previa
 </i18n>

From 4da74f8710787c03eef4c1b521920b8e8b95775a Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 21:45:08 -0300
Subject: [PATCH 034/128] Fix route roadmaps

---
 src/pages/Route/Roadmap/RoadmapBasicData.vue |  4 ++--
 src/pages/Route/Roadmap/RoadmapSummary.vue   |  4 ++--
 src/pages/Route/RouteRoadmap.vue             | 17 +++++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index 5084eefa7..889868e5a 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -134,8 +134,8 @@ es:
     Roadmap: Troncal
     ETD date: Fecha ETD
     ETD hour: Hora ETD
-    Tractor plate: Placa tractor
-    Trailer plate: Placa trailer
+    Tractor plate: Matrícula tractor
+    Trailer plate: Matrícula trailer
     Carrier: Transportista
     Price: Precio
     Driver name: Nombre del conductor
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 77d277666..fb756f4aa 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -124,8 +124,8 @@ const filter = {
 <i18n>
 es:
     Carrier: Transportista
-    Tractor Plate: Placa tractor
-    Trailer Plate: Placa trailer
+    Tractor Plate: Matrícula tractor
+    Trailer Plate: Matrícula trailer
     Phone: Teléfono
     Worker: Trabajador
     Observations: Observaciones
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index c7b12a417..73d63aa06 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -141,7 +141,7 @@ function previewRoadmap(id) {
         <Teleport to="#searchbar">
             <VnSearchbar
                 data-key="RoadmapList"
-                :label="t('Search roadmap')"
+                :label="t('Search roadmaps')"
                 :info="t('You can search by roadmap reference')"
             />
         </Teleport>
@@ -283,17 +283,18 @@ function previewRoadmap(id) {
 </style>
 <i18n>
 es:
-    Search roadmap: Buscar trocal
-    You can search by roadmap reference: Puedes buscar por referencia de la trocal
-    Delete roadmap(s): Eliminar trocal(es)
-    Selected roadmaps will be removed: Las trocales seleccionadas serán eliminadas
+    Search roadmaps: Buscar troncales
+    You can search by roadmap reference: Puedes buscar por referencia de la troncal
+    Delete roadmap(s): Eliminar troncal(es)
+    Selected roadmaps will be removed: Las troncales seleccionadas serán eliminadas
     Are you sure you want to continue?: ¿Seguro que quieres continuar?
     The date can't be empty: La fecha no puede estar vacía
     Clone Selected Routes: Clonar rutas seleccionadas
-    Create roadmap: Crear trocal
-    Roadmap: Trocal
+    Create roadmap: Crear troncal
+    Roadmap: Troncal
     Carrier: Transportista
-    Plate: Placa
+    Plate: Matrícula
     Price: Precio
     Observations: Observaciones
+    Preview: Vista previa
 </i18n>

From 53f69738a5a11c291decfcbee18bbdbdb32167f3 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 21:49:07 -0300
Subject: [PATCH 035/128] Fix routes form update

---
 src/pages/Route/Card/RouteForm.vue           | 6 +++---
 src/pages/Route/Roadmap/RoadmapBasicData.vue | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 5029ce4c0..8d32f6773 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -18,8 +18,8 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
-const shelvingId = route.params?.id || null;
-const isNew = Boolean(!shelvingId);
+const shelvingId = ref(route.params?.id || null);
+const isNew = Boolean(!shelvingId.value);
 const defaultInitialData = {
     agencyModeFk: null,
     created: null,
@@ -111,7 +111,7 @@ const onSave = (data, response) => {
         auto-load
     />
     <FormModel
-        :url="isNew ? null : `Routes/${shelvingId}`"
+        :url="isNew ? null : `Routes/${route.params?.id}`"
         :url-create="isNew ? 'Routes' : null"
         :observe-form-changes="!isNew"
         :filter="routeFilter"
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index 889868e5a..8b10f5e57 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -14,7 +14,6 @@ import {ref} from "vue";
 const { t } = useI18n();
 const router = useRouter();
 const route = useRoute();
-const entityId = route.params?.id || null;
 
 const supplierList = ref([]);
 const filter = { include: [{ relation: 'supplier' }] };
@@ -33,7 +32,7 @@ const onSave = (data, response) => {
         @on-fetch="(data) => (supplierList = data)"
     />
     <FormModel
-        :url="`Roadmaps/${entityId}`"
+        :url="`Roadmaps/${route.params?.id}`"
         observe-form-changes
         :filter="filter"
         model="roadmap"

From d816a572722cca0c7f7d9540d58950462903c5d2 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 22:24:52 -0300
Subject: [PATCH 036/128] Fix buscaman implementation

---
 src/pages/Route/Card/RouteSummary.vue | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 997618df1..f9baa316d 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -8,10 +8,10 @@ import VnLv from 'components/ui/VnLv.vue';
 import { QIcon } from 'quasar';
 import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
-import axios from 'axios';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import { openBuscaman } from 'src/utils/buscaman';
 
 const $props = defineProps({
     id: {
@@ -115,20 +115,6 @@ const ticketColumns = ref([
         align: 'left',
     },
 ]);
-
-const openBuscaman = async (route, ticket) => {
-    if (!route.vehicleFk) throw new Error(`The route doesn't have a vehicle`);
-    const response = await axios.get(`Routes/${route.vehicleFk}/getDeliveryPoint`);
-    if (!response.data)
-        throw new Error(`The route's vehicle doesn't have a delivery point`);
-
-    const address = `${response.data}+to:${ticket.postalCode} ${ticket.city} ${ticket.street}`;
-    window.open(
-        'https://gps.buscalia.com/usuario/localizar.aspx?bmi=true&addr=' +
-            encodeURI(address),
-        '_blank'
-    );
-};
 </script>
 
 <template>
@@ -229,7 +215,7 @@ const openBuscaman = async (route, ticket) => {
                             <QTd auto-width>
                                 <span
                                     class="text-primary cursor-pointer"
-                                    @click="openBuscaman(entity?.route, row)"
+                                    @click="openBuscaman(entity?.route?.vehicleFk, [row])"
                                 >
                                     {{ value }}
                                 </span>

From 819e25de386eaa6845d75aa695eadff1ec65bd3f Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 22 Feb 2024 22:29:03 -0300
Subject: [PATCH 037/128] Add eye icon summary

---
 src/pages/Route/RouteList.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index aae562c4b..0c9fdad48 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -502,6 +502,16 @@ const openTicketsDialog = (id) => {
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
                                         </QIcon>
+                                        <RouterLink
+                                            :to="{
+                                                name: 'RouteSummary',
+                                                params: { id: props?.row?.id },
+                                            }"
+                                        >
+                                            <QIcon name="vn:eye" size="xs" color="primary">
+                                                <QTooltip>{{ t('Summary') }}</QTooltip>
+                                            </QIcon>
+                                        </RouterLink>
                                     </div>
                                 </QTd>
                             </template>
@@ -552,4 +562,5 @@ es:
     Download selected routes as PDF: Descargar rutas seleccionadas como PDF
     Add ticket: Añadir tickets
     Preview: Vista previa
+    Summary: Resumen
 </i18n>

From 185de3c9318ff945704e6177a146ce427d68f29b Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 23 Feb 2024 00:46:57 -0300
Subject: [PATCH 038/128] Add roadmap stops

---
 src/i18n/en/index.js                     |   2 +
 src/i18n/es/index.js                     |   2 +
 src/pages/Route/Roadmap/RoadmapStops.vue | 169 +++++++++++++++++++++++
 src/router/modules/roadmap.js            |  11 +-
 4 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapStops.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 8503fa696..5731732b7 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -939,6 +939,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
+            stops: 'Stops'
         },
     },
     roadmap: {
@@ -946,6 +947,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
+            stops: 'Stops'
         },
     },
     route: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 1e548362d..e59855f37 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -939,6 +939,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
+            stops: 'Paradas'
         },
     },
     roadmap: {
@@ -946,6 +947,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
+            stops: 'Paradas'
         },
     },
     route: {
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
new file mode 100644
index 000000000..5aba86062
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -0,0 +1,169 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FetchData from 'components/FetchData.vue';
+import { computed, ref } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+import VnInput from 'components/common/VnInput.vue';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+
+const refreshKey = ref(0);
+const expeditionList = ref([]);
+const warehouseList = ref([]);
+
+const stopList = computed(() => expeditionList.value.filter((item) => !item.deleted));
+
+const addStop = async () => {
+    const response = await axios.get(`Roadmaps/${route.params?.id}`, {
+        params: {
+            filter: JSON.stringify({
+                fields: ['etd'],
+            }),
+        },
+    });
+    const eta = new Date(response.data.etd);
+    eta.setDate(eta.getDate() + 1);
+    expeditionList.value.push({
+        id: expeditionList.value.length * -1,
+        roadmapFk: Number(route.params?.id) || 0,
+        eta: eta.toISOString(),
+    });
+};
+
+const updateStop = (stop) => {
+    if (stop.id > 0) {
+        stop.updated = true;
+    }
+};
+
+const deleteStop = (stop) => {
+    if (stop.id > 0) {
+        stop.deleted = true;
+    }
+};
+
+const onSave = async () => {
+    const body = {
+        creates: expeditionList.value
+            .filter((item) => item.id < 0)
+            .map(({ id, ...data }) => data),
+        deletes: expeditionList.value
+            .filter((item) => item.deleted)
+            .map((item) => item.id),
+        updates: expeditionList.value
+            .filter((item) => item.updated)
+            .map(({ id, updated, ...data }) => ({ data, where: { id } })),
+    };
+    await axios.post(`ExpeditionTrucks/crud`, body);
+    refreshKey.value ++;
+};
+</script>
+<template>
+    <VnSubToolbar />
+    <FetchData
+        :key="refreshKey"
+        url="ExpeditionTrucks"
+        auto-load
+        :filter="{ where: { roadmapFk: route.params?.id } }"
+        sort-by="eta"
+        limit="30"
+        @on-fetch="(data) => (expeditionList = data)"
+    />
+    <FetchData
+        url="Warehouses"
+        auto-load
+        :filter="{ fields: ['id', 'name'] }"
+        sort-by="name"
+        limit="30"
+        @on-fetch="(data) => (warehouseList = data)"
+    />
+
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+        <div class="q-gutter-x-sm">
+            <QBtn
+                :label="t('globals.save')"
+                color="primary"
+                icon="save"
+                @click="onSave"
+                :title="t('globals.save')"
+            />
+        </div>
+    </Teleport>
+    <QForm class="q-pa-lg">
+        <QCard class="q-pa-md">
+            <div v-for="stop in stopList" :key="stop.id" class="row q-py-md">
+                <div class="col q-pr-lg">
+                    <VnSelectFilter
+                        v-model="stop.warehouseFk"
+                        :label="t('Warehouse')"
+                        :options="warehouseList"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        :input-debounce="0"
+                        @update:model-value="updateStop(stop)"
+                    />
+                </div>
+                <div class="col q-pr-lg">
+                    <VnInputDate
+                        v-model="stop.eta"
+                        :label="t('ETA date')"
+                        @update:model-value="updateStop(stop)"
+                    />
+                </div>
+                <div class="col q-pr-lg">
+                    <VnInputTime
+                        v-model="stop.eta"
+                        :label="t('ETA date')"
+                        @update:model-value="updateStop(stop)"
+                    />
+                </div>
+                <div class="col q-pr-lg">
+                    <VnInput
+                        v-model="stop.description"
+                        :label="t('Description')"
+                        type="textarea"
+                        :rows="1"
+                        @update:model-value="updateStop(stop)"
+                    />
+                </div>
+                <div class="flex justify-center items-center">
+                    <QIcon
+                        name="delete"
+                        size="sm"
+                        color="primary"
+                        class="cursor-pointer"
+                        @click="deleteStop(stop)"
+                    />
+                </div>
+            </div>
+            <div class="q-pt-lg">
+                <QIcon
+                    name="add_circle"
+                    size="sm"
+                    color="primary"
+                    class="cursor-pointer"
+                    @click="addStop"
+                />
+            </div>
+        </QCard>
+    </QForm>
+</template>
+<i18n>
+es:
+    Warehouse: Almacén
+    ETA date: Fecha ETA
+    ETA hour: Hora ETA
+    Description: Descripción
+</i18n>
diff --git a/src/router/modules/roadmap.js b/src/router/modules/roadmap.js
index fa63dbd44..02edf94be 100644
--- a/src/router/modules/roadmap.js
+++ b/src/router/modules/roadmap.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        card: ['RoadmapBasicData'],
+        card: ['RoadmapBasicData', 'RoadmapStops'],
     },
     children: [
         {
@@ -37,6 +37,15 @@ export default {
                     },
                     component: () => import('pages/Route/Roadmap/RoadmapBasicData.vue'),
                 },
+                {
+                    name: 'RoadmapStops',
+                    path: 'stops',
+                    meta: {
+                        title: 'stops',
+                        icon: 'vn:lines',
+                    },
+                    component: () => import('pages/Route/Roadmap/RoadmapStops.vue'),
+                },
             ],
         },
     ],

From 67eb8e82b607d77726eba7afcf7cfe10558f0997 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 08:17:22 -0300
Subject: [PATCH 039/128] WIP

---
 src/pages/Supplier/Card/SupplierSummary.vue | 40 +++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index d734e21a5..442e03f9f 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -52,9 +52,13 @@ const isAdministrative = computed(() => {
         @on-fetch="(data) => setData(data)"
     >
         <template #header-left>
-            <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+            <router-link
+                v-if="isAdministrative"
+                class="header link"
+                :to="{ name: 'SupplierSummary', params: { id: entityId } }"
+            >
                 <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
+            </router-link>
         </template>
         <template #header>
             <span>{{ supplier.name }} - {{ supplier.id }}</span>
@@ -62,10 +66,14 @@ const isAdministrative = computed(() => {
 
         <template #body>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierBasicData', params: { id: entityId } }"
+                >
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('globals.summary.basicData') }}</span>
                 <VnLv label="Id" :value="supplier.id" />
                 <VnLv label="Alias" :value="supplier.nickname" />
@@ -105,10 +113,14 @@ const isAdministrative = computed(() => {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierBillingData', params: { id: entityId } }"
+                >
                     {{ t('supplier.summary.billingData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('supplier.summary.billingData') }}</span>
                 <VnLv
                     :label="t('supplier.summary.payMethod')"
@@ -124,10 +136,14 @@ const isAdministrative = computed(() => {
                 <VnLv :label="t('supplier.summary.account')" :value="supplier.account" />
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierFiscalData', params: { id: entityId } }"
+                >
                     {{ t('supplier.summary.fiscalData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('supplier.summary.fiscalData') }}</span>
                 <VnLv
                     :label="t('supplier.summary.sageTaxType')"
@@ -155,10 +171,14 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierFiscalData', params: { id: entityId } }"
+                >
                     {{ t('supplier.summary.fiscalAddress') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('supplier.summary.fiscalAddress') }}</span>
                 <VnLv :label="t('supplier.summary.socialName')" :value="supplier.name" />
                 <VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" />

From e2d29f08b4d28e3ee635f3e2c87314c853f352bb Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 08:35:56 -0300
Subject: [PATCH 040/128] remove unnused class

---
 src/pages/Entry/Card/EntryBuys.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 64793eb70..a65e7e1c9 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -366,7 +366,7 @@ const showLockIcon = (groupingMode, mode) => {
                                             showLockIcon(props.row.groupingMode, col.name)
                                         "
                                         @click="toggleGroupingMode(props.row, col.name)"
-                                        class="cursor-pointer test"
+                                        class="cursor-pointer"
                                         size="sm"
                                         flat
                                         dense
@@ -392,8 +392,8 @@ const showLockIcon = (groupingMode, mode) => {
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
                         <QTd>
-                            <span>{{ props.row.item.id }}</span>
-                        </QTd>
+                            <span>{{ props.row.item.id }}</span> </QTd
+                        >'
                         <QTd>
                             <span>{{ props.row.item.size }}</span>
                         </QTd>

From ed2a7c5ee688e6b2338275167b9959374f320000 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 08:58:32 -0300
Subject: [PATCH 041/128] Add fill to lock icon

---
 src/pages/Entry/Card/EntryBuys.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index a65e7e1c9..a96edb1db 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -285,7 +285,7 @@ const toggleGroupingMode = async (buy, mode) => {
     }
 };
 
-const showLockIcon = (groupingMode, mode) => {
+const lockIconType = (groupingMode, mode) => {
     if (mode === 'packing') {
         return groupingMode === 2 ? 'lock' : 'lock_open';
     } else {
@@ -363,7 +363,7 @@ const showLockIcon = (groupingMode, mode) => {
                                 >
                                     <QBtn
                                         :icon="
-                                            showLockIcon(props.row.groupingMode, col.name)
+                                            lockIconType(props.row.groupingMode, col.name)
                                         "
                                         @click="toggleGroupingMode(props.row, col.name)"
                                         class="cursor-pointer"
@@ -372,6 +372,16 @@ const showLockIcon = (groupingMode, mode) => {
                                         dense
                                         unelevated
                                         push
+                                        :style="{
+                                            'font-variation-settings': `'FILL' ${
+                                                lockIconType(
+                                                    props.row.groupingMode,
+                                                    col.name
+                                                ) === 'lock'
+                                                    ? 1
+                                                    : 0
+                                            }`,
+                                        }"
                                     />
                                 </template>
                                 <template

From 46e5503a7919d4c316d96d4da39c173efd186085 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 10:43:30 -0300
Subject: [PATCH 042/128] save descriptor data in state

---
 src/components/ui/CardDescriptor.vue     | 4 ++++
 src/pages/Entry/Card/EntryDescriptor.vue | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 241937a4e..1c6b260c8 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useState } from 'src/composables/useState';
 
 const $props = defineProps({
     url: {
@@ -35,6 +36,8 @@ const $props = defineProps({
         default: null,
     },
 });
+
+const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -64,6 +67,7 @@ async function getData() {
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {
         isLoading.value = false;
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index d1df63c3b..bb7a20dd0 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -109,7 +109,7 @@ const showEntryReport = () => {
         :title="data.title"
         :subtitle="data.subtitle"
         @on-fetch="setData"
-        data-key="entryData"
+        data-key="entry"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">

From 913bc7d87074467d112c43c62d5a88eeec10724c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 11:50:38 -0300
Subject: [PATCH 043/128] Refetch descriptor data when exit EntryBasicData view

---
 src/pages/Entry/Card/EntryDescriptor.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index bb7a20dd0..13f24b93c 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -27,6 +27,7 @@ const route = useRoute();
 const { t } = useI18n();
 const { openReport } = usePrintService();
 const state = useState();
+const entryDescriptorRef = ref(null);
 
 const entryFilter = {
     include: [
@@ -96,13 +97,27 @@ const getEntryRedirectionFilter = (entry) => {
     });
 };
 
+const refetchEntryDescriptorData = async () => {
+    await entryDescriptorRef.value.getData();
+};
+
+watch(
+    () => route.name,
+    async (_, from) => {
+        if (from === 'EntryBasicData') await refetchEntryDescriptorData();
+    }
+);
+
 const showEntryReport = () => {
     openReport(`Entries/${route.params.id}/entry-order-pdf`);
 };
+
+watch;
 </script>
 
 <template>
     <CardDescriptor
+        ref="entryDescriptorRef"
         module="Entry"
         :url="`Entries/${entityId}`"
         :filter="entryFilter"
@@ -130,7 +145,7 @@ const showEntryReport = () => {
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
-        <template v-if="currentEntry" #icons>
+        <template #icons>
             <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="currentEntry.isExcludedFromAvailable"

From 6605eea044d9de9b2a93159f91245ad1e38be928 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 11:52:39 -0300
Subject: [PATCH 044/128] remove character added by accident

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

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index a96edb1db..168e56f14 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -402,8 +402,8 @@ const lockIconType = (groupingMode, mode) => {
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
                         <QTd>
-                            <span>{{ props.row.item.id }}</span> </QTd
-                        >'
+                            <span>{{ props.row.item.id }}</span>
+                        </QTd>
                         <QTd>
                             <span>{{ props.row.item.size }}</span>
                         </QTd>

From 3e04c86000318a6e17060c0ee2b9f495e4e109e2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 11:53:59 -0300
Subject: [PATCH 045/128] reduce EntrySummary distance between table rows

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

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 3861e0321..f4bb36ef3 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -338,7 +338,7 @@ const fetchEntryBuys = async () => {
                             v-if="rowIndex !== entryBuys.length - 1"
                             class="separation-row"
                         >
-                            <QTd colspan="10" style="height: 24px" />
+                            <QTd colspan="10" style="height: 16px" />
                         </QTr>
                     </template>
                 </QTable>

From 6ad2e9aafe520acb5b1d8c578a506b0a02d2c01d Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 23 Feb 2024 14:43:08 -0300
Subject: [PATCH 046/128] Update roadmap summary dialog implementation

---
 .../Route/Roadmap/RoadmapSummaryDialog.vue    | 29 -------------------
 src/pages/Route/RouteRoadmap.vue              | 18 +++---------
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 src/pages/Route/Roadmap/RoadmapSummaryDialog.vue

diff --git a/src/pages/Route/Roadmap/RoadmapSummaryDialog.vue b/src/pages/Route/Roadmap/RoadmapSummaryDialog.vue
deleted file mode 100644
index 35cb5771a..000000000
--- a/src/pages/Route/Roadmap/RoadmapSummaryDialog.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<script setup>
-import { useDialogPluginComponent } from 'quasar';
-import RoadmapSummary from "pages/Route/Roadmap/RoadmapSummary.vue";
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: true,
-    },
-});
-
-defineEmits([...useDialogPluginComponent.emits]);
-
-const { dialogRef, onDialogHide } = useDialogPluginComponent();
-</script>
-
-<template>
-    <QDialog ref="dialogRef" @hide="onDialogHide">
-        <div class="dialog full-width">
-            <RoadmapSummary v-if="$props.id" :id="$props.id" />
-        </div>
-    </QDialog>
-</template>
-
-<style lang="scss" scoped>
-.dialog {
-    max-width: 1280px;
-}
-</style>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 73d63aa06..f176aebc5 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -13,11 +13,13 @@ import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import axios from 'axios';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import RoadmapSummaryDialog from "pages/Route/Roadmap/RoadmapSummaryDialog.vue";
+import {useSummaryDialog} from "composables/useSummaryDialog";
+import RoadmapSummary from "pages/Route/Roadmap/RoadmapSummary.vue";
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const quasar = useQuasar();
+const { viewSummary } = useSummaryDialog();
 
 const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
@@ -122,18 +124,6 @@ function confirmRemove() {
         })
         .onOk(() => refreshKey.value++);
 }
-
-function previewRoadmap(id) {
-    if (!id) {
-        return;
-    }
-    quasar.dialog({
-        component: RoadmapSummaryDialog,
-        componentProps: {
-            id,
-        },
-    });
-}
 </script>
 
 <template>
@@ -248,7 +238,7 @@ function previewRoadmap(id) {
                                             name="preview"
                                             size="xs"
                                             color="primary"
-                                            @click="previewRoadmap(props?.row?.id)"
+                                            @click.stop="viewSummary(props?.row?.id, RoadmapSummary)"
                                             class="cursor-pointer"
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>

From 929a094132b6c0181ef5b773b989daf073b5081a Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 23 Feb 2024 15:30:45 -0300
Subject: [PATCH 047/128] Fix route table navigation

---
 src/pages/Route/RouteAutonomous.vue | 7 ++++++-
 src/pages/Route/RouteRoadmap.vue    | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 0c504ba9f..8d1a7f6fd 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -131,6 +131,10 @@ const openCreateInvoiceIn = () => {
 
     router.push({ name: 'RouteAutonomousCreateInvoiceIn', query: { q: params } });
 };
+
+function navigateToRouteSummary(event, row) {
+    router.push({ name: 'RouteSummary', params: { id: row.routeFk } })
+}
 </script>
 
 <template>
@@ -195,6 +199,7 @@ const openCreateInvoiceIn = () => {
                             selection="multiple"
                             :rows-per-page-options="[0]"
                             hide-pagination
+                            @row-click="navigateToRouteSummary"
                         >
                             <template #body-cell-ID="props">
                                 <QTd :props="props">
@@ -233,7 +238,7 @@ const openCreateInvoiceIn = () => {
                                             name="preview"
                                             size="xs"
                                             color="primary"
-                                            @click="viewSummary(props?.row?.routeFk, RouteSummary)"
+                                            @click.stop="viewSummary(props?.row?.routeFk, RouteSummary)"
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
                                         </QIcon>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index f176aebc5..767a1bf2e 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -15,10 +15,12 @@ import axios from 'axios';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import {useSummaryDialog} from "composables/useSummaryDialog";
 import RoadmapSummary from "pages/Route/Roadmap/RoadmapSummary.vue";
+import {useRouter} from "vue-router";
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const quasar = useQuasar();
+const router = useRouter();
 const { viewSummary } = useSummaryDialog();
 
 const to = Date.vnNew();
@@ -124,6 +126,10 @@ function confirmRemove() {
         })
         .onOk(() => refreshKey.value++);
 }
+
+function navigateToRoadmapSummary(event, row) {
+    router.push({ name: 'RoadmapSummary', params: { id: row.id } })
+}
 </script>
 
 <template>
@@ -219,7 +225,7 @@ function confirmRemove() {
                             :rows-per-page-options="[0]"
                             hide-pagination
                             :pagination="{ sortBy: 'ID', descending: true }"
-                            :on-row-click="(evt, row) => console.log(evt, row)"
+                            @row-click="navigateToRoadmapSummary"
                         >
                             <template #body-cell-carrier="props">
                                 <QTd :props="props">

From 4d2dacff6fa4ebacdf89e2136dbed044628c8d77 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 20:36:26 -0300
Subject: [PATCH 048/128] add no results label

---
 src/pages/Entry/Card/EntryBuys.vue    | 3 +--
 src/pages/Entry/Card/EntrySummary.vue | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 168e56f14..c6647de50 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -332,7 +332,7 @@ const lockIconType = (groupingMode, mode) => {
                 class="full-width q-mt-md"
                 :grid="$q.screen.lt.md"
                 v-model:selected="rowsSelected"
-                :no-results-label="t('No results')"
+                :no-data-label="t('globals.noResults')"
             >
                 <template #body="props">
                     <QTr>
@@ -487,5 +487,4 @@ es:
     Confirm deletion: Confirmar eliminación
     Are you sure you want to delete this buy?: Seguro que quieres eliminar esta compra?
     Are you sure you want to delete this buys?: Seguro que quieres eliminar estas compras?
-    No results: Sin resultados
 </i18n>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index f4bb36ef3..e6842a3f9 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -289,9 +289,9 @@ const fetchEntryBuys = async () => {
                 <QTable
                     :rows="entryBuys"
                     :columns="entriesTableColumns"
-                    hide-bottom
                     row-key="index"
                     class="full-width q-mt-md"
+                    :no-data-label="t('globals.noResults')"
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
@@ -355,5 +355,6 @@ const fetchEntryBuys = async () => {
 
 <i18n>
 es:
-    Travel data: 'Datos envío'
+    Travel data: Datos envío
+
 </i18n>

From ac5d83b8cccc52e54c92dbebad026741052b6ae8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 21:23:42 -0300
Subject: [PATCH 049/128] Several changes

---
 src/pages/Supplier/Card/SupplierAccounts.vue   |  2 +-
 src/pages/Supplier/Card/SupplierContacts.vue   | 12 +++++++++++-
 src/pages/Supplier/Card/SupplierDescriptor.vue |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 302e03217..39bcca63c 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -114,7 +114,7 @@ onMounted(() => {
                             :label="t('worker.create.bankEntity')"
                             v-model="row.bankEntityFk"
                             :options="bankEntitiesOptions"
-                            option-label="name"
+                            option-label="bic"
                             option-value="id"
                             hide-selected
                         >
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index d69b74a4c..571b57f00 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -11,6 +11,15 @@ const route = useRoute();
 const { t } = useI18n();
 const supplierContactRef = ref(null);
 
+const insertRow = () => {
+    supplierContactRef.value.insert();
+    setTimeout(() => {
+        const inputs = document.querySelectorAll('[input-name-focusable]');
+        const lastInput = inputs[inputs.length - 1];
+        if (lastInput) lastInput.focus();
+    }, 5);
+};
+
 onMounted(() => {
     if (supplierContactRef.value) supplierContactRef.value.reload();
 });
@@ -38,6 +47,7 @@ onMounted(() => {
                     <VnRow class="row q-gutter-md">
                         <div class="col">
                             <VnInput
+                                input-name-focusable
                                 :label="t('supplier.contacts.name')"
                                 v-model="row.name"
                             />
@@ -92,7 +102,7 @@ onMounted(() => {
                         size="sm"
                         class="cursor-pointer"
                         color="primary"
-                        @click="supplierContactRef.insert()"
+                        @click="insertRow()"
                     >
                         <QTooltip>
                             {{ t('Add contact') }}
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 83bad87d2..eabb95554 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -167,6 +167,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('All entries with current supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
+                    v-if="entity.client?.fi"
                     :to="{
                         name: 'CustomerCard',
                         params: { id: entity.client?.id },

From bf66d4ec998a461bedb6113843d8c858dc2b1264 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 25 Feb 2024 22:02:52 -0300
Subject: [PATCH 050/128] Table column filters

---
 src/pages/Entry/EntryLatestBuys.vue | 425 +++++++++++++++++++++++++++-
 1 file changed, 416 insertions(+), 9 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index f4a423f3b..32f975ca7 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -8,11 +8,14 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
 import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
+import { useArrayData } from 'composables/useArrayData';
 
 const router = useRouter();
 const session = useSession();
@@ -21,11 +24,72 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 
 const rowsFetchDataRef = ref(null);
+const itemTypesOptions = ref([]);
+const originsOptions = ref([]);
+const itemFamiliesOptions = ref([]);
+const intrastatOptions = ref([]);
+const packagingsOptions = ref([]);
 const editTableCellDialogRef = ref(null);
 const visibleColumns = ref([]);
 const allColumnNames = ref([]);
-const rows = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'id':
+        case 'size':
+        case 'weightByPiece':
+        case 'isActive':
+        case 'family':
+        case 'minPrice':
+        case 'packingOut':
+            return { [`i.${param}`]: value };
+        case 'name':
+        case 'description':
+            return { [`i.${param}`]: { like: `%${value}%` } };
+        case 'code':
+            return { 'it.code': value };
+        case 'intrastat':
+            return { 'intr.description': value };
+        case 'origin':
+            return { 'ori.code': value };
+        case 'landing':
+            return { [`lb.${param}`]: value };
+        case 'packing':
+        case 'grouping':
+        case 'quantity':
+        case 'entryFk':
+        case 'buyingValue':
+        case 'freightValue':
+        case 'comissionValue':
+        case 'packageValue':
+        case 'isIgnored':
+        case 'price2':
+        case 'price3':
+        case 'ektFk':
+        case 'weight':
+        case 'packagingFk':
+            return { [`b.${param}`]: value };
+    }
+};
+
+const params = reactive({});
+const arrayData = useArrayData('EntryLatestBuys', {
+    url: 'Buys/latestBuysFilter',
+    order: ['itemFk DESC'],
+    exprBuilder: exprBuilder,
+});
+const store = arrayData.store;
+const rows = computed(() => store.data);
 const rowsSelected = ref([]);
+
+const getInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
 const columns = computed(() => [
     {
         label: t('entry.latestBuys.picture'),
@@ -37,12 +101,32 @@ const columns = computed(() => [
         name: 'itemFk',
         field: 'itemFk',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.packing'),
         field: 'packing',
         name: 'packing',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -50,6 +134,16 @@ const columns = computed(() => [
         field: 'grouping',
         name: 'grouping',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -57,12 +151,32 @@ const columns = computed(() => [
         field: 'quantity',
         name: 'quantity',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.description'),
         field: 'description',
         name: 'description',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -70,35 +184,104 @@ const columns = computed(() => [
         field: 'size',
         name: 'size',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.tags'),
         name: 'tags',
         align: 'left',
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.type'),
         field: 'code',
         name: 'type',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'code',
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.intrastat'),
         field: 'intrastat',
         name: 'intrastat',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: intrastatOptions.value,
+                'option-value': 'description',
+                'option-label': 'description',
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.origin'),
         field: 'origin',
         name: 'origin',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: originsOptions.value,
+                'option-value': 'code',
+                'option-label': 'code',
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.weightByPiece'),
         field: 'weightByPiece',
         name: 'weightByPiece',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -106,24 +289,67 @@ const columns = computed(() => [
         field: 'isActive',
         name: 'isActive',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.family'),
         field: 'family',
         name: 'family',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemFamiliesOptions.value,
+                'option-value': 'code',
+                'option-label': 'code',
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.entryFk'),
         field: 'entryFk',
         name: 'entryFk',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.buyingValue'),
         field: 'buyingValue',
         name: 'buyingValue',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => toCurrency(val),
     },
     {
@@ -131,6 +357,16 @@ const columns = computed(() => [
         field: 'freightValue',
         name: 'freightValue',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => toCurrency(val),
     },
     {
@@ -138,6 +374,16 @@ const columns = computed(() => [
         field: 'comissionValue',
         name: 'comissionValue',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => toCurrency(val),
     },
     {
@@ -145,6 +391,16 @@ const columns = computed(() => [
         field: 'packageValue',
         name: 'packageValue',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => toCurrency(val),
     },
     {
@@ -152,12 +408,33 @@ const columns = computed(() => [
         field: 'isIgnored',
         name: 'isIgnored',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.price2'),
         field: 'price2',
         name: 'price2',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+
         format: (val) => toCurrency(val),
     },
     {
@@ -165,6 +442,16 @@ const columns = computed(() => [
         field: 'price3',
         name: 'price3',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => toCurrency(val),
     },
     {
@@ -172,6 +459,16 @@ const columns = computed(() => [
         field: 'minPrice',
         name: 'minPrice',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => toCurrency(val),
     },
     {
@@ -179,6 +476,16 @@ const columns = computed(() => [
         field: 'ektFk',
         name: 'ektFk',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -186,18 +493,51 @@ const columns = computed(() => [
         field: 'weight',
         name: 'weight',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.packagingFk'),
         field: 'packagingFk',
         name: 'packagingFk',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: packagingsOptions.value,
+                'option-value': 'id',
+                'option-label': 'id',
+                dense: true,
+            },
+        },
     },
     {
         label: t('entry.latestBuys.packingOut'),
         field: 'packingOut',
         name: 'packingOut',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => dashIfEmpty(val),
     },
     {
@@ -205,6 +545,16 @@ const columns = computed(() => [
         field: 'landing',
         name: 'landing',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
         format: (val) => toDate(val),
     },
 ]);
@@ -234,20 +584,58 @@ const redirectToEntryBuys = (entryFk) => {
     router.push({ name: 'EntryBuys', params: { id: entryFk } });
 };
 
+const applyColumnFilter = async (col) => {
+    try {
+        if (!col.columnFilter.filterValue) {
+            delete params[col.field];
+        } else {
+            params[col.field] = col.columnFilter.filterValue;
+        }
+
+        await arrayData.applyFilter({ params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
     allColumnNames.value = filteredColumns.map((col) => col.name);
+    await arrayData.fetch({ append: false });
 });
 </script>
 
 <template>
     <FetchData
-        ref="rowsFetchDataRef"
-        url="Buys/latestBuysFilter"
-        :filter="{ order: 'itemFk DESC', limit: 20 }"
-        @on-fetch="(data) => (rows = data)"
+        url="ItemTypes"
+        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
         auto-load
+        @on-fetch="(data) => (itemTypesOptions = data)"
+    />
+    <FetchData
+        url="Origins"
+        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
+        auto-load
+        @on-fetch="(data) => (originsOptions = data)"
+    />
+    <FetchData
+        url="ItemFamilies"
+        :filter="{ fields: ['code'], order: 'code ASC', limit: 30 }"
+        auto-load
+        @on-fetch="(data) => (itemFamiliesOptions = data)"
+    />
+    <FetchData
+        url="Packagings"
+        :filter="{ fields: ['id'], order: 'id ASC', limit: 30 }"
+        auto-load
+        @on-fetch="(data) => (packagingsOptions = data)"
+    />
+    <FetchData
+        url="Intrastats"
+        :filter="{ fields: ['description'], order: 'description ASC', limit: 30 }"
+        auto-load
+        @on-fetch="(data) => (intrastatOptions = data)"
     />
     <QToolbar class="bg-vn-dark justify-end">
         <div id="st-data">
@@ -265,15 +653,34 @@ onMounted(async () => {
         <QTable
             :rows="rows"
             :columns="columns"
-            hide-bottom
             selection="multiple"
             row-key="id"
             :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
             :visible-columns="visibleColumns"
             v-model:selected="rowsSelected"
+            :no-data-label="t('globals.noResults')"
             @row-click="(_, row) => redirectToEntryBuys(row.entryFk)"
         >
+            <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.name !== 'picture'"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
+            </template>
             <template #body-cell-picture="{ row }">
                 <QTd>
                     <QImg
@@ -288,7 +695,7 @@ onMounted(async () => {
             </template>
             <template #body-cell-itemFk="{ row }">
                 <QTd @click.stop>
-                    <QBtn flat color="blue">
+                    <QBtn flat color="primary">
                         {{ row.itemFk }}
                     </QBtn>
                 </QTd>
@@ -300,7 +707,7 @@ onMounted(async () => {
             </template>
             <template #body-cell-entryFk="{ row }">
                 <QTd @click.stop>
-                    <QBtn flat color="blue">
+                    <QBtn flat color="primary">
                         <EntryDescriptorProxy :id="row.entryFk" />
                         {{ row.entryFk }}
                     </QBtn>

From 4af2ef49a07befb22748fae0b934a501b6611ebf Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Feb 2024 07:11:33 +0100
Subject: [PATCH 051/128] refs #6930: replace tokenUSer with tokenMultimedia

---
 src/components/NavBar.vue                     |  4 ++--
 src/components/UserPanel.vue                  |  2 +-
 src/components/ui/VnAvatar.vue                |  4 ++--
 src/composables/downloadFile.js               |  4 ++--
 src/composables/useSession.js                 | 16 ++++++++++++++--
 src/pages/Claim/Card/ClaimBasicData.vue       |  4 ++--
 src/pages/Claim/Card/ClaimPhoto.vue           |  4 ++--
 src/pages/Claim/Card/ClaimSummary.vue         |  4 ++--
 src/pages/Customer/Card/CustomerBasicData.vue |  4 ++--
 src/pages/Entry/EntryLatestBuys.vue           |  4 ++--
 src/pages/Item/Card/ItemDescriptor.vue        |  4 ++--
 src/pages/Order/Card/OrderCatalogItem.vue     |  4 ++--
 src/pages/Order/OrderLines.vue                |  4 ++--
 src/pages/Route/Cmr/CmrList.vue               |  4 ++--
 src/pages/Route/RouteList.vue                 | 16 ++++++++--------
 src/pages/Wagon/WagonCounter.vue              |  4 ++--
 src/pages/Worker/Card/WorkerDescriptor.vue    |  4 ++--
 17 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 12366e174..17b8c2b7e 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -10,12 +10,12 @@ import UserPanel from 'components/UserPanel.vue';
 import VnBreadcrumbs from './common/VnBreadcrumbs.vue';
 
 const { t } = useI18n();
-const session = useSession();
 const stateStore = useStateStore();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index e0b6b86ed..a18dad79a 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -44,7 +44,7 @@ const darkMode = computed({
 });
 
 const user = state.getUser();
-const token = session.getToken();
+const token = session.getTokenMultimedia();
 
 onMounted(async () => {
     updatePreferences();
diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index 5a5483084..287f741e0 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -10,8 +10,8 @@ const $props = defineProps({
     size: { type: String, default: null },
     title: { type: String, default: null },
 });
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 const { t } = useI18n();
 
 const title = computed(() => $props.title ?? t('globals.system'));
diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index 877d2a254..b26dec731 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -1,8 +1,8 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
 
-const session = useSession();
-const token = session.getToken();
+const {getTokenMultimedia} = useSession();
+const token =  getTokenMultimedia();
 
 export async function downloadFile(dmsId) {
     let appUrl = await getUrl('', 'lilium');
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 008337b02..4d182a934 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -10,12 +10,20 @@ export function useSession() {
 
         return localToken || sessionToken || '';
     }
+    function getTokenMultimedia() {
+        const localTokenMultimedia = localStorage.getItem('tokenMultimedia');
+        const sessionTokenMultimedia = sessionStorage.getItem('tokenMultimedia');
+
+        return localTokenMultimedia || sessionTokenMultimedia || '';
+    }
 
     function setToken(data) {
         if (data.keepLogin) {
             localStorage.setItem('token', data.token);
+            localStorage.setItem('tokenMultimedia', data.tokenMultimedia);
         } else {
             sessionStorage.setItem('token', data.token);
+            sessionStorage.setItem('tokenMultimedia', data.tokenMultimedia);
         }
     }
 
@@ -23,6 +31,9 @@ export function useSession() {
         if (localStorage.getItem('token'))
             localStorage.removeItem('token')
 
+        if (localStorage.getItem('tokenMultimedia'))
+            localStorage.removeItem('tokenMultimedia')
+
         if (sessionStorage.getItem('token'))
             sessionStorage.removeItem('token');
 
@@ -37,8 +48,8 @@ export function useSession() {
         });
     }
 
-    async function login(token, keepLogin) {
-        setToken({ token, keepLogin });
+    async function login(token, tokenMultimedia, keepLogin) {
+        setToken({ token, tokenMultimedia, keepLogin });
 
         await useRole().fetch();
         await useUserConfig().fetch();
@@ -53,6 +64,7 @@ export function useSession() {
 
     return {
         getToken,
+        getTokenMultimedia,
         setToken,
         destroy,
         login,
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 35f93c736..1c4f998d8 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -13,8 +13,8 @@ import { useSession } from 'src/composables/useSession';
 
 const route = useRoute();
 const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 
 const claimFilter = {
     fields: [
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 6ac116ce0..dd97b60df 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -11,8 +11,8 @@ import FetchData from 'components/FetchData.vue';
 const router = useRouter();
 const quasar = useQuasar();
 const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 
 const claimId = computed(() => router.currentRoute.value.params.id);
 
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index cdc1f15be..9281cc08a 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -14,8 +14,8 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 458d50082..d23b08f17 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -11,8 +11,8 @@ import VnInput from 'src/components/common/VnInput.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 
 const workers = ref([]);
 const workersCopy = ref([]);
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index f4a423f3b..db66b8f0b 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -15,8 +15,8 @@ import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
 
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 const stateStore = useStateStore();
 const { t } = useI18n();
 
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 362fcfc67..af6de04e8 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -36,7 +36,7 @@ const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
-const { getToken } = useSession();
+const { getTokenMultimedia } = useSession();
 const state = useState();
 const user = state.getUser();
 
@@ -72,7 +72,7 @@ onMounted(async () => {
 });
 
 const getItemAvatar = async () => {
-    const token = getToken();
+    const token = getTokenMultimedia();
     const timeStamp = `timestamp=${Date.now()}`;
     image.value = `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}&${timeStamp}`;
 };
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index ee73bcffb..a197ceafc 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -11,8 +11,8 @@ import toCurrency from '../../../filters/toCurrency';
 
 const DEFAULT_PRICE_KG = 0;
 
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 const { t } = useI18n();
 
 defineProps({
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index a2ee42481..4b6c21c75 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -17,9 +17,9 @@ import axios from 'axios';
 
 const route = useRoute();
 const { t } = useI18n();
-const session = useSession();
+const { getTokenMultimedia } = useSession();
 const quasar = useQuasar();
-const token = session.getToken();
+const token = getTokenMultimedia();
 const orderSummary = ref({
     total: null,
     vat: null,
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index dc5602c1c..c0a6d263d 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -12,8 +12,8 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 const selected = ref([]);
 
 const columns = computed(() => [
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0b4aa6795..be8a29ceb 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -16,7 +16,7 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import {useSession} from "composables/useSession";
+import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
 const stateStore = useStateStore();
@@ -144,21 +144,21 @@ const cloneRoutes = () => {
 };
 
 const showRouteReport = () => {
-    const ids = selectedRows.value.map(row => row?.id)
-    const idString = ids.join(',')
+    const ids = selectedRows.value.map((row) => row?.id);
+    const idString = ids.join(',');
     let url;
 
     if (selectedRows.value.length <= 1) {
-        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getToken()}`;
+        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
     } else {
         const params = new URLSearchParams({
-            access_token: session.getToken(),
-            id: idString
-        })
+            access_token: session.getTokenMultimedia(),
+            id: idString,
+        });
         url = `api/Routes/downloadZip?${params.toString()}`;
     }
     window.open(url, '_blank');
-}
+};
 
 const markAsServed = () => {
     selectedRows.value.forEach((row) => {
diff --git a/src/pages/Wagon/WagonCounter.vue b/src/pages/Wagon/WagonCounter.vue
index bd5d2ca67..15a1ab7ba 100644
--- a/src/pages/Wagon/WagonCounter.vue
+++ b/src/pages/Wagon/WagonCounter.vue
@@ -7,8 +7,8 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const quasar = useQuasar();
 const { t } = useI18n();
-const session = useSession();
-const token = session.getToken();
+const { getTokenMultimedia } = useSession();
+const token = getTokenMultimedia();
 
 const counters = ref({
     alquilerBandeja: { count: 0, id: 96001, title: 'CC Bandeja', isTray: true },
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index bec56bee7..5144b3bfa 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -22,7 +22,7 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const { getToken } = useSession();
+const { getTokenMultimedia } = useSession();
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
@@ -56,7 +56,7 @@ const filter = {
 const sip = computed(() => worker.value?.sip && worker.value.sip.extension);
 
 function getWorkerAvatar() {
-    const token = getToken();
+    const token = getTokenMultimedia();
     return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
 }
 const data = ref(useCardDescription());

From d86675446827f092d816ff701d516aea1940bb26 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Feb 2024 07:47:22 +0100
Subject: [PATCH 052/128] refs #6930:  handle tokenMultimedia

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

diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index e2ccdac16..7a141e878 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -31,7 +31,7 @@ async function onSubmit() {
 
         if (!data) return;
 
-        await session.login(data.token, keepLogin.value);
+        await session.login(data.token, data.multimediaToken.id, keepLogin.value);
 
         quasar.notify({
             message: t('login.loginSuccess'),

From 022ef2428927a12b57c58430eb7fb7f7c76b8952 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 26 Feb 2024 07:53:52 -0300
Subject: [PATCH 053/128] Refactor roadmaps stops with crud model

---
 src/pages/Route/Roadmap/RoadmapStops.vue | 224 ++++++++++-------------
 1 file changed, 95 insertions(+), 129 deletions(-)

diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 5aba86062..6dc21563f 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -3,79 +3,41 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
-import { computed, ref } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
+import { onMounted, ref } from 'vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnInput from 'components/common/VnInput.vue';
-import axios from 'axios';
+import VnRow from 'components/ui/VnRow.vue';
+import CrudModel from 'components/CrudModel.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();
-
-const refreshKey = ref(0);
-const expeditionList = ref([]);
 const warehouseList = ref([]);
+const roadmapStopsCrudRef = ref(null);
 
-const stopList = computed(() => expeditionList.value.filter((item) => !item.deleted));
+const defaultStop = ref({
+    roadmapFk: Number(route.params?.id) || 0,
+    eta: new Date().toISOString(),
+});
 
-const addStop = async () => {
-    const response = await axios.get(`Roadmaps/${route.params?.id}`, {
-        params: {
-            filter: JSON.stringify({
-                fields: ['etd'],
-            }),
-        },
-    });
-    const eta = new Date(response.data.etd);
+const updateDefaultStop = (data) => {
+    const eta = new Date(data.etd);
     eta.setDate(eta.getDate() + 1);
-    expeditionList.value.push({
-        id: expeditionList.value.length * -1,
-        roadmapFk: Number(route.params?.id) || 0,
-        eta: eta.toISOString(),
-    });
+    defaultStop.value.eta = eta.toISOString();
 };
 
-const updateStop = (stop) => {
-    if (stop.id > 0) {
-        stop.updated = true;
-    }
-};
-
-const deleteStop = (stop) => {
-    if (stop.id > 0) {
-        stop.deleted = true;
-    }
-};
-
-const onSave = async () => {
-    const body = {
-        creates: expeditionList.value
-            .filter((item) => item.id < 0)
-            .map(({ id, ...data }) => data),
-        deletes: expeditionList.value
-            .filter((item) => item.deleted)
-            .map((item) => item.id),
-        updates: expeditionList.value
-            .filter((item) => item.updated)
-            .map(({ id, updated, ...data }) => ({ data, where: { id } })),
-    };
-    await axios.post(`ExpeditionTrucks/crud`, body);
-    refreshKey.value ++;
-};
+onMounted(() => {
+    if (roadmapStopsCrudRef.value) roadmapStopsCrudRef.value.reload();
+});
 </script>
 <template>
     <VnSubToolbar />
     <FetchData
-        :key="refreshKey"
-        url="ExpeditionTrucks"
+        :url="`Roadmaps/${route.params?.id}`"
         auto-load
-        :filter="{ where: { roadmapFk: route.params?.id } }"
-        sort-by="eta"
-        limit="30"
-        @on-fetch="(data) => (expeditionList = data)"
+        :filter="{ fields: ['etd'] }"
+        @on-fetch="updateDefaultStop"
     />
     <FetchData
         url="Warehouses"
@@ -85,80 +47,82 @@ const onSave = async () => {
         limit="30"
         @on-fetch="(data) => (warehouseList = data)"
     />
-
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
-        <div class="q-gutter-x-sm">
-            <QBtn
-                :label="t('globals.save')"
-                color="primary"
-                icon="save"
-                @click="onSave"
-                :title="t('globals.save')"
-            />
-        </div>
-    </Teleport>
-    <QForm class="q-pa-lg">
-        <QCard class="q-pa-md">
-            <div v-for="stop in stopList" :key="stop.id" class="row q-py-md">
-                <div class="col q-pr-lg">
-                    <VnSelectFilter
-                        v-model="stop.warehouseFk"
-                        :label="t('Warehouse')"
-                        :options="warehouseList"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        :input-debounce="0"
-                        @update:model-value="updateStop(stop)"
-                    />
-                </div>
-                <div class="col q-pr-lg">
-                    <VnInputDate
-                        v-model="stop.eta"
-                        :label="t('ETA date')"
-                        @update:model-value="updateStop(stop)"
-                    />
-                </div>
-                <div class="col q-pr-lg">
-                    <VnInputTime
-                        v-model="stop.eta"
-                        :label="t('ETA date')"
-                        @update:model-value="updateStop(stop)"
-                    />
-                </div>
-                <div class="col q-pr-lg">
-                    <VnInput
-                        v-model="stop.description"
-                        :label="t('Description')"
-                        type="textarea"
-                        :rows="1"
-                        @update:model-value="updateStop(stop)"
-                    />
-                </div>
-                <div class="flex justify-center items-center">
-                    <QIcon
-                        name="delete"
-                        size="sm"
-                        color="primary"
-                        class="cursor-pointer"
-                        @click="deleteStop(stop)"
-                    />
-                </div>
-            </div>
-            <div class="q-pt-lg">
-                <QIcon
-                    name="add_circle"
-                    size="sm"
-                    color="primary"
-                    class="cursor-pointer"
-                    @click="addStop"
-                />
-            </div>
-        </QCard>
-    </QForm>
+    <div class="q-pa-lg">
+        <CrudModel
+            ref="roadmapStopsCrudRef"
+            data-key="ExpeditionTrucks"
+            url="ExpeditionTrucks"
+            model="ExpeditionTrucks"
+            :filter="{ where: { roadmapFk: route.params?.id } }"
+            :default-remove="false"
+            :data-required="defaultStop"
+        >
+            <template #body="{ rows }">
+                <QCard class="q-pa-md">
+                    <VnRow
+                        v-for="(row, index) in rows"
+                        :key="index"
+                        class="row q-gutter-md q-mb-md"
+                    >
+                        <div class="col">
+                            <VnSelectFilter
+                                v-model.number="row.warehouseFk"
+                                :label="t('Warehouse')"
+                                :options="warehouseList"
+                                option-value="id"
+                                option-label="name"
+                                emit-value
+                                map-options
+                                use-input
+                                hide-selected
+                                :input-debounce="0"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInputDate v-model="row.eta" :label="t('ETA date')" />
+                        </div>
+                        <div class="col">
+                            <VnInputTime v-model="row.eta" :label="t('ETA date')" />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                v-model="row.description"
+                                :label="t('Description')"
+                                type="textarea"
+                                :rows="1"
+                            />
+                        </div>
+                        <div class="col-1 row justify-center items-center">
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="roadmapStopsCrudRef.remove([row])"
+                            >
+                                <QTooltip>
+                                    {{ t('Remove stop') }}
+                                </QTooltip>
+                            </QIcon>
+                        </div>
+                    </VnRow>
+                    <VnRow>
+                        <QIcon
+                            name="add"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="roadmapStopsCrudRef.insert()"
+                        >
+                            <QTooltip>
+                                {{ t('Add stop') }}
+                            </QTooltip>
+                        </QIcon>
+                    </VnRow>
+                </QCard>
+            </template>
+        </CrudModel>
+    </div>
 </template>
 <i18n>
 es:
@@ -166,4 +130,6 @@ es:
     ETA date: Fecha ETA
     ETA hour: Hora ETA
     Description: Descripción
+    Remove stop: Eliminar parada
+    Add stop: Añadir parada
 </i18n>

From 90bfba02909a198a89e25e8cabeb8f87751bc78e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 08:45:02 -0300
Subject: [PATCH 054/128] Create global variable for table separation row

---
 src/css/app.scss                      |  5 +++++
 src/pages/Entry/Card/EntryBuys.vue    |  5 +----
 src/pages/Entry/Card/EntrySummary.vue | 13 ++-----------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 4fec9db08..9a25d63e2 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -75,6 +75,11 @@ body.body--dark {
     background-color: var(--vn-light-gray);
 }
 
+.vn-table-separation-row {
+    height: 16px !important;
+    background-color: var(--vn-gray) !important;
+}
+
 /* Estilo para el asterisco en campos requeridos */
 .q-field.required .q-field__label:after {
     content: ' *';
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index c6647de50..06d1fcb4c 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -420,7 +420,7 @@ const lockIconType = (groupingMode, mode) => {
                     </QTr>
                     <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
                     <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
-                        <QTd colspan="12" style="height: 16px" />
+                        <QTd colspan="12" class="vn-table-separation-row" />
                     </QTr>
                 </template>
                 <template #item="props">
@@ -471,9 +471,6 @@ const lockIconType = (groupingMode, mode) => {
 </template>
 
 <style lang="scss" scoped>
-.separation-row {
-    background-color: var(--vn-gray) !important;
-}
 .grid-style-transition {
     transition: transform 0.28s, background-color 0.28s;
 }
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index e6842a3f9..e2828a1ce 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -334,11 +334,8 @@ const fetchEntryBuys = async () => {
                             </QTd>
                         </QTr>
                         <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
-                        <QTr
-                            v-if="rowIndex !== entryBuys.length - 1"
-                            class="separation-row"
-                        >
-                            <QTd colspan="10" style="height: 16px" />
+                        <QTr v-if="rowIndex !== entryBuys.length - 1">
+                            <QTd colspan="10" class="vn-table-separation-row" />
                         </QTr>
                     </template>
                 </QTable>
@@ -347,12 +344,6 @@ const fetchEntryBuys = async () => {
     </CardSummary>
 </template>
 
-<style lang="scss" scoped>
-.separation-row {
-    background-color: var(--vn-gray) !important;
-}
-</style>
-
 <i18n>
 es:
     Travel data: Datos envío

From 698a88e6f06ee19fc52331540bd7c2fa4e8cb249 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 26 Feb 2024 09:52:56 -0300
Subject: [PATCH 055/128] Fix infinite scroll in VnPaginate

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

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 4c38c1c1a..24944e322 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     },
     offset: {
         type: Number,
-        default: 500,
+        default: 0,
     },
     skeleton: {
         type: Boolean,
@@ -54,6 +54,10 @@ const props = defineProps({
         type: Function,
         default: null,
     },
+    disableInfiniteScroll: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate']);
@@ -122,10 +126,11 @@ async function paginate() {
     emit('onPaginate');
 }
 
-async function onLoad(...params) {
-    if (!store.data) return;
+async function onLoad(index, done) {
+    if (!store.data) {
+        return done();
+    }
 
-    const done = params[1];
     if (store.data.length === 0 || !props.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
@@ -174,7 +179,8 @@ async function onLoad(...params) {
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        class="full-width full-height"
+        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
+        class="full-width"
     >
         <slot name="body" :rows="store.data"></slot>
         <div v-if="isLoading" class="info-row q-pa-md text-center">

From 740eedbe44f9bb0d8095efb4fe89371040543807 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 09:54:59 -0300
Subject: [PATCH 056/128] Improve reactivity of card descriptor

---
 src/components/FormModel.vue             | 11 ++++++++++-
 src/pages/Entry/Card/EntryBasicData.vue  |  1 +
 src/pages/Entry/Card/EntryDescriptor.vue | 11 -----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9fd16088c..00703d516 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    clearStoreOnUnmount: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
@@ -91,7 +95,12 @@ onMounted(async () => {
 });
 
 onUnmounted(() => {
-    state.unset($props.model);
+    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    if (hasChanges.value) {
+        state.set($props.model, originalData.value);
+        return;
+    }
+    if ($props.clearStoreDataOnUnmount) state.unset($props.model);
 });
 
 const isLoading = ref(false);
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index a98a1227f..4a8cf154a 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -61,6 +61,7 @@ const onFilterTravelSelected = (formData, id) => {
         :url-update="`Entries/${route.params.id}`"
         model="entry"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 13f24b93c..656f8d5fd 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -97,17 +97,6 @@ const getEntryRedirectionFilter = (entry) => {
     });
 };
 
-const refetchEntryDescriptorData = async () => {
-    await entryDescriptorRef.value.getData();
-};
-
-watch(
-    () => route.name,
-    async (_, from) => {
-        if (from === 'EntryBasicData') await refetchEntryDescriptorData();
-    }
-);
-
 const showEntryReport = () => {
     openReport(`Entries/${route.params.id}/entry-order-pdf`);
 };

From 84a0be0a5c787448d1c34f459bbae4fc166fe977 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 10:52:24 -0300
Subject: [PATCH 057/128] Add new card to entry summary and fix links
 redirections

---
 src/pages/Entry/Card/EntrySummary.vue | 38 ++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index e2828a1ce..d8e98e141 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -148,9 +148,13 @@ const fetchEntryBuys = async () => {
         @on-fetch="(data) => setEntryData(data)"
     >
         <template #header-left>
-            <a class="header link" :href="entryUrl">
+            <router-link
+                :to="{ name: 'EntrySummary', params: { id: entityId } }"
+                class="header link"
+                :href="entryUrl"
+            >
                 <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
+            </router-link>
         </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
@@ -158,10 +162,13 @@ const fetchEntryBuys = async () => {
 
         <template #body>
             <QCard class="vn-one">
-                <a class="header link" :href="entryUrl">
+                <router-link
+                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
+                    class="header link"
+                >
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <VnRow>
                     <div class="col">
                         <VnLv
@@ -193,6 +200,17 @@ const fetchEntryBuys = async () => {
                             :value="entry.invoiceNumber"
                         />
                     </div>
+                </VnRow>
+            </QCard>
+            <QCard class="vn-one">
+                <router-link
+                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
+                    class="header link"
+                >
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </router-link>
+                <VnRow>
                     <div class="col">
                         <VnLv
                             :label="t('entry.summary.ordered')"
@@ -218,15 +236,17 @@ const fetchEntryBuys = async () => {
                         <VnLv
                             :label="t('entry.summary.excludedFromAvailable')"
                             :value="entry.isExcludedFromAvailable"
-                        />
-                    </div>
-                </VnRow>
+                        /></div
+                ></VnRow>
             </QCard>
             <QCard class="vn-one">
-                <a class="header link" :href="entryUrl">
+                <router-link
+                    :to="{ name: 'TravelSummary', params: { id: entry.travel.id } }"
+                    class="header link"
+                >
                     {{ t('Travel data') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <VnRow>
                     <div class="col">
                         <VnLv :label="t('entry.summary.travelReference')">

From e372c04d35303802a08bb67d893ae8c2b27c4804 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 11:28:03 -0300
Subject: [PATCH 058/128] change variable name

---
 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 00703d516..50cdf9ee3 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -100,7 +100,7 @@ onUnmounted(() => {
         state.set($props.model, originalData.value);
         return;
     }
-    if ($props.clearStoreDataOnUnmount) state.unset($props.model);
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
 });
 
 const isLoading = ref(false);

From f048a1c820bf71410f446156b56b0e46e86c7989 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 13:22:25 -0300
Subject: [PATCH 059/128] Add reactivity to supplier descriptor icons

---
 src/components/FormModel.vue                    | 11 ++++++++++-
 src/components/ui/CardDescriptor.vue            |  4 ++++
 src/pages/Supplier/Card/SupplierBasicData.vue   |  1 +
 src/pages/Supplier/Card/SupplierBillingData.vue |  1 +
 src/pages/Supplier/Card/SupplierDescriptor.vue  | 14 +++++++++-----
 src/pages/Supplier/Card/SupplierFiscalData.vue  |  1 +
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9fd16088c..50cdf9ee3 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    clearStoreOnUnmount: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
@@ -91,7 +95,12 @@ onMounted(async () => {
 });
 
 onUnmounted(() => {
-    state.unset($props.model);
+    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    if (hasChanges.value) {
+        state.set($props.model, originalData.value);
+        return;
+    }
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
 });
 
 const isLoading = ref(false);
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 345c8d088..92f95fd2c 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useState } from 'src/composables/useState';
 
 const $props = defineProps({
     url: {
@@ -35,6 +36,8 @@ const $props = defineProps({
         default: null,
     },
 });
+
+const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -64,6 +67,7 @@ async function getData() {
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {
         isLoading.value = false;
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index bc50deb9b..01741dd77 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -26,6 +26,7 @@ const workersOptions = ref([]);
         :url-update="`Suppliers/${route.params.id}`"
         model="supplier"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index bf5ccb115..26b6e5461 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -33,6 +33,7 @@ const formatPayDems = (data) => {
         :url-update="`Suppliers/${route.params.id}`"
         model="supplier"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index eabb95554..3228151cb 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -9,6 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateString } from 'src/filters';
 import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
+import { useState } from 'src/composables/useState';
 
 const $props = defineProps({
     id: {
@@ -21,6 +22,7 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const url = ref();
+const state = useState();
 
 const filter = {
     fields: [
@@ -71,6 +73,8 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
 
+const currentSupplier = computed(() => state.get('supplier'));
+
 const getEntryQueryParams = (supplier) => {
     if (!supplier) return null;
 
@@ -101,7 +105,7 @@ const getEntryQueryParams = (supplier) => {
         :subtitle="data.subtitle"
         :filter="filter"
         @on-fetch="setData"
-        data-key="Supplier"
+        data-key="supplier"
     >
         <template #header-extra-action>
             <QBtn
@@ -133,10 +137,10 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons>
+            <QCardActions v-if="currentSupplier" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!entity.isActive"
+                    v-if="!currentSupplier.isActive"
                     name="vn:disabled"
                     color="primary"
                     size="xs"
@@ -144,7 +148,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.isSerious"
+                    v-if="!currentSupplier.isSerious"
                     name="vn:supplierfalse"
                     color="primary"
                     size="xs"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index b26582065..806dac0fe 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -53,6 +53,7 @@ function handleLocation(data, location) {
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">

From 0cfdd783283e40dc2ff5a5fc67ad00cc6100e629 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 26 Feb 2024 14:16:12 -0300
Subject: [PATCH 060/128] Fix route autonomous table links

---
 src/pages/Route/RouteAutonomous.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 8d1a7f6fd..d4ce2636c 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -202,7 +202,7 @@ function navigateToRouteSummary(event, row) {
                             @row-click="navigateToRouteSummary"
                         >
                             <template #body-cell-ID="props">
-                                <QTd :props="props">
+                                <QTd :props="props" @click.stop>
                                     <span class="link">
                                         {{ props.value }}
                                         <RouteDescriptorProxy :id="props.value" />
@@ -210,7 +210,7 @@ function navigateToRouteSummary(event, row) {
                                 </QTd>
                             </template>
                             <template #body-cell-received="props">
-                                <QTd :props="props">
+                                <QTd :props="props" @click.stop>
                                     <span :class="props.value && 'link'">
                                         {{ dashIfEmpty(props.value) }}
                                         <InvoiceInDescriptorProxy
@@ -221,7 +221,7 @@ function navigateToRouteSummary(event, row) {
                                 </QTd>
                             </template>
                             <template #body-cell-autonomous="props">
-                                <QTd :props="props">
+                                <QTd :props="props" @click.stop>
                                     <span class="link">
                                         {{ props.value }}
                                         <SupplierDescriptorProxy

From c766c14a2cdfae64c5b97aced2f9d01d3ee4019b Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 26 Feb 2024 14:16:25 -0300
Subject: [PATCH 061/128] Fix route roadmap table links

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

diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 767a1bf2e..ee9e52254 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -228,7 +228,7 @@ function navigateToRoadmapSummary(event, row) {
                             @row-click="navigateToRoadmapSummary"
                         >
                             <template #body-cell-carrier="props">
-                                <QTd :props="props">
+                                <QTd :props="props" @click.stop>
                                     <span v-if="props.value" class="link">
                                         {{ props.value }}
                                         <SupplierDescriptorProxy

From 546df84db1c637e7a99abc89a6c287547723c477 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 26 Feb 2024 19:06:21 +0100
Subject: [PATCH 062/128] remove(claimRma): refs #6349 remove all references

---
 src/components/common/VnLog.vue         |   2 -
 src/i18n/en/index.js                    |   8 --
 src/i18n/es/index.js                    |   8 --
 src/pages/Claim/Card/ClaimBasicData.vue |   8 --
 src/pages/Claim/Card/ClaimRma.vue       | 145 --------------------
 src/pages/Claim/Card/ClaimSummary.vue   |   1 -
 src/pages/Claim/ClaimRmaList.vue        | 171 ------------------------
 src/router/modules/claim.js             |  23 +---
 8 files changed, 1 insertion(+), 365 deletions(-)
 delete mode 100644 src/pages/Claim/Card/ClaimRma.vue
 delete mode 100644 src/pages/Claim/ClaimRmaList.vue

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 6368a3e52..be5a6583c 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -1036,7 +1036,6 @@ en:
         claimStateFk: Claim State
         workerFk: Worker
         clientFk: Customer
-        rma: RMA
         responsibility: Responsibility
         packages: Packages
 es:
@@ -1076,7 +1075,6 @@ es:
         claimStateFk: Estado de la reclamación
         workerFk: Trabajador
         clientFk: Cliente
-        rma: RMA
         responsibility: Responsabilidad
         packages: Bultos
 </i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9e0ad7c9b..2670369fb 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -483,11 +483,9 @@ export default {
             claims: 'Claims',
             list: 'List',
             createClaim: 'Create claim',
-            rmaList: 'RMA',
             summary: 'Summary',
             basicData: 'Basic Data',
             lines: 'Lines',
-            rma: 'RMA',
             photos: 'Photos',
             development: 'Development',
             log: 'Audit logs',
@@ -504,10 +502,6 @@ export default {
             code: 'Code',
             records: 'records',
         },
-        rma: {
-            user: 'User',
-            created: 'Created',
-        },
         card: {
             claimId: 'Claim ID',
             assignedTo: 'Assigned',
@@ -547,7 +541,6 @@ export default {
             responsible: 'Responsible',
             worker: 'Worker',
             redelivery: 'Redelivery',
-            returnOfMaterial: 'RMA',
         },
         basicData: {
             customer: 'Customer',
@@ -555,7 +548,6 @@ export default {
             created: 'Created',
             state: 'State',
             picked: 'Picked',
-            returnOfMaterial: 'Return of material authorization (RMA)',
         },
         photo: {
             fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6083dfad7..844993522 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -482,11 +482,9 @@ export default {
             claims: 'Reclamaciones',
             list: 'Listado',
             createClaim: 'Crear reclamación',
-            rmaList: 'RMA',
             summary: 'Resumen',
             basicData: 'Datos básicos',
             lines: 'Líneas',
-            rma: 'RMA',
             development: 'Trazabilidad',
             photos: 'Fotos',
             log: 'Registros de auditoría',
@@ -503,10 +501,6 @@ export default {
             code: 'Código',
             records: 'registros',
         },
-        rma: {
-            user: 'Usuario',
-            created: 'Creado',
-        },
         card: {
             claimId: 'ID reclamación',
             assignedTo: 'Asignada a',
@@ -546,7 +540,6 @@ export default {
             responsible: 'Responsable',
             worker: 'Trabajador',
             redelivery: 'Devolución',
-            returnOfMaterial: 'RMA',
         },
         basicData: {
             customer: 'Cliente',
@@ -554,7 +547,6 @@ export default {
             created: 'Creada',
             state: 'Estado',
             picked: 'Recogida',
-            returnOfMaterial: 'Autorización de retorno de materiales (RMA)',
         },
         photo: {
             fileDescription:
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 35f93c736..b5bf2bb42 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -24,7 +24,6 @@ const claimFilter = {
         'workerFk',
         'claimStateFk',
         'packages',
-        'rma',
         'hasToPickUp',
     ],
     include: [
@@ -169,13 +168,6 @@ const statesFilter = {
                         type="number"
                     />
                 </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.rma"
-                        :label="t('claim.basicData.returnOfMaterial')"
-                        :rules="validate('claim.rma')"
-                    />
-                </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
diff --git a/src/pages/Claim/Card/ClaimRma.vue b/src/pages/Claim/Card/ClaimRma.vue
deleted file mode 100644
index bba901d7b..000000000
--- a/src/pages/Claim/Card/ClaimRma.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<script setup>
-import axios from 'axios';
-import { watch, ref, computed, onUnmounted, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-import CrudModel from 'components/CrudModel.vue';
-import { useState } from 'src/composables/useState';
-
-import { toDate } from 'src/filters';
-
-const quasar = useQuasar();
-const state = useState();
-const { t } = useI18n();
-const selected = ref([]);
-const claimRmaRef = ref();
-const claim = computed(() => state.get('ClaimDescriptor'));
-
-const claimRmaFilter = {
-    include: {
-        relation: 'worker',
-        scope: {
-            include: {
-                relation: 'user',
-            },
-        },
-    },
-    order: 'created DESC',
-    where: {
-        code: claim.value?.rma,
-    },
-};
-
-async function addRow() {
-    if (!claim.value.rma) {
-        return quasar.notify({
-            message: `This claim is not associated to any RMA`,
-            type: 'negative',
-        });
-    }
-    const formData = {
-        code: claim.value.rma,
-    };
-
-    await axios.post(`ClaimRmas`, formData);
-    await claimRmaRef.value.reload();
-
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.rowAdded'),
-        icon: 'check',
-    });
-}
-
-onMounted(() => {
-    if (claim.value) claimRmaRef.value.reload();
-});
-watch(
-    claim,
-    () => {
-        claimRmaRef.value.reload();
-    },
-    { deep: true }
-);
-</script>
-<template>
-    <div class="column items-center">
-        <div class="list">
-            <CrudModel
-                data-key="ClaimRma"
-                url="ClaimRmas"
-                model="ClaimRma"
-                :filter="claimRmaFilter"
-                v-model:selected="selected"
-                ref="claimRmaRef"
-                :default-save="false"
-                :default-reset="false"
-                :default-remove="false"
-            >
-                <template #body="{ rows }">
-                    <QCard>
-                        <template v-for="(row, index) of rows" :key="row.id">
-                            <QItem class="q-pa-none items-start">
-                                <QItemSection class="q-pa-md">
-                                    <QList>
-                                        <QItem class="q-pa-none">
-                                            <QItemSection>
-                                                <QItemLabel caption>
-                                                    {{ t('claim.rma.user') }}
-                                                </QItemLabel>
-                                                <QItemLabel>
-                                                    {{ row?.worker?.user?.name }}
-                                                </QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                        <QItem class="q-pa-none">
-                                            <QItemSection>
-                                                <QItemLabel caption>
-                                                    {{ t('claim.rma.created') }}
-                                                </QItemLabel>
-                                                <QItemLabel>
-                                                    {{
-                                                        toDate(row.created, {
-                                                            timeStyle: 'medium',
-                                                        })
-                                                    }}
-                                                </QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                    </QList>
-                                </QItemSection>
-                                <QCardActions vertical class="justify-between">
-                                    <QBtn
-                                        flat
-                                        round
-                                        color="orange"
-                                        icon="vn:bin"
-                                        @click="claimRmaRef.remove([row])"
-                                    >
-                                        <QTooltip>{{ t('globals.remove') }}</QTooltip>
-                                    </QBtn>
-                                </QCardActions>
-                            </QItem>
-                            <QSeparator v-if="index !== rows.length - 1" />
-                        </template>
-                    </QCard>
-                </template>
-            </CrudModel>
-        </div>
-    </div>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="addRow()" />
-    </QPageSticky>
-</template>
-
-<style lang="scss" scoped>
-.list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
-<i18n>
-es:
-    This claim is not associated to any RMA: Esta reclamación no está asociada a ninguna ARM
-</i18n>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index cdc1f15be..97bd79830 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -211,7 +211,6 @@ function openDialog(dmsId) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.returnOfMaterial')" :value="claim.rma" />
                 <QCheckbox
                     :align-items="right"
                     :label="t('claim.basicData.picked')"
diff --git a/src/pages/Claim/ClaimRmaList.vue b/src/pages/Claim/ClaimRmaList.vue
deleted file mode 100644
index b906e32fa..000000000
--- a/src/pages/Claim/ClaimRmaList.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
-import axios from 'axios';
-
-const quasar = useQuasar();
-const { t } = useI18n();
-
-const arrayData = useArrayData('ClaimRmaList');
-const isLoading = ref(false);
-const input = ref();
-
-const newRma = ref({
-    code: '',
-    crated: Date.vnNew(),
-});
-
-function onInputUpdate(value) {
-    newRma.value.code = value.toUpperCase();
-}
-
-async function submit() {
-    const formData = newRma.value;
-    if (formData.code === '') return;
-
-    isLoading.value = true;
-    await axios.post('ClaimRmas', formData);
-    await arrayData.refresh();
-    isLoading.value = false;
-    input.value.$el.focus();
-
-    newRma.value = {
-        code: '',
-        created: Date.vnNew(),
-    };
-}
-
-function confirm(id) {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                data: { id },
-                promise: remove,
-            },
-        })
-        .onOk(async () => await arrayData.refresh());
-}
-
-async function remove({ id }) {
-    await axios.delete(`ClaimRmas/${id}`);
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.rowRemoved'),
-    });
-}
-</script>
-
-<template>
-    <QPage class="column items-center q-pa-md sticky">
-        <QPageSticky expand position="top" :offset="[16, 16]">
-            <QCard class="card q-pa-md">
-                <QForm @submit="submit">
-                    <VnInput
-                        ref="input"
-                        v-model="newRma.code"
-                        :label="t('claim.rmaList.code')"
-                        @update:model-value="onInputUpdate"
-                        class="q-mb-md"
-                        :readonly="isLoading"
-                        :loading="isLoading"
-                        autofocus
-                    />
-                    <div class="text-caption">
-                        {{ arrayData.totalRows }} {{ t('claim.rmaList.records') }}
-                    </div>
-                </QForm>
-            </QCard>
-        </QPageSticky>
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="ClaimRmaList"
-                url="ClaimRmas"
-                order="id DESC"
-                :offset="50"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <QCard class="card">
-                        <template v-if="isLoading">
-                            <QItem class="q-pa-none items-start">
-                                <QItemSection class="q-pa-md">
-                                    <QList>
-                                        <QItem class="q-pa-none">
-                                            <QItemSection>
-                                                <QItemLabel caption>
-                                                    <QSkeleton />
-                                                </QItemLabel>
-                                                <QItemLabel>
-                                                    <QSkeleton type="text" />
-                                                </QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                    </QList>
-                                </QItemSection>
-                                <QCardActions vertical class="justify-between">
-                                    <QSkeleton
-                                        type="circle"
-                                        class="q-mb-md"
-                                        size="40px"
-                                    />
-                                </QCardActions>
-                            </QItem>
-                            <QSeparator />
-                        </template>
-                        <template v-for="row of rows" :key="row.id">
-                            <QItem class="q-pa-none items-start">
-                                <QItemSection class="q-pa-md">
-                                    <QList>
-                                        <QItem class="q-pa-none">
-                                            <QItemSection>
-                                                <QItemLabel caption>{{
-                                                    t('claim.rmaList.code')
-                                                }}</QItemLabel>
-                                                <QItemLabel>{{ row.code }}</QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                    </QList>
-                                </QItemSection>
-                                <QCardActions vertical class="justify-between">
-                                    <QBtn
-                                        flat
-                                        round
-                                        color="primary"
-                                        icon="vn:bin"
-                                        @click="confirm(row.id)"
-                                    >
-                                        <QTooltip>{{ t('globals.remove') }}</QTooltip>
-                                    </QBtn>
-                                </QCardActions>
-                            </QItem>
-                            <QSeparator />
-                        </template>
-                    </QCard>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
-
-<style lang="scss" scoped>
-.sticky {
-    padding-top: 156px;
-}
-
-.card {
-    width: 100%;
-    max-width: 60em;
-}
-
-.q-page-sticky {
-    z-index: 2998;
-}
-</style>
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index 1dfd75cff..30e6fffb3 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -10,11 +10,10 @@ export default {
     component: RouterView,
     redirect: { name: 'ClaimMain' },
     menus: {
-        main: ['ClaimList', 'ClaimRmaList'],
+        main: ['ClaimList'],
         card: [
             'ClaimBasicData',
             'ClaimLines',
-            'ClaimRma',
             'ClaimPhotos',
             'ClaimLog',
             'ClaimNotes',
@@ -38,16 +37,6 @@ export default {
                     },
                     component: () => import('src/pages/Claim/ClaimList.vue'),
                 },
-                {
-                    name: 'ClaimRmaList',
-                    path: 'rma',
-                    meta: {
-                        title: 'rmaList',
-                        icon: 'vn:barcode',
-                        roles: ['claimManager'],
-                    },
-                    component: () => import('src/pages/Claim/ClaimRmaList.vue'),
-                },
             ],
         },
         {
@@ -84,16 +73,6 @@ export default {
                     },
                     component: () => import('src/pages/Claim/Card/ClaimLines.vue'),
                 },
-                {
-                    name: 'ClaimRma',
-                    path: 'rma',
-                    meta: {
-                        title: 'rma',
-                        icon: 'vn:barcode',
-                        roles: ['claimManager'],
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimRma.vue'),
-                },
                 {
                     name: 'ClaimPhotos',
                     path: 'photos',

From 50d3bac20c5de783c31da76e207b161efb8428e8 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 26 Feb 2024 22:57:51 -0300
Subject: [PATCH 063/128] Add roadmap add stop dialog

---
 .../Route/Roadmap/RoadmapAddStopDialog.vue    | 125 ++++++++++++++++++
 src/pages/Route/Roadmap/RoadmapSummary.vue    |  56 ++++++--
 2 files changed, 172 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapAddStopDialog.vue

diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
new file mode 100644
index 000000000..b3097d852
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
@@ -0,0 +1,125 @@
+<script setup>
+import { useDialogPluginComponent } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { reactive, ref } from 'vue';
+import axios from 'axios';
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
+
+const emit = defineEmits([...useDialogPluginComponent.emits]);
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+
+const { t } = useI18n();
+const props = defineProps({
+    roadmapFk: {
+        type: Number,
+        required: true,
+    },
+});
+
+const isLoading = ref(false);
+const warehouseList = ref([]);
+const roadmapStopForm = reactive({
+    roadmapFk: Number(props.roadmapFk) || 0,
+    warehouseFk: null,
+    eta: new Date().toISOString(),
+    description: '',
+});
+
+const updateDefaultStop = (data) => {
+    const eta = new Date(data.etd);
+    eta.setDate(eta.getDate() + 1);
+    roadmapStopForm.eta = eta.toISOString();
+};
+
+const onSave = async () => {
+    isLoading.value = true;
+    try {
+        await axios.post('ExpeditionTrucks', { ...roadmapStopForm });
+        emit('ok');
+    } finally {
+        isLoading.value = false;
+        emit('hide');
+    }
+};
+</script>
+<template>
+    <FetchData
+        :url="`Roadmaps/${roadmapFk}`"
+        auto-load
+        :filter="{ fields: ['etd'] }"
+        @on-fetch="updateDefaultStop"
+    />
+    <FetchData
+        url="Warehouses"
+        auto-load
+        :filter="{ fields: ['id', 'name'] }"
+        sort-by="name"
+        limit="30"
+        @on-fetch="(data) => (warehouseList = data)"
+    />
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <QCard class="q-pa-lg">
+            <QCardSection class="row absolute absolute-top z-fullscreen">
+                <QSpace />
+                <QBtn icon="close" flat round dense v-close-popup />
+            </QCardSection>
+            <QCardSection class="card-section q-px-none">
+                <VnSelectFilter
+                    v-model.number="roadmapStopForm.warehouseFk"
+                    :label="t('Warehouse')"
+                    :options="warehouseList"
+                    option-value="id"
+                    option-label="name"
+                    emit-value
+                    map-options
+                    use-input
+                    hide-selected
+                    :input-debounce="0"
+                />
+            </QCardSection>
+            <QCardSection class="card-section row q-px-none">
+                <div class="col">
+                    <VnInputDate v-model="roadmapStopForm.eta" :label="t('ETA date')" />
+                </div>
+                <div class="col">
+                    <VnInputTime v-model="roadmapStopForm.eta" :label="t('ETA date')" />
+                </div>
+            </QCardSection>
+            <QCardSection class="card-section q-px-none">
+                <VnInput
+                    v-model="roadmapStopForm.description"
+                    :label="t('Description')"
+                    type="textarea"
+                    :rows="1"
+                />
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+                <QBtn
+                    :label="t('globals.confirm')"
+                    color="primary"
+                    :loading="isLoading"
+                    @click="onSave"
+                    unelevated
+                />
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+<style lang="scss" scoped>
+.card-section {
+    gap: 16px;
+}
+</style>
+
+<i18n>
+es:
+    Warehouse: Almacén
+    ETA date: Fecha ETA
+    ETA time: Hora ETA
+    Description: Descripción
+</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index fb756f4aa..446d381ec 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -2,12 +2,14 @@
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
-import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import { QIcon } from 'quasar';
+import { QIcon, useQuasar } from 'quasar';
 import { dashIfEmpty, toDateHour } from 'src/filters';
+import { useStateStore } from 'stores/useStateStore';
+import VnLv from 'components/ui/VnLv.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import VnLinkPhone from 'components/ui/VnLinkPhone.vue';
+import RoadmapAddStopDialog from 'pages/Route/Roadmap/RoadmapAddStopDialog.vue';
 
 const $props = defineProps({
     id: {
@@ -18,7 +20,9 @@ const $props = defineProps({
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
+const quasar = useQuasar();
 
+const summary = ref(null);
 const entityId = computed(() => $props.id || route.params.id);
 const isDialog = Boolean($props.id);
 const hideRightDrawer = () => {
@@ -55,6 +59,15 @@ const filter = {
         },
     ],
 };
+
+const openAddStopDialog = () => {
+    quasar
+        .dialog({
+            component: RoadmapAddStopDialog,
+            componentProps: { roadmapFk: entityId.value },
+        })
+        .onOk(() => summary.value.fetch());
+};
 </script>
 
 <template>
@@ -89,7 +102,14 @@ const filter = {
                     />
                 </QCard>
                 <QCard class="vn-one">
-                    <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)" />
+                    <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
+                        <template #value>
+                            <span>
+                                {{ dashIfEmpty(entity?.phone) }}
+                                <VnLinkPhone :phone-number="entity?.phone" />
+                            </span>
+                        </template>
+                    </VnLv>
                     <VnLv
                         :label="t('Worker')"
                         :value="
@@ -104,10 +124,26 @@ const filter = {
                     />
                 </QCard>
                 <QCard class="vn-max">
-                    <a class="header" :href="`#/route/roadmap/${entityId}/stops`">
-                        {{ t('Stops') }}
-                        <QIcon name="open_in_new" color="primary" />
-                    </a>
+                    <div class="flex items-center">
+                        <a class="header" :href="`#/route/roadmap/${entityId}/stops`">
+                            {{ t('Stops') }}
+                            <QIcon name="open_in_new" color="primary">
+                                <QTooltip>
+                                    {{ t('Go to stops') }}
+                                </QTooltip>
+                            </QIcon>
+                        </a>
+                        <QIcon
+                            name="add_circle"
+                            color="primary"
+                            class="q-ml-lg header cursor-pointer"
+                            @click.stop="openAddStopDialog"
+                        >
+                            <QTooltip>
+                                {{ t('Add stop') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
                     <QTable
                         :columns="columns"
                         :rows="entity?.expeditionTruck"
@@ -131,4 +167,6 @@ es:
     Observations: Observaciones
     Stops: Paradas
     Warehouse: Almacén
+    Go to stops: Ir a paradas
+    Add stop: Añadir parada
 </i18n>

From 50218d6ddfe27b5a1e235ddc761829ce03b17efd Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 27 Feb 2024 07:32:51 -0300
Subject: [PATCH 064/128] WIP

---
 src/pages/Entry/EntryLatestBuys.vue       |  10 +-
 src/pages/Entry/EntryLatestBuysFilter.vue | 479 ++++++++++++++++++++++
 2 files changed, 488 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Entry/EntryLatestBuysFilter.vue

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 32f975ca7..7c5e03285 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, reactive } from 'vue';
+import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -10,6 +10,7 @@ import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
@@ -604,6 +605,8 @@ onMounted(async () => {
     allColumnNames.value = filteredColumns.map((col) => col.name);
     await arrayData.fetch({ append: false });
 });
+
+onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -649,6 +652,11 @@ onMounted(async () => {
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <EntryLatestBuysFilter data-key="OrderCatalogList" :tags="tags" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
new file mode 100644
index 000000000..e715b4d8d
--- /dev/null
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -0,0 +1,479 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+// import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+// import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    tags: {
+        type: Array,
+        required: true,
+    },
+});
+
+const itemCategories = ref(null);
+const selectedCategoryFk = ref(null);
+const selectedTypeFk = ref(null);
+const itemTypesOptions = ref([]);
+const itemTypeWorkersOptions = ref([]);
+const suppliersOptions = ref([]);
+
+const categoryList = computed(() => {
+    return (itemCategories.value || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+});
+
+const selectCategory = async (params, categoryId, search) => {
+    if (params.categoryFk === categoryId) {
+        resetCategory();
+        params.categoryFk = null;
+        return;
+    }
+
+    selectedCategoryFk.value = categoryId;
+    params.categoryFk = categoryId;
+    console.log('params:: ', params);
+    await fetchItemTypes(categoryId);
+    search();
+};
+
+const resetCategory = () => {
+    selectedCategoryFk.value = null;
+    itemTypesOptions.value = null;
+};
+
+const fetchItemTypes = async (id) => {
+    try {
+        const filter = {
+            fields: ['id', 'name', 'categoryFk'],
+            where: { categoryFk: id },
+            include: 'category',
+            order: 'name ASC',
+        };
+        const { data } = await axios.get('ItemTypes', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemTypesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching item types', err);
+    }
+};
+
+// const selectedOrder = ref(null);
+// const orderList = [
+//     { way: 'ASC', name: 'Ascendant' },
+//     { way: 'DESC', name: 'Descendant' },
+// ];
+
+// const selectedOrderField = ref(null);
+// const OrderFields = [
+//     { field: 'relevancy DESC, name', name: 'Relevancy', priority: 999 },
+//     { field: 'showOrder, price', name: 'Color and price', priority: 999 },
+//     { field: 'name', name: 'Name', priority: 999 },
+//     { field: 'price', name: 'Price', priority: 999 },
+// ];
+
+// const clearFilter = (key) => {
+//     if (key === 'categoryFk') {
+//         resetCategory();
+//     }
+// };
+
+// const onFilterInit = async ({ params }) => {
+//     if (params.typeFk) {
+//         selectedTypeFk.value = params.typeFk;
+//     }
+//     if (params.categoryFk) {
+//         await loadTypes(params.categoryFk);
+//         selectedCategoryFk.value = params.categoryFk;
+//     }
+//     if (params.orderBy) {
+//         orderByParam.value = JSON.parse(params.orderBy);
+//         selectedOrder.value = orderByParam.value?.way;
+//         selectedOrderField.value = orderByParam.value?.field;
+//     }
+// };
+
+// const selectedCategory = computed(() =>
+//     (itemCategories.value || []).find(
+//         (category) => category?.id === selectedCategoryFk.value
+//     )
+// );
+
+// const selectedType = computed(() => {
+//     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
+// });
+
+// function exprBuilder(param, value) {
+//     switch (param) {
+//         case 'categoryFk':
+//         case 'typeFk':
+//             return { [param]: value };
+//         case 'search':
+//             return { 'i.name': { like: `%${value}%` } };
+//     }
+// }
+
+// const selectedTag = ref(null);
+// const tagValues = ref([{}]);
+// const tagOptions = ref(null);
+// const isButtonDisabled = computed(
+//     () => !selectedTag.value || tagValues.value.some((item) => !item.value)
+// );
+
+// const applyTagFilter = (params, search) => {
+//     if (!tagValues.value?.length) {
+//         params.tagGroups = null;
+//         search();
+//         return;
+//     }
+//     if (!params.tagGroups) {
+//         params.tagGroups = [];
+//     }
+//     params.tagGroups.push(
+//         JSON.stringify({
+//             values: tagValues.value,
+//             tagSelection: {
+//                 ...selectedTag.value,
+//                 orgShowField: selectedTag.value.name,
+//             },
+//             tagFk: selectedTag.value.tagFk,
+//         })
+//     );
+//     search();
+//     selectedTag.value = null;
+//     tagValues.value = [{}];
+// };
+
+// const removeTagChip = (selection, params, search) => {
+//     if (params.tagGroups) {
+//         params.tagGroups = (params.tagGroups || []).filter(
+//             (value) => value !== selection
+//         );
+//     }
+//     search();
+// };
+
+// const orderByParam = ref(null);
+
+// const onOrderFieldChange = (value, params, search) => {
+//     const orderBy = Object.assign({}, orderByParam.value, { field: value.field });
+//     params.orderBy = JSON.stringify(orderBy);
+//     search();
+// };
+
+// const onOrderChange = (value, params, search) => {
+//     const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
+//     params.orderBy = JSON.stringify(orderBy);
+//     search();
+// };
+
+const getCategoryClass = (category, params) => {
+    if (category.id === params?.categoryFk) {
+        return 'active';
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="ItemCategories"
+        limit="30"
+        auto-load
+        @on-fetch="(data) => (itemCategories = data)"
+    />
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        limit="30"
+        auto-load
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
+        @on-fetch="(data) => (itemTypeWorkersOptions = data)"
+    />
+    <FetchData
+        url="Suppliers"
+        limit="30"
+        auto-load
+        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
+        @on-fetch="(data) => (suppliersOptions = data)"
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :expr-builder="exprBuilder"
+        @init="onFilterInit"
+        @remove="clearFilter"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <!-- <template #customTags="{ tags: customTags, params, searchFn }">
+            <template v-for="tag in customTags" :key="tag.label">
+                <template v-if="tag.label === 'tagGroups'">
+                    <VnFilterPanelChip
+                        v-for="chip in tag.value"
+                        :key="chip"
+                        removable
+                        @remove="removeTagChip(chip, params, searchFn)"
+                    >
+                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
+                        <span>{{
+                            (JSON.parse(chip).values || [])
+                                .map((item) => item.value)
+                                .join(' | ')
+                        }}</span>
+                    </VnFilterPanelChip>
+                </template>
+            </template>
+        </template> -->
+        <template #body="{ params, searchFn }">
+            <QItem class="category-filter q-mt-md">
+                <div
+                    v-for="category in categoryList"
+                    :key="category.name"
+                    :class="['category', getCategoryClass(category, params)]"
+                >
+                    <QIcon
+                        :name="category.icon"
+                        class="category-icon"
+                        @click="selectCategory(params, category.id, searchFn)"
+                    >
+                        <QTooltip>
+                            {{ t(category.name) }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.typeFk')"
+                        v-model="params.typeFk"
+                        :options="itemTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        use-input
+                        :disable="!selectedCategoryFk"
+                        @update:model-value="
+                            (value) => {
+                                selectedTypeFk = value;
+                                searchFn();
+                            }
+                        "
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.categoryName }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.buyer')"
+                        v-model="params.salesPersonFk"
+                        :options="itemTypeWorkersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                        use-input
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.supplier')"
+                        v-model="params.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        use-input
+                        @update:model-value="searchFn()"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.active')"
+                        v-model="params.active"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.visible')"
+                        v-model="params.visible"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.floramondo')"
+                        v-model="params.floramondo"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style lang="scss" scoped>
+.category-filter {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 12px;
+
+    .category {
+        flex: 1;
+        flex-shrink: 0;
+        display: flex;
+        justify-content: center;
+
+        &.active {
+            .category-icon {
+                background-color: $primary;
+            }
+        }
+    }
+
+    .category-icon {
+        border-radius: 50%;
+        background-color: var(--vn-light-gray);
+        font-size: 2.6rem;
+        padding: 8px;
+        cursor: pointer;
+    }
+}
+
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+
+.filter-input {
+    flex-shrink: 1;
+    min-width: 0;
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        orderBy: Order By
+        tag: Tag
+        value: Value
+        order: Order
+
+        supplier: Supplier
+        from: From
+        to: To
+        active: Is active
+        visible: Is visible
+        floramondo: Is floramondo
+        salesPersonFk: Buyer
+        categoryFk: Category
+        typeFk: Type
+es:
+    params:
+        orderBy: Ordenar por
+        tag: Etiqueta
+        value: Valor
+        order: Orden
+
+        supplier: Proveedor
+        from: Desde
+        to: Hasta
+        active: Activo
+        visible: Visible
+        floramondo: Floramondo
+        salesPersonFk: Comprador
+        categoryFk: Categoría
+        typeFk: Tipo
+
+    Plant: Planta
+    Flower: Flor
+    Handmade: Confección
+    Green: Verde
+    Accessories: Complemento
+    Fruit: Fruta
+
+
+</i18n>

From 59dc1a4e3867a6b722f236113141c7e874aed5f7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 27 Feb 2024 08:17:55 -0300
Subject: [PATCH 065/128] Entry summary icon redirection condition

---
 src/pages/Entry/Card/EntrySummary.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index d8e98e141..b47469e3c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -149,6 +149,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
+                v-if="route.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"

From 3c68f4779f04a3c7208821708e18fdeb7bb43058 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 27 Feb 2024 10:35:56 -0300
Subject: [PATCH 066/128] Fix roadmap add stop dialog label

---
 src/pages/Route/Roadmap/RoadmapAddStopDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
index b3097d852..659158714 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
@@ -86,7 +86,7 @@ const onSave = async () => {
                     <VnInputDate v-model="roadmapStopForm.eta" :label="t('ETA date')" />
                 </div>
                 <div class="col">
-                    <VnInputTime v-model="roadmapStopForm.eta" :label="t('ETA date')" />
+                    <VnInputTime v-model="roadmapStopForm.eta" :label="t('ETA time')" />
                 </div>
             </QCardSection>
             <QCardSection class="card-section q-px-none">

From 4be9c027113a1d4542c7ebbf77255d3422dd7d00 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 27 Feb 2024 12:41:42 -0300
Subject: [PATCH 067/128] Fix routes add ticket dialog

---
 src/pages/Route/Card/RouteListTicketsDialog.vue | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/pages/Route/Card/RouteListTicketsDialog.vue b/src/pages/Route/Card/RouteListTicketsDialog.vue
index e5a8ac2b9..cc4515158 100644
--- a/src/pages/Route/Card/RouteListTicketsDialog.vue
+++ b/src/pages/Route/Card/RouteListTicketsDialog.vue
@@ -102,16 +102,13 @@ const setTicketsRoute = async () => {
         return;
     }
 
-    const updates = selectedRows.value?.map((ticket) => ({
-        where: {
-            id: ticket.id,
-            data: {
-                routeFk: $props.id,
-            },
-        },
-    }));
-
-    await axios.post(`Tickets/crud`, { updates });
+    await Promise.all(
+        (selectedRows.value || [])
+            .filter((ticket) => ticket?.id)
+            .map((ticket) =>
+                axios.patch(`Routes/${$props.id}/insertTicket`, { ticketId: ticket.id })
+            )
+    );
     await axios.post(`Routes/${$props.id}/updateVolume`);
     emit('ok');
     emit('hide');

From e7e34ef21ae40edbe93137bcecc820c379eed887 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 27 Feb 2024 13:03:31 -0300
Subject: [PATCH 068/128] Hide Go to summary icon when is in supplier summary
 view

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

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 442e03f9f..306057ff2 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -53,7 +53,7 @@ const isAdministrative = computed(() => {
     >
         <template #header-left>
             <router-link
-                v-if="isAdministrative"
+                v-if="isAdministrative && route.name !== 'SupplierSummary'"
                 class="header link"
                 :to="{ name: 'SupplierSummary', params: { id: entityId } }"
             >

From d863248177777a618ac4d1723e9e5cbe68546cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segarra=20Mart=C3=ADnez?= <jsegarra@verdnatura.es>
Date: Wed, 28 Feb 2024 06:38:25 +0100
Subject: [PATCH 069/128] refs #6940 fix: use onMounted

---
 src/pages/Route/Cmr/CmrList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index dc5602c1c..ac3d36ac5 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -89,6 +89,8 @@ function downloadPdfs() {
     // prettier-ignore
     return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
+
+onMounted(()=>{if(!stateStore.isRightDrawerShown())stateStore.toggleRightDrawer()})
 </script>
 <template>
     <div class="column items-center">

From 02934037e770054180221a8b544939e60ccd25e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segarra=20Mart=C3=ADnez?= <jsegarra@verdnatura.es>
Date: Wed, 28 Feb 2024 06:38:59 +0100
Subject: [PATCH 070/128] refs #6940 fix: show button in Navbar

---
 src/pages/Route/Cmr/CmrList.vue | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index ac3d36ac5..eb1901ab8 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -89,10 +89,26 @@ function downloadPdfs() {
     // prettier-ignore
     return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
-
-onMounted(()=>{if(!stateStore.isRightDrawerShown())stateStore.toggleRightDrawer()})
 </script>
 <template>
+      <template v-if="stateStore.isHeaderMounted()">
+
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
     <div class="column items-center">
         <div class="list">
             <VnPaginate

From 564533604047c2185de21fbf2762453212ae0449 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 28 Feb 2024 07:55:11 +0100
Subject: [PATCH 071/128] refs #6795 hotFix(claimSummary) fix
 ItemDescriptorProxy

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

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index b93cbbd81..7d6def871 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -259,7 +259,7 @@ function openDialog(dmsId) {
                                 >
                                 <ItemDescriptorProxy
                                     v-if="col.name == 'description'"
-                                    :id="props.row.id"
+                                    :id="props.row.sale.itemFk"
                                     :sale-fk="props.row.saleFk"
                                 ></ItemDescriptorProxy>
                             </QTh>

From bddfe8f9d7ff94ca253b2e34acf57434712976c2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Feb 2024 08:33:26 +0100
Subject: [PATCH 072/128] refs #6930 feat: call shareToken endpoint

---
 src/pages/Login/LoginMain.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index 7a141e878..0bdc02142 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -30,8 +30,15 @@ async function onSubmit() {
         const { data } = await axios.post('Accounts/login', params);
 
         if (!data) return;
+        const {
+            data: { multimediaToken },
+        } = await axios.get('VnUsers/ShareToken', {
+            headers: { Authorization: data.token },
+        });
 
-        await session.login(data.token, data.multimediaToken.id, keepLogin.value);
+        if (!multimediaToken) return;
+
+        await session.login(data.token, multimediaToken.id, keepLogin.value);
 
         quasar.notify({
             message: t('login.loginSuccess'),

From 0d80fd37a4127c7f395916f505cf6873bef53ba3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Feb 2024 11:28:57 +0100
Subject: [PATCH 073/128] refs #6930 feat: call loutMultimedia endpoint

---
 src/boot/axios.js             |  2 +-
 src/composables/useSession.js | 37 ++++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index c58cc2d08..e3e7289af 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -11,7 +11,7 @@ axios.defaults.baseURL = '/api/';
 
 const onRequest = (config) => {
     const token = session.getToken();
-    if (token.length && config.headers) {
+    if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
     }
 
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 4d182a934..580efbdf8 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -1,6 +1,7 @@
 import { useState } from './useState';
 import { useRole } from './useRole';
 import { useUserConfig } from './useUserConfig';
+import axios from 'axios';
 
 
 export function useSession() {
@@ -27,15 +28,37 @@ export function useSession() {
         }
     }
 
-    function destroy() {
-        if (localStorage.getItem('token'))
-            localStorage.removeItem('token')
-
-        if (localStorage.getItem('tokenMultimedia'))
+    async function destroy() {
+          if (localStorage.getItem('tokenMultimedia')){
+            await axios.post('VnUsers/logoutMultimedia',  null, {
+                headers: {Authorization: localStorage.getItem('tokenMultimedia') }
+            });
             localStorage.removeItem('tokenMultimedia')
 
-        if (sessionStorage.getItem('token'))
-            sessionStorage.removeItem('token');
+        }
+        if (localStorage.getItem('token')){
+            await axios.post('VnUsers/logout',  null, {
+                headers: {Authorization: localStorage.getItem('token') }
+            });
+            localStorage.removeItem('token')
+        }
+
+
+         if (sessionStorage.getItem('tokenMultimedia')){
+            await axios.post('VnUsers/logoutMultimedia',  null, {
+                headers: {Authorization: sessionStorage.getItem('tokenMultimedia') }
+            });
+            sessionStorage.removeItem('tokenMultimedia')
+
+        }
+        if (sessionStorage.getItem('token')){
+            await axios.post('VnUsers/logout',  null, {
+                headers: {Authorization: sessionStorage.getItem('token') }
+            });
+            sessionStorage.removeItem('token')
+        }
+
+
 
         const { setUser } = useState();
 

From f1961f07d103e78310aadfea9b2ece6bfb6bdb7a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 08:54:53 -0300
Subject: [PATCH 074/128] CardSummary changes

---
 src/components/ui/CardSummary.vue           | 26 ++++++++++++++++++---
 src/pages/Supplier/Card/SupplierSummary.vue | 10 +-------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index cb2c97746..a950ec139 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
-onMounted(() => fetch());
-
 const entity = ref();
 const props = defineProps({
     url: {
@@ -16,14 +15,25 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    summaryRouteName: {
+        type: String,
+        default: null,
+    },
 });
 const emit = defineEmits(['onFetch']);
+const route = useRoute();
+const isSummary = ref();
 
 defineExpose({
     entity,
     fetch,
 });
 
+onMounted(() => {
+    isSummary.value = String(route.path).endsWith('/summary');
+    fetch();
+});
+
 async function fetch() {
     const params = {};
 
@@ -48,7 +58,17 @@ watch(props, async () => {
             <template v-if="entity">
                 <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
                     <slot name="header-left">
-                        <span></span>
+                        <router-link
+                            v-if="!isSummary"
+                            class="header link"
+                            :to="{
+                                name: summaryRouteName,
+                                params: { id: entity.id },
+                            }"
+                        >
+                            <QIcon name="open_in_new" color="white" size="sm" />
+                        </router-link>
+                        <span v-else></span>
                     </slot>
                     <slot name="header" :entity="entity">
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 306057ff2..898872ef5 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -49,17 +49,9 @@ const isAdministrative = computed(() => {
     <CardSummary
         ref="summaryRef"
         :url="`Suppliers/${entityId}/getSummary`"
+        summary-route-name="SupplierSummary"
         @on-fetch="(data) => setData(data)"
     >
-        <template #header-left>
-            <router-link
-                v-if="isAdministrative && route.name !== 'SupplierSummary'"
-                class="header link"
-                :to="{ name: 'SupplierSummary', params: { id: entityId } }"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
-        </template>
         <template #header>
             <span>{{ supplier.name }} - {{ supplier.id }}</span>
         </template>

From 39381f29d739b2ccc865a91adf1dd5c55a460981 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Feb 2024 13:15:59 +0100
Subject: [PATCH 075/128] refs #6980 test: fix failed tests

---
 .../vitest/__tests__/composables/useSession.spec.js | 13 ++++++++-----
 test/vitest/__tests__/pages/Login/Login.spec.js     |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 4f900aca6..f9f3dcb80 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -54,7 +54,8 @@ describe('session', () => {
             expect(localStorage.getItem('token')).toEqual('tokenToBeGone');
             expect(user.value).toEqual(previousUser);
 
-            session.destroy();
+            vi.spyOn(axios, 'post').mockResolvedValue({ data: true });
+            await session.destroy();
 
             user = state.getUser();
             expect(localStorage.getItem('token')).toBeNull();
@@ -92,9 +93,10 @@ describe('session', () => {
             });
 
             const expectedToken = 'mySessionToken';
+            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
             const keepLogin = false;
 
-            await session.login(expectedToken, keepLogin);
+            await session.login(expectedToken,expectedTokenMultimedia, keepLogin);
 
             const roles = state.getRoles();
             const localToken = localStorage.getItem('token');
@@ -104,7 +106,7 @@ describe('session', () => {
             expect(localToken).toBeNull();
             expect(sessionToken).toEqual(expectedToken);
 
-            session.destroy(); // this clears token and user for any other test
+           await session.destroy(); // this clears token and user for any other test
         });
 
         it('should fetch the user roles and then set token in the localStorage', async () => {
@@ -114,9 +116,10 @@ describe('session', () => {
             });
 
             const expectedToken = 'myLocalToken';
+            const expectedTokenMultimedia = 'myLocalTokenMultimedia';
             const keepLogin = true;
 
-            await session.login(expectedToken, keepLogin);
+            await session.login(expectedToken, expectedTokenMultimedia, keepLogin);
 
             const roles = state.getRoles();
             const localToken = localStorage.getItem('token');
@@ -126,7 +129,7 @@ describe('session', () => {
             expect(localToken).toEqual(expectedToken);
             expect(sessionToken).toBeNull();
 
-            session.destroy(); // this clears token and user for any other test
+            await session.destroy(); // this clears token and user for any other test
         });
     });
 });
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/test/vitest/__tests__/pages/Login/Login.spec.js
index fadfc898f..6e2de9870 100644
--- a/test/vitest/__tests__/pages/Login/Login.spec.js
+++ b/test/vitest/__tests__/pages/Login/Login.spec.js
@@ -22,9 +22,9 @@ describe('Login', () => {
                 darkMode: false,
             },
         };
-        vi.spyOn(axios, 'post').mockResolvedValue({ data: { token: 'token' } });
+        vi.spyOn(axios, 'post').mockResolvedValueOnce({ data: { token: 'token' } });
         vi.spyOn(axios, 'get').mockResolvedValue({
-            data: { roles: [], user: expectedUser },
+            data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }},
         });
         vi.spyOn(vm.quasar, 'notify');
 
@@ -36,7 +36,7 @@ describe('Login', () => {
         expect(vm.quasar.notify).toHaveBeenCalledWith(
             expect.objectContaining({ type: 'positive' })
         );
-        vm.session.destroy();
+        await vm.session.destroy();
     });
 
     it('should not set the token into session if any error occurred', async () => {

From 9e86036f409d0657e007f5585c11b273e79e9968 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 09:53:15 -0300
Subject: [PATCH 076/128] Change new address tooltip

---
 src/pages/Supplier/Card/SupplierAddresses.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index c6b08075f..735b50625 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -83,8 +83,13 @@ const redirectToUpdateView = (addressData) => {
         <QPageSticky :offset="[20, 20]">
             <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
             <QTooltip>
-                {{ t('supplier.list.newSupplier') }}
+                {{ t('New address') }}
             </QTooltip>
         </QPageSticky>
     </QPage>
 </template>
+
+<i18n>
+es:
+    New address: Nueva dirección
+</i18n>

From fe5e448cf093e58d8c8916a12d03f8139e85460a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 10:13:49 -0300
Subject: [PATCH 077/128] Change show summary icon condition

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

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index a950ec139..1f89dceda 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -59,7 +59,7 @@ watch(props, async () => {
                 <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="!isSummary"
+                            v-if="!isSummary && summaryRouteName"
                             class="header link"
                             :to="{
                                 name: summaryRouteName,

From b0d43edbce47bca5a3bc361ea4dfb8db7eb98ac6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 12:02:38 -0300
Subject: [PATCH 078/128] Route summary link logic improvement

---
 src/components/ui/CardSummary.vue               | 10 +++++-----
 src/pages/Claim/Card/ClaimSummary.vue           |  1 +
 src/pages/Entry/Card/EntrySummary.vue           |  6 ------
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue |  6 +++++-
 src/pages/Route/Card/RouteSummary.vue           | 11 +++++------
 src/pages/Supplier/Card/SupplierSummary.vue     |  1 -
 src/pages/Travel/Card/TravelSummary.vue         | 10 ----------
 src/router/modules/Supplier.js                  |  1 +
 src/router/modules/claim.js                     |  1 +
 src/router/modules/customer.js                  |  1 +
 src/router/modules/entry.js                     |  1 +
 src/router/modules/invoiceIn.js                 |  1 +
 src/router/modules/invoiceOut.js                |  1 +
 src/router/modules/order.js                     |  1 +
 src/router/modules/route.js                     |  1 +
 src/router/modules/shelving.js                  | 13 ++++++-------
 src/router/modules/ticket.js                    |  1 +
 src/router/modules/travel.js                    |  1 +
 src/router/modules/wagon.js                     |  1 +
 src/router/modules/worker.js                    |  1 +
 20 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 1f89dceda..7799eee72 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -15,8 +15,8 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    summaryRouteName: {
-        type: String,
+    entityId: {
+        type: Number,
         default: null,
     },
 });
@@ -59,11 +59,11 @@ watch(props, async () => {
                 <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="!isSummary && summaryRouteName"
+                            v-if="!isSummary && route.meta.moduleName"
                             class="header link"
                             :to="{
-                                name: summaryRouteName,
-                                params: { id: entity.id },
+                                name: `${route.meta.moduleName}Summary`,
+                                params: { id: entityId || entity.id },
                             }"
                         >
                             <QIcon name="open_in_new" color="white" size="sm" />
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index b93cbbd81..cc66a8434 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -172,6 +172,7 @@ function openDialog(dmsId) {
     <CardSummary
         ref="summary"
         :url="`Claims/${entityId}/getSummary`"
+        :entity-id="entityId"
         @on-fetch="getClaimDms"
     >
         <template #header="{ entity: { claim } }">
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 3861e0321..7ac25a777 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -147,15 +147,9 @@ const fetchEntryBuys = async () => {
         :url="`Entries/${entityId}/getEntry`"
         @on-fetch="(data) => setEntryData(data)"
     >
-        <template #header-left>
-            <a class="header link" :href="entryUrl">
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
-        </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
-
         <template #body>
             <QCard class="vn-one">
                 <a class="header link" :href="entryUrl">
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5a56a3957..b80bf979d 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -95,7 +95,11 @@ const ticketsColumns = ref([
 </script>
 
 <template>
-    <CardSummary ref="summary" :url="`InvoiceOuts/${entityId}/summary`">
+    <CardSummary
+        ref="summary"
+        :url="`InvoiceOuts/${entityId}/summary`"
+        :entity-id="entityId"
+    >
         <template #header="{ entity: { invoiceOut } }">
             <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
         </template>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index df4495d3a..9801f3d28 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -132,12 +132,11 @@ const openBuscaman = async (route, ticket) => {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary ref="summary" :url="`Routes/${entityId}/summary`">
-            <template #header-left>
-                <RouterLink :to="{ name: `RouteSummary`, params: { id: entityId } }">
-                    <QIcon name="open_in_new" color="white" size="sm" />
-                </RouterLink>
-            </template>
+        <CardSummary
+            ref="summary"
+            :url="`Routes/${entityId}/summary`"
+            :entity-id="entityId"
+        >
             <template #header="{ entity }">
                 <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
             </template>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 898872ef5..417c2ac0d 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -49,7 +49,6 @@ const isAdministrative = computed(() => {
     <CardSummary
         ref="summaryRef"
         :url="`Suppliers/${entityId}/getSummary`"
-        summary-route-name="SupplierSummary"
         @on-fetch="(data) => setData(data)"
     >
         <template #header>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 2ed6a0487..b17fb0c22 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -236,19 +236,9 @@ async function setTravelData(travelData) {
         :url="`Travels/${entityId}/getTravel`"
         @on-fetch="(data) => setTravelData(data)"
     >
-        <template #header-left>
-            <router-link
-                class="header link"
-                :to="{ name: 'TravelSummary', params: { id: entityId } }"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-                <QTooltip>{{ t('travel.pageTitles.summary') }}</QTooltip>
-            </router-link>
-        </template>
         <template #header>
             <span>{{ travel.ref }} - {{ travel.id }}</span>
         </template>
-
         <template #header-right>
             <QBtn color="white" dense flat icon="more_vert" round size="md">
                 <QTooltip>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index d341ddc25..379a2c2c2 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'suppliers',
         icon: 'vn:supplier',
+        moduleName: 'Supplier',
     },
     component: RouterView,
     redirect: { name: 'SupplierMain' },
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index 1dfd75cff..3ab4f4cbf 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'claims',
         icon: 'vn:claims',
+        moduleName: 'Claim',
     },
     component: RouterView,
     redirect: { name: 'ClaimMain' },
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 716b0fa6c..75188bd32 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'customers',
         icon: 'vn:client',
+        moduleName: 'Customer',
     },
     component: RouterView,
     redirect: { name: 'CustomerMain' },
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 2f6c8cb4c..50a651af5 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'entries',
         icon: 'vn:entry',
+        moduleName: 'Entry',
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 01ed37036..869a3555a 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'invoiceIns',
         icon: 'vn:invoice-in',
+        moduleName: 'InvoiceIn',
     },
     component: RouterView,
     redirect: { name: 'InvoiceInMain' },
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 084cf6ac3..386e04ed8 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'invoiceOuts',
         icon: 'vn:invoice-out',
+        moduleName: 'InvoiceOut',
     },
     component: RouterView,
     redirect: { name: 'InvoiceOutMain' },
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 4599394cd..16d73281b 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'order',
         icon: 'vn:basket',
+        moduleName: 'Order',
     },
     component: RouterView,
     redirect: { name: 'OrderMain' },
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 614345913..fad991fc6 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'routes',
         icon: 'vn:delivery',
+        moduleName: 'Route',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 494f286c3..d32c7d9f3 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -1,17 +1,18 @@
-import {RouterView} from "vue-router";
+import { RouterView } from 'vue-router';
 
 export default {
     path: '/shelving',
     name: 'Shelving',
     meta: {
         title: 'shelving',
-        icon: 'vn:inventory'
+        icon: 'vn:inventory',
+        moduleName: 'Shelving',
     },
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
         main: ['ShelvingList'],
-        card: ['ShelvingBasicData', 'ShelvingLog']
+        card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
         {
@@ -51,8 +52,7 @@ export default {
                     meta: {
                         title: 'summary',
                     },
-                    component: () =>
-                        import('pages/Shelving/Card/ShelvingSummary.vue'),
+                    component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
                 },
                 {
                     name: 'ShelvingBasicData',
@@ -75,6 +75,5 @@ export default {
                 },
             ],
         },
-    ]
+    ],
 };
-
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 73c441b4d..d6b714154 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'tickets',
         icon: 'vn:ticket',
+        moduleName: 'Ticket',
     },
     component: RouterView,
     redirect: { name: 'TicketMain' },
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index 792b393e4..2f1e2150e 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'travel',
         icon: 'local_airport',
+        moduleName: 'Travel',
     },
     component: RouterView,
     redirect: { name: 'TravelMain' },
diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js
index 238e482dd..6f9a4c819 100644
--- a/src/router/modules/wagon.js
+++ b/src/router/modules/wagon.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'wagons',
         icon: 'vn:trolley',
+        moduleName: 'Wagon',
     },
     component: RouterView,
     redirect: { name: 'WagonMain' },
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 27a6f19a9..171e346c6 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'workers',
         icon: 'vn:worker',
+        moduleName: 'Worker',
     },
     component: RouterView,
     redirect: { name: 'WorkerMain' },

From e93864e9672a7ca846fe9743f738271e41fb878b Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 28 Feb 2024 21:21:07 -0300
Subject: [PATCH 079/128] Update routes list input

---
 src/pages/Route/RouteList.vue | 309 +++++++++++++---------------------
 1 file changed, 118 insertions(+), 191 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0c9fdad48..81135533b 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -3,7 +3,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toDate, toHour } from 'src/filters';
+import { dashIfEmpty, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import { useValidator } from 'composables/useValidator';
@@ -37,7 +37,7 @@ const columns = computed(() => [
         label: t('ID'),
         field: (row) => row.id,
         sortable: true,
-        align: 'left',
+        align: 'center',
     },
     {
         name: 'worker',
@@ -72,7 +72,7 @@ const columns = computed(() => [
         label: 'm³',
         field: (row) => dashIfEmpty(row.m3),
         sortable: true,
-        align: 'left',
+        align: 'center',
     },
     {
         name: 'description',
@@ -115,24 +115,6 @@ const updateRoute = async (route) => {
     }
 };
 
-const updateVehicle = (row, vehicle) => {
-    row.vehicleFk = vehicle.id;
-    row.vehiclePlateNumber = vehicle.numberPlate;
-    updateRoute(row);
-};
-
-const updateAgency = (row, agency) => {
-    row.agencyModeFk = agency.id;
-    row.agencyName = agency.name;
-    updateRoute(row);
-};
-
-const updateWorker = (row, worker) => {
-    row.workerFk = worker.id;
-    row.workerUserName = worker.name;
-    updateRoute(row);
-};
-
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 
@@ -241,7 +223,7 @@ const openTicketsDialog = (id) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
-    <QPage class="column items-center q-mb-xl">
+    <QPage class="column items-center">
         <VnSubToolbar class="bg-vn-dark justify-end">
             <template #st-actions>
                 <QBtn
@@ -294,189 +276,125 @@ const openTicketsDialog = (id) => {
                             :rows-per-page-options="[0]"
                             hide-pagination
                             :pagination="{ sortBy: 'ID', descending: true }"
+                            :no-data-label="t('No results')"
                         >
-                            <template #body-cell-worker="props">
-                                <QTd :props="props">
-                                    {{ props.row?.workerUserName }}
-                                    <QPopupEdit
-                                        :model-value="props.row.workerFk"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="
-                                            (worker) => updateWorker(props.row, worker)
-                                        "
+                            <template #body-cell-worker="{ row }">
+                                <QTd>
+                                    <VnSelectFilter
+                                        :label="t('Worker')"
+                                        v-model="row.workerFk"
+                                        :options="workers"
+                                        option-value="id"
+                                        option-label="name"
+                                        hide-selected
+                                        dense
+                                        :emit-value="false"
+                                        :rules="validate('Route.workerFk')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
                                     >
-                                        <VnSelectFilter
-                                            :label="t('Worker')"
-                                            v-model="scope.value"
-                                            :options="workers"
-                                            option-value="id"
-                                            option-label="name"
-                                            hide-selected
-                                            autofocus
-                                            :emit-value="false"
-                                            :rules="validate('Route.workerFk')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        >
-                                            <template #option="{ opt, itemProps }">
-                                                <QItem
-                                                    v-bind="itemProps"
-                                                    class="q-pa-xs row items-center"
+                                        <template #option="{ opt, itemProps }">
+                                            <QItem
+                                                v-bind="itemProps"
+                                                class="q-pa-xs row items-center"
+                                            >
+                                                <QItemSection
+                                                    class="col-9 justify-center"
                                                 >
-                                                    <QItemSection
-                                                        class="col-9 justify-center"
-                                                    >
-                                                        <span>{{ opt.name }}</span>
-                                                        <span class="text-grey">{{
-                                                            opt.nickname
-                                                        }}</span>
-                                                    </QItemSection>
-                                                </QItem>
-                                            </template>
-                                        </VnSelectFilter>
-                                    </QPopupEdit>
+                                                    <span>{{ opt.name }}</span>
+                                                    <span class="text-grey">{{
+                                                        opt.nickname
+                                                    }}</span>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelectFilter>
                                 </QTd>
                             </template>
-                            <template #body-cell-agency="props">
-                                <QTd :props="props">
-                                    {{ props.row?.agencyName }}
-                                    <QPopupEdit
-                                        :model-value="props.row.agencyModeFk"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="
-                                            (agency) => updateAgency(props.row, agency)
-                                        "
-                                    >
-                                        <VnSelectFilter
-                                            :label="t('Agency')"
-                                            v-model="scope.value"
-                                            :options="agencyList"
-                                            option-value="id"
-                                            option-label="name"
-                                            hide-selected
-                                            autofocus
-                                            :emit-value="false"
-                                            :rules="validate('route.agencyFk')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-agency="{ row }">
+                                <QTd>
+                                    <VnSelectFilter
+                                        :label="t('Agency')"
+                                        v-model="row.agencyModeFk"
+                                        :options="agencyList"
+                                        option-value="id"
+                                        option-label="name"
+                                        hide-selected
+                                        dense
+                                        :emit-value="false"
+                                        :rules="validate('route.agencyFk')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-vehicle="props">
-                                <QTd :props="props">
-                                    {{ props.row?.vehiclePlateNumber }}
-                                    <QPopupEdit
-                                        :model-value="props.row.vehicleFk"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="
-                                            (vehicle) => updateVehicle(props.row, vehicle)
-                                        "
-                                    >
-                                        <VnSelectFilter
-                                            :label="t('Vehicle')"
-                                            v-model="scope.value"
-                                            :options="vehicleList"
-                                            option-value="id"
-                                            option-label="numberPlate"
-                                            hide-selected
-                                            autofocus
-                                            :emit-value="false"
-                                            :rules="validate('route.vehicleFk')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-vehicle="{ row }">
+                                <QTd>
+                                    <VnSelectFilter
+                                        :label="t('Vehicle')"
+                                        v-model="row.vehicleFk"
+                                        :options="vehicleList"
+                                        option-value="id"
+                                        option-label="numberPlate"
+                                        hide-selected
+                                        dense
+                                        :emit-value="false"
+                                        :rules="validate('route.vehicleFk')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-date="props">
-                                <QTd :props="props">
-                                    {{ toDate(props.row?.created) }}
-                                    <QPopupEdit
-                                        v-model="props.row.created"
-                                        v-slot="scope"
-                                        @update:model-value="updateRoute(props.row)"
-                                        buttons
-                                    >
-                                        <VnInputDate
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Date')"
-                                            :rules="validate('route.created')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-date="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInputDate
+                                        v-model="row.created"
+                                        hide-bottom-space
+                                        dense
+                                        :label="t('Date')"
+                                        :rules="validate('route.created')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-description="props">
-                                <QTd :props="props">
-                                    {{ props.row?.description }}
-                                    <QPopupEdit
-                                        v-model="props.row.description"
-                                        v-slot="scope"
-                                        @update:model-value="updateRoute(props.row)"
-                                        buttons
-                                    >
-                                        <VnInput
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Description')"
-                                            :rules="validate('route.description')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-description="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInput
+                                        v-model="row.description"
+                                        :label="t('Description')"
+                                        :rules="validate('route.description')"
+                                        :is-clearable="false"
+                                        dense
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-started="props">
-                                <QTd :props="props">
-                                    {{ toHour(props.row.started) }}
-                                    <QPopupEdit
-                                        v-model="props.row.started"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="updateRoute(props.row)"
-                                    >
-                                        <VnInputTime
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Hour started')"
-                                            :rules="validate('route.started')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-started="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInputTime
+                                        v-model="row.started"
+                                        :label="t('Hour started')"
+                                        :rules="validate('route.started')"
+                                        :is-clearable="false"
+                                        hide-bottom-space
+                                        dense
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-finished="props">
-                                <QTd :props="props">
-                                    {{ toHour(props.row.finished) }}
-                                    <QPopupEdit
-                                        v-model="props.row.finished"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="updateRoute(props.row)"
-                                    >
-                                        <VnInputTime
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Hour finished')"
-                                            :rules="validate('route.finished')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-finished="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInputTime
+                                        v-model="row.finished"
+                                        autofocus
+                                        :label="t('Hour finished')"
+                                        :rules="validate('route.finished')"
+                                        :is-clearable="false"
+                                        hide-bottom-space
+                                        dense
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
                             <template #body-cell-actions="props">
@@ -508,7 +426,11 @@ const openTicketsDialog = (id) => {
                                                 params: { id: props?.row?.id },
                                             }"
                                         >
-                                            <QIcon name="vn:eye" size="xs" color="primary">
+                                            <QIcon
+                                                name="vn:eye"
+                                                size="xs"
+                                                color="primary"
+                                            >
                                                 <QTooltip>{{ t('Summary') }}</QTooltip>
                                             </QIcon>
                                         </RouterLink>
@@ -532,8 +454,13 @@ const openTicketsDialog = (id) => {
 </template>
 
 <style lang="scss" scoped>
+.table-input-cell {
+    min-width: 150px;
+}
+
 .route-list {
     width: 100%;
+    max-height: 100%;
 }
 
 .table-actions {

From a35eb1e2f2861a41a80fce0fac7ecc9ad21027ed Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 29 Feb 2024 08:08:00 -0300
Subject: [PATCH 080/128] Update routes list no result label

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

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 81135533b..2d149040d 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -276,7 +276,7 @@ const openTicketsDialog = (id) => {
                             :rows-per-page-options="[0]"
                             hide-pagination
                             :pagination="{ sortBy: 'ID', descending: true }"
-                            :no-data-label="t('No results')"
+                            :no-data-label="t('globals.noResults')"
                         >
                             <template #body-cell-worker="{ row }">
                                 <QTd>

From b2be4c13801f48680f1de3b930b8ed45b7428018 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 29 Feb 2024 11:01:41 -0300
Subject: [PATCH 081/128] Fix routes list spaces

---
 src/pages/Route/RouteAutonomous.vue | 12 ++++++------
 src/pages/Route/RouteRoadmap.vue    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index d4ce2636c..15e31d931 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -202,16 +202,16 @@ function navigateToRouteSummary(event, row) {
                             @row-click="navigateToRouteSummary"
                         >
                             <template #body-cell-ID="props">
-                                <QTd :props="props" @click.stop>
-                                    <span class="link">
+                                <QTd :props="props">
+                                    <span class="link" @click.stop>
                                         {{ props.value }}
                                         <RouteDescriptorProxy :id="props.value" />
                                     </span>
                                 </QTd>
                             </template>
                             <template #body-cell-received="props">
-                                <QTd :props="props" @click.stop>
-                                    <span :class="props.value && 'link'">
+                                <QTd :props="props">
+                                    <span :class="props.value && 'link'" @click.stop>
                                         {{ dashIfEmpty(props.value) }}
                                         <InvoiceInDescriptorProxy
                                             v-if="props.value"
@@ -221,8 +221,8 @@ function navigateToRouteSummary(event, row) {
                                 </QTd>
                             </template>
                             <template #body-cell-autonomous="props">
-                                <QTd :props="props" @click.stop>
-                                    <span class="link">
+                                <QTd :props="props">
+                                    <span class="link" @click.stop>
                                         {{ props.value }}
                                         <SupplierDescriptorProxy
                                             v-if="props.row?.supplierFk"
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index ee9e52254..3dca18d66 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -228,8 +228,8 @@ function navigateToRoadmapSummary(event, row) {
                             @row-click="navigateToRoadmapSummary"
                         >
                             <template #body-cell-carrier="props">
-                                <QTd :props="props" @click.stop>
-                                    <span v-if="props.value" class="link">
+                                <QTd :props="props">
+                                    <span v-if="props.value" class="link" @click.stop>
                                         {{ props.value }}
                                         <SupplierDescriptorProxy
                                             :id="props.row?.supplier?.id"

From 1073512aae25791f853a23ab31198a305ba376e2 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 3 Mar 2024 23:36:14 -0300
Subject: [PATCH 082/128] Implement Route autonomous dms

---
 src/components/common/VnDms.vue     |  9 +++-
 src/pages/Route/RouteAutonomous.vue | 73 ++++++++++++++++++++++++-----
 2 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index d2651f5d8..90390c35f 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -27,6 +27,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    url: {
+        type: String,
+        default: null,
+    },
 });
 
 const warehouses = ref();
@@ -65,14 +69,15 @@ function mapperDms(data) {
 }
 
 function getUrl() {
+    if ($props.url) return $props.url;
     if ($props.formInitialData) return 'dms/' + $props.formInitialData.id + '/updateFile';
     return `${$props.model}/${route.params.id}/uploadFile`;
 }
 
 async function save() {
     const body = mapperDms(dms.value);
-    await axios.post(getUrl(), body[0], body[1]);
-    emit('onDataSaved', body[1].params);
+    const response = await axios.post(getUrl(), body[0], body[1]);
+    emit('onDataSaved', body[1].params, response);
 }
 
 function defaultData() {
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 15e31d931..6fd4d3f90 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -12,8 +12,11 @@ import VnLv from 'components/ui/VnLv.vue';
 import useNotify from 'composables/useNotify';
 import RouteAutonomousFilter from 'pages/Route/Card/RouteAutonomousFilter.vue';
 import { useRouter } from 'vue-router';
-import RouteSummary from "pages/Route/Card/RouteSummary.vue";
-import {useSummaryDialog} from "composables/useSummaryDialog";
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+import { useSummaryDialog } from 'composables/useSummaryDialog';
+import VnDms from 'components/common/VnDms.vue';
+import { useState } from 'composables/useState';
+import axios from 'axios';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -24,6 +27,13 @@ const { viewSummary } = useSummaryDialog();
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
+const state = useState();
+const user = state.getUser();
+const dmsDialog = ref({
+    show: false,
+    initialForm: {},
+    rowsToCreateInvoiceIn: [],
+});
 const selectedRows = ref([]);
 const columns = computed(() => [
     {
@@ -108,8 +118,8 @@ const refreshKey = ref(0);
 
 const total = computed(() => selectedRows.value.reduce((item) => item?.price || 0, 0));
 
-const openCreateInvoiceIn = () => {
-    const rowsToCreateInvoiceIn = selectedRows.value
+const openDmsUploadDialog = async () => {
+    dmsDialog.value.rowsToCreateInvoiceIn = selectedRows.value
         .filter(
             (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk
         )
@@ -120,20 +130,44 @@ const openCreateInvoiceIn = () => {
             totalPrice: total.value,
         }));
 
-    if (rowsToCreateInvoiceIn.length !== selectedRows.value.length) {
+    if (dmsDialog.value.rowsToCreateInvoiceIn.length !== selectedRows.value.length) {
+        dmsDialog.value.rowsToCreateInvoiceIn = [];
+        dmsDialog.value.initialForm = null;
         return notify(t('Two autonomous cannot be counted at the same time'), 'negative');
     }
 
-    const params = encodeURI(JSON.stringify({
-        supplierName: selectedRows.value?.[0].supplierName,
-        rows: rowsToCreateInvoiceIn,
-    }));
+    const dmsType = await axios
+        .get('DmsTypes/findOne', {
+            filter: {
+                where: { code: 'invoiceIn' },
+            },
+        })
+        .then((res) => res.data);
 
-    router.push({ name: 'RouteAutonomousCreateInvoiceIn', query: { q: params } });
+    dmsDialog.value.initialForm = {
+        description: selectedRows.value?.[0].supplierName,
+        companyFk: user.value.companyFk,
+        warehouseFk: user.value.warehouseFk,
+        dmsTypeFk: dmsType?.id,
+    };
+    dmsDialog.value.show = true;
+};
+
+const onDmsSaved = async (dms, response) => {
+    if (response) {
+        await axios.post('AgencyTerms/createInvoiceIn', {
+            rows: dmsDialog.value.rowsToCreateInvoiceIn,
+            dms: response.data,
+        });
+    }
+    dmsDialog.value.show = false;
+    dmsDialog.value.initialForm = null;
+    dmsDialog.value.rowsToCreateInvoiceIn = [];
+    refreshKey.value++;
 };
 
 function navigateToRouteSummary(event, row) {
-    router.push({ name: 'RouteSummary', params: { id: row.routeFk } })
+    router.push({ name: 'RouteSummary', params: { id: row.routeFk } });
 }
 </script>
 
@@ -238,7 +272,12 @@ function navigateToRouteSummary(event, row) {
                                             name="preview"
                                             size="xs"
                                             color="primary"
-                                            @click.stop="viewSummary(props?.row?.routeFk, RouteSummary)"
+                                            @click.stop="
+                                                viewSummary(
+                                                    props?.row?.routeFk,
+                                                    RouteSummary
+                                                )
+                                            "
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
                                         </QIcon>
@@ -255,7 +294,7 @@ function navigateToRouteSummary(event, row) {
                 fab
                 icon="vn:invoice-in-create"
                 color="primary"
-                @click="openCreateInvoiceIn"
+                @click="openDmsUploadDialog"
             >
                 <QTooltip>
                     {{ t('Create invoiceIn') }}
@@ -263,6 +302,14 @@ function navigateToRouteSummary(event, row) {
             </QBtn>
         </QPageSticky>
     </QPage>
+    <QDialog v-model="dmsDialog.show">
+        <VnDms
+            url="dms/uploadFile"
+            model="AgencyTerms"
+            :form-initial-data="dmsDialog.initialForm"
+            @on-data-saved="onDmsSaved"
+        />
+    </QDialog>
 </template>
 
 <style lang="scss" scoped>

From 31911be3ba3ba0d486f9affeb34ac1f2d44f85ef Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 3 Mar 2024 23:36:30 -0300
Subject: [PATCH 083/128] Remove unused route

---
 .../Route/RouteAutonomousCreateInvoiceIn.vue  | 207 ------------------
 src/router/modules/route.js                   |   8 -
 2 files changed, 215 deletions(-)
 delete mode 100644 src/pages/Route/RouteAutonomousCreateInvoiceIn.vue

diff --git a/src/pages/Route/RouteAutonomousCreateInvoiceIn.vue b/src/pages/Route/RouteAutonomousCreateInvoiceIn.vue
deleted file mode 100644
index 2f3f51143..000000000
--- a/src/pages/Route/RouteAutonomousCreateInvoiceIn.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import FetchData from 'components/FetchData.vue';
-import { computed, onBeforeMount, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import VnInput from 'components/common/VnInput.vue';
-import axios from 'axios';
-import { useState } from 'composables/useState';
-
-const state = useState();
-const user = state.getUser();
-
-const { t } = useI18n();
-const route = useRoute();
-
-const formData = ref({});
-const queryParams = JSON.parse(decodeURI(route.query.q || ''));
-
-const companyList = ref([]);
-const warehouseList = ref([]);
-const dmsList = ref([]);
-const file = ref(null);
-const validContentType = ref('');
-
-onBeforeMount(async () => {
-    const [allowedContentTypes, dmsType] = await Promise.all([
-        axios.get('DmsContainers/allowedContentTypes').then((res) => res.data),
-        axios
-            .get('DmsTypes/findOne', {
-                filter: {
-                    where: { code: 'invoiceIn' },
-                },
-            })
-            .then((res) => res.data),
-    ]);
-    validContentType.value = (allowedContentTypes || []).join(', ');
-    formData.value = {
-        warehouseId: user.value.warehouseFk,
-        companyId: user.value.companyFk,
-        dmsTypeId: dmsType.id,
-        description: queryParams.supplierName,
-        hasFileAttached: false,
-        hasFile: false,
-    };
-});
-
-const requestConfig = computed(() => {
-    console.log(file.value);
-    console.log(file.value?.name);
-    let requestBody = {};
-    if (file.value?.length >= 1) {
-        requestBody = new FormData();
-        requestBody.append('file', file.value[0], file.value[0].name);
-    }
-    return {
-        headers: {
-            'Content-Type': 'multipart/form-data',
-        },
-        params: {
-            ...formData.value,
-        },
-        data: requestBody,
-    };
-});
-
-const onSave = (...params) => {
-    console.log('onSave', ...params);
-};
-</script>
-
-<template>
-    <VnSubToolbar />
-    <FetchData
-        url="Companies"
-        sort-by="code"
-        limit="30"
-        @on-fetch="(data) => (companyList = data)"
-        auto-load
-    />
-    <FetchData
-        url="Warehouses"
-        sort-by="name"
-        limit="30"
-        @on-fetch="(data) => (warehouseList = data)"
-        auto-load
-    />
-    <FetchData
-        url="DmsTypes"
-        sort-by="name"
-        limit="30"
-        @on-fetch="(data) => (dmsList = data)"
-        auto-load
-    />
-    <FormModel
-        url-create="dms/uploadFile"
-        model="dms"
-        :observe-form-changes="false"
-        :auto-load="false"
-        :form-initial-data="formData"
-        :request-config="requestConfig"
-        @on-data-saved="onSave"
-    >
-        <template #form>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="formData.reference"
-                        :label="t('Reference')"
-                        clearable
-                    />
-                </div>
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Company')"
-                        v-model="formData.companyId"
-                        :options="companyList"
-                        option-value="id"
-                        option-label="code"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Warehouse')"
-                        v-model="formData.warehouseId"
-                        :options="warehouseList"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </div>
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Type')"
-                        v-model="formData.dmsTypeId"
-                        :options="dmsList"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="formData.description"
-                        :label="t('Description')"
-                        clearable
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QFile
-                        v-model="file"
-                        :label="t('File')"
-                        clearable
-                        required
-                        :accept="validContentType"
-                        multiple
-                        :rules="[(value) => value || t('Enter a value')]"
-                        @update:model-value="
-                            (value) => {
-                                console.log(value);
-                                formData.hasFileAttached = Boolean(value);
-                            }
-                        "
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox
-                        v-model="formData.hasFile"
-                        :label="t('Generate identifier for original file')"
-                        multiple
-                    />
-                </div>
-            </VnRow>
-        </template>
-    </FormModel>
-</template>
-<i18n>
-es:
-    Reference: Referencia
-    Company: Empresa
-    Warehouse: Almacén
-    Type: Tipo
-    Description: Descripción
-    File: Fichero
-    Generate identifier for original file: Generar identificador para archivo original
-</i18n>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index abb6450d3..c1df3a4ed 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -46,14 +46,6 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteAutonomous.vue'),
                 },
-                {
-                    path: 'agency-term/createInvoiceIn',
-                    name: 'RouteAutonomousCreateInvoiceIn',
-                    meta: {
-                        title: 'autonomous',
-                    },
-                    component: () => import('src/pages/Route/RouteAutonomousCreateInvoiceIn.vue'),
-                },
                 {
                     path: 'roadmap',
                     name: 'RouteRoadmap',

From 2774c68f19944c0e66d75303c0255452151f45e6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 4 Mar 2024 09:06:29 -0300
Subject: [PATCH 084/128] Right filter panel WIP

---
 src/pages/Entry/EntryLatestBuys.vue       |   2 +-
 src/pages/Entry/EntryLatestBuysFilter.vue | 314 ++++++++++------------
 2 files changed, 138 insertions(+), 178 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 7c5e03285..65747d2e2 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -654,7 +654,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <EntryLatestBuysFilter data-key="OrderCatalogList" :tags="tags" />
+            <EntryLatestBuysFilter data-key="EntryLatestBuys" :tags="tags" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index e715b4d8d..55f75d0c5 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -1,36 +1,31 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 
-// import VnInput from 'components/common/VnInput.vue';
+import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-// import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 import axios from 'axios';
 
 const { t } = useI18n();
-const route = useRoute();
 const props = defineProps({
     dataKey: {
         type: String,
         required: true,
     },
-    tags: {
-        type: Array,
-        required: true,
-    },
 });
 
-const itemCategories = ref(null);
+const itemCategories = ref([]);
 const selectedCategoryFk = ref(null);
 const selectedTypeFk = ref(null);
 const itemTypesOptions = ref([]);
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagOptions = ref([]);
+const tagValues = ref([]);
 
 const categoryList = computed(() => {
     return (itemCategories.value || [])
@@ -41,16 +36,26 @@ const categoryList = computed(() => {
         }));
 });
 
+const selectedCategory = computed(() =>
+    (itemCategories.value || []).find(
+        (category) => category?.id === selectedCategoryFk.value
+    )
+);
+
+const selectedType = computed(() => {
+    return (itemTypesOptions.value || []).find(
+        (type) => type?.id === selectedTypeFk.value
+    );
+});
+
 const selectCategory = async (params, categoryId, search) => {
     if (params.categoryFk === categoryId) {
         resetCategory();
         params.categoryFk = null;
         return;
     }
-
     selectedCategoryFk.value = categoryId;
     params.categoryFk = categoryId;
-    console.log('params:: ', params);
     await fetchItemTypes(categoryId);
     search();
 };
@@ -60,6 +65,8 @@ const resetCategory = () => {
     itemTypesOptions.value = null;
 };
 
+const applyTags = () => {};
+
 const fetchItemTypes = async (id) => {
     try {
         const filter = {
@@ -77,120 +84,31 @@ const fetchItemTypes = async (id) => {
     }
 };
 
-// const selectedOrder = ref(null);
-// const orderList = [
-//     { way: 'ASC', name: 'Ascendant' },
-//     { way: 'DESC', name: 'Descendant' },
-// ];
-
-// const selectedOrderField = ref(null);
-// const OrderFields = [
-//     { field: 'relevancy DESC, name', name: 'Relevancy', priority: 999 },
-//     { field: 'showOrder, price', name: 'Color and price', priority: 999 },
-//     { field: 'name', name: 'Name', priority: 999 },
-//     { field: 'price', name: 'Price', priority: 999 },
-// ];
-
-// const clearFilter = (key) => {
-//     if (key === 'categoryFk') {
-//         resetCategory();
-//     }
-// };
-
-// const onFilterInit = async ({ params }) => {
-//     if (params.typeFk) {
-//         selectedTypeFk.value = params.typeFk;
-//     }
-//     if (params.categoryFk) {
-//         await loadTypes(params.categoryFk);
-//         selectedCategoryFk.value = params.categoryFk;
-//     }
-//     if (params.orderBy) {
-//         orderByParam.value = JSON.parse(params.orderBy);
-//         selectedOrder.value = orderByParam.value?.way;
-//         selectedOrderField.value = orderByParam.value?.field;
-//     }
-// };
-
-// const selectedCategory = computed(() =>
-//     (itemCategories.value || []).find(
-//         (category) => category?.id === selectedCategoryFk.value
-//     )
-// );
-
-// const selectedType = computed(() => {
-//     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
-// });
-
-// function exprBuilder(param, value) {
-//     switch (param) {
-//         case 'categoryFk':
-//         case 'typeFk':
-//             return { [param]: value };
-//         case 'search':
-//             return { 'i.name': { like: `%${value}%` } };
-//     }
-// }
-
-// const selectedTag = ref(null);
-// const tagValues = ref([{}]);
-// const tagOptions = ref(null);
-// const isButtonDisabled = computed(
-//     () => !selectedTag.value || tagValues.value.some((item) => !item.value)
-// );
-
-// const applyTagFilter = (params, search) => {
-//     if (!tagValues.value?.length) {
-//         params.tagGroups = null;
-//         search();
-//         return;
-//     }
-//     if (!params.tagGroups) {
-//         params.tagGroups = [];
-//     }
-//     params.tagGroups.push(
-//         JSON.stringify({
-//             values: tagValues.value,
-//             tagSelection: {
-//                 ...selectedTag.value,
-//                 orgShowField: selectedTag.value.name,
-//             },
-//             tagFk: selectedTag.value.tagFk,
-//         })
-//     );
-//     search();
-//     selectedTag.value = null;
-//     tagValues.value = [{}];
-// };
-
-// const removeTagChip = (selection, params, search) => {
-//     if (params.tagGroups) {
-//         params.tagGroups = (params.tagGroups || []).filter(
-//             (value) => value !== selection
-//         );
-//     }
-//     search();
-// };
-
-// const orderByParam = ref(null);
-
-// const onOrderFieldChange = (value, params, search) => {
-//     const orderBy = Object.assign({}, orderByParam.value, { field: value.field });
-//     params.orderBy = JSON.stringify(orderBy);
-//     search();
-// };
-
-// const onOrderChange = (value, params, search) => {
-//     const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
-//     params.orderBy = JSON.stringify(orderBy);
-//     search();
-// };
-
 const getCategoryClass = (category, params) => {
     if (category.id === params?.categoryFk) {
         return 'active';
     }
 };
+
+const getSelectedTagValues = async (tag) => {
+    try {
+        console.log('tag:: ', tag);
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+            limit: 30,
+        };
+
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+            params,
+        });
+        tag.valueOptions = data;
+        console.log('tag.valueOptions:: ', tag.valueOptions);
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
+};
 </script>
 
 <template>
@@ -214,6 +132,13 @@ const getCategoryClass = (category, params) => {
         :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
         @on-fetch="(data) => (suppliersOptions = data)"
     />
+    <FetchData
+        url="Tags"
+        :filter="{ fields: ['id', 'name', 'isFree'] }"
+        auto-load
+        limit="30"
+        @on-fetch="(data) => (tagOptions = data)"
+    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :expr-builder="exprBuilder"
@@ -221,47 +146,33 @@ const getCategoryClass = (category, params) => {
         @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
+            <strong v-if="tag.label === 'categoryFk'">
+                {{ t(selectedCategory?.name || '') }}
+            </strong>
+            <strong v-else-if="tag.label === 'typeFk'">
+                {{ t(selectedType?.name || '') }}
+            </strong>
+            <div v-else class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <!-- <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <template v-if="tag.label === 'tagGroups'">
-                    <VnFilterPanelChip
-                        v-for="chip in tag.value"
-                        :key="chip"
-                        removable
-                        @remove="removeTagChip(chip, params, searchFn)"
-                    >
-                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
-                        <span>{{
-                            (JSON.parse(chip).values || [])
-                                .map((item) => item.value)
-                                .join(' | ')
-                        }}</span>
-                    </VnFilterPanelChip>
-                </template>
-            </template>
-        </template> -->
         <template #body="{ params, searchFn }">
             <QItem class="category-filter q-mt-md">
-                <div
+                <QBtn
+                    dense
+                    flat
+                    round
                     v-for="category in categoryList"
                     :key="category.name"
                     :class="['category', getCategoryClass(category, params)]"
+                    :icon="category.icon"
+                    @click="selectCategory(params, category.id, searchFn)"
                 >
-                    <QIcon
-                        :name="category.icon"
-                        class="category-icon"
-                        @click="selectCategory(params, category.id, searchFn)"
-                    >
-                        <QTooltip>
-                            {{ t(category.name) }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
+                    <QTooltip>
+                        {{ t(category.name) }}
+                    </QTooltip>
+                </QBtn>
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
@@ -300,7 +211,7 @@ const getCategoryClass = (category, params) => {
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelectFilter
-                        :label="t('params.buyer')"
+                        :label="t('params.salesPersonFk')"
                         v-model="params.salesPersonFk"
                         :options="itemTypeWorkersOptions"
                         option-value="id"
@@ -346,6 +257,7 @@ const getCategoryClass = (category, params) => {
                         :label="t('params.from')"
                         v-model="params.from"
                         is-outlined
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -355,6 +267,7 @@ const getCategoryClass = (category, params) => {
                         :label="t('params.to')"
                         v-model="params.to"
                         is-outlined
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -364,6 +277,7 @@ const getCategoryClass = (category, params) => {
                         :label="t('params.active')"
                         v-model="params.active"
                         toggle-indeterminate
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection>
@@ -371,6 +285,7 @@ const getCategoryClass = (category, params) => {
                         :label="t('params.visible')"
                         v-model="params.visible"
                         toggle-indeterminate
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -380,9 +295,69 @@ const getCategoryClass = (category, params) => {
                         :label="t('params.floramondo')"
                         v-model="params.floramondo"
                         toggle-indeterminate
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
+
+            <QItem
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="q-mt-md filter-value bg-red"
+            >
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        :label="t('params.tag')"
+                        v-model="value.selectedTag"
+                        :options="tagOptions"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        @update:model-value="getSelectedTagValues(value)"
+                    />
+                </QItemSection>
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        v-if="!value?.isFree && value.valueOptions"
+                        :label="t('params.value')"
+                        v-model="value.value"
+                        :options="value.valueOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!value"
+                        class="filter-input"
+                        @update:model-value="applyTags()"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="value.value"
+                        :label="t('params.value')"
+                        :disable="!value"
+                        is-outlined
+                        class="filter-input"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="filter-icon"
+                    @click="(tagValues || []).splice(index, 1)"
+                />
+            </QItem>
+            <QItem class="q-mt-lg">
+                <QIcon
+                    name="add_circle"
+                    class="filter-icon"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -395,25 +370,16 @@ const getCategoryClass = (category, params) => {
     gap: 12px;
 
     .category {
-        flex: 1;
-        flex-shrink: 0;
-        display: flex;
-        justify-content: center;
+        padding: 8px;
+        width: 60px;
+        height: 60px;
+        font-size: 1.4rem;
+        background-color: var(--vn-light-gray);
 
         &.active {
-            .category-icon {
-                background-color: $primary;
-            }
+            background-color: $primary;
         }
     }
-
-    .category-icon {
-        border-radius: 50%;
-        background-color: var(--vn-light-gray);
-        font-size: 2.6rem;
-        padding: 8px;
-        cursor: pointer;
-    }
 }
 
 .filter-icon {
@@ -437,11 +403,6 @@ const getCategoryClass = (category, params) => {
 <i18n>
 en:
     params:
-        orderBy: Order By
-        tag: Tag
-        value: Value
-        order: Order
-
         supplier: Supplier
         from: From
         to: To
@@ -451,13 +412,10 @@ en:
         salesPersonFk: Buyer
         categoryFk: Category
         typeFk: Type
+        tag: Tag
+        value: Value
 es:
     params:
-        orderBy: Ordenar por
-        tag: Etiqueta
-        value: Valor
-        order: Orden
-
         supplier: Proveedor
         from: Desde
         to: Hasta
@@ -467,6 +425,8 @@ es:
         salesPersonFk: Comprador
         categoryFk: Categoría
         typeFk: Tipo
+        tag: Etiqueta
+        value: Valor
 
     Plant: Planta
     Flower: Flor

From ff94d7e43d61a34f81fba0a67fd356d43f89ce8b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 4 Mar 2024 09:47:47 -0300
Subject: [PATCH 085/128] supplier account changes

---
 src/components/CreateBankEntityForm.vue      |  6 +++---
 src/components/FormModelPopup.vue            |  6 +++---
 src/pages/Supplier/Card/SupplierAccounts.vue | 13 ++++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 106dbec3a..0ad35490e 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -32,8 +32,8 @@ const countriesFilter = {
 
 const countriesOptions = ref([]);
 
-const onDataSaved = (data) => {
-    emit('onDataSaved', data);
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
 };
 </script>
 
@@ -50,7 +50,7 @@ const onDataSaved = (data) => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 04322a3c8..cc22c77db 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -42,8 +42,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
     closeForm();
 };
 
@@ -59,7 +59,7 @@ const closeForm = () => {
         :default-actions="false"
         :url-create="urlCreate"
         :model="model"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 39bcca63c..41df6adb9 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -18,13 +18,16 @@ const quasar = useQuasar();
 const { notify } = useNotify();
 const route = useRoute();
 const { t } = useI18n();
+
+const bankEntitiesRef = ref(null);
 const supplier = ref(null);
 const supplierAccountRef = ref(null);
 const wireTransferFk = ref(null);
 const bankEntitiesOptions = ref([]);
 
-const onBankEntityCreated = (data) => {
-    bankEntitiesOptions.value.push(data);
+const onBankEntityCreated = async (dataSaved, rowData) => {
+    await bankEntitiesRef.value.fetch();
+    rowData.bankEntityFk = dataSaved.id;
 };
 
 const onChangesSaved = () => {
@@ -63,6 +66,7 @@ onMounted(() => {
 </script>
 <template>
     <FetchData
+        ref="bankEntitiesRef"
         url="BankEntities"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
@@ -120,7 +124,10 @@ onMounted(() => {
                         >
                             <template #form>
                                 <CreateBankEntityForm
-                                    @on-data-saved="onBankEntityCreated($event)"
+                                    @on-data-saved="
+                                        (_, requestResponse) =>
+                                            onBankEntityCreated(requestResponse, row)
+                                    "
                                     :show-entity-field="false"
                                 />
                             </template>

From 9f1abf5cdec933b5f5029be0f82a3a41b15c4af9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 4 Mar 2024 10:12:55 -0300
Subject: [PATCH 086/128] Use next tick

---
 src/pages/Supplier/Card/SupplierContacts.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 571b57f00..3abe5a9cc 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -13,11 +13,11 @@ const supplierContactRef = ref(null);
 
 const insertRow = () => {
     supplierContactRef.value.insert();
-    setTimeout(() => {
+    nextTick(() => {
         const inputs = document.querySelectorAll('[input-name-focusable]');
         const lastInput = inputs[inputs.length - 1];
         if (lastInput) lastInput.focus();
-    }, 5);
+    });
 };
 
 onMounted(() => {

From 6eee05249d3e9c7cd168d085ea0393fa122a8885 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 4 Mar 2024 22:08:44 -0300
Subject: [PATCH 087/128] Entry latest buys side filter panel

---
 src/pages/Entry/EntryLatestBuys.vue       |  9 +---
 src/pages/Entry/EntryLatestBuysFilter.vue | 61 ++++++++++++++++++-----
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 65747d2e2..8672f9445 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -587,13 +587,8 @@ const redirectToEntryBuys = (entryFk) => {
 
 const applyColumnFilter = async (col) => {
     try {
-        if (!col.columnFilter.filterValue) {
-            delete params[col.field];
-        } else {
-            params[col.field] = col.columnFilter.filterValue;
-        }
-
-        await arrayData.applyFilter({ params });
+        params[col.field] = col.columnFilter.filterValue;
+        await arrayData.addFilter({ params });
     } catch (err) {
         console.error('Error applying column filter', err);
     }
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index 55f75d0c5..23361ffb3 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -7,6 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 import axios from 'axios';
 
@@ -50,8 +51,8 @@ const selectedType = computed(() => {
 
 const selectCategory = async (params, categoryId, search) => {
     if (params.categoryFk === categoryId) {
-        resetCategory();
-        params.categoryFk = null;
+        resetCategory(params);
+        search();
         return;
     }
     selectedCategoryFk.value = categoryId;
@@ -60,12 +61,25 @@ const selectCategory = async (params, categoryId, search) => {
     search();
 };
 
-const resetCategory = () => {
+const resetCategory = (params) => {
     selectedCategoryFk.value = null;
     itemTypesOptions.value = null;
+    if (params) {
+        params.categoryFk = null;
+        params.typeFk = null;
+    }
 };
 
-const applyTags = () => {};
+const applyTags = (params, search) => {
+    params.tags = tagValues.value
+        .filter((tag) => tag.selectedTag && tag.value)
+        .map((tag) => ({
+            tagFk: tag.selectedTag.id,
+            tagName: tag.selectedTag.name,
+            value: tag.value,
+        }));
+    search();
+};
 
 const fetchItemTypes = async (id) => {
     try {
@@ -92,7 +106,7 @@ const getCategoryClass = (category, params) => {
 
 const getSelectedTagValues = async (tag) => {
     try {
-        console.log('tag:: ', tag);
+        tag.value = null;
         const filter = {
             fields: ['value'],
             order: 'value ASC',
@@ -104,11 +118,15 @@ const getSelectedTagValues = async (tag) => {
             params,
         });
         tag.valueOptions = data;
-        console.log('tag.valueOptions:: ', tag.valueOptions);
     } catch (err) {
         console.error('Error getting selected tag values');
     }
 };
+
+const removeTag = (index, params, search) => {
+    (tagValues.value || []).splice(index, 1);
+    applyTags(params, search);
+};
 </script>
 
 <template>
@@ -142,6 +160,7 @@ const getSelectedTagValues = async (tag) => {
     <VnFilterPanel
         :data-key="props.dataKey"
         :expr-builder="exprBuilder"
+        :custom-tags="['tags']"
         @init="onFilterInit"
         @remove="clearFilter"
     >
@@ -157,6 +176,21 @@ const getSelectedTagValues = async (tag) => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
+        <template #customTags="{ tags: customTags, params }">
+            <template v-for="tag in customTags" :key="tag.label">
+                <VnFilterPanelChip
+                    v-for="chip in tag.value"
+                    :key="chip"
+                    removable
+                    @remove="removeTagChip(chip, params, searchFn)"
+                >
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ chip.tagName }}: </strong>
+                        <span>"{{ chip.value }}"</span>
+                    </div>
+                </VnFilterPanelChip>
+            </template>
+        </template>
         <template #body="{ params, searchFn }">
             <QItem class="category-filter q-mt-md">
                 <QBtn
@@ -303,7 +337,7 @@ const getSelectedTagValues = async (tag) => {
             <QItem
                 v-for="(value, index) in tagValues"
                 :key="value"
-                class="q-mt-md filter-value bg-red"
+                class="q-mt-md filter-value"
             >
                 <QItemSection class="col">
                     <VnSelectFilter
@@ -316,12 +350,13 @@ const getSelectedTagValues = async (tag) => {
                         rounded
                         :emit-value="false"
                         use-input
+                        :is-clearable="false"
                         @update:model-value="getSelectedTagValues(value)"
                     />
                 </QItemSection>
                 <QItemSection class="col">
                     <VnSelectFilter
-                        v-if="!value?.isFree && value.valueOptions"
+                        v-if="!value?.selectedTag?.isFree && value.valueOptions"
                         :label="t('params.value')"
                         v-model="value.value"
                         :options="value.valueOptions || []"
@@ -333,8 +368,9 @@ const getSelectedTagValues = async (tag) => {
                         emit-value
                         use-input
                         :disable="!value"
+                        :is-clearable="false"
                         class="filter-input"
-                        @update:model-value="applyTags()"
+                        @update:model-value="applyTags(params, searchFn)"
                     />
                     <VnInput
                         v-else
@@ -343,12 +379,14 @@ const getSelectedTagValues = async (tag) => {
                         :disable="!value"
                         is-outlined
                         class="filter-input"
+                        :is-clearable="false"
+                        @keyup.enter="applyTags(params, searchFn)"
                     />
                 </QItemSection>
                 <QIcon
                     name="delete"
                     class="filter-icon"
-                    @click="(tagValues || []).splice(index, 1)"
+                    @click="removeTag(index, params, searchFn)"
                 />
             </QItem>
             <QItem class="q-mt-lg">
@@ -427,13 +465,10 @@ es:
         typeFk: Tipo
         tag: Etiqueta
         value: Valor
-
     Plant: Planta
     Flower: Flor
     Handmade: Confección
     Green: Verde
     Accessories: Complemento
     Fruit: Fruta
-
-
 </i18n>

From 4b860e05837c623f98f6725bfec90ab3993d6938 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 08:54:15 -0300
Subject: [PATCH 088/128] Change issued title

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

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 7bdf2ffbd..ad54d9908 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -158,7 +158,7 @@ const openPdf = () => {
                         >
                             <template #list-items>
                                 <VnLv
-                                    :label="t('invoiceOut.list.amount')"
+                                    :label="t('invoiceOut.list.issued')"
                                     :value="toDate(row.issued)"
                                 />
                                 <VnLv

From b010f8ec3ef6de9169fdca22e9cb79c347f19ed2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 09:17:09 -0300
Subject: [PATCH 089/128] Add links to invoice out summary table

---
 .../InvoiceOut/Card/InvoiceOutSummary.vue     | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5a56a3957..d74969319 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -7,6 +7,8 @@ import { toCurrency, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 onMounted(async () => {
     fetch();
@@ -67,29 +69,33 @@ const taxColumns = ref([
 const ticketsColumns = ref([
     {
         name: 'item',
-        label: 'invoiceOut.summary.ticketId',
+        label: t('invoiceOut.summary.ticketId'),
         field: (row) => row.id,
         sortable: true,
+        align: 'left',
     },
     {
         name: 'quantity',
-        label: 'invoiceOut.summary.nickname',
+        label: t('invoiceOut.summary.nickname'),
         field: (row) => row.nickname,
         sortable: true,
+        align: 'left',
     },
     {
         name: 'landed',
-        label: 'invoiceOut.summary.shipped',
+        label: t('invoiceOut.summary.shipped'),
         field: (row) => row.shipped,
         format: (value) => toDate(value),
         sortable: true,
+        align: 'left',
     },
     {
         name: 'landed',
-        label: 'invoiceOut.summary.totalWithVat',
+        label: t('invoiceOut.summary.totalWithVat'),
         field: (row) => row.totalWithVat,
         format: (value) => toCurrency(value),
         sortable: true,
+        align: 'left',
     },
 ]);
 </script>
@@ -144,12 +150,21 @@ const ticketsColumns = ref([
                     {{ t('invoiceOut.summary.tickets') }}
                 </div>
                 <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
+                    <template #body-cell-item="{ value }">
+                        <QTd>
+                            <QBtn flat color="primary">
+                                {{ value }}
+                                <TicketDescriptorProxy :id="value" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-quantity="{ value, row }">
+                        <QTd>
+                            <QBtn flat color="primary" dense>
+                                {{ value }}
+                                <CustomerDescriptorProxy :id="row.id" />
+                            </QBtn>
+                        </QTd>
                     </template>
                 </QTable>
             </QCard>

From 6969daf90fbc9905417f492b49a997b991b9f555 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 09:18:10 -0300
Subject: [PATCH 090/128] Revert "Add links to invoice out summary table"

This reverts commit b010f8ec3ef6de9169fdca22e9cb79c347f19ed2.
---
 .../InvoiceOut/Card/InvoiceOutSummary.vue     | 35 ++++++-------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index d74969319..5a56a3957 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -7,8 +7,6 @@ import { toCurrency, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 onMounted(async () => {
     fetch();
@@ -69,33 +67,29 @@ const taxColumns = ref([
 const ticketsColumns = ref([
     {
         name: 'item',
-        label: t('invoiceOut.summary.ticketId'),
+        label: 'invoiceOut.summary.ticketId',
         field: (row) => row.id,
         sortable: true,
-        align: 'left',
     },
     {
         name: 'quantity',
-        label: t('invoiceOut.summary.nickname'),
+        label: 'invoiceOut.summary.nickname',
         field: (row) => row.nickname,
         sortable: true,
-        align: 'left',
     },
     {
         name: 'landed',
-        label: t('invoiceOut.summary.shipped'),
+        label: 'invoiceOut.summary.shipped',
         field: (row) => row.shipped,
         format: (value) => toDate(value),
         sortable: true,
-        align: 'left',
     },
     {
         name: 'landed',
-        label: t('invoiceOut.summary.totalWithVat'),
+        label: 'invoiceOut.summary.totalWithVat',
         field: (row) => row.totalWithVat,
         format: (value) => toCurrency(value),
         sortable: true,
-        align: 'left',
     },
 ]);
 </script>
@@ -150,21 +144,12 @@ const ticketsColumns = ref([
                     {{ t('invoiceOut.summary.tickets') }}
                 </div>
                 <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
-                    <template #body-cell-item="{ value }">
-                        <QTd>
-                            <QBtn flat color="primary">
-                                {{ value }}
-                                <TicketDescriptorProxy :id="value" />
-                            </QBtn>
-                        </QTd>
-                    </template>
-                    <template #body-cell-quantity="{ value, row }">
-                        <QTd>
-                            <QBtn flat color="primary" dense>
-                                {{ value }}
-                                <CustomerDescriptorProxy :id="row.id" />
-                            </QBtn>
-                        </QTd>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
                     </template>
                 </QTable>
             </QCard>

From 12a470b7d919e3dda0f8955a46fea6ea3a06d88b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 09:27:44 -0300
Subject: [PATCH 091/128] Add links to invoice out summary tickets table

---
 .../InvoiceOut/Card/InvoiceOutSummary.vue     | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5721818e4..d74969319 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -2,16 +2,14 @@
 import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import axios from 'axios';
+import { toCurrency, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import { getUrl } from 'src/composables/getUrl';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 
-import { getUrl } from 'src/composables/getUrl';
-import { toCurrency, toDate } from 'src/filters';
-import axios from 'axios';
-
 onMounted(async () => {
     fetch();
     salixUrl.value = await getUrl('');
@@ -70,14 +68,14 @@ const taxColumns = ref([
 
 const ticketsColumns = ref([
     {
-        name: 'id',
+        name: 'item',
         label: t('invoiceOut.summary.ticketId'),
         field: (row) => row.id,
         sortable: true,
         align: 'left',
     },
     {
-        name: 'alias',
+        name: 'quantity',
         label: t('invoiceOut.summary.nickname'),
         field: (row) => row.nickname,
         sortable: true,
@@ -147,21 +145,25 @@ const ticketsColumns = ref([
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-max">
+            <QCard class="vn-three">
                 <div class="header">
                     {{ t('invoiceOut.summary.tickets') }}
                 </div>
                 <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
-                    <template #body-cell-id="{ row }">
+                    <template #body-cell-item="{ value }">
                         <QTd>
-                            <QBtn flat color="primary"> {{ row.id }}</QBtn>
-                            <TicketDescriptorProxy :id="row.id" />
+                            <QBtn flat color="primary">
+                                {{ value }}
+                                <TicketDescriptorProxy :id="value" />
+                            </QBtn>
                         </QTd>
                     </template>
-                    <template #body-cell-alias="{ row }">
+                    <template #body-cell-quantity="{ value, row }">
                         <QTd>
-                            <QBtn flat dense color="primary"> {{ row.nickname }}</QBtn>
-                            <CustomerDescriptorProxy :id="row.clientFk" />
+                            <QBtn flat color="primary" dense>
+                                {{ value }}
+                                <CustomerDescriptorProxy :id="row.id" />
+                            </QBtn>
                         </QTd>
                     </template>
                 </QTable>

From 87ab080b38e5d2c32bde79684a38e16aaa93dd7b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 09:53:46 -0300
Subject: [PATCH 092/128] Change negative bases download button icon and
 tooltip

---
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 5e82adf2a..e1740257a 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -140,7 +140,9 @@ const downloadCSV = async () => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
-            <QBtn color="primary" icon-right="archive" no-caps @click="downloadCSV()" />
+            <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
+                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
+            </QBtn>
         </Teleport>
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
@@ -187,4 +189,7 @@ const downloadCSV = async () => {
 }
 </style>
 
-<i18n></i18n>
+<i18n>
+es:
+    Download as CSV: Descargar como CSV
+</i18n>

From 052123ad0e6259d6e08b53bbc82352a1eae78e1b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 09:58:54 -0300
Subject: [PATCH 093/128] Change currentSupplier variable name

---
 src/pages/Supplier/Card/SupplierDescriptor.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 3228151cb..fc806f588 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -73,7 +73,7 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
 
-const currentSupplier = computed(() => state.get('supplier'));
+const supplier = computed(() => state.get('supplier'));
 
 const getEntryQueryParams = (supplier) => {
     if (!supplier) return null;
@@ -138,9 +138,9 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
         <template #icons>
-            <QCardActions v-if="currentSupplier" class="q-gutter-x-md">
+            <QCardActions v-if="supplier" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!currentSupplier.isActive"
+                    v-if="!supplier.isActive"
                     name="vn:disabled"
                     color="primary"
                     size="xs"
@@ -148,7 +148,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!currentSupplier.isSerious"
+                    v-if="!supplier.isSerious"
                     name="vn:supplierfalse"
                     color="primary"
                     size="xs"

From 5ddae1fe65bd774b312af1b926e6fcdd7c538b62 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 5 Mar 2024 10:56:18 -0300
Subject: [PATCH 094/128] Fix route basic data

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

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 8d32f6773..60693cbf1 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -117,7 +117,7 @@ const onSave = (data, response) => {
         :filter="routeFilter"
         model="route"
         :auto-load="!isNew"
-        :form-initial-data="defaultInitialData"
+        :form-initial-data="isNew ? defaultInitialData : null"
         @on-data-saved="onSave"
     >
         <template #form="{ data }">

From 912d54ea557d4c08ee582336bc413f6a26c61784 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 11:03:07 -0300
Subject: [PATCH 095/128] new bank entity add focus to bic input on mounted

---
 src/components/CreateBankEntityForm.vue | 11 ++++++++---
 src/components/common/VnInput.vue       | 12 ++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 0ad35490e..2d098beb0 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -16,9 +16,8 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['onDataSaved']);
-
 const { t } = useI18n();
-
+const bicInputRef = ref(null);
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
@@ -35,6 +34,11 @@ const countriesOptions = ref([]);
 const onDataSaved = (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
 };
+
+onMounted(async () => {
+    await nextTick();
+    bicInputRef.value.focus();
+});
 </script>
 
 <template>
@@ -64,6 +68,7 @@ const onDataSaved = (formData, requestResponse) => {
                 </div>
                 <div class="col">
                     <VnInput
+                        ref="bicInputRef"
                         :label="t('swift')"
                         v-model="data.bic"
                         :required="true"
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 8a01e0bee..ec836f2cd 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'keyup.enter']);
@@ -17,7 +17,7 @@ const $props = defineProps({
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
-
+const vnInputRef = ref(null);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -40,6 +40,14 @@ const styleAttrs = computed(() => {
 const onEnterPress = () => {
     emit('keyup.enter');
 };
+
+const focus = () => {
+    vnInputRef.value.focus();
+};
+
+defineExpose({
+    focus,
+});
 </script>
 
 <template>

From 859c87940d92761381b53b53cb69b2f4cdea2815 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 6 Mar 2024 08:15:50 -0300
Subject: [PATCH 096/128] Several changes

---
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     | 11 ++++++-
 src/pages/InvoiceOut/InvoiceOutList.vue       |  2 +-
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 30 +++++++++++++++++--
 src/router/modules/invoiceOut.js              |  2 +-
 src/stores/invoiceOutGlobal.js                |  8 ++---
 5 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 7e2b43a76..6f7e4c7fd 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -21,6 +21,7 @@ const {
     nPdfs,
     totalPdfs,
     errors,
+    addresses,
 } = storeToRefs(invoiceOutGlobalStore);
 
 const selectedCustomerId = ref(null);
@@ -86,6 +87,14 @@ const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
 };
 
+const statusText = computed(() => {
+    return status.value === 'invoicing'
+        ? `${t(`status.${status.value}`)} ${
+              addresses.value[getAddressNumber.value]?.clientId
+          }`
+        : t(`status.${status.value}`);
+});
+
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => {
     stateStore.rightDrawer = false;
@@ -103,7 +112,7 @@ onUnmounted(() => {
     <QPage class="column items-center q-pa-md">
         <QCard v-if="status" class="card">
             <QCardSection class="card-section">
-                <span class="text">{{ t(`status.${status}`) }}</span>
+                <span class="text">{{ statusText }}</span>
                 <span class="text">{{
                     t('invoiceOut.globalInvoices.statusCard.percentageText', {
                         getPercentage: getPercentage,
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index ad54d9908..ca68f0770 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -119,7 +119,7 @@ const openPdf = () => {
         <VnPaginate
             auto-load
             data-key="InvoiceOutList"
-            order="issued DESC, id DESC"
+            :order="['issued DESC', 'id DESC']"
             url="InvoiceOuts/filter"
         >
             <template #body="{ rows }">
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index e1740257a..fb3596499 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onBeforeMount } from 'vue';
+import { ref, computed, onBeforeMount, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -45,6 +45,14 @@ onBeforeMount(async () => {
     stateStore.rightDrawer = true;
 });
 
+const componentIsRendered = ref(false);
+
+onMounted(() =>
+    nextTick(() => {
+        componentIsRendered.value = true;
+    })
+);
+
 const rows = computed(() => arrayData.value.store.data);
 
 const columns = computed(() => [
@@ -139,7 +147,10 @@ const downloadCSV = async () => {
 
 <template>
     <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+        <Teleport
+            to="#st-actions"
+            v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
+        >
             <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
                 <QTooltip>{{ t('Download as CSV') }}</QTooltip>
             </QBtn>
@@ -178,6 +189,21 @@ const downloadCSV = async () => {
                     <WorkerDescriptorProxy :id="row.comercialId" />
                 </QTd>
             </template>
+            <template #body-cell-active="{ row }">
+                <QTd>
+                    <QCheckbox :model-value="!!row.isActive" disable />
+                </QTd>
+            </template>
+            <template #body-cell-hasToInvoice="{ row }">
+                <QTd>
+                    <QCheckbox :model-value="!!row.hasToInvoice" disable />
+                </QTd>
+            </template>
+            <template #body-cell-verifiedData="{ row }">
+                <QTd>
+                    <QCheckbox :model-value="!!row.isTaxDataChecked" disable />
+                </QTd>
+            </template>
         </QTable>
     </QPage>
 </template>
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 084cf6ac3..b9648e96a 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -43,7 +43,7 @@ export default {
                     name: 'InvoiceOutNegativeBases',
                     meta: {
                         title: 'negativeBases',
-                        icon: 'view_list',
+                        icon: 'vn:ticket',
                     },
                     component: () =>
                         import('src/pages/InvoiceOut/InvoiceOutNegativeBases.vue'),
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 9929a0127..b1bcc0e7d 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -107,7 +107,6 @@ export const useInvoiceOutGlobalStore = defineStore({
                 if (clientsToInvoice == 'all') params.clientId = undefined;
 
                 const { data } = await axios.post('InvoiceOuts/clientsToInvoice', params);
-
                 this.addresses = data;
 
                 if (!this.addresses || !this.addresses.length > 0) {
@@ -188,10 +187,8 @@ export const useInvoiceOutGlobalStore = defineStore({
 
                 const { data } = await axios.post('InvoiceOuts/invoiceClient', params);
 
-                if (data) {
-                    await this.makePdfAndNotify(data, address);
-                }
-
+                if (data) await this.makePdfAndNotify(data, address);
+                this.addressIndex++;
                 this.isInvoicing = false;
             } catch (err) {
                 if (
@@ -201,7 +198,6 @@ export const useInvoiceOutGlobalStore = defineStore({
                     err.response.status < 500
                 ) {
                     this.invoiceClientError(address, err.response?.data?.error?.message);
-                    this.addressIndex++;
                     return;
                 } else {
                     this.invoicing = false;

From 800b626c99b87bc8b67cc4d7ec461f1802bd4bb8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 6 Mar 2024 08:21:26 -0300
Subject: [PATCH 097/128] fire searchbar search on icon click

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

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 99710408d..d8155c21a 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -81,8 +81,9 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.entries(store.userParams)
-        .filter(([key, value]) => value && (props.staticParams || []).includes(key));
+    const staticParams = Object.entries(store.userParams).filter(
+        ([key, value]) => value && (props.staticParams || []).includes(key)
+    );
     await arrayData.applyFilter({
         params: {
             ...Object.fromEntries(staticParams),
@@ -117,7 +118,12 @@ async function search() {
             autofocus
         >
             <template #prepend>
-                <QIcon name="search" v-if="!quasar.platform.is.mobile" />
+                <QIcon
+                    v-if="!quasar.platform.is.mobile"
+                    class="cursor-pointer"
+                    name="search"
+                    @click="search"
+                />
             </template>
             <template #append>
                 <QIcon

From fe8e4a834274ab1b85ba105c65605dddfdf3a8e8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 6 Mar 2024 09:52:43 -0300
Subject: [PATCH 098/128] add VnSelectDialog refill to action icon

---
 src/components/common/VnSelectDialog.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 355a25109..bca014a19 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -59,6 +59,9 @@ const toggleForm = () => {
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
+                :style="{
+                    'font-variation-settings': `'FILL' ${1}`,
+                }"
             >
                 <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
             </QIcon>

From 44d7f98cdcc9b15eb530776f99d8e78556feb800 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 6 Mar 2024 18:22:15 -0300
Subject: [PATCH 099/128] Add item descriptor

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

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 3c7b72823..217a25870 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -11,6 +11,7 @@ import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
@@ -701,6 +702,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     <QBtn flat color="primary">
                         {{ row.itemFk }}
                     </QBtn>
+                    <ItemDescriptorProxy :id="row.itemFk" />
                 </QTd>
             </template>
             <template #body-cell-tags="{ row }">

From 2449488927837d247432614b79bd948b1e358732 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 6 Mar 2024 19:00:50 -0300
Subject: [PATCH 100/128] Changes

---
 src/components/EditTableCellValueForm.vue | 45 ++++++++++++-----------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/components/EditTableCellValueForm.vue b/src/components/EditTableCellValueForm.vue
index 6d3b7b08b..9e48889a0 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@@ -71,13 +71,9 @@ const closeForm = () => {
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">
-                {{
-                    t('editBuyTitle', {
-                        buysAmount: rows.length,
-                    })
-                }}
-            </h1>
+            <span class="title">{{ t('Edit') }}</span>
+            <span class="countLines">{{ ` ${rows.length} ` }}</span>
+            <span class="title">{{ t('buy(s)') }}</span>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
@@ -94,23 +90,23 @@ const closeForm = () => {
                 </div>
             </VnRow>
             <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
                 <QBtn
                     :label="t('globals.cancel')"
                     type="reset"
                     color="primary"
                     flat
-                    class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     v-close-popup
                 />
+                <QBtn
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
             </div>
         </QCard>
     </QForm>
@@ -129,13 +125,18 @@ const closeForm = () => {
     right: 20px;
     cursor: pointer;
 }
+
+.countLines {
+    font-size: 24px;
+    color: $primary;
+    font-weight: bold;
+}
 </style>
 
 <i18n>
-    en:
-        editBuyTitle: Edit {buysAmount} buy(s)
-    es:
-        editBuyTitle: Editar {buysAmount} compra(s)
-        Field to edit: Campo a editar
-        Value: Valor
-    </i18n>
+es:
+    Edit: Editar
+    buy(s): compra(s)
+    Field to edit: Campo a editar
+    Value: Valor
+</i18n>

From 7974725da08921181b1267827c8f16b4457d78b5 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 6 Mar 2024 23:15:26 -0300
Subject: [PATCH 101/128] Fix with feedback

---
 src/pages/Route/Roadmap/RoadmapStops.vue | 3 ++-
 src/pages/Route/RouteTickets.vue         | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 6dc21563f..9dbf44af4 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -75,6 +75,7 @@ onMounted(() => {
                                 map-options
                                 use-input
                                 hide-selected
+                                autofocus
                                 :input-debounce="0"
                             />
                         </div>
@@ -82,7 +83,7 @@ onMounted(() => {
                             <VnInputDate v-model="row.eta" :label="t('ETA date')" />
                         </div>
                         <div class="col">
-                            <VnInputTime v-model="row.eta" :label="t('ETA date')" />
+                            <VnInputTime v-model="row.eta" :label="t('ETA hour')" />
                         </div>
                         <div class="col">
                             <VnInput
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 7e4c0a530..6a1c7a2a0 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -266,7 +266,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="filter_alt"
                     color="primary"
-                    class="q-mr-sm"
+                    class="q-mr-sm filled-icon"
                     :disable="!selectedRows?.length"
                     @click="deletePriorities"
                 >
@@ -287,7 +287,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="sms"
                     color="primary"
-                    class="q-mr-sm"
+                    class="q-mr-sm filled-icon"
                     :disable="!selectedRows?.length"
                     @click="openSmsDialog"
                 >
@@ -417,6 +417,10 @@ const openSmsDialog = async () => {
 .table-actions {
     gap: 12px;
 }
+
+.filled-icon {
+    font-variation-settings: 'FILL' 1;
+}
 </style>
 <i18n>
 es:

From e8e2bc8403dd438a4baca637943369c0c8eb47bb Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 6 Mar 2024 23:25:41 -0300
Subject: [PATCH 102/128] Fix route list worker field

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

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 2d149040d..6b1b0d45f 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -285,7 +285,7 @@ const openTicketsDialog = (id) => {
                                         v-model="row.workerFk"
                                         :options="workers"
                                         option-value="id"
-                                        option-label="name"
+                                        option-label="nickname"
                                         hide-selected
                                         dense
                                         :emit-value="false"

From 1ab9bfefeda7a0e50a8daa961c955a4a4090eade Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 7 Mar 2024 20:36:56 -0300
Subject: [PATCH 103/128] Centralize roadmap add stop form

---
 .../Route/Roadmap/RoadmapAddStopDialog.vue    |  49 +--------
 .../Route/Roadmap/RoadmapAddStopForm.vue      | 104 ++++++++++++++++++
 src/pages/Route/Roadmap/RoadmapStops.vue      |  55 ++-------
 3 files changed, 117 insertions(+), 91 deletions(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapAddStopForm.vue

diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
index 659158714..810ef42c8 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
@@ -4,10 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { reactive, ref } from 'vue';
 import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
+import RoadmapAddStopForm from 'pages/Route/Roadmap/RoadmapAddStopForm.vue';
 
 const emit = defineEmits([...useDialogPluginComponent.emits]);
 const { dialogRef, onDialogHide } = useDialogPluginComponent();
@@ -21,7 +18,6 @@ const props = defineProps({
 });
 
 const isLoading = ref(false);
-const warehouseList = ref([]);
 const roadmapStopForm = reactive({
     roadmapFk: Number(props.roadmapFk) || 0,
     warehouseFk: null,
@@ -53,50 +49,17 @@ const onSave = async () => {
         :filter="{ fields: ['etd'] }"
         @on-fetch="updateDefaultStop"
     />
-    <FetchData
-        url="Warehouses"
-        auto-load
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name"
-        limit="30"
-        @on-fetch="(data) => (warehouseList = data)"
-    />
     <QDialog ref="dialogRef" @hide="onDialogHide">
         <QCard class="q-pa-lg">
             <QCardSection class="row absolute absolute-top z-fullscreen">
                 <QSpace />
                 <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="card-section q-px-none">
-                <VnSelectFilter
-                    v-model.number="roadmapStopForm.warehouseFk"
-                    :label="t('Warehouse')"
-                    :options="warehouseList"
-                    option-value="id"
-                    option-label="name"
-                    emit-value
-                    map-options
-                    use-input
-                    hide-selected
-                    :input-debounce="0"
-                />
-            </QCardSection>
-            <QCardSection class="card-section row q-px-none">
-                <div class="col">
-                    <VnInputDate v-model="roadmapStopForm.eta" :label="t('ETA date')" />
-                </div>
-                <div class="col">
-                    <VnInputTime v-model="roadmapStopForm.eta" :label="t('ETA time')" />
-                </div>
-            </QCardSection>
-            <QCardSection class="card-section q-px-none">
-                <VnInput
-                    v-model="roadmapStopForm.description"
-                    :label="t('Description')"
-                    type="textarea"
-                    :rows="1"
-                />
-            </QCardSection>
+            <RoadmapAddStopForm
+                :roadmap-fk="roadmapFk"
+                :form-data="roadmapStopForm"
+                layout="dialog"
+            />
             <QCardActions align="right">
                 <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
                 <QBtn
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
new file mode 100644
index 000000000..6793e4513
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
@@ -0,0 +1,104 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+import VnInput from 'components/common/VnInput.vue';
+
+const props = defineProps({
+    formData: {
+        type: Object,
+        default: () => ({}),
+    },
+    roadmapFk: {
+        type: [Number, String],
+        required: true,
+    },
+    layout: {
+        type: String,
+        default: 'row',
+    },
+});
+
+const { t } = useI18n();
+const warehouseList = ref([]);
+const form = computed(() => props.formData);
+const isDialog = computed(() => props.layout === 'dialog');
+</script>
+<template>
+    <FetchData
+        url="Warehouses"
+        auto-load
+        :filter="{ fields: ['id', 'name'] }"
+        sort-by="name"
+        limit="30"
+        @on-fetch="(data) => (warehouseList = data)"
+    />
+    <div :class="[isDialog ? 'column' : 'form-gap', 'full-width flex']">
+        <QCardSection class="flex-grow q-px-none flex-1">
+            <VnSelectFilter
+                v-model.number="form.warehouseFk"
+                class="full-width"
+                :label="t('Warehouse')"
+                :options="warehouseList"
+                option-value="id"
+                option-label="name"
+                emit-value
+                map-options
+                use-input
+                hide-selected
+                autofocus
+                :input-debounce="0"
+            />
+        </QCardSection>
+        <div :class="[!isDialog ? 'flex-2' : null, 'form-gap flex no-wrap']">
+            <QCardSection class="row q-px-none flex-1">
+                <VnInputDate
+                    v-model="form.eta"
+                    class="full-width"
+                    :label="t('ETA date')"
+                />
+            </QCardSection>
+            <QCardSection class="row q-px-none flex-1">
+                <VnInputTime
+                    v-model="form.eta"
+                    class="full-width"
+                    :label="t('ETA hour')"
+                />
+            </QCardSection>
+        </div>
+        <QCardSection class="q-px-none flex-1">
+            <VnInput
+                v-model="form.description"
+                class="full-width"
+                :label="t('Description')"
+                type="textarea"
+                :rows="1"
+            />
+        </QCardSection>
+    </div>
+</template>
+<style lang="scss" scoped>
+.form-gap {
+    gap: 16px;
+}
+
+.flex-1 {
+    flex: 1;
+}
+
+.flex-2 {
+    flex: 2;
+}
+</style>
+<i18n>
+es:
+    Warehouse: Almacén
+    ETA date: Fecha ETA
+    ETA hour: Hora ETA
+    Description: Descripción
+    Remove stop: Eliminar parada
+    Add stop: Añadir parada
+</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 9dbf44af4..10d6e6066 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -4,16 +4,11 @@ import { useRoute } from 'vue-router';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchData from 'components/FetchData.vue';
 import { onMounted, ref } from 'vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import CrudModel from 'components/CrudModel.vue';
+import RoadmapAddStopForm from "pages/Route/Roadmap/RoadmapAddStopForm.vue";
 
 const { t } = useI18n();
 const route = useRoute();
-const warehouseList = ref([]);
 const roadmapStopsCrudRef = ref(null);
 
 const defaultStop = ref({
@@ -39,14 +34,6 @@ onMounted(() => {
         :filter="{ fields: ['etd'] }"
         @on-fetch="updateDefaultStop"
     />
-    <FetchData
-        url="Warehouses"
-        auto-load
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name"
-        limit="30"
-        @on-fetch="(data) => (warehouseList = data)"
-    />
     <div class="q-pa-lg">
         <CrudModel
             ref="roadmapStopsCrudRef"
@@ -59,40 +46,12 @@ onMounted(() => {
         >
             <template #body="{ rows }">
                 <QCard class="q-pa-md">
-                    <VnRow
+                    <QCardSection
                         v-for="(row, index) in rows"
                         :key="index"
-                        class="row q-gutter-md q-mb-md"
+                        class="row no-wrap"
                     >
-                        <div class="col">
-                            <VnSelectFilter
-                                v-model.number="row.warehouseFk"
-                                :label="t('Warehouse')"
-                                :options="warehouseList"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                use-input
-                                hide-selected
-                                autofocus
-                                :input-debounce="0"
-                            />
-                        </div>
-                        <div class="col">
-                            <VnInputDate v-model="row.eta" :label="t('ETA date')" />
-                        </div>
-                        <div class="col">
-                            <VnInputTime v-model="row.eta" :label="t('ETA hour')" />
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                v-model="row.description"
-                                :label="t('Description')"
-                                type="textarea"
-                                :rows="1"
-                            />
-                        </div>
+                        <RoadmapAddStopForm :roadmap-fk="route.params?.id" :form-data="row" />
                         <div class="col-1 row justify-center items-center">
                             <QIcon
                                 name="delete"
@@ -106,8 +65,8 @@ onMounted(() => {
                                 </QTooltip>
                             </QIcon>
                         </div>
-                    </VnRow>
-                    <VnRow>
+                    </QCardSection>
+                    <QCardSection>
                         <QIcon
                             name="add"
                             size="sm"
@@ -119,7 +78,7 @@ onMounted(() => {
                                 {{ t('Add stop') }}
                             </QTooltip>
                         </QIcon>
-                    </VnRow>
+                    </QCardSection>
                 </QCard>
             </template>
         </CrudModel>

From 0e79676f588a444b1e87a7e1e590da954267ab24 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 8 Mar 2024 09:02:49 -0300
Subject: [PATCH 104/128] Create manual invoice WIP

---
 src/components/CreateManualInvoiceForm.vue | 155 +++++++++++++++++++++
 src/components/FormModelPopup.vue          |   6 +-
 src/pages/InvoiceOut/InvoiceOutList.vue    |  26 +++-
 3 files changed, 183 insertions(+), 4 deletions(-)
 create mode 100644 src/components/CreateManualInvoiceForm.vue

diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
new file mode 100644
index 000000000..de5decaad
--- /dev/null
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -0,0 +1,155 @@
+<script setup>
+import { reactive, ref } 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 VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+import VnInputDate from './common/VnInputDate.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const router = useRouter();
+
+const manualInvoiceFormData = reactive({
+    maxShipped: Date.vnNew(),
+});
+
+const isInvoicing = ref(false);
+const invoiceOutSerialsOptions = ref([]);
+const taxAreasOptions = ref([]);
+const ticketsOptions = ref([]);
+const clientsOptions = ref([]);
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+    router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="InvoiceOutSerials"
+        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
+        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="TaxAreas"
+        :filter="{ order: ['code'] }"
+        @on-fetch="(data) => (taxAreasOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Tickets"
+        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
+        @on-fetch="(data) => (ticketsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Clients"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        @on-fetch="(data) => (clientsOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        :title="t('Create manual invoice')"
+        url-create="InvoiceOuts/createManualInvoice"
+        model="invoiceOut"
+        :form-initial-data="manualInvoiceFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Ticket')"
+                        :options="ticketsOptions"
+                        hide-selected
+                        option-label="id"
+                        option-value="id"
+                        v-model="data.ticketFk"
+                        @update:model-value="data.clientFk = null"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.nickname
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+                <span class="row items-center" style="max-width: max-content">{{
+                    t('Or')
+                }}</span>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Client')"
+                        :options="clientsOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.clientFk"
+                        @update:model-value="data.ticketFk = null"
+                    />
+                </div>
+                <div class="col">
+                    <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Serial')"
+                        :options="invoiceOutSerialsOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="code"
+                        v-model="data.serial"
+                        :required="true"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Area')"
+                        :options="taxAreasOptions"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="data.taxArea"
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('Reference')"
+                    type="textarea"
+                    v-model="data.reference"
+                    fill-input
+                    autogrow
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Create manual invoice: Crear factura manual
+    Ticket: Ticket
+    Client: Cliente
+    Max date: Fecha límite
+    Serial: Serie
+    Area: Area
+    Reference: Referencia
+    Or: O
+</i18n>
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 04322a3c8..cc22c77db 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -42,8 +42,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
     closeForm();
 };
 
@@ -59,7 +59,7 @@ const closeForm = () => {
         :default-actions="false"
         :url-create="urlCreate"
         :model="model"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index ca68f0770..17b37b962 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -10,6 +10,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import CreateManualInvoiceForm from 'src/components/CreateManualInvoiceForm.vue';
 
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import { toDate, toCurrency } from 'src/filters/index';
@@ -18,13 +19,15 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useSession } from 'src/composables/useSession';
 
 const { t } = useI18n();
-const selectedCards = ref(new Map());
 const router = useRouter();
 const stateStore = useStateStore();
 const session = useSession();
 const token = session.getToken();
 const { viewSummary } = useSummaryDialog();
 
+const manualInvoiceDialogRef = ref(null);
+const selectedCards = ref(new Map());
+
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
@@ -83,6 +86,10 @@ const openPdf = () => {
         console.error('Error opening PDF');
     }
 };
+
+const openCreateInvoiceModal = () => {
+    manualInvoiceDialogRef.value.show();
+};
 </script>
 
 <template>
@@ -204,6 +211,20 @@ const openPdf = () => {
                 </div>
             </template>
         </VnPaginate>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="openCreateInvoiceModal()" />
+            <QTooltip>
+                {{ t('createInvoice') }}
+            </QTooltip>
+        </QPageSticky>
+
+        <QDialog
+            ref="manualInvoiceDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <CreateManualInvoiceForm />
+        </QDialog>
     </QPage>
 </template>
 
@@ -214,10 +235,13 @@ en:
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
     downloadPdf: Download PDF
+    createInvoice: Make invoice
 es:
     searchInvoice: Buscar factura emitida
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
     downloadPdf: Download PDF
+    createInvoice: Crear factura
+
 </i18n>

From ed99aea4a3cbecc4d23f576851c9fb97593be769 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 8 Mar 2024 15:05:11 -0300
Subject: [PATCH 105/128] Finish create manual invoice popup form

---
 src/components/CreateManualInvoiceForm.vue | 27 ++++++++++++++++++----
 src/components/FormModel.vue               |  9 ++++----
 src/components/FormModelPopup.vue          | 13 ++++++++---
 src/css/app.scss                           |  4 ++++
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index de5decaad..f03afbf35 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -19,15 +19,17 @@ const manualInvoiceFormData = reactive({
     maxShipped: Date.vnNew(),
 });
 
-const isInvoicing = ref(false);
+const formModelPopupRef = ref();
 const invoiceOutSerialsOptions = ref([]);
 const taxAreasOptions = ref([]);
 const ticketsOptions = ref([]);
 const clientsOptions = ref([]);
+const isLoading = computed(() => formModelPopupRef.value?.isLoading);
 
-const onDataSaved = (formData, requestResponse) => {
+const onDataSaved = async (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
-    router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
+    if (requestResponse && requestResponse.id)
+        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
 };
 </script>
 
@@ -57,6 +59,7 @@ const onDataSaved = (formData, requestResponse) => {
         auto-load
     />
     <FormModelPopup
+        ref="formModelPopupRef"
         :title="t('Create manual invoice')"
         url-create="InvoiceOuts/createManualInvoice"
         model="invoiceOut"
@@ -64,6 +67,10 @@ const onDataSaved = (formData, requestResponse) => {
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data }">
+            <span v-if="isLoading" class="text-primary invoicing-text">
+                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
+                {{ t('Invoicing in progress...') }}
+            </span>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
@@ -142,6 +149,17 @@ const onDataSaved = (formData, requestResponse) => {
     </FormModelPopup>
 </template>
 
+<style lang="scss" scoped>
+.invoicing-text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: $primary;
+    font-size: 24px;
+    margin-bottom: 8px;
+}
+</style>
+
 <i18n>
 es:
     Create manual invoice: Crear factura manual
@@ -152,4 +170,5 @@ es:
     Area: Area
     Reference: Referencia
     Or: O
+    Invoicing in progress...: Facturación en progreso...
 </i18n>
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9f5ae319c..ca7bd30e5 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -69,10 +69,6 @@ const $props = defineProps({
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 
-defineExpose({
-    save,
-});
-
 const componentIsRendered = ref(false);
 
 onMounted(async () => {
@@ -205,6 +201,11 @@ watch(formUrl, async () => {
     reset();
     fetch();
 });
+
+defineExpose({
+    save,
+    isLoading,
+});
 </script>
 <template>
     <div class="column items-center full-width">
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index cc22c77db..2d8886610 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
@@ -39,21 +39,28 @@ const $props = defineProps({
 
 const { t } = useI18n();
 
+const formModelRef = ref(null);
 const closeButton = ref(null);
-const isLoading = ref(false);
 
 const onDataSaved = (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
     closeForm();
 };
 
-const closeForm = () => {
+const isLoading = computed(() => formModelRef.value?.isLoading);
+
+const closeForm = async () => {
     if (closeButton.value) closeButton.value.click();
 };
+
+defineExpose({
+    isLoading,
+});
 </script>
 
 <template>
     <FormModel
+        ref="formModelRef"
         :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :default-actions="false"
diff --git a/src/css/app.scss b/src/css/app.scss
index 38dd642a3..388492432 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -97,6 +97,10 @@ select:-webkit-autofill {
     background-color: var(--vn-light-gray);
 }
 
+.fill-icon {
+    font-variation-settings: 'FILL' 1;
+}
+
 /* Estilo para el asterisco en campos requeridos */
 .q-field.required .q-field__label:after {
     content: ' *';

From 049e3c722a897e48bb8dbc118b14eaaf3e0962f7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 8 Mar 2024 15:09:28 -0300
Subject: [PATCH 106/128] Fix translation

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 17b37b962..f193a6e8c 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -241,7 +241,6 @@ es:
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    downloadPdf: Download PDF
+    downloadPdf: Descargar PDF
     createInvoice: Crear factura
-
 </i18n>

From 5011fd5f83e2904e3e4aa20ed63d4a9267467234 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 10 Mar 2024 21:41:36 -0300
Subject: [PATCH 107/128] Create date and time utility

---
 src/filters/date.js | 93 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 src/filters/date.js

diff --git a/src/filters/date.js b/src/filters/date.js
new file mode 100644
index 000000000..2766d1381
--- /dev/null
+++ b/src/filters/date.js
@@ -0,0 +1,93 @@
+/**
+ * Checks if a given date is valid.
+ *
+ * @param {number|string|Date} date - The date to be checked.
+ * @returns {boolean} True if the date is valid, false otherwise.
+ *
+ * @example
+ * // returns true
+ * isValidDate(new Date());
+ *
+ * @example
+ * // returns false
+ * isValidDate('invalid date');
+ */
+export function isValidDate(date) {
+    return date && !isNaN(new Date(date).getTime());
+}
+
+/**
+ * Converts a given date to a specific format.
+ *
+ * @param {number|string|Date} date - The date to be formatted.
+ * @returns {string} The formatted date as a string in 'dd/mm/yyyy' format. If the provided date is not valid, an empty string is returned.
+ *
+ * @example
+ * // returns "02/12/2022"
+ * toDateFormat(new Date(2022, 11, 2));
+ */
+export function toDateFormat(date) {
+    if (!isValidDate(date)) {
+        return '';
+    }
+    return new Date(date).toLocaleDateString('es-ES', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+    });
+}
+
+/**
+ * Converts a given date to a specific time format.
+ *
+ * @param {number|string|Date} date - The date to be formatted.
+ * @param {boolean} [showSeconds=false] - Whether to include seconds in the output format.
+ * @returns {string} The formatted time as a string in 'hh:mm:ss' format. If the provided date is not valid, an empty string is returned. If showSeconds is false, seconds are not included in the output format.
+ *
+ * @example
+ * // returns "00:00"
+ * toTimeFormat(new Date(2022, 11, 2));
+ *
+ * @example
+ * // returns "00:00:00"
+ * toTimeFormat(new Date(2022, 11, 2), true);
+ */
+export function toTimeFormat(date, showSeconds = false) {
+    if (!isValidDate(date)) {
+        return '';
+    }
+    return new Date(date).toLocaleDateString('es-ES', {
+        hour: '2-digit',
+        minute: '2-digit',
+        second: showSeconds ? '2-digit' : undefined,
+    });
+}
+
+/**
+ * Converts a given date to a specific date and time format.
+ *
+ * @param {number|string|Date} date - The date to be formatted.
+ * @param {boolean} [showSeconds=false] - Whether to include seconds in the output format.
+ * @returns {string} The formatted date as a string in 'dd/mm/yyyy, hh:mm:ss' format. If the provided date is not valid, an empty string is returned. If showSeconds is false, seconds are not included in the output format.
+ *
+ * @example
+ * // returns "02/12/2022, 00:00"
+ * toDateTimeFormat(new Date(2022, 11, 2));
+ *
+ * @example
+ * // returns "02/12/2022, 00:00:00"
+ * toDateTimeFormat(new Date(2022, 11, 2), true);
+ */
+export function toDateTimeFormat(date, showSeconds = false) {
+    if (!isValidDate(date)) {
+        return '';
+    }
+    return new Date(date).toLocaleDateString('es-ES', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: showSeconds ? '2-digit' : undefined,
+    });
+}

From 319295f2c2d8e1eca264da56375b0cc025d13d3d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 11 Mar 2024 16:53:33 -0300
Subject: [PATCH 108/128] Workers PDA

---
 src/i18n/en/index.js                |   7 ++
 src/i18n/es/index.js                |   7 ++
 src/pages/Worker/Card/WorkerPda.vue | 141 ++++++++++++++++++++++++++++
 src/router/modules/worker.js        |  11 ++-
 4 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Worker/Card/WorkerPda.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 94d552be3..116cd9d01 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -833,6 +833,7 @@ export default {
             notifications: 'Notifications',
             workerCreate: 'New worker',
             department: 'Department',
+            pda: 'PDA',
         },
         list: {
             name: 'Name',
@@ -874,6 +875,12 @@ export default {
             subscribed: 'Subscribed to the notification',
             unsubscribed: 'Unsubscribed from the notification',
         },
+        pda: {
+            newPDA: 'New PDA',
+            model: 'Model',
+            serialNumber: 'Serial number',
+            removePDA: 'Deallocate PDA',
+        },
         create: {
             name: 'Name',
             lastName: 'Last name',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index bcd780f5b..728b99702 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -833,6 +833,7 @@ export default {
             notifications: 'Notificaciones',
             workerCreate: 'Nuevo trabajador',
             department: 'Departamentos',
+            pda: 'PDA',
         },
         list: {
             name: 'Nombre',
@@ -874,6 +875,12 @@ export default {
             subscribed: 'Se ha suscrito a la notificación',
             unsubscribed: 'Se ha dado de baja de la notificación',
         },
+        pda: {
+            newPDA: 'Nueva PDA',
+            model: 'Modelo',
+            serialNumber: 'Número de serie',
+            removePDA: 'Desasignar PDA',
+        },
         create: {
             name: 'Nombre',
             lastName: 'Apellido',
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
new file mode 100644
index 000000000..e01c80838
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -0,0 +1,141 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { onMounted, ref, computed } from 'vue';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+import { useRole } from 'src/composables/useRole';
+
+const route = useRoute();
+const { t } = useI18n();
+const { notify } = useNotify();
+const { hasAny } = useRole();
+
+const fetchCurrentDeviceRef = ref(null);
+const deviceProductionsFilter = {
+    fields: ['id', 'serialNumber', 'modelFk'],
+    where: { stateFk: 'idle' },
+    order: 'id',
+};
+const deviceProductionsOptions = ref([]);
+const newPDA = ref({});
+const currentPDA = ref(null);
+
+const isAllowedToEdit = computed(() => hasAny(['hr', 'productionAssi']));
+
+const setCurrentPDA = (data) => {
+    currentPDA.value = data;
+    currentPDA.value.description = `ID: ${currentPDA.value.deviceProductionFk} ${t(
+        'worker.pda.model'
+    )}: ${currentPDA.value.deviceProduction.modelFk} ${t('worker.pda.serialNumber')}: ${
+        currentPDA.value.deviceProduction.serialNumber
+    }`;
+};
+
+const deallocatePDA = async (data) => {
+    try {
+        await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+            pda: currentPDA.value.deviceProductionFk,
+        });
+        data.pda = null;
+        currentPDA.value = null;
+        await fetchCurrentDeviceRef.value.fetch();
+        notify(t('PDA deallocated'), 'positive');
+    } catch (err) {
+        console.error('Error deallocating PDA');
+    }
+};
+
+onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
+</script>
+
+<template>
+    <FetchData
+        url="DeviceProductions"
+        :filter="deviceProductionsFilter"
+        auto-load
+        @on-fetch="(data) => (deviceProductionsOptions = data)"
+    />
+    <FetchData
+        ref="fetchCurrentDeviceRef"
+        url="DeviceProductionUsers"
+        :filter="{
+            where: { userFk: route.params.id },
+            include: { relation: 'deviceProduction' },
+        }"
+        auto-load
+        @on-fetch="(data) => setCurrentPDA(data[0])"
+    />
+    <QPage class="column items-center q-pa-md">
+        <FormModel
+            url="DeviceProductionUsers"
+            :url-create="`Workers/${route.params.id}/allocatePDA`"
+            model="DeviceProductionUser"
+            :form-initial-data="newPDA"
+            auto-load
+            @on-data-saved="(_, data) => setCurrentPDA(data)"
+        >
+            <template #form="{ data }">
+                <QField
+                    v-if="currentPDA && currentPDA.description"
+                    :label="t('worker.pda.newPDA')"
+                    :model-value="currentPDA.description"
+                    :editable="false"
+                    class="full-width"
+                >
+                    <template #control>
+                        <div tabindex="0">
+                            {{ currentPDA.description }}
+                        </div>
+                    </template>
+                    <template v-if="isAllowedToEdit" #append>
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="deallocatePDA(data)"
+                        >
+                            <QTooltip>
+                                {{ t('worker.pda.removePDA') }}
+                            </QTooltip>
+                        </QIcon>
+                    </template>
+                </QField>
+
+                <VnSelectFilter
+                    v-else
+                    :label="t('worker.pda.newPDA')"
+                    v-model="data.pda"
+                    :options="deviceProductionsOptions"
+                    option-label="serialNumber"
+                    option-value="id"
+                    hide-selected
+                    :disable="!isAllowedToEdit"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>ID: {{ scope.opt?.id }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ scope.opt?.modelFk }},
+                                    {{ scope.opt?.serialNumber }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelectFilter>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    PDA deallocated: PDA desasignada
+</i18n>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 27a6f19a9..57a879536 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'WorkerMain' },
     menus: {
         main: ['WorkerList', 'WorkerDepartment'],
-        card: ['WorkerNotificationsManager'],
+        card: ['WorkerNotificationsManager', 'WorkerPda'],
         departmentCard: ['BasicData'],
     },
     children: [
@@ -75,6 +75,15 @@ export default {
                     component: () =>
                         import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
                 },
+                {
+                    name: 'WorkerPda',
+                    path: 'pda',
+                    meta: {
+                        title: 'pda',
+                        icon: 'phone_android',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
+                },
             ],
         },
     ],

From 029fc043dea983806eb97b4b041303983070aeed Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 08:08:20 -0300
Subject: [PATCH 109/128] Change title translation

---
 src/i18n/es/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 728b99702..b8ec8dc6b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -876,7 +876,7 @@ export default {
             unsubscribed: 'Se ha dado de baja de la notificación',
         },
         pda: {
-            newPDA: 'Nueva PDA',
+            newPDA: 'PDA Actual',
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',

From dad2711311e4ef05747501cf8c83b9662d899cb6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 08:13:27 -0300
Subject: [PATCH 110/128] fix translation

---
 src/i18n/en/index.js                | 1 +
 src/i18n/es/index.js                | 3 ++-
 src/pages/Worker/Card/WorkerPda.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 116cd9d01..ece6d516a 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -877,6 +877,7 @@ export default {
         },
         pda: {
             newPDA: 'New PDA',
+            currentPDA: 'Current PDA',
             model: 'Model',
             serialNumber: 'Serial number',
             removePDA: 'Deallocate PDA',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index b8ec8dc6b..be16e3671 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -876,7 +876,8 @@ export default {
             unsubscribed: 'Se ha dado de baja de la notificación',
         },
         pda: {
-            newPDA: 'PDA Actual',
+            newPDA: 'Nueva PDA',
+            currentPDA: 'PDA Actual',
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index e01c80838..a487f2495 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -83,7 +83,7 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
             <template #form="{ data }">
                 <QField
                     v-if="currentPDA && currentPDA.description"
-                    :label="t('worker.pda.newPDA')"
+                    :label="t('worker.pda.currentPDA')"
                     :model-value="currentPDA.description"
                     :editable="false"
                     class="full-width"

From fff5e1849eaea53bc72a174b3eb6f4c618f7a7c3 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 09:59:27 -0300
Subject: [PATCH 111/128] Delete unused form

---
 src/pages/InvoiceOut/Card/SendInvoiceForm.vue | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 src/pages/InvoiceOut/Card/SendInvoiceForm.vue

diff --git a/src/pages/InvoiceOut/Card/SendInvoiceForm.vue b/src/pages/InvoiceOut/Card/SendInvoiceForm.vue
deleted file mode 100644
index 3956dab08..000000000
--- a/src/pages/InvoiceOut/Card/SendInvoiceForm.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormPopup from 'src/components/FormPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const { t } = useI18n();
-
-const email = ref(null);
-
-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
-};
-</script>
-
-<template>
-    <FormPopup
-        :title="t('New thermograph')"
-        :subtitle="t('Are you sure you want to send it?')"
-        @on-data-saved="onDataSaved($event)"
-    >
-        <template #form-inputs>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput :label="t('Email')" v-model="email" type="email" />
-                </div>
-            </VnRow>
-        </template>
-    </FormPopup>
-</template>
-
-<i18n>
-es:
-    Email: Email
-    Confirm: Confirmar
-    Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
-</i18n>

From 632049c13b967f7e36188f6f2c1b47332ad3ba66 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 11:31:32 -0300
Subject: [PATCH 112/128] Assign button change

---
 src/components/FormModel.vue        | 39 +++++++++++++++++++----------
 src/i18n/en/index.js                |  1 +
 src/i18n/es/index.js                |  2 ++
 src/pages/Worker/Card/WorkerPda.vue |  4 +--
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9f5ae319c..61de5d9f5 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -10,6 +10,7 @@ import { useValidator } from 'src/composables/useValidator';
 import useNotify from 'src/composables/useNotify.js';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
+import { tMobile } from 'src/composables/tMobile';
 
 const quasar = useQuasar();
 const state = useState();
@@ -43,6 +44,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    defaultButtons: {
+        type: Object,
+        default: () => {},
+    },
     autoLoad: {
         type: Boolean,
         default: false,
@@ -119,7 +124,19 @@ const hasChanges = ref(!$props.observeFormChanges);
 const originalData = ref({ ...$props.formInitialData });
 const formData = computed(() => state.get($props.model));
 const formUrl = computed(() => $props.url);
-
+const defaultButtons = computed(() => ({
+    save: {
+        color: 'primary',
+        icon: 'restart_alt',
+        label: 'globals.save',
+    },
+    reset: {
+        color: 'primary',
+        icon: 'save',
+        label: 'globals.reset',
+    },
+    ...$props.defaultButtons,
+}));
 const startFormWatcher = () => {
     watch(
         () => formData.value,
@@ -131,10 +148,6 @@ const startFormWatcher = () => {
     );
 };
 
-function tMobile(...args) {
-    if (!quasar.platform.is.mobile) return t(...args);
-}
-
 async function fetch() {
     const { data } = await axios.get($props.url, {
         params: { filter: JSON.stringify($props.filter) },
@@ -233,21 +246,21 @@ watch(formUrl, async () => {
             <QBtnGroup push class="q-gutter-x-sm">
                 <slot name="moreActions" />
                 <QBtn
-                    :label="tMobile('globals.reset')"
-                    color="primary"
-                    icon="restart_alt"
+                    :label="tMobile(defaultButtons.reset.label)"
+                    :color="defaultButtons.reset.color"
+                    :icon="defaultButtons.reset.icon"
                     flat
                     @click="reset"
                     :disable="!hasChanges"
-                    :title="t('globals.reset')"
+                    :title="t(defaultButtons.reset.label)"
                 />
                 <QBtn
-                    :label="tMobile('globals.save')"
-                    color="primary"
-                    icon="save"
+                    :label="tMobile(defaultButtons.save.label)"
+                    :color="defaultButtons.save.color"
+                    :icon="defaultButtons.save.icon"
                     @click="save"
                     :disable="!hasChanges"
-                    :title="t('globals.save')"
+                    :title="t(defaultButtons.save.label)"
                 />
             </QBtnGroup>
         </div>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ece6d516a..0be04003e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -31,6 +31,7 @@ export default {
         close: 'Close',
         cancel: 'Cancel',
         confirm: 'Confirm',
+        assign: 'Assign',
         back: 'Back',
         yes: 'Yes',
         no: 'No',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index be16e3671..a9684e4d7 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -31,6 +31,7 @@ export default {
         close: 'Cerrar',
         cancel: 'Cancelar',
         confirm: 'Confirmar',
+        assign: 'Asignar',
         back: 'Volver',
         yes: 'Si',
         no: 'No',
@@ -881,6 +882,7 @@ export default {
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',
+            assignPDA: 'Asignar PDA',
         },
         create: {
             name: 'Nombre',
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index a487f2495..2c2da5d4c 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -2,11 +2,9 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { onMounted, ref, computed } from 'vue';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useRole } from 'src/composables/useRole';
@@ -77,7 +75,9 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
             :url-create="`Workers/${route.params.id}/allocatePDA`"
             model="DeviceProductionUser"
             :form-initial-data="newPDA"
+            :default-actions="true"
             auto-load
+            :default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
             @on-data-saved="(_, data) => setCurrentPDA(data)"
         >
             <template #form="{ data }">

From bd5eb1a1c3f334fa9511f842ed0e238019fe179c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 11:34:38 -0300
Subject: [PATCH 113/128] remove assignPDA translation

---
 src/i18n/es/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index a9684e4d7..610c6017f 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -882,7 +882,6 @@ export default {
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',
-            assignPDA: 'Asignar PDA',
         },
         create: {
             name: 'Nombre',

From 06fa4aebc5b095e3b7f78736bf9b73350a5dc567 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 11:40:06 -0300
Subject: [PATCH 114/128] add invoice out list download icon

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index f193a6e8c..cf33b2cec 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -134,10 +134,10 @@ const openCreateInvoiceModal = () => {
                     <template #st-actions>
                         <QBtn
                             @click="openPdf()"
-                            class="q-mr-xl"
+                            class="q-mr-md"
                             color="primary"
+                            icon="cloud_download"
                             :disable="selectedCards.size === 0"
-                            :label="t('globals.download')"
                         >
                             <QTooltip>{{ t('downloadPdf') }}</QTooltip>
                         </QBtn>

From ff0b0c81315937372af0cc363dfdd0465bee1db4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 12:38:44 -0300
Subject: [PATCH 115/128] Remove innecesary prop

---
 src/pages/Worker/Card/WorkerPda.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 2c2da5d4c..ef8c3fe8e 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -75,7 +75,6 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
             :url-create="`Workers/${route.params.id}/allocatePDA`"
             model="DeviceProductionUser"
             :form-initial-data="newPDA"
-            :default-actions="true"
             auto-load
             :default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
             @on-data-saved="(_, data) => setCurrentPDA(data)"

From e4553659cf1ef6c245569557901bcd3a0a680d51 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 12 Mar 2024 21:23:46 -0300
Subject: [PATCH 116/128] Update translation from population to city

---
 src/pages/Route/Card/RouteListTicketsDialog.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Card/RouteListTicketsDialog.vue b/src/pages/Route/Card/RouteListTicketsDialog.vue
index cc4515158..ba07f859f 100644
--- a/src/pages/Route/Card/RouteListTicketsDialog.vue
+++ b/src/pages/Route/Card/RouteListTicketsDialog.vue
@@ -42,8 +42,8 @@ const columns = ref([
         align: 'left',
     },
     {
-        name: 'population',
-        label: t('Population'),
+        name: 'city',
+        label: t('City'),
         field: (row) => row?.address?.city,
         sortable: true,
         align: 'left',
@@ -232,7 +232,7 @@ es:
     Tickets to add: Tickets a añadir
     Client: Cliente
     Province: Provincia
-    Population: Población
+    City: Población
     PC: CP
     Address: Dirección
     Zone: Zona

From 77e29a2b876988253cc867d29168ee44471ea5f0 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 12 Mar 2024 21:26:17 -0300
Subject: [PATCH 117/128] Fix tickets feedback

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

diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 6a1c7a2a0..8410232c5 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -15,11 +15,14 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'components/FetchData.vue';
 import { openBuscaman } from 'src/utils/buscaman';
 import SendSmsDialog from 'components/common/SendSmsDialog.vue';
+import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
+import {useStateStore} from "stores/useStateStore";
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 
+const stateStore = useStateStore();
 const selectedRows = ref([]);
 const columns = computed(() => [
     {
@@ -219,6 +222,11 @@ const openSmsDialog = async () => {
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <RouteSearchbar />
+        </Teleport>
+    </template>
     <FetchData
         @on-fetch="(data) => (routeEntity = data)"
         auto-load
@@ -432,8 +440,8 @@ es:
     Warehouse: Almacén
     Packages: Bultos
     Packaging: Encajado
-    Confirm removal from route: Remover de la ruta
-    Are you sure you want to remove this ticket from the route?: ¿Seguro que quieres remover este ticket de la ruta?
+    Confirm removal from route: Quitar de la ruta
+    Are you sure you want to remove this ticket from the route?: ¿Seguro que quieres quitar este ticket de la ruta?
     Sort routes: Ordenar rutas
     Open buscaman: Abrir buscaman
     Delete priority: Borrar orden

From 09e18dfc017e2210f18e994e5cea31b3bd88bbb7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Mar 2024 09:07:34 +0100
Subject: [PATCH 118/128] refs #7033 deploy(2412): dev to test

---
 test/cypress/integration/worker/workerList.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index b5c57f920..bc4b2383e 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -16,7 +16,7 @@ describe('WorkerList', () => {
     it('should open the worker summary', () => {
         cy.openListSummary(0);
         cy.get('.summaryHeader div').should('have.text', '1110 - Jessica Jones');
-        cy.get('.summary .header').eq(0).invoke('text').should('include', 'Basic data');
-        cy.get('.summary .header').eq(1).should('have.text', 'User data');
+        cy.get('.summary .header-link').eq(0).invoke('text').should('include', 'Basic data');
+        cy.get('.summary .header-link').eq(1).should('have.text', 'User data');
     });
 });

From 78e3cff397201b110203925299b669f34ad146ae Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Mar 2024 09:08:27 +0100
Subject: [PATCH 119/128] refs #7033 deploy: init version 2414

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a679cdfc..dbf6bdcc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2414.01] - 2024-04-04
+
+### Added
+
+### Changed
+
+### Fixed
+
 ## [2400.01] - 2024-01-04
 
 ### Added
diff --git a/package.json b/package.json
index beae0b7b9..a35020b66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.12.0",
+    "version": "24.14.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From f1d21915eb55bc76b3bc21f821418a111f0f22e8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Mar 2024 09:28:28 +0000
Subject: [PATCH 120/128] fix vnlocation.spec

---
 test/cypress/integration/VnLocation.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 02b924e4d..5892e3ad5 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -40,9 +40,9 @@ describe('VnLocation', () => {
             cy.waitForElement('.q-card');
         });
 
-        it('Show all options', function() {
+        it('Show locations options', function() {
             cy.get(inputLocation).click();
-            cy.get(locationOptions).should('have.length', 1);
+            cy.get(locationOptions).should('have.length', 5);
         });
     });
 })

From 0fe0a6385bc26465a104b6264bda80759563aaf6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Mar 2024 10:43:25 +0100
Subject: [PATCH 121/128] hotFix(Readme): change bun to pnpm

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 86fe11ca7..e87a84d60 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,13 @@ Lilium frontend
 ## Install the dependencies
 
 ```bash
-bun install
+pnpm install
 ```
 
 ### Install quasar cli
 
 ```bash
-sudo bun install -g @quasar/cli
+sudo npm install -g @quasar/cli
 ```
 
 ### Start the app in development mode (hot-code reloading, error reporting, etc.)
@@ -23,13 +23,13 @@ quasar dev
 ### Run unit tests
 
 ```bash
-bun run test:unit
+pnpm run test:unit
 ```
 
 ### Run e2e tests
 
 ```bash
-npm run test:e2e
+pnpm run test:e2e
 ```
 
 ### Build the app for production

From 445d95057a7395dacbea495dd0daa0810df11bcd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Mar 2024 12:42:08 +0100
Subject: [PATCH 122/128] refs #6930 feat: trycatchfinally logout

---
 src/composables/useSession.js | 69 ++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 580efbdf8..507e63c0f 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -2,9 +2,11 @@ import { useState } from './useState';
 import { useRole } from './useRole';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
-
+import useNotify from './useNotify';
 
 export function useSession() {
+    const { notify } = useNotify();
+
     function getToken() {
         const localToken = localStorage.getItem('token');
         const sessionToken = sessionStorage.getItem('token');
@@ -29,37 +31,52 @@ export function useSession() {
     }
 
     async function destroy() {
-          if (localStorage.getItem('tokenMultimedia')){
-            await axios.post('VnUsers/logoutMultimedia',  null, {
-                headers: {Authorization: localStorage.getItem('tokenMultimedia') }
-            });
-            localStorage.removeItem('tokenMultimedia')
-
+        if (localStorage.getItem('tokenMultimedia')) {
+            try {
+                await axios.post('Accounts/logout', null, {
+                    headers: { Authorization: localStorage.getItem('tokenMultimedia') },
+                });
+            } catch (error) {
+                notify('errors.userConfig', 'negative');
+            } finally {
+                localStorage.removeItem('tokenMultimedia');
+            }
         }
-        if (localStorage.getItem('token')){
-            await axios.post('VnUsers/logout',  null, {
-                headers: {Authorization: localStorage.getItem('token') }
-            });
-            localStorage.removeItem('token')
+        if (localStorage.getItem('token')) {
+            try {
+                await axios.post('VnUsers/logout', null, {
+                    headers: { Authorization: localStorage.getItem('token') },
+                });
+            } catch (error) {
+                notify('errors.userConfig', 'negative');
+            } finally {
+                localStorage.removeItem('token');
+            }
         }
 
-
-         if (sessionStorage.getItem('tokenMultimedia')){
-            await axios.post('VnUsers/logoutMultimedia',  null, {
-                headers: {Authorization: sessionStorage.getItem('tokenMultimedia') }
-            });
-            sessionStorage.removeItem('tokenMultimedia')
-
+        if (sessionStorage.getItem('tokenMultimedia')) {
+            try {
+                await axios.post('Accounts/logout', null, {
+                    headers: { Authorization: sessionStorage.getItem('tokenMultimedia') },
+                });
+            } catch (error) {
+                notify('errors.userConfig', 'negative');
+            } finally {
+                sessionStorage.removeItem('tokenMultimedia');
+            }
         }
-        if (sessionStorage.getItem('token')){
-            await axios.post('VnUsers/logout',  null, {
-                headers: {Authorization: sessionStorage.getItem('token') }
-            });
-            sessionStorage.removeItem('token')
+        if (sessionStorage.getItem('token')) {
+            try {
+                await axios.post('VnUsers/logout', null, {
+                    headers: { Authorization: sessionStorage.getItem('token') },
+                });
+            } catch (error) {
+                notify('errors.userConfig', 'negative');
+            } finally {
+                sessionStorage.removeItem('token');
+            }
         }
 
-
-
         const { setUser } = useState();
 
         setUser({

From 0d3d002baf5265acbb226270ea5ac2d25e76e282 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Mar 2024 12:43:56 +0100
Subject: [PATCH 123/128] refs #6930 perf: replace label

---
 src/composables/useSession.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 507e63c0f..aa20dde20 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -37,7 +37,7 @@ export function useSession() {
                     headers: { Authorization: localStorage.getItem('tokenMultimedia') },
                 });
             } catch (error) {
-                notify('errors.userConfig', 'negative');
+                notify('errors.statusUnauthorized', 'negative');
             } finally {
                 localStorage.removeItem('tokenMultimedia');
             }
@@ -48,7 +48,7 @@ export function useSession() {
                     headers: { Authorization: localStorage.getItem('token') },
                 });
             } catch (error) {
-                notify('errors.userConfig', 'negative');
+                notify('errors.statusUnauthorized', 'negative');
             } finally {
                 localStorage.removeItem('token');
             }
@@ -60,7 +60,7 @@ export function useSession() {
                     headers: { Authorization: sessionStorage.getItem('tokenMultimedia') },
                 });
             } catch (error) {
-                notify('errors.userConfig', 'negative');
+                notify('errors.statusUnauthorized', 'negative');
             } finally {
                 sessionStorage.removeItem('tokenMultimedia');
             }
@@ -71,7 +71,7 @@ export function useSession() {
                     headers: { Authorization: sessionStorage.getItem('token') },
                 });
             } catch (error) {
-                notify('errors.userConfig', 'negative');
+                notify('errors.statusUnauthorized', 'negative');
             } finally {
                 sessionStorage.removeItem('token');
             }

From 63d195cbbf0de82a9bc1236bc0671b5dd296e914 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Mar 2024 13:21:26 +0100
Subject: [PATCH 124/128] refs #6930 perf: refactor destroy method

---
 src/composables/useSession.js | 65 +++++++++++------------------------
 1 file changed, 20 insertions(+), 45 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index aa20dde20..45d439b46 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -29,52 +29,27 @@ export function useSession() {
             sessionStorage.setItem('tokenMultimedia', data.tokenMultimedia);
         }
     }
-
+    async function destroyToken(url, storage, key) {
+        if (storage.getItem(key)) {
+            try {
+                await axios.post(url, null, {
+                    headers: { Authorization: storage.getItem(key) },
+                });
+            } catch (error) {
+                notify('errors.statusUnauthorized', 'negative');
+            } finally {
+                storage.removeItem(key);
+            }
+        }
+    }
     async function destroy() {
-        if (localStorage.getItem('tokenMultimedia')) {
-            try {
-                await axios.post('Accounts/logout', null, {
-                    headers: { Authorization: localStorage.getItem('tokenMultimedia') },
-                });
-            } catch (error) {
-                notify('errors.statusUnauthorized', 'negative');
-            } finally {
-                localStorage.removeItem('tokenMultimedia');
-            }
-        }
-        if (localStorage.getItem('token')) {
-            try {
-                await axios.post('VnUsers/logout', null, {
-                    headers: { Authorization: localStorage.getItem('token') },
-                });
-            } catch (error) {
-                notify('errors.statusUnauthorized', 'negative');
-            } finally {
-                localStorage.removeItem('token');
-            }
-        }
-
-        if (sessionStorage.getItem('tokenMultimedia')) {
-            try {
-                await axios.post('Accounts/logout', null, {
-                    headers: { Authorization: sessionStorage.getItem('tokenMultimedia') },
-                });
-            } catch (error) {
-                notify('errors.statusUnauthorized', 'negative');
-            } finally {
-                sessionStorage.removeItem('tokenMultimedia');
-            }
-        }
-        if (sessionStorage.getItem('token')) {
-            try {
-                await axios.post('VnUsers/logout', null, {
-                    headers: { Authorization: sessionStorage.getItem('token') },
-                });
-            } catch (error) {
-                notify('errors.statusUnauthorized', 'negative');
-            } finally {
-                sessionStorage.removeItem('token');
-            }
+        const tokens = {
+            tokenMultimedia: 'Accounts/logout',
+            token: 'VnUsers/logout',
+        };
+        for (const [key, url] of Object.entries(tokens)) {
+            await destroyToken(url, localStorage, key);
+            await destroyToken(url, sessionStorage, key);
         }
 
         const { setUser } = useState();

From 55ef37584a9f3b87a461048c4326bee385123a52 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Mar 2024 14:07:28 +0100
Subject: [PATCH 125/128] refs #6993 fix test front

---
 test/vitest/__tests__/components/Paginate.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index 2a22ce438..f3bf01489 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -57,13 +57,13 @@ describe('VnPaginate', () => {
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(3);
-            expect(vm.store.data.length).toEqual(6);
+            expect(vm.store.skip).toEqual(6);
+            expect(vm.store.data.length).toEqual(9);
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(6);
-            expect(vm.store.data.length).toEqual(9);
+            expect(vm.store.skip).toEqual(9);
+            expect(vm.store.data.length).toEqual(12);
         });
     });
 

From 62253e228270744980194554a47e278d9e86f1ae Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Mar 2024 13:33:02 +0100
Subject: [PATCH 126/128] refs #6546 test(VnPaginate) skip

---
 test/vitest/__tests__/components/Paginate.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index 2a22ce438..4b87a6ea3 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -2,7 +2,7 @@ import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
-describe('VnPaginate', () => {
+describe.skip('VnPaginate', () => {
     const expectedUrl = '/api/customers';
 
     let vm;

From 9094ae8c883e9cd89602c181c3a6cc53d9a7607f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Mar 2024 15:02:50 +0100
Subject: [PATCH 127/128] test(VnPaginate) fix

---
 test/vitest/__tests__/components/Paginate.spec.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index dcd74c72b..cf5e5d2ea 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -2,7 +2,7 @@ import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
-describe.skip('VnPaginate', () => {
+describe('VnPaginate', () => {
     const expectedUrl = '/api/customers';
 
     let vm;
@@ -49,6 +49,8 @@ describe.skip('VnPaginate', () => {
                 ],
             });
             vm.arrayData.hasMoreData.value = true;
+            await vm.$nextTick();
+
             vm.store.data = [
                 { id: 1, name: 'Tony Stark' },
                 { id: 2, name: 'Jessica Jones' },
@@ -57,13 +59,13 @@ describe.skip('VnPaginate', () => {
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(6);
-            expect(vm.store.data.length).toEqual(9);
+            expect(vm.store.skip).toEqual(3);
+            expect(vm.store.data.length).toEqual(6);
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(9);
-            expect(vm.store.data.length).toEqual(12);
+            expect(vm.store.skip).toEqual(6);
+            expect(vm.store.data.length).toEqual(9);
         });
     });
 

From 2ea6fd2ea6b955ba531aa2adeefe30d1e6087690 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 19 Mar 2024 13:50:15 -0300
Subject: [PATCH 128/128] Change vnconfirm export name

---
 src/composables/useVnConfirm.js                        | 2 +-
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/composables/useVnConfirm.js b/src/composables/useVnConfirm.js
index 430a290be..76c3f4f28 100644
--- a/src/composables/useVnConfirm.js
+++ b/src/composables/useVnConfirm.js
@@ -1,7 +1,7 @@
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import { useQuasar } from 'quasar';
 
-export function useSummaryDialog() {
+export function useVnConfirm() {
     const quasar = useQuasar();
 
     const openConfirmationModal = (title, message, promise, successFn) => {
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index fc84c042b..10af631bc 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -10,7 +10,7 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import useNotify from 'src/composables/useNotify';
 import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
-import { useSummaryDialog } from 'composables/useVnConfirm';
+import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
 
 const $props = defineProps({
@@ -26,7 +26,7 @@ const session = useSession();
 const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-const { openConfirmationModal } = useSummaryDialog();
+const { openConfirmationModal } = useVnConfirm();
 const quasar = useQuasar();
 
 const transferInvoiceDialogRef = ref();