Skip to content

Commit 9a4cb39

Browse files
pradeep.rauthanpradeep.rauthan
authored andcommitted
ACP@E-127:Asynchronous order emails from non-default websites has default website logo URL
1 parent 6f3107a commit 9a4cb39

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,10 @@ public function getUrl(Store $store, $route = '', $params = [])
772772
$params['_scope_to_url'] = true;
773773
}
774774

775-
// Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl in multi-store environment
775+
/**
776+
* Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl
777+
* in multi-store environment
778+
*/
776779
$params['_escape_params'] = $store->getCode();
777780

778781
return $url->getUrl($route, $params);

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Magento\Cms\Block\Block;
1212
use Magento\Framework\App\Area;
1313
use Magento\Framework\App\Config\ScopeConfigInterface;
14+
use Magento\Framework\App\ObjectManager;
1415
use Magento\Framework\App\State;
1516
use Magento\Framework\Css\PreProcessor\Adapter\CssInliner;
1617
use Magento\Framework\Escaper;
@@ -30,14 +31,13 @@
3031
use Magento\Framework\View\Element\AbstractBlock;
3132
use Magento\Framework\View\LayoutFactory;
3233
use Magento\Framework\View\LayoutInterface;
34+
use Magento\Store\Model\Information as StoreInformation;
3335
use Magento\Store\Model\ScopeInterface;
3436
use Magento\Store\Model\StoreManagerInterface;
3537
use Magento\Variable\Model\Source\Variables;
3638
use Magento\Variable\Model\Variable;
3739
use Magento\Variable\Model\VariableFactory;
3840
use Psr\Log\LoggerInterface;
39-
use Magento\Store\Model\Information as StoreInformation;
40-
use Magento\Framework\App\ObjectManager;
4141

4242
/**
4343
* Core Email Template Filter Model
@@ -591,7 +591,10 @@ public function storeDirective($construction)
591591
unset($params['url']);
592592
}
593593

594-
// Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl in multi-store environment
594+
/**
595+
* Pass extra parameter to distinguish stores urls for property Magento\Framework\Url $cacheUrl
596+
* in multi-store environment
597+
*/
595598
$this->urlModel->setScope($this->_storeManager->getStore());
596599
$params['_escape_params'] = $this->_storeManager->getStore()->getCode();
597600

@@ -858,8 +861,8 @@ public function configDirective($construction)
858861
if ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_COUNTRY_CODE) {
859862
$configValue = $storeInformationObj->getData('country');
860863
} elseif ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_REGION_CODE) {
861-
$configValue = $storeInformationObj->getData('region')?
862-
$storeInformationObj->getData('region'):
864+
$configValue = $storeInformationObj->getData('region') ?
865+
$storeInformationObj->getData('region') :
863866
$configValue;
864867
}
865868
}

0 commit comments

Comments
 (0)