ENGCOM-4594: Fixed shipping method block alignment issue #21963

Author: sivaschenko

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml

@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormPaymentSection">
-        <element name="header" type="text" selector="#shipping-methods span.title"/>
+        <element name="header" type="text" selector="#order-methods span.title"/>
         <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
         <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
         <element name="shippingError" type="text" selector="#order[has_shipping]-error"/>

app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml

@@ -47,15 +47,17 @@
             </div>
         </section>
 
-        <section id="shipping-methods" class="admin__page-section order-methods">
-            <div id="order-shipping_method" class="admin__page-section-item order-shipping-method">
-                <?= $block->getChildHtml('shipping_method') ?>
+        <section id="order-methods" class="admin__page-section order-methods">
+            <div class="admin__page-section-title">
+                <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Information') ?></span>
             </div>
-        </section>
-
-        <section id="payment-methods" class="admin__page-section payment-methods">
-            <div id="order-billing_method" class="admin__page-section-item order-billing-method">
-                <?= $block->getChildHtml('billing_method') ?>
+            <div class="admin__page-section-content">
+                <div id="order-billing_method" class="admin__page-section-item order-billing-method">
+                    <?= $block->getChildHtml('billing_method') ?>
+                </div>
+                <div id="order-shipping_method" class="admin__page-section-item order-shipping-method">
+                    <?= $block->getChildHtml('shipping_method') ?>
+                </div>
             </div>
         </section>
 

app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less

@@ -55,6 +55,7 @@
     }
 
     .order-billing-address,
+    .order-billing-method,
     .order-history,
     .order-information,
     .order-payment-method,
@@ -64,6 +65,7 @@
     }
 
     .order-shipping-address,
+    .order-shipping-method,
     .order-totals,
     .order-view-account-information .order-account-information {
         float: right;

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php

@@ -105,7 +105,7 @@ class Create extends Block
      *
      * @var string
      */
-    protected $orderMethodsSelector = '#shipping-methods';
+    protected $orderMethodsSelector = '#order-methods';
 
     /**
      * Page header.