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

Author: pradeep.rauthan

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

@@ -771,13 +771,6 @@ 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/Plugin/GetUrl.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Email\Model\Plugin;
+
+class GetUrl
+{
+    /**
+     * A unique store parameter need to pass in \Magento\Email\Model\AbstractTemplate `getUrl` function
+     * for separating links in email content for sales order email confirmation.
+     *
+     * @param \Magento\Email\Model\AbstractTemplate $subject
+     * @param \Magento\Store\Model\Store $store
+     * @param string $scope
+     * @return array
+     */
+    public function beforeGetUrl(
+        \Magento\Email\Model\AbstractTemplate $subject,
+        \Magento\Store\Model\Store $store,
+        $route = '',
+        $params = []
+    ) {
+        /**
+         * Pass extra parameter to distinguish stores urls for property \Magento\Email\Model\AbstractTemplate `getUrl`
+         * in multi-store environment
+         */
+        $params['_escape_params'] = $store->getCode();
+
+        return [$store, $route, $params];
+    }
+}

app/code/Magento/Email/Test/Unit/Model/Plugin/GetUrlTest.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Email\Test\Unit\Model\Plugin;
+
+use Magento\Email\Model\Plugin\GetUrl;
+use Magento\Store\Model\Store;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class GetUrlTest extends TestCase
+{
+    /** @var  Store|MockObject */
+    private $storeMock;
+
+    /** @var  GetUrl|Object */
+    private $plugin;
+
+    /**
+     * setUp
+     *
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->storeMock = $this->createMock(Store::class);
+
+        $this->plugin = new GetUrl();
+    }
+
+    /**
+     * Test if unique store parameter passed in third argument `$params` of `beforeGetUrl` function.
+     *
+     * @return void
+     */
+    public function testBeforeGetUrl(): void
+    {
+        $storeCode = 'second_store_view';
+        $params['_escape_params'] = $storeCode;
+        $route = '';
+
+        $abstractTemplateMock = $this->getMockBuilder(\Magento\Email\Model\AbstractTemplate::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeMock->expects($this->once())
+            ->method('getCode')
+            ->willReturn($storeCode);
+
+        $this->assertEquals(
+            [$this->storeMock, $route, $params],
+            $this->plugin->beforeGetUrl($abstractTemplateMock, $this->storeMock, $route, [])
+        );
+    }
+}

app/code/Magento/Email/etc/di.xml

@@ -61,6 +61,9 @@
         <plugin name="WindowsSmtpConfig" type="Magento\Email\Model\Plugin\WindowsSmtpConfig" />
         <plugin name="EmailDisable" type="Magento\Email\Model\Mail\TransportInterfacePlugin" />
     </type>
+    <type name="Magento\Email\Model\AbstractTemplate">
+        <plugin name="EmailTemplateLinkUrl" type="Magento\Email\Model\Plugin\GetUrl"/>
+    </type>
     <type name="Magento\Config\Model\Config\TypePool">
         <arguments>
             <argument name="sensitive" xsi:type="array">