Skip to content

Commit d66f6c3

Browse files
committed
Resolve undefined variable in ReviewPayment class
1 parent e56640c commit d66f6c3

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
declare(strict_types=1);
8+
69
namespace Magento\Sales\Controller\Adminhtml\Order;
710

811
use Magento\Backend\App\Action;
12+
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
913

10-
class ReviewPayment extends \Magento\Sales\Controller\Adminhtml\Order
14+
/**
15+
* Class \Magento\Sales\Controller\Adminhtml\Order\ReviewPayment
16+
*/
17+
class ReviewPayment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpGetActionInterface
1118
{
1219
/**
1320
* Authorization level of a basic admin session
@@ -21,7 +28,7 @@ class ReviewPayment extends \Magento\Sales\Controller\Adminhtml\Order
2128
*
2229
* Either denies or approves a payment that is in "review" state
2330
*
24-
* @return \Magento\Backend\Model\View\Result\Redirect
31+
* @return \Magento\Framework\Controller\Result\Redirect
2532
*/
2633
public function execute()
2734
{
@@ -50,21 +57,23 @@ public function execute()
5057
}
5158
break;
5259
default:
53-
throw new \Exception(sprintf('Action "%s" is not supported.', $action));
60+
throw new \Magento\Framework\Exception\NotFoundException(
61+
__('Action "%1" is not supported.', $action)
62+
);
5463
}
5564
$this->orderRepository->save($order);
5665
$this->messageManager->addSuccessMessage($message);
66+
$resultRedirect->setPath('sales/order/view', ['order_id' => $order->getEntityId()]);
5767
} else {
5868
$resultRedirect->setPath('sales/*/');
5969
return $resultRedirect;
6070
}
71+
// phpcs:ignore Magento2.Exceptions.ThrowCatch
6172
} catch (\Magento\Framework\Exception\LocalizedException $e) {
62-
$this->messageManager->addErrorMessage($e->getMessage());
63-
} catch (\Exception $e) {
6473
$this->messageManager->addErrorMessage(__('We can\'t update the payment right now.'));
6574
$this->logger->critical($e);
75+
$resultRedirect->setPath('sales/*/');
6676
}
67-
$resultRedirect->setPath('sales/order/view', ['order_id' => $order->getEntityId()]);
6877
return $resultRedirect;
6978
}
7079
}

0 commit comments

Comments
 (0)