Skip to content

Commit ee3cdc0

Browse files
pawan-adobe-securitypawan-adobe-security
committed
Merge branch 'AC-11642' into cia-2.4.8-beta1-develop-bugfix-06202024
2 parents eee4b11 + 545887d commit ee3cdc0

File tree

5 files changed

+69
-4
lines changed

5 files changed

+69
-4
lines changed

‎app/code/Magento/Sales/ViewModel/Order/Create/SidebarPermissionCheck.php

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Sales\ViewModel\Order\Create;
9+
10+
use Magento\Framework\AuthorizationInterface;
11+
use Magento\Framework\View\Element\Block\ArgumentInterface;
12+
13+
/**
14+
* Sidebar block permission check
15+
*/
16+
class SidebarPermissionCheck implements ArgumentInterface
17+
{
18+
/**
19+
* @var AuthorizationInterface
20+
*/
21+
private $authorization;
22+
23+
/**
24+
* Permissions constructor.
25+
*
26+
* @param AuthorizationInterface $authorization
27+
*/
28+
public function __construct(AuthorizationInterface $authorization)
29+
{
30+
$this->authorization = $authorization;
31+
}
32+
33+
/**
34+
* To check customer permission
35+
*
36+
* @return bool
37+
*/
38+
public function isAllowed(): bool
39+
{
40+
return $this->authorization->isAllowed('Magento_Customer::customer');
41+
}
42+
}

‎app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
</block>
3737
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Data" template="Magento_Sales::order/create/data.phtml" name="data">
3838
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar" template="Magento_Sales::order/create/sidebar.phtml" name="sidebar">
39+
<arguments>
40+
<argument name="sideBarPermissionCheck" xsi:type="object">Magento\Sales\ViewModel\Order\Create\SidebarPermissionCheck</argument>
41+
</arguments>
3942
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="Magento_Sales::order/create/sidebar/items.phtml" name="cart"/>
4043
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="Magento_Sales::order/create/sidebar/items.phtml" name="wishlist"/>
4144
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="Magento_Sales::order/create/sidebar/items.phtml" name="reorder"/>

‎app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<referenceContainer name="content">
1212
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Data" template="Magento_Sales::order/create/data.phtml" name="data">
1313
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar" template="Magento_Sales::order/create/sidebar.phtml" name="sidebar">
14+
<arguments>
15+
<argument name="sideBarPermissionCheck" xsi:type="object">Magento\Sales\ViewModel\Order\Create\SidebarPermissionCheck</argument>
16+
</arguments>
1417
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="Magento_Sales::order/create/sidebar/items.phtml" name="cart"/>
1518
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="Magento_Sales::order/create/sidebar/items.phtml" name="wishlist"/>
1619
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="Magento_Sales::order/create/sidebar/items.phtml" name="reorder"/>

‎app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<body>
1010
<referenceContainer name="content">
1111
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar" template="Magento_Sales::order/create/sidebar.phtml" name="sidebar">
12+
<arguments>
13+
<argument name="sideBarPermissionCheck" xsi:type="object">Magento\Sales\ViewModel\Order\Create\SidebarPermissionCheck</argument>
14+
</arguments>
1215
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="Magento_Sales::order/create/sidebar/items.phtml" name="cart"/>
1316
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="Magento_Sales::order/create/sidebar/items.phtml" name="wishlist"/>
1417
<block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="Magento_Sales::order/create/sidebar/items.phtml" name="reorder"/>

‎app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,32 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
use Magento\Framework\Escaper;
8+
use Magento\Framework\View\Helper\SecureHtmlRenderer;
9+
use Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
10+
use Magento\Sales\ViewModel\Order\Create\SidebarPermissionCheck;
11+
712
/**
8-
* @var \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar $block
9-
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
13+
* @var Sidebar $block
14+
* @var SecureHtmlRenderer $secureRenderer
15+
* @var Escaper $escaper
1016
*/
17+
18+
/**
19+
* @var SidebarPermissionCheck $sideBarPermissionCheck
20+
*/
21+
$sideBarPermissionCheck = $block->getData('sideBarPermissionCheck');
22+
1123
?>
24+
<?php if ($sideBarPermissionCheck->isAllowed()): ?>
1225
<div class="customer-current-activity-inner">
13-
<h4 class="customer-activity-title"><?= $block->escapeHtml(__('Customer\'s Activities')) ?></h4>
26+
<h4 class="customer-activity-title"><?= $escaper->escapeHtml(__('Customer\'s Activities')) ?></h4>
1427
<div class="create-order-sidebar-container">
1528
<?= $block->getChildHtml('top_button') ?>
1629
<?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child): ?>
1730
<?php if ($_alias != 'top_button' && $_alias != 'bottom_button'): ?>
1831
<?php if ($block->canDisplay($_child)): ?>
19-
<div class="order-sidebar-block" id="order-sidebar_<?= $block->escapeHtmlAttr($_alias) ?>">
32+
<div class="order-sidebar-block" id="order-sidebar_<?= $escaper->escapeHtmlAttr($_alias) ?>">
2033
<?= $block->getChildHtml($_alias) ?>
2134
</div>
2235
<?php endif; ?>
@@ -25,6 +38,7 @@
2538
<?= $block->getChildHtml('bottom_button') ?>
2639
</div>
2740
</div>
41+
<?php endif; ?>
2842
<?php $scriptString = <<<script
2943
require([
3044
"prototype",

0 commit comments

Comments
 (0)