From 9e9132e73e65038a337dc01cb97d979c3cd7680a Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Tue, 30 Jan 2024 14:42:13 -0400 Subject: [PATCH] Fix: Support Cancel Method (#1892) --- .../ADempiere/Form/VPOS2/DialogInfo/pin.vue | 4 ++++ .../ADempiere/Form/VPOS2/MainOrder/index.vue | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/ADempiere/Form/VPOS2/DialogInfo/pin.vue b/src/components/ADempiere/Form/VPOS2/DialogInfo/pin.vue index df304ea316..c5a91d480a 100644 --- a/src/components/ADempiere/Form/VPOS2/DialogInfo/pin.vue +++ b/src/components/ADempiere/Form/VPOS2/DialogInfo/pin.vue @@ -122,6 +122,7 @@ export default defineComponent({ store.commit('setShowedDialogPin', { isShowed: false }) + storedModalDialog.value.cancelMethod() pin.value = '' } @@ -137,6 +138,9 @@ export default defineComponent({ closeDialog() } }) + .finally(() => { + closeDialog() + }) } return { diff --git a/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue b/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue index ceeeff28dc..606c1e71ef 100644 --- a/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue +++ b/src/components/ADempiere/Form/VPOS2/MainOrder/index.vue @@ -277,14 +277,18 @@ export default defineComponent({ }) .then(updateLineResponse => { refreshLine(updateLineResponse) - isLoadingQty.value = false + isLoadingPrice.value = false currentLine.value.isEditCurrentPrice = false }) .catch(() => { - isLoadingQty.value = false + isLoadingPrice.value = false currentLine.value.isEditCurrentPrice = true }) }, + cancelMethod: () => { + currentLine.value.isEditCurrentPrice = false + isLoadingPrice.value = false + }, requestedAccess: 'IsModifyPrice', requestedAmount: price, isShowed: true @@ -328,6 +332,10 @@ export default defineComponent({ currentLine.value.isEditQtyEntered = true }) }, + cancelMethod: () => { + currentLine.value.isEditQtyEntered = false + isLoadingQty.value = false + }, requestedAccess: 'IsAllowsModifyQuantity', requestedAmount: quantity, isShowed: true @@ -374,6 +382,10 @@ export default defineComponent({ isLoadingDiscount.value = false }) }, + cancelMethod: () => { + currentLine.value.isEditDiscount = false + isLoadingDiscount.value = false + }, requestedAccess: 'IsAllowsModifyDiscount', requestedAmount: discount_rate, isShowed: true