#24730: Fix Frontend Invoice PDF configured Logo image

mozok · mozok · commit 2389da7df17a · 2020-10-23T22:38:28.000+03:00
diff --git a/app/code/Magento/Sales/Helper/Invoice/Logo.php b/app/code/Magento/Sales/Helper/Invoice/Logo.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Magento\Sales\Helper\Invoice;
+
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class Logo extends AbstractHelper
+{
+    const XML_PATH_SALES_IDENTITY_LOGO_HTML = 'sales/identity/logo_html';
+
+    protected $logoBaseDir = 'sales/store/logo_html/';
+
+    /**
+     * @return string|null
+     */
+    public function getLogoFile()
+    {
+        $result = null;
+
+        $invoiceLogoPath = $this->getIdentityLogoHtml();
+        if ($invoiceLogoPath) {
+            $result = $this->_urlBuilder->getBaseUrl(
+                ['_type' => UrlInterface::URL_TYPE_MEDIA]
+            ) . $this->getLogoBaseDir() . $invoiceLogoPath;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogoBaseDir()
+    {
+        return $this->logoBaseDir;
+    }
+
+    /**
+     * @param null|int|string $store
+     * @return mixed
+     */
+    public function getIdentityLogoHtml($store = null)
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_SALES_IDENTITY_LOGO_HTML,
+            ScopeInterface::SCOPE_STORE,
+            $store
+        );
+    }
+}
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
@@ -11,6 +11,13 @@
     <update handle="print" />
     <body>
         <attribute name="class" value="account"/>
+        <referenceContainer name="header-wrapper">
+            <referenceBlock name="logo">
+                <arguments>
+                    <argument name="logo_src" xsi:type="helper" helper="Magento\Sales\Helper\Invoice\Logo::getLogoFile"/>
+                </arguments>
+            </referenceBlock>
+        </referenceContainer>
         <referenceContainer name="page.main.title">
             <block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="order.status" template="Magento_Sales::order/order_status.phtml" />
             <block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="order.date" template="Magento_Sales::order/order_date.phtml" />
