Merge branch 'fix-wrong-logo-path-on-print-order-page' of github.com:ihor-sviziev/magento2 into 2.4-develop

Author: ishakhsuvarov

app/code/Magento/Sales/ViewModel/Header/LogoPathResolver.php

@@ -7,12 +7,13 @@
 
 namespace Magento\Sales\ViewModel\Header;
 
+use Magento\Config\Model\Config\Backend\Image\Logo;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolverInterface;
+use Magento\Framework\Registry;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Sales\Model\Order;
-use Magento\Framework\Registry;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolverInterface;
 
 /**
  * Class for resolving logo path
@@ -25,8 +26,6 @@ class LogoPathResolver implements LogoPathResolverInterface, ArgumentInterface
     private $scopeConfig;
 
     /**
-     * Core registry
-     *
      * @var Registry
      */
     private $coreRegistry;
@@ -50,20 +49,31 @@ public function __construct(
      */
     public function getPath(): ?string
     {
-        $path = null;
         $storeId = null;
         $order = $this->coreRegistry->registry('current_order');
         if ($order instanceof Order) {
             $storeId = $order->getStoreId();
         }
-        $storeLogoPath = $this->scopeConfig->getValue(
+        $salesLogoPath = $this->scopeConfig->getValue(
             'sales/identity/logo_html',
             ScopeInterface::SCOPE_STORE,
             $storeId
         );
-        if ($storeLogoPath !== null) {
-            $path = 'sales/store/logo_html/' . $storeLogoPath;
+
+        if ($salesLogoPath !== null) {
+            return 'sales/store/logo_html/' . $salesLogoPath;
         }
-        return $path;
+
+        $headerLogoPath = $this->scopeConfig->getValue(
+            'design/header/logo_src',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
+        if ($headerLogoPath !== null) {
+            return Logo::UPLOAD_DIR . '/' . $headerLogoPath;
+        }
+
+        return null;
     }
 }

dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/LogoTest.php

@@ -5,17 +5,17 @@
  */
 namespace Magento\Sales\Block\Order\PrintOrder;
 
-use Magento\Framework\View\LayoutInterface;
-use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\State;
-use Magento\Theme\Block\Html\Header\Logo;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolver as LogoPathResolverDefault;
+use Magento\Framework\View\LayoutInterface;
 use Magento\Sales\ViewModel\Header\LogoPathResolver as LogoPathResolverSales;
-use \PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Theme\Block\Html\Header\Logo;
+use Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolver as LogoPathResolverDefault;
+use PHPUnit\Framework\TestCase;
 
 class LogoTest extends TestCase
 {
@@ -71,4 +71,33 @@ public function testGetLogoSrc(): void
         $this->mediaDirectory->delete($defaultPath);
         $this->mediaDirectory->delete($salesPath);
     }
+
+    /**
+     * Checks that fallback to header logo works fine
+     *
+     * @magentoConfigFixture default_store design/header/logo_src default/logo.jpg
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function testGetLogoSrcWithFallback(): void
+    {
+        $host = 'http://localhost/media/';
+        $defaultLogoFile = 'logo.jpg';
+        $defaultPath = 'logo/default/' . $defaultLogoFile;
+        $this->mediaDirectory->writeFile($defaultPath, '');
+        $blockArguments = ['data' =>
+            ['logoPathResolver' => $this->objectManager->get(LogoPathResolverDefault::class)]
+        ];
+        /** @var Logo $block */
+        $block = $this->objectManager->create(LayoutInterface::class)
+            ->createBlock(Logo::class, 'logo', $blockArguments);
+        $this->assertSame($host . $defaultPath, $block->getLogoSrc());
+        $blockArguments = ['data' =>
+            ['logoPathResolver' => $this->objectManager->get(LogoPathResolverSales::class)]
+        ];
+        /** @var Logo $block */
+        $block = $this->objectManager->create(LayoutInterface::class)
+            ->createBlock(Logo::class, 'logo', $blockArguments);
+        $this->assertSame($host . $defaultPath, $block->getLogoSrc());
+        $this->mediaDirectory->delete($defaultPath);
+    }
 }