Merge pull request #5718 from magento-chaika/Chaika-PR-MC-32767

Chaika-PR-MC-32767

Author: dhorytskyi

app/code/Magento/Sales/view/frontend/email/order_new_guest.html

@@ -8,7 +8,7 @@
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var order_data.email_customer_note|escape|nl2br":"Email Order Note",
-"var order.billing_address.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var created_at_formatted":"Order Created At (datetime)",
 "var order.increment_id":"Order Id",
 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
@@ -29,7 +29,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.billing_address.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans "Once your package ships we will send an email with a link to track your order."}}

app/code/Magento/User/Model/Notificator.php

@@ -107,6 +107,7 @@ public function sendForgotPassword(UserInterface $user): void
             $this->sendNotification(
                 'admin/emails/forgot_email_template',
                 [
+                    'username' => $user->getFirstName().' '.$user->getLastName(),
                     'user' => $user,
                     'store' => $this->storeManager->getStore(
                         Store::DEFAULT_STORE_ID

app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html

@@ -4,16 +4,17 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Password Reset Confirmation for %name" name=$user.name}} @-->
+<!--@subject {{trans "Password Reset Confirmation for %name" name=$username}} @-->
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var user.id":"Account Holder Id",
 "var user.rp_token":"Reset Password Token",
 "var user.name":"Account Holder Name",
-"store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.id _query_token=$user.rp_token":"Reset Password URL"
+"store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.id _query_token=$user.rp_token":"Reset Password URL",
+"var username":"Account Holder Name"
 } @-->
 
-{{trans "%name," name=$user.name}}
+{{trans "%name," name=$username}}
 
 {{trans "There was recently a request to change the password for your account."}}
 

app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html

@@ -8,7 +8,7 @@
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var order_data.email_customer_note|escape|nl2br":"Email Order Note",
-"var order.billing_address.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var created_at_formatted":"Order Created At (datetime)",
 "var order.increment_id":"Order Id",
 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
@@ -27,7 +27,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$order.billing_address.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans "Once your package ships we will send you a tracking number."}}

lib/internal/Magento/Framework/Filter/VariableResolver/StrictResolver.php

@@ -9,10 +9,12 @@
 namespace Magento\Framework\Filter\VariableResolver;
 
 use Magento\Email\Model\AbstractTemplate;
+use Magento\Framework\Data\Collection;
 use Magento\Framework\DataObject;
 use Magento\Framework\Filter\Template;
 use Magento\Framework\Filter\Template\Tokenizer\VariableFactory;
 use Magento\Framework\Filter\VariableResolverInterface;
+use Magento\Framework\Phrase;
 
 /**
  * Resolves variables allowing only scalar values
@@ -57,11 +59,8 @@ public function resolve(string $value, Template $filter, array $templateVariable
             }
         }
 
-        if (isset($stackArgs[$last]['variable'])
-            && (is_scalar($stackArgs[$last]['variable']) || is_array($stackArgs[$last]['variable']))
-        ) {
-            // If value for construction exists set it
-            $result = $stackArgs[$last]['variable'];
+        if (isset($stackArgs[$last]['variable'])) {
+            $result = $this->assignResolvedVariable($stackArgs[$last]['variable']);
         }
 
         return $result;
@@ -168,4 +167,25 @@ private function shouldHandleDataAccess(int $i, array &$stackArgs): bool
                 || is_array($stackArgs[$i - 1]['variable'])
             );
     }
+
+    /**
+     * Assign resolved variable
+     *
+     * @param mixed $stackArg
+     * @return mixed|null
+     */
+    private function assignResolvedVariable($stackArg)
+    {
+        $result = null;
+        if (isset($stackArg) && (
+            is_scalar($stackArg) || is_array($stackArg) ||
+            $stackArg instanceof Collection || $stackArg instanceof Phrase
+            )
+        ) {
+            // If value for construction exists set it
+            $result = $stackArg;
+        }
+
+        return $result;
+    }
 }