MC-42486: Region ID and Country ID values and not properly converted in Email templates

devarul · devarul · commit f5f18475569f · 2021-06-10T01:51:48.000+05:30
- Converted country id and region id into country name and region name
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
@@ -36,6 +36,7 @@
 use Magento\Variable\Model\Variable;
 use Magento\Variable\Model\VariableFactory;
 use Psr\Log\LoggerInterface;
+use Magento\Store\Model\Information as StoreInformation;
 
 /**
  * Core Email Template Filter Model
@@ -201,6 +202,11 @@ class Filter extends Template
      */
     private $pubDirectoryRead;
 
+    /**
+     * @var StoreInformation
+     */
+    private $storeInformation;
+
 
     /**
      * Filter constructor.
@@ -222,6 +228,7 @@ class Filter extends Template
      * @param CssInliner $cssInliner
      * @param array $variables
      * @param array $directiveProcessors
+     * @param StoreInformation|null $storeInformation
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -242,7 +249,8 @@ public function __construct(
         Filesystem $pubDirectory,
         CssInliner $cssInliner,
         $variables = [],
-        array $directiveProcessors = []
+        array $directiveProcessors = [],
+        StoreInformation $storeInformation = null
     ) {
         $this->_escaper = $escaper;
         $this->_assetRepo = $assetRepo;
@@ -259,6 +267,8 @@ public function __construct(
         $this->cssProcessor = $cssProcessor;
         $this->pubDirectory = $pubDirectory;
         $this->configVariables = $configVariables;
+        $this->storeInformation = $storeInformation ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(StoreInformation::class);
         parent::__construct($string, $variables, $directiveProcessors, $variableResolver);
     }
 
@@ -825,18 +835,29 @@ private function validateProtocolDirectiveHttpScheme(array $params) : void
      *
      * @param string[] $construction
      * @return string
+     * @throws NoSuchEntityException
      */
     public function configDirective($construction)
     {
         $configValue = '';
         $params = $this->getParameters($construction[2]);
         $storeId = $this->getStoreId();
+        $store = $this->_storeManager->getStore($storeId);
+        $storeInformationObj = $this->storeInformation
+            ->getStoreInformationObject($store);
         if (isset($params['path']) && $this->isAvailableConfigVariable($params['path'])) {
             $configValue = $this->_scopeConfig->getValue(
                 $params['path'],
                 ScopeInterface::SCOPE_STORE,
                 $storeId
             );
+            if ($params['path'] == "general/store_information/country_id") {
+                $configValue = $storeInformationObj->getData('country');
+            } elseif ($params['path'] == "general/store_information/region_id") {
+                $configValue = $storeInformationObj->getData('region')?
+                    $storeInformationObj->getData('region'):
+                    $configValue;
+            }
         }
         return $configValue;
     }
diff --git a/app/code/Magento/Email/view/frontend/email/footer.html b/app/code/Magento/Email/view/frontend/email/footer.html
@@ -6,9 +6,7 @@
 -->
 <!--@subject {{trans "Footer"}} @-->
 <!--@vars {
-"var store.frontend_name":"Store Name",
-"var store_country":"Country Name",
-"var store_region":"Region Name"
+"var store.frontend_name":"Store Name"
 } @-->
 
                     <!-- End Content -->
diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html
@@ -10,9 +10,7 @@
 "var logo_alt":"Email Logo Alt Text",
 "var logo_height":"Email Logo Image Height",
 "var logo_width":"Email Logo Image Width",
-"var template_styles|raw":"Template CSS",
-"var store_country":"Country Name",
-"var store_region":"Region Name"
+"var template_styles|raw":"Template CSS"
 } @-->
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/app/design/frontend/Magento/luma/Magento_Email/email/footer.html b/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
@@ -11,9 +11,7 @@
 "var url_customer_service":"Customer Service URL",
 "var store_phone":"Store Phone",
 "var store_hours":"Store Hours",
-"var store.formatted_address|raw":"Store Address",
-"var store_country":"Country Name",
-"var store_region":"Region Name"
+"var store.formatted_address|raw":"Store Address"
 } @-->
 
                     <!-- End Content -->
