MAGETWO-82653: GitHub 11380 #11683

 - Merge Pull Request #11683 from serhii-balko/magento2:github-11380
 - Merged commits:
   1. 07d43db
   2. af15ed0
   3. 155eb77

Author: Oleksii Korshenko

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

@@ -55,9 +55,7 @@
             'Magento_Sales/order/create/form'
         ], function(mage) {
             mage.apply();
-        <?php if ($_methodsCount != 1) : ?>
             order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
-        <?php endif; ?>
         });
     </script>
 <?php else : ?>

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

@@ -45,6 +45,11 @@ public function testContentUpdated()
         $block = $this->layout->createBlock(Form::class, 'order_billing_method');
         $block->setTemplate('Magento_Sales::order/create/billing/method/form.phtml');
 
-        $this->assertContains('mage.apply()', $block->toHtml());
+        $html = $block->toHtml();
+        $this->assertContains('mage.apply()', $html);
+        $this->assertContains(
+            "order.setPaymentMethod('" . $block->escapeHtml($block->getSelectedMethodCode()) . "')",
+            $html
+        );
     }
 }