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 01/46] 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 defd26fe914cccc519c180731b8dd26786a984dd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 26 Jun 2024 12:25:01 +0000
Subject: [PATCH 02/46] feat: define Sticky Button

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 493f1480e..cb691de69 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -66,6 +66,7 @@ const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();
 
+const filterPanel = ref(null);
 const DEFAULT_MODE = 'card';
 const TABLE_MODE = 'table';
 const mode = ref(DEFAULT_MODE);
@@ -191,7 +192,16 @@ defineExpose({
         show-if-above
     >
         <QScrollArea class="fit">
+          <QBtn
+                class="q-mt-lg q-mr-xs q-mb-lg"
+                round
+                color="primary"
+                style="position: fixed; z-index: 1; right: 0; bottom: 0"
+                icon="search"
+                @click="filterPanel.search()"
+            ></QBtn>
             <VnFilterPanel
+                ref="filterPanel"
                 :data-key="$attrs['data-key']"
                 :search-button="true"
                 v-model="params"

From a5a39455823e1302f09239001cf025ac7420571e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 26 Jun 2024 12:26:05 +0000
Subject: [PATCH 03/46] feat: remove button from panel

---
 src/components/ui/VnFilterPanel.vue | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 3c1a4c8a5..f6241ffe8 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -55,6 +55,7 @@ const $props = defineProps({
     },
 });
 
+defineExpose({ search });
 const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 
 const arrayData = useArrayData($props.dataKey, {
@@ -248,23 +249,6 @@ function formatValue(value) {
         <QList dense class="list q-gutter-y-sm q-mt-sm">
             <slot name="body" :params="params" :search-fn="search"></slot>
         </QList>
-        <template v-if="$props.searchButton">
-            <QItem>
-                <QItemSection class="q-py-sm">
-                    <QBtn
-                        :label="t('Search')"
-                        class="full-width"
-                        color="primary"
-                        dense
-                        icon="search"
-                        rounded
-                        :type="disableSubmitEvent ? 'button' : 'submit'"
-                        unelevated
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-        </template>
     </QForm>
     <QInnerLoading
         :label="t('globals.pleaseWait')"

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 04/46] 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 05/46] 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 06/46] 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 07/46] 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 08/46] 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 09/46] 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

From 9179dc7432f9b19761cdf95cdb25a4d2c528775a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jul 2024 09:35:18 -0300
Subject: [PATCH 10/46] Ticket package

---
 src/pages/Ticket/Card/TicketPackage.vue | 121 ++++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml          |   6 ++
 src/pages/Ticket/locale/es.yml          |   6 ++
 src/router/modules/ticket.js            |  10 ++
 4 files changed, 143 insertions(+)
 create mode 100644 src/pages/Ticket/Card/TicketPackage.vue

diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
new file mode 100644
index 000000000..959f45b81
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -0,0 +1,121 @@
+<script setup>
+import { ref, watch, computed, reactive } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+const ticketPackagingsCrudRef = ref(null);
+const listPackagingsOptions = ref([]);
+const arrayData = useArrayData('TicketPackagings');
+const { store } = arrayData;
+
+const crudModelFilter = reactive({
+    fields: ['id', 'ticketFk', 'packagingFk', 'quantity', 'created'],
+    where: { ticketFk: route.params.id },
+});
+
+const crudModelRequiredData = computed(() => ({
+    packagingFk: null,
+    quantity: null,
+    created: Date.vnNew(),
+    ticketFk: route.params.id,
+}));
+
+watch(
+    () => route.params.id,
+    async () => {
+        crudModelFilter.where.ticketFk = route.params.id;
+        store.filter = crudModelFilter;
+        await ticketPackagingsCrudRef.value.reload();
+    }
+);
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (listPackagingsOptions = data)"
+        auto-load
+        :filter="{ fields: ['packagingFk', 'name'], order: 'name ASC', limit: 30 }"
+        url="Packagings/listPackaging"
+    />
+    <div class="flex justify-center">
+        <CrudModel
+            ref="ticketPackagingsCrudRef"
+            data-key="TicketPackagings"
+            url="TicketPackagings"
+            model="TicketPackagings"
+            :filter="crudModelFilter"
+            :data-required="crudModelRequiredData"
+            :default-remove="false"
+            auto-load
+            style="max-width: 800px"
+        >
+            <template #body="{ rows }">
+                <QCard class="q-px-lg q-py-md">
+                    <div
+                        v-for="(row, index) in rows"
+                        :key="index"
+                        class="q-mb-md row items-center q-gutter-x-md"
+                    >
+                        <VnSelect
+                            :label="t('package.package')"
+                            :options="listPackagingsOptions"
+                            hide-selected
+                            option-label="name"
+                            option-value="packagingFk"
+                            v-model="row.packagingFk"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>{{ scope.opt?.name }} </QItemLabel>
+                                        <QItemLabel caption>
+                                            #{{ scope.opt?.itemFk }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                        <VnInput
+                            :label="t('package.quantity')"
+                            v-model="row.quantity"
+                            class="col"
+                        />
+                        <VnInputDate :label="t('package.added')" v-model="row.created" />
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="ticketPackagingsCrudRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('package.removePackage') }}
+                            </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>
+                </QCard>
+            </template>
+        </CrudModel>
+    </div>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 39aed4af7..1b9619fd3 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -164,3 +164,9 @@ tracking:
     worker: Worker
     created: Created
     addState: Add state
+package:
+    package: Package
+    quantity: Quantity
+    added: Added
+    addPackage: Add package
+    removePackage: Remove package
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index d5b50efc5..32744e557 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -164,5 +164,11 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+package:
+    package: Package
+    quantity: Cantidad
+    added: Añadido
+    addPackage: Añadir embalaje
+    removePackage: Quitar embalaje
 Search ticket: Buscar tickets
 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 1e635470b..e14fe7908 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -23,6 +23,7 @@ export default {
             'TicketTracking',
             'TicketVolume',
             'TicketNotes',
+            'TicketPackage',
         ],
     },
     children: [
@@ -188,6 +189,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
                 },
+                {
+                    path: 'package',
+                    name: 'TicketPackage',
+                    meta: {
+                        title: 'packages',
+                        icon: 'vn:bin',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
+                },
             ],
         },
     ],

From cdbbd576e379a45344c2c648217fa075e9b3ecc6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 2 Jul 2024 14:54:14 +0200
Subject: [PATCH 11/46] refactor: refs #6899 end invoiceOut migration with
 VnTable

---
 src/components/CreateManualInvoiceForm.vue    |  25 +-
 src/components/TransferInvoiceForm.vue        | 167 ++++----
 src/components/VnTable/VnTable.vue            |  16 +-
 src/components/ui/CardDescriptor.vue          |   5 +-
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  |   4 +-
 .../Card/InvoiceOutDescriptorMenu.vue         |  31 +-
 .../InvoiceOut/Card/InvoiceOutSummary.vue     |   8 +-
 src/pages/InvoiceOut/InvoiceOutFilter.vue     |   3 +-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     |   9 +-
 src/pages/InvoiceOut/InvoiceOutList.vue       | 379 ++++++++++--------
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 225 ++++++-----
 src/pages/InvoiceOut/locale/en.yml            |  25 ++
 src/pages/InvoiceOut/locale/es.yml            |  29 ++
 src/router/modules/invoiceOut.js              |   2 +-
 14 files changed, 527 insertions(+), 401 deletions(-)
 create mode 100644 src/pages/InvoiceOut/locale/en.yml

diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index 92399c20c..1aa95011f 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -46,22 +46,6 @@ const onDataSaved = async (formData, requestResponse) => {
         @on-fetch="(data) => (taxAreasOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Tickets"
-        :filter="{
-            fields: ['id', 'nickname'],
-            where: { refFk: null },
-            order: 'shipped DESC',
-        }"
-        @on-fetch="(data) => (ticketsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Clients"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (clientsOptions = data)"
-        auto-load
-    />
     <FormModelPopup
         ref="formModelPopupRef"
         :title="t('Create manual invoice')"
@@ -84,6 +68,10 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.ticketFk"
                     @update:model-value="data.clientFk = null"
+                    url="Tickets"
+                    :where="{ refFk: null }"
+                    :fields="['id', 'nickname']"
+                    :filter-options="{ order: 'shipped DESC' }"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -105,6 +93,9 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.clientFk"
                     @update:model-value="data.ticketFk = null"
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    :filter-options="{ order: 'name ASC' }"
                 />
                 <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
@@ -116,7 +107,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="description"
                     option-value="code"
                     v-model="data.serial"
-                    :required="true"
                 />
                 <VnSelect
                     :label="t('Area')"
@@ -125,7 +115,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="code"
                     option-value="code"
                     v-model="data.taxArea"
-                    :required="true"
                 />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index 1af23583d..f307aa1f4 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -8,7 +8,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
-
+import { useDialogPluginComponent } from 'quasar';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -18,7 +18,7 @@ const $props = defineProps({
         default: () => {},
     },
 });
-
+const { dialogRef } = useDialogPluginComponent();
 const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
@@ -70,14 +70,11 @@ const makeInvoice = async () => {
                     });
             });
             if (!response) {
-                console.log('entra cuando no checkbox');
                 return;
             }
         }
 
-        console.log('params: ', params);
         const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
-        console.log('data: ', data);
         notify(t('Transferred invoice'), 'positive');
         const id = data?.[0];
         if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
@@ -119,90 +116,92 @@ const makeInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
-    <FormPopup
+    <QDialog ref="dialogRef">
+        <FormPopup
         @on-submit="makeInvoice()"
         :title="t('Transfer invoice')"
         :custom-submit-button-label="t('Transfer client')"
         :default-cancel-button="false"
-    >
+        >
         <template #form-inputs>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
-                    :label="t('Client')"
-                    :options="clientsOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="transferInvoiceParams.newClientFk"
-                    :required="true"
-                    url="Clients"
-                    :fields="['id', 'name', 'hasToInvoiceByAddress']"
-                    auto-load
-                >
-                    <template #option="scope">
-                        <QItem
-                            v-bind="scope.itemProps"
-                            @click="selectedClient(scope.opt)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>
-                                    #{{ scope.opt?.id }} - {{ scope.opt?.name }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <VnSelect
-                    :label="t('Rectificative type')"
-                    :options="rectificativeTypeOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                    :required="true"
-                />
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
-                    :label="t('Class')"
-                    :options="siiTypeInvoiceOutsOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                    :required="true"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>
-                                    {{ scope.opt?.code }} -
-                                    {{ scope.opt?.description }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <VnSelect
-                    :label="t('Type')"
-                    :options="invoiceCorrectionTypesOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                    :required="true"
-                />
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div>
-                    <QCheckbox :label="t('Bill destination client')" v-model="checked" />
-                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                        <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
-                    </QIcon>
-                </div>
-            </VnRow>
-        </template>
-    </FormPopup>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('Client')"
+                        :options="clientsOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="transferInvoiceParams.newClientFk"
+                        :required="true"
+                        url="Clients"
+                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
+                        auto-load
+                    >
+                        <template #option="scope">
+                            <QItem
+                                v-bind="scope.itemProps"
+                                @click="selectedClient(scope.opt)"
+                            >
+                                <QItemSection>
+                                    <QItemLabel>
+                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('Rectificative type')"
+                        :options="rectificativeTypeOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('Class')"
+                        :options="siiTypeInvoiceOutsOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.code }} -
+                                        {{ scope.opt?.description }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('Type')"
+                        :options="invoiceCorrectionTypesOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div>
+                        <QCheckbox :label="t('Bill destination client')" v-model="checked" />
+                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+            </template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 493f1480e..8c00bb3f2 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    hasSubtoolbar: {
+        type: Boolean,
+        default: true,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -177,9 +181,12 @@ function columnName(col) {
 function getColAlign(col) {
     return 'text-' + (col.align ?? 'left')
 }
+
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     reload,
     redirect: redirectFn,
+    selected
 });
 </script>
 <template>
@@ -225,11 +232,14 @@ defineExpose({
             :search-url="searchUrl"
             :disable-infinite-scroll="mode == TABLE_MODE"
             @save-changes="reload"
-            :has-subtoolbar="isEditable"
+            :has-subtoolbar="$attrs['hasSubtoolbar'] ?? isEditable"
         >
+            <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+            </template>
             <template #body="{ rows }">
                 <QTable
-                    v-bind="$attrs['QTable']"
+                    v-bind="$attrs['q-table']"
                     class="vnTable"
                     :columns="splittedColumns.columns"
                     :rows="rows"
@@ -246,6 +256,7 @@ defineExpose({
                             CrudModelRef.vnPaginateRef.paginate()
                     "
                     @row-click="(_, row) => rowClickFunction(row)"
+                    @update:selected="$emit('update:selected', $event)"
                 >
                     <template #top-left>
                         <slot name="top-left"></slot>
@@ -477,6 +488,7 @@ defineExpose({
                         default="input"
                         v-model="data[column.name]"
                         :show-label="true"
+                        component-prop="columnCreate"
                     />
                     <slot name="more-create-dialog" :data="data" />
                 </div>
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8bb2a603e..c233247bb 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -46,6 +46,7 @@ let arrayData;
 let store;
 let entity;
 const isLoading = ref(false);
+const menuRef = ref({});
 
 defineExpose({ getData });
 
@@ -127,9 +128,9 @@ const emit = defineEmits(['onFetch']);
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu>
+                    <QMenu ref="menuRef">
                         <QList>
-                            <slot name="menu" :entity="entity" />
+                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>
                     </QMenu>
                 </QBtn>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index e01706e84..42b8d92d9 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -63,8 +63,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         @on-fetch="setData"
         data-key="invoiceOutData"
     >
-        <template #menu="{ entity }">
-            <InvoiceOutDescriptorMenu :invoice-out-data="entity" />
+        <template #menu="{ entity, menuRef }">
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 10af631bc..0d9e2aef6 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -11,13 +11,20 @@ import useNotify from 'src/composables/useNotify';
 import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
+import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 
+onBeforeMount(async () => (salixUrl.value = await getUrl('')));
+
 const $props = defineProps({
     invoiceOutData: {
         type: Object,
         default: () => {},
     },
+    menuRef: {
+        type: Object,
+        default: () => {},
+    },
 });
 
 const { notify } = useNotify();
@@ -28,8 +35,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
 const quasar = useQuasar();
-
-const transferInvoiceDialogRef = ref();
+const salixUrl = ref();
 const invoiceFormType = ref('pdf');
 const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
@@ -115,6 +121,7 @@ const refundInvoice = async (withWarehouse) => {
     try {
         const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
         const { data } = await axios.post('InvoiceOuts/refund', params);
+        location.href = `${salixUrl.value}ticket/${data[0].id}/sale`;
         notify(
             t('refundInvoiceSuccessMessage', {
                 refundTicket: data[0].id,
@@ -125,11 +132,21 @@ const refundInvoice = async (withWarehouse) => {
         console.error('Error generating invoice out pdf', err);
     }
 };
+
+const showTransferInvoiceForm = async () => {
+    $props.menuRef.hide();
+    quasar.dialog({
+        component: TransferInvoiceForm,
+        componentProps: {
+            invoiceOutData: $props.invoiceOutData,
+        },
+    })
+}
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="transferInvoiceDialogRef.show()">
-        <QItemSection>{{ t('Transfer invoice to...') }}</QItemSection>
+    <QItem v-ripple clickable>
+        <QItemSection @click="showTransferInvoiceForm()">{{ t('Transfer invoice to...') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection>{{ t('Show invoice...') }}</QItemSection>
@@ -222,10 +239,6 @@ const refundInvoice = async (withWarehouse) => {
             {{ t('Create a single ticket with all the content of the current invoice') }}
         </QTooltip>
     </QItem>
-
-    <QDialog ref="transferInvoiceDialogRef">
-        <TransferInvoiceForm :invoice-out-data="invoiceOutData" />
-    </QDialog>
 </template>
 
 <i18n>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index c773c43cf..8e344b1ca 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -3,7 +3,7 @@ import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { toCurrency, toDate } from 'src/filters';
+import { toCurrency, toDate, toPercentage } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -57,12 +57,14 @@ const taxColumns = ref([
         name: 'quantity',
         label: 'invoiceOut.summary.rate',
         field: (row) => row.rate,
+        format: (value) => toPercentage(value / 100),
         sortable: true,
     },
     {
         name: 'invoiceOuted',
         label: 'invoiceOut.summary.fee',
         field: (row) => row.vat,
+        format: (value) => toCurrency(value),
         sortable: true,
     },
 ]);
@@ -164,7 +166,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-item="{ value }">
                         <QTd>
-                            <QBtn flat color="primary">
+                            <QBtn flat class="link">
                                 {{ value }}
                                 <TicketDescriptorProxy :id="value" />
                             </QBtn>
@@ -172,7 +174,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-quantity="{ value, row }">
                         <QTd>
-                            <QBtn class="no-uppercase" flat color="primary" dense>
+                            <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
                                 <CustomerDescriptorProxy :id="row.id" />
                             </QBtn>
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 985bfb085..103e175ec 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -41,7 +41,7 @@ function setWorkers(data) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -93,7 +93,6 @@ function setWorkers(data) {
                 <QItemSection>
                     <QCheckbox
                         :label="t('Has PDF')"
-                        @update:model-value="searchFn()"
                         toggle-indeterminate
                         v-model="params.hasPdf"
                     />
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index a01af6b4b..eecc61bc2 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -30,7 +30,7 @@ const selectedCustomerId = ref(null);
 const tableColumnComponents = {
     clientId: {
         component: QBtn,
-        props: { flat: true, color: 'blue' },
+        props: { flat: true, class: 'link' },
         event: (prop) => selectCustomerId(prop.value),
     },
     clientName: {
@@ -52,7 +52,12 @@ const tableColumnComponents = {
 };
 
 const columns = computed(() => [
-    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        align: 'left',
+        name: 'clientId',
+        label: 'Id',
+        field: 'clientId',
+    },
     {
         label: t('invoiceOut.globalInvoices.table.client'),
         field: 'clientName',
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 536ee4971..40e0baf2f 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,74 +1,160 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import CreateManualInvoiceForm from 'src/components/CreateManualInvoiceForm.vue';
-
-import InvoiceOutFilter from './InvoiceOutFilter.vue';
-import { toDate, toCurrency } from 'src/filters/index';
-import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useSession } from 'src/composables/useSession';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import { toCurrency, toDate } from 'src/filters/index';
+import { useStateStore } from 'stores/useStateStore';
+import { QBtn } from 'quasar';
 
 const { t } = useI18n();
-const router = useRouter();
 const stateStore = useStateStore();
 const session = useSession();
 const tokenMultimedia = session.getTokenMultimedia();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const ticketsOptions = ref([]);
+const customerOptions = ref([]);
+const selectedRows = ref([]);
+const hasSelectedCards = computed(() => selectedRows.value.length > 0);
 
-const manualInvoiceDialogRef = ref(null);
-const selectedCards = ref(new Map());
-
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('invoiceOutList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'ref',
+        label: t('invoiceOutList.tableVisibleColumns.ref'),
+        isTitle: true,
+        component: 'select',
+        attrs: {
+            url: 'InvoiceOuts',
+            optionLabel: 'ref',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'Issued',
+        label: t('invoiceOutList.tableVisibleColumns.issued'),
+        component: 'date',
+        format: (row) => toDate(row.issued),
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'companyCode',
+        label: t('invoiceOutModule.company'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('invoiceOutModule.amount'),
+        cardVisible: true,
+        format: (row) => toCurrency(row.amount),
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('invoiceOutList.tableVisibleColumns.created'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.created),
+    },
+    {
+        align: 'left',
+        name: 'dued',
+        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.dued),
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('InvoiceOutSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, InvoiceOutSummary),
+            },
+            {
+                title: t('DownloadPdf'),
+                icon: 'vn:ticket',
+                isPrimary: true,
+                action: (row) => openPdf(row.id),
+            },
+        ],
+    },
+]);
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-function navigate(id) {
-    router.push({ path: `/invoice-out/${id}` });
-}
-
-const toggleIndividualCard = (cardData) => {
-    if (selectedCards.value.has(cardData.id)) {
-        selectedCards.value.delete(cardData.id);
-        return;
-    }
-    selectedCards.value.set(cardData.id, cardData);
-};
-
-const toggleAllCards = (cardsData) => {
-    const allSelected = selectedCards.value.size === cardsData.length;
-
-    if (!allSelected) {
-        // Si no todas las tarjetas están seleccionadas, selecciónalas todas
-        cardsData.forEach((data) => {
-            if (!selectedCards.value.has(data.id)) {
-                selectedCards.value.set(data.id, data);
-            }
-        });
-    } else {
-        // Si todas las tarjetas están seleccionadas, deselecciónalas todas
-        selectedCards.value.clear();
-    }
-};
-
-const openPdf = () => {
+function openPdf(id) {
     try {
-        if (selectedCards.value.size === 0) return;
-        const selectedCardsArray = Array.from(selectedCards.value.values());
-
-        if (selectedCards.value.size === 1) {
-            const [invoiceOut] = selectedCardsArray;
-            const url = `api/InvoiceOuts/${invoiceOut.id}/download?access_token=${tokenMultimedia}`;
+            const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
             window.open(url, '_blank');
+    } catch (err) {
+        console.error('Error opening PDF', err);
+    }
+};
+
+function downloadPdf() {
+    try {
+        if (selectedRows.value.size === 0) return;
+        const selectedCardsArray = Array.from(selectedRows.value.values());
+
+        if (selectedRows.value.size === 1) {
+            const [invoiceOut] = selectedCardsArray;
+            openPdf(invoiceOut.id);
         } else {
             const invoiceOutIdsArray = selectedCardsArray.map(
                 (invoiceOut) => invoiceOut.id
@@ -86,11 +172,9 @@ const openPdf = () => {
     } catch (err) {
         console.error('Error opening PDF');
     }
-};
+}
 
-const openCreateInvoiceModal = () => {
-    manualInvoiceDialogRef.value.show();
-};
+watch(selectedRows, { deep: true });
 </script>
 
 <template>
@@ -99,115 +183,80 @@ const openCreateInvoiceModal = () => {
         :label="t('searchInvoice')"
         data-key="InvoiceOutList"
     />
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutFilter data-key="InvoiceOutList" />
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn color="primary" icon-right="cloud_download" @click="downloadPdf()" :disable="!hasSelectedCards">
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
         </template>
-    </RightMenu>
-    <QPage>
-        <VnPaginate
-            auto-load
-            data-key="InvoiceOutList"
-            :order="['issued DESC', 'id DESC']"
-            url="InvoiceOuts/filter"
-        >
-            <template #body="{ rows }">
-                <VnSubToolbar class="justify-end">
-                    <template #st-actions>
-                        <QBtn
-                            @click="openPdf()"
-                            class="q-mr-md"
-                            color="primary"
-                            icon="cloud_download"
-                            :disable="selectedCards.size === 0"
-                        >
-                            <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
-                        </QBtn>
-                        <QCheckbox
-                            left-label
-                            :label="t('globals.markAll')"
-                            @click="toggleAllCards(rows)"
-                            :model-value="selectedCards.size === rows.length"
-                            class="q-mr-md"
-                        />
-                    </template>
-                </VnSubToolbar>
-                <div class="flex flex-center q-pa-md">
-                    <div class="vn-card-list">
-                        <CardList
-                            :element="row"
-                            :id="row.id"
-                            :show-checkbox="true"
-                            :is-selected="selectedCards.has(row.id)"
-                            :key="row.id"
-                            :title="row.ref"
-                            @click="navigate(row.id)"
-                            @toggle-card-check="toggleIndividualCard(row)"
-                            v-for="row of rows"
-                        >
-                            <template #list-items>
-                                <VnLv
-                                    :label="t('invoiceOut.list.issued')"
-                                    :value="toDate(row.issued)"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.amount')"
-                                    :value="toCurrency(row.amount)"
-                                />
-                                <VnLv :label="t('invoiceOut.list.client')">
-                                    <template #value>
-                                        <span class="link" @click.stop>
-                                            {{ row?.clientSocialName }}
-                                            <CustomerDescriptorProxy
-                                                :id="row?.clientFk"
-                                            />
-                                        </span>
-                                    </template>
-                                </VnLv>
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortCreated')"
-                                    :title-label="t('invoiceOut.list.created')"
-                                    :value="toDate(row.created)"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.company')"
-                                    :value="row.companyCode"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortDued')"
-                                    :title-label="t('invoiceOut.list.dued')"
-                                    :value="toDate(row.dued)"
-                                />
-                            </template>
-                            <template #actions>
-                                <QBtn
-                                    :label="t('components.smartCard.openSummary')"
-                                    @click.stop="viewSummary(row.id, InvoiceOutSummary)"
-                                    color="primary"
-                                    style="margin-top: 15px"
-                                    type="submit"
-                                />
-                            </template>
-                        </CardList>
-                    </div>
-                </div>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="openCreateInvoiceModal()" />
-            <QTooltip>
-                {{ t('createInvoice') }}
-            </QTooltip>
-        </QPageSticky>
+    </VnSubToolbar>
+    <VnTable
+        ref="tableRef"
+        data-key="invoiceOut"
+        url="InvoiceOuts/filter"
+        :create="{
+            urlCreate: 'InvoiceOuts/createManualInvoice',
+            title: t('Create Manual Invoice'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {
+                active: true,
+            },
+        }"
+        v-model:selected="selectedRows"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        redirect="invoice-out"
+        auto-load
+        :q-table="{
+            'row-key':'id',
+            selection:'multiple'
+        }" 
 
-        <QDialog
-            ref="manualInvoiceDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <CreateManualInvoiceForm />
-        </QDialog>
-    </QPage>
+    >
+    <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Tickets"
+                v-model="data.ticketFk"
+                :label="t('invoiceOutList.tableVisibleColumns.ticket')"
+                :options="ticketsOptions"
+                option-label="nickname"
+                option-value="id"
+            />
+            <VnSelect
+                url="Clients"
+                v-model="data.clientFk"
+                :label="t('invoiceOutModule.customer')"
+                :options="customerOptions"
+                option-label="name"
+                option-value="id"
+            />
+            <VnInputDate
+                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
+                v-model="data.maxShipped"
+            />
+            <VnSelect
+                url="InvoiceOutSerials"
+                v-model="data.invoiceOutSerial"
+                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
+                :options="invoiceOutSerialsOptions"
+                option-label="description"
+                option-value="code"
+            />
+            <VnSelect
+                url="TaxAreas"
+                v-model="data.area"
+                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                :options="taxAreasOptions"
+                option-label="code"
+                option-value="code"
+            />
+            <QInput
+                v-model="data.reference"
+                :label="t('invoiceOutList.tableVisibleColumns.ref')"
+            />
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
@@ -223,4 +272,4 @@ es:
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
     createInvoice: Crear factura
-</i18n>
+</i18n>
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 84a79661e..d94661849 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,21 +1,19 @@
 <script setup>
-import { computed, onBeforeMount } from 'vue';
+import { computed, ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { toCurrency } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
-import { useStateStore } from 'stores/useStateStore';
-import { useArrayData } from 'composables/useArrayData';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+// import useStateStore from 'src/stores/useStateStore';
 
-const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
-const stateStore = useStateStore();
 const { t } = useI18n();
-
+const tableRef = ref();
+// const userFrom = Date.vnFirstDayOfMonth().toISOString();
+// const userTo = Date.vnLastDayOfMonth().toISOString();
+const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
+// const stateStore = useStateStore();
 const arrayData = useArrayData('InvoiceOutNegative', {
     url: 'InvoiceOuts/negativeBases',
     limit: 0,
@@ -36,165 +34,170 @@ const arrayData = useArrayData('InvoiceOutNegative', {
 
 onBeforeMount(async () => {
     await arrayData.fetch({ append: false });
-    stateStore.rightDrawer = true;
+    // stateStore.rightDrawer = true;
 });
 
 const columns = computed(() => [
     {
-        label: t('invoiceOut.negativeBases.company'),
-        field: 'company',
+        align: 'left',
         name: 'company',
-        align: 'left',
+        label: t('invoiceOutModule.company'),
+        component: 'select',
+        cardVisible: true,
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
-        label: t('invoiceOut.negativeBases.country'),
-        field: 'country',
+        align: 'left',
         name: 'country',
-        align: 'left',
+        label: t('negativeBases.country'),
+        component: 'select',
+        attrs: {
+            url: 'Countries',
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
-        label: t('invoiceOut.negativeBases.clientId'),
-        field: 'clientId',
+        align: 'left',
         name: 'clientId',
-        align: 'left',
+        label: t('negativeBases.clientId'),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.client'),
-        field: 'clientSocialName',
-        name: 'client',
         align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        component: 'select',
+        isTitle: true,
+        cardVisible: true,
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        }
     },
     {
-        label: t('invoiceOut.negativeBases.amount'),
-        field: 'amount',
+        align: 'left',
         name: 'amount',
-        align: 'left',
-        format: (value) => toCurrency(value),
+        label: t('invoiceOutModule.amount'),
+        format: (row) => toCurrency(row.amount),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.base'),
-        field: 'taxableBase',
-        name: 'base',
         align: 'left',
+        name: 'taxableBase',
+        label: t('negativeBases.base'),
     },
     {
-        label: t('invoiceOut.negativeBases.ticketId'),
-        field: 'ticketFk',
-        name: 'ticketId',
         align: 'left',
+        name: 'ticketFk',
+        label: t('negativeBases.ticketId'),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.active'),
-        field: 'isActive',
-        name: 'active',
         align: 'left',
+        name: 'isActive',
+        label: t('negativeBases.active'),
     },
     {
-        label: t('invoiceOut.negativeBases.hasToInvoice'),
-        field: 'hasToInvoice',
+        align: 'left',
         name: 'hasToInvoice',
-        align: 'left',
+        label: t('negativeBases.hasToInvoice'),
     },
     {
-        label: t('invoiceOut.negativeBases.verifiedData'),
-        field: 'isTaxDataChecked',
-        name: 'verifiedData',
         align: 'left',
+        name: 'hasVerifiedData',
+        label: t('negativeBases.verifiedData'),
     },
     {
-        label: t('invoiceOut.negativeBases.comercial'),
-        field: 'workerName',
-        name: 'worker',
         align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'workerName',
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.workerName),
     },
 ]);
 
 const downloadCSV = async () => {
-    const params = {}; // filter.value;
+    console.log('arrayData from: ', arrayData.store.userParams.from);
+    console.log('arrayData to: ', arrayData.store.userParams.to);
     const filterParams = {
         limit: 20,
         where: {
             and: [],
         },
     };
-    for (const param in params) {
-        if (params[param]) filterParams.where.and.push({ [param]: params[param] });
-    }
+
+    for (const [key, value] of Object.entries(arrayData.store.userParams)) {
+        if (value) {
+          filterParams.where.and.push({ [key]: value });
+        }
+    };
 
     await invoiceOutGlobalStore.getNegativeBasesCsv(
-        arrayData.value.store.userParams.from,
-        arrayData.value.store.userParams.to,
-        params
+        arrayData.store.userParams.from,
+        arrayData.store.userParams.to,
+        filterParams
     );
 };
 </script>
 <template>
     <VnSubToolbar>
         <template #st-actions>
-            <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
+            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
                 <QTooltip>{{ t('Download as CSV') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="arrayData.store.data"
-            row-key="clientId"
-            class="full-width q-mt-md"
-        >
-            <template #body-cell-clientId="{ row }">
-                <QTd>
-                    <QBtn flat dense class="link"> {{ row.clientId }}</QBtn>
-                    <CustomerDescriptorProxy :id="row.clientId" />
-                </QTd>
-            </template>
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
-                    <QBtn flat dense class="link"> {{ row.ticketFk }}</QBtn>
-                    <TicketDescriptorProxy :id="row.ticketFk" />
-                </QTd>
-            </template>
-            <template #body-cell-worker="{ row }">
-                <QTd>
-                    <QBtn class="no-uppercase link" flat dense>{{ row.workerName }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.comercialId" />
-                </QTd>
-            </template>
-            <template #body-cell-active="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isActive" disable />
-                </QTd>
-            </template>
-            <template #body-cell-hasToInvoice="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.hasToInvoice" disable />
-                </QTd>
-            </template>
-            <template #body-cell-verifiedData="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isTaxDataChecked" disable />
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
+    <VnTable
+        ref="tableRef"
+        data-key="invoiceOut"
+        url="InvoiceOuts/negativeBases"
+        :user-params="arrayData.store.userParams"
+        :expr-builder="(param, value) => {
+            switch (param) {
+                case 'from':
+                case 'to':
+                    return;
+                default:
+                    return { [param]: value };
+            }
+        }"
+        :limit="0"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        :is-editable="false"
+        :use-model="true"
+    >
+        <!-- <template #moreBeforeActions>
+            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
+                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
+            </QBtn>
+        </template> -->
+    </VnTable>
 </template>
 
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-.no-uppercase {
-    text-transform: none;
-}
-</style>
-
 <i18n>
 es:
     Download as CSV: Descargar como CSV
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
new file mode 100644
index 000000000..5ad92ed09
--- /dev/null
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -0,0 +1,25 @@
+invoiceOutModule:
+    customer: Client
+    amount: Amount
+    company: Company
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Reference
+        issued: Issued
+        created: Created
+        dueDate: Max date
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Tax area
+DownloadPdf: Download PDF
+InvoiceOutSummary: Summary
+negativeBases:
+        country: Country
+        clientId: Client ID
+        base: Base
+        ticketId: Ticket
+        active: Active
+        hasToInvoice: Has to invoice
+        verifiedData: Verified data
+        commercial: Commercial
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index b936c7b7e..a05125630 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -1,2 +1,31 @@
 Search invoice: Buscar factura emitida
 You can search by invoice reference: Puedes buscar por referencia de la factura
+invoiceOutModule:
+    customer: Cliente
+    amount: Importe
+    company: Empresa
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Referencia
+        issued: Fecha emisión
+        customer: Cliente
+        company: Empresa
+        amount: Importe
+        created: F. creación
+        dueDate: F. máxima
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Area
+DownloadPdf: Descargar PDF
+InvoiceOutSummary: Resumen
+negativeBases:
+        country: País
+        clientId: ID del cliente
+        client: Cliente
+        base: Base
+        ticketId: Ticket
+        active: Activo
+        hasToInvoice: Debe facturar
+        verifiedData: Datos verificados
+        commercial: Comercial
\ No newline at end of file
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 7c05b82e6..aac84573c 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -35,7 +35,7 @@ export default {
                     name: 'InvoiceOutGlobal',
                     meta: {
                         title: 'globalInvoicing',
-                        icon: 'contact_support',
+                        icon: 'Date_Range',
                     },
                     component: () => import('src/pages/InvoiceOut/InvoiceOutGlobal.vue'),
                 },

From 5c36ad14f48fed04134221bb94f37431bfa6cf8a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jul 2024 21:33:19 -0300
Subject: [PATCH 12/46] Ticket components

---
 src/i18n/locale/en.yml                     |   1 +
 src/i18n/locale/es.yml                     |   1 +
 src/pages/Ticket/Card/TicketComponents.vue | 356 +++++++++++++++++++++
 src/pages/Ticket/Card/TicketDescriptor.vue |  17 +
 src/pages/Ticket/locale/en.yml             |  18 ++
 src/pages/Ticket/locale/es.yml             |  18 ++
 src/router/modules/ticket.js               |  10 +
 7 files changed, 421 insertions(+)
 create mode 100644 src/pages/Ticket/Card/TicketComponents.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 59cd1170a..c26100699 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -452,6 +452,7 @@ ticket:
         weeklyTickets: Weekly tickets
         services: Service
         tracking: Tracking
+        components: Components
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e35e3d41c..58b0d900b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -451,6 +451,7 @@ ticket:
         weeklyTickets: Tickets programados
         services: Servicios
         tracking: Estados
+        components: Componentes
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
new file mode 100644
index 000000000..85d2179a2
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -0,0 +1,356 @@
+<script setup>
+import { ref, computed, onMounted, 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 ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.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';
+
+const route = useRoute();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const salesRef = ref(null);
+const arrayData = useArrayData('ticketData');
+const { store } = arrayData;
+
+const ticketData = computed(() => store.data);
+const components = ref([]);
+const componentsList = ref([]);
+const theoricalCost = ref(0);
+const ticketVolume = ref(null);
+
+watch(
+    () => ticketData.value,
+    async () => {
+        await nextTick();
+        salesRef.value.fetch();
+        getComponentsSum();
+        getTheoricalCost();
+        if (ticketData.value?.zone && ticketData.value?.zone?.isVolumetric)
+            getTicketVolume();
+    }
+);
+
+const salesFilter = computed(() => ({
+    order: 'concept ASC',
+    include: [
+        {
+            relation: 'item',
+        },
+        {
+            relation: 'components',
+            scope: {
+                fields: ['componentFk', 'value'],
+                include: {
+                    relation: 'component',
+                    scope: {
+                        fields: ['typeFk', 'name'],
+                        include: {
+                            relation: 'componentType',
+                            scope: {
+                                fields: ['type', 'isBase'],
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ],
+    where: { ticketFk: route.params.id },
+}));
+
+const columns = computed(() => [
+    {
+        label: t('components.item'),
+        name: 'item',
+        align: 'left',
+    },
+    {
+        label: t('components.description'),
+        name: 'description',
+        align: 'left',
+    },
+    {
+        label: t('components.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('components.serie'),
+        name: 'serie',
+        align: 'left',
+    },
+    {
+        label: t('components.components'),
+        name: 'components',
+        align: 'left',
+    },
+    {
+        label: t('components.import'),
+        name: 'import',
+        align: 'left',
+    },
+    {
+        label: t('components.total'),
+        name: 'total',
+        align: 'left',
+    },
+]);
+
+const getBase = computed(() => {
+    let sum = 0;
+    for (let sale of components.value) {
+        for (let saleComponent of sale.components) {
+            if (saleComponent.component.componentType.isBase) {
+                sum += sale.quantity * saleComponent.value;
+            }
+        }
+    }
+    return sum;
+});
+
+const getTotal = computed(() => {
+    let total = 0;
+    for (let sale of components.value) {
+        for (let saleComponent of sale.components) {
+            total += sale.quantity * saleComponent.value;
+        }
+    }
+    return total;
+});
+
+const getComponentsSum = async () => {
+    try {
+        const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
+        componentsList.value = data;
+        console.log('componentsList', componentsList.value);
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getTheoricalCost = async () => {
+    try {
+        const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
+        theoricalCost.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getTicketVolume = async () => {
+    try {
+        if (!ticketData.value) return;
+        const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
+        console.log('data volume: ', data);
+        ticketVolume.value = data[0].volume;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+onMounted(() => {
+    stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        ref="salesRef"
+        url="sales"
+        :filter="salesFilter"
+        @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"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('components.total') }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="justify-center" horizontal>
+                    <span class="q-mr-xs color-vn-label"
+                        >{{ t('components.baseToCommission') }}:
+                    </span>
+                    <span>{{ toCurrency(getBase) }}</span>
+                </QCardSection>
+                <QCardSection class="justify-center" horizontal>
+                    <span class="q-mr-xs color-vn-label"
+                        >{{ t('components.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('components.components') }}
+                    </span>
+                </QCardSection>
+                <QCardSection
+                    v-for="(component, index) in componentsList"
+                    :key="index"
+                    class="justify-center"
+                    horizontal
+                >
+                    <span class="q-mr-xs color-vn-label"> {{ component.name }}: </span>
+                    <span>{{ 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('components.zoneBreakdown') }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="justify-center" horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('components.price') }}:
+                    </span>
+                    <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
+                </QCardSection>
+                <QCardSection class="justify-center" horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('components.bonus') }}:
+                    </span>
+                    <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
+                </QCardSection>
+                <QCardSection class="justify-center" horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('components.zone') }}:
+                    </span>
+                    <span class="link">
+                        {{ dashIfEmpty(ticketData?.zone?.name) }}
+                        <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
+                    </span>
+                </QCardSection>
+                <QCardSection
+                    v-if="ticketData?.zone?.isVolumetric"
+                    class="justify-center"
+                    horizontal
+                >
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('components.volume') }}:
+                    </span>
+                    <span>{{ ticketVolume }}</span>
+                </QCardSection>
+                <QCardSection class="justify-center" horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('components.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('components.theoricalCost') }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="justify-center" horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('components.totalPrice') }}:
+                    </span>
+                    <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
+                </QCardSection>
+            </QCard>
+        </template>
+    </RightMenu>
+    <QTable
+        :rows="components"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell-item="{ row }">
+            <QTd>
+                <QBtn flat color="primary">
+                    {{ row.itemFk }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd>
+                <div class="column">
+                    <span>{{ row.item.name }}</span>
+                    <span class="color-vn-label">{{ row.item.subName }}</span>
+                    <FetchedTags :item="row.item" :max-length="6" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-serie="{ row }">
+            <QTd>
+                <div class="column">
+                    <span v-for="(saleComponent, index) in row.components" :key="index">
+                        {{ saleComponent.component?.componentType?.type }}
+                    </span>
+                </div>
+            </QTd>
+        </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>
+        <template #body-cell-import="{ row }">
+            <QTd>
+                <div class="column">
+                    <span v-for="(saleComponent, index) in row.components" :key="index">
+                        {{ toCurrency(saleComponent.value, 'EUR', 3) }}
+                    </span>
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-total="{ row }">
+            <QTd>
+                <div class="column">
+                    <span v-for="(saleComponent, index) in row.components" :key="index">
+                        {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
+                    </span>
+                </div>
+            </QTd>
+        </template>
+    </QTable>
+</template>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 5fb312b28..100e24058 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -66,6 +66,23 @@ const filter = {
                 fields: ['id', 'name'],
             },
         },
+        {
+            relation: 'zone',
+            scope: {
+                fields: [
+                    'agencyModeFk',
+                    'bonus',
+                    'hour',
+                    'id',
+                    'isVolumetric',
+                    'itemMaxSize',
+                    'm3Max',
+                    'name',
+                    'price',
+                    'travelingDays',
+                ],
+            },
+        },
     ],
 };
 
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 39aed4af7..90a3e67b7 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -159,6 +159,24 @@ service:
     addService: Add service
     quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
     createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
+components:
+    item: Item
+    description: Description
+    quantity: Quantity
+    serie: Serie
+    components: Components
+    import: Import
+    total: Total
+    baseToCommission: Base to commission
+    totalWithoutVat: Total without VAT
+    zoneBreakdown: Zone breakdown
+    price: Price
+    bonus: Bonus
+    zone: Zone
+    volume: Volume
+    theoricalCost: Theorical cost
+    totalPrice: Total price
+    packages: Packages
 tracking:
     state: State
     worker: Worker
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index d5b50efc5..370d3433d 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -164,5 +164,23 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+components:
+    item: Artículo
+    description: Descripción
+    quantity: Cantidad
+    serie: Serie
+    components: Componentes
+    import: Importe
+    total: Total
+    baseToCommission: Base comisionable
+    totalWithoutVat: Total sin IVA
+    zoneBreakdown: Desglose zona
+    price: Precio
+    bonus: Bonificación
+    zone: Zona
+    volume: Volúmen
+    theoricalCost: Porte teórico
+    totalPrice: Precio total
+    packages: Bultos
 Search ticket: Buscar tickets
 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 1e635470b..1a9a7d557 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -23,6 +23,7 @@ export default {
             'TicketTracking',
             'TicketVolume',
             'TicketNotes',
+            'TicketComponents',
         ],
     },
     children: [
@@ -179,6 +180,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
                 },
+                {
+                    path: 'components',
+                    name: 'TicketComponents',
+                    meta: {
+                        title: 'components',
+                        icon: 'vn:components',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketComponents.vue'),
+                },
                 {
                     path: 'observation',
                     name: 'TicketNotes',

From 10f5323b9a82fdc41afaec03b181532021fe9b73 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 3 Jul 2024 09:45:59 +0200
Subject: [PATCH 13/46] refactor: refs #6899 fix negativeBases call

---
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 79 +++++++------------
 src/stores/invoiceOutGlobal.js                |  2 +-
 2 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index d94661849..61e63a7a7 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,41 +1,20 @@
 <script setup>
-import { computed, ref, onBeforeMount } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { toCurrency } from 'src/filters';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { useArrayData } from 'src/composables/useArrayData';
-// import useStateStore from 'src/stores/useStateStore';
 
 const { t } = useI18n();
 const tableRef = ref();
-// const userFrom = Date.vnFirstDayOfMonth().toISOString();
-// const userTo = Date.vnLastDayOfMonth().toISOString();
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
-// const stateStore = useStateStore();
-const arrayData = useArrayData('InvoiceOutNegative', {
-    url: 'InvoiceOuts/negativeBases',
-    limit: 0,
-    userParams: {
-        from: Date.vnFirstDayOfMonth().toISOString(),
-        to: Date.vnLastDayOfMonth().toISOString(),
-    },
-    exprBuilder: (param, value) => {
-        switch (param) {
-            case 'from':
-            case 'to':
-                return;
-            default:
-                return { [param]: value };
-        }
-    },
-});
-
-onBeforeMount(async () => {
-    await arrayData.fetch({ append: false });
-    // stateStore.rightDrawer = true;
-});
+const userParams = {
+    from: Date.vnFirstDayOfMonth().toISOString(),
+    to: Date.vnLastDayOfMonth().toISOString(),
+};
+useArrayData('InvoiceOutNegative', { userParams });
 
 const columns = computed(() => [
     {
@@ -51,7 +30,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         align: 'left',
@@ -65,7 +44,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         align: 'left',
@@ -86,7 +65,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         align: 'left',
@@ -139,8 +118,6 @@ const columns = computed(() => [
 ]);
 
 const downloadCSV = async () => {
-    console.log('arrayData from: ', arrayData.store.userParams.from);
-    console.log('arrayData to: ', arrayData.store.userParams.to);
     const filterParams = {
         limit: 20,
         where: {
@@ -148,15 +125,15 @@ const downloadCSV = async () => {
         },
     };
 
-    for (const [key, value] of Object.entries(arrayData.store.userParams)) {
+    for (const [key, value] of Object.entries(userParams)) {
         if (value) {
-          filterParams.where.and.push({ [key]: value });
+            filterParams.where.and.push({ [key]: value });
         }
-    };
+    }
 
     await invoiceOutGlobalStore.getNegativeBasesCsv(
-        arrayData.store.userParams.from,
-        arrayData.store.userParams.to,
+        userParams.from,
+        userParams.to,
         filterParams
     );
 };
@@ -171,30 +148,28 @@ const downloadCSV = async () => {
     </VnSubToolbar>
     <VnTable
         ref="tableRef"
-        data-key="invoiceOut"
+        data-key="negativeFilter"
         url="InvoiceOuts/negativeBases"
-        :user-params="arrayData.store.userParams"
-        :expr-builder="(param, value) => {
-            switch (param) {
-                case 'from':
-                case 'to':
-                    return;
-                default:
-                    return { [param]: value };
+        :user-params="userParams"
+        :expr-builder="
+            (param, value) => {
+                switch (param) {
+                    case 'from':
+                    case 'to':
+                        return;
+                    default:
+                        return { [param]: value };
+                }
             }
-        }"
+        "
         :limit="0"
         :columns="columns"
         default-mode="table"
         auto-load
         :is-editable="false"
         :use-model="true"
+        :order="''"
     >
-        <!-- <template #moreBeforeActions>
-            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
-                <QTooltip>{{ t('Download as CSV') }}</QTooltip>
-            </QBtn>
-        </template> -->
     </VnTable>
 </template>
 
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index b1bcc0e7d..bb9a3d376 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -237,7 +237,7 @@ export const useInvoiceOutGlobalStore = defineStore({
         async getNegativeBasesCsv() {
             try {
                 const arrayData = useArrayData('InvoiceOutNegative');
-                const params = arrayData.store.currentFilter;
+                const params = arrayData.store.userParams;
 
                 const { data } = await axios.get('InvoiceOuts/negativeBasesCsv', {
                     params,

From 825e4497d288aaaa7253edbe9f0196298a3407ac Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 14:18:24 +0200
Subject: [PATCH 14/46] feat: handle request when unauthorized

---
 src/composables/useSession.js | 42 ++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index ca2abef00..10791c9c8 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -58,31 +58,37 @@ export function useSession() {
             }
         }
     }
-    async function destroy() {
+    async function destroy(destroyTokens = true) {
         const tokens = {
             tokenMultimedia: 'Accounts/logout',
             token: 'VnUsers/logout',
         };
         const storage = keepLogin() ? localStorage : sessionStorage;
+        let destroyTokenPromises = [];
+        try {
+            if (destroyTokens) {
+                const { data: isValidToken } = await axios.get('VnUsers/validateToken');
+                if (isValidToken)
+                    destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
+                        destroyToken(url, storage, key)
+                    );
+            }
+        } finally {
+            localStorage.clear();
+            sessionStorage.clear();
+            await Promise.allSettled(destroyTokenPromises);
+            const { setUser } = useState();
 
-        for (const [key, url] of Object.entries(tokens)) {
-            await destroyToken(url, storage, key);
+            setUser({
+                id: 0,
+                name: '',
+                nickname: '',
+                lang: '',
+                darkMode: null,
+            });
+
+            stopRenewer();
         }
-
-        localStorage.clear();
-        sessionStorage.clear();
-
-        const { setUser } = useState();
-
-        setUser({
-            id: 0,
-            name: '',
-            nickname: '',
-            lang: '',
-            darkMode: null,
-        });
-
-        stopRenewer();
     }
 
     async function login(data) {

From 83fa9a15b9fcc21024a6c6b0a57af23850485478 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 14:18:38 +0200
Subject: [PATCH 15/46] feat: redirect to login with current path

---
 src/boot/axios.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 4fd83ddea..fa8a08003 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -55,10 +55,10 @@ const onResponseError = (error) => {
     }
 
     if (session.isLoggedIn() && response?.status === 401) {
-        session.destroy();
+        session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
-        Router.push({ path: url });
+        Router.push(`/login?redirect=${url}`);
     } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }

From 57b38a87469928c68d06e756537092a23b44ae9a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 14:18:47 +0200
Subject: [PATCH 16/46] test: unit && e2e

---
 test/cypress/integration/logout.spec.js       | 39 +++++++++++++++++++
 .../__tests__/composables/useSession.spec.js  |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 test/cypress/integration/logout.spec.js

diff --git a/test/cypress/integration/logout.spec.js b/test/cypress/integration/logout.spec.js
new file mode 100644
index 000000000..b35a8415a
--- /dev/null
+++ b/test/cypress/integration/logout.spec.js
@@ -0,0 +1,39 @@
+/// <reference types="cypress" />
+describe('Logout', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/dashboard`);
+        cy.waitForElement('.q-page', 6000);
+    });
+    describe('by user', () => {
+        it('should logout', () => {
+            cy.get(
+                '#user > .q-btn__content > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
+            ).click();
+            cy.get('.block').click();
+        });
+    });
+    describe('not user', () => {
+        beforeEach(() => {
+            cy.intercept('GET', '**/VnUsers/acl', {
+                statusCode: 401,
+                body: {
+                    error: {
+                        statusCode: 401,
+                        name: 'Error',
+                        message: 'Authorization Required',
+                        code: 'AUTHORIZATION_REQUIRED',
+                    },
+                },
+                statusMessage: 'AUTHORIZATION_REQUIRED',
+            }).as('someRoute');
+        });
+        it('when token not exists', () => {
+            cy.reload();
+            cy.get('.q-notification__message').should(
+                'have.text',
+                'Authorization Required'
+            );
+        });
+    });
+});
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 831acbf18..789b149ec 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -55,6 +55,7 @@ describe('session', () => {
             expect(user.value).toEqual(previousUser);
 
             vi.spyOn(axios, 'post').mockResolvedValue({ data: true });
+            vi.spyOn(axios, 'get').mockResolvedValue({ data: true });
             await session.destroy();
 
             user = state.getUser();

From 91eb966586d318d4bfabe5c7a51dda2f2b3fef07 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jul 2024 14:44:36 -0300
Subject: [PATCH 17/46] Ticket photos

---
 src/i18n/locale/en.yml                    |  1 +
 src/i18n/locale/es.yml                    |  1 +
 src/pages/Order/Card/OrderCatalogItem.vue | 13 +++--
 src/pages/Order/OrderCatalog.vue          |  7 ++-
 src/pages/Ticket/Card/TicketPicture.vue   | 60 +++++++++++++++++++++++
 src/router/modules/ticket.js              | 10 ++++
 6 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketPicture.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 75b07801a..3a1d619c0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -554,6 +554,7 @@ ticket:
         weeklyTickets: Weekly tickets
         services: Service
         tracking: Tracking
+        pictures: Pictures
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 452e387c9..42b887c21 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -552,6 +552,7 @@ ticket:
         weeklyTickets: Tickets programados
         services: Servicios
         tracking: Estados
+        pictures: Fotos
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index 8fa0bb5b9..2b4724e35 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -7,7 +7,7 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
-import toCurrency from '../../../filters/toCurrency';
+import { toCurrency } from 'filters/index';
 
 const DEFAULT_PRICE_KG = 0;
 
@@ -18,6 +18,10 @@ defineProps({
         type: Object,
         required: true,
     },
+    isCatalog: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const dialog = ref(null);
@@ -28,7 +32,7 @@ const dialog = ref(null);
         <QCard class="card shadow-6">
             <div class="img-wrapper">
                 <VnImg :id="item.id" zoom-size="lg" class="image" />
-                <div v-if="item.hex" class="item-color-container">
+                <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
                         :style="{ backgroundColor: `#${item.hex}` }"
@@ -50,11 +54,12 @@ const dialog = ref(null);
                 </template>
                 <div class="footer">
                     <div class="price">
-                        <p>
+                        <p v-if="isCatalog">
                             {{ item.available }} {{ t('to') }}
                             {{ toCurrency(item.price) }}
                         </p>
-                        <QIcon name="add_circle" class="icon">
+                        <slot name="price" />
+                        <QIcon v-if="isCatalog" name="add_circle" class="icon">
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 081a2cd2f..1474bbde4 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -77,7 +77,12 @@ function extractValueTags(items) {
                         <div v-if="rows && !rows?.length" class="no-result">
                             {{ t('globals.noResults') }}
                         </div>
-                        <OrderCatalogItem v-for="row in rows" :key="row.id" :item="row" />
+                        <OrderCatalogItem
+                            v-for="row in rows"
+                            :key="row.id"
+                            :item="row"
+                            is-catalog
+                        />
                     </div>
                 </template>
             </VnPaginate>
diff --git a/src/pages/Ticket/Card/TicketPicture.vue b/src/pages/Ticket/Card/TicketPicture.vue
new file mode 100644
index 000000000..e319ef963
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketPicture.vue
@@ -0,0 +1,60 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import OrderCatalogItem from 'pages/Order/Card/OrderCatalogItem.vue';
+
+import { toCurrency } from 'filters/index';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const salesFilter = {
+    include: {
+        relation: 'item',
+        scope: {
+            field: ['name', 'image'],
+        },
+    },
+    where: { ticketFk: route.params.id },
+};
+const sales = ref([]);
+</script>
+
+<template>
+    <FetchData
+        ref="salesRef"
+        url="sales"
+        :filter="salesFilter"
+        @on-fetch="(data) => (sales = data)"
+        auto-load
+    />
+    <div class="pictures-list">
+        <OrderCatalogItem v-for="(sale, index) in sales" :key="index" :item="sale.item">
+            <template #price>
+                <div class="q-mt-md full-width row justify-between items-center">
+                    <span class="text-h6">{{ sale.quantity }}</span>
+                    <span>{{ t('by') }}</span>
+                    <span class="text-h6">{{ toCurrency(sale.item?.price) }}</span>
+                </div>
+            </template>
+        </OrderCatalogItem>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.pictures-list {
+    display: flex;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 16px;
+}
+</style>
+
+<i18n>
+es:
+    by: por
+</i18n>
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 1e635470b..db61cd405 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -23,6 +23,7 @@ export default {
             'TicketTracking',
             'TicketVolume',
             'TicketNotes',
+            'TicketPicture',
         ],
     },
     children: [
@@ -142,6 +143,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
                 },
+                {
+                    path: 'picture',
+                    name: 'TicketPicture',
+                    meta: {
+                        title: 'pictures',
+                        icon: 'vn:photo',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketPicture.vue'),
+                },
                 {
                     path: 'boxing',
                     name: 'TicketBoxing',

From 02ce4f2658d586e98a265c43cc9e0cfdbbc6f8da Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jul 2024 15:12:20 -0300
Subject: [PATCH 18/46] Small change

---
 src/pages/Ticket/Card/TicketComponents.vue | 13 ++++++++-----
 src/pages/Ticket/Card/TicketService.vue    |  1 -
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 85d2179a2..5aeb6b0a5 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -37,7 +37,8 @@ watch(
         getTheoricalCost();
         if (ticketData.value?.zone && ticketData.value?.zone?.isVolumetric)
             getTicketVolume();
-    }
+    },
+    { immediate: true }
 );
 
 const salesFilter = computed(() => ({
@@ -134,7 +135,6 @@ const getComponentsSum = async () => {
     try {
         const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
         componentsList.value = data;
-        console.log('componentsList', componentsList.value);
     } catch (error) {
         console.error(error);
     }
@@ -153,7 +153,6 @@ const getTicketVolume = async () => {
     try {
         if (!ticketData.value) return;
         const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
-        console.log('data volume: ', data);
         ticketVolume.value = data[0].volume;
     } catch (error) {
         console.error(error);
@@ -218,8 +217,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     class="justify-center"
                     horizontal
                 >
-                    <span class="q-mr-xs color-vn-label"> {{ component.name }}: </span>
-                    <span>{{ toCurrency(component.value, 'EUR', 3) }}</span>
+                    <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
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 4cc8207ef..63dd454ba 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -77,7 +77,6 @@ const getDefaultTaxClass = async () => {
             params: { filter: JSON.stringify(filter) },
         });
         defaultTaxClass.value = data;
-        console.log('defaultTaxClass', defaultTaxClass.value);
     } catch (error) {
         console.error(error);
     }

From 8baf5b14890741a5a1ec5e8b89292f499e35f237 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jul 2024 16:14:47 -0300
Subject: [PATCH 19/46] Apply right alignment to total and import columns

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

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 5aeb6b0a5..b99da3f9b 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -339,7 +339,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
         <template #body-cell-import="{ row }">
             <QTd>
-                <div class="column">
+                <div class="column text-right">
                     <span v-for="(saleComponent, index) in row.components" :key="index">
                         {{ toCurrency(saleComponent.value, 'EUR', 3) }}
                     </span>
@@ -348,7 +348,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
         <template #body-cell-total="{ row }">
             <QTd>
-                <div class="column">
+                <div class="column text-right">
                     <span v-for="(saleComponent, index) in row.components" :key="index">
                         {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
                     </span>

From 2b0b47012091135181cbec51b869686eed8d0162 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 21:30:29 +0200
Subject: [PATCH 20/46] fix: TicketComponent Sales column

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

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index b99da3f9b..7c2de41a6 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -58,7 +58,7 @@ const salesFilter = computed(() => ({
                         include: {
                             relation: 'componentType',
                             scope: {
-                                fields: ['type', 'isBase'],
+                                fields: ['type', 'isBase', 'name'],
                             },
                         },
                     },
@@ -169,7 +169,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 <template>
     <FetchData
         ref="salesRef"
-        url="sales"
+        url="Sales"
         :filter="salesFilter"
         @on-fetch="(data) => (components = data)"
         auto-load
@@ -323,7 +323,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <QTd>
                 <div class="column">
                     <span v-for="(saleComponent, index) in row.components" :key="index">
-                        {{ saleComponent.component?.componentType?.type }}
+                        {{ saleComponent.component?.componentType?.name }}
                     </span>
                 </div>
             </QTd>

From e2054c2eb78862866f91923c586b417f5970478c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 21:35:19 +0200
Subject: [PATCH 21/46] fix: Itemdescriptor .link

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

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 7c2de41a6..018ec1905 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -305,7 +305,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #body-cell-item="{ row }">
             <QTd>
                 <QBtn flat color="primary">
-                    {{ row.itemFk }}
+                    <span class="link">{{ row.itemFk }}</span>
                     <ItemDescriptorProxy :id="row.itemFk" />
                 </QBtn>
             </QTd>

From 8dc1ec75b3e36f87638b7caa14d9983453473f8e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 4 Jul 2024 08:27:20 +0200
Subject: [PATCH 22/46] refactor: refs #6899 requested changes

---
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 10 ++++++----
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 0d9e2aef6..eae41d789 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -121,7 +121,7 @@ const refundInvoice = async (withWarehouse) => {
     try {
         const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
         const { data } = await axios.post('InvoiceOuts/refund', params);
-        location.href = `${salixUrl.value}ticket/${data[0].id}/sale`;
+        location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
         notify(
             t('refundInvoiceSuccessMessage', {
                 refundTicket: data[0].id,
@@ -140,13 +140,15 @@ const showTransferInvoiceForm = async () => {
         componentProps: {
             invoiceOutData: $props.invoiceOutData,
         },
-    })
-}
+    });
+};
 </script>
 
 <template>
     <QItem v-ripple clickable>
-        <QItemSection @click="showTransferInvoiceForm()">{{ t('Transfer invoice to...') }}</QItemSection>
+        <QItemSection @click="showTransferInvoiceForm()">{{
+            t('Transfer invoice to...')
+        }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection>{{ t('Show invoice...') }}</QItemSection>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 8e344b1ca..e9d5a2f1f 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -115,7 +115,7 @@ const ticketsColumns = ref([
         </template>
         <template #body="{ entity: { invoiceOut } }">
             <QCard class="vn-one">
-                <VnTitle :text="t('invoiceOut.pageTitles.basicData')" />
+                <VnTitle :text="t('globals.pageTitles.basicData')" />
                 <VnLv
                     :label="t('invoiceOut.summary.issued')"
                     :value="toDate(invoiceOut.issued)"

From 6ce03287efe84c7a4cf500beb665d43bba71e4b4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 09:53:06 +0200
Subject: [PATCH 23/46] perf: remove justify-center CSS class

---
 src/pages/Ticket/Card/TicketComponents.vue | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 018ec1905..19d25d259 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -187,13 +187,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ t('components.total') }}
                     </span>
                 </QCardSection>
-                <QCardSection class="justify-center" horizontal>
+                <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label"
                         >{{ t('components.baseToCommission') }}:
                     </span>
                     <span>{{ toCurrency(getBase) }}</span>
                 </QCardSection>
-                <QCardSection class="justify-center" horizontal>
+                <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label"
                         >{{ t('components.totalWithoutVat') }}:
                     </span>
@@ -214,7 +214,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QCardSection
                     v-for="(component, index) in componentsList"
                     :key="index"
-                    class="justify-center"
                     horizontal
                 >
                     <span v-if="component.name" class="q-mr-xs color-vn-label">
@@ -236,19 +235,19 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ t('components.zoneBreakdown') }}
                     </span>
                 </QCardSection>
-                <QCardSection class="justify-center" horizontal>
+                <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
                         {{ t('components.price') }}:
                     </span>
                     <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
                 </QCardSection>
-                <QCardSection class="justify-center" horizontal>
+                <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
                         {{ t('components.bonus') }}:
                     </span>
                     <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
                 </QCardSection>
-                <QCardSection class="justify-center" horizontal>
+                <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
                         {{ t('components.zone') }}:
                     </span>
@@ -257,17 +256,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
                     </span>
                 </QCardSection>
-                <QCardSection
-                    v-if="ticketData?.zone?.isVolumetric"
-                    class="justify-center"
-                    horizontal
-                >
+                <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
                     <span class="q-mr-xs color-vn-label">
                         {{ t('components.volume') }}:
                     </span>
                     <span>{{ ticketVolume }}</span>
                 </QCardSection>
-                <QCardSection class="justify-center" horizontal>
+                <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
                         {{ t('components.packages') }}:
                     </span>
@@ -285,7 +280,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ t('components.theoricalCost') }}
                     </span>
                 </QCardSection>
-                <QCardSection class="justify-center" horizontal>
+                <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
                         {{ t('components.totalPrice') }}:
                     </span>

From 9b1f73d30fe58d4eab01c787fd38f6c005bef5f4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jul 2024 08:45:51 -0300
Subject: [PATCH 24/46] Rename catalog item

---
 .../OrderCatalogItem.vue => components/ui/CatalogItem.vue}  | 0
 src/pages/Order/OrderCatalog.vue                            | 4 ++--
 src/pages/Ticket/Card/TicketPicture.vue                     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{pages/Order/Card/OrderCatalogItem.vue => components/ui/CatalogItem.vue} (100%)

diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/components/ui/CatalogItem.vue
similarity index 100%
rename from src/pages/Order/Card/OrderCatalogItem.vue
rename to src/components/ui/CatalogItem.vue
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 1474bbde4..2cf6e1c29 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
-import OrderCatalogItem from 'pages/Order/Card/OrderCatalogItem.vue';
+import CatalogItem from 'components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
 
 const route = useRoute();
@@ -77,7 +77,7 @@ function extractValueTags(items) {
                         <div v-if="rows && !rows?.length" class="no-result">
                             {{ t('globals.noResults') }}
                         </div>
-                        <OrderCatalogItem
+                        <CatalogItem
                             v-for="row in rows"
                             :key="row.id"
                             :item="row"
diff --git a/src/pages/Ticket/Card/TicketPicture.vue b/src/pages/Ticket/Card/TicketPicture.vue
index e319ef963..604d6c804 100644
--- a/src/pages/Ticket/Card/TicketPicture.vue
+++ b/src/pages/Ticket/Card/TicketPicture.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
-import OrderCatalogItem from 'pages/Order/Card/OrderCatalogItem.vue';
+import CatalogItem from 'components/ui/CatalogItem.vue';
 
 import { toCurrency } from 'filters/index';
 
@@ -32,7 +32,7 @@ const sales = ref([]);
         auto-load
     />
     <div class="pictures-list">
-        <OrderCatalogItem v-for="(sale, index) in sales" :key="index" :item="sale.item">
+        <CatalogItem v-for="(sale, index) in sales" :key="index" :item="sale.item">
             <template #price>
                 <div class="q-mt-md full-width row justify-between items-center">
                     <span class="text-h6">{{ sale.quantity }}</span>
@@ -40,7 +40,7 @@ const sales = ref([]);
                     <span class="text-h6">{{ toCurrency(sale.item?.price) }}</span>
                 </div>
             </template>
-        </OrderCatalogItem>
+        </CatalogItem>
     </div>
 </template>
 

From 90fbfd38e0b4bd6e559b3a981c39ecb1e571ffcc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 4 Jul 2024 14:03:33 +0200
Subject: [PATCH 25/46] refcactor: refs #6899 deleted warnings

---
 src/components/VnTable/VnTable.vue            |  6 +++-
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue |  2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue       | 31 +++++++++++--------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 56d1cbe8f..e4e8e0358 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -63,6 +63,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    table: {
+        type: Object,
+        default: () => ({}),
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -243,7 +247,7 @@ defineExpose({
             </template>
             <template #body="{ rows }">
                 <QTable
-                    v-bind="$attrs['q-table']"
+                    v-bind="table"
                     class="vnTable"
                     :columns="splittedColumns.columns"
                     :rows="rows"
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 78ec03a16..23c63ee6a 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -48,7 +48,7 @@ const getStatus = computed({
 
 onMounted(async () => {
     await invoiceOutGlobalStore.init();
-    formData.value = { ...formInitialData.value };
+    formData.value = formInitialData.value.invoiceDate;
 });
 </script>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 40e0baf2f..037834d09 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
+import { onMounted, onUnmounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -12,6 +12,7 @@ import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
+import { watchEffect } from 'vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -140,12 +141,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-            const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
-            window.open(url, '_blank');
+        const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
+        window.open(url, '_blank');
     } catch (err) {
         console.error('Error opening PDF', err);
     }
-};
+}
 
 function downloadPdf() {
     try {
@@ -174,7 +175,7 @@ function downloadPdf() {
     }
 }
 
-watch(selectedRows, { deep: true });
+watchEffect(selectedRows);
 </script>
 
 <template>
@@ -185,7 +186,12 @@ watch(selectedRows, { deep: true });
     />
     <VnSubToolbar>
         <template #st-actions>
-            <QBtn color="primary" icon-right="cloud_download" @click="downloadPdf()" :disable="!hasSelectedCards">
+            <QBtn
+                color="primary"
+                icon-right="cloud_download"
+                @click="downloadPdf()"
+                :disable="!hasSelectedCards"
+            >
                 <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
             </QBtn>
         </template>
@@ -208,13 +214,12 @@ watch(selectedRows, { deep: true });
         default-mode="table"
         redirect="invoice-out"
         auto-load
-        :q-table="{
-            'row-key':'id',
-            selection:'multiple'
-        }" 
-
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
-    <template #more-create-dialog="{ data }">
+        <template #more-create-dialog="{ data }">
             <VnSelect
                 url="Tickets"
                 v-model="data.ticketFk"
@@ -272,4 +277,4 @@ es:
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
     createInvoice: Crear factura
-</i18n>
\ No newline at end of file
+</i18n>

From decf33c0b7efe2220afb945ff462bad632306491 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jul 2024 09:46:10 -0300
Subject: [PATCH 26/46] small changes

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

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 59cd1170a..5a009a7ab 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -452,6 +452,7 @@ ticket:
         weeklyTickets: Weekly tickets
         services: Service
         tracking: Tracking
+        packages: Packages
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e35e3d41c..a5f501d51 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -451,6 +451,7 @@ ticket:
         weeklyTickets: Tickets programados
         services: Servicios
         tracking: Estados
+        packages: Bultos
     list:
         nickname: Alias
         state: Estado
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index e14fe7908..cc0199b49 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -194,7 +194,7 @@ export default {
                     name: 'TicketPackage',
                     meta: {
                         title: 'packages',
-                        icon: 'vn:bin',
+                        icon: 'vn:bucket',
                     },
                     component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
                 },

From 273641cd981ce7c4bda2c4391dc1d16f239d5158 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jul 2024 13:02:24 -0300
Subject: [PATCH 27/46] Change translation

---
 src/pages/Ticket/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 32744e557..1e13220e6 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -165,7 +165,7 @@ ticketSale:
     agency: Agencia
     address: Consignatario
 package:
-    package: Package
+    package: Embalaje
     quantity: Cantidad
     added: Añadido
     addPackage: Añadir embalaje

From f81c5d4fb0bb7e56d80c599baa0e7dd0cc2da971 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 5 Jul 2024 09:06:17 +0200
Subject: [PATCH 28/46] feat: refs #7348 add checkbox

---
 src/pages/Customer/Card/CustomerFiscalData.vue | 2 ++
 src/pages/Customer/Card/CustomerGreuges.vue    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index d8592421f..a7cdfafc5 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -147,6 +147,7 @@ function handleLocation(data, location) {
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
                 />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
         </template>
     </FormModel>
@@ -176,6 +177,7 @@ es:
     onlyLetters: Sólo se pueden usar letras, números y espacios
     whenActivatingIt: Al activarlo, no informar el código del país en el campo nif
     inOrderToInvoice: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar
+    Daily invoice: Facturación diaria
 en:
     onlyLetters: Only letters, numbers and spaces can be used
     whenActivatingIt: When activating it, do not enter the country code in the ID field
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 0dcb3a3a9..bbcd217b0 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -108,7 +108,7 @@ const setRows = (data) => {
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-    <template v-if="stateStore.isHeaderMounted()">
+    <template v-if="stateStore.isHeaderMounted()"> 
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
                 <QBtn

From 4ebcb420c3ba4c07c995e633ea8d39f0f91a3ca9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 5 Jul 2024 09:31:05 +0200
Subject: [PATCH 29/46] test: fix myEntry

---
 .../cypress/integration/entry/myEntry.spec.js | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index fc80c93f8..bd0e55c37 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,20 +1,20 @@
-// describe('WagonTypeCreate', () => {
-//     beforeEach(() => {
-//         cy.viewport(1920, 1080);
-//         cy.login('customer');
-//         cy.visit(`/#/entry/my`, {
-//             onBeforeLoad(win) {
-//                 cy.stub(win, 'open');
-//             },
-//         });
-//         cy.waitForElement('.q-page', 6000);
-//     });
+describe('My entry when is supplier', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('supplier');
+        cy.visit(`/#/entry/my`, {
+            onBeforeLoad(win) {
+                cy.stub(win, 'open');
+            },
+        });
+        cy.waitForElement('.q-page', 6000);
+    });
 
-//     it('should create edit and remove new dms', () => {
-//         cy.get(
-//             '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
-//         ).click();
-//         cy.get('.q-card__actions > .q-btn').click();
-//         cy.window().its('open').should('be.called');
-//     });
-// });
+    it('should open buyLabel when is supplier', () => {
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+        ).click();
+        cy.get('.q-card__actions > .q-btn').click();
+        cy.window().its('open').should('be.called');
+    });
+});

From df01967e2e69f305fbdda1652cdaa6bef7017c74 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 5 Jul 2024 09:41:12 +0200
Subject: [PATCH 30/46] perf: remove unnecessary import

---
 src/components/CrudModel.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index fa7761c5f..a55bde6f2 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -10,7 +10,6 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
-import VnSubToolbar from './ui/VnSubToolbar.vue';
 
 const { push } = useRouter();
 const quasar = useQuasar();

From 7201fd6d210126b45263aaeac47c08d956332112 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 5 Jul 2024 09:41:36 +0200
Subject: [PATCH 31/46] fix: remove warnings

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

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 8d747963b..985c9cc53 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -28,7 +28,7 @@ const $props = defineProps({
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
-import noImage from '/public/no-user.png';
+import noImage from '/no-user.png';
 import { useRole } from 'src/composables/useRole';
 const url = computed(() => {
     const isEmployee = useRole().isEmployee();

From 60481861eecd642ef6b1301424ea65449df32356 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 5 Jul 2024 09:46:18 +0200
Subject: [PATCH 32/46] test: fix myentry.spec.js

---
 .../cypress/integration/entry/myEntry.spec.js | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index fc80c93f8..bd0e55c37 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,20 +1,20 @@
-// describe('WagonTypeCreate', () => {
-//     beforeEach(() => {
-//         cy.viewport(1920, 1080);
-//         cy.login('customer');
-//         cy.visit(`/#/entry/my`, {
-//             onBeforeLoad(win) {
-//                 cy.stub(win, 'open');
-//             },
-//         });
-//         cy.waitForElement('.q-page', 6000);
-//     });
+describe('My entry when is supplier', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('supplier');
+        cy.visit(`/#/entry/my`, {
+            onBeforeLoad(win) {
+                cy.stub(win, 'open');
+            },
+        });
+        cy.waitForElement('.q-page', 6000);
+    });
 
-//     it('should create edit and remove new dms', () => {
-//         cy.get(
-//             '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
-//         ).click();
-//         cy.get('.q-card__actions > .q-btn').click();
-//         cy.window().its('open').should('be.called');
-//     });
-// });
+    it('should open buyLabel when is supplier', () => {
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+        ).click();
+        cy.get('.q-card__actions > .q-btn').click();
+        cy.window().its('open').should('be.called');
+    });
+});

From da3a60174134844e38f95216cb3fd8d5def74e61 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 5 Jul 2024 10:02:07 +0200
Subject: [PATCH 33/46] feat: move Qbtn

---
 src/components/VnTable/VnTable.vue  | 8 --------
 src/components/ui/VnFilterPanel.vue | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 13b12a05b..f4018cba5 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -205,14 +205,6 @@ defineExpose({
         show-if-above
     >
         <QScrollArea class="fit">
-          <QBtn
-                class="q-mt-lg q-mr-xs q-mb-lg"
-                round
-                color="primary"
-                style="position: fixed; z-index: 1; right: 0; bottom: 0"
-                icon="search"
-                @click="filterPanel.search()"
-            ></QBtn>
             <VnFilterPanel
                 ref="filterPanel"
                 :data-key="$attrs['data-key']"
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 9b2345825..084f482d6 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -193,6 +193,14 @@ function formatValue(value) {
 </script>
 
 <template>
+    <QBtn
+        class="q-mt-lg q-mr-xs q-mb-lg"
+        round
+        color="primary"
+        style="position: fixed; z-index: 1; right: 0; bottom: 0"
+        icon="search"
+        @click="search()"
+    ></QBtn>
     <QForm @submit="search" id="filterPanelForm">
         <QList dense>
             <QItem class="q-mt-xs">

From 9aa283a6123c759941c1505f90f3f7a6eabb3668 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 10:16:52 +0200
Subject: [PATCH 34/46] fix: refs #6899 fix openReport call

---
 .../Card/InvoiceOutDescriptorMenu.vue         |  1 -
 src/pages/InvoiceOut/InvoiceOutList.vue       | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index eae41d789..e524faa24 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -134,7 +134,6 @@ const refundInvoice = async (withWarehouse) => {
 };
 
 const showTransferInvoiceForm = async () => {
-    $props.menuRef.hide();
     quasar.dialog({
         component: TransferInvoiceForm,
         componentProps: {
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 037834d09..fc40d95f2 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -6,6 +6,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { usePrintService } from 'composables/usePrintService';
 import { useSession } from 'src/composables/useSession';
 import VnTable from 'components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
@@ -25,6 +26,8 @@ const ticketsOptions = ref([]);
 const customerOptions = ref([]);
 const selectedRows = ref([]);
 const hasSelectedCards = computed(() => selectedRows.value.length > 0);
+const MODEL = 'InvoiceOuts';
+const { openReport } = usePrintService();
 
 const columns = computed(() => [
     {
@@ -43,7 +46,7 @@ const columns = computed(() => [
         isTitle: true,
         component: 'select',
         attrs: {
-            url: 'InvoiceOuts',
+            url: MODEL,
             optionLabel: 'ref',
             optionValue: 'id',
         },
@@ -141,7 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-        const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
+        const url = `api/${MODEL}/${id}/download?access_token=${tokenMultimedia}`;
         window.open(url, '_blank');
     } catch (err) {
         console.error('Error opening PDF', err);
@@ -162,13 +165,13 @@ function downloadPdf() {
             );
             const invoiceOutIds = invoiceOutIdsArray.join(',');
 
-            const params = new URLSearchParams({
-                access_token: tokenMultimedia,
+            const params = {
                 ids: invoiceOutIds,
-            });
+            };
 
-            const url = `api/InvoiceOuts/downloadZip?${params}`;
-            window.open(url, '_blank');
+            openReport(`${MODEL}/downloadZip`, params);
+            // const url = `api/${MODEL}/downloadZip?${params}`;
+            // window.open(url, '_blank');
         }
     } catch (err) {
         console.error('Error opening PDF');
@@ -199,7 +202,7 @@ watchEffect(selectedRows);
     <VnTable
         ref="tableRef"
         data-key="invoiceOut"
-        url="InvoiceOuts/filter"
+        :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
             title: t('Create Manual Invoice'),

From c2da14e59ab2f5c9020df02cf69313941605b01d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 5 Jul 2024 10:42:52 +0200
Subject: [PATCH 35/46] perf: remove warningsCLI

---
 src/components/VnTable/VnTable.vue             | 2 --
 src/pages/Entry/Card/EntrySummary.vue          | 2 +-
 src/pages/Entry/EntryLatestBuys.vue            | 2 +-
 src/pages/Entry/EntryList.vue                  | 4 ----
 src/pages/Ticket/TicketFilter.vue              | 1 -
 src/pages/Ticket/TicketList.vue                | 1 -
 src/pages/Travel/Card/TravelSummary.vue        | 2 +-
 test/cypress/integration/entry/myEntry.spec.js | 2 +-
 8 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index f4018cba5..1610735a4 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -74,7 +74,6 @@ const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();
 
-const filterPanel = ref(null);
 const DEFAULT_MODE = 'card';
 const TABLE_MODE = 'table';
 const mode = ref(DEFAULT_MODE);
@@ -206,7 +205,6 @@ defineExpose({
     >
         <QScrollArea class="fit">
             <VnFilterPanel
-                ref="filterPanel"
                 :data-key="$attrs['data-key']"
                 :search-button="true"
                 v-model="params"
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 7b92b29d4..fe530795c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUpdated } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index dca32c08d..176820668 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index fe719db6e..1d00b5af5 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useRoute } from 'vue-router';
 import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
@@ -12,8 +10,6 @@ import { toDate } from 'src/filters';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const route = useRoute();
-const entityId = computed(() => route.params.id);
 const tableRef = ref();
 
 const entryFilter = {
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 63ac48393..53fe46dfc 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -6,7 +6,6 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
-import toDateString from 'filters/toDateString';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 16d7aac5d..ae635fb4e 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import { toDate, toDateString, toCurrency } from 'src/filters/index';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import TicketFilter from './TicketFilter.vue';
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index af9aa5f7f..d7dce911b 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUpdated } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index bd0e55c37..8edd3a11c 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,4 +1,4 @@
-describe('My entry when is supplier', () => {
+describe('EntryMy when is supplier', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('supplier');

From a634d8d6e6ec739136aaaff0dd56e5a73014b1a5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 14:02:24 +0200
Subject: [PATCH 36/46] refactor: refs #6899 deleted comments

---
 src/pages/InvoiceOut/InvoiceOutList.vue          | 9 +--------
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index fc40d95f2..074df617f 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -7,7 +7,6 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { usePrintService } from 'composables/usePrintService';
-import { useSession } from 'src/composables/useSession';
 import VnTable from 'components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
@@ -17,8 +16,6 @@ import { watchEffect } from 'vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
-const session = useSession();
-const tokenMultimedia = session.getTokenMultimedia();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const invoiceOutSerialsOptions = ref([]);
@@ -122,7 +119,6 @@ const columns = computed(() => [
     },
     {
         align: 'right',
-        label: '',
         name: 'tableActions',
         actions: [
             {
@@ -144,8 +140,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-        const url = `api/${MODEL}/${id}/download?access_token=${tokenMultimedia}`;
-        window.open(url, '_blank');
+        openReport(`${MODEL}//${id}/download`);
     } catch (err) {
         console.error('Error opening PDF', err);
     }
@@ -170,8 +165,6 @@ function downloadPdf() {
             };
 
             openReport(`${MODEL}/downloadZip`, params);
-            // const url = `api/${MODEL}/downloadZip?${params}`;
-            // window.open(url, '_blank');
         }
     } catch (err) {
         console.error('Error opening PDF');
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 61e63a7a7..0b9dd7ad7 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -168,7 +168,6 @@ const downloadCSV = async () => {
         auto-load
         :is-editable="false"
         :use-model="true"
-        :order="''"
     >
     </VnTable>
 </template>

From 41052cce28b8c615a31291e39af16baaa311d612 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 14:05:57 +0200
Subject: [PATCH 37/46] refactor: refs #6899 corrected api call

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

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 074df617f..0f7bb5032 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -140,7 +140,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     try {
-        openReport(`${MODEL}//${id}/download`);
+        openReport(`${MODEL}/${id}/download`);
     } catch (err) {
         console.error('Error opening PDF', err);
     }

From 3490ba1a8c929942cf6099eb8bc29ce3babfa1ab Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jul 2024 11:36:37 -0300
Subject: [PATCH 38/46] Add input type number

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

diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index 959f45b81..8a8f688d1 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -89,6 +89,8 @@ watch(
                             :label="t('package.quantity')"
                             v-model="row.quantity"
                             class="col"
+                            type="number"
+                            min="1"
                         />
                         <VnInputDate :label="t('package.added')" v-model="row.created" />
                         <QIcon

From b87e88ae7ff00f90e2439216ecc057576651d80a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jul 2024 12:04:18 -0300
Subject: [PATCH 39/46] Handle quantity empty value

---
 src/pages/Ticket/Card/TicketPackage.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index 8a8f688d1..9583d6662 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -30,6 +30,10 @@ const crudModelRequiredData = computed(() => ({
     ticketFk: route.params.id,
 }));
 
+const handleInputQuantityClear = (row) => {
+    if (row.quantity === null || row.quantity === undefined) row.quantity = 0;
+};
+
 watch(
     () => route.params.id,
     async () => {
@@ -59,7 +63,7 @@ watch(
             auto-load
             style="max-width: 800px"
         >
-            <template #body="{ rows }">
+            <template #body="{ rows, validate }">
                 <QCard class="q-px-lg q-py-md">
                     <div
                         v-for="(row, index) in rows"
@@ -77,7 +81,9 @@ watch(
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
                                     <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.name }} </QItemLabel>
+                                        <QItemLabel>
+                                            {{ scope.opt?.name }}
+                                        </QItemLabel>
                                         <QItemLabel caption>
                                             #{{ scope.opt?.itemFk }}
                                         </QItemLabel>
@@ -87,10 +93,13 @@ watch(
                         </VnSelect>
                         <VnInput
                             :label="t('package.quantity')"
-                            v-model="row.quantity"
+                            v-model.number="row.quantity"
                             class="col"
                             type="number"
                             min="1"
+                            :required="true"
+                            @update:model-value="handleInputQuantityClear(row)"
+                            :rules="validate('TicketPackaging.quantity')"
                         />
                         <VnInputDate :label="t('package.added')" v-model="row.created" />
                         <QIcon

From 98595e9ce4b1a7e42b6dbc0b3cf04d8d5eb3bbbf Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jul 2024 16:53:39 -0300
Subject: [PATCH 40/46] Add ticket price

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

diff --git a/src/pages/Ticket/Card/TicketPicture.vue b/src/pages/Ticket/Card/TicketPicture.vue
index 604d6c804..d6cc19bd1 100644
--- a/src/pages/Ticket/Card/TicketPicture.vue
+++ b/src/pages/Ticket/Card/TicketPicture.vue
@@ -37,7 +37,7 @@ const sales = ref([]);
                 <div class="q-mt-md full-width row justify-between items-center">
                     <span class="text-h6">{{ sale.quantity }}</span>
                     <span>{{ t('by') }}</span>
-                    <span class="text-h6">{{ toCurrency(sale.item?.price) }}</span>
+                    <span class="text-h6">{{ toCurrency(sale?.price) }}</span>
                 </div>
             </template>
         </CatalogItem>

From 1de091da47312dabd4093abb31b7a69a468f478f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jul 2024 17:03:31 -0300
Subject: [PATCH 41/46] Initial value of quantity 0

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

diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index 9583d6662..a76fce2b6 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -25,7 +25,7 @@ const crudModelFilter = reactive({
 
 const crudModelRequiredData = computed(() => ({
     packagingFk: null,
-    quantity: null,
+    quantity: 0,
     created: Date.vnNew(),
     ticketFk: route.params.id,
 }));

From d2c4c65b009c1e8231572ef4da841130294cf175 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 09:05:03 +0200
Subject: [PATCH 42/46] fix

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

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 58aaf2bf0..394c472c2 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -408,7 +408,6 @@ function handleLocation(data, location) {
         default-mode="table"
         redirect="customer"
         auto-load
-        :disable-option="{ card: true }"
     >
         <template #more-create-dialog="{ data }">
             <VnLocation

From 32d2087bce84993833aa0bea28a3c4faa24bff6d Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 8 Jul 2024 12:56:34 +0200
Subject: [PATCH 43/46] feat: #7348 restore template

---
 src/pages/Customer/Card/CustomerGreuges.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 8056afe5a..8cca2ef23 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -108,23 +108,6 @@ const setRows = (data) => {
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
         <QCard class="full-width q-pa-sm">
             <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount !== undefined">

From 41deb8217415e2097d1ac25b7b6150a65102731d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 13:23:42 +0200
Subject: [PATCH 44/46] feat(VnTable): add visibleColumns

---
 src/components/VnTable/VnTable.vue         |  41 +++--
 src/components/VnTable/VnVisibleColumn.vue | 181 +++++++++++++++++++++
 2 files changed, 205 insertions(+), 17 deletions(-)
 create mode 100644 src/components/VnTable/VnVisibleColumn.vue

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 1610735a4..c26478360 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -13,6 +13,7 @@ import VnLv from 'components/ui/VnLv.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnTableFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
+import TableVisibleColumns from 'src/components/VnTable/VnVisibleColumn.vue';
 
 const $props = defineProps({
     columns: {
@@ -67,6 +68,10 @@ const $props = defineProps({
         type: Object,
         default: () => ({ card: false, table: false }),
     },
+    tableCode: {
+        type: String,
+        default: null,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -115,6 +120,14 @@ watch(
     (val) => setUserParams(val)
 );
 
+const rowClickFunction = computed(() => {
+    if ($props.rowClick) return $props.rowClick;
+    if ($props.redirect) return ({ id }) => redirectFn(id);
+    return () => {};
+});
+
+const isTableMode = computed(() => mode.value == TABLE_MODE);
+
 function setUserParams(watchedParams) {
     if (!watchedParams) return;
 
@@ -158,12 +171,6 @@ function splitColumns(columns) {
     }
 }
 
-const rowClickFunction = computed(() => {
-    if ($props.rowClick) return $props.rowClick;
-    if ($props.redirect) return ({ id }) => redirectFn(id);
-    return () => {};
-});
-
 function redirectFn(id) {
     router.push({ path: `/${$props.redirect}/${id}` });
 }
@@ -236,7 +243,7 @@ defineExpose({
             :limit="20"
             ref="CrudModelRef"
             :search-url="searchUrl"
-            :disable-infinite-scroll="mode == TABLE_MODE"
+            :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
         >
@@ -254,11 +261,11 @@ defineExpose({
                     :columns="splittedColumns.columns"
                     :rows="rows"
                     v-model:selected="selected"
-                    :grid="mode != TABLE_MODE"
+                    :grid="!isTableMode"
                     table-header-class="bg-header"
                     card-container-class="grid-three"
                     flat
-                    :style="mode == TABLE_MODE && 'max-height: 90vh'"
+                    :style="isTableMode && 'max-height: 90vh'"
                     virtual-scroll
                     @virtual-scroll="
                         (event) =>
@@ -272,13 +279,12 @@ defineExpose({
                         <slot name="top-left"></slot>
                     </template>
                     <template #top-right>
-                        <!-- <QBtn
-                        icon="visibility"
-                        title="asd"
-                        class="bg-vn-section-color q-mr-md"
-                        dense
-                        v-if="mode == 'table'"
-                    /> -->
+                        <TableVisibleColumns
+                            v-if="isTableMode"
+                            v-model="splittedColumns.columns"
+                            :table-code="tableCode ?? route.name"
+                            class="q-mr-md"
+                        />
                         <QBtnToggle
                             v-model="mode"
                             toggle-color="primary"
@@ -298,7 +304,7 @@ defineExpose({
                         <QTh
                             auto-width
                             style="min-width: 100px"
-                            v-if="$props.columnSearch"
+                            v-if="$props.columnSearch && col.visible"
                         >
                             <VnTableFilter
                                 :column="col"
@@ -330,6 +336,7 @@ defineExpose({
                             auto-width
                             class="no-margin q-px-xs"
                             :class="getColAlign(col)"
+                            v-if="col.visible"
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
                                 <VnTableColumn
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
new file mode 100644
index 000000000..ab9c5d5c3
--- /dev/null
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -0,0 +1,181 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed, onMounted } from 'vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const columns = defineModel({ type: Object, default: [] });
+const $props = defineProps({
+    tableCode: {
+        type: String,
+        default: '',
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const popupProxyRef = ref();
+const initialUserConfigViewData = ref();
+const localColumns = ref([]);
+
+const areAllChecksMarked = computed(() => {
+    return columns.value.every((col) => col.visible);
+});
+
+function setUserConfigViewData(data, isLocal) {
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    if (!isLocal) localColumns.value = [];
+    for (let column of columns.value) {
+        const { label, name } = column;
+        column.visible = data[name] ?? true;
+        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
+    }
+}
+
+function toggleMarkAll(val) {
+    columns.value.forEach((col) => (col.visible = val));
+}
+
+async function getConfig(url, filter) {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+}
+
+async function fetchViewConfigData() {
+    try {
+        const defaultFilter = {
+            where: { tableCode: $props.tableCode },
+        };
+
+        const userConfig = await getConfig('UserConfigViews', {
+            where: {
+                ...defaultFilter.where,
+                ...{ userFk: user.id },
+            },
+        });
+
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
+            return;
+        }
+
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data', err);
+    }
+}
+
+async function saveConfig() {
+    const configuration = {};
+    for (const { name, visible } of localColumns.value)
+        configuration[name] = visible ?? true;
+    setUserConfigViewData(configuration, true);
+    if (!$props.tableCode) return popupProxyRef.value.hide();
+
+    try {
+        const params = {};
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+        notify('errors.writeRequest', 'negative');
+    }
+}
+
+onMounted(async () => {
+    setUserConfigViewData({});
+    await fetchViewConfigData();
+});
+</script>
+<template>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md" dense>
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div v-if="columns.length > 0" class="checks-layout">
+                    <QCheckbox
+                        v-for="col in localColumns"
+                        :key="col.name"
+                        :label="col.label"
+                        v-model="col.visible"
+                    />
+                </div>
+                <QBtn
+                    class="full-width q-mt-md"
+                    color="primary"
+                    @click="saveConfig()"
+                    :label="t('globals.save')"
+                />
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+        Tick all: Marcar todas
+</i18n>

From dd872dba3b4892f10f8729cec7121204be2018d8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 13:51:56 +0200
Subject: [PATCH 45/46] fix: areAllChecksMarked

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

diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index ab9c5d5c3..0f979acd3 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -23,7 +23,7 @@ const initialUserConfigViewData = ref();
 const localColumns = ref([]);
 
 const areAllChecksMarked = computed(() => {
-    return columns.value.every((col) => col.visible);
+    return localColumns.value.every((col) => col.visible);
 });
 
 function setUserConfigViewData(data, isLocal) {
@@ -38,7 +38,7 @@ function setUserConfigViewData(data, isLocal) {
 }
 
 function toggleMarkAll(val) {
-    columns.value.forEach((col) => (col.visible = val));
+    localColumns.value.forEach((col) => (col.visible = val));
 }
 
 async function getConfig(url, filter) {

From b23915ea2ddeaa52960c6e80c771aeda77ff0ab2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 14:14:24 +0200
Subject: [PATCH 46/46] fix: vnTable filter class

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

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index b3386899f..f91478051 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -40,7 +40,7 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
-    class: 'q-px-sm q-pb-xs q-pt-none fit',
+    class: 'q-px-xs q-pb-xs q-pt-none fit',
     dense: true,
 };
 
@@ -101,7 +101,7 @@ const components = {
         component: markRaw(VnSelect),
         event: updateEvent,
         attrs: {
-            class: 'q-px-md q-pb-xs q-pt-none fit',
+            class: 'q-px-sm q-pb-xs q-pt-none fit',
             dense: true,
             filled: !$props.showTitle,
         },
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 1d5072646..9c6ea89ed 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -287,7 +287,6 @@ defineExpose({
                             v-if="isTableMode"
                             v-model="splittedColumns.columns"
                             :table-code="tableCode ?? route.name"
-                            class="q-mr-md"
                         />
                         <QBtnToggle
                             v-model="mode"