ACP2E-127:Asynchronous order emails from non-default websites has default website logo URL

Author: pradeep.rauthan

app/code/Magento/Email/Model/AbstractTemplate.php

@@ -771,6 +771,10 @@ public function getUrl(Store $store, $route = '', $params = [])
         if ($this->storeManager->getStore()->getId() != $store->getId()) {
             $params['_scope_to_url'] = true;
         }
+
+        // Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl in multi-store environment
+        $params['_escape_params'] = $store->getCode();
+
         return $url->getUrl($route, $params);
     }
 }

app/code/Magento/Email/Model/Template/Filter.php

@@ -591,6 +591,10 @@ public function storeDirective($construction)
             unset($params['url']);
         }
 
+        // Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl in multi-store environment
+        $this->urlModel->setScope($this->_storeManager->getStore());
+        $params['_escape_params'] = $this->_storeManager->getStore()->getCode();
+
         return $this->urlModel->getUrl($path, $params);
     }