From 6bb758b88ce42d932c888eff78d551ab0ddf2bce Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 18 Feb 2025 00:40:13 +0100 Subject: [PATCH 1/4] fix: reload table when apply discount --- src/pages/Ticket/Card/TicketSale.vue | 40 +++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index b849b3b35d6..fa3c146ceee 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -57,7 +57,7 @@ const canProceed = ref(); watch( () => route.params.id, - () => tableRef.value.reload() + () => tableRef.value.reload(), ); const columns = computed(() => [ @@ -133,7 +133,7 @@ const columns = computed(() => [ align: 'left', label: t('globals.amount'), name: 'amount', - format: (row) => parseInt(row.amount * row.quantity), + format: (row) => toCurrency(getSaleTotal(row)), }, { align: 'left', @@ -200,7 +200,7 @@ const changeQuantity = async (sale) => { await updateQuantity(sale); } catch (e) { const { quantity } = tableRef.value.CrudModelRef.originalData.find( - (s) => s.id === sale.id + (s) => s.id === sale.id, ); sale.quantity = quantity; throw e; @@ -331,8 +331,7 @@ const updateDiscount = async (sales, newDiscount = null) => { }; await axios.post(`Tickets/${route.params.id}/updateDiscount`, params); notify('globals.dataSaved', 'positive'); - for (let sale of sales) sale.discount = _newDiscount; - edit.value = { ...DEFAULT_EDIT }; + tableRef.value.reload(); }; const getNewPrice = computed(() => { @@ -505,7 +504,7 @@ async function isSalePrepared(item) { componentProps: { title: t('Item prepared'), message: t( - 'This item is already prepared. Do you want to continue?' + 'This item is already prepared. Do you want to continue?', ), data: item, }, @@ -527,7 +526,7 @@ watch( if (newItemFk) { updateItem(newRow.value); } - } + }, ); @@ -597,7 +596,7 @@ watch( openConfirmationModal( t('Continue anyway?'), t('You are going to delete lines of the ticket'), - removeSales + removeSales, ) " > @@ -826,21 +825,24 @@ watch( :mana-code="manaCode" @save="changeDiscount(row)" > - -
- -
+ {{ toPercentage(row.discount / 100) }} - From 93401dfcdca0100113b9003e3664c4ca7c78ce6c Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Tue, 18 Feb 2025 00:40:39 +0100 Subject: [PATCH 2/4] fix: use mana in ticketSale.discount --- src/components/ui/VnUsesMana.vue | 5 +++++ src/pages/Ticket/Card/TicketEditMana.vue | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/ui/VnUsesMana.vue b/src/components/ui/VnUsesMana.vue index 891de5f630d..ee2888e44a2 100644 --- a/src/components/ui/VnUsesMana.vue +++ b/src/components/ui/VnUsesMana.vue @@ -53,3 +53,8 @@ const manaCode = ref(props.manaCode); /> + + es: + Promotion mana: Maná promoción + Claim mana: Maná reclamación + diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue index 693875712d1..a55658a07e7 100644 --- a/src/pages/Ticket/Card/TicketEditMana.vue +++ b/src/pages/Ticket/Card/TicketEditMana.vue @@ -47,7 +47,10 @@ const cancel = () => {
Mana: {{ toCurrency(mana) }}
- + +
+ +
{{ t('New price') }} @@ -56,9 +59,6 @@ const cancel = () => {
-
- -
Date: Tue, 18 Feb 2025 10:08:28 +0100 Subject: [PATCH 3/4] fix: refs #8225 update email verification condition in WorkerDescriptorMenu --- src/pages/Worker/Card/WorkerDescriptorMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Worker/Card/WorkerDescriptorMenu.vue b/src/pages/Worker/Card/WorkerDescriptorMenu.vue index 8d82dc839f7..0dcb4fd7115 100644 --- a/src/pages/Worker/Card/WorkerDescriptorMenu.vue +++ b/src/pages/Worker/Card/WorkerDescriptorMenu.vue @@ -53,7 +53,7 @@ const showChangePasswordDialog = () => { Date: Tue, 18 Feb 2025 10:22:26 +0100 Subject: [PATCH 4/4] fix: refs #6943 rollback --- src/components/common/VnCardBeta.vue | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue index 16fc14c2c41..d2bed62575c 100644 --- a/src/components/common/VnCardBeta.vue +++ b/src/components/common/VnCardBeta.vue @@ -38,23 +38,17 @@ onBeforeMount(async () => { } }); -if (props.baseUrl) { - onBeforeRouteUpdate(async (to, from) => { - if (hasRouteParam(to.params)) { - const { matched } = router.currentRoute.value; - const { name } = matched.at(-3); - if (name) { - router.push({ name, params: to.params }); - } - } - if (to.params.id !== from.params.id) { - arrayData.store.url = `${props.baseUrl}/${to.params.id}`; - await arrayData.fetch({ append: false, updateRouter: false }); - } - }); -} -function hasRouteParam(params, valueToCheck = ':addressId') { - return Object.values(params).includes(valueToCheck); +onBeforeRouteUpdate(async (to, from) => { + const id = to.params.id; + if (id !== from.params.id) await fetch(id, true); +}); + +async function fetch(id, append = false) { + const regex = /\/(\d+)/; + if (props.idInWhere) arrayData.store.filter.where = { id }; + else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`; + else arrayData.store.url = props.url.replace(regex, `/${id}`); + await arrayData.fetch({ append, updateRouter: false }); }