AC-9827 admin order management improvements

tranthienbinh1989 · tranthienbinh1989 · commit 553b4de6fb75 · 2024-06-17T10:11:51.000-05:00
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -16,29 +16,21 @@
 class View extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * Block group
-     *
      * @var string
      */
     protected $_blockGroup = 'Magento_Sales';
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
 
     /**
-     * Sales config
-     *
      * @var \Magento\Sales\Model\Config
      */
     protected $_salesConfig;
 
     /**
-     * Reorder helper
-     *
      * @var \Magento\Sales\Helper\Reorder
      */
     protected $_reorderHelper;
@@ -121,7 +113,7 @@ protected function _construct()
             );
         }
 
-        if ($this->_isAllowedAction('Magento_Sales::emails') && !$order->isCanceled()) {
+        if ($this->_isAllowedAction('Magento_Sales::email') && !$order->isCanceled()) {
             $message = __('Are you sure you want to send an order email to customer?');
             $this->addButton(
                 'send_notification',
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php
@@ -6,15 +6,16 @@
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class Cancel extends \Magento\Backend\App\Action
+class Cancel extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
+    public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';
 
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/NewAction.php
@@ -15,7 +15,7 @@ class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInte
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
+    public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -18,7 +18,7 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
      *
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
+    public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Start.php
@@ -14,7 +14,7 @@ class Start extends \Magento\Backend\App\Action implements HttpGetActionInterfac
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
+    public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';
 
     /**
      * Start create creditmemo action
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/UpdateQty.php
@@ -15,7 +15,7 @@ class UpdateQty extends \Magento\Backend\App\Action implements HttpPostActionInt
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
+    public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php
@@ -6,15 +6,16 @@
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class VoidAction extends Action
+class VoidAction extends Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';
+    public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';
 
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php
@@ -17,7 +17,7 @@ class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInte
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::shipment';
+    public const ADMIN_RESOURCE = 'Magento_Sales::ship';
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -22,7 +22,7 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::shipment';
+    public const ADMIN_RESOURCE = 'Magento_Sales::ship';
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Start.php
@@ -15,7 +15,7 @@ class Start extends \Magento\Backend\App\Action implements HttpGetActionInterfac
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Sales::shipment';
+    public const ADMIN_RESOURCE = 'Magento_Sales::ship';
 
     /**
      * Start create shipment action
diff --git a/app/code/Magento/Shipping/etc/acl.xml b/app/code/Magento/Shipping/etc/acl.xml
@@ -13,7 +13,7 @@
                     <resource id="Magento_Backend::stores_settings">
                         <resource id="Magento_Config::config">
                             <resource id="Magento_Shipping::config_shipping" title="Shipping Settings Section" translate="title" sortOrder="5" />
-                            <resource id="Magento_Shipping::shipping_policy" title="Shipping Policy Parameters Section" translate="title" sortOrder="5" />
+                            <resource id="Magento_Shipping::shipping_policy" title="Shipping Policy Parameters Section" translate="title" sortOrder="5" disabled="true" />
                             <resource id="Magento_Shipping::carriers" title="Delivery Methods Section" translate="title" sortOrder="5" />
                         </resource>
                     </resource>
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -21,6 +21,11 @@
  */
 class SaveTest extends AbstractCreditmemoControllerTest
 {
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::creditmemo';
+
     /**
      * @var string
      */
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -18,6 +18,11 @@
  */
 class SaveTest extends AbstractShipmentControllerTest
 {
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::ship';
+
     /**
      * @var string
      */
@@ -105,8 +110,7 @@ private function prepareRequest(array $params = [])
             ]
         );
 
-        $data = $params ?? [];
-        $this->getRequest()->setPostValue($data);
+        $this->getRequest()->setPostValue($params);
 
         return $order;
     }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInte`
`15`	`15`	`*`
`16`	`16`	`* @see _isAllowed()`
`17`	`17`	`*/`
`18`		`- const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';`
	`18`	`+ public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac`
`18`	`18`	`*`
`19`	`19`	`* @see _isAllowed()`
`20`	`20`	`*/`
`21`		`- public const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';`
	`21`	`+ public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class Start extends \Magento\Backend\App\Action implements HttpGetActionInterfac`
`14`	`14`	`*`
`15`	`15`	`* @see _isAllowed()`
`16`	`16`	`*/`
`17`		`- const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';`
	`17`	`+ public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* Start create creditmemo action`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class UpdateQty extends \Magento\Backend\App\Action implements HttpPostActionInt`
`15`	`15`	`*`
`16`	`16`	`* @see _isAllowed()`
`17`	`17`	`*/`
`18`		`- const ADMIN_RESOURCE = 'Magento_Sales::sales_creditmemo';`
	`18`	`+ public const ADMIN_RESOURCE = 'Magento_Sales::creditmemo';`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* @var \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoader`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInte`
`17`	`17`	`*`
`18`	`18`	`* @see _isAllowed()`
`19`	`19`	`*/`
`20`		`- const ADMIN_RESOURCE = 'Magento_Sales::shipment';`
	`20`	`+ public const ADMIN_RESOURCE = 'Magento_Sales::ship';`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac`
`22`	`22`	`*`
`23`	`23`	`* @see _isAllowed()`
`24`	`24`	`*/`
`25`		`- const ADMIN_RESOURCE = 'Magento_Sales::shipment';`
	`25`	`+ public const ADMIN_RESOURCE = 'Magento_Sales::ship';`
`26`	`26`
`27`	`27`	`/**`
`28`	`28`	`* @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Start extends \Magento\Backend\App\Action implements HttpGetActionInterfac`
`15`	`15`	`*`
`16`	`16`	`* @see _isAllowed()`
`17`	`17`	`*/`
`18`		`- const ADMIN_RESOURCE = 'Magento_Sales::shipment';`
	`18`	`+ public const ADMIN_RESOURCE = 'Magento_Sales::ship';`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* Start create shipment action`