Skip to content

Commit 310d8df

Browse files
author
Stanislav Idolov
authored
ENGCOM-2703: Replacing deprecated methods from Magento_Sales module. #17410 
2 parents ef6f3d2 + 7c564d5 commit 310d8df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+189
-165
lines changed

‎app/code/Magento/Sales/Controller/AbstractController/Reorder.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,16 @@ public function execute()
5959
$cart->addOrderItem($item);
6060
} catch (\Magento\Framework\Exception\LocalizedException $e) {
6161
if ($this->_objectManager->get(\Magento\Checkout\Model\Session::class)->getUseNotice(true)) {
62-
$this->messageManager->addNotice($e->getMessage());
62+
$this->messageManager->addNoticeMessage($e->getMessage());
6363
} else {
64-
$this->messageManager->addError($e->getMessage());
64+
$this->messageManager->addErrorMessage($e->getMessage());
6565
}
6666
return $resultRedirect->setPath('*/*/history');
6767
} catch (\Exception $e) {
68-
$this->messageManager->addException($e, __('We can\'t add this item to your shopping cart right now.'));
68+
$this->messageManager->addExceptionMessage(
69+
$e,
70+
__('We can\'t add this item to your shopping cart right now.')
71+
);
6972
return $resultRedirect->setPath('checkout/cart');
7073
}
7174
}

‎app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function execute()
3333
$this->_objectManager->create(\Magento\Sales\Api\CreditmemoManagementInterface::class)
3434
->notify($creditmemoId);
3535

36-
$this->messageManager->addSuccess(__('You sent the message.'));
36+
$this->messageManager->addSuccessMessage(__('You sent the message.'));
3737
$resultRedirect = $this->resultRedirectFactory->create();
3838
$resultRedirect->setPath('sales/order_creditmemo/view', ['creditmemo_id' => $creditmemoId]);
3939
return $resultRedirect;

‎app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function execute()
5757
\Magento\Sales\Api\InvoiceManagementInterface::class
5858
)->notify($invoice->getEntityId());
5959

60-
$this->messageManager->addSuccess(__('You sent the message.'));
60+
$this->messageManager->addSuccessMessage(__('You sent the message.'));
6161
return $this->resultRedirectFactory->create()->setPath(
6262
'sales/invoice/view',
6363
['order_id' => $invoice->getOrder()->getId(), 'invoice_id' => $invoiceId]

‎app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function getInvoice()
7979
->get($this->getRequest()->getParam('invoice_id'));
8080
$this->registry->register('current_invoice', $invoice);
8181
} catch (\Exception $e) {
82-
$this->messageManager->addError(__('Invoice capturing error'));
82+
$this->messageManager->addErrorMessage(__('Invoice capturing error'));
8383
return false;
8484
}
8585

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ protected function _initOrder()
154154
try {
155155
$order = $this->orderRepository->get($id);
156156
} catch (NoSuchEntityException $e) {
157-
$this->messageManager->addError(__('This order no longer exists.'));
157+
$this->messageManager->addErrorMessage(__('This order no longer exists.'));
158158
$this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
159159
return false;
160160
} catch (InputException $e) {
161-
$this->messageManager->addError(__('This order no longer exists.'));
161+
$this->messageManager->addErrorMessage(__('This order no longer exists.'));
162162
$this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
163163
return false;
164164
}

‎app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function execute()
6161
$collection = $this->filter->getCollection($this->collectionFactory->create());
6262
return $this->massAction($collection);
6363
} catch (\Exception $e) {
64-
$this->messageManager->addError($e->getMessage());
64+
$this->messageManager->addErrorMessage($e->getMessage());
6565
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
6666
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
6767
return $resultRedirect->setPath($this->redirectUrl);

‎app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ public function execute()
114114
'order_id' => $address->getParentId()
115115
]
116116
);
117-
$this->messageManager->addSuccess(__('You updated the order address.'));
117+
$this->messageManager->addSuccessMessage(__('You updated the order address.'));
118118
return $resultRedirect->setPath('sales/*/view', ['order_id' => $address->getParentId()]);
119119
} catch (LocalizedException $e) {
120-
$this->messageManager->addError($e->getMessage());
120+
$this->messageManager->addErrorMessage($e->getMessage());
121121
} catch (\Exception $e) {
122-
$this->messageManager->addException($e, __('We can\'t update the order address right now.'));
122+
$this->messageManager->addExceptionMessage($e, __('We can\'t update the order address right now.'));
123123
}
124124
return $resultRedirect->setPath('sales/*/address', ['address_id' => $address->getId()]);
125125
} else {

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ public function execute()
2424
{
2525
$resultRedirect = $this->resultRedirectFactory->create();
2626
if (!$this->isValidPostRequest()) {
27-
$this->messageManager->addError(__('You have not canceled the item.'));
27+
$this->messageManager->addErrorMessage(__('You have not canceled the item.'));
2828
return $resultRedirect->setPath('sales/*/');
2929
}
3030
$order = $this->_initOrder();
3131
if ($order) {
3232
try {
3333
$this->orderManagement->cancel($order->getEntityId());
34-
$this->messageManager->addSuccess(__('You canceled the order.'));
34+
$this->messageManager->addSuccessMessage(__('You canceled the order.'));
3535
} catch (\Magento\Framework\Exception\LocalizedException $e) {
36-
$this->messageManager->addError($e->getMessage());
36+
$this->messageManager->addErrorMessage($e->getMessage());
3737
} catch (\Exception $e) {
38-
$this->messageManager->addError(__('You have not canceled the item.'));
38+
$this->messageManager->addErrorMessage(__('You have not canceled the item.'));
3939
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
4040
}
4141
return $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,22 +317,22 @@ protected function _processActionData($action = null)
317317
}
318318
}
319319
if (!$isApplyDiscount) {
320-
$this->messageManager->addError(
320+
$this->messageManager->addErrorMessage(
321321
__(
322322
'"%1" coupon code was not applied. Do not apply discount is selected for item(s)',
323323
$this->escaper->escapeHtml($couponCode)
324324
)
325325
);
326326
} else {
327327
if ($this->_getQuote()->getCouponCode() !== $couponCode) {
328-
$this->messageManager->addError(
328+
$this->messageManager->addErrorMessage(
329329
__(
330330
'The "%1" coupon code isn\'t valid. Verify the code and try again.',
331331
$this->escaper->escapeHtml($couponCode)
332332
)
333333
);
334334
} else {
335-
$this->messageManager->addSuccess(__('The coupon code has been accepted.'));
335+
$this->messageManager->addSuccessMessage(__('The coupon code has been accepted.'));
336336
}
337337
}
338338
}

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public function execute()
4747
\Magento\Sales\Api\CreditmemoManagementInterface::class
4848
);
4949
$creditmemoManagement->cancel($creditmemoId);
50-
$this->messageManager->addSuccess(__('The credit memo has been canceled.'));
50+
$this->messageManager->addSuccessMessage(__('The credit memo has been canceled.'));
5151
} catch (\Magento\Framework\Exception\LocalizedException $e) {
52-
$this->messageManager->addError($e->getMessage());
52+
$this->messageManager->addErrorMessage($e->getMessage());
5353
} catch (\Exception $e) {
54-
$this->messageManager->addError(__('Credit memo has not been canceled.'));
54+
$this->messageManager->addErrorMessage(__('Credit memo has not been canceled.'));
5555
}
5656
$resultRedirect = $this->resultRedirectFactory->create();
5757
$resultRedirect->setPath('sales/*/view', ['creditmemo_id' => $creditmemoId]);

0 commit comments

Comments
 (0)