From ad950f33c68fb6e18c65a974e482e80c771f3089 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 26 Jun 2024 08:27:36 -0300
Subject: [PATCH 1/7] WIP

---
 src/i18n/locale/en.yml                     |   1 +
 src/i18n/locale/es.yml                     |   1 +
 src/pages/Ticket/Card/TicketExpedition.vue | 244 +++++++++++++++++++++
 src/pages/Ticket/locale/en.yml             |  10 +
 src/pages/Ticket/locale/es.yml             |  10 +
 src/router/modules/ticket.js               |  25 ++-
 6 files changed, 286 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketExpedition.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d121dfb66..849f00c88 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -446,6 +446,7 @@ ticket:
         sale: Sale
         ticketAdvance: Advance tickets
         futureTickets: Future tickets
+        expedition: Expedition
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3654f4a72..6c722e43d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -445,6 +445,7 @@ ticket:
         sale: Lineas del pedido
         ticketAdvance: Adelantar tickets
         futureTickets: Tickets a futuro
+        expedition: Expedición
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
new file mode 100644
index 000000000..280e82b8a
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -0,0 +1,244 @@
+<script setup>
+import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter, useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketEditManaProxy from './TicketEditMana.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.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';
+
+const route = useRoute();
+const router = useRouter();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+const editPriceProxyRef = ref(null);
+
+const expeditions = ref([]);
+const selectedExpeditions = ref([]);
+const allColumnNames = ref([]);
+
+// const arrayData = useArrayData('ticketData');
+// const { store } = arrayData;
+
+// watch(
+//     () => route.params.id,
+//     async () => await getSales()
+// );
+
+const columns = computed(() => [
+    {
+        label: t('expedition.id'),
+        name: 'id',
+        field: 'id',
+        align: 'left',
+        sortable: true,
+        // columnFilter: {
+        //     component: VnInput,
+        //     type: 'text',
+        //     filterValue: null,
+        //     event: getInputEvents,
+        //     attrs: {
+        //         dense: true,
+        //     },
+        // },
+    },
+    {
+        label: t('expedition.item'),
+        name: 'item',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.name'),
+        name: 'name',
+        field: 'packageItemName',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.packageType'),
+        name: 'packageType',
+        field: 'freightItemName',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.counter'),
+        name: 'counter',
+        field: 'counter',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.externalId'),
+        name: 'externalId',
+        field: 'externalId',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        columnFilter: null,
+        format: (value) => toDateTimeFormat(value),
+    },
+    {
+        label: t('expedition.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: '',
+        name: 'history',
+        align: 'left',
+        columnFilter: null,
+    },
+]);
+
+const showLog = (expedition) => {};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    const filteredColumns = columns.value.filter((col) => col.name !== 'history');
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+    console.log('allColumnNames', allColumnNames.value);
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="Expeditions/filter"
+        auto-load
+        :filter="{ where: { ticketFk: route.params.id }, order: ['created DESC'] }"
+        @on-fetch="(data) => (expeditions = data)"
+    />
+
+    <VnSubToolbar>
+        <template #st-data>
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="expeditionIndex"
+                labels-traductions-path="expedition"
+                @on-config-saved="visibleColumns = [...$event, 'history']"
+            />
+        </template>
+    </VnSubToolbar>
+
+    <QTable
+        :rows="expeditions"
+        :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')"
+    >
+        <template #body-cell-item="{ row }">
+            <QTd auto-width @click.stop>
+                <QBtn flat color="primary">{{ row.packagingItemFk }}</QBtn>
+                <ItemDescriptorProxy :id="row.packagingItemFk" />
+            </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-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>
+
+    <!-- <QPageSticky :offset="[20, 20]">
+        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
+        <QTooltip class="text-no-wrap">
+            {{ t('Add item to basket') }}
+        </QTooltip>
+    </QPageSticky> -->
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index a89671a0c..04822df3e 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -80,3 +80,13 @@ futureTickets:
     moveTicketSuccess: Tickets moved successfully!
     searchInfo: Search future tickets by date
     futureTicket: Future tickets
+expedition:
+    id: Expedition
+    item: Item
+    name: Name
+    packageType: Package type
+    counter: Counter
+    externalId: externalId
+    created: Created
+    state: State
+    historyAction: Status log
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index ce52e18ba..7cbbd02bd 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -79,6 +79,16 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+expedition:
+    id: Expedición
+    item: Artículo
+    name: Nombre
+    packageType: Package type
+    counter: Contador
+    externalId: externalId
+    created: Fecha creación
+    state: Estado
+    historyAction: Historial de estados
 card:
     search: Buscar tickets
     searchInfo: Buscar tickets por identificador o alias
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 9c105be32..878396604 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,13 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList', 'TicketAdvance', 'TicketFuture'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketLog'],
+        card: [
+            'TicketBoxing',
+            'TicketSms',
+            'TicketSale',
+            'TicketLog',
+            'TicketExpedition',
+        ],
     },
     children: [
         {
@@ -94,13 +100,13 @@ export default {
                     component: () => import('src/pages/Ticket/Card/TicketSale.vue'),
                 },
                 {
-                    path: 'boxing',
-                    name: 'TicketBoxing',
+                    path: 'expedition',
+                    name: 'TicketExpedition',
                     meta: {
-                        title: 'boxing',
+                        title: 'expedition',
                         icon: 'vn:package',
                     },
-                    component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
+                    component: () => import('src/pages/Ticket/Card/TicketExpedition.vue'),
                 },
                 {
                     path: 'sms',
@@ -120,6 +126,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
                 },
+                {
+                    path: 'boxing',
+                    name: 'TicketBoxing',
+                    meta: {
+                        title: 'boxing',
+                        icon: 'vn:science',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
+                },
             ],
         },
     ],

From 053059997adb9ab687d9c55dc523fea5ae5912b8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 27 Jun 2024 08:37:48 -0300
Subject: [PATCH 2/7] WIP

---
 src/pages/Ticket/Card/ExpeditionNewTicket.vue |  78 +++++
 src/pages/Ticket/Card/TicketExpedition.vue    | 284 +++++++++++++++---
 src/pages/Ticket/locale/en.yml                |   8 +
 src/pages/Ticket/locale/es.yml                |   8 +
 4 files changed, 344 insertions(+), 34 deletions(-)
 create mode 100644 src/pages/Ticket/Card/ExpeditionNewTicket.vue

diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
new file mode 100644
index 000000000..da775a368
--- /dev/null
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -0,0 +1,78 @@
+<script setup>
+import { reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    ticket: {
+        type: Boolean,
+        default: false,
+    },
+    withRoute: {
+        type: Boolean,
+        default: false,
+    },
+    selectedExpeditions: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+
+const newTicketFormData = reactive({});
+
+const createTicket = async () => {
+    try {
+        const expeditionIds = $props.selectedExpeditions.map(
+            (expedition) => expedition.id
+        );
+        const params = {
+            clientId: $props.ticket.clientFk,
+            landed: newTicketFormData.landed,
+            warehouseId: $props.ticket.warehouseFk,
+            addressId: $props.ticket.addressFk,
+            agencyModeId: $props.ticket.agencyModeFk,
+            routeId: newTicketFormData.routeFk,
+            expeditionIds: expeditionIds,
+        };
+
+        const { data } = await axios.post('Expeditions/moveExpeditions', params);
+        notify(t('globals.dataSaved'), 'positive');
+        router.push({ name: 'TicketSummary', params: { id: data.id } });
+    } catch (error) {
+        console.error(error);
+    }
+};
+</script>
+
+<template>
+    <FormModelPopup
+        model="expeditionNewTicket"
+        :form-initial-data="newTicketFormData"
+        :save-fn="createTicket"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate :label="t('expedition.landed')" v-model="data.landed" />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-if="withRoute"
+                    :label="t('expedition.routeId')"
+                    v-model="data.routeFk"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 280e82b8a..002dc9b22 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -1,16 +1,17 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
+import { onMounted, ref, computed, onUnmounted, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter, useRoute } from 'vue-router';
+import { useRoute } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import 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';
@@ -21,25 +22,64 @@ import { toDateTimeFormat } from 'src/filters/date';
 import axios from 'axios';
 
 const route = useRoute();
-const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 const editPriceProxyRef = ref(null);
+const newTicketDialogRef = ref(null);
+const expeditionsFetchDataRef = ref(null);
+const logsTableDialogRef = ref(null);
 
-const expeditions = ref([]);
+const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
+const visibleColumns = ref([]);
+const newTicketWithRoute = ref(false);
+const itemsOptions = ref([]);
 
-// const arrayData = useArrayData('ticketData');
-// const { store } = arrayData;
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'expeditionFk':
+            return { id: value };
+        case 'packageItemName':
+            return { packagingItemFk: value };
+    }
+};
+
+const arrayData = useArrayData('ticketExpeditions', {
+    url: 'Expeditions/filter',
+    filter: { where: { ticketFk: route.params.id }, order: ['created DESC'] },
+    exprBuilder: exprBuilder,
+});
+const { store } = arrayData;
+const ticketExpeditions = computed(() => store.data);
 
 // watch(
 //     () => route.params.id,
 //     async () => await getSales()
 // );
 
+const params = reactive({});
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        await arrayData.addFilter({ 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(() => [
     {
         label: t('expedition.id'),
@@ -47,35 +87,65 @@ const columns = computed(() => [
         field: 'id',
         align: 'left',
         sortable: true,
-        // columnFilter: {
-        //     component: VnInput,
-        //     type: 'text',
-        //     filterValue: null,
-        //     event: getInputEvents,
-        //     attrs: {
-        //         dense: true,
-        //     },
-        // },
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterParamKey: 'expeditionFk',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('expedition.item'),
         name: 'item',
         align: 'left',
-        columnFilter: null,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterParamKey: 'packageItemName',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('expedition.name'),
         name: 'name',
         field: 'packageItemName',
         align: 'left',
-        columnFilter: null,
+        columnFilter: {
+            component: VnSelect,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemsOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
     },
     {
         label: t('expedition.packageType'),
         name: 'packageType',
         field: 'freightItemName',
         align: 'left',
-        columnFilter: null,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            // filterParamKey: 'expeditionFk',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         label: t('expedition.counter'),
@@ -114,13 +184,76 @@ const columns = computed(() => [
     },
 ]);
 
-const showLog = (expedition) => {};
+const logTableColumns = computed(() => [
+    {
+        label: t('expedition.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('expedition.name'),
+        name: 'name',
+        align: 'name',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        columnFilter: null,
+        format: (value) => toDateTimeFormat(value),
+    },
+]);
+
+const showNewTicketDialog = (withRoute = false) => {
+    newTicketWithRoute.value = withRoute;
+    newTicketDialogRef.value.show();
+};
+
+const deleteExpedition = async () => {
+    try {
+        const expeditionIds = selectedExpeditions.value.map(
+            (expedition) => expedition.id
+        );
+        const params = { expeditionIds };
+        await axios.post('Expeditions/deleteExpeditions', params);
+        expeditionsFetchDataRef.value.fetch();
+        selectedExpeditions.value = [];
+        notify(t('expedition.expeditionRemoved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const showLog = async (expedition) => {
+    await getExpeditionState(expedition);
+    logsTableDialogRef.value.show();
+};
+
+const getExpeditionState = async (expedition) => {
+    try {
+        const filter = {
+            where: { expeditionFk: expedition.id },
+            order: ['created DESC'],
+        };
+
+        const { data } = await axios.get(`ExpeditionStates/filter`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        expeditionsLogsData.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'history');
     allColumnNames.value = filteredColumns.map((col) => col.name);
-    console.log('allColumnNames', allColumnNames.value);
+    await arrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -128,12 +261,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 <template>
     <FetchData
-        url="Expeditions/filter"
+        url="Items"
         auto-load
-        :filter="{ where: { ticketFk: route.params.id }, order: ['created DESC'] }"
-        @on-fetch="(data) => (expeditions = data)"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemsOptions = data)"
     />
-
     <VnSubToolbar>
         <template #st-data>
             <TableVisibleColumns
@@ -143,10 +275,62 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 @on-config-saved="visibleColumns = [...$event, 'history']"
             />
         </template>
+        <template #st-actions>
+            <QBtnGroup push class="q-gutter-x-sm" flat>
+                <QBtnDropdown
+                    ref="btnDropdownRef"
+                    color="primary"
+                    :label="t('ticketSale.more')"
+                    :disable="!selectedExpeditions.length"
+                >
+                    <template #label>
+                        <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
+                    </template>
+                    <QList>
+                        <QItem
+                            clickable
+                            v-close-popup
+                            v-ripple
+                            @click="showNewTicketDialog(false)"
+                        >
+                            <QItemSection>
+                                <QItemLabel>{{
+                                    t('expedition.newTicketWithoutRoute')
+                                }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                        <QItem
+                            clickable
+                            v-close-popup
+                            v-ripple
+                            @click="showNewTicketDialog(true)"
+                        >
+                            <QItemSection>
+                                <QItemLabel>{{
+                                    t('expedition.newTicketWithRoute')
+                                }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </QBtnDropdown>
+                <QBtn
+                    :disable="!selectedExpeditions.length"
+                    icon="delete"
+                    color="primary"
+                    @click="
+                        openConfirmationModal(
+                            '',
+                            t('expedition.removeExpeditionSubtitle'),
+                            deleteExpedition
+                        )
+                    "
+                />
+            </QBtnGroup>
+        </template>
     </VnSubToolbar>
 
     <QTable
-        :rows="expeditions"
+        :rows="ticketExpeditions"
         :columns="columns"
         row-key="id"
         :pagination="{ rowsPerPage: 0 }"
@@ -156,6 +340,21 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :visible-columns="visibleColumns"
         :no-data-label="t('globals.noResults')"
     >
+        <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>
@@ -234,11 +433,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QTd>
         </template>
     </QTable>
-
-    <!-- <QPageSticky :offset="[20, 20]">
-        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
-        <QTooltip class="text-no-wrap">
-            {{ t('Add item to basket') }}
-        </QTooltip>
-    </QPageSticky> -->
+    <QDialog ref="newTicketDialogRef" transition-show="scale" transition-hide="scale">
+        <ExpeditionNewTicket
+            :ticket="ticketExpeditions"
+            :with-route="newTicketWithRoute"
+            :selected-expeditions="selectedExpeditions"
+        />
+    </QDialog>
+    <QDialog ref="logsTableDialogRef" transition-show="scale" transition-hide="scale">
+        <QTable
+            ref="tableRef"
+            data-key="TicketExpeditionLog"
+            :rows="expeditionsLogsData"
+            :filter="logTableFilter"
+            :columns="logTableColumns"
+            class="q-pa-sm"
+        >
+            <template #body-cell-name="{ row }">
+                <QTd auto-width>
+                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                    <WorkerDescriptorProxy :id="row.workerFk" />
+                </QTd>
+            </template>
+        </QTable>
+    </QDialog>
 </template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 04822df3e..151db3710 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -90,3 +90,11 @@ expedition:
     created: Created
     state: State
     historyAction: Status log
+    newTicketWithRoute: New ticket with route
+    newTicketWithoutRoute: New ticket without route
+    landed: Landed
+    routeId: Route id
+    deleteExpedition: Delete expedition
+    expeditionRemoved: Expedition removed
+    removeExpeditionSubtitle: Are you sure you want to delete this expedition?
+    worker: Worker
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 7cbbd02bd..eefd7a5d4 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -89,6 +89,14 @@ expedition:
     created: Fecha creación
     state: Estado
     historyAction: Historial de estados
+    newTicketWithRoute: Nuevo ticket con ruta
+    newTicketWithoutRoute: Nuevo ticket sin ruta
+    landed: F. entrega
+    routeId: Id ruta
+    deleteExpedition: Eliminar expedición
+    expeditionRemoved: Expedición eliminada
+    removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición?
+    worker: Trabajador
 card:
     search: Buscar tickets
     searchInfo: Buscar tickets por identificador o alias

From fe67f21206adb8ca5cdef203be03e2df279d6834 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 28 Jun 2024 08:27:21 -0300
Subject: [PATCH 3/7] Ticket expedition

---
 src/pages/Ticket/Card/TicketExpedition.vue | 45 ++++++++++++++--------
 src/pages/Ticket/locale/en.yml             |  1 +
 src/pages/Ticket/locale/es.yml             |  1 +
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 002dc9b22..b7d062f99 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, reactive } from 'vue';
+import { onMounted, ref, computed, onUnmounted, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -28,7 +28,6 @@ const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 const editPriceProxyRef = ref(null);
 const newTicketDialogRef = ref(null);
-const expeditionsFetchDataRef = ref(null);
 const logsTableDialogRef = ref(null);
 
 const expeditionsLogsData = ref([]);
@@ -47,18 +46,34 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const arrayData = useArrayData('ticketExpeditions', {
+const expeditionsFilter = computed(() => ({
+    where: { ticketFk: route.params.id },
+    order: ['created DESC'],
+}));
+
+const expeditionsArrayData = useArrayData('ticketExpeditions', {
     url: 'Expeditions/filter',
-    filter: { where: { ticketFk: route.params.id }, order: ['created DESC'] },
+    filter: expeditionsFilter.value,
     exprBuilder: exprBuilder,
 });
-const { store } = arrayData;
-const ticketExpeditions = computed(() => store.data);
+const expeditionsStore = expeditionsArrayData.store;
+const ticketExpeditions = computed(() => expeditionsStore.data);
 
-// watch(
-//     () => route.params.id,
-//     async () => await getSales()
-// );
+const ticketArrayData = useArrayData('ticketData');
+const ticketStore = ticketArrayData.store;
+const ticketData = computed(() => ticketStore.data);
+
+const refetchExpeditions = async () => {
+    await expeditionsArrayData.applyFilter({
+        params: { filter: JSON.stringify(expeditionsFilter.value) },
+    });
+};
+
+watch(
+    () => route.params.id,
+    async () => await refetchExpeditions(),
+    { immediate: true }
+);
 
 const params = reactive({});
 
@@ -66,7 +81,7 @@ const applyColumnFilter = async (col) => {
     try {
         const paramKey = col.columnFilter?.filterParamKey || col.field;
         params[paramKey] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params });
+        await expeditionsArrayData.addFilter({ params });
     } catch (err) {
         console.error('Error applying column filter', err);
     }
@@ -220,7 +235,7 @@ const deleteExpedition = async () => {
         );
         const params = { expeditionIds };
         await axios.post('Expeditions/deleteExpeditions', params);
-        expeditionsFetchDataRef.value.fetch();
+        await refetchExpeditions();
         selectedExpeditions.value = [];
         notify(t('expedition.expeditionRemoved'), 'positive');
     } catch (error) {
@@ -253,7 +268,7 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'history');
     allColumnNames.value = filteredColumns.map((col) => col.name);
-    await arrayData.fetch({ append: false });
+    // await expeditionsArrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -280,7 +295,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QBtnDropdown
                     ref="btnDropdownRef"
                     color="primary"
-                    :label="t('ticketSale.more')"
+                    :label="t('expedition.move')"
                     :disable="!selectedExpeditions.length"
                 >
                     <template #label>
@@ -435,7 +450,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QTable>
     <QDialog ref="newTicketDialogRef" transition-show="scale" transition-hide="scale">
         <ExpeditionNewTicket
-            :ticket="ticketExpeditions"
+            :ticket="ticketData"
             :with-route="newTicketWithRoute"
             :selected-expeditions="selectedExpeditions"
         />
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 151db3710..81ddce1c6 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -98,3 +98,4 @@ expedition:
     expeditionRemoved: Expedition removed
     removeExpeditionSubtitle: Are you sure you want to delete this expedition?
     worker: Worker
+    move: Move
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index eefd7a5d4..13ec0201e 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -97,6 +97,7 @@ expedition:
     expeditionRemoved: Expedición eliminada
     removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición?
     worker: Trabajador
+    move: Mover
 card:
     search: Buscar tickets
     searchInfo: Buscar tickets por identificador o alias

From d2ac7b993217cb4008b344866cfe2acce4ff20fc Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 1 Jul 2024 11:05:14 -0300
Subject: [PATCH 4/7] Handle empty response of default columns from backend

---
 src/components/common/TableVisibleColumns.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 7aa696a07..a4e4afafe 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -52,7 +52,7 @@ const toggleMarkAll = (val) => {
 
 const getConfig = async (url, filter) => {
     const response = await axios.get(url, {
-        params: { filter: filter },
+        params: { filter: JSON.stringify(filter) },
     });
     return response.data && response.data.length > 0 ? response.data[0] : null;
 };
@@ -60,7 +60,7 @@ const getConfig = async (url, filter) => {
 const fetchViewConfigData = async () => {
     try {
         const userConfigFilter = {
-            where: { tableCode: $props.tableCode, userFk: user.id },
+            where: { tableCode: $props.tableCode, userFk: user.value.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
@@ -74,8 +74,14 @@ const fetchViewConfigData = async () => {
         const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
         if (defaultConfig) {
+            // Si el backend devuelve una configuración por defecto la usamos
             setUserConfigViewData(defaultConfig.columns);
             return;
+        } else {
+            // Si no hay configuración por defecto mostramos todas las columnas
+            const defaultColumns = {};
+            $props.allColumns.forEach((col) => (defaultColumns[col] = true));
+            setUserConfigViewData(defaultColumns);
         }
     } catch (err) {
         console.err('Error fetching config view data', err);

From dfed21157840895f638a5412bcdf33eba7b4f7f1 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 1 Jul 2024 11:10:50 -0300
Subject: [PATCH 5/7] Fix bad git pull merge

---
 src/router/modules/ticket.js | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 11ca73407..7966ffa9a 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -52,24 +52,6 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },
-                {
-                    name: 'TicketAdvance',
-                    path: 'advance',
-                    meta: {
-                        title: 'ticketAdvance',
-                        icon: 'keyboard_double_arrow_left',
-                    },
-                    component: () => import('src/pages/Ticket/TicketAdvance.vue'),
-                },
-                {
-                    name: 'TicketAdvance',
-                    path: 'advance',
-                    meta: {
-                        title: 'ticketAdvance',
-                        icon: 'keyboard_double_arrow_left',
-                    },
-                    component: () => import('src/pages/Ticket/TicketAdvance.vue'),
-                },
                 {
                     path: 'weekly',
                     name: 'TicketWeekly',
@@ -89,8 +71,8 @@ export default {
                     component: () => import('src/pages/Ticket/TicketFuture.vue'),
                 },
                 {
-                    path: 'advance',
                     name: 'TicketAdvance',
+                    path: 'advance',
                     meta: {
                         title: 'ticketAdvance',
                         icon: 'keyboard_double_arrow_left',

From 71d650653933c290697cb88decef413391fd4f62 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 1 Jul 2024 11:13:36 -0300
Subject: [PATCH 6/7] remove unused filter

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

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index b7d062f99..bddfa2bfd 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -460,7 +460,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             ref="tableRef"
             data-key="TicketExpeditionLog"
             :rows="expeditionsLogsData"
-            :filter="logTableFilter"
             :columns="logTableColumns"
             class="q-pa-sm"
         >

From 95f2ddc6a45078bdb0c390a9e69e69b7df1e90cd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 18:24:31 +0200
Subject: [PATCH 7/7] fix: simple i18n

---
 src/pages/Ticket/Card/TicketSale.vue | 1 -
 src/pages/Ticket/locale/es.yml       | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 32408bf67..84f598d3c 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -774,6 +774,5 @@ es:
     Continue anyway?: ¿Continuar de todas formas?
     You are going to delete lines of the ticket: Vas a eliminar lineas del ticket
     Add item: Añadir artículo
-    Select lines to see the options: Selecciona líneas para ver las opciones
     Transfer lines: Transferir líneas
 </i18n>
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index df5ecd00c..a7006beea 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -185,3 +185,4 @@ expedition:
     move: Mover
 Search ticket: Buscar tickets
 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