Merge pull request #2028 from magento-chaika/Chaika_2.2.4_PR2

Chaika_2.2.4_PR2

Author: Alexander Akimov

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

@@ -6,57 +6,60 @@
 
 ?>
 <?php if ($block->hasMethods()) : ?>
-<div id="order-billing_method_form">
-    <dl class="admin__payment-methods">
-    <?php
-        $_methods = $block->getMethods();
-        $_methodsCount = count($_methods);
-        $_counter = 0;
-    ?>
-    <?php foreach ($_methods as $_method) :
-        $_code = $_method->getCode();
-        $_counter++;
-    ?>
-        <dt class="admin__field-option">
-        <?php if ($_methodsCount > 1) : ?>
-            <input id="p_method_<?= $block->escapeHtml($_code); ?>"
-                   value="<?= $block->escapeHtml($_code); ?>"
-                   type="radio" name="payment[method]"
-                   title="<?= $block->escapeHtml($_method->getTitle()); ?>"
-                   onclick="payment.switchMethod('<?= $block->escapeHtml($_code); ?>')"
-                    <?php if ($block->getSelectedMethodCode() == $_code) : ?>
-                    checked="checked"
+    <div id="order-billing_method_form">
+        <dl class="admin__payment-methods">
+            <?php
+                $_methods = $block->getMethods();
+                $_methodsCount = count($_methods);
+                $_counter = 0;
+                $currentSelectedMethod = $block->getSelectedMethodCode();
+            ?>
+            <?php foreach ($_methods as $_method) :
+                $_code = $_method->getCode();
+                $_counter++;
+            ?>
+                <dt class="admin__field-option">
+                    <?php if ($_methodsCount > 1) : ?>
+                        <input id="p_method_<?= $block->escapeHtml($_code); ?>"
+                               value="<?= $block->escapeHtml($_code); ?>"
+                               type="radio" name="payment[method]"
+                               title="<?= $block->escapeHtml($_method->getTitle()); ?>"
+                               onclick="payment.switchMethod('<?= $block->escapeHtml($_code); ?>')"
+                            <?php if ($block->getSelectedMethodCode() == $_code) : ?>
+                                checked="checked"
+                            <?php endif; ?>
+                            <?php $className = ($_counter == $_methodsCount) ? ' validate-one-required-by-name' : ''; ?>
+                               class="admin__control-radio<?= $block->escapeHtml($className); ?>"/>
+                    <?php else : ?>
+                        <span class="no-display">
+                            <input id="p_method_<?= $block->escapeHtml($_code); ?>"
+                                   value="<?= $block->escapeHtml($_code); ?>"
+                                   type="radio"
+                                   name="payment[method]" class="admin__control-radio"
+                                   checked="checked"/>
+                        </span>
                     <?php endif; ?>
-                    <?php $className = ($_counter == $_methodsCount) ? ' validate-one-required-by-name' : ''; ?>
-                   class="admin__control-radio<?= $block->escapeHtml($className); ?>"/>
-        <?php else :?>
-            <span class="no-display">
-                <input id="p_method_<?= $block->escapeHtml($_code); ?>"
-                       value="<?= $block->escapeHtml($_code); ?>"
-                       type="radio"
-                       name="payment[method]" class="admin__control-radio"
-                       checked="checked"/>
-            </span>
-        <?php endif;?>
 
-            <label class="admin__field-label"
-                   for="p_method_<?= $block->escapeHtml($_code); ?>"><?= $block->escapeHtml($_method->getTitle()) ?>
-            </label>
-        </dt>
-        <dd class="admin__payment-method-wrapper">
-            <?= /* @noEscape */ $block->getChildHtml('payment.method.' . $_code) ?>
-        </dd>
-    <?php endforeach; ?>
-    </dl>
-</div>
+                    <label class="admin__field-label" for="p_method_<?= $block->escapeHtml($_code); ?>">
+                        <?= $block->escapeHtml($_method->getTitle()) ?>
+                    </label>
+                </dt>
+                <dd class="admin__payment-method-wrapper">
+                    <?= /* @noEscape */ $block->getChildHtml('payment.method.' . $_code) ?>
+                </dd>
+            <?php endforeach; ?>
+        </dl>
+    </div>
     <script>
         require([
             'mage/apply/main',
             'Magento_Sales/order/create/form'
         ], function(mage) {
             mage.apply();
         <?php if ($_methodsCount != 1) : ?>
-            order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
+            order.setPaymentMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
+        <?php else : ?>
+            payment.switchMethod('<?= $block->escapeHtml($currentSelectedMethod); ?>');
         <?php endif; ?>
         });
     </script>