AC-11642:Sales order sidebar fix

Author: Devika-GL

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php

@@ -3,16 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml\Order\Create;
 
+use Magento\Backend\Block\Widget\Button;
+use Magento\Framework\DataObject;
+
 /**
  * Adminhtml sales order create sidebar
  *
  * @api
- * @author      Magento Core Team <[email protected]>
  * @since 100.0.2
  */
-class Sidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
+class Sidebar extends AbstractCreate
 {
     /**
      * Preparing global layout
@@ -23,7 +27,7 @@ protected function _prepareLayout()
     {
         if ($this->getCustomerId()) {
             $button = $this->getLayout()->createBlock(
-                \Magento\Backend\Block\Widget\Button::class
+                Button::class
             )->setData(
                 [
                     'label' => __('Update Changes'),
@@ -34,9 +38,7 @@ protected function _prepareLayout()
                 ]
             );
             $this->setChild('top_button', $button);
-        }
 
-        if ($this->getCustomerId()) {
             $button = clone $button;
             $button->unsId();
             $this->setChild('bottom_button', $button);
@@ -47,7 +49,7 @@ protected function _prepareLayout()
     /**
      * Check if can display
      *
-     * @param \Magento\Framework\DataObject $child
+     * @param DataObject $child
      * @return true
      */
     public function canDisplay($child)
@@ -57,4 +59,14 @@ public function canDisplay($child)
         }
         return true;
     }
+
+    /**
+     * To check customer permission
+     *
+     * @return bool
+     */
+    public function isAllowedAction(): bool
+    {
+        return $this->_authorization->isAllowed('Magento_Customer::customer');
+    }
 }

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

@@ -7,16 +7,18 @@
 /**
  * @var \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar $block
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
+<?php  if ($block->isAllowedAction()): ?>
 <div class="customer-current-activity-inner">
-    <h4 class="customer-activity-title"><?= $block->escapeHtml(__('Customer\'s Activities')) ?></h4>
+    <h4 class="customer-activity-title"><?= $escaper->escapeHtml(__('Customer\'s Activities')) ?></h4>
     <div class="create-order-sidebar-container">
     <?= $block->getChildHtml('top_button') ?>
     <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child): ?>
         <?php if ($_alias != 'top_button' && $_alias != 'bottom_button'): ?>
             <?php if ($block->canDisplay($_child)): ?>
-                <div class="order-sidebar-block" id="order-sidebar_<?= $block->escapeHtmlAttr($_alias) ?>">
+                <div class="order-sidebar-block" id="order-sidebar_<?= $escaper->escapeHtmlAttr($_alias) ?>">
                     <?= $block->getChildHtml($_alias) ?>
                 </div>
             <?php endif; ?>
@@ -25,6 +27,7 @@
     <?= $block->getChildHtml('bottom_button') ?>
     </div>
 </div>
+<?php endif; ?>
 <?php $scriptString = <<<script
 require([
     "prototype",