Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Success message is not showing when creating invoice & shipment simultaniously #19942 #20391

Merged
merged 1 commit into from
Mar 11, 2019
Merged

Success message is not showing when creating invoice & shipment simultaniously #19942 #20391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/shipment_new.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
</tr>
</table>
{{/depend}}
{{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
{{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
<table class="order-details">
<tr>
<td class="address-details">
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
</tr>
</table>
{{/depend}}
{{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
{{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
<table class="order-details">
<tr>
<td class="address-details">
Expand Down
13 changes: 13 additions & 0 deletions app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_track.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<update handle="sales_email_order_shipment_renderers"/>
<body>
<block class="Magento\Framework\View\Element\Template" name="sales.order.email.shipment.track" template="Magento_Sales::email/shipment/track.phtml"/>
</body>
</page>
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
</tr>
</table>
{{/depend}}
{{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
{{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
<table class="order-details">
<tr>
<td class="address-details">
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h1>{{trans "Your Shipment #%shipment_id for Order #%order_id" shipment_id=$ship
</tr>
</table>
{{/depend}}
{{block class='Magento\\Framework\\View\\Element\\Template' area='frontend' template='Magento_Sales::email/shipment/track.phtml' shipment=$shipment order=$order}}
{{layout handle="sales_email_order_shipment_track" shipment=$shipment order=$order}}
<table class="order-details">
<tr>
<td class="address-details">
Expand Down