Merge pull request #9738 from magento-gl/spartans_pr_21042025

[Spartans] Bugfixes Delivery

Author: pawan-adobe-security

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

@@ -12,8 +12,6 @@
 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
@@ -35,36 +33,20 @@ 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;
     }
 
     /**
@@ -86,19 +68,4 @@ 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

@@ -8,11 +8,7 @@
  * @var \Magento\Framework\View\Element\Template $block
  * @var \Magento\Framework\Escaper $escaper
  */
-if ($block->getConfig()->isB2bEnabled()) {
-    $adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/adobe-icon.svg');
-} else {
-    $adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
-}
+$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
 ?>
 <?php if ($block->getConfig()->isEnabled()): ?>
     <div class="lac-notification-sticky"
@@ -21,7 +17,7 @@ if ($block->getConfig()->isB2bEnabled()) {
         <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($adobeFileUrl) ?>" alt="Magento" />
+                    <img class="logo-img"  src="<?= $escaper->escapeUrl($viewFileUrl) ?>" alt="Magento" />
                 </div>
                 <div class="lac-notification-text wrapper">
                     <span data-bind="html: notificationText"></span>

app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/images/adobe-icon.svg

@@ -2,15 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
  */
 declare(strict_types=1);
 

app/code/Magento/OrderCancellationGraphQl/Model/Validator/ValidateOrderCancellationReason.php

@@ -2,15 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
  */
 declare(strict_types=1);
 

app/code/Magento/OrderCancellationGraphQl/Plugin/Model/CancelOrder.php

@@ -2,15 +2,6 @@
 /**
  * Copyright 2025 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
  */
 declare(strict_types=1);
 

app/code/Magento/OrderCancellationGraphQl/Plugin/Model/CancelOrderGuest.php

@@ -1,17 +1,7 @@
 <?php
-/************************************************************************
- * Copyright 2025 Adobe
+/**
+ * Copyright 2014 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
- * ***********************************************************************
  */
 declare(strict_types=1);
 

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php

@@ -1,17 +1,7 @@
 <?php
-/************************************************************************
+/**
  * Copyright 2025 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
- * ***********************************************************************
  */
 
 declare(strict_types=1);

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/EditComment.php

@@ -1,17 +1,7 @@
 <?php
-/************************************************************************
- * Copyright 2025 Adobe
+/**
+ * Copyright 2014 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
- * ***********************************************************************
  */
 declare(strict_types=1);
 

app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php

@@ -1,17 +1,7 @@
 <?php
-/************************************************************************
+/**
  * Copyright 2025 Adobe
  * All Rights Reserved.
- *
- * NOTICE: All information contained herein is, and remains
- * the property of Adobe and its suppliers, if any. The intellectual
- * and technical concepts contained herein are proprietary to Adobe
- * and its suppliers and are protected by all applicable intellectual
- * property laws, including trade secret and copyright laws.
- * Dissemination of this information or reproduction of this material
- * is strictly forbidden unless prior written permission is obtained
- * from Adobe.
- * ***********************************************************************
  */
 
 declare(strict_types=1);