Fix Braintree error showing despite successful MOTO order.

genecommerce · Oct 31, 2019 · 3c8799b · 3c8799b
1 parent 964c349
commit 3c8799b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Gateway/Validator/ResponseValidator.php b/Gateway/Validator/ResponseValidator.php
@@ -29,7 +29,13 @@ static function ($response) {
                         && isset($response->transaction)
                         && in_array(
                             $response->transaction->status,
-                            [Transaction::AUTHORIZED, Transaction::SUBMITTED_FOR_SETTLEMENT, Transaction::SETTLING, Transaction::SETTLEMENT_PENDING]
+                            [
+                                Transaction::AUTHORIZED,
+                                Transaction::SUBMITTED_FOR_SETTLEMENT,
+                                Transaction::SETTLING,
+                                Transaction::SETTLEMENT_PENDING
+                            ],
+                            true
                         ),
                         [__('Wrong transaction status')]
                     ];

diff --git a/view/adminhtml/templates/payment/script.phtml b/view/adminhtml/templates/payment/script.phtml
@@ -20,7 +20,7 @@ $code = $block->escapeHtml($block->getCode());
         ], function(Braintree, $) {
             let config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
                 payment,
-                form = $('#payment_form_<?= $block->escapeJs($code) ?>');
+                form = $('#payment_form_<?= /* @noEscape */ $code ?>');
 
             config.active = form.length > 0 && !form.is(':hidden');
             payment = new Braintree(config);

diff --git a/view/adminhtml/web/js/braintree.js b/view/adminhtml/web/js/braintree.js
@@ -234,7 +234,7 @@ define([
          * Place order
          */
         placeOrder: function () {
-            $('#' + this.container).find('[type="submit"]').trigger('click');
+            $('#' + this.selector).trigger('realOrder');
         },
 
         /**
@@ -312,7 +312,7 @@ define([
                     }
                 } else {
                     this.setPaymentDetails(payload.nonce);
-                    this.placeOrder();
+                    $('#' + this.container).find('[type="submit"]').trigger('click');
                 }
             }.bind(this));
         }