Merge remote-tracking branch 'origin/MAGETWO-71759' into MPI-PR-Regression2

Author: iivashchenko

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

@@ -5,33 +5,46 @@
  */
 
 ?>
-<?php if ($block->hasMethods()): ?>
+<?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++; ?>
+    <?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]"
+        <?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; ?>
-                   class="admin__control-radio<?php if ($_counter == $_methodsCount) : ?> validate-one-required-by-name<?php endif; ?>"/>
+                   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"
+                <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>
+            <label class="admin__field-label"
+                   for="p_method_<?= $block->escapeHtml($_code); ?>"><?= $block->escapeHtml($_method->getTitle()) ?>
+            </label>
         </dt>
         <dd class="admin__payment-method-wrapper">
-            <?= $block->getChildHtml('payment.method.' . $_code) ?>
+            <?= /* @noEscape */ $block->getChildHtml('payment.method.' . $_code) ?>
         </dd>
     <?php endforeach; ?>
     </dl>
@@ -42,11 +55,11 @@
             'Magento_Sales/order/create/form'
         ], function(mage) {
             mage.apply();
-        <?php if ($_methodsCount != 1):?>
+        <?php if ($_methodsCount != 1) : ?>
             order.setPaymentMethod('<?= $block->escapeHtml($block->getSelectedMethodCode()); ?>');
         <?php endif; ?>
         });
     </script>
-<?php else: ?>
+<?php else : ?>
     <div class="admin__message-empty"><?= $block->escapeHtml(__('No Payment Methods')); ?></div>
 <?php endif; ?>