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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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