From bd9915edfacb459b222523aaf0e8c11286482490 Mon Sep 17 00:00:00 2001 From: Vadym Okun <mr.cbmd@gmail.com> Date: Fri, 26 Jun 2015 14:39:47 +0300 Subject: [PATCH] Added containers to invoice and shipping creation sections --- .../Sales/view/adminhtml/layout/sales_order_invoice_new.xml | 2 ++ .../view/adminhtml/templates/order/invoice/create/items.phtml | 2 ++ .../view/adminhtml/layout/adminhtml_order_shipment_new.xml | 2 ++ .../Shipping/view/adminhtml/templates/create/items.phtml | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml index f31b37ea47d..f11eaee813d 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/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> diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml index 0253050d8f3..332ab7c3518 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml +++ b/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> diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml index de964564823..30b7eb8ccfa 100644 --- a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml +++ b/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"/> diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml index d871532f2d4..f94db78338f 100644 --- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml +++ b/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> -- GitLab