From 5272e5aaaef380ec43884dbe57c67f36c0dffe6b Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 13 Jan 2025 11:53:55 +0100 Subject: [PATCH 1/3] fix: redirect to sales when confirming lines --- src/pages/Order/Card/OrderLines.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue index e5b683534..6093addb5 100644 --- a/src/pages/Order/Card/OrderLines.vue +++ b/src/pages/Order/Card/OrderLines.vue @@ -213,9 +213,9 @@ async function handleConfirm() { type: 'positive', }); router.push({ - name: 'TicketList', + name: 'TicketSale', query: { - table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }), + table: JSON.stringify({ id: route.params.id }), }, }); } From ac589a86266166376250a61c2597febc3c32c698 Mon Sep 17 00:00:00 2001 From: jorgep Date: Mon, 13 Jan 2025 12:21:33 +0100 Subject: [PATCH 2/3] fix: refs #8110 prevent form submit --- src/boot/qformMixin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js index 187ca6dbc..97d80c670 100644 --- a/src/boot/qformMixin.js +++ b/src/boot/qformMixin.js @@ -31,7 +31,7 @@ export default { console.error(error); } form.addEventListener('keyup', function (evt) { - if (evt.key === 'Enter') { + if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) { const input = evt.target; if (input.type == 'textarea' && evt.shiftKey) { evt.preventDefault(); From 671f30800646b24bcd4e8a45bcf829e621f68fb1 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 13 Jan 2025 13:29:39 +0100 Subject: [PATCH 3/3] revert: revert header --- src/components/ui/CardSummary.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue index 52427f3fe..a1de3eee3 100644 --- a/src/components/ui/CardSummary.vue +++ b/src/components/ui/CardSummary.vue @@ -82,7 +82,7 @@ async function fetch() { - + {{ entity.id + ' - ' + entity.name }}