Skip to content

Commit fadcfa8

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #9738 from magento-gl/spartans_pr_21042025
[Spartans] Bugfixes Delivery
2 parents 520f9e3 + 030be66 commit fadcfa8

File tree

60 files changed

+158
-681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+158
-681
lines changed

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

-33
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
use Magento\Framework\App\ObjectManager;
1313
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
1414
use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
15-
use Magento\Framework\App\Config\ScopeConfigInterface;
16-
use Magento\Store\Model\StoreManagerInterface;
1715

1816
/**
1917
* View model to get extension configuration in the template
@@ -35,36 +33,20 @@ class Configuration implements \Magento\Framework\View\Element\Block\ArgumentInt
3533
*/
3634
private $getLoggedAsCustomerAdminId;
3735

38-
/**
39-
* @var ScopeConfigInterface
40-
*/
41-
private $scopeConfig;
42-
43-
/**
44-
* @var StoreManagerInterface
45-
*/
46-
private $storeManager;
47-
4836
/**
4937
* @param ConfigInterface $config
5038
* @param HttpContext $httpContext
51-
* @param ScopeConfigInterface $scopeConfig
52-
* @param StoreManagerInterface $storeManager
5339
* @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
5440
*/
5541
public function __construct(
5642
ConfigInterface $config,
5743
HttpContext $httpContext,
58-
ScopeConfigInterface $scopeConfig,
59-
StoreManagerInterface $storeManager,
6044
?GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId = null
6145
) {
6246
$this->config = $config;
6347
$this->httpContext = $httpContext;
6448
$this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId
6549
?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
66-
$this->scopeConfig = $scopeConfig;
67-
$this->storeManager = $storeManager;
6850
}
6951

7052
/**
@@ -86,19 +68,4 @@ private function isLoggedIn(): bool
8668
{
8769
return (bool)$this->httpContext->getValue(Context::CONTEXT_AUTH);
8870
}
89-
90-
/**
91-
* Is B2b enabled
92-
*
93-
* @return bool
94-
* @throws \Magento\Framework\Exception\NoSuchEntityException
95-
*/
96-
public function isB2bEnabled(): bool
97-
{
98-
return (bool)$this->scopeConfig->getValue(
99-
"btob/website_configuration/company_active",
100-
\Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
101-
$this->storeManager->getStore()->getWebsiteId()
102-
);
103-
}
10471
}

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
* @var \Magento\Framework\View\Element\Template $block
99
* @var \Magento\Framework\Escaper $escaper
1010
*/
11-
if ($block->getConfig()->isB2bEnabled()) {
12-
$adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/adobe-icon.svg');
13-
} else {
14-
$adobeFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
15-
}
11+
$viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
1612
?>
1713
<?php if ($block->getConfig()->isEnabled()): ?>
1814
<div class="lac-notification-sticky"
@@ -21,7 +17,7 @@ if ($block->getConfig()->isB2bEnabled()) {
2117
<div class="lac-notification clearfix" data-bind="visible: isVisible" style="display: none">
2218
<div class="top-container">
2319
<div class="lac-notification-icon wrapper">
24-
<img class="logo-img" src="<?= $escaper->escapeUrl($adobeFileUrl) ?>" alt="Magento" />
20+
<img class="logo-img" src="<?= $escaper->escapeUrl($viewFileUrl) ?>" alt="Magento" />
2521
</div>
2622
<div class="lac-notification-text wrapper">
2723
<span data-bind="html: notificationText"></span>

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

-1
This file was deleted.

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

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

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

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

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

-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

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

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

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

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166

177
declare(strict_types=1);

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

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/EditComment.php

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166

177
declare(strict_types=1);

‎app/code/Magento/Sales/Helper/SalesEntityCommentValidator.php

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Creditmemo/Comment/Validator.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2011 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Creditmemo/CommentRepository.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2017 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Invoice/Comment/Validator.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2011 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Invoice/CommentRepository.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2017 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Shipment/Comment/Validator.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2011 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/Order/Shipment/CommentRepository.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2017 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2011 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo;
177

‎app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2011 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
namespace Magento\Sales\Model\ResourceModel\Order\Invoice;
177

0 commit comments

Comments
 (0)