Merge pull request #399 from magento-mpi/prs

[Github] Merge public Github commits

Author: vpelipenko

app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml

@@ -24,6 +24,8 @@
                         <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
                             <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
                         </block>
+                        <container name="submit_before" label="Submit Before"/>
+                        <container name="submit_after" label="Submit After"/>
                     </block>
                 </block>
             </block>

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

@@ -123,8 +123,10 @@
                     <label class="admin__field-label" for="send_email"><?php echo __('Email Copy of Invoice') ?></label>
                 </div>
                 <?php endif; ?>
+                <?php echo $block->getChildHtml('submit_before') ?>
                 <div class="actions">
                     <?php echo $block->getChildHtml('submit_button') ?>
+                    <?php echo $block->getChildHtml('submit_after') ?>
                 </div>
             </div>
         </div>

app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml

@@ -18,6 +18,8 @@
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
                         <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
+                        <container name="submit_before" label="Submit Before"/>
+                        <container name="submit_after" label="Submit After"/>
                     </block>
                     <block class="Magento\Shipping\Block\Adminhtml\Order\Tracking" name="shipment_tracking" template="order/tracking.phtml"/>
                     <block class="Magento\Shipping\Block\Adminhtml\Order\Packaging" name="shipment_packaging" template="Magento_Shipping::order/packaging/popup.phtml"/>

app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml

@@ -104,9 +104,10 @@
                         <span><?php echo __('Email Copy of Shipment') ?></span></label>
                 </div>
             <?php endif; ?>
-
+            <?php echo $block->getChildHtml('submit_before') ?>
             <div class="order-history-comments-actions actions">
                 <?php echo $block->getChildHtml('submit_button') ?>
+                <?php echo $block->getChildHtml('submit_after') ?>
             </div>
         </div>
     </div>

app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml

@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildhtml('grid') ?>
+<?php echo $block->getChildHtml('grid') ?>