Merge pull request #3 from Elshaden/elshaden

Fix Force close a completed Payment,
alifaraun · Sep 16, 2024 · 94603d4 · 94603d4
2 parents e31465e + 80bb826
commit 94603d4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/views/pay.blade.php b/src/views/pay.blade.php
@@ -19,6 +19,7 @@ class MoamalataPay {
                     this.amount = amount;
                     this.merchantReference = merchantReference;
                     this.debug = debug;
+                    this.isCompleteCalled = false
                 }
 
                 log(data) {
@@ -68,6 +69,7 @@ class MoamalataPay {
                         TrxDateTime: secureHashResponse.DateTimeLocalTrxn,
                         SecureHash: secureHashResponse.secureHash,
                         completeCallback: function(data) {
+                            this.isCompleteCalled = true;
                             window.dispatchEvent(
                                 new CustomEvent('moamalatCompleted', {
                                     detail: data
@@ -91,9 +93,11 @@ class MoamalataPay {
                             });
                         },
                         cancelCallback: function() {
-                            window.dispatchEvent(
-                                new CustomEvent('moamalatCancel')
-                            )
+                               if (!this.isCompleteCalled) {
+                                    window.dispatchEvent(
+                                    new CustomEvent('moamalatCancel')
+                                )
+                               }
                             parent_.log({
                                 "status": "canceled"
                             });