From 2ab7d48b0c8b6eb7bf0909e3e45cbc621dbbdb1d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Jul 2024 09:55:24 +0200
Subject: [PATCH 01/74] feat: refs #7553 added VnTable in Expedition, new field
 & minor changes in rest of section

---
 salix-front-mindshore                         |   1 +
 src/pages/Ticket/Card/TicketExpedition.vue    | 304 ++++++------------
 .../Ticket/Card/TicketPurchaseRequest.vue     |  30 +-
 src/pages/Ticket/Card/TicketSale.vue          |  11 +-
 src/pages/Ticket/Card/TicketSaleTracking.vue  |  10 +-
 src/pages/Ticket/Card/TicketTracking.vue      |  10 +-
 src/pages/Ticket/Card/TicketVolume.vue        |  10 +-
 src/pages/Ticket/locale/en.yml                |   3 +
 src/pages/Ticket/locale/es.yml                |   3 +
 9 files changed, 149 insertions(+), 233 deletions(-)
 create mode 160000 salix-front-mindshore

diff --git a/salix-front-mindshore b/salix-front-mindshore
new file mode 160000
index 000000000..7432396ce
--- /dev/null
+++ b/salix-front-mindshore
@@ -0,0 +1 @@
+Subproject commit 7432396ceafb7fe46b8ed8ac28fa7753df57efd2
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index a7eb9e27e..e8dd5b31c 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -1,41 +1,37 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, reactive, watch } from 'vue';
+import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TicketEditManaProxy from './TicketEditMana.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toPercentage } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { toDateTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
-const editPriceProxyRef = ref(null);
 const newTicketDialogRef = ref(null);
 const logsTableDialogRef = ref(null);
-
+const tableRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
 const visibleColumns = ref([]);
 const newTicketWithRoute = ref(false);
-const itemsOptions = ref([]);
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -56,8 +52,6 @@ const expeditionsArrayData = useArrayData('ticketExpeditions', {
     filter: expeditionsFilter.value,
     exprBuilder: exprBuilder,
 });
-const expeditionsStore = expeditionsArrayData.store;
-const ticketExpeditions = computed(() => expeditionsStore.data);
 
 const ticketArrayData = useArrayData('ticketData');
 const ticketStore = ticketArrayData.store;
@@ -75,127 +69,95 @@ watch(
     { immediate: true }
 );
 
-const params = reactive({});
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await expeditionsArrayData.addFilter({ filter: expeditionsFilter.value, params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('expedition.id'),
         name: 'id',
-        field: 'id',
-        align: 'left',
-        sortable: true,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.item'),
-        name: 'item',
+        name: 'packagingItemFk',
         align: 'left',
+        cardVisible: true,
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'packageItemName',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.name'),
-        name: 'name',
-        field: 'packageItemName',
+        name: 'packageItemName',
         align: 'left',
+        isTitle: true,
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: itemsOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
+            inWhere: true,
+            // component: 'select',
+            // attrs: {
+            //     url: 'Items',
+            //     useLike: false,
+            //     fields: ['id', 'name'],
+            //     optionLabel: 'name',
+            //     optionValue: 'id',
+            // },
         },
     },
     {
         label: t('expedition.packageType'),
-        name: 'packageType',
-        field: 'freightItemName',
+        name: 'freightItemName',
         align: 'left',
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            // filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.counter'),
         name: 'counter',
-        field: 'counter',
         align: 'left',
-        columnFilter: null,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.externalId'),
         name: 'externalId',
-        field: 'externalId',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.created'),
         name: 'created',
-        field: 'created',
         align: 'left',
-        columnFilter: null,
-        format: (value) => toDateTimeFormat(value),
+        cardVisible: true,
+        format: (row) => toDateTimeFormat(row.created),
     },
     {
         label: t('expedition.state'),
         name: 'state',
-        field: 'state',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: { inWhere: true },
     },
     {
-        label: '',
-        name: 'history',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('expedition.historyAction'),
+                icon: 'history',
+                isPrimary: true,
+                action: (row) => showLog(row),
+            },
+        ],
     },
 ]);
 
@@ -204,23 +166,35 @@ const logTableColumns = computed(() => [
         label: t('expedition.state'),
         name: 'state',
         field: 'state',
-        align: 'left',
+        align: 'center',
         sortable: true,
     },
     {
         label: t('expedition.name'),
         name: 'name',
-        align: 'name',
+        field: 'name',
+        align: 'center',
         columnFilter: null,
     },
     {
         label: t('expedition.created'),
         name: 'created',
         field: 'created',
-        align: 'left',
+        align: 'center',
         columnFilter: null,
         format: (value) => toDateTimeFormat(value),
     },
+    {
+        label: t('expedition.isScanned'),
+        name: 'isScanned',
+        field: 'isScanned',
+        align: 'center',
+        columnFilter: null,
+        format: (value) => {
+            if (value === true) return t('expedition.yes');
+            else return t('expedition.no');
+        },
+    },
 ]);
 
 const showNewTicketDialog = (withRoute = false) => {
@@ -255,10 +229,20 @@ const getExpeditionState = async (expedition) => {
             order: ['created DESC'],
         };
 
-        const { data } = await axios.get(`ExpeditionStates/filter`, {
+        const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        expeditionsLogsData.value = data;
+        const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
+            params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
+        });
+
+        expeditionsLogsData.value = expeditionStates.map((state) => {
+            const scannedState = scannedStates.find((s) => s.id === state.id);
+            return {
+                ...state,
+                isScanned: scannedState ? scannedState.isScanned : false,
+            };
+        });
     } catch (error) {
         console.error(error);
     }
@@ -268,19 +252,12 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'history');
     allColumnNames.value = filteredColumns.map((col) => col.name);
-    // await expeditionsArrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <FetchData
-        url="Items"
-        auto-load
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        @on-fetch="(data) => (itemsOptions = data)"
-    />
     <VnSubToolbar>
         <template #st-data>
             <TableVisibleColumns
@@ -296,7 +273,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     ref="btnDropdownRef"
                     color="primary"
                     :label="t('expedition.move')"
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                 >
                     <template #label>
                         <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -329,7 +306,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QList>
                 </QBtnDropdown>
                 <QBtn
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                     icon="delete"
                     color="primary"
                     @click="
@@ -344,110 +321,27 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
     </VnSubToolbar>
 
-    <QTable
-        :rows="ticketExpeditions"
+    <VnTable
+        ref="tableRef"
+        data-key="TicketExpedition"
+        url="Expeditions/filter"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        selection="multiple"
-        v-model:selected="selectedExpeditions"
-        :visible-columns="visibleColumns"
-        :no-data-label="t('globals.noResults')"
+        :filter="expeditionsFilter"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+        default-mode="table"
+        auto-load
     >
-        <template #top-row="{ cols }">
-            <QTr>
-                <QTd />
-                <QTd v-for="(col, index) in cols" :key="index" style="max-width: 100px">
-                    <component
-                        :is="col.columnFilter.component"
-                        v-if="col.columnFilter"
-                        v-model="col.columnFilter.filterValue"
-                        v-bind="col.columnFilter.attrs"
-                        v-on="col.columnFilter.event(col)"
-                        dense
-                    />
-                </QTd>
-            </QTr>
-        </template>
-        <template #body-cell-item="{ row }">
-            <QTd auto-width @click.stop>
-                <QBtn flat color="primary">{{ row.packagingItemFk }}</QBtn>
+        <template #column-packagingItemFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.packagingItemFk }}
                 <ItemDescriptorProxy :id="row.packagingItemFk" />
-            </QTd>
+            </span>
         </template>
-        <template #body-cell-available="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.available }}
-                </QBadge>
-            </QTd>
-        </template>
-
-        <template #body-cell-price="{ row }">
-            <QTd>
-                <template v-if="isTicketEditable && row.id">
-                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
-                        {{ toCurrency(row.price) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        ref="editPriceProxyRef"
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="updatePrice(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.price"
-                            :label="t('ticketSale.price')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toCurrency(row.price) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-discount="{ row }">
-            <QTd>
-                <template v-if="!isLocked && row.id">
-                    <QBtn
-                        flat
-                        color="primary"
-                        dense
-                        @click="onOpenEditDiscountPopover(row)"
-                    >
-                        {{ toPercentage(row.discount / 100) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="changeDiscount(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-history="{ row }">
-            <QTd>
-                <QBtn
-                    @click.stop="showLog(row)"
-                    color="primary"
-                    icon="history"
-                    size="md"
-                    flat
-                >
-                    <QTooltip class="text-no-wrap">
-                        {{ t('expedition.historyAction') }}
-                    </QTooltip>
-                </QBtn>
-            </QTd>
-        </template>
-    </QTable>
+    </VnTable>
     <QDialog ref="newTicketDialogRef" transition-show="scale" transition-hide="scale">
         <ExpeditionNewTicket
             :ticket="ticketData"
@@ -461,12 +355,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             data-key="TicketExpeditionLog"
             :rows="expeditionsLogsData"
             :columns="logTableColumns"
-            class="q-pa-sm"
+            class="q-pa-md full-width"
         >
             <template #body-cell-name="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.workerFk" />
+                <QTd style="text-align: center">
+                    <span class="link" @click.stop>
+                        <QBtn flat dense>{{ row.name }}</QBtn>
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </span>
                 </QTd>
             </template>
         </QTable>
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 281dc46a1..35573cf2d 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -186,18 +186,22 @@ const openCreateModal = () => createTicketRequestDialogRef.value.show();
                     </template>
                     <template #body-cell-requester="{ row }">
                         <QTd @click.stop>
-                            <QBtn flat color="primary">
-                                {{ row.requester?.user?.nickname }}
-                                <WorkerDescriptorProxy :id="row.requesterFk" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn flat>
+                                    {{ row.requester?.user?.nickname }}
+                                    <WorkerDescriptorProxy :id="row.requesterFk" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                     <template #body-cell-atender="{ row }">
                         <QTd @click.stop>
-                            <QBtn flat color="primary">
-                                {{ row.atender?.user?.nickname }}
-                                <WorkerDescriptorProxy :id="row.attenderFk" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn flat>
+                                    {{ row.atender?.user?.nickname }}
+                                    <WorkerDescriptorProxy :id="row.attenderFk" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                     <template #body-cell-quantity="{ row }">
@@ -220,10 +224,12 @@ const openCreateModal = () => createTicketRequestDialogRef.value.show();
                     </template>
                     <template #body-cell-saleFk="{ row }">
                         <QTd @click.stop>
-                            <QBtn v-if="row.saleFk" flat color="primary">
-                                {{ row.sale.itemFk }}
-                                <ItemDescriptorProxy :id="row.sale.itemFk" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn v-if="row.saleFk" flat>
+                                    {{ row.sale.itemFk }}
+                                    <ItemDescriptorProxy :id="row.sale.itemFk" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                     <template #body-cell-actions="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index cbc94b388..13fea42b4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -11,7 +11,6 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketEditManaProxy from './TicketEditMana.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
 
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
 import TicketTransfer from './TicketTransfer.vue';
@@ -620,10 +619,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #body-cell-itemFk="{ row }">
             <QTd @click.stop>
                 <div v-if="row.id">
-                    <QBtn flat color="primary" dense>
-                        {{ row.itemFk }}
-                    </QBtn>
-                    <ItemDescriptorProxy :id="row.itemFk" />
+                    <span class="link">
+                        <QBtn flat dense>
+                            {{ row.itemFk }}
+                        </QBtn>
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
                 </div>
                 <VnSelect
                     v-else
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index d519bc2c6..93aa627e6 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -406,10 +406,12 @@ const qCheckBoxController = (sale, action) => {
         <template #body-cell-item="{ row }">
             <QTd @click.stop>
                 <div>
-                    <QBtn flat color="primary">
-                        {{ row.itemFk }}
-                    </QBtn>
-                    <ItemDescriptorProxy :id="row.itemFk" />
+                    <span class="link">
+                        <QBtn flat>
+                            {{ row.itemFk }}
+                        </QBtn>
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
                 </div>
             </QTd>
         </template>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 2ddb278fa..62d755c4d 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -95,10 +95,12 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
                 >
                     <template #body-cell-worker="{ row }">
                         <QTd @click.stop>
-                            <QBtn flat color="primary">
-                                {{ row.user?.name }}
-                                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
-                            </QBtn>
+                            <span class="link">
+                                <QBtn flat>
+                                    {{ row.user?.name }}
+                                    <WorkerDescriptorProxy :id="row.user?.worker?.id" />
+                                </QBtn>
+                            </span>
                         </QTd>
                     </template>
                 </QTable>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 93da31e53..a021cfbf1 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -134,10 +134,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     >
         <template #body-cell-item="{ row }">
             <QTd>
-                <QBtn flat color="primary">
-                    {{ row.itemFk }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
+                <span class="link">
+                    <QBtn flat>
+                        {{ row.itemFk }}
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </QBtn>
+                </span>
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 10a8e1fa4..66a3787dd 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -112,6 +112,9 @@ expedition:
     removeExpeditionSubtitle: Are you sure you want to delete this expedition?
     worker: Worker
     move: Move
+    isScanned: Is scanned
+    yes: Yes
+    no: No
 basicData:
     next: Next
     back: Back
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index a80692bfe..59f5a7f91 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -201,6 +201,9 @@ expedition:
     removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición?
     worker: Trabajador
     move: Mover
+    isScanned: Escaneado
+    yes: Sí
+    no: No
 package:
     package: Embalaje
     quantity: Cantidad

From 1dace39882a136d1304b3f8905494555e67cfd0e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Jul 2024 11:24:40 +0200
Subject: [PATCH 02/74] refactor: refs #7553 changed isScanned field & fixed
 cardDescriptor warning

---
 src/components/ui/CardDescriptor.vue       |  3 ++-
 src/pages/Ticket/Card/TicketExpedition.vue | 23 +++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 90ac856e5..7f35f0a28 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -47,6 +47,7 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -170,7 +171,7 @@ const toModule = computed(() =>
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu ref="menuRef">
+                    <QMenu :ref="menuRef">
                         <QList>
                             <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index e8dd5b31c..5ca57ae8e 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -98,14 +98,6 @@ const columns = computed(() => [
         isTitle: true,
         columnFilter: {
             inWhere: true,
-            // component: 'select',
-            // attrs: {
-            //     url: 'Items',
-            //     useLike: false,
-            //     fields: ['id', 'name'],
-            //     optionLabel: 'name',
-            //     optionValue: 'id',
-            // },
         },
     },
     {
@@ -181,7 +173,6 @@ const logTableColumns = computed(() => [
         name: 'created',
         field: 'created',
         align: 'center',
-        columnFilter: null,
         format: (value) => toDateTimeFormat(value),
     },
     {
@@ -189,11 +180,6 @@ const logTableColumns = computed(() => [
         name: 'isScanned',
         field: 'isScanned',
         align: 'center',
-        columnFilter: null,
-        format: (value) => {
-            if (value === true) return t('expedition.yes');
-            else return t('expedition.no');
-        },
     },
 ]);
 
@@ -365,6 +351,15 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </span>
                 </QTd>
             </template>
+            <template #body-cell-isScanned="{ row }">
+                <QTd style="text-align: center">
+                    <QCheckbox disable v-model="row.isScanned">
+                        {{
+                            row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
+                        }}
+                    </QCheckbox>
+                </QTd>
+            </template>
         </QTable>
     </QDialog>
 </template>

From 61f1eae282d94617dd1ce2d40cc9f2843f5af236 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Jul 2024 12:01:46 +0200
Subject: [PATCH 03/74] fix: deleted branch cloned wrongly

---
 salix-front-mindshore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 salix-front-mindshore

diff --git a/salix-front-mindshore b/salix-front-mindshore
deleted file mode 160000
index 7432396ce..000000000
--- a/salix-front-mindshore
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7432396ceafb7fe46b8ed8ac28fa7753df57efd2

From 954a6ff6c0c197821051e030a6a671586a1c7d09 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 2 Aug 2024 13:55:51 +0200
Subject: [PATCH 04/74] refacotr: refs #7553 refactor sales, purchaseRequest
 and saleTracking

---
 src/pages/Monitor/SalesTicketsTable.vue       |   4 +-
 .../Ticket/Card/TicketPurchaseRequest.vue     | 310 +++++++++---------
 src/pages/Ticket/Card/TicketSale.vue          | 259 +++++++--------
 src/pages/Ticket/Card/TicketSaleTracking.vue  |  16 +-
 4 files changed, 303 insertions(+), 286 deletions(-)

diff --git a/src/pages/Monitor/SalesTicketsTable.vue b/src/pages/Monitor/SalesTicketsTable.vue
index 1ca68240b..1dd0557ab 100644
--- a/src/pages/Monitor/SalesTicketsTable.vue
+++ b/src/pages/Monitor/SalesTicketsTable.vue
@@ -303,7 +303,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.goToLines'),
                 icon: 'vn:lines',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => redirectToSales(row.id),
                 isPrimary: true,
                 attrs: {
@@ -314,7 +314,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.preview'),
                 icon: 'preview',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),
                 isPrimary: true,
                 attrs: {
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 35573cf2d..3efdcbef8 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -1,27 +1,32 @@
 <script setup>
 import { ref, computed, watch, reactive } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import TicketCreateRequest from './TicketCreateRequest.vue';
-
 import { dashIfEmpty } from 'src/filters';
 import { toDateFormat } from 'src/filters/date.js';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import useNotify from 'src/composables/useNotify.js';
 
 const route = useRoute();
 const { t } = useI18n();
-const createTicketRequestDialogRef = ref(null);
-const crudModelRef = ref(null);
+const tableRef = ref();
+const attendersOptions = ref([]);
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
 
 watch(
     () => route.params.id,
     async (val) => {
         crudModelFilter.where.ticketFk = val;
-        crudModelRef.value.reload();
+        tableRef.value.reload();
     }
 );
 
@@ -72,64 +77,90 @@ const crudModelFilter = reactive({
 
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('purchaseRequest.id'),
         name: 'id',
-        field: 'id',
-        align: 'left',
-        columnFilter: null,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.description'),
         name: 'description',
-        field: 'description',
-        align: 'left',
-        format: (val) => dashIfEmpty(val),
+        columnClass: 'expand',
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.created'),
         name: 'created',
-        field: 'created',
-        align: 'left',
-        format: (val) => toDateFormat(val),
+        format: (row) => toDateFormat(row.created),
+        cardVisible: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.requester'),
-        name: 'requester',
-        align: 'left',
-        sortable: true,
+        name: 'requesterFk',
+        cardVisible: true,
+        format: (row) => dashIfEmpty(row.requester?.user?.nickname),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.atender'),
-        name: 'atender',
-        align: 'left',
+        name: 'attenderFk',
+        cardVisible: true,
+        format: (row) => dashIfEmpty(row.atender?.user?.nickname),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.quantity'),
         name: 'quantity',
-        align: 'left',
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.price'),
         name: 'price',
-        align: 'left',
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.saleFk'),
         name: 'saleFk',
-        align: 'left',
+        cardVisible: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.state'),
-        name: 'state',
-        field: 'isOk',
-        align: 'left',
-        format: (val) => t(getRequestState(val)),
+        name: 'isOk',
+        cardVisible: true,
+        isHidden: true,
     },
     {
-        label: '',
-        name: 'actions',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('globals.delete'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) =>
+                    openConfirmationModal(
+                        t('You are going to delete this ticket purchase request'),
+                        t(
+                            'This ticket will be removed from ticket purchase requests! Continue anyway?'
+                        ),
+                        () => removeLine(row.id)
+                    ),
+            },
+        ],
     },
 ]);
 
@@ -140,131 +171,114 @@ const getRequestState = (state) => {
         case false:
             return 'Denied';
         case true:
-            return 'Acepted';
+            return 'Accepted';
     }
 };
 
 const isEditable = (isOk) => isOk !== null;
 
-const removeLine = async (row) => crudModelRef.value.remove([row]);
-
-const openCreateModal = () => createTicketRequestDialogRef.value.show();
+async function removeLine(id) {
+    try {
+        await axios.delete(`TicketRequests/${id}`);
+        notify(t('globals.dataSaved'), 'positive');
+        location.reload();
+    } catch (err) {
+        console.error('Error ', err);
+    }
+}
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md">
-        <CrudModel
-            data-key="PurchaseRequests"
-            url="TicketRequests"
-            ref="crudModelRef"
-            :filter="crudModelFilter"
-            :order="['created ASC']"
-            :default-remove="false"
-            :default-save="false"
-            :default-reset="false"
-            :limit="0"
-            auto-load
-        >
-            <template #body="{ rows }">
-                <QTable
-                    :rows="rows"
-                    :columns="columns"
-                    row-key="id"
-                    :pagination="{ rowsPerPage: 0 }"
-                    class="full-width q-mt-md"
-                    :no-data-label="t('globals.noResults')"
-                    @row-click="(_, row) => redirectToTicketSummary(row.ticketFk)"
-                >
-                    <template #body-cell-description="{ row }">
-                        <QTd @click.stop>
-                            <VnInput
-                                v-model="row.description"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #body-cell-requester="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn flat>
-                                    {{ row.requester?.user?.nickname }}
-                                    <WorkerDescriptorProxy :id="row.requesterFk" />
-                                </QBtn>
-                            </span>
-                        </QTd>
-                    </template>
-                    <template #body-cell-atender="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn flat>
-                                    {{ row.atender?.user?.nickname }}
-                                    <WorkerDescriptorProxy :id="row.attenderFk" />
-                                </QBtn>
-                            </span>
-                        </QTd>
-                    </template>
-                    <template #body-cell-quantity="{ row }">
-                        <QTd @click.stop>
-                            <VnInput
-                                v-model="row.quantity"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #body-cell-price="{ row }">
-                        <QTd @click.stop>
-                            <VnInput
-                                v-model="row.price"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #body-cell-saleFk="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn v-if="row.saleFk" flat>
-                                    {{ row.sale.itemFk }}
-                                    <ItemDescriptorProxy :id="row.sale.itemFk" />
-                                </QBtn>
-                            </span>
-                        </QTd>
-                    </template>
-                    <template #body-cell-actions="{ row }">
-                        <QTd>
-                            <QIcon
-                                @click.stop="removeLine(row)"
-                                class="q-ml-sm cursor-pointer"
-                                color="primary"
-                                name="delete"
-                                size="sm"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.delete') }}
-                                </QTooltip>
-                            </QIcon>
-                        </QTd>
-                    </template>
-                </QTable>
-            </template>
-        </CrudModel>
-        <QDialog
-            ref="createTicketRequestDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <TicketCreateRequest @on-request-created="crudModelRef.reload()" />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn @click="openCreateModal()" color="primary" fab icon="add" />
-            <QTooltip class="text-no-wrap">
-                {{ t('purchaseRequest.newRequest') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
+        auto-load
+        @on-fetch="(data) => (attendersOptions = data)"
+    />
+    <VnTable
+        ref="tableRef"
+        data-key="PurchaseRequests"
+        url="TicketRequests"
+        :create="{
+            urlCreate: 'TicketRequests',
+            title: t('Create request'),
+            onDataSaved: ({ id }) => tableRef.reload(id),
+            formInitialData: {
+                ticketFk: route.params.id,
+            },
+        }"
+        save-url="TicketRequests/crud"
+        :filter="crudModelFilter"
+        :columns="columns"
+        :is-editable="true"
+        :right-search="false"
+        auto-load
+    >
+        <template #column-description="{ row }">
+            <VnInput v-model="row.description" :disable="isEditable(row.isOk)" />
+        </template>
+        <template #column-requesterFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.requester?.user?.nickname }}
+                <WorkerDescriptorProxy :id="row.requesterFk" />
+            </span>
+        </template>
+        <template #column-attenderFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.atender?.user?.nickname }}
+                <WorkerDescriptorProxy :id="row.attenderFk" />
+            </span>
+        </template>
+        <template #column-quantity="{ row }">
+            <VnInput v-model="row.quantity" :disable="isEditable(row.isOk)" />
+        </template>
+        <template #column-price="{ row }">
+            <span @click.stop>
+                <VnInput v-model="row.price" :disable="isEditable(row.isOk)">
+                    {{ row.price }}
+                </VnInput>
+            </span>
+        </template>
+        <template #column-saleFk="{ row }">
+            <QTd style="width: 3%">
+                <span class="link" @click.stop>
+                    {{ dashIfEmpty(row.sale?.itemFk) }}
+                    <ItemDescriptorProxy :id="row.sale?.itemFk" /> </span
+            ></QTd>
+        </template>
+        <template #column-isOk="{ row }">
+            {{ t(getRequestState(row.isOk)) }}
+        </template>
+
+        <template #more-create-dialog="{ data }">
+            <VnInput
+                v-model="data.description"
+                :label="t('purchaseRequest.description')"
+            />
+            <VnSelect
+                :label="t('purchaseRequest.atender')"
+                v-model="data.attenderFk"
+                :options="attendersOptions"
+                hide-selected
+                option-label="nickname"
+                option-value="id"
+            />
+            <VnInput
+                v-model="data.quantity"
+                :label="t('purchaseRequest.quantity')"
+                type="number"
+                min="1"
+            />
+            <VnInput
+                v-model="data.price"
+                :label="t('purchaseRequest.price')"
+                type="number"
+                min="0"
+            />
+        </template>
+    </VnTable>
 </template>
+
 <i18n>
     es:
         New: Nueva
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 13fea42b4..853913285 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -16,11 +16,12 @@ import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
 import TicketTransfer from './TicketTransfer.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toPercentage, dashIfEmpty } from 'src/filters';
+import { toCurrency, toPercentage } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -33,7 +34,8 @@ const stateBtnDropdownRef = ref(null);
 
 const arrayData = useArrayData('ticketData');
 const { store } = arrayData;
-
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
 const ticketConfig = ref(null);
 const isLocked = ref(false);
 const isTicketEditable = ref(false);
@@ -56,86 +58,104 @@ watch(
 
 const columns = computed(() => [
     {
-        label: '',
+        align: 'left',
         name: 'statusIcons',
-        align: 'left',
+        hidden: true,
     },
     {
-        label: '',
-        name: 'picture',
-        align: 'left',
+        align: 'center',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
     },
     {
+        align: 'left',
         label: t('ticketSale.visible'),
         name: 'visible',
-        field: 'visible',
-        align: 'left',
-        sortable: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.visible),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.available'),
         name: 'available',
-        field: 'available',
-        align: 'left',
-        sortable: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.available),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.id'),
         name: 'itemFk',
-        field: 'itemFk',
-        align: 'left',
-        sortable: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.quantity'),
         name: 'quantity',
-        field: 'quantity',
-        align: 'left',
-        sortable: true,
+        cardVisible: true,
+        format: (row) => toCurrency(row.quantity),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.item'),
         name: 'item',
-        field: 'item',
-        align: 'left',
-        sortable: true,
+        format: (row) => row?.item?.name,
+        columnClass: 'expand',
+        cardVisible: true,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.price'),
         name: 'price',
-        field: 'price',
-        align: 'left',
-        sortable: true,
-        format: (val) => toCurrency(val),
+        cardVisible: true,
+        format: (row) => toCurrency(row.price),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.discount'),
         name: 'discount',
-        field: 'discount',
-        align: 'left',
-        sortable: true,
+        cardVisible: true,
+        format: (row) => toPercentage(row.discount),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.amount'),
         name: 'amount',
-        field: 'amount',
-        align: 'left',
-        sortable: true,
-        format: (val) => toCurrency(val),
+        format: (row) => parseInt(row.amount * row.quantity),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.packaging'),
         name: 'itemPackingTypeFk',
-        field: 'item',
-        align: 'left',
-        sortable: true,
-        format: (val) => dashIfEmpty(val?.itemPackingTypeFk),
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
+        hidden: true,
     },
     {
-        label: '',
-        name: 'history',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('ticketSale.history'),
+                icon: 'history',
+                isPrimary: true,
+                action: (row) => goToLog(row.id),
+            },
+        ],
     },
 ]);
 
@@ -478,7 +498,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     :ticket="store.data"
                     :is-ticket-editable="isTicketEditable"
                     :sales="selectedValidSales"
-                    :disable="!selectedSales.length"
+                    :disable="!hasSelectedRows"
                     :mana="mana"
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
@@ -487,7 +507,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QBtn
                     color="primary"
                     icon="delete"
-                    :disable="!isTicketEditable || !selectedSales.length"
+                    :disable="!isTicketEditable || !hasSelectedRows"
                     @click="
                         openConfirmationModal(
                             t('Continue anyway?'),
@@ -501,7 +521,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QBtn
                     color="primary"
                     icon="vn:splitline"
-                    :disable="!isTicketEditable || !selectedSales.length"
+                    :disable="!isTicketEditable || !hasSelectedRows"
                     @click="setTransferParams()"
                 >
                     <QTooltip>{{ t('Transfer lines') }}</QTooltip>
@@ -540,17 +560,21 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QCardSection>
         </div></QDrawer
     >
-    <QTable
-        :rows="sales"
+    <!-- TODO: el botón de añadir filas como está en salix-->
+    <VnTable
+        ref="tableRef"
+        data-key="TicketSales"
+        :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        selection="multiple"
-        v-model:selected="selectedSales"
-        :no-data-label="t('globals.noResults')"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+        :right-search="false"
+        auto-load
     >
-        <template #body-cell-statusIcons="{ row }">
+        <template #column-statusIcons="{ row }">
             <QTd class="q-gutter-x-xs">
                 <router-link
                     v-if="row.claim?.claimFk"
@@ -595,58 +619,40 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QIcon>
             </QTd>
         </template>
-        <template #body-cell-picture="{ row }">
-            <QTd>
-                <div class="image-wrapper">
-                    <VnImg :id="row.itemFk" class="rounded" />
+        <template #column-image="{ row }">
+            <div class="image-wrapper">
+                <VnImg :id="parseInt(row?.item?.id)" class="rounded" />
+            </div>
+        </template>
+        <template #column-visible="{ row }">
+            <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+                {{ row.visible }}
+            </QBadge>
+        </template>
+        <template #column-available="{ row }">
+            <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+                {{ row.available }}
+            </QBadge>
+        </template>
+        <template #column-itemFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row?.itemFk }}
+                <ItemDescriptorProxy :id="row?.itemFk" />
+            </span>
+        </template>
+        <template #column-item="{ row }">
+            <div class="row column full-width justify-between items-start">
+                {{ row?.item?.name }}
+                <div v-if="row?.item?.subName" class="subName">
+                    {{ row?.item?.subName.toUpperCase() }}
                 </div>
-            </QTd>
+            </div>
+            <FetchedTags :item="row?.item" :max-length="6" />
+            <QPopupProxy v-if="row.id && isTicketEditable">
+                <VnInput v-model="row.concept" @change="updateConcept(row)" />
+            </QPopupProxy>
         </template>
-        <template #body-cell-visible="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.visible < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.visible }}
-                </QBadge>
-            </QTd>
-        </template>
-        <template #body-cell-available="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.available }}
-                </QBadge>
-            </QTd>
-        </template>
-        <template #body-cell-itemFk="{ row }">
-            <QTd @click.stop>
-                <div v-if="row.id">
-                    <span class="link">
-                        <QBtn flat dense>
-                            {{ row.itemFk }}
-                        </QBtn>
-                        <ItemDescriptorProxy :id="row.itemFk" />
-                    </span>
-                </div>
-                <VnSelect
-                    v-else
-                    :options="itemsWithNameOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    @update:model-value="changeQuantity(row)"
-                    v-model="row.itemFk"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </QTd>
-        </template>
-        <template #body-cell-quantity="{ row }">
+        <template #column-quantity="{ row }">
             <QTd @click.stop>
                 <VnInput
                     v-if="isTicketEditable"
@@ -658,19 +664,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span v-else>{{ row.quantity }}</span>
             </QTd>
         </template>
-        <template #body-cell-item="{ row }">
-            <QTd class="col">
-                <div class="column">
-                    <span>{{ row.concept }}</span>
-                    <span class="color-vn-label">{{ row.item?.subName }}</span>
-                    <FetchedTags v-if="row.item" :item="row.item" :max-length="6" />
-                    <QPopupProxy v-if="row.id && isTicketEditable">
-                        <VnInput v-model="row.concept" @change="updateConcept(row)" />
-                    </QPopupProxy>
-                </div>
-            </QTd>
-        </template>
-        <template #body-cell-price="{ row }">
+        <template #column-price="{ row }">
             <QTd>
                 <template v-if="isTicketEditable && row.id">
                     <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
@@ -692,7 +686,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span v-else>{{ toCurrency(row.price) }}</span>
             </QTd>
         </template>
-        <template #body-cell-discount="{ row }">
+        <template #column-discount="{ row }">
             <QTd>
                 <template v-if="!isLocked && row.id">
                     <QBtn
@@ -718,21 +712,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span v-else>{{ toPercentage(row.discount / 100) }}</span>
             </QTd>
         </template>
-        <template #body-cell-history="{ row }">
-            <QTd>
-                <QBtn
-                    v-if="row.$hasLogs"
-                    @click.stop="goToLog(row.id)"
-                    color="primary"
-                    icon="history"
-                    size="md"
-                    flat
-                >
-                    <QTooltip class="text-no-wrap">
-                        {{ t('ticketSale.history') }}
-                    </QTooltip>
-                </QBtn>
-            </QTd>
+        <template #column-amount="{ row }">
+            {{ toCurrency(row.quantity * row.price) }}
         </template>
         <template #bottom-row>
             <QBtn
@@ -750,7 +731,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTooltip>
             </QBtn>
         </template>
-    </QTable>
+    </VnTable>
 
     <QPageSticky :offset="[20, 20]">
         <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
@@ -760,6 +741,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QPageSticky>
 </template>
 
+<style lang="scss" scoped>
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+}
+
+.subName {
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
+</style>
+
 <i18n>
 es:
     New item: Nuevo artículo
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 93aa627e6..8097c68ef 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -345,7 +345,7 @@ const qCheckBoxController = (sale, action) => {
         :no-data-label="t('globals.noResults')"
     >
         <template #body-cell-isChecked="{ row }">
-            <QTd @click.stop>
+            <QTd @click.stop style="width: 20%">
                 <QCheckbox
                     :model-value="!!row.hasSaleGroupDetail"
                     color="pink"
@@ -404,7 +404,7 @@ const qCheckBoxController = (sale, action) => {
             </QTd>
         </template>
         <template #body-cell-item="{ row }">
-            <QTd @click.stop>
+            <QTd @click.stop style="width: 20%">
                 <div>
                     <span class="link">
                         <QBtn flat>
@@ -426,8 +426,18 @@ const qCheckBoxController = (sale, action) => {
                 </div>
             </QTd>
         </template>
+        <template #body-cell-quantity="{ row }">
+            <QTd style="width: 10%">
+                {{ row.quantity }}
+            </QTd>
+        </template>
+        <template #body-cell-parking="{ row }">
+            <QTd style="width: 10%">
+                {{ dashIfEmpty(row.parkingFk) }}
+            </QTd>
+        </template>
         <template #body-cell-actions="{ row }">
-            <QTd>
+            <QTd style="width: 20%">
                 <QBtn
                     @click.stop="showLog(row)"
                     color="primary"

From 4a57c53c3da495a67b9849886b988eda54a06b11 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 19 Aug 2024 11:30:20 +0200
Subject: [PATCH 05/74] fix: refs #7553 & #7356 migration

---
 src/components/VnTable/VnTable.vue            |  21 +
 src/composables/useArrayData.js               |   2 +-
 src/i18n/locale/en.yml                        |   8 +-
 src/i18n/locale/es.yml                        |   6 +
 src/pages/Ticket/Card/TicketDescriptor.vue    |  21 +
 .../Ticket/Card/TicketDescriptorMenu.vue      | 107 ++++-
 src/pages/Ticket/Card/TicketSale.vue          |  92 ++--
 src/pages/Ticket/Card/TicketService.vue       |   2 +-
 src/pages/Ticket/Card/TicketSummary.vue       |  47 +-
 src/pages/Ticket/Card/TicketTracking.vue      |  12 +-
 src/pages/Ticket/Card/TicketVolume.vue        |  10 +-
 src/pages/Ticket/TicketAdvance.vue            | 414 ++++++------------
 src/pages/Ticket/TicketList.vue               | 296 +++++++++++++
 src/pages/Ticket/locale/en.yml                |  19 +
 src/pages/Ticket/locale/es.yml                |  19 +
 15 files changed, 730 insertions(+), 346 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3344f53b4..1fc4947f0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -49,6 +49,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    bottom: {
+        type: Object,
+        default: null,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -388,6 +392,11 @@ defineExpose({
                             @click="stateStore.toggleRightDrawer()"
                         />
                     </template>
+                    <template #top>
+                        <div class="full-width-slot">
+                            <slot name="before-header" />
+                        </div>
+                    </template>
                     <template #header-cell="{ col }">
                         <QTh v-if="col.visible ?? true">
                             <div
@@ -482,6 +491,9 @@ defineExpose({
                             />
                         </QTd>
                     </template>
+                    <template #bottom v-if="bottom">
+                        <slot name="bottom-table" />
+                    </template>
                     <template #item="{ row, colsMap }">
                         <component
                             :is="$props.redirect ? 'router-link' : 'span'"
@@ -780,4 +792,13 @@ es:
     cursor: text;
     user-select: all;
 }
+
+.full-width-slot {
+    width: 100%;
+    display: flex;
+    text-align: center;
+    color: var(--vn-text-color);
+    margin-bottom: -1%;
+    background-color: var(--vn-header-color);
+}
 </style>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 50d620a34..651bcefb0 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -28,7 +28,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             delete params.filter;
             store.userParams = { ...params, ...store.userParams };
             store.userFilter = { ...filter, ...store.userFilter };
-            if (filter.order) store.order = filter.order;
+            if (filter?.order) store.order = filter.order;
         }
     });
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 6943252c9..a04b3af15 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -578,6 +578,8 @@ ticket:
         warehouse: Warehouse
         customerCard: Customer card
         alias: Alias
+        ticketList: Ticket List
+        newOrder: New Order
     boxing:
         expedition: Expedition
         item: Item
@@ -628,6 +630,11 @@ ticket:
         weight: Weight
         goTo: Go to
         summaryAmount: Summary
+        purchaseRequest: Purchase request
+        service: Service
+        description: Description
+        attender: Attender
+        ok: Ok
     create:
         client: Client
         address: Address
@@ -651,7 +658,6 @@ invoiceOut:
         client: Client
         company: Company
         customerCard: Customer card
-        ticketList: Ticket List
     summary:
         issued: Issued
         created: Created
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f32562313..642017c8e 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -584,6 +584,8 @@ ticket:
         warehouse: Almacén
         customerCard: Ficha del cliente
         alias: Alias
+        ticketList: Listado de tickets
+        newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
         item: Artículo
@@ -634,6 +636,10 @@ ticket:
         weight: Peso
         goTo: Ir a
         summaryAmount: Resumen
+        purchaseRequest: Petición de compra
+        service: Servicio
+        description: Descripción
+        attender: Comprador
     create:
         client: Cliente
         address: Dirección
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index f68c897db..e4a349f12 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -87,6 +87,11 @@ const filter = {
 };
 
 const data = ref(useCardDescription());
+
+function ticketFilter(ticket) {
+    console.log('ticket: ', ticket);
+    return JSON.stringify({ clientFk: ticket.clientFk });
+}
 </script>
 
 <template>
@@ -159,6 +164,22 @@ const data = ref(useCardDescription());
                 >
                     <QTooltip>{{ t('ticket.card.customerCard') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    size="md"
+                    icon="vn:ticket"
+                    color="primary"
+                    :to="{ name: 'TicketList', query: { table: ticketFilter(entity) } }"
+                >
+                    <QTooltip>{{ t('ticket.card.ticketList') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    size="md"
+                    icon="vn:basketadd"
+                    color="primary"
+                    :to="{ name: 'OrderList' }"
+                >
+                    <QTooltip>{{ t('ticket.card.newOrder') }}</QTooltip>
+                </QBtn>
             </QCardActions>
         </template>
     </CardDescriptor>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index c7784bc2a..31f85582c 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -24,6 +24,7 @@ const { openReport, sendEmail } = usePrintService();
 
 const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
+const showWeightDialog = ref(false);
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -153,30 +154,66 @@ function openConfirmDialog(callback) {
         },
     });
 }
+
+function createPdfDialog() {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            promise: createPdfInvoice,
+        },
+    });
+}
+
+async function createPdfInvoice() {
+    const { data } = await axios.get('invoiceOuts', {
+        params: {
+            filter: JSON.stringify({
+                where: { ref: ticket.value.refFk },
+            }),
+        },
+    });
+    const invoiceId = data[0].id;
+    const { response } = await axios.post(`InvoiceOuts/${invoiceId}/createPdf`);
+    if (!response) {
+        notify({
+            message: 'The invoice PDF document has been regenerated',
+            type: 'positive',
+        });
+    }
+}
+
+function setWeightToTicket(weight) {
+    console.log('weight: ', weight);
+    const { data } = axios.patch(`Tickets/${ticketId}`, {
+        weight: weight,
+    });
+    console.log('data: ', data);
+    if (data) window.location.reload();
+}
 </script>
 <template>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
         </QItemSection>
-        <QItemSection>{{ t('Open Delivery Note...') }}</QItemSection>
+        <QItemSection>{{ t('Show Delivery Note...') }}</QItemSection>
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
         <QMenu anchor="top end" self="top start" auto-close bordered>
             <QList>
                 <QItem @click="openDeliveryNote('deliveryNote')" v-ripple clickable>
-                    <QItemSection>{{ t('With prices') }}</QItemSection>
+                    <QItemSection>{{ t('as PDF') }}</QItemSection>
                 </QItem>
                 <QItem @click="openDeliveryNote('withoutPrices')" v-ripple clickable>
-                    <QItemSection>{{ t('Without prices') }}</QItemSection>
+                    <QItemSection>{{ t('as PDF without prices') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="openDeliveryNote('deliveryNote', 'csv')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('As CSV') }}</QItemSection>
+                    <QItemSection>{{ t('as CSV') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
@@ -196,21 +233,21 @@ function openConfirmDialog(callback) {
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('With prices') }}</QItemSection>
+                    <QItemSection>{{ t('Send PDF') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('withoutPrices')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('Without prices') }}</QItemSection>
+                    <QItemSection>{{ t('Send PDF to tablet') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('deliveryNote', 'csv')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('As CSV') }}</QItemSection>
+                    <QItemSection>{{ t('Send CSV') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
@@ -219,7 +256,7 @@ function openConfirmDialog(callback) {
         <QItemSection avatar>
             <QIcon name="receipt" />
         </QItemSection>
-        <QItemSection>{{ t('Open Proforma Invoice') }}</QItemSection>
+        <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection avatar>
@@ -235,24 +272,54 @@ function openConfirmDialog(callback) {
                     <QItemSection>{{ t('Pending payment') }}</QItemSection>
                 </QItem>
                 <QItem @click="showSmsDialog('minAmount')" v-ripple clickable>
-                    <QItemSection>{{ t('Minimum amount') }}</QItemSection>
+                    <QItemSection>{{ t('Minimum import') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="showSmsDialogWithChanges('orderChanges')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('Order changes') }}</QItemSection>
+                    <QItemSection>{{ t('Notify changes') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
     </QItem>
+    <QItem @click="createPdfDialog()" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="picture_as_pdf" />
+        </QItemSection>
+        <QItemSection>{{ t('Regenerate PDF invoice') }}</QItemSection>
+    </QItem>
     <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="content_copy" />
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem @click="showWeightDialog = !showWeightDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_paste" />
+        </QItemSection>
+        <QItemSection>{{ t('Set ticket weight') }}</QItemSection>
+    </QItem>
+    <QDialog v-model="showWeightDialog" transition-show="scale" transition-hide="scale">
+        <QCard>
+            <QCardSection>
+                <QInput
+                    v-model="weight"
+                    type="number"
+                    :label="t('Weight')"
+                    @update:model-value="setWeightToTicket"
+                />
+                <QBtn flat v-close-popup class="text-primary">
+                    {{ t('Close') }}
+                </QBtn>
+                <QBTn flat @click="setWeightToTicket" class="text-primary">
+                    {{ t('Save') }}
+                </QBTn>
+            </QCardSection>
+        </QCard>
+    </QDialog>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -266,20 +333,26 @@ function openConfirmDialog(callback) {
 
 <i18n>
 es:
-    Open Delivery Note...: Abrir albarán...
+    Show Delivery Note...: Ver albarán...
     Send Delivery Note...: Enviar albarán...
-    With prices: Con precios
-    Without prices: Sin precios
-    As CSV: Como CSV
-    Open Proforma Invoice: Abrir factura proforma
+    as PDF: como PDF
+    as PDF without prices: como PDF sin precios
+    as CSV: Como CSV
+    Send PDF: Enviar PDF
+    Send PDF to tablet: Enviar PDF a tablet
+    Send CSV: Enviar CSV
+    Show Proforma: Ver proforma
     Delete ticket: Eliminar ticket
     Send SMS...: Enviar SMS
     Pending payment: Pago pendiente
-    Minimum amount: Importe mínimo
-    Order changes: Cambios del pedido
+    Minimum import: Importe mínimo
+    Notify changes: Notificar cambios
     Ticket deleted: Ticket eliminado
     You can undo this action within the first hour: Puedes deshacer esta acción dentro de la primera hora
     To clone ticket: Clonar ticket
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
+    Regenerate PDF invoice: Regenerar PDF factura
+    The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
+    Set ticket weight: Establecer peso al ticket
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 853913285..f2c5228b4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,6 +22,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -50,6 +51,9 @@ const transfer = ref({
     lastActiveTickets: [],
     sales: [],
 });
+const tableRef = ref([]);
+const formModelPopupRef = ref();
+const showForm = ref(false);
 
 watch(
     () => route.params.id,
@@ -395,7 +399,7 @@ const changeTicketState = async (val) => {
 };
 
 const removeSelectedSales = () => {
-    selectedSales.value.forEach((sale) => {
+    selectedRows.value.forEach((sale) => {
         const index = sales.value.indexOf(sale);
         sales.value.splice(index, 1);
     });
@@ -403,17 +407,16 @@ const removeSelectedSales = () => {
 
 const removeSales = async () => {
     try {
-        const params = { sales: selectedValidSales.value, ticketId: store.data.id };
+        const params = { sales: selectedRows.value, ticketId: store.data.id };
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');
+        window.location.reload();
     } catch (err) {
         console.error('Error deleting sales', err);
     }
 };
 
-const insertRow = () => sales.value.push({ ...DEFAULT_EDIT });
-
 const setTransferParams = async () => {
     try {
         const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
@@ -442,6 +445,15 @@ onMounted(async () => {
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+async function save(item) {
+    const { data } = await axios.post(`Tickets/${route.params.id}/addSale`, {
+        id: route.params.id,
+        barcode: item.itemFk,
+        quantity: parseInt(item.quantity),
+    });
+    if (data) window.location.reload();
+}
 </script>
 
 <template>
@@ -455,12 +467,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (isLocked = data)"
     />
-    <FetchData
-        url="Items/withName"
-        :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
-        auto-load
-        @on-fetch="(data) => (itemsWithNameOptions = data)"
-    />
     <FetchData
         url="States/editableStates"
         :filter="{ fields: ['code', 'name', 'id', 'alertLevel'], order: 'name ASC' }"
@@ -560,13 +566,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QCardSection>
         </div></QDrawer
     >
-    <!-- TODO: el botón de añadir filas como está en salix-->
     <VnTable
         ref="tableRef"
         data-key="TicketSales"
         :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
         v-model:selected="selectedRows"
+        :bottom="true"
         :table="{
             'row-key': 'id',
             selection: 'multiple',
@@ -625,7 +631,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </div>
         </template>
         <template #column-visible="{ row }">
-            <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+            <QBadge :color="row.visible < 0 ? 'alert' : 'transparent'" dense>
                 {{ row.visible }}
             </QBadge>
         </template>
@@ -667,7 +673,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #column-price="{ row }">
             <QTd>
                 <template v-if="isTicketEditable && row.id">
-                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
+                    <QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
                         {{ toCurrency(row.price) }}
                     </QBtn>
                     <TicketEditManaProxy
@@ -689,12 +695,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #column-discount="{ row }">
             <QTd>
                 <template v-if="!isLocked && row.id">
-                    <QBtn
-                        flat
-                        color="primary"
-                        dense
-                        @click="onOpenEditDiscountPopover(row)"
-                    >
+                    <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                         {{ toPercentage(row.discount / 100) }}
                     </QBtn>
                     <TicketEditManaProxy
@@ -715,21 +716,54 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
         </template>
-        <template #bottom-row>
-            <QBtn
-                class="cursor-pointer fill-icon q-ml-md q-my-lg"
+        <template #bottom-table v-if="isTicketEditable">
+            <QIcon
+                @click="showForm = !showForm"
+                class="fill-icon-on-hover"
                 color="primary"
-                icon="add_circle"
-                size="md"
-                round
-                flat
-                :disable="!isTicketEditable"
-                @click="insertRow()"
+                name="add_circle"
+                size="sm"
             >
                 <QTooltip>
                     {{ t('Add item') }}
                 </QTooltip>
-            </QBtn>
+            </QIcon>
+            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+                <FormModelPopup
+                    ref="formModelPopupRef"
+                    :url-create="`Tickets/${route.params.id}/addSale`"
+                    :title="t('New item')"
+                    :form-initial-data="{
+                        price: 0,
+                        discount: 0,
+                        visible: 0,
+                        available: 0,
+                        packaging: null,
+                    }"
+                    :save-fn="save"
+                >
+                    <template #form-inputs="{ data }">
+                        <VnSelect
+                            url="Items/withName"
+                            :option-filter="{
+                                order: 'id DESC',
+                            }"
+                            :fields="['id', 'name']"
+                            :label="t('Items')"
+                            option-label="name"
+                            option-value="id"
+                            :options="itemsWithNameOptions"
+                            hide-selected
+                            v-model="data.itemFk"
+                        />
+                        <VnInput
+                            v-model="data.quantity"
+                            :label="t('Quantity')"
+                            type="number"
+                        />
+                    </template>
+                </FormModelPopup>
+            </QDialog>
         </template>
     </VnTable>
 
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 63dd454ba..bdfb7ea8c 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -50,7 +50,7 @@ const createRefund = async () => {
         if (!selected.value.length) return;
 
         const params = {
-            servicesIds: selected.value.map((s) => +s.ticketFk),
+            servicesIds: selected.value.map((s) => +s.id),
             withWarehouse: false,
             negative: true,
         };
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 295e8bca5..4a0839655 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -425,7 +425,7 @@ async function changeState(value) {
                 <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
                 <QTable :rows="ticket.packagings" flat>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.package') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
@@ -445,7 +445,7 @@ async function changeState(value) {
                 />
                 <QTable :rows="ticket.services" flat>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
@@ -466,6 +466,49 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
+            <QCard class="vn-max" v-if="ticket.requests.length > 0">
+                <VnTitle
+                    :url="ticketUrl + 'request'"
+                    :text="t('ticket.summary.purchaseRequest')"
+                />
+                <QTable :rows="ticket.requests" flat>
+                    <template #header="props">
+                        <QTr class="tr-header" :props="props">
+                            <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.requester') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.attender') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.ok') }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd>{{ toDate(props.row.created) }}</QTd>
+                            <QTd>{{ props.row.description }}</QTd>
+                            <QTd>{{ props.row.requester?.user?.username }}</QTd>
+                            <QTd>{{ props.row.atender?.user?.username }}</QTd>
+                            <QTd>{{ props.row.quantity }}</QTd>
+                            <QTd>{{ toCurrency(props.row.price) }}</QTd>
+                            <QTd>
+                                <span class="link" v-if="props.row.isOk">
+                                    {{ props.row.itemFk }}
+                                    <ItemDescriptorProxy :id="props.row.itemFk" />
+                                </span>
+                            </QTd>
+                            <QTd>
+                                <QCheckbox
+                                    v-model="props.row.isOk"
+                                    disable
+                                    :toggle-indeterminate="false"
+                                />
+                            </QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
         </template>
     </CardSummary>
 </template>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 62d755c4d..f747ae024 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -94,13 +94,11 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
                     :no-data-label="t('globals.noResults')"
                 >
                     <template #body-cell-worker="{ row }">
-                        <QTd @click.stop>
-                            <span class="link">
-                                <QBtn flat>
-                                    {{ row.user?.name }}
-                                    <WorkerDescriptorProxy :id="row.user?.worker?.id" />
-                                </QBtn>
-                            </span>
+                        <QTd>
+                            <QBtn flat class="link" @click.stop>
+                                {{ row.user?.name }}
+                                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
+                            </QBtn>
                         </QTd>
                     </template>
                 </QTable>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index a021cfbf1..a47a127c1 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -134,12 +134,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     >
         <template #body-cell-item="{ row }">
             <QTd>
-                <span class="link">
-                    <QBtn flat>
-                        {{ row.itemFk }}
-                        <ItemDescriptorProxy :id="row.itemFk" />
-                    </QBtn>
-                </span>
+                <QBtn flat class="link" @click.stop>
+                    {{ row.itemFk }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index bf4000fdf..1c926491c 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -3,8 +3,8 @@ import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+// import VnInput from 'src/components/common/VnInput.vue';
+// import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -19,13 +19,14 @@ import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const { notify } = useNotify();
 const user = state.getUser();
-
+const tableRef = ref();
 const itemPackingTypesOptions = ref([]);
 const zonesOptions = ref([]);
 const selectedTickets = ref([]);
@@ -44,15 +45,14 @@ const exprBuilder = (param, value) => {
         case 'notMovableLines':
         case 'futureZoneFk':
             return { [param]: value };
-        case 'iptColFilter':
-            return { ipt: { like: `%${value}%` } };
-        case 'futureIptColFilter':
-            return { futureIpt: { like: `%${value}%` } };
+        case 'ipt':
+            return { [param]: { like: `%${value}%` } };
+        case 'futureIpt':
+            return { [param]: { like: `%${value}%` } };
     }
 };
 
 const userParams = reactive({});
-
 const arrayData = useArrayData('AdvanceTickets', {
     url: 'Tickets/getTicketsAdvance',
     userParams: userParams,
@@ -82,220 +82,123 @@ const getInputEvents = (col) => {
           };
 };
 
-const ticketColumns = computed(() => [
+const columns = computed(() => [
     {
         label: '',
         name: 'icons',
-        align: 'left',
-        columnFilter: null,
+        hidden: true,
     },
     {
-        label: t('advanceTickets.ticketId'),
-        name: 'ticketId',
         align: 'center',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'id',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        label: t('advanceTickets.ticketId'),
+        name: 'id',
     },
     {
+        align: 'left',
         label: t('advanceTickets.ipt'),
         name: 'ipt',
-        field: 'ipt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
-            filterParamKey: 'iptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+            component: 'select',
             attrs: {
-                options: itemPackingTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'description',
-                dense: true,
+                url: 'itemPackingTypes',
+                fields: ['code', 'description'],
+                where: { isActive: true },
+                optionValue: 'code',
+                optionLabel: 'description',
             },
         },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
     },
     {
+        align: 'left',
         label: t('advanceTickets.state'),
         name: 'state',
-        align: 'left',
-        sortable: true,
-        columnFilter: null,
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('advanceTickets.liters'),
         name: 'liters',
-        field: 'liters',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
+        align: 'left',
         label: t('advanceTickets.lines'),
         name: 'lines',
-        field: 'lines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
     },
     {
+        align: 'left',
         label: t('advanceTickets.import'),
-        field: 'import',
-        name: 'import',
-        align: 'left',
-        sortable: true,
+        name: 'totalWithVat',
+        hidden: true,
+        format: (row) => toCurrency(row.totalWithVat),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'futureId',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
-        field: 'futureIpt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
-            filterParamKey: 'futureIptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+            component: 'select',
             attrs: {
-                options: itemPackingTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'description',
-                dense: true,
+                url: 'itemPackingTypes',
+                fields: ['code', 'description'],
+                where: { isActive: true },
+                optionValue: 'code',
+                optionLabel: 'description',
             },
         },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureState'),
         name: 'futureState',
-        align: 'left',
-        sortable: true,
-        columnFilter: null,
-        format: (val) => dashIfEmpty(val),
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLiters'),
         name: 'futureLiters',
-        field: 'futureLiters',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureZone'),
-        name: 'futureZoneName',
-        field: 'futureZoneName',
-        align: 'left',
-        sortable: true,
+        name: 'futureZoneFk',
+        columnClass: 'expand',
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            filterParamKey: 'futureZoneFk',
-            event: getInputEvents,
+            component: 'select',
+            inWhere: true,
             attrs: {
-                options: zonesOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
+                url: 'Zones',
+                fields: ['id', 'name'],
             },
         },
-        format: (val) => dashIfEmpty(val),
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
     },
     {
+        align: 'left',
         label: t('advanceTickets.notMovableLines'),
         name: 'notMovableLines',
-        field: 'notMovableLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLines'),
         name: 'futureLines',
-        field: 'futureLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('advanceTickets.futureImport'),
-        name: 'futureImport',
         align: 'left',
-        sortable: true,
-        columnFilter: null,
+        label: t('advanceTickets.futureImport'),
+        name: 'futureTotalWithVat',
+        hidden: true,
+        format: (row) => toCurrency(row.futureTotalWithVat),
     },
 ]);
 
@@ -457,6 +360,13 @@ onMounted(async () => {
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
 });
+
+const getColor = (row) => {
+    return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
+};
+const getFutureColor = (row) => {
+    return row?.futureClassColor ? `bg-${row.futureClassColor}` : 'bg-orange';
+};
 </script>
 
 <template>
@@ -480,9 +390,9 @@ onMounted(async () => {
         @on-fetch="(data) => (zonesOptions = data)"
     />
     <VnSearchbar
-        data-key="WeeklyTickets"
-        :label="t('weeklyTickets.search')"
-        :info="t('weeklyTickets.searchInfo')"
+        data-key="AdvanceTickets"
+        :label="t('advanceTickets.search')"
+        :info="t('advanceTickets.searchInfo')"
     />
     <VnSubToolbar>
         <template #st-data>
@@ -531,73 +441,32 @@ onMounted(async () => {
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="tickets"
-            :columns="ticketColumns"
-            row-key="index"
-            selection="multiple"
+        <VnTable
+            ref="tableRef"
+            data-key="AdvanceTickets"
+            url="TicketWeeklies/filter"
+            :columns="columns"
+            auto-load
+            :right-search="false"
+            :disable-option="{ card: true }"
             v-model:selected="selectedTickets"
-            :pagination="{ rowsPerPage: 0 }"
-            :no-data-label="t('globals.noResults')"
-            style="max-width: 99%"
+            :table="{
+                'row-key': 'id',
+                selection: 'multiple',
+            }"
         >
-            <template #header="props">
-                <QTr :props="props">
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="7"
-                        translate
-                    >
-                        {{ t('advanceTickets.destination') }}
-                        {{ toDateFormat(userParams.dateToAdvance) }}
-                    </QTh>
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="9"
-                        translate
-                    >
-                        {{ t('advanceTickets.origin') }}
-                        {{ toDateFormat(userParams.dateFuture) }}
-                    </QTh>
-                </QTr>
-                <QTr>
-                    <QTh>
-                        <QCheckbox v-model="props.selected" />
-                    </QTh>
-                    <QTh
-                        v-for="(col, index) in ticketColumns"
-                        :key="index"
-                        :class="{ 'vertical-separator': col.name === 'futureId' }"
-                    >
-                        {{ col.label }}
-                    </QTh>
-                </QTr>
+            <!--TODO: arreglar estilos-->
+            <template #before-header>
+                <span class="horizontal-separator" translate>
+                    {{ t('advanceTickets.destination') }}
+                    {{ toDateFormat(userParams.dateToAdvance) }}
+                </span>
+                <span class="horizontal-separator" translate>
+                    {{ t('advanceTickets.origin') }}
+                    {{ toDateFormat(userParams.dateFuture) }}
+                </span>
             </template>
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.columnFilter"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
-            </template>
-            <template #header-cell-availableLines="{ col }">
-                <QTh class="vertical-separator">
-                    {{ col.label }}
-                </QTh>
-            </template>
-            <template #body-cell-icons="{ row }">
+            <template #column-icons="{ row }">
                 <QTd class="q-gutter-x-xs">
                     <QIcon
                         v-if="row.futureAgency !== row.agency && row.agency"
@@ -624,73 +493,52 @@ onMounted(async () => {
                     </QIcon>
                 </QTd>
             </template>
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
-                    <QBtn flat class="link">
-                        {{ row.id }}
-                        <TicketDescriptorProxy :id="row.id" />
-                    </QBtn>
-                </QTd>
+            <template #column-id="{ row }">
+                <span class="link" @click.stop>
+                    {{ row.id }}
+                    <TicketDescriptorProxy :id="row.id" />
+                </span>
             </template>
-            <template #body-cell-state="{ row }">
-                <QTd>
-                    <QBadge
-                        text-color="black"
-                        :color="row.classColor"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ row.state }}
-                    </QBadge>
-                </QTd>
+            <template #column-state="{ row }">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
             </template>
-            <template #body-cell-import="{ row }">
-                <QTd>
-                    <QBadge
-                        :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
-                        :color="totalPriceColor(row.totalWithVat)"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ toCurrency(row.totalWithVat || 0) }}
-                    </QBadge>
-                </QTd>
+            <template #column-totalWithVat="{ row }">
+                <QBadge
+                    :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
+                    :color="totalPriceColor(row.totalWithVat)"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ toCurrency(row.totalWithVat || 0) }}
+                </QBadge>
             </template>
-            <template #body-cell-futureId="{ row }">
-                <QTd class="vertical-separator">
-                    <QBtn flat class="link" dense>
+            <template #column-futureId="{ row }">
+                <!--TODO: arreglar estilos para que se muestre como antes, slot?-->
+                <div class="vertical-separator">
+                    <span class="link" @click.stop>
                         {{ row.futureId }}
                         <TicketDescriptorProxy :id="row.futureId" />
-                    </QBtn>
-                </QTd>
+                    </span>
+                </div>
             </template>
-            <template #body-cell-futureState="{ row }">
-                <QTd>
-                    <QBadge
-                        text-color="black"
-                        :color="row.futureClassColor"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ row.futureState }}
-                    </QBadge>
-                </QTd>
+            <template #column-futureState="{ row }">
+                <QChip :class="getFutureColor(row)" dense square>
+                    {{ row.futureState }}
+                </QChip>
             </template>
-            <template #body-cell-futureImport="{ row }">
-                <QTd>
-                    <QBadge
-                        :text-color="
-                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
-                        "
-                        :color="totalPriceColor(row.futureTotalWithVat)"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ toCurrency(row.futureTotalWithVat || 0) }}
-                    </QBadge>
-                </QTd>
+            <template #column-futureTotalWithVat="{ row }">
+                <QBadge
+                    :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
+                    :color="totalPriceColor(row.futureTotalWithVat)"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ toCurrency(row.futureTotalWithVat || 0) }}
+                </QBadge>
             </template>
-        </QTable>
+        </VnTable>
         <VnProgress
             :progress="progressPercentage"
             :cancelled="cancelProgress"
@@ -714,6 +562,8 @@ onMounted(async () => {
 }
 
 .horizontal-separator {
-    border-bottom: 4px solid white !important;
+    width: 100%;
+    margin-top: 1%;
+    border-bottom: 5px solid white !important;
 }
 </style>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad53935bc..30e365490 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -2,7 +2,9 @@
 import axios from 'axios';
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 import { toDate, toCurrency } from 'src/filters/index';
+import useNotify from 'src/composables/useNotify';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -10,14 +12,25 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
+const quasar = useQuasar();
+const { notify } = useNotify();
 const clientsOptions = ref([]);
 const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
 const selectedClient = ref();
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
+const showForm = ref(false);
+const dialogData = ref();
+const companiesOptions = ref([]);
+const accountingOptions = ref([]);
+const amountToReturn = ref();
 
 const columns = computed(() => [
     {
@@ -187,9 +200,158 @@ const fetchAddresses = async (formData) => {
 const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
+
+async function makeInvoice(ticket) {
+    const ticketsIds = ticket.map((item) => item.id);
+    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });
+    const response = data;
+    if (response)
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
+}
+
+async function sendDocuware(ticket) {
+    try {
+        let ticketIds = ticket.map((item) => item.id);
+
+        const { data } = await axios.post(`Docuwares/upload`, {
+            fileCabinet: 'deliveryNote',
+            ticketIds,
+        });
+
+        for (let ticket of ticketIds) {
+            ticket.stateFk = data.id;
+            ticket.state = data.name;
+            ticket.alertLevel = data.alertLevel;
+            ticket.alertLevelCode = data.code;
+        }
+        notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.log('err: ', err);
+    }
+}
+
+function openBalanceDialog(ticket) {
+    const checkedTickets = ticket;
+    const amountPaid = ref(0);
+    const clientFk = ref(null);
+    const description = ref([]);
+    const firstTicketClientId = checkedTickets[0].clientFk;
+    const isSameClient = checkedTickets.every(
+        (ticket) => ticket.clientFk === firstTicketClientId
+    );
+
+    if (!isSameClient) {
+        throw new Error('You cannot make a payment on account from multiple clients');
+    }
+
+    for (let ticketData of checkedTickets) {
+        console.log('ticketData: ', ticketData);
+        amountPaid.value += ticketData.totalWithVat;
+        clientFk.value = ticketData.clientFk;
+        description.value.push(ticketData.id);
+    }
+
+    const balanceCreateDialog = ref({
+        amountPaid: amountPaid.value,
+        clientFk: clientFk.value,
+        description: `Albaran: ${description.value.join(', ')}`,
+    });
+    dialogData.value = balanceCreateDialog;
+    showForm.value = true;
+}
+
+async function onSubmit() {
+    const { data: email } = await axios.get('Clients', {
+        params: {
+            filter: JSON.stringify({ where: { id: dialogData.value.value.clientFk } }),
+        },
+    });
+
+    const { data } = await axios.post(
+        `Clients/${dialogData.value.value.clientFk}/createReceipt`,
+        {
+            payed: dialogData.value.payed,
+            companyFk: dialogData.value.companyFk,
+            bankFk: dialogData.value.bankFk,
+            amountPaid: dialogData.value.value.amountPaid,
+            description: dialogData.value.value.description,
+            clientFk: dialogData.value.value.clientFk,
+            email: email[0].email,
+        }
+    );
+
+    if (data) notify('globals.dataSaved', 'positive');
+    showForm.value = false;
+}
+
+const setAmountToReturn = (newAmountGiven) => {
+    const amountPaid = dialogData.value.value.amountPaid;
+
+    amountToReturn.value = newAmountGiven - amountPaid;
+};
+
+function setReference(data) {
+    console.log('entity: ', data);
+
+    let newDescription = '';
+
+    switch (data) {
+        case 1:
+            newDescription = `${t(
+                'ticketList.creditCard'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 2:
+            newDescription = `${t(
+                'ticketList.cash'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 3:
+            newDescription = `${newDescription.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 4:
+            newDescription = `${t(
+                'ticketList.transfers'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 3317:
+            newDescription = '';
+            break;
+        default:
+            break;
+    }
+
+    dialogData.value.value.description = newDescription;
+    console.log('Updated description:', dialogData.value.value.description);
+}
 </script>
 
 <template>
+    <FetchData
+        url="Companies"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Accountings"
+        @on-fetch="(data) => (accountingOptions = data)"
+        auto-load
+    />
     <VnSearchbar
         data-key="Tickets"
         :label="t('Search ticket')"
@@ -209,6 +371,11 @@ const getColor = (row) => {
         :columns="columns"
         redirect="ticket"
         auto-load
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
         <template #more-create-dialog="{ data }">
             <VnRow>
@@ -306,6 +473,135 @@ const getColor = (row) => {
             </QChip>
         </template>
     </VnTable>
+    <QPageSticky :offset="[20, 80]" style="z-index: 2">
+        <QBtn
+            v-if="hasSelectedRows"
+            @click="makeInvoice(selectedRows)"
+            color="primary"
+            fab
+            icon="vn:invoice-in"
+        />
+        <QTooltip>
+            {{ t('ticketList.createInvoice') }}
+        </QTooltip>
+    </QPageSticky>
+    <QPageSticky v-if="hasSelectedRows" :offset="[20, 140]" style="z-index: 2">
+        <QBtn
+            @click.stop="openBalanceDialog(selectedRows)"
+            color="primary"
+            fab
+            icon="vn:recovery"
+        />
+        <QTooltip>
+            {{ t('ticketList.accountPayment') }}
+        </QTooltip>
+    </QPageSticky>
+    <QDialog ref="dialogRef" v-model="showForm">
+        <QCard class="q-pa-md q-mb-md">
+            <QForm @submit="onSubmit()" class="q-pa-sm">
+                {{ t('ticketList.addPayment') }}
+                <VnRow>
+                    <VnInputDate
+                        :label="t('ticketList.date')"
+                        v-model="dialogData.payed"
+                    />
+                    <VnSelect
+                        :label="t('ticketList.company')"
+                        v-model="dialogData.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                    >
+                    </VnSelect>
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('ticketList.bank')"
+                        v-model="dialogData.bankFk"
+                        :options="accountingOptions"
+                        option-value="id"
+                        option-label="bank"
+                        hide-selected
+                        @update:model-value="setReference"
+                    />
+                    <VnInput
+                        :label="t('ticketList.amount')"
+                        v-model="dialogData.value.amountPaid"
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <span>
+                        {{ t('ticketList.cash') }}
+                    </span>
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <VnInput
+                        :label="t('ticketList.deliveredAmount')"
+                        v-model="dialogData.value.amountGiven"
+                        @update:model-value="setAmountToReturn"
+                        type="number"
+                    />
+                    <VnInput
+                        :label="t('ticketList.amountToReturn')"
+                        :model-value="amountToReturn"
+                        type="number"
+                        readonly
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 3 || dialogData.bankFk === 3117">
+                    <VnInput
+                        :label="t('ticketList.compensation')"
+                        v-model="dialogData.value.compensation"
+                        type="text"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('ticketList.reference')"
+                        v-model="dialogData.value.description"
+                        type="text"
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <QCheckbox
+                        :label="t('ticketList.viewReceipt')"
+                        v-model="dialogData.value.viewReceipt"
+                        :toggle-indeterminate="false"
+                    />
+                    <QCheckbox
+                        :label="t('ticketList.sendEmail')"
+                        v-model="dialogData.value.senEmail"
+                        :toggle-indeterminate="false"
+                    />
+                </VnRow>
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :label="t('globals.save')"
+                        color="primary"
+                        @click="onSubmit()"
+                    />
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
+                    />
+                </div>
+            </QForm>
+        </QCard>
+    </QDialog>
+    <QPageSticky v-if="hasSelectedRows" :offset="[20, 200]" style="z-index: 2">
+        <QBtn
+            @click="sendDocuware(selectedRows)"
+            color="primary"
+            fab
+            icon="install_mobile"
+        />
+        <QTooltip>
+            {{ t('ticketList.sendDocuware') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
 
 <i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 66a3787dd..ddd33128e 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -66,6 +66,8 @@ advanceTickets:
     advanceWithoutNegativeTitle: Advance tickets (without negatives)
     advanceWithoutNegativeSubtitle: Advance {selectedTickets} tickets confirmation
     errorsList: Errors list
+    search: Search advance tickets
+    searchInfo: Search advance tickets by ID or client ID
 futureTickets:
     problems: Problems
     ticketId: ID
@@ -239,3 +241,20 @@ ticketList:
     summary: Summary
     client: Customer
     createTicket: Create ticket
+    createInvoice: Create invoice
+    accountPayment: Account payment
+    sendDocuware: Set delivered and send delivery note(s) to the tablet
+    addPayment: Add payment
+    date: Date
+    company: Company
+    amount: Amount
+    reference: Reference
+    bank: Bank
+    cash: Cash
+    deliveredAmount: Delivered amount
+    amountToReturn: Amount to return
+    viewReceipt: View receipt
+    sendEmail: Send email
+    compensation: Compensation
+    creditCard: Credit card
+    transfers: Transfers
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 59f5a7f91..97fd63060 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -113,6 +113,8 @@ advanceTickets:
     advanceWithoutNegativeTitle: Adelantar tickets (sin negativos)
     advanceWithoutNegativeSubtitle: '¿Desea adelantar {selectedTickets} tickets?'
     errorsList: Lista de errores
+    search: Buscar por tickets adelantados
+    searchInfo: Buscar tickets adelantados por el identificador o el identificador del cliente
 futureTickets:
     problems: Problemas
     ticketId: ID
@@ -242,3 +244,20 @@ ticketList:
     summary: Resumen
     client: Cliente
     createTicket: Crear ticket
+    createInvoice: Crear factura
+    accountPayment: Pago a cuenta...
+    sendDocuware: Marcar como servido/s y enviar albarán/es a la tablet
+    addPayment: Añadir pago
+    date: Fecha
+    company: Empresa
+    amount: Importe
+    reference: Referencia
+    bank: Caja
+    cash: Efectivo
+    deliveredAmount: Cantidad entregada
+    amountToReturn: Cantidad a devolver
+    viewReceipt: Ver recibido
+    sendEmail: Enviar correo
+    compensation: Compensación
+    creditCard: Tarjeta de crédito
+    transfers: Transferencias

From 574a2efc923240f8fc7700d7a133dd45a4928fb8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 19 Aug 2024 13:03:38 +0200
Subject: [PATCH 06/74] feat: refs #7553 added transferClient function

---
 src/pages/Ticket/Card/TicketDescriptor.vue    |  1 -
 .../Ticket/Card/TicketDescriptorMenu.vue      | 85 ++++++++++++-------
 2 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index e4a349f12..148b0dc35 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -89,7 +89,6 @@ const filter = {
 const data = ref(useCardDescription());
 
 function ticketFilter(ticket) {
-    console.log('ticket: ', ticket);
     return JSON.stringify({ clientFk: ticket.clientFk });
 }
 </script>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 31f85582c..89c061507 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -9,6 +9,8 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
+import FormPopup from 'components/FormPopup.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 
 const props = defineProps({
     ticket: {
@@ -24,7 +26,9 @@ const { openReport, sendEmail } = usePrintService();
 
 const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
-const showWeightDialog = ref(false);
+const client = ref();
+const showTransferDialog = ref(false);
+const dialogRef = ref();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -182,16 +186,54 @@ async function createPdfInvoice() {
     }
 }
 
-function setWeightToTicket(weight) {
-    console.log('weight: ', weight);
-    const { data } = axios.patch(`Tickets/${ticketId}`, {
-        weight: weight,
-    });
-    console.log('data: ', data);
+async function transferClient(client) {
+    const params = {
+        clientFk: client,
+    };
+
+    const { data } = await axios.patch(`Tickets/${ticketId}/transferClient`, params);
+
     if (data) window.location.reload();
 }
 </script>
 <template>
+    <QItem @click="showTransferDialog = !showTransferDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_paste" />
+        </QItemSection>
+        <QItemSection>{{ t('Transfer client') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showTransferDialog">
+        <FormPopup
+            @on-submit="transferClient(client)"
+            :title="t('Transfer client')"
+            :custom-submit-button-label="t('Transfer client')"
+            :default-cancel-button="false"
+        >
+            <template #form-inputs>
+                <VnSelect
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    option-label="name"
+                    option-value="id"
+                    v-model="client"
+                    :label="t('Client')"
+                    auto-load
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `#${scope.opt.id} - ` }}
+                                    {{ scope.opt.name }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
@@ -296,30 +338,6 @@ function setWeightToTicket(weight) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
-    <QItem @click="showWeightDialog = !showWeightDialog" v-ripple clickable>
-        <QItemSection avatar>
-            <QIcon name="content_paste" />
-        </QItemSection>
-        <QItemSection>{{ t('Set ticket weight') }}</QItemSection>
-    </QItem>
-    <QDialog v-model="showWeightDialog" transition-show="scale" transition-hide="scale">
-        <QCard>
-            <QCardSection>
-                <QInput
-                    v-model="weight"
-                    type="number"
-                    :label="t('Weight')"
-                    @update:model-value="setWeightToTicket"
-                />
-                <QBtn flat v-close-popup class="text-primary">
-                    {{ t('Close') }}
-                </QBtn>
-                <QBTn flat @click="setWeightToTicket" class="text-primary">
-                    {{ t('Save') }}
-                </QBTn>
-            </QCardSection>
-        </QCard>
-    </QDialog>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -343,7 +361,7 @@ es:
     Send CSV: Enviar CSV
     Show Proforma: Ver proforma
     Delete ticket: Eliminar ticket
-    Send SMS...: Enviar SMS
+    Send SMS...: Enviar SMS...
     Pending payment: Pago pendiente
     Minimum import: Importe mínimo
     Notify changes: Notificar cambios
@@ -354,5 +372,6 @@ es:
     It was not able to clone the ticket: No se pudo clonar el ticket
     Regenerate PDF invoice: Regenerar PDF factura
     The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
-    Set ticket weight: Establecer peso al ticket
+    Transfer client: Transferir cliente
+    Client: Cliente
 </i18n>

From 511d53d1099ed2444427f29edc4c05b08747b786 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 19 Aug 2024 13:48:55 +0200
Subject: [PATCH 07/74] feat: refs #7553 added refund and add turn functions to
 descriptor

---
 .../Ticket/Card/TicketDescriptorMenu.vue      | 138 ++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 89c061507..1b64d7979 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -28,6 +28,7 @@ const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
 const client = ref();
 const showTransferDialog = ref(false);
+const showTurnDialog = ref(false);
 const dialogRef = ref();
 const actions = {
     clone: async () => {
@@ -195,6 +196,37 @@ async function transferClient(client) {
 
     if (data) window.location.reload();
 }
+
+async function addTurn(day) {
+    const params = {
+        ticketFk: parseInt(ticketId),
+        weekDay: day,
+        agencyModeFk: ticket.value.agencyModeFk,
+    };
+    await axios.patch(`TicketWeeklies`, params);
+
+    notify({
+        message: t('Current ticket deleted and added to shift'),
+        type: 'positive',
+    });
+    window.location.reload();
+}
+
+async function createRefund(withWarehouse) {
+    const params = {
+        ticketsIds: [parseInt(ticketId)],
+        withWarehouse: withWarehouse,
+    };
+    const { data } = await axios.post(`Tickets/refund`, params);
+    console.log('data: ', data);
+
+    if (data) {
+        const refundTicket = data;
+        console.log('refundTicket: ', refundTicket);
+
+        push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
+    }
+}
 </script>
 <template>
     <QItem @click="showTransferDialog = !showTransferDialog" v-ripple clickable>
@@ -234,6 +266,75 @@ async function transferClient(client) {
             </template>
         </FormPopup>
     </QDialog>
+    <QItem @click="showTurnDialog = !showTurnDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_paste" />
+        </QItemSection>
+        <QItemSection>{{ t('addTurn') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showTurnDialog">
+        <FormPopup
+            @on-submit="addTurn"
+            :title="t('What is the day of receipt of the ticket?')"
+            :default-submit-button="false"
+            :default-cancel-button="false"
+            style="text-align: center"
+        >
+            <template #form-inputs>
+                <QBtnGroup spread>
+                    <QBtn
+                        :label="t('weekdays.mon')"
+                        color="primary"
+                        @click="addTurn(0)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.tue')"
+                        color="primary"
+                        @click="addTurn(1)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.wed')"
+                        color="primary"
+                        @click="addTurn(2)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.thu')"
+                        color="primary"
+                        @click="addTurn(3)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.fri')"
+                        color="primary"
+                        @click="addTurn(4)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.sat')"
+                        color="primary"
+                        @click="addTurn(5)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.sun')"
+                        color="primary"
+                        @click="addTurn(6)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                </QBtnGroup>
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
@@ -338,6 +439,29 @@ async function transferClient(client) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="monetization_on" />
+        </QItemSection>
+        <QItemSection>{{ t('Refund all...') }}</QItemSection>
+        <QItemSection side>
+            <QIcon name="keyboard_arrow_right" />
+        </QItemSection>
+        <QMenu anchor="top end" self="top start" auto-close bordered>
+            <QList>
+                <QItem v-ripple clickable @click="createRefund(true)">
+                    <QItemSection>
+                        {{ t('with warehouse') }}
+                    </QItemSection>
+                </QItem>
+                <QItem v-ripple clickable @click="createRefund(false)">
+                    <QItemSection>
+                        {{ t('without warehouse') }}
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </QMenu>
+    </QItem>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -349,7 +473,15 @@ async function transferClient(client) {
     </template>
 </template>
 
+<style lang="scss" scoped>
+.weekdaysBtn {
+    margin: 1%;
+}
+</style>
+
 <i18n>
+en:
+    addTurn: Add turn
 es:
     Show Delivery Note...: Ver albarán...
     Send Delivery Note...: Enviar albarán...
@@ -374,4 +506,10 @@ es:
     The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
     Transfer client: Transferir cliente
     Client: Cliente
+    addTurn: Añadir a turno
+    What is the day of receipt of the ticket?: ¿Cuál es el día de preparación del pedido?
+    Current ticket deleted and added to shift: Ticket actual eliminado y añadido al turno
+    Refund all...: Abonar todo...
+    with warehouse: con almacén
+    without warehouse: sin almacén
 </i18n>

From 85bc61029855cce21546744884924ba32926d9d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 20 Aug 2024 09:36:27 +0200
Subject: [PATCH 08/74] feat: refs #7553 refs #7356 & #7553 added rest of
 missing functions in the descriptor menu

---
 src/pages/Ticket/Card/TicketDescriptor.vue    |   2 +-
 .../Ticket/Card/TicketDescriptorMenu.vue      | 130 +++++++++++++++++-
 2 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 148b0dc35..b3dba2849 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -30,7 +30,7 @@ const filter = {
         {
             relation: 'address',
             scope: {
-                fields: ['id', 'name', 'mobile', 'phone'],
+                fields: ['id', 'name', 'mobile', 'phone', 'incotermsFk'],
             },
         },
         {
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 1b64d7979..4c1cfad76 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -11,6 +11,8 @@ import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
 import FormPopup from 'components/FormPopup.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
 
 const props = defineProps({
     ticket: {
@@ -24,12 +26,16 @@ const { dialog, notify } = useQuasar();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 
-const ticket = ref(props.ticket);
+const { ticket } = toRefs(props);
 const ticketId = currentRoute.value.params.id;
 const client = ref();
 const showTransferDialog = ref(false);
 const showTurnDialog = ref(false);
+const showChangeTimeDialog = ref(false);
 const dialogRef = ref();
+const isEditable = ref();
+const hasInvoicing = ref();
+const hasPdf = ref();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -187,6 +193,26 @@ async function createPdfInvoice() {
     }
 }
 
+function makeInvoiceDialog() {
+    //TODO: lo de abajo?
+    // if (ticket.value.address?.incotermsFk && !ticket.value.weight && !force)
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            promise: makeInvoice,
+        },
+    });
+}
+async function makeInvoice() {
+    console.log(ticket.value);
+    const params = {
+        ticketsIds: [parseInt(ticketId)],
+    };
+    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
+
+    if (data) window.location.reload();
+}
+
 async function transferClient(client) {
     const params = {
         clientFk: client,
@@ -218,17 +244,65 @@ async function createRefund(withWarehouse) {
         withWarehouse: withWarehouse,
     };
     const { data } = await axios.post(`Tickets/refund`, params);
-    console.log('data: ', data);
 
     if (data) {
         const refundTicket = data;
-        console.log('refundTicket: ', refundTicket);
 
         push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
     }
 }
+
+async function changeShippedHour(time) {
+    console.log('time: ', time);
+    const params = {
+        shipped: time,
+    };
+
+    const { data } = await axios.post(`Tickets/${ticketId}/updateEditableTicket`, params);
+
+    if (data) window.location.reload();
+}
+
+function openRecalculateDialog() {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('Recalculate components'),
+            message: t('Are you sure you want to recalculate components?'),
+            promise: recalculateComponents,
+        },
+    });
+}
+
+async function recalculateComponents() {
+    await axios.post(`Tickets/${ticketId}/recalculateComponents`);
+    notify({
+        message: t('Data saved'),
+        type: 'positive',
+    });
+    window.location.reload();
+}
+
+const handleFetchData = (data) => {
+    isEditable.value = data;
+    handleInvoiceOutData();
+};
+
+async function handleInvoiceOutData() {
+    const { data } = await axios.get(`InvoiceOuts`, {
+        params: {
+            filter: JSON.stringify({ where: { ref: ticket.value.refFk } }),
+        },
+    });
+    hasPdf.value = data[0]?.hasPdf;
+}
 </script>
 <template>
+    <FetchData
+        :url="`Tickets/${ticketId}/isEditable`"
+        auto-load
+        @on-fetch="handleFetchData"
+    />
     <QItem @click="showTransferDialog = !showTransferDialog" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="content_paste" />
@@ -268,7 +342,7 @@ async function createRefund(withWarehouse) {
     </QDialog>
     <QItem @click="showTurnDialog = !showTurnDialog" v-ripple clickable>
         <QItemSection avatar>
-            <QIcon name="content_paste" />
+            <QIcon name="vn:calendar" />
         </QItemSection>
         <QItemSection>{{ t('addTurn') }}</QItemSection>
     </QItem>
@@ -401,6 +475,20 @@ async function createRefund(withWarehouse) {
         </QItemSection>
         <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
+    <QItem @click="showChangeTimeDialog = !showChangeTimeDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="schedule" />
+        </QItemSection>
+        <QItemSection>{{ t('Change shipped hour') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
+        <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
+            <template #form-inputs>
+                <!--TODO: pone el año a 1970, corregir-->
+                <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="sms" />
@@ -427,11 +515,26 @@ async function createRefund(withWarehouse) {
             </QList>
         </QMenu>
     </QItem>
-    <QItem @click="createPdfDialog()" v-ripple clickable>
+    <!--TODO: acabar esta parte, falta la función makeInvoice-->
+    <QItem @click="makeInvoiceDialog()" v-ripple clickable v-if="isEditable">
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
         </QItemSection>
-        <QItemSection>{{ t('Regenerate PDF invoice') }}</QItemSection>
+        <QItemSection>{{ t('Make invoice') }}</QItemSection>
+    </QItem>
+    <!--TODO: acabar esta parte, falta el campo hasInvoicing-->
+    <QItem
+        @click="createPdfDialog()"
+        v-ripple
+        clickable
+        v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)"
+    >
+        <QItemSection avatar>
+            <QIcon name="picture_as_pdf" />
+        </QItemSection>
+        <QItemSection>{{
+            hasPdf.value ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
+        }}</QItemSection>
     </QItem>
     <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
         <QItemSection avatar>
@@ -439,6 +542,12 @@ async function createRefund(withWarehouse) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem @click="openRecalculateDialog()" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="refresh" />
+        </QItemSection>
+        <QItemSection>{{ t('Recalculate components') }}</QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="monetization_on" />
@@ -502,6 +611,7 @@ es:
     To clone ticket: Clonar ticket
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
+    Generate PDF invoice: Generar PDF factura
     Regenerate PDF invoice: Regenerar PDF factura
     The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
     Transfer client: Transferir cliente
@@ -512,4 +622,10 @@ es:
     Refund all...: Abonar todo...
     with warehouse: con almacén
     without warehouse: sin almacén
+    Make invoice: Crear factura
+    Change shipped hour: Cambiar hora de envío
+    Shipped hour: Hora de envío
+    Recalculate components: Recalcular componentes
+    Are you sure you want to recalculate components?: ¿Seguro que quieres recalcular los componentes?
+    Data saved: Datos guardados
 </i18n>

From 5f63a9b05884aa80d09f619d21326e5f293b5e74 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 20 Aug 2024 10:02:23 +0200
Subject: [PATCH 09/74] refactor: refs #7553 & #7356 changed makeInvoice
 function and dialogs

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 4c1cfad76..aec920002 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -194,23 +194,26 @@ async function createPdfInvoice() {
 }
 
 function makeInvoiceDialog() {
-    //TODO: lo de abajo?
-    // if (ticket.value.address?.incotermsFk && !ticket.value.weight && !force)
     dialog({
         component: VnConfirm,
         componentProps: {
+            title: t('Are you sure you want to invoice this ticket?'),
+            message: t('You are going to invoice this ticket'),
             promise: makeInvoice,
         },
     });
 }
 async function makeInvoice() {
-    console.log(ticket.value);
     const params = {
         ticketsIds: [parseInt(ticketId)],
     };
-    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
+    await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
 
-    if (data) window.location.reload();
+    notify({
+        message: t('Ticket invoiced'),
+        type: 'positive',
+    });
+    window.location.reload();
 }
 
 async function transferClient(client) {
@@ -515,7 +518,6 @@ async function handleInvoiceOutData() {
             </QList>
         </QMenu>
     </QItem>
-    <!--TODO: acabar esta parte, falta la función makeInvoice-->
     <QItem @click="makeInvoiceDialog()" v-ripple clickable v-if="isEditable">
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
@@ -628,4 +630,7 @@ es:
     Recalculate components: Recalcular componentes
     Are you sure you want to recalculate components?: ¿Seguro que quieres recalcular los componentes?
     Data saved: Datos guardados
+    Are you sure you want to invoice this ticket?: ¿Seguro que quieres facturar este ticket?
+    You are going to invoice this ticket: Vas a facturar este ticket
+    Ticket invoiced: Ticket facturado
 </i18n>

From 79a26d7b94c75708157f8f1ed1b4deda62aafd2d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 21 Aug 2024 11:42:03 +0200
Subject: [PATCH 10/74] feat: refs #7553 refs  #7356 added VnTable in
 TicketVolume & fixed QBadge in summary

---
 src/pages/Ticket/Card/TicketSummary.vue | 11 ++--
 src/pages/Ticket/Card/TicketVolume.vue  | 69 ++++++++++++-------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 155b3a820..634568e46 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -137,11 +137,14 @@ async function changeState(value) {
                     :url="ticketUrl + 'basic-data/step-one'"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv :label="t('ticket.summary.state')">
+                <VnLv v-if="ticket.ticketState" :label="t('ticket.summary.state')">
                     <template #value>
-                        <QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'">
-                            {{ ticket.ticketState?.state?.name }}
-                        </QChip>
+                        <QBadge
+                            text-color="black"
+                            :color="ticket.ticketState.state.classColor"
+                        >
+                            {{ ticket.ticketState.state.name }}
+                        </QBadge>
                     </template>
                 </VnLv>
                 <VnLv :label="t('ticket.summary.salesPerson')">
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index a47a127c1..e6db759d0 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -11,11 +11,13 @@ import FetchData from 'components/FetchData.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty } from 'src/filters';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const salesRef = ref(null);
+const tableRef = ref();
 
 watch(
     () => route.params.id,
@@ -34,37 +36,34 @@ const salesFilter = computed(() => ({
 
 const sales = ref([]);
 const packingTypeVolume = ref([]);
-const rows = computed(() => sales.value);
 
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('volume.item'),
-        name: 'item',
-        align: 'left',
+        name: 'itemFk',
     },
     {
+        align: 'left',
         label: t('volume.description'),
-        name: 'description',
-        align: 'left',
+        name: 'concept',
+        columnClass: 'expand',
     },
     {
+        align: 'left',
         label: t('volume.packingType'),
-        name: 'quantity',
-        field: (row) => row.item.itemPackingTypeFk,
-        align: 'left',
-        format: (val) => dashIfEmpty(val),
+        name: 'itemPackingTypeFk',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.item.itemPackingTypeFk),
     },
     {
+        align: 'left',
         label: t('volume.quantity'),
         name: 'quantity',
-        field: 'quantity',
-        align: 'left',
     },
     {
-        label: t('volume.volumeQuantity'),
-        name: 'quantity',
-        field: (row) => row.saleVolume?.volume,
         align: 'left',
+        label: t('volume.volumeQuantity'),
+        name: 'volume',
     },
 ]);
 
@@ -124,30 +123,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QCard>
         </template>
     </RightMenu>
-    <QTable
-        :rows="rows"
+    <VnTable
+        ref="tableRef"
+        data-key="TicketVolume"
+        :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
+        :right-search="false"
+        :column-search="false"
+        auto-load
     >
-        <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat class="link" @click.stop>
-                    {{ row.itemFk }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
         </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
-                <div class="column">
-                    <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
-                    <FetchedTags :item="row.item" :max-length="6" />
-                </div>
-            </QTd>
+        <template #column-concept="{ row }">
+            <span>{{ row.item.name }}</span>
+            <span class="color-vn-label q-pl-md">{{ row.item.subName }}</span>
+            <FetchedTags :item="row.item" :max-length="6" />
         </template>
-    </QTable>
+        <template #column-volume="{ rowIndex }">
+            <span>{{ packingTypeVolume?.[rowIndex]?.volume }}</span>
+        </template>
+    </VnTable>
 </template>

From 87eca93ef867b9bf797879356379bce4dc041861 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 12:16:21 +0200
Subject: [PATCH 11/74] fix: use class link

---
 .../Ticket/Card/BasicData/BasicDataTable.vue  | 263 ------------------
 src/pages/Ticket/Card/TicketComponents.vue    |   6 +-
 2 files changed, 3 insertions(+), 266 deletions(-)
 delete mode 100644 src/pages/Ticket/Card/BasicData/BasicDataTable.vue

diff --git a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue b/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
deleted file mode 100644
index 48b8c882f..000000000
--- a/src/pages/Ticket/Card/BasicData/BasicDataTable.vue
+++ /dev/null
@@ -1,263 +0,0 @@
-<script setup>
-import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import FetchData from 'components/FetchData.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import { toCurrency } from 'filters/index';
-import { useRole } from 'src/composables/useRole';
-
-const $props = defineProps({
-    formData: {
-        type: Object,
-        required: true,
-    },
-    haveNegatives: {
-        type: Boolean,
-        required: true,
-        default: false,
-    },
-});
-
-const emit = defineEmits(['updateForm', 'update:haveNegatives']);
-
-const stateStore = useStateStore();
-const { t } = useI18n();
-const { hasAny } = useRole();
-
-const _ticketData = ref($props.formData);
-const ticketUpdateActions = ref(null);
-const haveNegatives = computed({
-    get: () => $props.haveNegatives,
-    set: (val) => emit('update:haveNegatives', val),
-});
-const rows = computed(() => _ticketData.value?.sale?.items || []);
-
-watch(
-    () => _ticketData.value,
-    (val) => emit('updateForm', val),
-    { deep: true }
-);
-
-const columns = computed(() => [
-    {
-        required: true,
-        label: t('basicData.item'),
-        name: 'item',
-        align: 'left',
-        format: (val) => val.name,
-    },
-    {
-        required: true,
-        label: t('basicData.description'),
-        name: 'description',
-        align: 'left',
-        hidden: true,
-    },
-    {
-        label: t('basicData.movable'),
-        name: 'movable',
-        align: 'left',
-    },
-    {
-        required: true,
-        label: t('basicData.quantity'),
-        name: 'quantity',
-        field: 'quantity',
-        align: 'left',
-    },
-    {
-        required: true,
-        label: t('basicData.pricePPU'),
-        name: 'price',
-        field: 'price',
-        align: 'left',
-        format: (val) => toCurrency(val),
-    },
-    {
-        required: true,
-        label: t('basicData.newPricePPU'),
-        name: 'newPrice',
-        field: (row) => row.component.newPrice,
-        align: 'left',
-        format: (val) => toCurrency(val),
-    },
-    {
-        required: true,
-        label: t('basicData.difference'),
-        name: 'difference',
-        field: (row) => row.component.difference,
-        align: 'left',
-        format: (val) => toCurrency(val),
-    },
-]);
-
-const loadDefaultTicketAction = () => {
-    const isSalesAssistant = hasAny(['salesAssistant']);
-    _ticketData.value.option = isSalesAssistant ? 'mana' : 'renewPrices';
-};
-
-const totalPrice = computed(() => {
-    return rows.value.reduce((acc, item) => acc + item.price * item.quantity, 0);
-});
-
-const totalNewPrice = computed(() => {
-    return rows.value.reduce(
-        (acc, item) => acc + item.component.newPrice * item.quantity,
-        0
-    );
-});
-
-const totalDifference = computed(() => {
-    return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
-});
-const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
-const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
-const ticketHaveNegatives = () => {
-    let _haveNegatives = false;
-    let haveNotNegatives = false;
-    _ticketData.value.withoutNegatives = false;
-    _ticketData.value?.sale?.items.forEach((item) => {
-        if (item.quantity > item.movable) _haveNegatives = true;
-        else haveNotNegatives = true;
-    });
-
-    haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences.value;
-    if (haveNegatives.value) _ticketData.value.withoutNegatives = true;
-};
-
-onMounted(() => {
-    stateStore.rightDrawer = true;
-    loadDefaultTicketAction();
-    ticketHaveNegatives();
-});
-
-onUnmounted(() => (stateStore.rightDrawer = false));
-</script>
-
-<template>
-    <FetchData
-        url="TicketUpdateActions"
-        @on-fetch="(data) => (ticketUpdateActions = data)"
-        auto-load
-    />
-    <RightMenu>
-        <template #right-panel>
-            <QCard
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.total') }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.price') }}:
-                        {{ toCurrency(totalPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
-                    </span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="totalDifference"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.chargeDifference') }}
-                    </span>
-                </QCardSection>
-                <QCardSection
-                    v-for="(action, index) in ticketUpdateActions"
-                    :key="index"
-                    horizontal
-                >
-                    <QRadio
-                        v-model="_ticketData.option"
-                        :val="action.code"
-                        :label="action.description"
-                        dense
-                    />
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="haveNegatives"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal class="flex row items-center">
-                    <QCheckbox
-                        :label="t('basicData.withoutNegatives')"
-                        v-model="_ticketData.withoutNegatives"
-                        :toggle-indeterminate="false"
-                    />
-                    <QIcon name="info" size="xs" class="q-ml-sm">
-                        <QTooltip max-width="350px">
-                            {{ t('basicData.withoutNegativesInfo') }}
-                        </QTooltip>
-                    </QIcon>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
-    <QTable
-        :visible-columns="showMovablecolumn"
-        :rows="rows"
-        :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
-        flat
-    >
-        <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat color="primary">
-                    {{ row.itemFk }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
-        </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
-                <div class="column">
-                    <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
-                    <FetchedTags :item="row.item" :max-length="6" />
-                </div>
-            </QTd>
-        </template>
-        <template #body-cell-movable="{ row }">
-            <QTd>
-                <QBadge
-                    v-if="_ticketData?.sale?.haveDifferences"
-                    :text-color="row.quantity > row.movable ? 'black' : 'white'"
-                    :color="row.quantity > row.movable ? 'negative' : 'transparent'"
-                    :label="row.movable"
-                />
-            </QTd>
-        </template>
-    </QTable>
-</template>
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 3954b5a62..0f14f5956 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -298,9 +298,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :no-data-label="t('globals.noResults')"
     >
         <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat color="primary">
-                    <span class="link">{{ row.itemFk }}</span>
+            <QTd @click.stop class="link">
+                <QBtn flat>
+                    <span>{{ row.itemFk }}</span>
                     <ItemDescriptorProxy :id="row.itemFk" />
                 </QBtn>
             </QTd>

From 6218463e7e82699b0aaf4d6b26e7388d529dfaad Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 12:16:29 +0200
Subject: [PATCH 12/74] perf: rename component

---
 .../Ticket/Card/BasicData/TicketBasicData.vue | 263 ++++++++++++++++++
 .../Card/BasicData/TicketBasicDataView.vue    |   4 +-
 2 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Ticket/Card/BasicData/TicketBasicData.vue

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
new file mode 100644
index 000000000..61337a3c9
--- /dev/null
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -0,0 +1,263 @@
+<script setup>
+import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency } from 'filters/index';
+import { useRole } from 'src/composables/useRole';
+
+const $props = defineProps({
+    formData: {
+        type: Object,
+        required: true,
+    },
+    haveNegatives: {
+        type: Boolean,
+        required: true,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['updateForm', 'update:haveNegatives']);
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { hasAny } = useRole();
+
+const _ticketData = ref($props.formData);
+const ticketUpdateActions = ref(null);
+const haveNegatives = computed({
+    get: () => $props.haveNegatives,
+    set: (val) => emit('update:haveNegatives', val),
+});
+const rows = computed(() => _ticketData.value?.sale?.items || []);
+
+watch(
+    () => _ticketData.value,
+    (val) => emit('updateForm', val),
+    { deep: true }
+);
+
+const columns = computed(() => [
+    {
+        required: true,
+        label: t('basicData.item'),
+        name: 'item',
+        align: 'left',
+        format: (val) => val.name,
+    },
+    {
+        required: true,
+        label: t('basicData.description'),
+        name: 'description',
+        align: 'left',
+        hidden: true,
+    },
+    {
+        label: t('basicData.movable'),
+        name: 'movable',
+        align: 'left',
+    },
+    {
+        required: true,
+        label: t('basicData.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+    },
+    {
+        required: true,
+        label: t('basicData.pricePPU'),
+        name: 'price',
+        field: 'price',
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        required: true,
+        label: t('basicData.newPricePPU'),
+        name: 'newPrice',
+        field: (row) => row.component.newPrice,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        required: true,
+        label: t('basicData.difference'),
+        name: 'difference',
+        field: (row) => row.component.difference,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+]);
+
+const loadDefaultTicketAction = () => {
+    const isSalesAssistant = hasAny(['salesAssistant']);
+    _ticketData.value.option = isSalesAssistant ? 'mana' : 'renewPrices';
+};
+
+const totalPrice = computed(() => {
+    return rows.value.reduce((acc, item) => acc + item.price * item.quantity, 0);
+});
+
+const totalNewPrice = computed(() => {
+    return rows.value.reduce(
+        (acc, item) => acc + item.component.newPrice * item.quantity,
+        0
+    );
+});
+
+const totalDifference = computed(() => {
+    return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
+});
+const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
+const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
+const ticketHaveNegatives = () => {
+    let _haveNegatives = false;
+    let haveNotNegatives = false;
+    _ticketData.value.withoutNegatives = false;
+    _ticketData.value?.sale?.items.forEach((item) => {
+        if (item.quantity > item.movable) _haveNegatives = true;
+        else haveNotNegatives = true;
+    });
+
+    haveNegatives.value = _haveNegatives && haveNotNegatives && haveDifferences.value;
+    if (haveNegatives.value) _ticketData.value.withoutNegatives = true;
+};
+
+onMounted(() => {
+    stateStore.rightDrawer = true;
+    loadDefaultTicketAction();
+    ticketHaveNegatives();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="TicketUpdateActions"
+        @on-fetch="(data) => (ticketUpdateActions = data)"
+        auto-load
+    />
+    <RightMenu>
+        <template #right-panel>
+            <QCard
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('basicData.total') }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.price') }}:
+                        {{ toCurrency(totalPrice) }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
+                    </span>
+                </QCardSection>
+            </QCard>
+            <QCard
+                v-if="totalDifference"
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('basicData.chargeDifference') }}
+                    </span>
+                </QCardSection>
+                <QCardSection
+                    v-for="(action, index) in ticketUpdateActions"
+                    :key="index"
+                    horizontal
+                >
+                    <QRadio
+                        v-model="_ticketData.option"
+                        :val="action.code"
+                        :label="action.description"
+                        dense
+                    />
+                </QCardSection>
+            </QCard>
+            <QCard
+                v-if="haveNegatives"
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal class="flex row items-center">
+                    <QCheckbox
+                        :label="t('basicData.withoutNegatives')"
+                        v-model="_ticketData.withoutNegatives"
+                        :toggle-indeterminate="false"
+                    />
+                    <QIcon name="info" size="xs" class="q-ml-sm">
+                        <QTooltip max-width="350px">
+                            {{ t('basicData.withoutNegativesInfo') }}
+                        </QTooltip>
+                    </QIcon>
+                </QCardSection>
+            </QCard>
+        </template>
+    </RightMenu>
+    <QTable
+        :visible-columns="showMovablecolumn"
+        :rows="rows"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+        flat
+    >
+        <template #body-cell-item="{ row }">
+            <QTd @click.stop class="link">
+                <QBtn flat>
+                    {{ row.itemFk }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd>
+                <div class="column">
+                    <span>{{ row.item.name }}</span>
+                    <span class="color-vn-label">{{ row.item.subName }}</span>
+                    <FetchedTags :item="row.item" :max-length="6" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-movable="{ row }">
+            <QTd>
+                <QBadge
+                    v-if="_ticketData?.sale?.haveDifferences"
+                    :text-color="row.quantity > row.movable ? 'black' : 'white'"
+                    :color="row.quantity > row.movable ? 'negative' : 'transparent'"
+                    :label="row.movable"
+                />
+            </QTd>
+        </template>
+    </QTable>
+</template>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index af47761a2..a88e5e6d6 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -3,7 +3,7 @@ import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import BasicDataTable from './BasicDataTable.vue';
+import TicketBasicData from './TicketBasicData.vue';
 import TicketBasicDataForm from './TicketBasicDataForm.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
@@ -168,7 +168,7 @@ onBeforeMount(async () => await getTicketData());
             />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
-            <BasicDataTable
+            <TicketBasicData
                 :form-data="formData"
                 v-model:haveNegatives="haveNegatives"
                 @update-form="($event) => (formData = $event)"

From 56c461f085aecf4ba8f994871085a2f0fb3de890 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 21 Aug 2024 12:41:04 +0200
Subject: [PATCH 13/74] refactor: refs #7553 refs #7356 changed generatePdf
 name, fixed changeTime & added order in TicketVolume

---
 .../Ticket/Card/TicketDescriptorMenu.vue      | 19 ++++++++++++-------
 src/pages/Ticket/Card/TicketVolume.vue        |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index aec920002..3354da966 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -166,16 +166,16 @@ function openConfirmDialog(callback) {
     });
 }
 
-function createPdfDialog() {
+function generatePdfDialog() {
     dialog({
         component: VnConfirm,
         componentProps: {
-            promise: createPdfInvoice,
+            promise: generatePdfInvoice,
         },
     });
 }
 
-async function createPdfInvoice() {
+async function generatePdfInvoice() {
     const { data } = await axios.get('invoiceOuts', {
         params: {
             filter: JSON.stringify({
@@ -478,7 +478,12 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
-    <QItem @click="showChangeTimeDialog = !showChangeTimeDialog" v-ripple clickable>
+    <QItem
+        v-if="isEditable"
+        @click="showChangeTimeDialog = !showChangeTimeDialog"
+        v-ripple
+        clickable
+    >
         <QItemSection avatar>
             <QIcon name="schedule" />
         </QItemSection>
@@ -487,7 +492,7 @@ async function handleInvoiceOutData() {
     <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
         <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
             <template #form-inputs>
-                <!--TODO: pone el año a 1970, corregir-->
+                <!--TODO: pone el año a 1970, esperar corrección componente VnInputTime-->
                 <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
             </template>
         </FormPopup>
@@ -526,7 +531,7 @@ async function handleInvoiceOutData() {
     </QItem>
     <!--TODO: acabar esta parte, falta el campo hasInvoicing-->
     <QItem
-        @click="createPdfDialog()"
+        @click="generatePdfDialog()"
         v-ripple
         clickable
         v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)"
@@ -544,7 +549,7 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
-    <QItem @click="openRecalculateDialog()" v-ripple clickable>
+    <QItem v-if="isEditable" @click="openRecalculateDialog()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="refresh" />
         </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index e6db759d0..61f9b83d9 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -130,6 +130,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :columns="columns"
         :right-search="false"
         :column-search="false"
+        :order="['itemPackingTypeFk']"
         auto-load
     >
         <template #column-itemFk="{ row }">

From ffa6ef57fe18230e2828ec238c8eb6471ede3899 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 21 Aug 2024 13:18:43 +0200
Subject: [PATCH 14/74] fix: refs #7553 refs #7356 fix generatePdf function

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

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 3354da966..d8efe08c1 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -13,6 +13,7 @@ import FormPopup from 'components/FormPopup.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
+import { useAcl } from 'src/composables/useAcl';
 
 const props = defineProps({
     ticket: {
@@ -34,7 +35,7 @@ const showTurnDialog = ref(false);
 const showChangeTimeDialog = ref(false);
 const dialogRef = ref();
 const isEditable = ref();
-const hasInvoicing = ref();
+const hasInvoicing = useAcl('invoicing');
 const hasPdf = ref();
 const actions = {
     clone: async () => {
@@ -529,18 +530,17 @@ async function handleInvoiceOutData() {
         </QItemSection>
         <QItemSection>{{ t('Make invoice') }}</QItemSection>
     </QItem>
-    <!--TODO: acabar esta parte, falta el campo hasInvoicing-->
     <QItem
         @click="generatePdfDialog()"
         v-ripple
         clickable
-        v-if="ticket.refFk !== null && (ticket.hasInvoicing || hasPdf)"
+        v-if="ticket.refFk !== null && (hasInvoicing || hasPdf)"
     >
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
         </QItemSection>
         <QItemSection>{{
-            hasPdf.value ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
+            hasPdf ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
         }}</QItemSection>
     </QItem>
     <QItem @click="openConfirmDialog('clone')" v-ripple clickable>

From 14961d0aec9bba8f374430d46ff6ad89bd3cb278 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 22 Aug 2024 23:40:29 +0200
Subject: [PATCH 15/74] fix: change order column by default

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

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ee0471770..12df8a2d3 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -387,7 +387,7 @@ function setReference(data) {
             formInitialData: {},
         }"
         default-mode="table"
-        order="id DESC"
+        order="shipped DESC"
         :columns="columns"
         :user-params="userParams"
         :right-search="false"

From 390ab9cfd16d266aaadac97ac48e6849cf96e2b8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 10:34:54 +0200
Subject: [PATCH 16/74] feat: CustomerConsumptionFilter

---
 .../Card/CustomerConsumptionFilter.vue        | 93 ++++++++++++++++++-
 .../Card/SupplierConsumptionFilter.vue        | 52 +++--------
 2 files changed, 102 insertions(+), 43 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..91536e954 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -5,6 +5,8 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { QItem } from 'quasar';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
 
 const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
@@ -33,6 +35,8 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.buyerId"
                         url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         :label="t('params.buyer')"
                         option-value="id"
                         option-label="nickname"
@@ -48,30 +52,93 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.typeId"
                         url="ItemTypes"
-                        :label="t('params.type')"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
                         option-label="name"
                         option-value="id"
                         dense
                         outlined
                         rounded
                     >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
                     </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
+                        v-model="params.categoryId"
                         url="ItemCategories"
-                        :label="t('params.category')"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
                         option-label="name"
                         option-value="id"
-                        v-model="params.categoryId"
                         dense
                         outlined
                         rounded
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -82,10 +149,30 @@ en:
         buyer: Buyer
         type: Type
         category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
 es:
     params:
         item: Id artículo
         buyer: Comprador
         type: Tipo
         category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
 </i18n>
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 3fc61b15e..401bde8fa 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -1,56 +1,21 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const buyersOptions = ref([]);
-const itemTypesOptions = ref([]);
-const itemCategoriesOptions = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        :filter="{
-            fields: ['id', 'nickname'],
-            order: 'nickname ASC',
-        }"
-        @on-fetch="(data) => (buyersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemTypes"
-        :filter="{
-            fields: ['id', 'name', 'categoryFk'],
-            include: 'category',
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemTypesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemCategories"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemCategoriesOptions = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -82,7 +47,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
                         @update:model-value="searchFn()"
-                        :options="buyersOptions"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
@@ -98,7 +65,10 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.typeId')"
                         v-model="params.typeId"
                         @update:model-value="searchFn()"
-                        :options="itemTypesOptions"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -125,7 +95,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
                         @update:model-value="searchFn()"
-                        :options="itemCategoriesOptions"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 071f3ba4d085c22f231ff96972f5d4c48ac8b183 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 11:58:26 +0200
Subject: [PATCH 17/74] perf: TicketSummary issues

---
 .../Card/InvoiceOutDescriptorProxy.vue        |  7 ++++-
 src/pages/Ticket/Card/TicketSummary.vue       | 31 ++++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue
index 9ef0ed4b8..8e49fa16a 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
+import InvoiceOutSummary from './InvoiceOutSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <InvoiceOutDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceOutDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceOutSummary"
+        />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 634568e46..643390c7d 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,4 +1,5 @@
 <script setup>
+import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -178,7 +179,14 @@ async function changeState(value) {
                         </a>
                     </template>
                 </VnLv>
-                <VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
+                <VnLv :label="t('ticket.summary.route')">
+                    <template #value>
+                        <span class="link">
+                            {{ ticket.routeFk }}
+                            <RouteDescriptorProxy
+                                :id="ticket.routeFk"
+                            /> </span></template
+                ></VnLv>
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
                         <span :class="{ link: ticket.refFk }">
@@ -195,7 +203,7 @@ async function changeState(value) {
                     :value="dashIfEmpty(ticket.weight)"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-one" style="flex: 2 1">
                 <VnTitle
                     :url="ticketUrl + 'basic-data/step-one'"
                     :text="t('globals.summary.basicData')"
@@ -306,10 +314,9 @@ async function changeState(value) {
                                 <QBtn
                                     flat
                                     round
-                                    size="xs"
                                     icon="vn:claims"
                                     v-if="props.row.claim"
-                                    color="primary"
+                                    class="link"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -325,10 +332,9 @@ async function changeState(value) {
                                 <QBtn
                                     flat
                                     round
-                                    size="xs"
                                     icon="vn:claims"
                                     v-if="props.row.claimBeginning"
-                                    color="primary"
+                                    class="link"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -344,8 +350,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="warning"
                                     v-show="props.row.visible < 0"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip
                                         >{{ t('ticket.summary.visible') }}:
@@ -355,8 +360,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:reserva"
                                     v-show="props.row.reserved"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.reserved') }}
@@ -365,8 +369,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:unavailable"
                                     v-show="props.row.itemShortage"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.itemShortage') }}
@@ -375,10 +378,10 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:components"
                                     v-show="props.row.hasComponentLack"
-                                    size="xs"
-                                    color="primary"
+                                    class="link"
                                 >
                                     <QTooltip>
+                                        {{ props.row }}
                                         {{ t('ticket.summary.hasComponentLack') }}
                                     </QTooltip>
                                 </QIcon>

From b8dea8551d405215301729b66069006664b8a014 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:04:33 +0200
Subject: [PATCH 18/74] perf: TicketTransferSale

---
 src/pages/Ticket/Card/TicketSale.vue         |  2 +-
 src/pages/Ticket/Card/TicketTransfer.vue     | 29 ++-----
 src/pages/Ticket/Card/TicketTransferForm.vue | 84 ++++++++++++++++++++
 3 files changed, 90 insertions(+), 25 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketTransferForm.vue

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index f2c5228b4..b269c75d4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -615,7 +615,7 @@ async function save(item) {
                 </QIcon>
                 <QIcon
                     v-if="row.hasComponentLack"
-                    color="primary"
+                    class="link"
                     name="vn:components"
                     size="xs"
                 >
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 9a22c764c..1944b80f4 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
+import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
@@ -135,9 +136,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :columns="destinationTicketColumns"
                 :title="t('Destination ticket')"
                 row-key="id"
-                :pagination="{ rowsPerPage: 0 }"
                 class="full-width q-mt-md"
-                :no-data-label="t('globals.noResults')"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,29 +157,11 @@ onMounted(() => (_transfer.value = $props.transfer));
                     </QTd>
                 </template>
 
+                <template #no-data>
+                    <TicketTransferForm v-bind="$props" />
+                </template>
                 <template #bottom>
-                    <QForm class="q-mt-lg full-width">
-                        <VnInput
-                            v-model.number="_transfer.ticketId"
-                            :label="t('Transfer to ticket')"
-                            :clearable="false"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="keyboard_arrow_right"
-                                    color="primary"
-                                    @click="transferSales(_transfer.ticketId)"
-                                    style="width: 30px"
-                                />
-                            </template>
-                        </VnInput>
-                        <QBtn
-                            :label="t('New ticket')"
-                            color="primary"
-                            class="full-width q-my-lg"
-                            @click="transferSales()"
-                        />
-                    </QForm>
+                    <TicketTransferForm v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
new file mode 100644
index 000000000..b5c4a660f
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -0,0 +1,84 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+
+const $props = defineProps({
+    mana: {
+        type: Number,
+        default: null,
+    },
+    newPrice: {
+        type: Number,
+        default: 0,
+    },
+    transfer: {
+        type: Object,
+        default: () => {},
+    },
+    ticket: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['refreshData']);
+
+const router = useRouter();
+const { t } = useI18n();
+
+const _transfer = ref($props.transfer);
+
+const transferSales = async (ticketId) => {
+    const params = {
+        ticketId: ticketId,
+        sales: $props.transfer.sales,
+    };
+
+    const { data } = await axios.post(
+        `tickets/${$props.ticket.id}/transferSales`,
+        params
+    );
+
+    if (data && data.id === $props.ticket.id) emit('refreshData');
+    else router.push({ name: 'TicketSale', params: { id: data.id } });
+};
+</script>
+
+<template>
+    {{ _transfer }}
+    <QForm class="q-mt-lg full-width">
+        <VnInput
+            v-model.number="_transfer.ticketId"
+            :label="t('Transfer to ticket')"
+            :clearable="false"
+        >
+            <template #append>
+                <QBtn
+                    icon="keyboard_arrow_right"
+                    color="primary"
+                    @click="transferSales(_transfer.ticketId)"
+                    style="width: 30px"
+                />
+            </template>
+        </VnInput>
+        <QBtn
+            :label="t('New ticket')"
+            color="primary"
+            class="full-width q-my-lg"
+            @click="transferSales()"
+        />
+    </QForm>
+</template>
+
+<i18n>
+es:
+    Sales to transfer: Líneas a transferir
+    Destination ticket: Ticket destinatario
+    Transfer to ticket: Transferir a ticket
+    New ticket: Nuevo ticket
+</i18n>

From 45d9322892fd940d40969b29b0a82865ba30493e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 11:24:06 +0200
Subject: [PATCH 19/74] feat: refs #7553 added icons, descriptors and missing
 columns in TicketList and minor changes

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Ticket/Card/TicketDescriptorMenu.vue      |   1 -
 src/pages/Ticket/Card/TicketSale.vue          |   2 +-
 src/pages/Ticket/Card/TicketSummary.vue       |  46 ++--
 src/pages/Ticket/TicketList.vue               | 251 ++++++++++++++----
 src/pages/Ticket/locale/en.yml                |   5 +
 src/pages/Ticket/locale/es.yml                |   5 +
 8 files changed, 241 insertions(+), 71 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 65b8e68bc..b6abdb807 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -618,6 +618,7 @@ ticket:
         landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
+        consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3f12c0e41..e2ef436b4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -624,6 +624,7 @@ ticket:
         landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
+        consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index d8efe08c1..ae88e1b7b 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -493,7 +493,6 @@ async function handleInvoiceOutData() {
     <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
         <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
             <template #form-inputs>
-                <!--TODO: pone el año a 1970, esperar corrección componente VnInputTime-->
                 <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
             </template>
         </FormPopup>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index b269c75d4..f2c5228b4 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -615,7 +615,7 @@ async function save(item) {
                 </QIcon>
                 <QIcon
                     v-if="row.hasComponentLack"
-                    class="link"
+                    color="primary"
                     name="vn:components"
                     size="xs"
                 >
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 643390c7d..c1321b0d9 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,6 +243,15 @@ async function changeState(value) {
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.consignee')"
+                    :value="
+                        ticket.client.salesPersonUser.nickname +
+                        ' #' +
+                        ticket.client.salesPersonUser.id
+                    "
+                >
+                </VnLv>
+                <VnLv
+                    :label="t('ticket.summary.consigneeAddress')"
                     :value="formattedAddress()"
                 />
             </QCard>
@@ -316,7 +325,7 @@ async function changeState(value) {
                                     round
                                     icon="vn:claims"
                                     v-if="props.row.claim"
-                                    class="link"
+                                    color="primary"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -324,17 +333,17 @@ async function changeState(value) {
                                         },
                                     }"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claim.claimFk }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claim.claimFk }}
+                                    </QTooltip>
                                 </QBtn>
                                 <QBtn
                                     flat
                                     round
                                     icon="vn:claims"
                                     v-if="props.row.claimBeginning"
-                                    class="link"
+                                    color="primary"
                                     :to="{
                                         name: 'ClaimCard',
                                         params: {
@@ -342,25 +351,25 @@ async function changeState(value) {
                                         },
                                     }"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claimBeginning.claimFk }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claimBeginning.claimFk }}
+                                    </QTooltip>
                                 </QBtn>
                                 <QIcon
                                     name="warning"
                                     v-show="props.row.visible < 0"
-                                    class="link"
+                                    color="primary"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.visible') }}:
-                                        {{ props.row.visible }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.visible') }}:
+                                        {{ props.row.visible }}
+                                    </QTooltip>
                                 </QIcon>
                                 <QIcon
                                     name="vn:reserva"
                                     v-show="props.row.reserved"
-                                    class="link"
+                                    color="primary"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.reserved') }}
@@ -369,7 +378,7 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:unavailable"
                                     v-show="props.row.itemShortage"
-                                    class="link"
+                                    color="primary"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.itemShortage') }}
@@ -378,10 +387,9 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:components"
                                     v-show="props.row.hasComponentLack"
-                                    class="link"
+                                    color="primary"
                                 >
                                     <QTooltip>
-                                        {{ props.row }}
                                         {{ t('ticket.summary.hasComponentLack') }}
                                     </QTooltip>
                                 </QIcon>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 12df8a2d3..e05e783d9 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -17,6 +17,9 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import { toTimeFormat } from 'src/filters/date';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -47,16 +50,9 @@ const amountToReturn = ref();
 const columns = computed(() => [
     {
         align: 'left',
-        name: 'stateFk',
-        label: t('ticketList.state'),
-        columnFilter: {
-            name: 'stateFk',
-            component: 'select',
-            attrs: {
-                url: 'States',
-                fields: ['id', 'name'],
-            },
-        },
+        name: 'statusIcons',
+        hidden: true,
+        format: () => '',
     },
     {
         align: 'left',
@@ -67,40 +63,6 @@ const columns = computed(() => [
         },
         isId: true,
     },
-    {
-        align: 'left',
-        name: 'nickname',
-        label: t('ticketList.nickname'),
-        isTitle: true,
-    },
-
-    {
-        align: 'left',
-        name: 'shipped',
-        cardVisible: true,
-        label: t('ticketList.shipped'),
-        columnFilter: {
-            component: 'date',
-            alias: 't',
-            inWhere: true,
-        },
-        format: ({ shipped }) => toDate(shipped),
-    },
-    {
-        align: 'left',
-        name: 'zoneFk',
-        label: t('ticketList.zone'),
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                url: 'Zones',
-                fields: ['id', 'name'],
-            },
-            alias: 't',
-            inWhere: true,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.zoneName),
-    },
     {
         align: 'left',
         label: t('ticketList.salesPerson'),
@@ -118,6 +80,77 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
     },
+    {
+        align: 'left',
+        name: 'shippedDate',
+        cardVisible: true,
+        label: t('ticketList.shipped'),
+        columnFilter: {
+            component: 'date',
+            alias: 't',
+            inWhere: true,
+        },
+        format: ({ shippedDate }) => toDate(shippedDate),
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('ticketList.hour'),
+        format: (row) => toTimeFormat(row.shipped),
+    },
+    {
+        align: 'left',
+        name: 'zoneLanding',
+        label: t('ticketList.closure'),
+        format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('ticketList.nickname'),
+    },
+    {
+        align: 'left',
+        name: 'province',
+        label: t('ticketList.province'),
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'stateFk',
+        label: t('ticketList.state'),
+        columnFilter: {
+            name: 'stateFk',
+            component: 'select',
+            attrs: {
+                url: 'States',
+                fields: ['id', 'name'],
+            },
+        },
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'zoneFk',
+        label: t('ticketList.zone'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Zones',
+                fields: ['id', 'name'],
+            },
+            alias: 't',
+            inWhere: true,
+        },
+        columnClass: 'expand',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.zoneName),
+    },
+    {
+        align: 'left',
+        name: 'warehouse',
+        label: t('ticketList.warehouse'),
+        columnClass: 'expand',
+    },
     {
         align: 'left',
         name: 'totalWithVat',
@@ -133,15 +166,27 @@ const columns = computed(() => [
         align: 'right',
         name: 'tableActions',
         actions: [
+            {
+                title: t('ticketList.toLines'),
+                icon: 'list',
+                isPrimary: true,
+                action: (row) => redirectToLines(row.id),
+            },
             {
                 title: t('ticketList.summary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, TicketSummary),
             },
         ],
     },
 ]);
 
+function redirectToLines(id) {
+    const url = `#/ticket/${id}/sale`;
+    window.open(url, '_blank');
+}
+
 const onClientSelected = async (formData) => {
     await fetchClient(formData);
     await fetchAddresses(formData);
@@ -213,6 +258,21 @@ const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
 
+const getDateColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+    const timeTicket = new Date(date);
+    timeTicket.setHours(0, 0, 0, 0);
+    const comparation = today - timeTicket;
+    return comparation < 0 ? 'bg-success' : 'bg-warning';
+};
+
+const getTotalColor = () => {
+    // const total = row.totalWithVat;
+    // return total > 0 && total < 50 ? 'bg-warning' : '';
+    return 'bg-warning';
+};
+
 onMounted(() => (stateStore.rightDrawer = true));
 
 async function makeInvoice(ticket) {
@@ -387,7 +447,7 @@ function setReference(data) {
             formInitialData: {},
         }"
         default-mode="table"
-        order="shipped DESC"
+        :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
         :columns="columns"
         :user-params="userParams"
         :right-search="false"
@@ -399,6 +459,101 @@ function setReference(data) {
             selection: 'multiple',
         }"
     >
+        <template #column-statusIcons="{ row }">
+            <QIcon
+                v-if="row.isTaxDataChecked === 0"
+                color="primary"
+                name="vn:no036"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('No verified data') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.hasTicketRequest" color="primary" name="vn:claims" size="xs">
+                <QTooltip>
+                    {{ t('Purchase request') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.itemShortage"
+                color="primary"
+                name="vn:unavailable"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('Not visible') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
+                <QTooltip>
+                    {{ t('Client frozen') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
+                <QTooltip>
+                    {{ t('Risk') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.hasComponentLack"
+                color="primary"
+                name="vn:components"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('Component lack') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.hasRounding"
+                color="primary"
+                name="vn:sync_problem"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('Rounding') }}
+                </QTooltip>
+            </QIcon>
+        </template>
+        <template #column-salesPersonFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.salesPerson }}
+                <CustomerDescriptorProxy :id="row.salesPersonFk" />
+            </span>
+        </template>
+        <template #column-shippedDate="{ row }">
+            <QChip :class="getDateColor(row.shipped)" dense square>
+                {{ row.shippedDate }}
+            </QChip>
+        </template>
+        <template #column-nickname="{ row }">
+            <span class="link" @click.stop>
+                {{ row.nickname }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+        <template #column-stateFk="{ row }">
+            <QChip :class="getColor(row)" dense square>
+                {{ row.state }}
+            </QChip>
+        </template>
+        <template #column-zoneFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.zoneName }}
+                <ZoneDescriptorProxy :id="row.zoneFk" />
+            </span>
+        </template>
+        <template #column-totalWithVat="{ row }">
+            <QChip
+                v-if="row.totalWithVat > 0 && row.totalWithVat < 50"
+                :class="getTotalColor()"
+                dense
+                square
+            >
+                {{ row.totalWithVat }}
+            </QChip>
+        </template>
         <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnSelect
@@ -490,11 +645,6 @@ function setReference(data) {
                 </div>
             </VnRow>
         </template>
-        <template #column-stateFk="{ row }">
-            <QChip :class="getColor(row)" dense square>
-                {{ row.state }}
-            </QChip>
-        </template>
     </VnTable>
     <QPageSticky :offset="[20, 80]" style="z-index: 2">
         <QBtn
@@ -633,4 +783,5 @@ es:
     You can search by ticket id or alias: Puedes buscar por id o alias del ticket
     Zone: Zona
     New ticket: Nuevo ticket
+    Component lack: Faltan componentes
 </i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index ddd33128e..115a5ebf7 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -258,3 +258,8 @@ ticketList:
     compensation: Compensation
     creditCard: Credit card
     transfers: Transfers
+    province: Province
+    warehouse: Warehouse
+    hour: Hour
+    closure: Closure
+    toLines: Go to lines
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 97fd63060..1deda4bc4 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -261,3 +261,8 @@ ticketList:
     compensation: Compensación
     creditCard: Tarjeta de crédito
     transfers: Transferencias
+    province: Provincia
+    warehouse: Almacén
+    hour: Hora
+    closure: Cierre
+    toLines: Ir a lineas

From b622f6ef96af92c8fd9159a3ec30f384b61836de Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 3 Sep 2024 07:36:40 +0200
Subject: [PATCH 20/74] fix: refs #7553 fixed QChips like Salix

---
 src/pages/Ticket/TicketList.vue | 34 +++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index e05e783d9..e35c63e43 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -255,7 +255,11 @@ const fetchAddresses = async (formData) => {
     }
 };
 const getColor = (row) => {
-    return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
+    // return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
+    if (row.alertLevelCode === 'OK') return 'bg-success';
+    else if (row.alertLevelCode === 'FREE') return 'bg-notice';
+    else if (row.alertLevel === 1) return 'bg-warning';
+    else if (row.alertLevel === 0) return 'bg-alert';
 };
 
 const getDateColor = (date) => {
@@ -264,13 +268,8 @@ const getDateColor = (date) => {
     const timeTicket = new Date(date);
     timeTicket.setHours(0, 0, 0, 0);
     const comparation = today - timeTicket;
-    return comparation < 0 ? 'bg-success' : 'bg-warning';
-};
-
-const getTotalColor = () => {
-    // const total = row.totalWithVat;
-    // return total > 0 && total < 50 ? 'bg-warning' : '';
-    return 'bg-warning';
+    if (comparation == 0) return 'bg-warning';
+    if (comparation < 0) return 'bg-success';
 };
 
 onMounted(() => (stateStore.rightDrawer = true));
@@ -523,9 +522,11 @@ function setReference(data) {
             </span>
         </template>
         <template #column-shippedDate="{ row }">
-            <QChip :class="getDateColor(row.shipped)" dense square>
-                {{ row.shippedDate }}
-            </QChip>
+            <span v-if="getDateColor(row.shipped)">
+                <QChip :class="getDateColor(row.shipped)" dense square>
+                    {{ row.shippedDate }}
+                </QChip>
+            </span>
         </template>
         <template #column-nickname="{ row }">
             <span class="link" @click.stop>
@@ -534,9 +535,14 @@ function setReference(data) {
             </span>
         </template>
         <template #column-stateFk="{ row }">
-            <QChip :class="getColor(row)" dense square>
+            <span v-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
+            <span v-else>
                 {{ row.state }}
-            </QChip>
+            </span>
         </template>
         <template #column-zoneFk="{ row }">
             <span class="link" @click.stop>
@@ -547,7 +553,7 @@ function setReference(data) {
         <template #column-totalWithVat="{ row }">
             <QChip
                 v-if="row.totalWithVat > 0 && row.totalWithVat < 50"
-                :class="getTotalColor()"
+                class="bg-warning"
                 dense
                 square
             >

From d18ca14b4ee1d78b69cf5a5c4d364f00c32df6e1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 3 Sep 2024 07:45:46 +0200
Subject: [PATCH 21/74] fix: refs #7553 merge changes

---
 src/pages/Ticket/Card/TicketExpedition.vue | 11 -------
 src/pages/Ticket/Card/TicketSale.vue       | 37 +++++++++++-----------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 1284ce00f..5ca57ae8e 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -3,7 +3,6 @@ import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -98,17 +97,7 @@ const columns = computed(() => [
         align: 'left',
         isTitle: true,
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
             inWhere: true,
-            attrs: {
-                options: itemsOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
         },
     },
     {
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 4fb3ca3dc..3dcaa0644 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -656,25 +656,24 @@ async function save(item) {
             <QPopupProxy v-if="row.id && isTicketEditable">
                 <VnInput v-model="row.concept" @change="updateConcept(row)" />
             </QPopupProxy>
-                <VnSelect
-                    v-else
-                    :options="itemsWithNameOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    @update:model-value="changeQuantity(row)"
-                    v-model="row.itemFk"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </QTd>
+            <VnSelect
+                v-else
+                :options="itemsWithNameOptions"
+                hide-selected
+                option-label="name"
+                option-value="id"
+                @update:model-value="changeQuantity(row)"
+                v-model="row.itemFk"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                            <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
         </template>
         <template #column-quantity="{ row }">
             <QTd @click.stop>

From f35e33cf1037816f1cf0d33ab998dcb65cc4b33b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 3 Sep 2024 12:54:44 +0200
Subject: [PATCH 22/74] fix: refs #7553 fixed TicketTransfer

---
 src/pages/Ticket/Card/TicketSale.vue         |  3 ++-
 src/pages/Ticket/Card/TicketTransfer.vue     | 28 ++------------------
 src/pages/Ticket/Card/TicketTransferForm.vue |  1 -
 src/pages/Ticket/TicketList.vue              |  4 +--
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 3dcaa0644..3ce90b85e 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -283,7 +283,7 @@ const getMana = async () => {
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
-    return selectedSales.value.filter((sale) => sale.id != undefined);
+    return [...selectedRows.value];
 });
 
 const onOpenEditPricePopover = async (sale) => {
@@ -418,6 +418,7 @@ const removeSales = async () => {
 
 const setTransferParams = async () => {
     try {
+        selectedSales.value = selectedValidSales.value;
         const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
         transfer.value = {
             lastActiveTickets: [],
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 1944b80f4..93412aa9b 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-import axios from 'axios';
 
 const $props = defineProps({
     mana: {
@@ -28,13 +26,10 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refreshData']);
-
-const router = useRouter();
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
 
-const _transfer = ref(null);
+const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
@@ -85,29 +80,13 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
-const transferSales = async (ticketId) => {
-    const params = {
-        ticketId: ticketId,
-        sales: $props.transfer.sales,
-    };
-
-    const { data } = await axios.post(
-        `tickets/${$props.ticket.id}/transferSales`,
-        params
-    );
-
-    if (data && data.id === $props.ticket.id) emit('refreshData');
-    else router.push({ name: 'TicketSale', params: { id: data.id } });
-};
-
 onMounted(() => (_transfer.value = $props.transfer));
 </script>
 
 <template>
     <QPopupProxy ref="QPopupProxyRef">
-        <QCard class="q-px-md" style="display: flex">
+        <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
-                v-if="transfer.sales"
                 :rows="transfer.sales"
                 :columns="transferLinesColumns"
                 :title="t('Sales to transfer')"
@@ -121,9 +100,6 @@ onMounted(() => (_transfer.value = $props.transfer));
                         <VnInput
                             v-model.number="row.quantity"
                             :clearable="false"
-                            @keyup.enter="changeQuantity(row)"
-                            @blur="changeQuantity(row)"
-                            @focus="edit.oldQuantity = row.quantity"
                             style="max-width: 60px"
                         />
                     </QTd>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index b5c4a660f..c4b3906ae 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -50,7 +50,6 @@ const transferSales = async (ticketId) => {
 </script>
 
 <template>
-    {{ _transfer }}
     <QForm class="q-mt-lg full-width">
         <VnInput
             v-model.number="_transfer.ticketId"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index e35c63e43..07907aac9 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -490,9 +490,7 @@ function setReference(data) {
                 </QTooltip>
             </QIcon>
             <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
-                <QTooltip>
-                    {{ t('Risk') }}
-                </QTooltip>
+                <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
             </QIcon>
             <QIcon
                 v-if="row.hasComponentLack"

From cb7d729b0f01ab15b5302abee21567b04fe4ebd1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 08:02:28 +0200
Subject: [PATCH 23/74] fix: refs #7553 fixed details in summary and data-key
 in TicketList

---
 src/pages/Ticket/Card/TicketSummary.vue | 97 ++++++++++++++++++++++---
 src/pages/Ticket/TicketList.vue         |  6 +-
 2 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index c1321b0d9..3330b4d1d 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -15,6 +15,7 @@ import { getUrl } from 'src/composables/getUrl';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -79,6 +80,29 @@ async function changeState(value) {
     await axios.post(`Tickets/state`, formData);
     router.go(route.fullPath);
 }
+
+function getNoteValue(description) {
+    switch (description) {
+        case 'ItemPicker':
+            return t('ItemPicker');
+        case 'Packager':
+            return t('Packager');
+        case 'Delivery':
+            return t('Delivery');
+        case 'SalesPerson':
+            return t('SalesPerson');
+        case 'Administrative':
+            return t('Administrative');
+        case 'Weight':
+            return t('Weight');
+        case 'InvoiceOut':
+            return t('InvoiceOut');
+        case 'DropOff':
+            return t('DropOff');
+        case 'Sustitución':
+            return t('Sustitución');
+    }
+}
 </script>
 
 <template>
@@ -160,7 +184,14 @@ async function changeState(value) {
                     :label="t('ticket.summary.agency')"
                     :value="ticket.agencyMode?.name"
                 />
-                <VnLv :label="t('ticket.summary.zone')" :value="ticket?.zone?.name" />
+                <VnLv :label="t('ticket.summary.zone')">
+                    <template #value>
+                        <span class="link" @click.stop>
+                            {{ ticket?.zone?.name }}
+                            <ZoneDescriptorProxy :id="ticket.zoneFk" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv
                     :label="t('ticket.summary.warehouse')"
                     :value="ticket.warehouse?.name"
@@ -263,7 +294,7 @@ async function changeState(value) {
                 <VnLv
                     v-for="note in ticket.notes"
                     :key="note.id"
-                    :label="note.observationType.description"
+                    :label="getNoteValue(note.observationType.description)"
                     :value="note.description"
                 >
                     <template #value>
@@ -291,6 +322,7 @@ async function changeState(value) {
                     <VnLv
                         :label="t('ticket.summary.total')"
                         :value="toCurrency(ticket.totalWithVat)"
+                        style="font-weight: bold"
                     />
                 </div>
             </QCard>
@@ -400,7 +432,17 @@ async function changeState(value) {
                                     <ItemDescriptorProxy :id="props.row.itemFk" />
                                 </QBtn>
                             </QTd>
-                            <QTd>{{ props.row.visible }}</QTd>
+                            <QTd>
+                                <QChip
+                                    dense
+                                    rounded
+                                    v-if="props.row.visible < 0"
+                                    :color="'negative'"
+                                >
+                                    {{ props.row.visible }}
+                                    {{ console.log(props.row) }}
+                                </QChip>
+                            </QTd>
                             <QTd>{{ props.row.available }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
@@ -432,12 +474,9 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard
-                class="vn-max"
-                v-if="ticket.packagings.length > 0 || ticket.services.length > 0"
-            >
+            <QCard class="vn-max" v-if="ticket.packagings.length != 0">
                 <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
-                <QTable :rows="ticket.packagings" flat>
+                <QTable :rows="ticket.packagings" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
@@ -453,11 +492,13 @@ async function changeState(value) {
                         </QTr>
                     </template>
                 </QTable>
+            </QCard>
+            <QCard class="vn-max" v-if="ticket.services.length != 0">
                 <VnTitle
                     :url="ticketUrl + 'service'"
                     :text="t('ticket.summary.service')"
                 />
-                <QTable :rows="ticket.services" flat>
+                <QTable :rows="ticket.services" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
@@ -480,12 +521,12 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-max" v-if="ticket.requests.length > 0">
+            <QCard class="vn-max" v-if="ticket.requests.length != 0">
                 <VnTitle
                     :url="ticketUrl + 'request'"
                     :text="t('ticket.summary.purchaseRequest')"
                 />
-                <QTable :rows="ticket.requests" flat>
+                <QTable :rows="ticket.requests" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
@@ -517,7 +558,14 @@ async function changeState(value) {
                                     v-model="props.row.isOk"
                                     disable
                                     :toggle-indeterminate="false"
-                                />
+                                >
+                                    <QTooltip v-if="props.row.isOk">
+                                        {{ t('Accepted') }}
+                                    </QTooltip>
+                                    <QTooltip v-else>
+                                        {{ t('Denied') }}
+                                    </QTooltip>
+                                </QCheckbox>
                             </QTd>
                         </QTr>
                     </template>
@@ -564,3 +612,28 @@ async function changeState(value) {
     color: $primary-light;
 }
 </style>
+
+<i18n>
+en:
+    ItemPicker: Item Picker
+    Packager: Packager
+    Delivery: Delivery
+    SalesPerson: Sales Person
+    Administrative: Administrative
+    Weight: Weight
+    InvoiceOut: Invoice Out
+    DropOff: Drop Off
+    Sustitución: Sustitution
+es:
+    ItemPicker: Items
+    Packager: Encajador
+    Delivery: Envío
+    SalesPerson: Comercial
+    Administrative: Administrativa
+    Weight: Peso
+    InvoiceOut: Facturas
+    DropOff: Despacho
+    Sustitución: Sustitución
+    Accepted: Aceptado
+    Denied: Denegado
+</i18n>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 07907aac9..ad50f5433 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -426,18 +426,18 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Tickets"
+        data-key="Ticket"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Tickets" />
+            <TicketFilter data-key="Ticket" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Tickets"
+        data-key="Ticket"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',

From 5471607d327350ac5efe117d67693d70fef8e86a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 08:18:10 +0200
Subject: [PATCH 24/74] refactor: refs #7553 added order to Expedition table
 and tootltip in delete button

---
 src/pages/Ticket/Card/TicketExpedition.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 5ca57ae8e..cbbbfdee1 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -302,7 +302,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             deleteExpedition
                         )
                     "
-                />
+                >
+                    <QTooltip>{{ t('Delete expedition') }}</QTooltip>
+                </QBtn>
             </QBtnGroup>
         </template>
     </VnSubToolbar>
@@ -320,6 +322,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         }"
         default-mode="table"
         auto-load
+        order="created DESC"
     >
         <template #column-packagingItemFk="{ row }">
             <span class="link" @click.stop>
@@ -363,3 +366,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QTable>
     </QDialog>
 </template>
+
+<i18n>
+es:
+    Delete expedition: Eliminar expedición
+</i18n>

From 0d9773a30fea6da93a50c91205bbbb3e9d56628d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 09:11:05 +0200
Subject: [PATCH 25/74] refactor: refs #7553 added default date in new
 expedition modal

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

diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index 55ca700bc..9183ae405 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -31,6 +31,7 @@ const router = useRouter();
 const { notify } = useNotify();
 
 const newTicketFormData = reactive({});
+const date = new Date();
 
 const createTicket = async () => {
     try {
@@ -64,7 +65,11 @@ const createTicket = async () => {
     >
         <template #form-inputs="{ data }">
             <VnRow>
-                <VnInputDate :label="t('expedition.landed')" v-model="data.landed" />
+                <VnInputDate
+                    :label="t('expedition.landed')"
+                    v-model="data.landed"
+                    :model-value="date"
+                />
             </VnRow>
             <VnRow>
                 <VnInput

From 1889aa85b5bb755aa5d88a7c3abd72531d6f2b6d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 11:49:49 +0200
Subject: [PATCH 26/74] refactor: refs #7553 deleted expedition code and slot
 in VnTable

---
 src/components/VnTable/VnTable.vue         |  5 +++--
 src/pages/Ticket/Card/TicketExpedition.vue | 18 +-----------------
 src/pages/Ticket/locale/en.yml             |  3 ++-
 src/pages/Ticket/locale/es.yml             |  5 +++--
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9a5b748ba..5367ce4c9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -408,11 +408,12 @@ defineExpose({
                         @click="stateStore.toggleRightDrawer()"
                     />
                 </template>
-                <template #top>
+                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles-->
+                <!-- <template #top>
                     <div class="full-width-slot">
                         <slot name="before-header" />
                     </div>
-                </template>
+                </template> -->
                 <template #header-cell="{ col }">
                     <QTh v-if="col.visible ?? true">
                         <div
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index cbbbfdee1..4becb3db3 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -28,7 +27,6 @@ const tableRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
-const visibleColumns = ref([]);
 const newTicketWithRoute = ref(false);
 const selectedRows = ref([]);
 const hasSelectedRows = computed(() => selectedRows.value.length > 0);
@@ -245,14 +243,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 <template>
     <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="expeditionIndex"
-                labels-traductions-path="expedition"
-                @on-config-saved="visibleColumns = [...$event, 'history']"
-            />
-        </template>
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtnDropdown
@@ -303,7 +293,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         )
                     "
                 >
-                    <QTooltip>{{ t('Delete expedition') }}</QTooltip>
+                    <QTooltip>{{ t('expedition.removeExpedition') }}</QTooltip>
                 </QBtn>
             </QBtnGroup>
         </template>
@@ -320,7 +310,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             'row-key': 'id',
             selection: 'multiple',
         }"
-        default-mode="table"
         auto-load
         order="created DESC"
     >
@@ -366,8 +355,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QTable>
     </QDialog>
 </template>
-
-<i18n>
-es:
-    Delete expedition: Eliminar expedición
-</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index b2626faa3..7629633c8 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -106,7 +106,7 @@ expedition:
     name: Name
     packageType: Package type
     counter: Counter
-    externalId: externalId
+    externalId: external Id
     created: Created
     state: State
     historyAction: Status log
@@ -122,6 +122,7 @@ expedition:
     isScanned: Is scanned
     yes: Yes
     no: No
+    removeExpedition: Delete expedition
 basicData:
     next: Next
     back: Back
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 879870b78..2e7dc4d1c 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -193,9 +193,9 @@ expedition:
     id: Expedición
     item: Artículo
     name: Nombre
-    packageType: Package type
+    packageType: Embalaje
     counter: Contador
-    externalId: externalId
+    externalId: ID externo
     created: Fecha creación
     state: Estado
     historyAction: Historial de estados
@@ -211,6 +211,7 @@ expedition:
     isScanned: Escaneado
     yes: Sí
     no: No
+    removeExpedition: Eliminar expedición
 package:
     package: Embalaje
     quantity: Cantidad

From f5eacea4830988f29829ce385cc4b104f5b69453 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 4 Sep 2024 14:12:27 +0200
Subject: [PATCH 27/74] refactor: refs #7553 modified QDrawer and table columns

---
 src/pages/Ticket/Card/TicketVolume.vue | 63 ++++++++++++++------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 61f9b83d9..8d7036c8b 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -1,11 +1,10 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
+import { ref, computed, onUnmounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -42,28 +41,36 @@ const columns = computed(() => [
         align: 'left',
         label: t('volume.item'),
         name: 'itemFk',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
         align: 'left',
         label: t('volume.description'),
         name: 'concept',
         columnClass: 'expand',
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('volume.packingType'),
         name: 'itemPackingTypeFk',
+        cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.item.itemPackingTypeFk),
     },
     {
         align: 'left',
         label: t('volume.quantity'),
         name: 'quantity',
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('volume.volumeQuantity'),
         name: 'volume',
+        cardVisible: true,
     },
 ]);
 
@@ -86,10 +93,6 @@ const applyVolumes = async (salesData) => {
     }
 };
 
-onMounted(() => {
-    stateStore.rightDrawer = true;
-});
-
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
@@ -101,28 +104,32 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => applyVolumes(data)"
         auto-load
     />
-    <RightMenu v-if="packingTypeVolume.length">
-        <template #right-panel>
-            <QCard
-                v-for="(packingType, index) in packingTypeVolume"
-                :key="index"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('volume.type') }}:
-                        {{ dashIfEmpty(packingType.description) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
+    <QDrawer
+        v-if="packingTypeVolume.length"
+        side="right"
+        :width="270"
+        v-model="stateStore.rightDrawer"
+    >
+        <QCard
+            v-for="(packingType, index) in packingTypeVolume"
+            :key="index"
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('volume.type') }}:
+                    {{ dashIfEmpty(packingType.description) }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
+            </QCardSection>
+        </QCard>
+    </QDrawer>
+
     <VnTable
         ref="tableRef"
         data-key="TicketVolume"

From db6f4fd15a64d32e11d726142dd19bcd45f3502e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 5 Sep 2024 14:32:22 +0200
Subject: [PATCH 28/74] refactor: refs #7553 deleted logs

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue |  1 -
 src/pages/Ticket/Card/TicketSummary.vue        | 12 ++++++++++--
 src/pages/Ticket/TicketList.vue                |  7 +------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index e0c1da889..334939c97 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -259,7 +259,6 @@ async function createRefund(withWarehouse) {
 }
 
 async function changeShippedHour(time) {
-    console.log('time: ', time);
     const params = {
         shipped: time,
     };
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ee6ca6d91..17e4a96c0 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -440,10 +440,18 @@ function getNoteValue(description) {
                                     :color="'negative'"
                                 >
                                     {{ props.row.visible }}
-                                    {{ console.log(props.row) }}
                                 </QChip>
                             </QTd>
-                            <QTd>{{ props.row.available }}</QTd>
+                            <QTd>
+                                <QChip
+                                    dense
+                                    rounded
+                                    v-if="props.row.available < 0"
+                                    :color="'negative'"
+                                >
+                                    {{ props.row.available }}
+                                </QChip>
+                            </QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
                                 <div class="row full-width justify-between">
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad50f5433..ee6c4b6a7 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -302,7 +302,7 @@ async function sendDocuware(ticket) {
         }
         notify('globals.dataSaved', 'positive');
     } catch (err) {
-        console.log('err: ', err);
+        console.err('err: ', err);
     }
 }
 
@@ -321,7 +321,6 @@ function openBalanceDialog(ticket) {
     }
 
     for (let ticketData of checkedTickets) {
-        console.log('ticketData: ', ticketData);
         amountPaid.value += ticketData.totalWithVat;
         clientFk.value = ticketData.clientFk;
         description.value.push(ticketData.id);
@@ -367,8 +366,6 @@ const setAmountToReturn = (newAmountGiven) => {
 };
 
 function setReference(data) {
-    console.log('entity: ', data);
-
     let newDescription = '';
 
     switch (data) {
@@ -410,7 +407,6 @@ function setReference(data) {
     }
 
     dialogData.value.value.description = newDescription;
-    console.log('Updated description:', dialogData.value.value.description);
 }
 </script>
 
@@ -451,7 +447,6 @@ function setReference(data) {
         :user-params="userParams"
         :right-search="false"
         redirect="ticket"
-        auto-load
         v-model:selected="selectedRows"
         :table="{
             'row-key': 'id',

From 8ff9dae1d8b32de00fa5876fd441b4d033123054 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 07:16:03 +0200
Subject: [PATCH 29/74] refactor: refs #7553 requested changes

---
 src/pages/Ticket/Card/TicketSummary.vue |  8 +++++++-
 src/pages/Ticket/TicketFilter.vue       | 10 ++++++++++
 src/pages/Ticket/TicketList.vue         |  1 -
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 17e4a96c0..4562f2c60 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -351,7 +351,7 @@ function getNoteValue(description) {
                     </template>
                     <template #body="props">
                         <QTr :props="props">
-                            <QTd>
+                            <QTd class="q-gutter-x-xs">
                                 <QBtn
                                     flat
                                     round
@@ -392,6 +392,7 @@ function getNoteValue(description) {
                                     name="warning"
                                     v-show="props.row.visible < 0"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.visible') }}:
@@ -402,6 +403,7 @@ function getNoteValue(description) {
                                     name="vn:reserva"
                                     v-show="props.row.reserved"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.reserved') }}
@@ -411,6 +413,7 @@ function getNoteValue(description) {
                                     name="vn:unavailable"
                                     v-show="props.row.itemShortage"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.itemShortage') }}
@@ -420,6 +423,7 @@ function getNoteValue(description) {
                                     name="vn:components"
                                     v-show="props.row.hasComponentLack"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.hasComponentLack') }}
@@ -438,6 +442,7 @@ function getNoteValue(description) {
                                     rounded
                                     v-if="props.row.visible < 0"
                                     :color="'negative'"
+                                    text-color="white"
                                 >
                                     {{ props.row.visible }}
                                 </QChip>
@@ -448,6 +453,7 @@ function getNoteValue(description) {
                                     rounded
                                     v-if="props.row.available < 0"
                                     :color="'negative'"
+                                    text-color="white"
                                 >
                                     {{ props.row.available }}
                                 </QChip>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 3b9833ce2..b7389b93f 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -115,6 +115,15 @@ const warehouses = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.scopedDays"
+                        :label="t('Days onward')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
@@ -278,4 +287,5 @@ es:
     Warehouse: Almacén
     Yes: Si
     No: No
+    Days onward: Días adelante
 </i18n>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ee6c4b6a7..1f2687500 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -255,7 +255,6 @@ const fetchAddresses = async (formData) => {
     }
 };
 const getColor = (row) => {
-    // return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
     if (row.alertLevelCode === 'OK') return 'bg-success';
     else if (row.alertLevelCode === 'FREE') return 'bg-notice';
     else if (row.alertLevel === 1) return 'bg-warning';

From 0e5607d685b19600ce99fea92ad83616eca8aa40 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 6 Sep 2024 13:59:50 +0200
Subject: [PATCH 30/74] feat: refs #7553 ticket component to vntable and fixed
 minor errors

---
 .../Ticket/Card/BasicData/TicketBasicData.vue | 151 ++++----
 src/pages/Ticket/Card/TicketComponents.vue    | 353 +++++++++---------
 .../Ticket/Card/TicketPurchaseRequest.vue     |  15 +-
 src/pages/Ticket/Card/TicketSale.vue          | 181 ++++-----
 src/pages/Ticket/Card/TicketVolume.vue        |   4 +-
 5 files changed, 338 insertions(+), 366 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 22e89d394..741231ca3 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -145,83 +144,81 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (ticketUpdateActions = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
-            <QCard
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <QCard
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('basicData.total') }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('basicData.price') }}:
+                    {{ toCurrency(totalPrice) }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
+                </span>
+            </QCardSection>
+            <QCardSection class="column items-center" horizontal>
+                <span>
+                    {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
+                </span>
+            </QCardSection>
+        </QCard>
+        <QCard
+            v-if="totalDifference"
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('basicData.chargeDifference') }}
+                </span>
+            </QCardSection>
+            <QCardSection
+                v-for="(action, index) in ticketUpdateActions"
+                :key="index"
+                horizontal
             >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.total') }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.price') }}:
-                        {{ toCurrency(totalPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
-                    </span>
-                </QCardSection>
-                <QCardSection class="column items-center" horizontal>
-                    <span>
-                        {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
-                    </span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="totalDifference"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('basicData.chargeDifference') }}
-                    </span>
-                </QCardSection>
-                <QCardSection
-                    v-for="(action, index) in ticketUpdateActions"
-                    :key="index"
-                    horizontal
-                >
-                    <QRadio
-                        v-model="_ticketData.option"
-                        :val="action.code"
-                        :label="action.description"
-                        dense
-                    />
-                </QCardSection>
-            </QCard>
-            <QCard
-                v-if="haveNegatives"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal class="flex row items-center">
-                    <QCheckbox
-                        :label="t('basicData.withoutNegatives')"
-                        v-model="_ticketData.withoutNegatives"
-                        :toggle-indeterminate="false"
-                    />
-                    <QIcon name="info" size="xs" class="q-ml-sm">
-                        <QTooltip max-width="350px">
-                            {{ t('basicData.withoutNegativesInfo') }}
-                        </QTooltip>
-                    </QIcon>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
+                <QRadio
+                    v-model="_ticketData.option"
+                    :val="action.code"
+                    :label="action.description"
+                    dense
+                />
+            </QCardSection>
+        </QCard>
+        <QCard
+            v-if="haveNegatives"
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            bordered
+            flat
+            style="border-color: black"
+        >
+            <QCardSection horizontal class="flex row items-center">
+                <QCheckbox
+                    :label="t('basicData.withoutNegatives')"
+                    v-model="_ticketData.withoutNegatives"
+                    :toggle-indeterminate="false"
+                />
+                <QIcon name="info" size="xs" class="q-ml-sm">
+                    <QTooltip max-width="350px">
+                        {{ t('basicData.withoutNegativesInfo') }}
+                    </QTooltip>
+                </QIcon>
+            </QCardSection>
+        </QCard>
+    </QDrawer>
     <QTable
         :visible-columns="showMovablecolumn"
         :rows="rows"
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index c008f8314..96462b8a6 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -5,15 +5,16 @@ import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { toCurrency } from 'filters/index';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
@@ -75,32 +76,39 @@ const columns = computed(() => [
         name: 'item',
         align: 'left',
     },
+    {
+        align: 'left',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
+    },
     {
         label: t('ticketComponents.description'),
         name: 'description',
         align: 'left',
+        columnClass: 'expand',
     },
     {
         label: t('ticketComponents.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
-        format: (val) => dashIfEmpty(val),
+        format: (row) => dashIfEmpty(row.quantity),
     },
     {
         label: t('ticketComponents.serie'),
         name: 'serie',
         align: 'left',
-    },
-    {
-        label: t('ticketComponents.components'),
-        name: 'components',
-        align: 'left',
-    },
-    {
-        label: t('ticketComponents.import'),
-        name: 'import',
-        align: 'left',
+        format: (row) => dashIfEmpty(row.serie),
     },
     {
         label: t('ticketComponents.total'),
@@ -174,181 +182,166 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (components = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.total') }}
+                </span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label"
+                    >{{ t('ticketComponents.baseToCommission') }}:
+                </span>
+                <span>{{ toCurrency(getBase) }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label"
+                    >{{ t('ticketComponents.totalWithoutVat') }}:
+                </span>
+                <span>{{ toCurrency(getTotal) }}</span>
+            </QCardSection>
+        </QCard>
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.components') }}
+                </span>
+            </QCardSection>
+            <QCardSection
+                v-for="(component, index) in componentsList"
+                :key="index"
+                horizontal
             >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.total') }}
-                    </span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label"
-                        >{{ t('ticketComponents.baseToCommission') }}:
-                    </span>
-                    <span>{{ toCurrency(getBase) }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label"
-                        >{{ t('ticketComponents.totalWithoutVat') }}:
-                    </span>
-                    <span>{{ toCurrency(getTotal) }}</span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.components') }}
-                    </span>
-                </QCardSection>
-                <QCardSection
-                    v-for="(component, index) in componentsList"
-                    :key="index"
-                    horizontal
-                >
-                    <span v-if="component.name" class="q-mr-xs color-vn-label">
-                        {{ component.name }}:
-                    </span>
-                    <span v-if="component.value">{{
-                        toCurrency(component.value, 'EUR', 3)
-                    }}</span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.zoneBreakdown') }}
-                    </span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.price') }}:
-                    </span>
-                    <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.bonus') }}:
-                    </span>
-                    <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.zone') }}:
-                    </span>
-                    <span class="link">
-                        {{ dashIfEmpty(ticketData?.zone?.name) }}
-                        <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
-                    </span>
-                </QCardSection>
-                <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.volume') }}:
-                    </span>
-                    <span>{{ ticketVolume }}</span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.packages') }}:
-                    </span>
-                    <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
-                </QCardSection>
-            </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
-                <QCardSection horizontal>
-                    <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('ticketComponents.theoricalCost') }}
-                    </span>
-                </QCardSection>
-                <QCardSection horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketComponents.totalPrice') }}:
-                    </span>
-                    <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
-                </QCardSection>
-            </QCard>
-        </template>
-    </RightMenu>
-    <QTable
-        :rows="components"
+                <span v-if="component.name" class="q-mr-xs color-vn-label">
+                    {{ component.name }}:
+                </span>
+                <span v-if="component.value">{{
+                    toCurrency(component.value, 'EUR', 3)
+                }}</span>
+            </QCardSection>
+        </QCard>
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.zoneBreakdown') }}
+                </span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.price') }}:
+                </span>
+                <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.bonus') }}:
+                </span>
+                <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.zone') }}:
+                </span>
+                <span class="link">
+                    {{ dashIfEmpty(ticketData?.zone?.name) }}
+                    <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
+                </span>
+            </QCardSection>
+            <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.volume') }}:
+                </span>
+                <span>{{ ticketVolume }}</span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.packages') }}:
+                </span>
+                <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
+            </QCardSection>
+        </QCard>
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
+            <QCardSection horizontal>
+                <span class="text-weight-bold text-subtitle1 text-center full-width">
+                    {{ t('ticketComponents.theoricalCost') }}
+                </span>
+            </QCardSection>
+            <QCardSection horizontal>
+                <span class="q-mr-xs color-vn-label">
+                    {{ t('ticketComponents.totalPrice') }}:
+                </span>
+                <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
+            </QCardSection>
+        </QCard>
+    </QDrawer>
+    <VnTable
+        ref="tableRef"
+        data-key="TicketComponents"
+        url="Sales"
+        :user-filter="salesFilter"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
+        :right-search="false"
+        auto-load
+        :disable-option="{ card: true }"
+        :column-search="false"
     >
-        <template #body-cell-item="{ row }">
-            <QTd @click.stop class="link">
-                <QBtn flat>
-                    <span>{{ row.itemFk }}</span>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
+        <template #column-item="{ row }">
+            <span @click.stop flat class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
         </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
-                <div class="column">
-                    <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
-                    <FetchedTags :item="row.item" />
-                </div>
-            </QTd>
+        <template #column-image="{ row }">
+            <div class="image-wrapper">
+                <VnImg :id="parseInt(row?.item?.id)" class="rounded" />
+            </div>
         </template>
-        <template #body-cell-serie="{ row }">
-            <QTd>
-                <div class="column">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
-                        {{ saleComponent.component?.componentType?.name }}
-                    </span>
-                </div>
-            </QTd>
+        <template #column-description="{ row }">
+            <div class="column">
+                <span>{{ row.item.name }}</span>
+                <span class="color-vn-label">{{ row.item.subName }}</span>
+                <FetchedTags :item="row.item" />
+            </div>
         </template>
-        <template #body-cell-components="{ row }">
-            <QTd>
-                <div class="column">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
-                        {{ saleComponent.component?.name }}
-                    </span>
-                </div>
-            </QTd>
+        <template #column-serie="{ row }">
+            <div class="column">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ saleComponent.component?.componentType?.name }}
+                </span>
+            </div>
         </template>
-        <template #body-cell-import="{ row }">
-            <QTd>
-                <div class="column text-right">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
+        <!-- <template #column-components="{ row }">
+            <div class="column">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ saleComponent.component?.name }}
+                </span>
+            </div>
+        </template> -->
+        <!-- <template #column-import="{ row }">
+            <div class="column text-left">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ toCurrency(saleComponent.value, 'EUR', 3) }}
+                </span>
+            </div>
+        </template> -->
+        <template #column-total="{ row }">
+            <div class="column">
+                <span v-for="(saleComponent, index) in row.components" :key="index">
+                    {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
+                    <QTooltip>
+                        {{ saleComponent.component?.name }}:
                         {{ toCurrency(saleComponent.value, 'EUR', 3) }}
-                    </span>
-                </div>
-            </QTd>
+                    </QTooltip>
+                </span>
+            </div>
         </template>
-        <template #body-cell-total="{ row }">
-            <QTd>
-                <div class="column text-right">
-                    <span v-for="(saleComponent, index) in row.components" :key="index">
-                        {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
-                    </span>
-                </div>
-            </QTd>
-        </template>
-    </QTable>
+    </VnTable>
 </template>
+
+<style lang="scss" scoped>
+.image-wrapper {
+    width: 40px;
+    height: 40px;
+}
+</style>
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 3efdcbef8..d0af9efd0 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -14,8 +14,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
+import { onMounted } from 'vue';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const route = useRoute();
+const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
 const attendersOptions = ref([]);
@@ -84,14 +87,12 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.description'),
         name: 'description',
         columnClass: 'expand',
-        hidden: true,
     },
     {
         align: 'left',
@@ -99,7 +100,6 @@ const columns = computed(() => [
         name: 'created',
         format: (row) => toDateFormat(row.created),
         cardVisible: true,
-        hidden: true,
     },
     {
         align: 'left',
@@ -107,7 +107,6 @@ const columns = computed(() => [
         name: 'requesterFk',
         cardVisible: true,
         format: (row) => dashIfEmpty(row.requester?.user?.nickname),
-        hidden: true,
     },
     {
         align: 'left',
@@ -115,33 +114,28 @@ const columns = computed(() => [
         name: 'attenderFk',
         cardVisible: true,
         format: (row) => dashIfEmpty(row.atender?.user?.nickname),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.quantity'),
         name: 'quantity',
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.price'),
         name: 'price',
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.saleFk'),
         name: 'saleFk',
         cardVisible: true,
-        hidden: true,
     },
     {
         align: 'left',
         label: t('purchaseRequest.state'),
         name: 'isOk',
         cardVisible: true,
-        isHidden: true,
     },
     {
         align: 'right',
@@ -186,6 +180,8 @@ async function removeLine(id) {
         console.error('Error ', err);
     }
 }
+
+onMounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -212,6 +208,7 @@ async function removeLine(id) {
         :columns="columns"
         :is-editable="true"
         :right-search="false"
+        :column-search="false"
         auto-load
     >
         <template #column-description="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 3ce90b85e..2d51ed8ca 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -63,7 +63,6 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'statusIcons',
-        hidden: true,
     },
     {
         align: 'center',
@@ -85,20 +84,17 @@ const columns = computed(() => [
         label: t('ticketSale.visible'),
         name: 'visible',
         format: (row, dashIfEmpty) => dashIfEmpty(row.visible),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('ticketSale.available'),
         name: 'available',
         format: (row, dashIfEmpty) => dashIfEmpty(row.available),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('ticketSale.id'),
         name: 'itemFk',
-        hidden: true,
     },
     {
         align: 'left',
@@ -106,7 +102,6 @@ const columns = computed(() => [
         name: 'quantity',
         cardVisible: true,
         format: (row) => toCurrency(row.quantity),
-        hidden: true,
     },
     {
         align: 'left',
@@ -115,7 +110,6 @@ const columns = computed(() => [
         format: (row) => row?.item?.name,
         columnClass: 'expand',
         cardVisible: true,
-        hidden: true,
     },
     {
         align: 'left',
@@ -123,7 +117,6 @@ const columns = computed(() => [
         name: 'price',
         cardVisible: true,
         format: (row) => toCurrency(row.price),
-        hidden: true,
     },
     {
         align: 'left',
@@ -131,14 +124,12 @@ const columns = computed(() => [
         name: 'discount',
         cardVisible: true,
         format: (row) => toPercentage(row.discount),
-        hidden: true,
     },
     {
         align: 'left',
         label: t('ticketSale.amount'),
         name: 'amount',
         format: (row) => parseInt(row.amount * row.quantity),
-        hidden: true,
     },
     {
         align: 'left',
@@ -146,7 +137,6 @@ const columns = computed(() => [
         name: 'itemPackingTypeFk',
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
-        hidden: true,
     },
     {
         align: 'right',
@@ -578,52 +568,51 @@ async function save(item) {
             selection: 'multiple',
         }"
         :right-search="false"
+        :column-search="false"
         auto-load
     >
         <template #column-statusIcons="{ row }">
-            <QTd class="q-gutter-x-xs">
-                <router-link
-                    v-if="row.claim?.claimFk"
-                    :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
-                >
-                    <QIcon color="primary" name="vn:claims" size="xs">
-                        <QTooltip>
-                            {{ t('ticketSale.claim') }}:
-                            {{ row.claim?.claimFk }}
-                        </QTooltip>
-                    </QIcon>
-                </router-link>
-                <QIcon v-if="row.visible < 0" color="primary" name="warning" size="xs">
+            <router-link
+                v-if="row.claim?.claimFk"
+                :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
+            >
+                <QIcon color="primary" name="vn:claims" size="xs">
                     <QTooltip>
-                        {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
+                        {{ t('ticketSale.claim') }}:
+                        {{ row.claim?.claimFk }}
                     </QTooltip>
                 </QIcon>
-                <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
-                    <QTooltip>
-                        {{ t('ticketSale.reserved') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.itemShortage"
-                    color="primary"
-                    name="vn:unavailable"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('ticketSale.noVisible') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasComponentLack"
-                    color="primary"
-                    name="vn:components"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('ticketSale.hasComponentLack') }}
-                    </QTooltip>
-                </QIcon>
-            </QTd>
+            </router-link>
+            <QIcon v-if="row.visible < 0" color="primary" name="warning" size="xs">
+                <QTooltip>
+                    {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
+                </QTooltip>
+            </QIcon>
+            <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
+                <QTooltip>
+                    {{ t('ticketSale.reserved') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.itemShortage"
+                color="primary"
+                name="vn:unavailable"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('ticketSale.noVisible') }}
+                </QTooltip>
+            </QIcon>
+            <QIcon
+                v-if="row.hasComponentLack"
+                color="primary"
+                name="vn:components"
+                size="xs"
+            >
+                <QTooltip>
+                    {{ t('ticketSale.hasComponentLack') }}
+                </QTooltip>
+            </QIcon>
         </template>
         <template #column-image="{ row }">
             <div class="image-wrapper">
@@ -677,59 +666,53 @@ async function save(item) {
             </VnSelect>
         </template>
         <template #column-quantity="{ row }">
-            <QTd @click.stop>
-                <VnInput
-                    v-if="isTicketEditable"
-                    v-model.number="row.quantity"
-                    @keyup.enter="changeQuantity(row)"
-                    @blur="changeQuantity(row)"
-                    @focus="edit.oldQuantity = row.quantity"
-                />
-                <span v-else>{{ row.quantity }}</span>
-            </QTd>
+            <VnInput
+                v-if="isTicketEditable"
+                v-model.number="row.quantity"
+                @keyup.enter="changeQuantity(row)"
+                @blur="changeQuantity(row)"
+                @focus="edit.oldQuantity = row.quantity"
+            />
+            <span v-else>{{ row.quantity }}</span>
         </template>
         <template #column-price="{ row }">
-            <QTd>
-                <template v-if="isTicketEditable && row.id">
-                    <QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
-                        {{ toCurrency(row.price) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        ref="editPriceProxyRef"
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="updatePrice(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.price"
-                            :label="t('ticketSale.price')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toCurrency(row.price) }}</span>
-            </QTd>
+            <template v-if="isTicketEditable && row.id">
+                <QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
+                    {{ toCurrency(row.price) }}
+                </QBtn>
+                <TicketEditManaProxy
+                    ref="editPriceProxyRef"
+                    :mana="mana"
+                    :new-price="getNewPrice"
+                    @save="updatePrice(row)"
+                >
+                    <VnInput
+                        v-model.number="edit.price"
+                        :label="t('ticketSale.price')"
+                        type="number"
+                    />
+                </TicketEditManaProxy>
+            </template>
+            <span v-else>{{ toCurrency(row.price) }}</span>
         </template>
         <template #column-discount="{ row }">
-            <QTd>
-                <template v-if="!isLocked && row.id">
-                    <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
-                        {{ toPercentage(row.discount / 100) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="changeDiscount(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
-            </QTd>
+            <template v-if="!isLocked && row.id">
+                <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
+                    {{ toPercentage(row.discount / 100) }}
+                </QBtn>
+                <TicketEditManaProxy
+                    :mana="mana"
+                    :new-price="getNewPrice"
+                    @save="changeDiscount(row)"
+                >
+                    <VnInput
+                        v-model.number="edit.discount"
+                        :label="t('ticketSale.discount')"
+                        type="number"
+                    />
+                </TicketEditManaProxy>
+            </template>
+            <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 00fdad006..2d40ca424 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUnmounted, watch, nextTick } from 'vue';
+import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -93,6 +93,8 @@ const applyVolumes = async (salesData) => {
     }
 };
 
+onMounted(() => (stateStore.rightDrawer = false));
+
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 

From 4630496361ca4c4a1da14924425fd8f97dded1f8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 08:10:05 +0200
Subject: [PATCH 31/74] refactor: refs #7553 changed fields in ticket component
 & ticket filter

---
 src/pages/Ticket/Card/TicketComponents.vue | 22 ++++++++++++++++------
 src/pages/Ticket/TicketFilter.vue          |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 96462b8a6..9ac9771b8 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -110,6 +110,16 @@ const columns = computed(() => [
         align: 'left',
         format: (row) => dashIfEmpty(row.serie),
     },
+    {
+        label: t('ticketComponents.components'),
+        name: 'components',
+        align: 'left',
+    },
+    {
+        label: t('ticketComponents.import'),
+        name: 'import',
+        align: 'left',
+    },
     {
         label: t('ticketComponents.total'),
         name: 'total',
@@ -311,28 +321,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </span>
             </div>
         </template>
-        <!-- <template #column-components="{ row }">
+        <template #column-components="{ row }">
             <div class="column">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ saleComponent.component?.name }}
                 </span>
             </div>
-        </template> -->
-        <!-- <template #column-import="{ row }">
+        </template>
+        <template #column-import="{ row }">
             <div class="column text-left">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ toCurrency(saleComponent.value, 'EUR', 3) }}
                 </span>
             </div>
-        </template> -->
+        </template>
         <template #column-total="{ row }">
             <div class="column">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
-                    <QTooltip>
+                    <!-- <QTooltip>
                         {{ saleComponent.component?.name }}:
                         {{ toCurrency(saleComponent.value, 'EUR', 3) }}
-                    </QTooltip>
+                    </QTooltip> -->
                 </span>
             </div>
         </template>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index b7389b93f..8f71aad08 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -118,7 +118,7 @@ const warehouses = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInput
-                        v-model="params.scopedDays"
+                        v-model="params.scopeDays"
                         :label="t('Days onward')"
                         is-outlined
                     />

From 0b961050a0c12f49356c5398061bf5473d7f114e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 08:14:53 +0200
Subject: [PATCH 32/74] refactor: refs #7553 rollback ticket advance due to
 slot problems

---
 src/components/VnTable/VnTable.vue |   3 +-
 src/pages/Ticket/TicketAdvance.vue | 426 +++++++++++++++++++----------
 2 files changed, 290 insertions(+), 139 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 59afb406a..5a21ebd5e 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -408,7 +408,8 @@ defineExpose({
                         @click="stateStore.toggleRightDrawer()"
                     />
                 </template>
-                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles-->
+                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles
+                    por lo que no es viable para el uso que se le quiere dar-->
                 <!-- <template #top>
                     <div class="full-width-slot">
                         <slot name="before-header" />
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 79c9f3559..bf4000fdf 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -3,8 +3,8 @@ import { onMounted, ref, computed, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-// import VnInput from 'src/components/common/VnInput.vue';
-// import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -19,14 +19,13 @@ import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const { notify } = useNotify();
 const user = state.getUser();
-const tableRef = ref();
+
 const itemPackingTypesOptions = ref([]);
 const zonesOptions = ref([]);
 const selectedTickets = ref([]);
@@ -45,14 +44,15 @@ const exprBuilder = (param, value) => {
         case 'notMovableLines':
         case 'futureZoneFk':
             return { [param]: value };
-        case 'ipt':
-            return { [param]: { like: `%${value}%` } };
-        case 'futureIpt':
-            return { [param]: { like: `%${value}%` } };
+        case 'iptColFilter':
+            return { ipt: { like: `%${value}%` } };
+        case 'futureIptColFilter':
+            return { futureIpt: { like: `%${value}%` } };
     }
 };
 
 const userParams = reactive({});
+
 const arrayData = useArrayData('AdvanceTickets', {
     url: 'Tickets/getTicketsAdvance',
     userParams: userParams,
@@ -82,123 +82,220 @@ const getInputEvents = (col) => {
           };
 };
 
-const columns = computed(() => [
+const ticketColumns = computed(() => [
     {
         label: '',
         name: 'icons',
-        hidden: true,
-    },
-    {
-        align: 'center',
-        label: t('advanceTickets.ticketId'),
-        name: 'id',
-    },
-    {
         align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('advanceTickets.ticketId'),
+        name: 'ticketId',
+        align: 'center',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'id',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
         label: t('advanceTickets.ipt'),
         name: 'ipt',
+        field: 'ipt',
+        align: 'left',
+        sortable: true,
         columnFilter: {
-            component: 'select',
+            component: VnSelect,
+            filterParamKey: 'iptColFilter',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'itemPackingTypes',
-                fields: ['code', 'description'],
-                where: { isActive: true },
-                optionValue: 'code',
-                optionLabel: 'description',
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
             },
         },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.state'),
         name: 'state',
-        hidden: true,
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
     },
     {
-        align: 'left',
         label: t('advanceTickets.liters'),
         name: 'liters',
+        field: 'liters',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
-        align: 'left',
         label: t('advanceTickets.lines'),
         name: 'lines',
-        format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
+        field: 'lines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.import'),
-        name: 'totalWithVat',
-        hidden: true,
-        format: (row) => toCurrency(row.totalWithVat),
+        field: 'import',
+        name: 'import',
+        align: 'left',
+        sortable: true,
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            filterParamKey: 'futureId',
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
+        field: 'futureIpt',
+        align: 'left',
+        sortable: true,
         columnFilter: {
-            component: 'select',
+            component: VnSelect,
+            filterParamKey: 'futureIptColFilter',
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'itemPackingTypes',
-                fields: ['code', 'description'],
-                where: { isActive: true },
-                optionValue: 'code',
-                optionLabel: 'description',
+                options: itemPackingTypesOptions.value,
+                'option-value': 'code',
+                'option-label': 'description',
+                dense: true,
             },
         },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureState'),
         name: 'futureState',
-        hidden: true,
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureLiters'),
         name: 'futureLiters',
-    },
-    {
+        field: 'futureLiters',
         align: 'left',
-        label: t('advanceTickets.futureZone'),
-        name: 'futureZoneFk',
-        columnClass: 'expand',
+        sortable: true,
         columnFilter: {
-            component: 'select',
-            inWhere: true,
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
             attrs: {
-                url: 'Zones',
-                fields: ['id', 'name'],
+                dense: true,
             },
         },
-        columnField: {
-            component: null,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
+        format: (val) => dashIfEmpty(val),
     },
     {
+        label: t('advanceTickets.futureZone'),
+        name: 'futureZoneName',
+        field: 'futureZoneName',
         align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnSelect,
+            type: 'select',
+            filterValue: null,
+            filterParamKey: 'futureZoneFk',
+            event: getInputEvents,
+            attrs: {
+                options: zonesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
         label: t('advanceTickets.notMovableLines'),
         name: 'notMovableLines',
+        field: 'notMovableLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureLines'),
         name: 'futureLines',
+        field: 'futureLines',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
     },
     {
-        align: 'left',
         label: t('advanceTickets.futureImport'),
-        name: 'futureTotalWithVat',
-        hidden: true,
-        format: (row) => toCurrency(row.futureTotalWithVat),
+        name: 'futureImport',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
     },
 ]);
 
@@ -351,7 +448,7 @@ const handleCloseProgressDialog = () => {
 const handleCancelProgress = () => (cancelProgress.value = true);
 
 onMounted(async () => {
-    let today = Date.vnNew().toISOString();
+    let today = Date.vnNew();
     const tomorrow = new Date(today);
     tomorrow.setDate(tomorrow.getDate() + 1);
     userParams.dateFuture = tomorrow;
@@ -360,13 +457,6 @@ onMounted(async () => {
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
 });
-
-const getColor = (row) => {
-    return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
-};
-const getFutureColor = (row) => {
-    return row?.futureClassColor ? `bg-${row.futureClassColor}` : 'bg-orange';
-};
 </script>
 
 <template>
@@ -390,9 +480,9 @@ const getFutureColor = (row) => {
         @on-fetch="(data) => (zonesOptions = data)"
     />
     <VnSearchbar
-        data-key="AdvanceTickets"
-        :label="t('advanceTickets.search')"
-        :info="t('advanceTickets.searchInfo')"
+        data-key="WeeklyTickets"
+        :label="t('weeklyTickets.search')"
+        :info="t('weeklyTickets.searchInfo')"
     />
     <VnSubToolbar>
         <template #st-data>
@@ -441,32 +531,73 @@ const getFutureColor = (row) => {
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
-        <VnTable
-            ref="tableRef"
-            data-key="AdvanceTickets"
-            url="TicketWeeklies/filter"
-            :columns="columns"
-            auto-load
-            :right-search="false"
-            :disable-option="{ card: true }"
+        <QTable
+            :rows="tickets"
+            :columns="ticketColumns"
+            row-key="index"
+            selection="multiple"
             v-model:selected="selectedTickets"
-            :table="{
-                'row-key': 'id',
-                selection: 'multiple',
-            }"
+            :pagination="{ rowsPerPage: 0 }"
+            :no-data-label="t('globals.noResults')"
+            style="max-width: 99%"
         >
-            <!--TODO: arreglar estilos-->
-            <template #before-header>
-                <span class="horizontal-separator" translate>
-                    {{ t('advanceTickets.destination') }}
-                    {{ toDateFormat(userParams.dateToAdvance) }}
-                </span>
-                <span class="horizontal-separator" translate>
-                    {{ t('advanceTickets.origin') }}
-                    {{ toDateFormat(userParams.dateFuture) }}
-                </span>
+            <template #header="props">
+                <QTr :props="props">
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="7"
+                        translate
+                    >
+                        {{ t('advanceTickets.destination') }}
+                        {{ toDateFormat(userParams.dateToAdvance) }}
+                    </QTh>
+                    <QTh
+                        class="horizontal-separator text-uppercase color-vn-label"
+                        colspan="9"
+                        translate
+                    >
+                        {{ t('advanceTickets.origin') }}
+                        {{ toDateFormat(userParams.dateFuture) }}
+                    </QTh>
+                </QTr>
+                <QTr>
+                    <QTh>
+                        <QCheckbox v-model="props.selected" />
+                    </QTh>
+                    <QTh
+                        v-for="(col, index) in ticketColumns"
+                        :key="index"
+                        :class="{ 'vertical-separator': col.name === 'futureId' }"
+                    >
+                        {{ col.label }}
+                    </QTh>
+                </QTr>
             </template>
-            <template #column-icons="{ row }">
+            <template #top-row="{ cols }">
+                <QTr>
+                    <QTd />
+                    <QTd
+                        v-for="(col, index) in cols"
+                        :key="index"
+                        style="max-width: 100px"
+                    >
+                        <component
+                            :is="col.columnFilter.component"
+                            v-if="col.columnFilter"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
+            </template>
+            <template #header-cell-availableLines="{ col }">
+                <QTh class="vertical-separator">
+                    {{ col.label }}
+                </QTh>
+            </template>
+            <template #body-cell-icons="{ row }">
                 <QTd class="q-gutter-x-xs">
                     <QIcon
                         v-if="row.futureAgency !== row.agency && row.agency"
@@ -493,52 +624,73 @@ const getFutureColor = (row) => {
                     </QIcon>
                 </QTd>
             </template>
-            <template #column-id="{ row }">
-                <span class="link" @click.stop>
-                    {{ row.id }}
-                    <TicketDescriptorProxy :id="row.id" />
-                </span>
+            <template #body-cell-ticketId="{ row }">
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.id }}
+                        <TicketDescriptorProxy :id="row.id" />
+                    </QBtn>
+                </QTd>
             </template>
-            <template #column-state="{ row }">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
+            <template #body-cell-state="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.classColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.state }}
+                    </QBadge>
+                </QTd>
             </template>
-            <template #column-totalWithVat="{ row }">
-                <QBadge
-                    :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
-                    :color="totalPriceColor(row.totalWithVat)"
-                    class="q-ma-none"
-                    dense
-                >
-                    {{ toCurrency(row.totalWithVat || 0) }}
-                </QBadge>
+            <template #body-cell-import="{ row }">
+                <QTd>
+                    <QBadge
+                        :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
+                        :color="totalPriceColor(row.totalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.totalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
             </template>
-            <template #column-futureId="{ row }">
-                <!--TODO: arreglar estilos para que se muestre como antes, slot?-->
-                <div class="vertical-separator">
-                    <span class="link" @click.stop>
+            <template #body-cell-futureId="{ row }">
+                <QTd class="vertical-separator">
+                    <QBtn flat class="link" dense>
                         {{ row.futureId }}
                         <TicketDescriptorProxy :id="row.futureId" />
-                    </span>
-                </div>
+                    </QBtn>
+                </QTd>
             </template>
-            <template #column-futureState="{ row }">
-                <QChip :class="getFutureColor(row)" dense square>
-                    {{ row.futureState }}
-                </QChip>
+            <template #body-cell-futureState="{ row }">
+                <QTd>
+                    <QBadge
+                        text-color="black"
+                        :color="row.futureClassColor"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ row.futureState }}
+                    </QBadge>
+                </QTd>
             </template>
-            <template #column-futureTotalWithVat="{ row }">
-                <QBadge
-                    :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
-                    :color="totalPriceColor(row.futureTotalWithVat)"
-                    class="q-ma-none"
-                    dense
-                >
-                    {{ toCurrency(row.futureTotalWithVat || 0) }}
-                </QBadge>
+            <template #body-cell-futureImport="{ row }">
+                <QTd>
+                    <QBadge
+                        :text-color="
+                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
+                        "
+                        :color="totalPriceColor(row.futureTotalWithVat)"
+                        class="q-ma-none"
+                        dense
+                    >
+                        {{ toCurrency(row.futureTotalWithVat || 0) }}
+                    </QBadge>
+                </QTd>
             </template>
-        </VnTable>
+        </QTable>
         <VnProgress
             :progress="progressPercentage"
             :cancelled="cancelProgress"
@@ -562,8 +714,6 @@ const getFutureColor = (row) => {
 }
 
 .horizontal-separator {
-    width: 100%;
-    margin-top: 1%;
-    border-bottom: 5px solid white !important;
+    border-bottom: 4px solid white !important;
 }
 </style>

From 6248a4117d06e60ee4f141dcb5b65969c590bfbe Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 9 Sep 2024 13:52:41 +0200
Subject: [PATCH 33/74] refactor: refs #7553 requested changes

---
 src/components/CrudModel.vue                  |  2 +
 .../Ticket/Card/BasicData/TicketBasicData.vue | 12 ++--
 .../Card/BasicData/TicketBasicDataForm.vue    | 36 ++++++------
 .../Card/BasicData/TicketBasicDataView.vue    |  5 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    | 56 ++++++++++++++++++-
 src/pages/Ticket/Card/TicketNotes.vue         |  7 ++-
 src/pages/Ticket/Card/TicketPackage.vue       | 25 +++++----
 src/pages/Ticket/Card/TicketSale.vue          |  6 +-
 src/pages/Ticket/Card/TicketSaleTracking.vue  | 40 ++++++++-----
 src/pages/Ticket/Card/TicketSummary.vue       | 53 ++++++++----------
 10 files changed, 150 insertions(+), 92 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 33c831e3f..f4797ffd4 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -234,6 +234,8 @@ async function remove(data) {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
+    } else {
+        reset();
     }
     emit('update:selected', []);
 }
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 741231ca3..2ed84e50e 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -114,7 +114,7 @@ const totalNewPrice = computed(() => {
 const totalDifference = computed(() => {
     return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
 });
-const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
+const showMovableColumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
 const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
 const ticketHaveNegatives = () => {
     let _haveNegatives = false;
@@ -156,18 +156,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     {{ t('basicData.total') }}
                 </span>
             </QCardSection>
-            <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.price') }}:
                     {{ toCurrency(totalPrice) }}
                 </span>
             </QCardSection>
-            <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
                 </span>
             </QCardSection>
-            <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
                 </span>
@@ -220,7 +220,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QCard>
     </QDrawer>
     <QTable
-        :visible-columns="showMovablecolumn"
+        :visible-columns="showMovableColumn"
         :rows="rows"
         :columns="columns"
         row-key="id"
@@ -238,7 +238,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
-            <QTd>
+            <QTd style="display: contents">
                 <div class="column">
                     <span>{{ row.item.name }}</span>
                     <span class="color-vn-label">{{ row.item.subName }}</span>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 28c6fcf15..4b2e90a84 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -51,18 +51,18 @@ const agencyByWarehouseFilter = computed(() => ({
     },
 }));
 
-const zonesFilter = computed(() => ({
-    fields: ['id', 'name'],
-    order: 'name ASC',
-    where: formData.value?.agencyModeFk
-        ? {
-              shipped: formData.value?.shipped,
-              addressFk: formData.value?.addressFk,
-              agencyModeFk: formData.value?.agencyModeFk,
-              warehouseFk: formData.value?.warehouseFk,
-          }
-        : {},
-}));
+function zoneWhere() {
+    if (formData?.value?.agencyModeFk) {
+        return formData.value?.agencyModeFk
+            ? {
+                  shipped: formData.value?.shipped,
+                  addressFk: formData.value?.addressFk,
+                  agencyModeFk: formData.value?.agencyModeFk,
+                  warehouseFk: formData.value?.warehouseFk,
+              }
+            : {};
+    }
+}
 
 const getLanded = async (params) => {
     try {
@@ -293,13 +293,6 @@ onMounted(() => onFormModelInit());
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FetchData
-        ref="zonesFetchRef"
-        url="Zones/includingExpired"
-        :filter="zonesFilter"
-        @on-fetch="(data) => (zonesOptions = data)"
-        auto-load
-    />
     <QForm>
         <VnRow>
             <VnSelect
@@ -420,7 +413,10 @@ onMounted(() => onFormModelInit());
                 v-model="zoneId"
                 option-value="id"
                 option-label="name"
-                :options="zonesOptions"
+                url="Zones/includingExpired"
+                :fields="['id', 'name']"
+                sort-by="id"
+                :where="zoneWhere"
                 hide-selected
                 map-options
                 :required="true"
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index a88e5e6d6..92640f898 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -158,7 +158,10 @@ onBeforeMount(async () => await getTicketData());
         color="primary"
         animated
         keep-alive
-        style="max-width: 800px; margin: auto"
+        style="margin: auto"
+        :style="{
+            'max-width': step > 1 ? 'none' : '800px',
+        }"
     >
         <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
             <TicketBasicDataForm
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index b3dba2849..eef834cfa 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -2,13 +2,13 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import { toDateTimeFormat } from 'src/filters/date';
 
 const $props = defineProps({
     id: {
@@ -36,7 +36,18 @@ const filter = {
         {
             relation: 'client',
             scope: {
-                fields: ['id', 'name', 'salesPersonFk', 'phone', 'mobile', 'email'],
+                fields: [
+                    'id',
+                    'name',
+                    'salesPersonFk',
+                    'phone',
+                    'mobile',
+                    'email',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                    'hasElectronicInvoice',
+                ],
                 include: [
                     {
                         relation: 'user',
@@ -132,7 +143,10 @@ function ticketFilter(ticket) {
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
+            <VnLv
+                :label="t('ticket.card.shipped')"
+                :value="toDateTimeFormat(entity.shipped)"
+            />
             <VnLv
                 v-if="entity.agencyMode"
                 :label="t('ticket.card.agency')"
@@ -143,6 +157,38 @@ function ticketFilter(ticket) {
         </template>
         <template #icons="{ entity }">
             <QCardActions>
+                <QIcon
+                    v-if="entity.client.isActive == false"
+                    name="vn:disabled"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client inactive') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.client.isFreezed == true"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client Frozen') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.problem.includes('hasRisk')"
+                    name="vn:risk"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client has debt') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.client.isTaxDataChecked == false"
+                    name="vn:no036"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client not checked') }}</QTooltip>
+                </QIcon>
                 <QIcon
                     v-if="entity.isDeleted == true"
                     name="vn:deletedTicket"
@@ -188,4 +234,8 @@ function ticketFilter(ticket) {
 es:
     This ticket is deleted: Este ticket está eliminado
     Go to module index: Ir al índice del modulo
+    Client inactive: Cliente inactivo
+    Client not checked: Cliente no verificado
+    Client has debt: Cliente con deuda
+    Client Frozen: Cliente congelado
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index cfc0c2431..881300399 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -33,6 +33,9 @@ watch(
         await ticketNotesCrudRef.value.reload();
     }
 );
+function handleDelete(row) {
+    ticketNotesCrudRef.value.remove([row]);
+}
 </script>
 
 <template>
@@ -74,12 +77,14 @@ watch(
                             v-model="row.description"
                             class="col"
                         />
+                        {{ index }},
+                        {{ row }}
                         <QIcon
                             name="delete"
                             size="sm"
                             class="cursor-pointer"
                             color="primary"
-                            @click="ticketNotesCrudRef.remove([row])"
+                            @click="handleDelete(row)"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index a76fce2b6..9dee76f8e 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -10,6 +10,7 @@ import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import VnRow from 'src/components/ui/VnRow.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -114,17 +115,19 @@ watch(
                             </QTooltip>
                         </QIcon>
                     </div>
-                    <QIcon
-                        name="add_circle"
-                        class="fill-icon-on-hover q-ml-md"
-                        size="sm"
-                        color="primary"
-                        @click="ticketPackagingsCrudRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('package.addPackage') }}
-                        </QTooltip>
-                    </QIcon>
+                    <VnRow>
+                        <QIcon
+                            name="add_circle"
+                            class="fill-icon-on-hover q-ml-md"
+                            size="sm"
+                            color="primary"
+                            @click="ticketPackagingsCrudRef.insert()"
+                        >
+                            <QTooltip>
+                                {{ t('package.addPackage') }}
+                            </QTooltip>
+                        </QIcon>
+                    </VnRow>
                 </QCard>
             </template>
         </CrudModel>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2d51ed8ca..71dd56960 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -100,7 +100,6 @@ const columns = computed(() => [
         align: 'left',
         label: t('ticketSale.quantity'),
         name: 'quantity',
-        cardVisible: true,
         format: (row) => toCurrency(row.quantity),
     },
     {
@@ -109,20 +108,17 @@ const columns = computed(() => [
         name: 'item',
         format: (row) => row?.item?.name,
         columnClass: 'expand',
-        cardVisible: true,
     },
     {
         align: 'left',
         label: t('ticketSale.price'),
         name: 'price',
-        cardVisible: true,
         format: (row) => toCurrency(row.price),
     },
     {
         align: 'left',
         label: t('ticketSale.discount'),
         name: 'discount',
-        cardVisible: true,
         format: (row) => toPercentage(row.discount),
     },
     {
@@ -135,7 +131,6 @@ const columns = computed(() => [
         align: 'left',
         label: t('ticketSale.packaging'),
         name: 'itemPackingTypeFk',
-        cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
     },
     {
@@ -569,6 +564,7 @@ async function save(item) {
         }"
         :right-search="false"
         :column-search="false"
+        :disable-option="{ card: true }"
         auto-load
     >
         <template #column-statusIcons="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index d2fec97ac..e7830bf37 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -25,7 +25,7 @@ const saleTrackingFetchDataRef = ref(null);
 
 const sales = ref([]);
 const saleTrackings = ref([]);
-const itemShelvignsSales = ref([]);
+const itemShelvingsSales = ref([]);
 const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
 const oldQuantity = ref(null);
 
@@ -88,7 +88,7 @@ const logTableColumns = computed(() => [
         label: t('ticketSaleTracking.original'),
         name: 'original',
         field: 'originalQuantity',
-        align: 'original',
+        align: 'left',
         sortable: true,
     },
     {
@@ -177,7 +177,7 @@ const getItemShelvingSales = async (sale) => {
         const { data } = await axios.get(`ItemShelvingSales/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        itemShelvignsSales.value = data;
+        itemShelvingsSales.value = data;
     } catch (error) {
         console.error(error);
     }
@@ -464,12 +464,14 @@ const qCheckBoxController = (sale, action) => {
             data-key="saleTrackingLog"
             :rows="saleTrackings"
             :columns="logTableColumns"
-            class="q-pa-sm"
+            class="q-pa-sm full-width"
         >
             <template #body-cell-worker="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.workerFk" />
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.name }}
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </QBtn>
                 </QTd>
             </template>
         </QTable>
@@ -481,12 +483,12 @@ const qCheckBoxController = (sale, action) => {
     >
         <QTable
             data-key="itemShelvingsSales"
-            :rows="itemShelvignsSales"
+            :rows="itemShelvingsSales"
             :columns="shelvingsTableColumns"
-            class="q-pa-sm"
+            class="q-pa-sm full-width"
         >
             <template #body-cell-quantity="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnInput
                         v-model.number="row.quantity"
                         @keyup.enter="updateQuantity(row)"
@@ -496,13 +498,15 @@ const qCheckBoxController = (sale, action) => {
                 </QTd>
             </template>
             <template #body-cell-worker="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.userFk" />
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.name }}
+                        <WorkerDescriptorProxy :id="row.userFk" />
+                    </QBtn>
                 </QTd>
             </template>
             <template #body-cell-shelving="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnSelect
                         url="Shelvings"
                         hide-selected
@@ -515,7 +519,7 @@ const qCheckBoxController = (sale, action) => {
                 </QTd>
             </template>
             <template #body-cell-parking="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnSelect
                         url="Parkings"
                         hide-selected
@@ -550,4 +554,10 @@ $estados: (
         }
     }
 }
+
+@media (min-width: 560px) {
+    .q-dialog__inner--minimized > div {
+        max-width: 900px;
+    }
+}
 </style>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 4562f2c60..8ad9a36d0 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -16,6 +16,7 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -103,13 +104,18 @@ function getNoteValue(description) {
             return t('Sustitución');
     }
 }
+
+function toTicketUrl(section) {
+    return '#/ticket/' + entityId.value + '/' + section;
+}
 </script>
 
 <template>
     <FetchData
         url="States/editableStates"
-        @on-fetch="(data) => (editableStates = data)"
+        :filter="{ fields: ['code', 'name', 'id', 'alertLevel'], order: 'name ASC' }"
         auto-load
+        @on-fetch="(data) => (editableStates = data)"
     />
     <CardSummary
         ref="summaryRef"
@@ -127,39 +133,26 @@ function getNoteValue(description) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState(item.code)"
+                />
             </QBtnDropdown>
         </template>
         <template #body>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="ticketUrl + 'basic-data/step-one'"
+                    :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
                 <VnLv v-if="ticket.ticketState" :label="t('ticket.summary.state')">
@@ -236,7 +229,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-one" style="flex: 2 1">
                 <VnTitle
-                    :url="ticketUrl + 'basic-data/step-one'"
+                    :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
                 <VnLv
@@ -288,7 +281,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-one" v-if="ticket.notes.length">
                 <VnTitle
-                    :url="ticketUrl + 'observation'"
+                    :url="toTicketUrl('observation')"
                     :text="t('ticket.pageTitles.notes')"
                 />
                 <VnLv
@@ -328,7 +321,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-max">
                 <VnTitle
-                    :url="ticketUrl + 'sale'"
+                    :url="toTicketUrl('sale')"
                     :text="t('ticket.summary.saleLines')"
                 />
                 <QTable :rows="ticket.sales" style="text-align: center">
@@ -488,7 +481,7 @@ function getNoteValue(description) {
                 </QTable>
             </QCard>
             <QCard class="vn-max" v-if="ticket.packagings.length != 0">
-                <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
+                <VnTitle :url="toTicketUrl('package')" :text="t('globals.packages')" />
                 <QTable :rows="ticket.packagings" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
@@ -508,7 +501,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-max" v-if="ticket.services.length != 0">
                 <VnTitle
-                    :url="ticketUrl + 'service'"
+                    :url="toTicketUrl('service')"
                     :text="t('ticket.summary.service')"
                 />
                 <QTable :rows="ticket.services" flat style="text-align: center">
@@ -536,7 +529,7 @@ function getNoteValue(description) {
             </QCard>
             <QCard class="vn-max" v-if="ticket.requests.length != 0">
                 <VnTitle
-                    :url="ticketUrl + 'request'"
+                    :url="toTicketUrl('request')"
                     :text="t('ticket.summary.purchaseRequest')"
                 />
                 <QTable :rows="ticket.requests" flat style="text-align: center">

From ff7bcfb00a1a60c63cd0e770200e1080b65eb781 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Sep 2024 10:16:42 +0200
Subject: [PATCH 34/74] refactor: refs #7553 modified ticket sale to create a
 row in the table

---
 src/components/VnTable/VnTable.vue   |  23 +++-
 src/pages/Ticket/Card/TicketSale.vue | 182 +++++++++++++++------------
 2 files changed, 122 insertions(+), 83 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 5d7b74fab..7c1d6a3ae 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -53,6 +53,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    bottom: {
+        type: Object,
+        default: null,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -522,7 +526,24 @@ function handleOnDataSaved(_, res) {
                     </QTd>
                 </template>
                 <template #bottom v-if="bottom">
-                    <slot name="bottom-table" />
+                    <slot name="bottom-table">
+                        <QIcon
+                            @click="
+                                () =>
+                                    createAsDialog
+                                        ? (showForm = !showForm)
+                                        : handleOnDataSaved(create)
+                            "
+                            class="fill-icon-on-hover"
+                            color="primary"
+                            name="add_circle"
+                            size="sm"
+                            shortcut="+"
+                        />
+                        <QTooltip>
+                            {{ createForm.title }}
+                        </QTooltip>
+                    </slot>
                 </template>
                 <template #item="{ row, colsMap }">
                     <component
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 71dd56960..ca89ff551 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,7 +22,6 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -51,8 +50,6 @@ const transfer = ref({
     sales: [],
 });
 const tableRef = ref([]);
-const formModelPopupRef = ref();
-const showForm = ref(false);
 
 watch(
     () => route.params.id,
@@ -219,6 +216,7 @@ const addSale = async (sale) => {
         sale.item = newSale.item;
 
         notify('globals.dataSaved', 'positive');
+        window.location.reload();
     } catch (err) {
         console.error('Error adding sale', err);
     }
@@ -427,18 +425,70 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
     getSales();
+    getItems();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-async function save(item) {
-    const { data } = await axios.post(`Tickets/${route.params.id}/addSale`, {
-        id: route.params.id,
-        barcode: item.itemFk,
-        quantity: parseInt(item.quantity),
-    });
-    if (data) window.location.reload();
+const items = ref([]);
+const newRow = ref({});
+
+async function getItems() {
+    const { data } = await axios.get(`Items/withName`);
+    items.value = data;
 }
+
+const updateItem = (row) => {
+    const selectedItem = items.value.find((item) => item.id === row.itemFk);
+    if (selectedItem) {
+        row.item = selectedItem;
+        row.itemFk = selectedItem.id;
+        row.price = selectedItem.price;
+        row.discount = 0;
+        row.quantity = 0;
+        row.amount = row.price * row.quantity;
+    }
+    endNewRow(selectedItem);
+};
+
+function handleOnDataSave({ CrudModelRef }) {
+    const { copy } = addRow(CrudModelRef.formData);
+    CrudModelRef.insert(copy);
+}
+
+const addRow = (original = null) => {
+    let copy = null;
+    if (!original) {
+        copy = { isNew: true };
+    } else {
+        copy = {
+            itemFk: original.itemFk,
+            item: original.item,
+            quantity: original.quantity,
+            price: original.price,
+            discount: original.discount,
+            amount: original.amount,
+            isNew: true,
+        };
+    }
+    newRow.value = copy;
+    return { original, copy };
+};
+
+const endNewRow = (row) => {
+    if (row.itemFk && row.quantity) {
+        row.isNew = false;
+    }
+};
+
+watch(
+    () => newRow.value.itemFk,
+    (newItemFk) => {
+        if (newItemFk) {
+            updateItem(newRow.value);
+        }
+    }
+);
 </script>
 
 <template>
@@ -566,6 +616,16 @@ async function save(item) {
         :column-search="false"
         :disable-option="{ card: true }"
         auto-load
+        :create="{
+            onDataSaved: handleOnDataSave,
+        }"
+        :create-as-dialog="false"
+        :crud-model="{
+            paginate: false,
+        }"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
     >
         <template #column-statusIcons="{ row }">
             <router-link
@@ -626,7 +686,26 @@ async function save(item) {
             </QBadge>
         </template>
         <template #column-itemFk="{ row }">
-            <span class="link" @click.stop>
+            <VnSelect
+                v-if="row.isNew"
+                url="Items"
+                :options="items"
+                option-label="name"
+                option-value="id"
+                v-model="row.itemFk"
+                @update:model-value="updateItem(row)"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>
+                                {{ scope.opt?.id }} - {{ scope.opt?.name }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <span v-else class="link" @click.stop>
                 {{ row?.itemFk }}
                 <ItemDescriptorProxy :id="row?.itemFk" />
             </span>
@@ -638,34 +717,22 @@ async function save(item) {
                     {{ row?.item?.subName.toUpperCase() }}
                 </div>
             </div>
-            <FetchedTags :item="row?.item" :max-length="6" />
+            <FetchedTags :item="row" :max-length="6" />
             <QPopupProxy v-if="row.id && isTicketEditable">
                 <VnInput v-model="row.concept" @change="updateConcept(row)" />
             </QPopupProxy>
-            <VnSelect
-                v-else
-                :options="itemsWithNameOptions"
-                hide-selected
-                option-label="name"
-                option-value="id"
-                @update:model-value="changeQuantity(row)"
-                v-model="row.itemFk"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                            <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
         </template>
         <template #column-quantity="{ row }">
             <VnInput
-                v-if="isTicketEditable"
+                v-if="row.isNew"
+                v-model.number="row.quantity"
+                type="number"
+                @blur="changeQuantity(row)"
+                @focus="edit.oldQuantity = row.quantity"
+            />
+            <VnInput
+                v-else-if="isTicketEditable"
                 v-model.number="row.quantity"
-                @keyup.enter="changeQuantity(row)"
                 @blur="changeQuantity(row)"
                 @focus="edit.oldQuantity = row.quantity"
             />
@@ -713,58 +780,9 @@ async function save(item) {
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
         </template>
-        <template #bottom-table v-if="isTicketEditable">
-            <QIcon
-                @click="showForm = !showForm"
-                class="fill-icon-on-hover"
-                color="primary"
-                name="add_circle"
-                size="sm"
-            >
-                <QTooltip>
-                    {{ t('Add item') }}
-                </QTooltip>
-            </QIcon>
-            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
-                <FormModelPopup
-                    ref="formModelPopupRef"
-                    :url-create="`Tickets/${route.params.id}/addSale`"
-                    :title="t('New item')"
-                    :form-initial-data="{
-                        price: 0,
-                        discount: 0,
-                        visible: 0,
-                        available: 0,
-                        packaging: null,
-                    }"
-                    :save-fn="save"
-                >
-                    <template #form-inputs="{ data }">
-                        <VnSelect
-                            url="Items/withName"
-                            :option-filter="{
-                                order: 'id DESC',
-                            }"
-                            :fields="['id', 'name']"
-                            :label="t('Items')"
-                            option-label="name"
-                            option-value="id"
-                            :options="itemsWithNameOptions"
-                            hide-selected
-                            v-model="data.itemFk"
-                        />
-                        <VnInput
-                            v-model="data.quantity"
-                            :label="t('Quantity')"
-                            type="number"
-                        />
-                    </template>
-                </FormModelPopup>
-            </QDialog>
-        </template>
     </VnTable>
 
-    <QPageSticky :offset="[20, 20]">
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
         <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}

From 422907447b40cceedc3e2207800704dd77b1fb5c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 11 Sep 2024 10:27:08 +0200
Subject: [PATCH 35/74] refactor: refs #7553 merge conflicts

---
 .../Ticket/Card/TicketDescriptorMenu.vue      |  1 -
 src/pages/Ticket/Card/TicketSummary.vue       | 24 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 8bd072489..4140abcc8 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -639,7 +639,6 @@ async function handleInvoiceOutData() {
 <i18n>
 en:
     addTurn: Add turn
-en:
     invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
 
 es:
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index d959ad9d9..2a4a5e3c3 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -147,13 +147,13 @@ function toTicketUrl(section) {
                     :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv v-if="ticket.ticketState" :label="t('ticket.summary.state')">
+                <VnLv v-if="entity.ticketState" :label="t('ticket.summary.state')">
                     <template #value>
                         <QBadge
                             text-color="black"
-                            :color="ticket.ticketState.state.classColor"
+                            :color="entity.ticketState.state.classColor"
                         >
-                            {{ ticket.ticketState.state.name }}
+                            {{ entity.ticketState.state.name }}
                         </QBadge>
                     </template>
                 </VnLv>
@@ -172,8 +172,8 @@ function toTicketUrl(section) {
                 <VnLv :label="t('ticket.summary.zone')">
                     <template #value>
                         <span class="link" @click.stop>
-                            {{ ticket?.zone?.name }}
-                            <ZoneDescriptorProxy :id="ticket.zoneFk" />
+                            {{ entity?.zone?.name }}
+                            <ZoneDescriptorProxy :id="entity.zoneFk" />
                         </span>
                     </template>
                 </VnLv>
@@ -198,11 +198,11 @@ function toTicketUrl(section) {
                 <VnLv :label="t('ticket.summary.route')">
                     <template #value>
                         <span class="link">
-                            {{ ticket.routeFk }}
-                            <RouteDescriptorProxy
-                                :id="ticket.routeFk"
-                            /> </span></template
-                ></VnLv>
+                            {{ entity.routeFk }}
+                            <RouteDescriptorProxy :id="entity.routeFk" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
                         <span :class="{ link: entity.refFk }">
@@ -260,9 +260,9 @@ function toTicketUrl(section) {
                 <VnLv
                     :label="t('ticket.summary.consignee')"
                     :value="
-                        ticket.client.salesPersonUser.nickname +
+                        entity.client.salesPersonUser.nickname +
                         ' #' +
-                        ticket.client.salesPersonUser.id
+                        entity.client.salesPersonUser.id
                     "
                 >
                 </VnLv>

From 4a1f5e922c1dedc57d558386e2e75432219e995b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 10:19:21 +0200
Subject: [PATCH 36/74] refactor: refs #7553 align ticket sale qdrawer fields

---
 src/pages/Ticket/Card/TicketSale.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index ca89ff551..75204965a 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -580,22 +580,19 @@ watch(
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             style="border: 2px solid black"
         >
-            <QCardSection class="justify-center text-subtitle1" horizontal>
+            <QCardSection class="justify-end text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"
                     >{{ t('ticketSale.subtotal') }}:
                 </span>
                 <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
             </QCardSection>
-            <QCardSection class="justify-center text-subtitle1" horizontal>
+            <QCardSection class="justify-end text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.tax') }}: </span>
                 <span>{{
                     toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
                 }}</span>
             </QCardSection>
-            <QCardSection
-                class="justify-center text-weight-bold text-subtitle1"
-                horizontal
-            >
+            <QCardSection class="justify-end text-weight-bold text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
                 <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
             </QCardSection>

From b4c46dc153b9f3359dc599bf266017b5aa31fe14 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 13:13:56 +0200
Subject: [PATCH 37/74] refactor: refs #7553 modified ticketSummary QChips,
 deleted useless code

---
 src/pages/Ticket/Card/TicketNotes.vue   |  2 --
 src/pages/Ticket/Card/TicketSummary.vue | 10 ++++++++--
 src/pages/Ticket/Card/TicketVolume.vue  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index 881300399..ec2353eb3 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -77,8 +77,6 @@ function handleDelete(row) {
                             v-model="row.description"
                             class="col"
                         />
-                        {{ index }},
-                        {{ row }}
                         <QIcon
                             name="delete"
                             size="sm"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 7f499f7b7..0c5366cce 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -428,25 +428,31 @@ function toTicketUrl(section) {
                             </QTd>
                             <QTd>
                                 <QChip
+                                    v-if="props.row.visible < 0"
                                     dense
                                     rounded
-                                    v-if="props.row.visible < 0"
                                     :color="'negative'"
                                     text-color="white"
                                 >
                                     {{ props.row.visible }}
                                 </QChip>
+                                <span v-else>
+                                    {{ props.row.visible }}
+                                </span>
                             </QTd>
                             <QTd>
                                 <QChip
+                                    v-if="props.row.available < 0"
                                     dense
                                     rounded
-                                    v-if="props.row.available < 0"
                                     :color="'negative'"
                                     text-color="white"
                                 >
                                     {{ props.row.available }}
                                 </QChip>
+                                <span v-else>
+                                    {{ props.row.available }}
+                                </span>
                             </QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 2d40ca424..16769b4e1 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -93,7 +93,7 @@ const applyVolumes = async (salesData) => {
     }
 };
 
-onMounted(() => (stateStore.rightDrawer = false));
+onMounted(() => (stateStore.rightDrawer = true));
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

From bb1eb30a25338b3afd712123ef5935a27671039e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 13:22:53 +0200
Subject: [PATCH 38/74] fix: refs #7553 changed fields in order in purchase
 request table

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

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 0c5366cce..e8ba955d2 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -550,8 +550,8 @@ function toTicketUrl(section) {
                     </template>
                     <template #body="props">
                         <QTr :props="props">
-                            <QTd>{{ toDate(props.row.created) }}</QTd>
                             <QTd>{{ props.row.description }}</QTd>
+                            <QTd>{{ toDate(props.row.created) }}</QTd>
                             <QTd>{{ props.row.requester?.user?.username }}</QTd>
                             <QTd>{{ props.row.atender?.user?.username }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>

From c291ea267cb355c2e0bdf59cd21efd5279821f3b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 12:07:45 +0200
Subject: [PATCH 39/74] refactor: refs #7553 added clickable event in transfer
 sales like Salix

---
 src/pages/Ticket/Card/TicketTransfer.vue     | 15 ++++++++++++---
 src/pages/Ticket/Card/TicketTransferForm.vue |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 93412aa9b..3c9e32f9e 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -28,7 +28,7 @@ const $props = defineProps({
 
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
-
+const transferFormRef = ref(null);
 const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
@@ -80,6 +80,14 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
+const handleRowClick = (row) => {
+    console.log('row: ', row);
+    const ticketId = row.id;
+    if (transferFormRef.value) {
+        transferFormRef.value.transferSales(ticketId);
+    }
+};
+
 onMounted(() => (_transfer.value = $props.transfer));
 </script>
 
@@ -113,6 +121,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :title="t('Destination ticket')"
                 row-key="id"
                 class="full-width q-mt-md"
+                @row-click="(_, row) => handleRowClick(row)"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -134,10 +143,10 @@ onMounted(() => (_transfer.value = $props.transfer));
                 </template>
 
                 <template #no-data>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
                 <template #bottom>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index c4b3906ae..d07a9d2e7 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -47,6 +47,8 @@ const transferSales = async (ticketId) => {
     if (data && data.id === $props.ticket.id) emit('refreshData');
     else router.push({ name: 'TicketSale', params: { id: data.id } });
 };
+
+defineExpose({ transferSales });
 </script>
 
 <template>

From 6f9e46f7a011fe214a7fc00d83fdc025a8bcae65 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 13:01:07 +0200
Subject: [PATCH 40/74] fix: refs #7553 deleted log

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

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 3c9e32f9e..e1a011a84 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -81,7 +81,6 @@ const destinationTicketColumns = computed(() => [
 ]);
 
 const handleRowClick = (row) => {
-    console.log('row: ', row);
     const ticketId = row.id;
     if (transferFormRef.value) {
         transferFormRef.value.transferSales(ticketId);

From 34f70d026e25b0e2632d58239ef8ce5924543465 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Sep 2024 11:50:00 +0200
Subject: [PATCH 41/74] feat: refs #7553 added new field in list and
 translations

---
 src/pages/Ticket/TicketList.vue | 13 +++++++++++++
 src/pages/Ticket/locale/en.yml  |  3 ++-
 src/pages/Ticket/locale/es.yml  |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index be348b8e1..53c920179 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -122,6 +122,13 @@ const columns = computed(() => [
         align: 'left',
         name: 'nickname',
         label: t('ticketList.nickname'),
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'addressNickname',
+        label: t('ticketList.addressNickname'),
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -543,6 +550,12 @@ function setReference(data) {
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
+        <template #column-addressNickname="{ row }">
+            <span class="link" @click.stop>
+                {{ row.addressNickname }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
         <template #column-stateFk="{ row }">
             <span v-if="getColor(row)">
                 <QChip :class="getColor(row)" dense square>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 7629633c8..34eee17e1 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -238,7 +238,7 @@ package:
     removePackage: Remove package
 ticketList:
     id: Id
-    nickname: Nickname
+    nickname: Ticket nickname
     state: State
     shipped: Shipped
     zone: Zone
@@ -269,3 +269,4 @@ ticketList:
     hour: Hour
     closure: Closure
     toLines: Go to lines
+    addressNickname: Address nickname
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index d9bb88a6b..e66a3514b 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -241,7 +241,7 @@ You can search by ticket id or alias: Puedes buscar por id o alias del ticket
 Select lines to see the options: Selecciona líneas para ver las opciones
 ticketList:
     id: Id
-    nickname: Alias
+    nickname: Alias ticket
     state: Estado
     shipped: F. Envío
     zone: Zona
@@ -272,3 +272,4 @@ ticketList:
     hour: Hora
     closure: Cierre
     toLines: Ir a lineas
+    addressNickname: Alias consignatario

From 44d98865feb33ff0ddbfdf07bc8b4fbacc1f5e8b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 20 Sep 2024 09:04:31 +0200
Subject: [PATCH 42/74] fix: refs #7553 requested changes

---
 src/i18n/locale/es.yml                        |   6 +-
 src/pages/Order/OrderList.vue                 |   4 +-
 .../Card/BasicData/TicketBasicDataForm.vue    |  13 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |   7 +-
 .../Ticket/Card/TicketDescriptorMenu.vue      |  12 +-
 src/pages/Ticket/Card/TicketSale.vue          |   4 +-
 src/pages/Ticket/Card/TicketService.vue       |  32 +++++
 src/pages/Ticket/Card/TicketSummary.vue       |   9 --
 src/pages/Ticket/TicketAdvance.vue            |   3 +
 src/pages/Ticket/TicketAdvanceFilter.vue      |  10 ++
 src/pages/Ticket/TicketList.vue               | 130 ++++++++++--------
 src/pages/Ticket/locale/en.yml                |   1 +
 src/pages/Ticket/locale/es.yml                |   1 +
 src/router/modules/ticket.js                  |   2 +-
 14 files changed, 157 insertions(+), 77 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4cbc449b9..e7f1f3507 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -63,7 +63,7 @@ globals:
     shipped: F. envío
     totalEntries: Ent. totales
     amount: Importe
-    packages: Bultos
+    packages: Embalajes
     download: Descargar
     downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
@@ -265,7 +265,7 @@ globals:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
         ldap: LDAP
         samba: Samba
         twoFactor: Doble factor
@@ -484,7 +484,7 @@ ticket:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index d96a33ef5..f5c8a44de 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -20,7 +20,6 @@ const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
 const addressesList = ref([]);
-const clientId = ref();
 
 const columns = computed(() => [
     {
@@ -191,6 +190,7 @@ const getDateColor = (date) => {
             formInitialData: {
                 active: true,
                 addressId: null,
+                clientFk: null,
             },
         }"
         :user-params="{ showEmpty: false }"
@@ -221,7 +221,7 @@ const getDateColor = (date) => {
             <VnSelect
                 url="Clients"
                 :include="{ relation: 'addresses' }"
-                v-model="clientId"
+                v-model="data.clientFk"
                 :label="t('module.customer')"
                 @update:model-value="(id) => fetchClientAddress(id, data)"
             />
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 4b2e90a84..fdc75abda 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -12,6 +12,7 @@ import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
 const $props = defineProps({
@@ -23,7 +24,7 @@ const $props = defineProps({
 });
 
 const emit = defineEmits(['updateForm']);
-
+const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
@@ -306,6 +307,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.client')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -326,6 +328,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.warehouse')"
             />
         </VnRow>
         <VnRow>
@@ -338,6 +341,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.address')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -385,6 +389,7 @@ onMounted(() => onFormModelInit());
                 :label="t('basicData.alias')"
                 v-model="formData.nickname"
                 :required="true"
+                :rules="validate('basicData.alias')"
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
@@ -397,6 +402,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.company')"
             />
             <VnSelect
                 :label="t('basicData.agency')"
@@ -407,6 +413,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 @focus="agencyFetchRef.fetch()"
+                :rules="validate('basicData.agency')"
             />
             <VnSelect
                 :label="t('basicData.zone')"
@@ -421,6 +428,7 @@ onMounted(() => onFormModelInit());
                 map-options
                 :required="true"
                 @focus="zonesFetchRef.fetch()"
+                :rules="validate('basicData.zone')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -440,16 +448,19 @@ onMounted(() => onFormModelInit());
                 :label="t('basicData.shipped')"
                 v-model="formData.shipped"
                 :required="true"
+                :rules="validate('basicData.shipped')"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
+                :rules="validate('basicData.shippedHour')"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
+                :rules="validate('basicData.landed')"
             />
         </VnRow>
     </QForm>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index eef834cfa..3855240cb 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -221,7 +221,12 @@ function ticketFilter(ticket) {
                     size="md"
                     icon="vn:basketadd"
                     color="primary"
-                    :to="{ name: 'OrderList' }"
+                    :to="{
+                        name: 'OrderList',
+                        query: {
+                            createForm: JSON.stringify({}),
+                        },
+                    }"
                 >
                     <QTooltip>{{ t('ticket.card.newOrder') }}</QTooltip>
                 </QBtn>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 4140abcc8..705d8df7d 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -100,10 +100,14 @@ const actions = {
 
 function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
     const path = `Tickets/${ticket.value.id}/delivery-note-${documentType}`;
-    openReport(path, {
-        recipientId: ticket.value.clientFk,
-        type: type,
-    });
+    openReport(
+        path,
+        {
+            recipientId: ticket.value.clientFk,
+            type: type,
+        },
+        '_blank'
+    );
 }
 
 function sendDeliveryNoteConfirmation(type = 'deliveryNote', documentType = 'pdf') {
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 75204965a..660c4b1f2 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -685,7 +685,9 @@ watch(
         <template #column-itemFk="{ row }">
             <VnSelect
                 v-if="row.isNew"
-                url="Items"
+                url="Items/WithName"
+                :fields="['id', 'name']"
+                :sort-by="['id DESC']"
                 :options="items"
                 option-label="name"
                 option-value="id"
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index bdfb7ea8c..b5ae5efc5 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -104,7 +104,21 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
 ]);
+
+async function deleteService(row) {
+    const serviceId = row.id;
+
+    const { data } = await axios.delete(`TicketServices/${serviceId}`);
+    if (data) notify('Service deleted successfully', 'positive');
+    ticketServiceCrudRef.value.reload();
+}
 </script>
 
 <template>
@@ -123,6 +137,8 @@ const columns = computed(() => [
         :data-required="crudModelRequiredData"
         auto-load
         v-model:selected="selected"
+        :order="['description ASC']"
+        :default-remove="false"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -180,6 +196,21 @@ const columns = computed(() => [
                         />
                     </QTd>
                 </template>
+                <template #body-cell-actions="{ row }">
+                    <QTd auto-width>
+                        <QIcon
+                            color="primary"
+                            name="delete"
+                            class="cursor-pointer"
+                            size="sm"
+                            @click.stop="deleteService(row)"
+                        >
+                            <QTooltip class="text-no-wrap">
+                                {{ t('globals.delete') }}
+                            </QTooltip>
+                        </QIcon>
+                    </QTd>
+                </template>
             </QTable>
         </template>
     </CrudModel>
@@ -187,3 +218,4 @@ const columns = computed(() => [
         <QBtn fab color="primary" icon="add" @click="ticketServiceCrudRef.insert()" />
     </QPageSticky>
 </template>
+ñ
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index e8ba955d2..fc107c315 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -260,15 +260,6 @@ function toTicketUrl(section) {
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.consignee')"
-                    :value="
-                        entity.client.salesPersonUser.nickname +
-                        ' #' +
-                        entity.client.salesPersonUser.id
-                    "
-                >
-                </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.consigneeAddress')"
                     :value="formattedAddress()"
                 />
             </QCard>
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index f56c7cb36..7ae959443 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -59,6 +59,7 @@ const arrayData = useArrayData('AdvanceTickets', {
     exprBuilder: exprBuilder,
     limit: 0,
 });
+console.log('arrayData: ', arrayData);
 const { store } = arrayData;
 const tickets = computed(() =>
     (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
@@ -461,6 +462,7 @@ onMounted(async () => {
     tomorrow.setDate(tomorrow.getDate() + 1);
     userParams.dateFuture = tomorrow;
     userParams.dateToAdvance = today;
+    userParams.scopeDays = 1;
     userParams.warehouseFk = user.value.warehouseFk;
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
@@ -550,6 +552,7 @@ onMounted(async () => {
             style="max-width: 99%"
         >
             <template #header="props">
+                {{ userParams.scopeDays }}
                 <QTr :props="props">
                     <QTh
                         class="horizontal-separator text-uppercase color-vn-label"
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 209a1a307..b25ebdea6 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -9,6 +9,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import axios from 'axios';
 import { onMounted } from 'vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -116,6 +117,15 @@ onMounted(async () => await getItemPackingTypes());
                     </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputNumber
+                        v-model="params.scopeDays"
+                        :label="t('Days onward')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 53c920179..1cb46582d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { toDate, toCurrency } from 'src/filters/index';
+import { toDate, toCurrency, dashIfEmpty } from 'src/filters/index';
 import useNotify from 'src/composables/useNotify';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -21,6 +21,7 @@ import FetchData from 'src/components/FetchData.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
+import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -150,6 +151,11 @@ const columns = computed(() => [
         },
         columnClass: 'expand',
     },
+    {
+        align: 'left',
+        name: 'refFk',
+        label: t('ticketList.ref'),
+    },
     {
         align: 'left',
         name: 'zoneFk',
@@ -477,59 +483,66 @@ function setReference(data) {
         }"
     >
         <template #column-statusIcons="{ row }">
-            <QIcon
-                v-if="row.isTaxDataChecked === 0"
-                color="primary"
-                name="vn:no036"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('No verified data') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon v-if="row.hasTicketRequest" color="primary" name="vn:claims" size="xs">
-                <QTooltip>
-                    {{ t('Purchase request') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.itemShortage"
-                color="primary"
-                name="vn:unavailable"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('Not visible') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
-                <QTooltip>
-                    {{ t('Client frozen') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
-                <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.hasComponentLack"
-                color="primary"
-                name="vn:components"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('Component lack') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.hasRounding"
-                color="primary"
-                name="vn:sync_problem"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('Rounding') }}
-                </QTooltip>
-            </QIcon>
+            <div class="q-gutter-x-xs">
+                <QIcon
+                    v-if="row.isTaxDataChecked === 0"
+                    color="primary"
+                    name="vn:no036"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('No verified data') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasTicketRequest"
+                    color="primary"
+                    name="vn:buyrequest"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Purchase request') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.itemShortage"
+                    color="primary"
+                    name="vn:unavailable"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Not visible') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
+                    <QTooltip>
+                        {{ t('Client frozen') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
+                    <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasComponentLack"
+                    color="primary"
+                    name="vn:components"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Component lack') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasRounding"
+                    color="primary"
+                    name="sync_problem"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Rounding') }}
+                    </QTooltip>
+                </QIcon>
+            </div>
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>
@@ -566,9 +579,15 @@ function setReference(data) {
                 {{ row.state }}
             </span>
         </template>
+        <template #column-refFk="{ row }">
+            <span class="link" @click.stop>
+                {{ dashIfEmpty(row.refFk) }}
+                <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+            </span>
+        </template>
         <template #column-zoneFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.zoneName }}
+                {{ dashIfEmpty(row.zoneName) }}
                 <ZoneDescriptorProxy :id="row.zoneFk" />
             </span>
         </template>
@@ -586,6 +605,7 @@ function setReference(data) {
             <VnRow>
                 <VnSelect
                     url="Clients"
+                    :fields="['id', 'name']"
                     :label="t('ticketList.client')"
                     v-model="data.clientId"
                     :options="clientsOptions"
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 34eee17e1..fb944730e 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -270,3 +270,4 @@ ticketList:
     closure: Closure
     toLines: Go to lines
     addressNickname: Address nickname
+    ref: Reference
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index e66a3514b..24971529c 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -273,3 +273,4 @@ ticketList:
     closure: Cierre
     toLines: Ir a lineas
     addressNickname: Alias consignatario
+    ref: Referencia
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index dcc238f95..6e407b88b 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -198,7 +198,7 @@ export default {
                     name: 'TicketPackage',
                     meta: {
                         title: 'packages',
-                        icon: 'vn:bin',
+                        icon: 'vn:bucket',
                     },
                     component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
                 },

From 45b54332060a2dd2faf3db663bedc7b079e2510c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 20 Sep 2024 09:14:11 +0200
Subject: [PATCH 43/74] refs #6898 fix filter

---
 src/components/CreateNewPostcodeForm.vue       |  2 +-
 src/components/VnSelectProvince.vue            |  2 +-
 src/i18n/locale/en.yml                         |  1 +
 src/i18n/locale/es.yml                         |  1 +
 src/pages/Supplier/Card/SupplierFiscalData.vue |  2 +-
 src/pages/Supplier/SupplierList.vue            | 13 +++++++++++++
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index a426ac2b4..f920303c4 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -105,7 +105,7 @@ async function setProvince(id, data) {
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :emit-value="false"
                     clearable
                 >
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index ea10ace19..d50e292ce 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -38,7 +38,7 @@ async function onProvinceCreated(_, data) {
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
-        :roles-allowed-to-create="['deliveryAssistant']"
+        :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
     >
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ed42d0ce1..1d1a287c2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1010,6 +1010,7 @@ supplier:
             account: Account
             payMethod: Pay Method
             payDay: Pay Day
+            country: Country
     summary:
         responsible: Responsible
         notes: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4b1543a1e..db717824a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -994,6 +994,7 @@ supplier:
             account: Cuenta
             payMethod: Método de pago
             payDay: Dia de pago
+            country: País
     summary:
         responsible: Responsable
         notes: Notas
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index fd9667112..bcce93e53 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -129,7 +129,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     v-model="data.postCode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d8404632c..ad668f0c0 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -75,6 +75,19 @@ const columns = computed(() => [
         },
         visible: false,
     },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.country'),
+        name: 'country',
+        columnFilter: {
+            component: 'select',
+            name: 'countryFk',
+            attrs: {
+                url: 'countries',
+                fields: ['id', 'name'],
+            },
+        },
+    },
 ]);
 </script>
 

From 2537e58ff3839f7ab901ca6c31bd0de7a617892e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 09:56:04 +0200
Subject: [PATCH 44/74] fix: refs #7524 dynamic fetch

---
 .../Travel/Card/TravelThermographsForm.vue    | 35 +++++--------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 7f40873b1..c61e8c46f 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -28,18 +28,8 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const { notify } = useNotify();
-
-const thermographFilter = {
-    fields: ['thermographFk'],
-    where: {
-        travelFk: null,
-    },
-    order: 'thermographFk ASC',
-};
-const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
-const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -166,26 +156,13 @@ const updateThermograph = async () => {
         console.error('Error creating thermograph');
     }
 };
-
-const onThermographCreated = async (data) => {
-    await fetchTravelThermographsRef.value.fetch();
-    thermographForm.thermographId = data.thermographId;
-};
 </script>
-
 <template>
     <FetchData
         url="DmsContainers/allowedContentTypes"
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <FetchData
-        ref="fetchTravelThermographsRef"
-        url="TravelThermographs"
-        @on-fetch="(data) => (thermographsOptions = data)"
-        :filter="thermographFilter"
-        auto-load
-    />
     <FetchData
         url="DmsTypes"
         :filter="{ order: 'name' }"
@@ -239,15 +216,22 @@ const onThermographCreated = async (data) => {
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
                         v-model="thermographForm.thermographId"
-                        :options="thermographsOptions"
+                        url="TravelThermographs"
                         option-value="thermographFk"
                         option-label="thermographFk"
+                        :fields="['thermographFk']"
+                        :where="{ travelFk: null }"
+                        sort-by="thermographFk ASC"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                     >
                         <template #form>
                             <CreateThermographForm
-                                @on-data-saved="onThermographCreated($event, data)"
+                                @on-data-saved="
+                                    (data) =>
+                                        (thermographForm.thermographId =
+                                            data.thermographFk)
+                                "
                             />
                         </template>
                     </VnSelectDialog>
@@ -323,7 +307,6 @@ const onThermographCreated = async (data) => {
         </QForm>
     </QPage>
 </template>
-
 <i18n>
 es:
     Select files: Selecciona ficheros

From 3b709c20cf13389c85880a7165d240f9eb45a1e0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 10:05:28 +0200
Subject: [PATCH 45/74] fix: refs #7524 use id

---
 src/pages/Travel/Card/TravelThermographsForm.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index c61e8c46f..d8dc6edc8 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -228,9 +228,7 @@ const updateThermograph = async () => {
                         <template #form>
                             <CreateThermographForm
                                 @on-data-saved="
-                                    (data) =>
-                                        (thermographForm.thermographId =
-                                            data.thermographFk)
+                                    (data) => (thermographForm.thermographId = data.id)
                                 "
                             />
                         </template>

From b2cc74d890770aa0aa1c204bf36cdee06d828ca5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 10:27:24 +0200
Subject: [PATCH 46/74] fix: refs #7524 use id

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

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index d8dc6edc8..4f16b0a49 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -156,6 +156,10 @@ const updateThermograph = async () => {
         console.error('Error creating thermograph');
     }
 };
+
+const onThermographCreated = async (data) => {
+    thermographForm.thermographId = data.id;
+};
 </script>
 <template>
     <FetchData

From ac6d98cd36691ee748ca41b365e9cf25a4280ad1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 11:22:51 +0200
Subject: [PATCH 47/74] fix: refs #7353 horizontal scroll

---
 src/components/VnTable/VnTable.vue          | 20 +++--
 src/components/VnTable/VnVisibleColumn.vue  |  2 +-
 src/pages/Monitor/MonitorClients.vue        |  7 +-
 src/pages/Monitor/Ticket/MonitorTickets.vue | 92 +++++++++------------
 4 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 5b39265fb..2c9526ec0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -415,7 +415,7 @@ function handleOnDataSaved(_, res) {
                     <QBtn
                         v-if="$props.rightSearch"
                         icon="filter_alt"
-                        class="bg-vn-section-color q-ml-md"
+                        class="bg-vn-section-color q-ml-sm"
                         dense
                         @click="stateStore.toggleRightDrawer()"
                     />
@@ -502,8 +502,9 @@ function handleOnDataSaved(_, res) {
                             :key="index"
                             :title="btn.title"
                             :icon="btn.icon"
-                            class="q-px-sm"
+                            class="q-pa-xs"
                             flat
+                            dense
                             :class="
                                 btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                             "
@@ -745,10 +746,16 @@ es:
     }
 }
 
-.q-table th {
-    padding: 0;
-}
+.q-table {
+    th {
+        padding: 0;
+    }
 
+    &__top {
+        padding: 12px 0px;
+        top: 0;
+    }
+}
 .vnTable {
     thead tr th {
         position: sticky;
@@ -757,9 +764,6 @@ es:
     thead tr:first-child th {
         top: 0;
     }
-    .q-table__top {
-        top: 0;
-    }
     tbody {
         .q-checkbox {
             display: flex;
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index 36f5ed7de..f5c3458cd 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -135,7 +135,7 @@ onMounted(async () => {
 });
 </script>
 <template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-sm q-px-sm" dense>
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
                 <QIcon name="info" size="sm" class="info-icon">
diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index ff51e4464..68b24b400 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -139,7 +139,10 @@ const columns = computed(() => [
     </VnTable>
 </template>
 <style lang="scss" scoped>
-.full-width .vn-row > * {
-    flex: 0.4;
+.full-width .vn-row {
+    margin-bottom: 0;
+    > * {
+        flex: 0.3;
+    }
 }
 </style>
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 258b5022f..29bf42915 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -54,7 +54,7 @@ const columns = computed(() => [
         label: t('salesTicketsTable.problems'),
         name: 'totalProblems',
         align: 'left',
-
+        columnClass: 'no-padding',
         columnFilter: false,
         attrs: {
             dense: true,
@@ -65,7 +65,6 @@ const columns = computed(() => [
         name: 'id',
         field: 'id',
         align: 'left',
-
         columnFilter: {
             component: 'number',
             name: 'id',
@@ -110,7 +109,6 @@ const columns = computed(() => [
         name: 'shippedDate',
         style: { 'max-width': '100px' },
         align: 'left',
-
         columnFilter: {
             component: 'date',
             name: 'shippedDate',
@@ -164,7 +162,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.state'),
         name: 'state',
         align: 'left',
-        style: { 'max-width': '100px' },
         columnFilter: {
             component: 'select',
             name: 'stateFk',
@@ -193,7 +190,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.zone'),
         name: 'zoneFk',
         align: 'left',
-
         columnFilter: {
             component: 'select',
             name: 'zoneFk',
@@ -210,8 +206,7 @@ const columns = computed(() => [
         name: 'totalWithVat',
         field: 'totalWithVat',
         align: 'left',
-        style: { 'max-width': '75px' },
-
+        style: 'max-width: 75px',
         columnFilter: {
             component: 'number',
             name: 'totalWithVat',
@@ -370,7 +365,7 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <QTd class="no-padding" style="max-width: 60px">
+            <span>
                 <QIcon
                     v-if="row.isTaxDataChecked === 0"
                     name="vn:no036"
@@ -424,46 +419,40 @@ const openTab = (id) =>
                 >
                     <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
                 </QIcon>
-            </QTd>
+            </span>
         </template>
         <template #column-id="{ row }">
-            <QTd class="no-padding">
-                <span class="link" @click.stop.prevent>
-                    {{ row.id }}
-                    <TicketDescriptorProxy :id="row.id" />
-                </span>
-            </QTd>
+            <span class="link" @click.stop.prevent>
+                {{ row.id }}
+                <TicketDescriptorProxy :id="row.id" />
+            </span>
         </template>
         <template #column-clientFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.nickname">
-                <span class="link">{{ row.nickname }}</span>
+            <div @click.stop :title="row.nickname">
+                <span class="link" v-text="row.nickname" />
                 <CustomerDescriptorProxy :id="row.clientFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-salesPersonFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.userName">
+            <div @click.stop :title="row.userName">
                 <span class="link" v-text="dashIfEmpty(row.userName)" />
                 <WorkerDescriptorProxy :id="row.salesPersonFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-shippedDate="{ row }">
-            <QTd class="no-padding">
-                <QBadge
-                    v-bind="getBadgeAttrs(row.shippedDate)"
-                    class="q-pa-sm"
-                    style="font-size: 14px"
-                >
-                    {{ formatShippedDate(row.shippedDate) }}
-                </QBadge>
-            </QTd>
+            <QBadge
+                v-bind="getBadgeAttrs(row.shippedDate)"
+                class="q-pa-sm"
+                style="font-size: 14px"
+            >
+                {{ formatShippedDate(row.shippedDate) }}
+            </QBadge>
         </template>
         <template #column-provinceFk="{ row }">
-            <QTd class="no-padding">
-                <span :title="row.province" v-text="row.province" />
-            </QTd>
+            <span :title="row.province" v-text="row.province" />
         </template>
         <template #column-state="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <div @click.stop.prevent>
                 <div v-if="row.refFk">
                     <span class="link">{{ row.refFk }}</span>
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
@@ -477,32 +466,33 @@ const openTab = (id) =>
                 >
                     {{ row.state }}
                 </QBadge>
-            </QTd>
+            </div>
         </template>
         <template #column-isFragile="{ row }">
-            <QTd class="no-padding">
-                <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
-                    <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
-                </QIcon>
-            </QTd>
+            <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
+                <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
+            </QIcon>
         </template>
         <template #column-zoneFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent :title="row.zoneName">
+            <div @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-totalWithVat="{ row }">
-            <QTd class="no-padding">
-                <QBadge
-                    :color="totalPriceColor(row) || 'transparent'"
-                    :text-color="totalPriceColor(row) ? 'black' : 'white'"
-                    class="q-pa-sm"
-                    style="font-size: 14px"
-                >
-                    {{ toCurrency(row.totalWithVat) }}
-                </QBadge>
-            </QTd>
+            <QBadge
+                :color="totalPriceColor(row) || 'transparent'"
+                :text-color="totalPriceColor(row) ? 'black' : 'white'"
+                class="q-pa-sm"
+                style="font-size: 14px"
+            >
+                {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
         </template>
     </VnTable>
 </template>
+<style lang="scss" scoped>
+td .q-icon {
+    margin: 0 2px;
+}
+</style>

From e1f3589110f55936bb916ed20cc915fc8e0242fa Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 12:17:10 +0200
Subject: [PATCH 48/74] fix: refs #7353 horizontal scroll

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

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 29bf42915..4c6daca87 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -54,7 +54,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.problems'),
         name: 'totalProblems',
         align: 'left',
-        columnClass: 'no-padding',
         columnFilter: false,
         attrs: {
             dense: true,

From 87efc2f355d5bcc4dacc44ac6f90b2ca07698297 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:00:34 +0200
Subject: [PATCH 49/74] fix: refs #7353 responsive filters

---
 src/pages/Monitor/MonitorClients.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index 68b24b400..e98e11c6d 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -141,8 +141,9 @@ const columns = computed(() => [
 <style lang="scss" scoped>
 .full-width .vn-row {
     margin-bottom: 0;
+    flex-direction: row;
     > * {
-        flex: 0.3;
+        max-width: 105px;
     }
 }
 </style>

From 3e101242f64b72cd6ab727e93fd4a9ddabd99b34 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:20:40 +0200
Subject: [PATCH 50/74] chore: refs #7353 drop useless code

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

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 4c6daca87..f6e9848cf 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -205,7 +205,6 @@ const columns = computed(() => [
         name: 'totalWithVat',
         field: 'totalWithVat',
         align: 'left',
-        style: 'max-width: 75px',
         columnFilter: {
             component: 'number',
             name: 'totalWithVat',

From 7a253d314c6940c25100c3c78aa7dd79cf1126bd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:22:15 +0200
Subject: [PATCH 51/74] chore: refs #7353 drop useless code

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

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index f6e9848cf..16d5abffb 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -106,7 +106,6 @@ const columns = computed(() => [
     {
         label: t('salesTicketsTable.date'),
         name: 'shippedDate',
-        style: { 'max-width': '100px' },
         align: 'left',
         columnFilter: {
             component: 'date',

From edea17340dbbb388faae05ba386c8f206758cd0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 20 Sep 2024 14:33:59 +0200
Subject: [PATCH 52/74] refactor: refs #7553 adjust ticket notes view  in
 summary

---
 src/pages/Ticket/Card/TicketSummary.vue | 5 +++--
 src/pages/Ticket/TicketList.vue         | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index fc107c315..b6a60122c 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -281,6 +281,7 @@ function toTicketUrl(section) {
                             type="textarea"
                             class="notes"
                             readonly
+                            autogrow
                         />
                     </template>
                 </VnLv>
@@ -377,7 +378,7 @@ function toTicketUrl(section) {
                                     </QTooltip>
                                 </QIcon>
                                 <QIcon
-                                    name="vn:reserva"
+                                    name="vn:reserved"
                                     v-show="props.row.reserved"
                                     color="primary"
                                     size="xs"
@@ -576,7 +577,7 @@ function toTicketUrl(section) {
 </template>
 <style lang="scss" scoped>
 .notes {
-    width: max-content;
+    width: fit-content;
 }
 
 .q-card.q-card--dark.q-dark.vn-one {
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 1cb46582d..0fac89550 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -36,6 +36,7 @@ const selectedClient = ref();
 const stateStore = useStateStore();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
+from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
@@ -68,6 +69,7 @@ const columns = computed(() => [
         name: 'statusIcons',
         hidden: true,
         format: () => '',
+        columnClass: 'expand',
     },
     {
         align: 'left',

From df56eefe2f0ab236f475fd177ec22e0e9c435e14 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 15:46:54 +0200
Subject: [PATCH 53/74] fix: refs #7353 fine tunning ui

---
 src/pages/Monitor/MonitorClients.vue | 2 +-
 src/pages/Monitor/MonitorOrders.vue  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index e98e11c6d..c1958cdcb 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -143,7 +143,7 @@ const columns = computed(() => [
     margin-bottom: 0;
     flex-direction: row;
     > * {
-        max-width: 105px;
+        max-width: 125px;
     }
 }
 </style>
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index eb455a239..52d442d0a 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -132,7 +132,6 @@ const openTab = (id) =>
         :table="{
             'row-key': 'id',
             selection: 'multiple',
-            'hide-bottom': true,
         }"
         default-mode="table"
         :row-click="({ id }) => openTab(id)"

From 17bb144bce5087508a6f4612836b445f09390f9d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 10:04:45 +0200
Subject: [PATCH 54/74] fix: refs #7404 translates and some minor style fixes

---
 src/i18n/locale/es.yml                        |   1 +
 src/pages/Entry/EntryStockBought.vue          | 108 +++++++++---------
 src/pages/Entry/EntryStockBoughtDetail.vue    |  23 +++-
 .../integration/entry/stockBought.spec.js     |   2 -
 4 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 53b487e9f..423775658 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -162,6 +162,7 @@ globals:
         dms: Gestión documental
         entryCreate: Nueva entrada
         latestBuys: Últimas compras
+        reserves: Reservas
         tickets: Tickets
         ticketCreate: Nuevo ticket
         boxing: Encajado
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5b4d43e06..5027ad511 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -54,7 +54,6 @@ const columns = [
         create: true,
         component: 'number',
         summation: true,
-        cardVisible: true,
     },
     {
         align: 'left',
@@ -101,14 +100,9 @@ const travel = ref(null);
 const userParams = ref({
     dated: Date.vnNew(),
 });
+
 const filter = ref({
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
+    fields: ['id', 'm3', 'warehouseInFk'],
     include: [
         {
             relation: 'warehouseIn',
@@ -117,6 +111,13 @@ const filter = ref({
             },
         },
     ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
 });
 
 const setUserParams = async ({ dated }) => {
@@ -139,7 +140,7 @@ function openDialog() {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.filter((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
                     }
                 "
             />
@@ -149,10 +150,10 @@ function openDialog() {
                         {{ t('Booked trucks') }}:
                     </span>
                     <span>
-                        {{ travel[0]?.m3 }}
+                        {{ travel?.m3 }}
                     </span>
                     <QBtn
-                        v-if="travel[0]?.m3"
+                        v-if="travel?.m3"
                         style="max-width: 20%"
                         flat
                         icon="edit"
@@ -166,10 +167,10 @@ function openDialog() {
     </VnSubToolbar>
     <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
-            :url-update="`Travels/${travel[0].id}`"
+            :url-update="`Travels/${travel?.id}`"
             model="travel"
             :title="t('Travel m3')"
-            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
             @on-data-saved="fetchDataRef.fetch()"
         >
             <template #form-inputs="{ data }">
@@ -192,51 +193,56 @@ function openDialog() {
             />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <VnTable
-            ref="tableRef"
-            data-key="StockBoughts"
-            url="StockBoughts/getStockBought"
-            save-url="StockBoughts/crud"
-            order="reserve DESC"
-            :right-search="false"
-            :is-editable="true"
-            :create="{
-                urlCreate: 'StockBoughts',
-                title: t('Reserve some space'),
-                onDataSaved: () => tableRef.reload(),
-                formInitialData: {
-                    workerFk: user.id,
-                    dated: Date.vnNow(),
-                },
-            }"
-            :columns="columns"
-            :user-params="userParams"
-            :footer="true"
-            auto-load
-        >
-            <template #column-workerFk="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.worker?.user?.name }}
-                    <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span>
-            </template>
-        </VnTable>
-    </QPage>
+    <div class="table-container">
+        <QPage class="column items-center q-pa-md">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughts"
+                url="StockBoughts/getStockBought"
+                save-url="StockBoughts/crud"
+                order="reserve DESC"
+                :right-search="false"
+                :is-editable="true"
+                :create="{
+                    urlCreate: 'StockBoughts',
+                    title: t('Reserve some space'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {
+                        workerFk: user.id,
+                        dated: Date.vnNow(),
+                    },
+                }"
+                :columns="columns"
+                :user-params="userParams"
+                :footer="true"
+                auto-load
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </QPage>
+    </div>
 </template>
 <style lang="css" scoped>
 .travel {
     margin-bottom: 0px;
 }
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 40%;
+}
 </style>
 <i18n>
-    en:
-        Buyer: Buyer
-        Reserve: Reserve
-        Bought: Bought
-        More: More
-        Date: Date
-        This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
         Edit travel: Editar envío
         Travel: Envíos
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 744b9d3fe..9489c2362 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -22,7 +22,7 @@ const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}
 const columns = [
     {
         align: 'left',
-        label: 'Entry',
+        label: t('Entry'),
         name: 'entryFk',
         isTitle: true,
         isId: true,
@@ -41,24 +41,28 @@ const columns = [
         create: true,
         columnClass: 'expand',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         name: 'volume',
         label: t('Volume'),
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('Packaging'),
         name: 'packagingFk',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: 'Packing',
         name: 'packing',
         columnFilter: false,
+        cardVisible: true,
     },
 ];
 </script>
@@ -73,18 +77,20 @@ const columns = [
                 :columns="columns"
                 :right-search="false"
                 :disable-infinite-scroll="true"
-                :disable-option="{ card: true }"
                 :limit="0"
                 auto-load
             >
+                <template #top-left>
+                    <QBtn flat icon="Close" v-close-popup />
+                </template>
                 <template #column-entryFk="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.entryFk }}
                         <EntryDescriptorProxy :id="row.entryFk" />
                     </span>
                 </template>
                 <template #column-itemName="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.itemName }}
                         <ItemDescriptorProxy :id="row.itemFk" />
                     </span>
@@ -93,8 +99,8 @@ const columns = [
         </div>
     </QDialog>
 </template>
-<style lang="css">
-.q-dialog__inner {
+<style lang="css" scoped>
+.container {
     max-width: 50vw;
     overflow: auto;
     display: flex;
@@ -110,4 +116,9 @@ const columns = [
         Bought: Comprado
         More: Más
         Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
 </i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index b93afa520..66e06b79e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -6,7 +6,6 @@ describe('EntryStockBought', () => {
     });
     it('Should edit the reserved space', () => {
         cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('tBody > tr').its('length').should('eq', 2);
         cy.get('input[name="reserve"]').type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
@@ -18,7 +17,6 @@ describe('EntryStockBought', () => {
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
         cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('tBody > tr').its('length').should('eq', 3);
     });
     it('Should check detail for the buyer', () => {
         cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();

From f025b4361ee7fb69eee4689ad73102cdb1a38b4b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 23 Sep 2024 10:21:30 +0200
Subject: [PATCH 55/74] refactor: refs #7553 last requested changes

---
 src/components/VnTable/VnTable.vue            | 15 ++++++++---
 src/i18n/locale/es.yml                        |  2 +-
 src/pages/Order/OrderList.vue                 | 11 +++++++-
 src/pages/Ticket/Card/TicketDescriptor.vue    |  4 +--
 .../Ticket/Card/TicketDescriptorMenu.vue      |  5 ++++
 src/pages/Ticket/Card/TicketSale.vue          | 27 +++++++------------
 src/pages/Ticket/Card/TicketService.vue       | 10 ++++---
 src/pages/Ticket/TicketAdvance.vue            |  1 -
 src/pages/Ticket/TicketList.vue               |  3 ++-
 9 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 46910f685..848e5b49f 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -106,6 +106,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    disabledAttr: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -529,18 +533,21 @@ function handleOnDataSaved(_) {
                 </template>
                 <template #bottom v-if="bottom">
                     <slot name="bottom-table">
-                        <QIcon
+                        <QBtn
                             @click="
                                 () =>
                                     createAsDialog
                                         ? (showForm = !showForm)
                                         : handleOnDataSaved(create)
                             "
-                            class="fill-icon-on-hover"
+                            class="cursor-pointer fill-icon"
                             color="primary"
-                            name="add_circle"
-                            size="sm"
+                            icon="add_circle"
+                            size="md"
+                            round
+                            flat
                             shortcut="+"
+                            :disabled="!disabledAttr"
                         />
                         <QTooltip>
                             {{ createForm.title }}
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e704a682a..8c8b3e6ff 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -559,7 +559,7 @@ ticket:
         purchaseRequest: Petición de compra
         service: Servicio
         description: Descripción
-        attender: Comprador
+        attender: Consignatario
     create:
         client: Cliente
         address: Dirección
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index f5c8a44de..7d1fd0056 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -14,13 +14,15 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
 const addressesList = ref([]);
-
+const route = useRoute();
 const columns = computed(() => [
     {
         align: 'left',
@@ -168,6 +170,13 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
+
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk, id);
+});
 </script>
 <template>
     <OrderSearchbar />
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 3855240cb..70fd9ab1e 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -156,7 +156,7 @@ function ticketFilter(ticket) {
             <VnLv :label="t('ticket.card.alias')" :value="entity.nickname" />
         </template>
         <template #icons="{ entity }">
-            <QCardActions>
+            <QCardActions class="q-gutter-x-xs">
                 <QIcon
                     v-if="entity.client.isActive == false"
                     name="vn:disabled"
@@ -224,7 +224,7 @@ function ticketFilter(ticket) {
                     :to="{
                         name: 'OrderList',
                         query: {
-                            createForm: JSON.stringify({}),
+                            createForm: JSON.stringify({ clientFk: entity.clientFk }),
                         },
                     }"
                 >
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 705d8df7d..12e03551b 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -89,6 +89,7 @@ const actions = {
             notify({
                 message: t('You can undo this action within the first hour'),
                 icon: 'info',
+                type: 'warning',
             });
 
             push({ name: 'TicketList' });
@@ -190,6 +191,8 @@ function openConfirmDialog(callback) {
     dialog({
         component: VnConfirm,
         componentProps: {
+            title: t('This ticket will be removed from current route! Continue anyway?'),
+            message: t('You are going to delete this ticket'),
             promise: actions[callback],
         },
     });
@@ -689,4 +692,6 @@ es:
     Weight set: Peso establecido
     This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
     invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
+    This ticket will be removed from current route! Continue anyway?: ¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?
+    You are going to delete this ticket: Vas a eliminar este ticket
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index e8a6d27da..767c31cdd 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -388,8 +388,17 @@ const removeSelectedSales = () => {
 };
 
 const removeSales = async () => {
+    let paramsOk = true;
     try {
         const params = { sales: selectedRows.value, ticketId: store.data.id };
+        params.sales.forEach((sale) => {
+            if (!sale.itemFk) {
+                tableRef.value.reload();
+                paramsOk = false;
+            }
+        });
+
+        if (!paramsOk) return;
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');
@@ -623,6 +632,7 @@ watch(
         :default-remove="false"
         :default-reset="false"
         :default-save="false"
+        :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
             <router-link
@@ -779,23 +789,6 @@ watch(
         <template #column-amount="{ row }">
             {{ toCurrency(row.quantity * row.price) }}
         </template>
-        <template #bottom-row>
-            <QBtn
-                class="cursor-pointer fill-icon q-ml-md q-my-lg"
-                color="primary"
-                icon="add_circle"
-                size="md"
-                round
-                flat
-                shortcut="+"
-                :disable="!isTicketEditable"
-                @click="insertRow()"
-            >
-                <QTooltip>
-                    {{ t('Add item') }}
-                </QTooltip>
-            </QBtn>
-        </template>
     </VnTable>
 
     <QPageSticky :offset="[20, 20]" style="z-index: 2">
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 57d6977df..c5bf7437e 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -114,10 +114,12 @@ const columns = computed(() => [
 
 async function deleteService(row) {
     const serviceId = row.id;
-
-    const { data } = await axios.delete(`TicketServices/${serviceId}`);
-    if (data) notify('Service deleted successfully', 'positive');
-    ticketServiceCrudRef.value.reload();
+    if (!row.id) ticketServiceCrudRef.value.reset();
+    else {
+        const { data } = await axios.delete(`TicketServices/${serviceId}`);
+        if (data) notify('Service deleted successfully', 'positive');
+        ticketServiceCrudRef.value.reload();
+    }
 }
 </script>
 
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 7ae959443..43b500dc0 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -59,7 +59,6 @@ const arrayData = useArrayData('AdvanceTickets', {
     exprBuilder: exprBuilder,
     limit: 0,
 });
-console.log('arrayData: ', arrayData);
 const { store } = arrayData;
 const tickets = computed(() =>
     (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 0fac89550..ad97e75c1 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -555,7 +555,7 @@ function setReference(data) {
         <template #column-shippedDate="{ row }">
             <span v-if="getDateColor(row.shipped)">
                 <QChip :class="getDateColor(row.shipped)" dense square>
-                    {{ row.shippedDate }}
+                    {{ toDate(row.shippedDate) }}
                 </QChip>
             </span>
         </template>
@@ -615,6 +615,7 @@ function setReference(data) {
                     option-label="name"
                     hide-selected
                     @update:model-value="(client) => onClientSelected(data)"
+                    :sort-by="'id ASC'"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

From 1ae20202ccd84c09428572fb14c3764dd11ccf1c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 23 Sep 2024 11:56:20 +0200
Subject: [PATCH 56/74] feat: refs #8000 add column into zoneBasicData

---
 src/pages/Zone/Card/ZoneBasicData.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 512d07636..c60a4c77b 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -64,6 +64,15 @@ const agencyOptions = ref([]);
                     type="number"
                     min="0"
                 />
+
+                <VnInput
+                    class="mw-10"
+                    v-model="data.itemMaxLength"
+                    :label="t('Max length m³')"
+                    clearable
+                    type="number"
+                    min="0"
+                />
             </VnRow>
 
             <VnRow>
@@ -128,4 +137,5 @@ es:
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico
+    Max length m³: Medidad máxima tumbado
 </i18n>

From 5ebbb1cf737aa405717efe4b8851601287898333 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 23 Sep 2024 12:24:19 +0200
Subject: [PATCH 57/74] feat: refs #8000 fix

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

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index c60a4c77b..535f2393d 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -137,5 +137,5 @@ es:
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico
-    Max length m³: Medidad máxima tumbado
+    Max length m³: Medida máxima tumbado
 </i18n>

From e700f6f4a8cb71c22216fdd11e1a409ea1dbdb37 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 13:14:25 +0200
Subject: [PATCH 58/74] feat: refs #7404 style dynamic text color

---
 src/components/VnTable/VnTable.vue         | 16 ++------
 src/components/ui/VnPaginate.vue           |  5 +--
 src/css/quasar.variables.scss              |  1 -
 src/pages/Entry/Card/EntrySummary.vue      | 26 ++++++------
 src/pages/Entry/EntryLatestBuys.vue        | 15 +++----
 src/pages/Entry/EntryLatestBuysFilter.vue  |  2 +
 src/pages/Entry/EntryStockBought.vue       | 46 +++++++++++++++++++++-
 src/pages/Entry/EntryStockBoughtDetail.vue | 10 ++++-
 8 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a3b64d264..621e2acfc 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -639,18 +639,10 @@ function handleOnDataSaved(_) {
                             :key="col?.id"
                             class="text-center"
                         >
-                            <div
-                                v-if="col?.summation"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                class="text-bold q-pa-sm"
-                            >
-                                {{
-                                    rows.reduce(
-                                        (sum, currentRow) => sum + currentRow[col.name],
-                                        0
-                                    )
-                                }}
-                            </div>
+                            <slot
+                                :name="`column-footer-${col.name}`"
+                                :class="getColAlign(col)"
+                            />
                         </QTh>
                     </QTr>
                 </template>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 79a79c383..37101dafe 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -131,9 +131,8 @@ async function fetch(params) {
     useArrayData(props.dataKey, params);
     arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
-        isLoading.value = false;
-    }
+    if (!store.hasMoreData) isLoading.value = false;
+
     emit('onFetch', store.data);
     return store.data;
 }
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index aeac483be..9f7c62848 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -36,7 +36,6 @@ $color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }
-
 .bg-notice {
     background-color: $info;
 }
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 379be1d2f..58a5c2e1b 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,7 +164,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
-                v-if="route.name !== 'EntrySummary'"
+                v-if="route?.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"
@@ -184,7 +185,10 @@ const fetchEntryBuys = async () => {
                     <QIcon name="open_in_new" />
                 </router-link>
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+                <VnLv
+                    :label="t('entry.summary.currency')"
+                    :value="entry.currency?.name"
+                />
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
                 <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                 <VnLv
@@ -210,12 +214,12 @@ const fetchEntryBuys = async () => {
                 </VnLv>
                 <VnLv
                     :label="t('entry.summary.travelAgency')"
-                    :value="entry.travel.agency.name"
+                    :value="entry.travel.agency?.name"
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
-                    :value="entry.travel.warehouseOut.name"
+                    :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelDelivered')"
@@ -225,7 +229,7 @@ const fetchEntryBuys = async () => {
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
-                    :value="entry.travel.warehouseIn.name"
+                    :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelReceived')"
@@ -281,17 +285,17 @@ const fetchEntryBuys = async () => {
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
-                            <QTd v-for="col in cols" :key="col.name">
+                            <QTd v-for="col in cols" :key="col?.name">
                                 <component
-                                    :is="tableColumnComponents[col.name].component(props)"
-                                    v-bind="tableColumnComponents[col.name].props(props)"
-                                    @click="tableColumnComponents[col.name].event(props)"
+                                    :is="tableColumnComponents[col?.name].component()"
+                                    v-bind="tableColumnComponents[col?.name].props()"
+                                    @click="tableColumnComponents[col?.name].event()"
                                     class="col-content"
                                 >
                                     <template
                                         v-if="
-                                            col.name !== 'observation' &&
-                                            col.name !== 'isConfirmed'
+                                            col?.name !== 'observation' &&
+                                            col?.name !== 'isConfirmed'
                                         "
                                         >{{ col.value }}</template
                                     >
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 7c4354b65..61c430b23 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,16 +1,17 @@
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 const stateStore = useStateStore();
 const { t } = useI18n();
-import { toDate } from 'src/filters';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 const columns = [
     {
         align: 'center',
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index f147a3c6f..83124c1bf 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
@@ -18,6 +19,7 @@ defineProps({
 
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagValues = ref([]);
 </script>
 
 <template>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5027ad511..fa4b1e6b6 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -56,7 +56,7 @@ const columns = [
         summation: true,
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Bought'),
         name: 'bought',
         summation: true,
@@ -129,6 +129,18 @@ const setUserParams = async ({ dated }) => {
 function openDialog() {
     travelDialogRef.value = true;
 }
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -203,6 +215,7 @@ function openDialog() {
                 order="reserve DESC"
                 :right-search="false"
                 :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
                 :create="{
                     urlCreate: 'StockBoughts',
                     title: t('Reserve some space'),
@@ -223,11 +236,31 @@ function openDialog() {
                         <WorkerDescriptorProxy :id="row?.workerFk" />
                     </span>
                 </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ tableRef.footer.reserve }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ tableRef.footer.bought }}
+                    </span>
+                </template>
             </VnTable>
         </QPage>
     </div>
 </template>
-<style lang="css" scoped>
+<style lang="scss" scoped>
 .travel {
     margin-bottom: 0px;
 }
@@ -241,6 +274,15 @@ function openDialog() {
     align-items: center;
     width: 40%;
 }
+.text-negative {
+    color: $negative !important;
+}
+.input-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+}
 </style>
 <i18n>
     es:
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 9489c2362..cdcd28381 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -81,7 +81,13 @@ const columns = [
                 auto-load
             >
                 <template #top-left>
-                    <QBtn flat icon="Close" v-close-popup />
+                    <QBtn
+                        flat
+                        icon="Close"
+                        color="primary"
+                        class="bg-vn-section-color q-pa-xs"
+                        v-close-popup
+                    />
                 </template>
                 <template #column-entryFk="{ row }">
                     <span class="link">
@@ -103,10 +109,10 @@ const columns = [
 .container {
     max-width: 50vw;
     overflow: auto;
-    display: flex;
     justify-content: center;
     align-items: center;
     margin: auto;
+    background-color: var(--vn-section-color);
 }
 </style>
 <i18n>

From b04564d5a81c1d686e641210f2c7f420ac9b6b15 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 13:23:25 +0200
Subject: [PATCH 59/74] fix: refs #7404 style non center pop up

---
 src/components/VnTable/VnTable.vue         | 4 ----
 src/pages/Entry/EntryStockBought.vue       | 6 ------
 src/pages/Entry/EntryStockBoughtDetail.vue | 3 +--
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 621e2acfc..0f7dd3a02 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -727,10 +727,6 @@ es:
     border-color: var(--vn-section-color);
 }
 
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index fa4b1e6b6..4750a8417 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -277,12 +277,6 @@ function setFooter(data) {
 .text-negative {
     color: $negative !important;
 }
-.input-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-}
 </style>
 <i18n>
     es:
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index cdcd28381..2c1a5a47e 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -67,7 +67,7 @@ const columns = [
 ];
 </script>
 <template>
-    <QDialog :maximized="true">
+    <QDialog>
         <div class="container">
             <VnTable
                 ref="tableRef"
@@ -112,7 +112,6 @@ const columns = [
     justify-content: center;
     align-items: center;
     margin: auto;
-    background-color: var(--vn-section-color);
 }
 </style>
 <i18n>

From 3716507f93cbb95c3e2701a64adc48583ff09117 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 23 Sep 2024 13:51:20 +0200
Subject: [PATCH 60/74] perf: refs #7553 removeSales function

---
 src/pages/Ticket/Card/TicketSale.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 767c31cdd..2dc67872f 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -388,17 +388,18 @@ const removeSelectedSales = () => {
 };
 
 const removeSales = async () => {
-    let paramsOk = true;
     try {
-        const params = { sales: selectedRows.value, ticketId: store.data.id };
-        params.sales.forEach((sale) => {
-            if (!sale.itemFk) {
-                tableRef.value.reload();
-                paramsOk = false;
-            }
-        });
+        const params = {
+            sales: selectedRows.value.filter((sale) => sale.id),
+            ticketId: store.data.id,
+        };
+        selectedRows.value
+            .filter((sale) => !sale.id)
+            .forEach((sale) =>
+                tableRef.value.CrudModelRef.formData.splice(sale.$index, 1)
+            );
 
-        if (!paramsOk) return;
+        if (params.sales.length == 0) return;
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');

From ac8aa6bcc14d4edca83c1a967a6a00395e62bc5b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 14:21:41 +0200
Subject: [PATCH 61/74] fix: table order

---
 src/i18n/locale/en.yml            |  2 +-
 src/i18n/locale/es.yml            |  2 +-
 src/pages/Item/ItemFixedPrice.vue | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 2e2365f7b..089f417f9 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1074,7 +1074,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 53b487e9f..338332eb1 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1058,7 +1058,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"

From caddcf45c3b6c3efb085bf3e742debac77f440b9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 12:43:52 +0000
Subject: [PATCH 62/74] fix: Options VnSelect properties

---
 src/pages/Customer/Card/CustomerBasicData.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 6472a47ff..4987fc7ba 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -111,6 +111,8 @@ const exprBuilder = (param, value) => {
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
+                    :option-label="'nickname'"
+                    :option-value="'id'"
                     :rules="validate('client.salesPersonFk')"
                     :expr-builder="exprBuilder"
                     emit-value

From ab0c38810a4bb155672bb05e5e04084279b399dc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 12:44:37 +0000
Subject: [PATCH 63/74] fix: Options VnSelect properties

---
 src/pages/Customer/CustomerList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 0428c0c7b..6b6a45e15 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -428,7 +428,9 @@ function handleLocation(data, location) {
                 :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
-                }"
+                }"                
+                :option-label="'nickname'"
+                :option-value="'id'"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
                 emit-value

From 27a3e36b589930db022428737f9ec17f983a8171 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 14:56:34 +0200
Subject: [PATCH 64/74] fix: comments

---
 src/pages/Customer/Card/CustomerBasicData.vue | 4 ++--
 src/pages/Customer/CustomerList.vue           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 4987fc7ba..79ae79ad9 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -111,8 +111,8 @@ const exprBuilder = (param, value) => {
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
-                    :option-label="'nickname'"
-                    :option-value="'id'"
+                    option-label="nickname"
+                    option-value="id"
                     :rules="validate('client.salesPersonFk')"
                     :expr-builder="exprBuilder"
                     emit-value
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 6b6a45e15..5e24a1c2d 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -428,9 +428,9 @@ function handleLocation(data, location) {
                 :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
-                }"                
-                :option-label="'nickname'"
-                :option-value="'id'"
+                }"
+                option-label="nickname"
+                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
                 emit-value

From e9e2caee85b0f1826b9a73d295800ed35efef463 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 13:18:14 +0000
Subject: [PATCH 65/74] feat: autofocus after clear

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

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 26160929c..1246eedcd 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -103,6 +103,7 @@ const mixinRules = [
                     @click="
                         () => {
                             value = null;
+                            vnInputRef.focus();
                             emit('remove');
                         }
                     "

From b4b31c0c92227c697d0bb5550773d51d0f3082ca Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 15:21:07 +0200
Subject: [PATCH 66/74] fix: enable autofocus

---
 src/components/common/VnInputDate.vue | 3 +++
 src/components/common/VnInputTime.vue | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index fd8993d6f..3d5afaf80 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -20,6 +20,7 @@ const { validations } = useValidator();
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const vnInputDateRef = ref(null);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
@@ -91,6 +92,7 @@ const styleAttrs = computed(() => {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputDateRef"
             v-model="formattedDate"
             class="vn-input-date"
             :mask="mask"
@@ -113,6 +115,7 @@ const styleAttrs = computed(() => {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputDateRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 42ec79479..a5e7d3002 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -16,6 +16,7 @@ const props = defineProps({
         default: false,
     },
 });
+const vnInputTimeRef = ref(null);
 const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
@@ -69,6 +70,7 @@ function dateToTime(newDate) {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputTimeRef"
             class="vn-input-time"
             mask="##:##"
             placeholder="--:--"
@@ -92,6 +94,7 @@ function dateToTime(newDate) {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputTimeRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "

From 3ede256dc554c7739e9cb7106f0f27d31063d48d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 18:30:14 +0000
Subject: [PATCH 67/74] feat: change label because its more natural

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index b6cbfbafd..e5ed14a40 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -14,11 +14,11 @@ const props = defineProps({
 });
 const modelValue = ref(
     props.location
-        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
         : null
 );
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
 }
 const handleModelValue = (data) => {
     emit('update:model-value', data);

From 876078166081102fc0cfba3cd76601aee361a153 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 08:15:44 +0200
Subject: [PATCH 68/74] fix: merge in dev

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a6948494c..a7c4e6378 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -789,11 +789,11 @@ es:
     thead tr:first-child th {
         top: 0;
     }
-    <<<<<<< HEAD .q-table__top {
+    .q-table__top {
         top: 0;
         padding: 12px 0;
     }
-    =======>>>>>>>d13cab0a240a3a10db97a793022ba0f5ded48965 tbody {
+    tbody {
         .q-checkbox {
             display: flex;
             margin-bottom: 9px;

From 2c73ce28c30cd652c2359d9146981d10985aebd1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:02:35 +0200
Subject: [PATCH 69/74] fix: fixed wagon tests

---
 .../integration/wagon/wagonCreate.spec.js     | 25 ++++++++++++++-----
 .../wagonType/wagonTypeCreate.spec.js         |  2 +-
 .../wagonType/wagonTypeEdit.spec.js           | 14 +++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 9aff3a819..57d0f8fec 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -11,7 +11,9 @@ describe('WagonCreate', () => {
         cy.get('input').eq(1).type('1234ABCD');
         cy.get('input').eq(2).type('100');
         cy.get('input').eq(3).click();
-        cy.get('div[role="listbox"]').find('div.q-item').click();
+        cy.get('.q-select > .q-field__inner > .q-field__control').type(
+            '{downarrow}{enter}'
+        );
 
         // Save
         cy.get('button[type="submit"]').click();
@@ -19,12 +21,23 @@ describe('WagonCreate', () => {
         // Check data has been saved successfully
         cy.waitForElement('.q-card');
 
-        cy.get('.title').should('have.text', '1234');
-        cy.get('[title-label="Plate"] > .value > span').should('have.text', '1234ABCD');
-        cy.get(':nth-child(2) > .value > span').should('have.text', '100');
-        cy.get(':nth-child(3) > .value > span').should('have.text', 'Wagon Type #1');
+        // cy.get('.cursor-text').should('have.text', '1234');
+        // cy.get(':nth-child(1) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     '1234ABCD'
+        // );
+        // cy.get(':nth-child(2) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     '100'
+        // );
+        // cy.get(':nth-child(3) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     'Wagon Type #1'
+        // );
 
         // Delete wagon type created
-        cy.get('.actions > .q-btn--standard').click();
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
+        ).click();
     });
 });
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index cd7ffa58f..0ad98e597 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -13,7 +13,7 @@ describe('WagonTypeCreate', () => {
     });
     it('delete a wagon type', () => {
         cy.get(
-            ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard'
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
         ).click();
     });
 });
diff --git a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
index 6e5816e51..36dd83411 100644
--- a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
@@ -4,7 +4,7 @@ describe('WagonTypeEdit', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit('/#/wagon/type/2/edit');
+        cy.visit('/#/wagon/type/1/edit');
     });
 
     it('should edit the name and the divisible field of the wagon type', () => {
@@ -14,14 +14,14 @@ describe('WagonTypeEdit', () => {
         cy.get('.q-btn--standard').click();
     });
 
-    it('should create a tray', () => {
-        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input').last().type('150');
-        cy.get(trayColorRow).type('{downArrow}{downArrow}{enter}');
-    });
-
     it('should delete a tray', () => {
         cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').first().click();
         cy.reload();
     });
+
+    it('should create a tray', () => {
+        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').last().click();
+        cy.get('input').last().type('150');
+        cy.get(trayColorRow).type('{downArrow}{downArrow}{downArrow}{enter}');
+    });
 });

From 768e15755fb63d645d43e123802cdbb5e0978936 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:18:10 +0200
Subject: [PATCH 70/74] fix: deleted code

---
 .../integration/wagon/wagonCreate.spec.js       | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 57d0f8fec..881e51f42 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -18,23 +18,6 @@ describe('WagonCreate', () => {
         // Save
         cy.get('button[type="submit"]').click();
 
-        // Check data has been saved successfully
-        cy.waitForElement('.q-card');
-
-        // cy.get('.cursor-text').should('have.text', '1234');
-        // cy.get(':nth-child(1) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     '1234ABCD'
-        // );
-        // cy.get(':nth-child(2) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     '100'
-        // );
-        // cy.get(':nth-child(3) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     'Wagon Type #1'
-        // );
-
         // Delete wagon type created
         cy.get(
             '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'

From f2ae231efb4f032c58b284d84206dccadce97175 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:35:34 +0200
Subject: [PATCH 71/74] fix: missing code

---
 .../integration/wagon/wagonCreate.spec.js        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 881e51f42..cd248d1bb 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -18,6 +18,22 @@ describe('WagonCreate', () => {
         // Save
         cy.get('button[type="submit"]').click();
 
+        // Check data has been saved successfully
+        cy.waitForElement('.q-card');
+
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text'
+        ).should('have.text', '1234');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '1234ABCD');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '100');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', 'Wagon Type #1');
+
         // Delete wagon type created
         cy.get(
             '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'

From cd96003c0ea3221676986ad505246b8bb9ccae90 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 10:35:59 +0200
Subject: [PATCH 72/74] refactor: refs #7553 requested changes and added
 keyup.enter

---
 src/components/VnTable/VnTable.vue                    |  7 -------
 src/pages/Customer/Card/CustomerConsumptionFilter.vue |  1 -
 src/pages/Order/Card/OrderLines.vue                   |  2 +-
 src/pages/Order/OrderList.vue                         |  2 +-
 src/pages/Order/locale/en.yml                         |  1 +
 src/pages/Order/locale/es.yml                         |  1 +
 src/pages/Ticket/Card/BasicData/TicketBasicData.vue   |  2 +-
 src/pages/Ticket/Card/TicketComponents.vue            |  2 +-
 src/pages/Ticket/Card/TicketNotes.vue                 | 10 ++++++++++
 src/pages/Ticket/Card/TicketSale.vue                  |  2 +-
 src/pages/Ticket/Card/TicketService.vue               | 11 ++++++++++-
 src/pages/Ticket/Card/TicketVolume.vue                |  2 +-
 12 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 325b0e997..6dabf51f5 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -433,13 +433,6 @@ function handleOnDataSaved(_) {
                         @click="stateStore.toggleRightDrawer()"
                     />
                 </template>
-                <!--TODO: este slot se carga los botones de mostrar tabla/card y columnas visibles
-                    por lo que no es viable para el uso que se le quiere dar-->
-                <!-- <template #top>
-                    <div class="full-width-slot">
-                        <slot name="before-header" />
-                    </div>
-                </template> -->
                 <template #header-cell="{ col }">
                     <QTh v-if="col.visible ?? true">
                         <div
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 91536e954..289b2eb08 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -47,7 +47,6 @@ defineProps({ dataKey: { type: String, required: true } });
                 </QItemSection>
             </QItem>
             <QItem>
-                <!--It's required to include the relation category !! There's 413 records in production-->
                 <QItemSection>
                     <VnSelect
                         v-model="params.typeId"
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 17a157797..175c956e1 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -249,7 +249,7 @@ watch(
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard
             class="order-lines-summary q-pa-lg"
             v-if="orderSummary.vat && orderSummary.total"
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 7d1fd0056..6b6b41828 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -192,7 +192,7 @@ onMounted(() => {
         :order="['landed DESC', 'clientFk ASC', 'id DESC']"
         :create="{
             urlCreate: 'Orders/new',
-            title: 'Create Order',
+            title: t('module.cerateOrder'),
             onDataSaved: (url) => {
                 tableRef.redirect(url);
             },
diff --git a/src/pages/Order/locale/en.yml b/src/pages/Order/locale/en.yml
index b630a18ed..4349bc76f 100644
--- a/src/pages/Order/locale/en.yml
+++ b/src/pages/Order/locale/en.yml
@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Sales Person
     address: Address
+    cerateOrder: Create order
 lines:
     item: Item
     warehouse: Warehouse
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
index 055d22719..cef06cb6d 100644
--- a/src/pages/Order/locale/es.yml
+++ b/src/pages/Order/locale/es.yml
@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Comercial
     address: Dirección
+    cerateOrder: Crear cesta
 lines:
     item: Artículo
     warehouse: Almacén
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index 2ed84e50e..ab96a6e75 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -144,7 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (ticketUpdateActions = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             bordered
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 9ac9771b8..0bccdaacd 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -192,7 +192,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (components = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index f6bcc4533..ea06cd9f6 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -17,6 +17,7 @@ const ticketNotesCrudRef = ref(null);
 const observationTypes = ref([]);
 const arrayData = useArrayData('TicketNotes');
 const { store } = arrayData;
+const isSaving = ref(false);
 
 const crudModelFilter = reactive({
     where: { ticketFk: route.params.id },
@@ -36,6 +37,14 @@ watch(
 function handleDelete(row) {
     ticketNotesCrudRef.value.remove([row]);
 }
+
+async function handleSave() {
+    if (!isSaving.value) {
+        isSaving.value = true;
+        await ticketNotesCrudRef.value?.saveChanges();
+        isSaving.value = false;
+    }
+}
 </script>
 
 <template>
@@ -76,6 +85,7 @@ function handleDelete(row) {
                             :label="t('ticketNotes.description')"
                             v-model="row.description"
                             class="col"
+                            @keyup.enter="handleSave"
                         />
                         <QIcon
                             name="delete"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2dc67872f..d87f6c402 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -585,7 +585,7 @@ watch(
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <div
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             style="border: 2px solid black"
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index c5bf7437e..45a870f7f 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -25,7 +25,7 @@ const { notify } = useNotify();
 
 const selected = ref([]);
 const defaultTaxClass = ref(null);
-
+const isSaving = ref(false);
 const crudModelFilter = computed(() => ({
     where: { ticketFk: route.params.id },
 }));
@@ -121,6 +121,14 @@ async function deleteService(row) {
         ticketServiceCrudRef.value.reload();
     }
 }
+
+async function handleSave() {
+    if (!isSaving.value) {
+        isSaving.value = true;
+        await ticketServiceCrudRef.value?.saveChanges();
+        isSaving.value = false;
+    }
+}
 </script>
 
 <template>
@@ -195,6 +203,7 @@ async function deleteService(row) {
                             v-model.number="row.price"
                             type="number"
                             min="0"
+                            @keyup.enter="handleSave"
                         />
                     </QTd>
                 </template>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 16769b4e1..2cf7ffc42 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -109,7 +109,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <QDrawer
         v-if="packingTypeVolume.length"
         side="right"
-        :width="270"
+        :width="265"
         v-model="stateStore.rightDrawer"
     >
         <QCard

From c9e4ab490d5ede89588842c4fdfb80c759be381c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 12:23:19 +0200
Subject: [PATCH 73/74] build: init version 2442

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ead0193c9..eaaa0b812 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.40.0",
+    "version": "24.42.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From d35b40a891d3c894b0e21e6881bc7216c41214ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 14:07:04 +0200
Subject: [PATCH 74/74] fix: vnTable color

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 52cd3ed47..f53f3c645 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -731,6 +731,10 @@ es:
     border-color: var(--vn-section-color);
 }
 
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));