Skip to content

Commit a9c263a

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch 'MAGETWO-92195' into 2.3-bugfixes-031018
2 parents 2ae0b65 + da8096e commit a9c263a

File tree

5 files changed

+11
-819
lines changed

5 files changed

+11
-819
lines changed

app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Sales\Controller\Adminhtml\Order;
77

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
89
use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Ui\Component\MassAction\Filter;
@@ -14,7 +15,7 @@
1415
/**
1516
* Class MassHold
1617
*/
17-
class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
18+
class MassHold extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction implements HttpPostActionInterface
1819
{
1920
/**
2021
* Authorization level of a basic admin session

app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,19 @@
55
*/
66
namespace Magento\Sales\Controller\Adminhtml\Order;
77

8+
use Magento\Framework\App\Action\HttpPostActionInterface;
89
use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
910
use Magento\Backend\App\Action\Context;
1011
use Magento\Ui\Component\MassAction\Filter;
1112
use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
1213
use Magento\Sales\Api\OrderManagementInterface;
1314

14-
class MassUnhold extends AbstractMassAction
15+
/**
16+
* Class MassUnhold, change status for select orders
17+
*
18+
* @package Magento\Sales\Controller\Adminhtml\Order
19+
*/
20+
class MassUnhold extends AbstractMassAction implements HttpPostActionInterface
1521
{
1622
/**
1723
* Authorization level of a basic admin session
@@ -24,6 +30,8 @@ class MassUnhold extends AbstractMassAction
2430
private $orderManagement;
2531

2632
/**
33+
* Class constructor
34+
*
2735
* @param Context $context
2836
* @param Filter $filter
2937
* @param CollectionFactory $collectionFactory

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php

Lines changed: 0 additions & 294 deletions
This file was deleted.

0 commit comments

Comments
 (0)