Merge remote-tracking branch 'origin/MAGETWO-37630-PR' into PR

Author: Natalia Momotenko

app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml

@@ -4,5 +4,10 @@
  * See COPYING.txt for license details.
  */
 ?>
-<p><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></p>
-<p><?php echo __('Purchase Order Number: %1', $block->escapeHtml($block->getInfo()->getPoNumber())) ?></p>
+<div class="order-payment-method-name"><?php echo $block->escapeHtml($block->getMethod()->getTitle()); ?></div>
+<table class="data-table admin__table-secondary">
+    <tr>
+        <th><?php echo $block->escapeHtml(__('Purchase Order Number')); ?>:</th>
+        <td><?php echo $block->escapeHtml($block->getInfo()->getPoNumber()); ?></td>
+    </tr>
+</table>

app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml

@@ -15,7 +15,7 @@
 <?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
 
 <?php if ($_specificInfo = $block->getSpecificInformation()):?>
-<table class="data-table">
+<table class="data-table admin__table-secondary">
 <?php foreach ($_specificInfo as $_label => $_value):?>
     <tr>
         <th><?php echo $block->escapeHtml($_label)?>:</th>

app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml

@@ -25,7 +25,7 @@
                 <span class="title"><?php echo __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
                 <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
                 <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
             </div>

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

@@ -22,7 +22,7 @@
                     <span class="title"><?php echo __('Payment Information') ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
-                    <div><?php echo $block->getChildHtml('order_payment') ?></div>
+                    <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
                     <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
                     <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
                 </div>

app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml

@@ -22,7 +22,7 @@
                 <span class="title"><?php echo __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
                 <div class="order-payment-currency">
                     <?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
                 </div>

app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml

@@ -28,7 +28,7 @@
                 <span class="title"><?php echo __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div><?php echo $block->getPaymentHtml() ?></div>
+                <div class="order-payment-method-title"><?php echo $block->getPaymentHtml() ?></div>
                 <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
                 <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
             </div>

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

@@ -35,6 +35,9 @@
     .data-grid {
         .action-configure {
             float: right;
+            &.disabled {
+                display: none;
+            }
         }
         .col-id,
         .col-price,

app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less

@@ -10,7 +10,7 @@
 .admin__payment-method-wapper {
     margin: 0;
     .admin__field {
-        margin-left: -4rem;
+        margin-left: 0;
         &:first-child {
             margin-top: 1.5rem;
         }
@@ -81,11 +81,20 @@
     }
 }
 
-.order-payment-method-title,
 .shipping-description-title {
     font-weight: @font-weight__bold;
 }
 
 .action-create-label {
     margin: @indent__s 0;
 }
+
+.order-payment-method-title {
+    + .order-payment-currency {
+        margin-top: @indent__s;
+    }
+    .admin__table-secondary {
+        margin-top: @indent__s;
+        &:extend(.abs-admin__table-secondary-edit-order all);
+    }
+}