Fix: Support Cancel Method (#1892)

solop-develop · Jan 30, 2024 · 9e9132e · 9e9132e
1 parent 4a57e70
commit 9e9132e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git 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
@@ -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