Merge branch 'master' into hotfix_negative_available

Reviewed-on: #1715
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

src/boot/vnDate.js

@@ -1,4 +1,6 @@
 import { boot } from 'quasar/wrappers';
+import { date as quasarDate } from 'quasar';
+const { formatDate } = quasarDate;
 
 export default boot(() => {
     Date.vnUTC = () => {
@@ -25,4 +27,34 @@ export default boot(() => {
         const date = new Date(Date.vnUTC());
         return new Date(date.getFullYear(), date.getMonth() + 1, 0);
     };
+
+    Date.getCurrentDateTimeFormatted = (
+        options = {
+            startOfDay: false,
+            endOfDay: true,
+            iso: true,
+            mask: 'DD-MM-YYYY HH:mm',
+        },
+    ) => {
+        const date = Date.vnUTC();
+        if (options.startOfDay) {
+            date.setHours(0, 0, 0);
+        }
+        if (options.endOfDay) {
+            date.setHours(23, 59, 0);
+        }
+        if (options.iso) {
+            return date.toISOString();
+        }
+        return formatDate(date, options.mask);
+    };
+
+    Date.convertToISODateTime = (dateTimeStr) => {
+        const [datePart, timePart] = dateTimeStr.split(' ');
+        const [day, month, year] = datePart.split('-');
+        const [hours, minutes] = timePart.split(':');
+
+        const isoDate = new Date(year, month - 1, day, hours, minutes);
+        return isoDate.toISOString();
+    };
 });

src/components/EditPictureForm.vue

@@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
             img.onerror = () => {
                 notify(
                     t("This photo provider doesn't allow remote downloads"),
-                    'negative'
+                    'negative',
                 );
             };
         }
@@ -219,11 +219,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateLeft()"
-                    >
+                    />
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate left') }}
-                        </QTooltip> -->
-                    </QIcon>
                     <div>
                         <div ref="photoContainerRef" />
                     </div>
@@ -233,11 +229,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateRight()"
-                    >
+                    />
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate right') }}
-                        </QTooltip> -->
-                    </QIcon>
                 </div>
 
                 <div class="column">
@@ -265,7 +257,6 @@ const makeRequest = async () => {
                                     class="cursor-pointer q-mr-sm"
                                     @click="openInputFile()"
                                 >
-                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
                                 </QIcon>
                                 <QIcon name="info" class="cursor-pointer">
                                     <QTooltip>{{

src/components/common/VnAccountNumber.vue

@@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
+        @keydown.tab="$refs.inputRef.vnInputRef.blur()"
+        @blur="model = useAccountShortToStandard(model) ?? model"
         @input="model = $event.target.value.replace(/[^\d.]/g, '')"
     />
 </template>

src/components/common/VnInputDateTime.vue

@@ -0,0 +1,79 @@
+<script setup>
+import { computed, useAttrs } from 'vue';
+import { date } from 'quasar';
+import VnDate from './VnDate.vue';
+import VnTime from './VnTime.vue';
+
+const $attrs = useAttrs();
+const model = defineModel({ type: [Date] });
+
+const $props = defineProps({
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
+});
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
+const mask = 'DD-MM-YYYY HH:mm';
+const selectedDate = computed({
+    get() {
+        if (!model.value) return new Date(model.value);
+        return date.formatDate(new Date(model.value), mask);
+    },
+    set(value) {
+        model.value = Date.convertToISODateTime(value);
+    },
+});
+const manageDate = (date) => {
+    selectedDate.value = date;
+};
+</script>
+
+<template>
+    <div @mouseover="hover = true" @mouseleave="hover = false">
+        <QInput
+            ref="vnInputDateRef"
+            v-model="selectedDate"
+            class="vn-input-date"
+            placeholder="dd/mm/aaaa HH:mm"
+            v-bind="{ ...$attrs, ...styleAttrs }"
+            :clearable="false"
+            @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
+            hide-bottom-space
+            @update:model-value="manageDate"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
+        >
+            <template #prepend>
+                <QIcon name="today" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnDate :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+            <template #append>
+                <QIcon name="access_time" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnTime format24h :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+        </QInput>
+    </div>
+</template>
+<i18n>
+    es:
+        Open date: Abrir fecha
+</i18n>

src/components/common/__tests__/VnInputDateTime.spec.js

@@ -0,0 +1,81 @@
+import { createWrapper } from 'app/test/vitest/helper.js';
+import { describe, it, expect, beforeAll } from 'vitest';
+import VnInputDateTime from 'components/common/VnInputDateTime.vue';
+import vnDateBoot from 'src/boot/vnDate';
+
+let vm;
+let wrapper;
+
+beforeAll(() => {
+    // Initialize the vnDate boot
+    vnDateBoot();
+});
+function generateWrapper(date, outlined, showEvent) {
+    wrapper = createWrapper(VnInputDateTime, {
+        props: {
+            modelValue: date,
+            isOutlined: outlined,
+            showEvent: showEvent,
+        },
+    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+}
+
+describe('VnInputDateTime', () => {
+    describe('selectedDate', () => {
+        it('formats a valid datetime correctly', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).toBe('25-12-2023 10:30');
+        });
+
+        it('handles null date value', async () => {
+            generateWrapper(null, false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).toBeInstanceOf(Date);
+        });
+
+        it('updates the model value when a new datetime is set', async () => {
+            vm.selectedDate = '31-12-2023 15:45';
+            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+        });
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({});
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {
+            generateWrapper('2023-12-25T10:30:00', true, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({
+                dense: true,
+                outlined: true,
+                rounded: true,
+            });
+        });
+    });
+
+    describe('component rendering', () => {
+        it('should render date and time icons', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const icons = wrapper.findAllComponents({ name: 'QIcon' });
+            expect(icons.length).toBe(2);
+            expect(icons[0].props('name')).toBe('today');
+            expect(icons[1].props('name')).toBe('access_time');
+        });
+
+        it('should render popup proxies for date and time', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
+            expect(popups.length).toBe(2);
+        });
+    });
+});

src/components/ui/EntityDescriptor.vue

@@ -44,7 +44,8 @@ onBeforeMount(async () => {
     });
 
     // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id) await getData();
+    if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
+        await getData();
     watch(
         () => [$props.url, $props.filter],
         async () => {
@@ -58,7 +59,8 @@ async function getData() {
     store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
-        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        await arrayData.fetch({ append: false, updateRouter: false });
+        const { data } = store;
         state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {

src/i18n/locale/en.yml

@@ -19,6 +19,7 @@ globals:
     logOut: Log out
     date: Date
     dataSaved: Data saved
+    openDetail: Open detail
     dataDeleted: Data deleted
     delete: Delete
     search: Search

src/i18n/locale/es.yml

@@ -20,10 +20,11 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    dataCreated: Datos creados
+    openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
     changes: Cambios
-    dataCreated: Datos creados
     add: Añadir
     create: Crear
     edit: Modificar

src/pages/Item/components/ItemProposal.vue

@@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
 import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
 import FetchData from 'components/FetchData.vue';
+import { useState } from 'src/composables/useState';
 
 const MATCH = 'match';
+const { notifyResults } = displayResults();
 
 const { t } = useI18n();
 const $props = defineProps({
@@ -18,14 +20,20 @@ const $props = defineProps({
         required: true,
         default: () => {},
     },
+    filter: {
+        type: Object,
+        required: true,
+        default: () => {},
+    },
     replaceAction: {
         type: Boolean,
-        required: false,
+        required: true,
         default: false,
     },
+
     sales: {
         type: Array,
-        required: false,
+        required: true,
         default: () => [],
     },
 });
@@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
 const sale = computed(() => $props.sales[0]);
 const saleFk = computed(() => sale.value.saleFk);
 const filter = computed(() => ({
+    where: $props.filter,
+
     itemFk: $props.itemLack.itemFk,
     sales: saleFk.value,
 }));

src/pages/Item/components/ItemProposalProxy.vue

@@ -1,13 +1,17 @@
 <script setup>
 import ItemProposal from './ItemProposal.vue';
 import { useDialogPluginComponent } from 'quasar';
-
 const $props = defineProps({
     itemLack: {
         type: Object,
         required: true,
         default: () => {},
     },
+    filter: {
+        type: Object,
+        required: true,
+        default: () => {},
+    },
     replaceAction: {
         type: Boolean,
         required: false,
@@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
     <QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
         <QCard class="dialog-width">
             <QCardSection class="row items-center q-pb-none">
-                <span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
+                <span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
                 <QSpace />
                 <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>

src/pages/Route/Card/RouteSummary.vue

@@ -233,10 +233,10 @@ const ticketColumns = ref([
                                 </span>
                             </QTd>
                         </template>
-                        <template #body-cell-client="{ value, row }">
+                        <template #body-cell-client="{ row }">
-                            <QTd auto-width>
+                            <QTd>
                                 <span class="link">
-                                    {{ value }}
+                                    {{ row.clientFk }}
                                     <CustomerDescriptorProxy :id="row?.clientFk" />
                                 </span>
                             </QTd>

src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue

@@ -101,7 +101,7 @@ const onNextStep = async () => {
                 t('basicData.negativesConfirmMessage'),
                 submitWithNegatives,
             );
-        else submit();
+        else await submit();
     }
 };
 </script>

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -28,6 +28,7 @@ const props = defineProps({
 
 onMounted(() => {
     restoreTicket();
+    hasDocuware();
 });
 
 watch(

src/pages/Ticket/Card/TicketDescriptorProxy.vue

@@ -1,7 +1,6 @@
 <script setup>
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketSummary from './TicketSummary.vue';
-
 const $props = defineProps({
     id: {
         type: Number,

src/pages/Ticket/Card/TicketSale.vue

@@ -768,6 +768,7 @@ watch(
                 v-model="row.itemFk"
                 :use-like="false"
                 @update:model-value="changeItem(row)"
+                autofocus
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

src/pages/Ticket/Card/TicketSplit.vue

@@ -3,7 +3,9 @@ import { ref } from 'vue';
 
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import split from './components/split';
-const emit = defineEmits(['ticketTransfered']);
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+const { notifyResults } = displayResults();
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     ticket: {
@@ -16,13 +18,20 @@ const splitDate = ref(Date.vnNew());
 
 const splitSelectedRows = async () => {
     const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
-    await split(tickets, splitDate.value);
+    const results = await split(tickets, splitDate.value);
-    emit('ticketTransfered', tickets);
+    notifyResults(results, 'ticketFk');
+    emit('ticketTransferred', tickets);
 };
 </script>
 
 <template>
-    <VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
+    <VnInputDate
+        class="q-mr-sm"
+        :label="$t('New date')"
+        v-model="splitDate"
+        clearable
+        autofocus
+    />
     <QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
 </template>
 <style lang="scss">

src/pages/Ticket/Card/TicketTransfer.vue

@@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-const emit = defineEmits(['ticketTransfered']);
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     mana: {

src/pages/Ticket/Card/TicketTransferProxy.vue

@@ -1,8 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import TicketTransfer from './TicketTransfer.vue';
-import Split from './TicketSplit.vue';
+import TicketSplit from './TicketSplit.vue';
-const emit = defineEmits(['ticketTransfered']);
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     mana: {
@@ -35,7 +35,7 @@ const transferRef = ref(null);
 <template>
     <QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
         <div class="flex row items-center q-ma-lg" v-if="$props.split">
-            <Split
+            <TicketSplit
                 ref="splitRef"
                 @splitSelectedRows="splitSelectedRows"
                 :ticket="$props.ticket"

src/pages/Ticket/Card/components/split.js

@@ -1,13 +1,11 @@
 import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
-
 export default async function (data, date) {
     const reducedData = data.reduce((acc, item) => {
         const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
         if (existing) {
             existing.sales.push(item.saleFk);
         } else {
-            acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
+            acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
         }
         return acc;
     }, []);
@@ -16,7 +14,5 @@ export default async function (data, date) {
 
     const results = await Promise.allSettled(promises);
 
-    notifyResults(results, 'ticketFk');
-
     return results;
 }

src/pages/Ticket/Negative/TicketLackDetail.vue

@@ -23,7 +23,6 @@ const tableRef = ref();
 const changeItemDialogRef = ref(null);
 const changeStateDialogRef = ref(null);
 const changeQuantityDialogRef = ref(null);
-const showProposalDialog = ref(false);
 const showChangeQuantityDialog = ref(false);
 const selectedRows = ref([]);
 const route = useRoute();
@@ -63,6 +62,7 @@ const showItemProposal = () => {
         .dialog({
             component: ItemProposalProxy,
             componentProps: {
+                filter: filter.value,
                 itemLack: tableRef.value.itemLack,
                 replaceAction: true,
                 sales: selectedRows.value,
@@ -117,21 +117,17 @@ const showItemProposal = () => {
                                 sales: selectedRows,
                                 lastActiveTickets: selectedRows.map((row) => row.id),
                             }"
-                            @ticket-transfered="reload"
+                            @ticket-transferred="reload"
                         ></TicketTransferProxy>
                     </template>
                 </QBtn>
                 <QBtn
                     color="primary"
-                    @click="showProposalDialog = true"
+                    @click="showItemProposal"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     data-cy="itemProposal"
                 >
-                    <QIcon
+                    <QIcon name="import_export" class="rotate-90" />
-                        name="import_export"
-                        class="rotate-90"
-                        @click="showItemProposal"
-                    ></QIcon>
                     <QTooltip bottom anchor="bottom right">
                         {{ t('itemProposal') }}
                     </QTooltip>
@@ -139,7 +135,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeItem"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeItem.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:item" /> </template>
@@ -153,7 +149,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeState"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeState.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:eye" /> </template>
@@ -167,7 +163,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeQuantity"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeQuantity.title')"
                     @click="showChangeQuantityDialog = true"
                 >

src/pages/Ticket/Negative/TicketLackFilter.vue

@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDateTime from 'src/components/common/VnInputDateTime.vue';
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -66,6 +67,7 @@ const setUserParams = (params) => {
         :data-key="props.dataKey"
         :search-button="true"
         @set-user-params="setUserParams"
+        :unremovable-params="['warehouseFk']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -77,12 +79,11 @@ const setUserParams = (params) => {
             <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <VnInput
+                        <VnInputDateTime
-                            v-model="params.days"
+                            v-model="params.availabled"
-                            :label="t('negative.days')"
+                            :label="t('negative.availabled')"
                             dense
                             filled
-                            type="number"
                             @update:model-value="
                                 (value) => {
                                     setUserParams(params);

src/pages/Ticket/Negative/TicketLackList.vue

@@ -21,14 +21,13 @@ const selectedRows = ref([]);
 const tableRef = ref();
 const filterParams = ref({});
 const negativeParams = reactive({
-    days: useRole().likeAny('buyer') ? 2 : 0,
     warehouseFk: useState().getUser().value.warehouseFk,
+    availabled: Date.getCurrentDateTimeFormatted(),
 });
 const redirectToCreateView = ({ itemFk }) => {
     router.push({
         name: 'NegativeDetail',
         params: { id: itemFk },
-        query: { days: filterParams.value.days ?? negativeParams.days },
     });
 };
 const columns = computed(() => [
@@ -65,15 +64,19 @@ const columns = computed(() => [
         columnFilter: {
             component: 'input',
             type: 'number',
-            columnClass: 'shrink',
+            inWhere: false,
         },
     },
     {
         name: 'longName',
-        align: 'center',
+        align: 'left',
         label: t('negative.longName'),
         field: ({ longName }) => longName,
-
+        columnFilter: {
+            component: 'input',
+            inWhere: false,
+            useLike: true,
+        },
         sortable: true,
         headerStyle: 'width: 350px',
         cardVisible: true,
@@ -94,6 +97,11 @@ const columns = computed(() => [
         field: ({ inkFk }) => inkFk,
         sortable: true,
         cardVisible: true,
+        columnFilter: {
+            component: 'input',
+            columnClass: 'shrink',
+            inWhere: false,
+        },
     },
     {
         name: 'size',
@@ -155,7 +163,6 @@ const setUserParams = (params) => {
             <TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
         </template>
     </RightMenu>
-    {{ filterRef }}
     <VnTable
         ref="tableRef"
         data-key="NegativeList"

src/pages/Ticket/Negative/TicketLackTable.vue

@@ -5,7 +5,7 @@ import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import FetchData from 'src/components/FetchData.vue';
-import { toDate, toHour } from 'src/filters';
+import { toDate } from 'src/filters';
 import useNotify from 'src/composables/useNotify.js';
 import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { useRoute } from 'vue-router';
@@ -22,14 +22,6 @@ const $props = defineProps({
     },
 });
 
-watch(
-    () => $props.filter,
-    (v) => {
-        filterLack.value.where = v;
-        tableRef.value.reload(filterLack);
-    },
-);
-
 const filterLack = ref({
     include: [
         {
@@ -90,6 +82,7 @@ const columns = computed(() => [
     },
     {
         name: 'alertLevelCode',
+        field: 'alertLevelCode',
         label: t('negative.detail.state'),
         columnFilter: {
             name: 'alertLevelCode',
@@ -158,7 +151,6 @@ const saveChange = async (field, { row }) => {
         fetchItemLack.value.fetch();
     } catch (err) {
         console.error('Error saving changes', err);
-        f;
     }
 };
 
@@ -171,7 +163,11 @@ function onBuysFetched(data) {
     <FetchData
         ref="fetchItemLack"
         :url="`Tickets/itemLack`"
-        :params="{ id: entityId }"
+        :params="{
+            itemFk: entityId,
+            warehouseFk: $props.filter.warehouseFk,
+            availabled: Date.getCurrentDateTimeFormatted(),
+        }"
         @on-fetch="(data) => (itemLack = data[0])"
         auto-load
     />
@@ -207,6 +203,7 @@ function onBuysFetched(data) {
         dense
         :is-editable="true"
         :row-click="false"
+        :search-url="false"
         :right-search="false"
         :right-search-icon="false"
         v-model:selected="selectedRows"
@@ -214,7 +211,6 @@ function onBuysFetched(data) {
     >
         <template #top-left>
             <div style="display: flex; align-items: center" v-if="itemLack">
-                <!-- <VnImg :id="itemLack.itemFk" class="rounded image-wrapper"></VnImg> -->
                 <div class="flex column" style="align-items: center">
                     <QBadge
                         ref="badgeLackRef"
@@ -239,7 +235,7 @@ function onBuysFetched(data) {
 
         <template #column-status="{ row }">
             <QTd style="min-width: 150px">
-                <div class="icon-container">
+                <div class="flex items-start q-ma-sm">
                     <QIcon
                         v-if="row.isBasket"
                         name="vn:basket"
@@ -266,9 +262,10 @@ function onBuysFetched(data) {
                         size="xs"
                     >
                         <QTooltip>{{
-                            t('negative.detail.hasObservation')
+                            row?.note || t('negative.detail.hasObservation')
-                        }}</QTooltip> </QIcon
+                        }}</QTooltip>
-                    ><QIcon
+                    </QIcon>
+                    <QIcon
                         v-if="row.isRookie"
                         name="vn:Person"
                         size="xs"
@@ -305,9 +302,9 @@ function onBuysFetched(data) {
             </span>
         </template>
         <template #column-ticketFk="{ row }">
-            <span class="q-pa-sm link">
+            <span class="link" @click.stop>
-                {{ row.id }}
+                {{ row.ticketFk }}
-                <TicketDescriptorProxy :id="row.id" />
+                <TicketDescriptorProxy :id="row.ticketFk" />
             </span>
         </template>
         <template #column-alertLevelCode="props">
@@ -335,15 +332,6 @@ function onBuysFetched(data) {
     </VnTable>
 </template>
 <style lang="scss" scoped>
-.icon-container {
-    display: grid;
-    grid-template-columns: repeat(3, 0.2fr);
-    row-gap: 5px; /* Ajusta el espacio entre los iconos según sea necesario */
-}
-.icon-container > * {
-    width: 100%;
-    height: auto;
-}
 .list-enter-active,
 .list-leave-active {
     transition: all 1s ease;

src/pages/Ticket/Negative/components/ChangeItemDialog.vue

@@ -2,7 +2,9 @@
 import { ref } from 'vue';
 import axios from 'axios';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+
+const { notifyResults } = displayResults();
 const emit = defineEmits(['update-item']);
 
 const showChangeItemDialog = ref(false);
@@ -37,7 +39,6 @@ const updateItem = async () => {
 <template>
     <QCard class="q-pa-sm">
         <QCardSection class="row items-center justify-center column items-stretch">
-            {{ showChangeItemDialog }}
             <span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
             <VnSelect
                 url="Items/WithName"
@@ -47,6 +48,7 @@ const updateItem = async () => {
                 option-label="name"
                 option-value="id"
                 v-model="newItem"
+                autofocus
             >
             </VnSelect>
         </QCardSection>

src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue

@@ -2,8 +2,9 @@
 import { ref } from 'vue';
 import axios from 'axios';
 import VnInput from 'src/components/common/VnInput.vue';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
 
+const { notifyResults } = displayResults();
 const showChangeQuantityDialog = ref(false);
 const newQuantity = ref(null);
 const $props = defineProps({
@@ -16,15 +17,16 @@ const emit = defineEmits(['update-quantity']);
 const updateQuantity = async () => {
     try {
         showChangeQuantityDialog.value = true;
-        const rowsToUpdate = $props.selectedRows.map(({ saleFk }) =>
+        const rowsToUpdate = $props.selectedRows.map(({ saleFk, ticketFk }) =>
             axios.post(`Sales/${saleFk}/updateQuantity`, {
                 saleFk,
+                ticketFk,
                 quantity: +newQuantity.value,
             }),
         );
 
         const result = await Promise.allSettled(rowsToUpdate);
-        notifyResults(result, 'saleFk');
+        notifyResults(result, 'ticketFk');
 
         emit('update-quantity', newQuantity.value);
     } catch (err) {
@@ -42,6 +44,7 @@ const updateQuantity = async () => {
                 :min="0"
                 :label="$t('negative.detail.modal.changeQuantity.placeholder')"
                 v-model="newQuantity"
+                autofocus
             />
         </QCardSection>
         <QCardActions align="right">

src/pages/Ticket/Negative/components/ChangeStateDialog.vue

@@ -3,8 +3,9 @@ import { ref } from 'vue';
 import axios from 'axios';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
 
+const { notifyResults } = displayResults();
 const emit = defineEmits(['update-state']);
 const editableStates = ref([]);
 const showChangeStateDialog = ref(false);
@@ -49,6 +50,7 @@ const updateState = async () => {
                 :options="editableStates"
                 option-label="name"
                 option-value="code"
+                autofocus
             />
         </QCardSection>
         <QCardActions align="right">

src/pages/Ticket/Negative/composables/notifyResults.js

@@ -0,0 +1,56 @@
+import { Notify } from 'quasar';
+import useOpenURL from 'src/composables/useOpenURL';
+import { useI18n } from 'vue-i18n';
+
+export function displayResults() {
+    const { t } = useI18n();
+
+    const createSuccessNotification = (id, path) => {
+        Notify.create({
+            type: 'positive',
+            message: t('globals.dataSaved'),
+            actions: [
+                {
+                    label: t('globals.openDetail'),
+                    color: 'white',
+                    handler: () => useOpenURL(`#/ticket/${id}/${path}`),
+                },
+            ],
+        });
+    };
+
+    const handleResult = (result, key, path) => {
+        if (result.status !== 'fulfilled') {
+            const data = JSON.parse(result.reason.config.data);
+            const error =
+                result.reason.response?.data?.error?.message ?? result.reason.message;
+            Notify.create({
+                type: 'negative',
+                message: `Ticket ${data[key]}: ${error}`,
+            });
+            return;
+        }
+
+        const data = JSON.parse(result.value.config.data);
+        let id = data[key];
+
+        if (result.value.data.status === 'noSplit') {
+            Notify.create({
+                type: 'warning',
+                message: `Ticket ${id}: ${t('negative.split.noSplit')}`,
+            });
+            return;
+        }
+
+        if (result.value.data.status === 'split') {
+            id = result.value.data.newTicket;
+        }
+
+        createSuccessNotification(id, path);
+    };
+
+    const notifyResults = (results, key, path = 'sale') =>
+        results.forEach((result) => handleResult(result, key, path));
+
+    return { notifyResults };
+}

src/pages/Ticket/locale/en.yml

@@ -236,6 +236,7 @@ negative:
     minTimed: minTimed
     negativeAction: Negative
     totalNegative: Total negatives
+    availabled: Availabled
     days: Days
     buttonsUpdate:
         item: Item
@@ -265,7 +266,7 @@ negative:
         isRookie: Is rookie
         turno: Turn line
         isBasket: Basket
-        hasObservation: Has substitution
+        hasObservation: Has substitution note
         hasToIgnore: VIP
         modal:
             changeItem:
@@ -288,3 +289,4 @@ negative:
         newTicket: New ticket
         status: Result
         message: Message
+        noSplit: No split

src/pages/Ticket/locale/es.yml

@@ -216,7 +216,8 @@ ticketList:
 negative:
     hour: Hora
     id: Id Articulo
-    longName: Articulo
+    longName: Artículo
+    itemFk: Artículo
     supplier: Productor
     colour: Color
     size: Medida
@@ -232,6 +233,7 @@ negative:
     inkFk: Color
     timed: Hora
     date: Fecha
+    availabled: Disponible
     minTimed: Hora
     type: Tipo
     negativeAction: Negativo
@@ -265,7 +267,7 @@ negative:
         isRookie: Cliente nuevo
         turno: Linea turno
         isBasket: Cesta
-        hasObservation: Tiene sustitución
+        hasObservation: Tiene nota de sustitución
         hasToIgnore: VIP
         modal:
             changeItem:
@@ -284,10 +286,11 @@ negative:
                 title: Gestionar tickets spliteados
                 subTitle: Confir fecha y agencia
     split:
-        ticket: Ticket viejo
+        ticket: Ticket origen
         newTicket: Ticket nuevo
         status: Estado
         message: Mensaje
+        noSplit: No se puede splitar
     rounding: Redondeo
     noVerifiedData: Sin datos comprobados
     purchaseRequest: Petición de compra

src/utils/notifyResults.js

@@ -1,19 +0,0 @@
-import { Notify } from 'quasar';
-
-export default function (results, key) {
-    results.forEach((result, index) => {
-        if (result.status === 'fulfilled') {
-            const data = JSON.parse(result.value.config.data);
-            Notify.create({
-                type: 'positive',
-                message: `Operación (${index + 1}) ${data[key]} completada con éxito.`,
-            });
-        } else {
-            const data = JSON.parse(result.reason.config.data);
-            Notify.create({
-                type: 'negative',
-                message: `Operación (${index + 1}) ${data[key]} fallida: ${result.reason.message}`,
-            });
-        }
-    });
-}