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

Migrate in-store-pickup email to strict mode #3385

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Migrate in-store-pickup email to strict mode #3385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ded418
Migrate in-store-pickup email to strict mode
smartexcan May 24, 2023
281ec82
Merge branch 'develop' into in-store-pickup-email
smartexcan Jul 11, 2023
c2b794c
Merge branch 'develop' into in-store-pickup-email
smartexcan Dec 4, 2023
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
3 changes: 3 additions & 0 deletions InventoryInStorePickupSales/Model/Order/Email/ReadyForPickupSender.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ protected function prepareTemplate(Order $order)
'order' => $order,
'store' => $order->getStore(),
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
'order_data' => [
'customer_name' => $order->getCustomerName()
]
];
$transportObject = new DataObject($transport);

Expand Down
17 changes: 7 additions & 10 deletions InventoryInStorePickupSales/view/frontend/email/order_ready_for_pickup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@
* See COPYING.txt for license details.
*/
-->
<!--@subject {{trans "Your %store_name order is ready for pickup" store_name=$store.getFrontendName()}} @-->
<!--@subject {{trans "Your %store_name order is ready for pickup" store_name=$store.frontend_name}} @-->
<!--@vars {
"var order.getEmailCustomerNote()":"Email Order Note",
"var order.getCustomerName()":"Customer Name",
"var store.getFrontendName()":"Store Name",
"var store.frontend_name":"Store Name",
"var order.increment_id":"Order Id",
"var formattedShippingAddress|raw":"Shipping Address",
"var order.getShippingDescription()":"Shipping Description",
"var store.getFrontendName()|escape":"Store Name",
"var order.getCustomerName()":"Customer Name"
"var order.shipping_description":"Shipping Description",
"var order_data.customer_name":"Customer Name"
} @-->

{{template config_path="design/email/header_template"}}

<table>
<tr class="email-intro">
<td>
<p class="greeting">{{trans "%customer_name," customer_name=$order.getCustomerName()}}</p>
<p class="greeting">{{trans "%customer_name," customer_name=$order_data.customer_name}}</p>
<p>
{{trans "Your order placed from %store_name is ready for pickup." store_name=$store.getFrontendName()}}
{{trans "Your order placed from %store_name is ready for pickup." store_name=$store.frontend_name}}
</p>
</td>
</tr>
Expand All @@ -46,7 +43,7 @@ <h3>{{trans "Shipping Info"}}</h3>
<tr>
<td class="method-info">
<h3>{{trans "Shipping Method"}}</h3>
<p>{{var order.getShippingDescription()}}</p>
<p>{{var order.shipping_description}}</p>
</td>
</tr>
</table>
Expand Down