From 3b9ccab48c2d47fe0177368210b18b77bceaa09c Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 20 Jan 2025 08:01:46 +0100 Subject: [PATCH 1/3] fix: redirect to Ticketsale when confirming an order --- src/pages/Order/Card/OrderLines.vue | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue index 6093addb5eb..36dc3883e77 100644 --- a/src/pages/Order/Card/OrderLines.vue +++ b/src/pages/Order/Card/OrderLines.vue @@ -208,15 +208,28 @@ async function remove(item) { async function handleConfirm() { const result = await confirm(route.params.id); if (result) { + const sale = await axios.get(`OrderRows`, { + params: { + filter: JSON.stringify({ + where: { orderFk: route.params.id }, + }), + }, + }); + const ticket = await axios.get(`Sales`, { + params: { + filter: JSON.stringify({ + where: { id: sale.data[0].saleFk }, + }), + }, + }); quasar.notify({ message: t('globals.dataSaved'), type: 'positive', }); router.push({ name: 'TicketSale', - query: { - table: JSON.stringify({ id: route.params.id }), - }, + params: { id: ticket.data[0].ticketFk }, + query: { table: JSON.stringify({ filter: { limit: 20, skip: 0 } }) }, }); } } From a1254b25b4309d32de3ecfb54e0dbc0810d2d736 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 20 Jan 2025 11:26:57 +0100 Subject: [PATCH 2/3] fix: fix ticketSale quantity --- src/pages/Ticket/Card/TicketSale.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index 8aa785c74bf..7a8b4a83d7b 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -54,7 +54,6 @@ const transfer = ref({ }); const tableRef = ref([]); const canProceed = ref(); -const isLoading = ref(false); watch( () => route.params.id, @@ -197,6 +196,7 @@ const changeQuantity = async (sale) => { try { if (!rowToUpdate.value) return; rowToUpdate.value = null; + sale.isNew = false; await updateQuantity(sale); } catch (e) { const { quantity } = tableRef.value.CrudModelRef.originalData.find( @@ -214,9 +214,6 @@ const updateQuantity = async ({ quantity, id }) => { }; const addSale = async (sale) => { - if (isLoading.value) return; - - isLoading.value = true; const params = { barcode: sale.itemFk, quantity: sale.quantity, @@ -237,6 +234,7 @@ const addSale = async (sale) => { sale.item = newSale.item; notify('globals.dataSaved', 'positive'); + sale.isNew = false; arrayData.fetch({}); }; From a3cdb18535da81554c280e4aa3d424dfd6a03280 Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 20 Jan 2025 12:04:59 +0100 Subject: [PATCH 3/3] fix: fix use-like --- src/pages/Ticket/Card/TicketSale.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index 7a8b4a83d7b..b849b3b35d6 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -752,6 +752,7 @@ watch( option-label="name" option-value="id" v-model="row.itemFk" + :use-like="false" @update:model-value="updateItem(row)" >