Merge remote-tracking branch 'origin/AC-13628' into spartans_pr_11022025

Author: glo60612

app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -12,6 +12,8 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * View model to get extension configuration in the template
@@ -33,20 +35,36 @@ class Configuration implements \Magento\Framework\View\Element\Block\ArgumentInt
      */
     private $getLoggedAsCustomerAdminId;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param ConfigInterface $config
      * @param HttpContext $httpContext
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
      * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
      */
     public function __construct(
         ConfigInterface $config,
         HttpContext $httpContext,
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
         ?GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId = null
     ) {
         $this->config = $config;
         $this->httpContext = $httpContext;
         $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId
             ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -68,4 +86,19 @@ private function isLoggedIn(): bool
     {
         return (bool)$this->httpContext->getValue(Context::CONTEXT_AUTH);
     }
+
+    /**
+     * Is B2b enabled
+     *
+     * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function isB2bEnabled(): bool
+    {
+        return (bool)$this->scopeConfig->getValue(
+            "btob/website_configuration/company_active",
+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
+            $this->storeManager->getStore()->getWebsiteId()
+        );
+    }
 }

app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml

@@ -1,14 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * @var \Magento\Framework\View\Element\Template $block
  * @var \Magento\Framework\Escaper $escaper
  */
-$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
+if ($block->getConfig()->isB2bEnabled()) {
+    $adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/adobe-icon.svg');
+} else {
+    $adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
+}
 ?>
 <?php if ($block->getConfig()->isEnabled()): ?>
     <div class="lac-notification-sticky"
@@ -17,7 +21,7 @@ $viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images
         <div class="lac-notification clearfix" data-bind="visible: isVisible" style="display: none">
             <div class="top-container">
                 <div class="lac-notification-icon wrapper">
-                    <img class="logo-img"  src="<?= $escaper->escapeUrl($viewFileUrl) ?>" alt="Magento" />
+                    <img class="logo-img"  src="<?= $escaper->escapeUrl($adobeFileUrl) ?>" alt="Magento" />
                 </div>
                 <div class="lac-notification-text wrapper">
                     <span data-bind="html: notificationText"></span>

app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/css/source/_module.less

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 //
@@ -29,7 +29,7 @@
                 margin: 10px 25px 10px 10px;
 
                 .logo-img {
-                    display: block
+                    display: block;
                 }
             }