Merge remote-tracking branch 'origin/MAGETWO-90104' into 2.3-develop-pr10-2

Author: zakdma

app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js

@@ -145,6 +145,8 @@ define([
         _initBraintree: function () {
             var self = this;
 
+            this.disableEventListeners();
+
             self.braintree.setup(self.clientToken, 'custom', {
                 id: self.selector,
                 hostedFields: self.getHostedFields(),
@@ -154,6 +156,7 @@ define([
                  */
                 onReady: function () {
                     $('body').trigger('processStop');
+                    self.enableEventListeners();
                 },
 
                 /**

app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml

@@ -12,6 +12,7 @@
         $_methods = $block->getMethods();
         $_methodsCount = count($_methods);
         $_counter = 0;
+        $currentSelectedMethod = $block->getSelectedMethodCode();
     ?>
     <?php foreach ($_methods as $_method) :
         $_code = $_method->getCode();
@@ -24,7 +25,7 @@
                    type="radio" name="payment[method]"
                    title="<?= $block->escapeHtml($_method->getTitle()); ?>"
                    onclick="payment.switchMethod('<?= $block->escapeHtml($_code); ?>')"
-                    <?php if ($block->getSelectedMethodCode() == $_code) : ?>
+                    <?php if ($currentSelectedMethod == $_code) : ?>
                     checked="checked"
                     <?php endif; ?>
                     <?php $className = ($_counter == $_methodsCount) ? ' validate-one-required-by-name' : ''; ?>
@@ -39,8 +40,8 @@
             </span>
         <?php endif;?>
 
-            <label class="admin__field-label"
-                   for="p_method_<?= $block->escapeHtml($_code); ?>"><?= $block->escapeHtml($_method->getTitle()) ?>
+            <label class="admin__field-label" for="p_method_<?= $block->escapeHtml($_code); ?>">
+                <?= $block->escapeHtml($_method->getTitle()) ?>
             </label>
         </dt>
         <dd class="admin__payment-method-wrapper">
@@ -55,7 +56,11 @@
             'Magento_Sales/order/create/form'
         ], function(mage) {
             mage.apply();
-            order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
+        <?php if ($_methodsCount !== 1) : ?>
+            order.setPaymentMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
+        <?php else : ?>
+            payment.switchMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
+        <?php endif; ?>
         });
     </script>
 <?php else : ?>

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/FormTest.php

@@ -47,9 +47,5 @@ public function testContentUpdated()
 
         $html = $block->toHtml();
         $this->assertContains('mage.apply()', $html);
-        $this->assertContains(
-            "order.setPaymentMethod('" . $block->escapeHtml($block->getSelectedMethodCode()) . "')",
-            $html
-        );
     }
 }