Skip to content

Commit 20069c4

Browse files
tiagosampaiotiagosampaio
committed
Replacing deprecated methods from Magento_Sales module.
1 parent f1154d4 commit 20069c4

Some content is hidden

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

67 files changed

+170
-156
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/Create/LoadBlock.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public function execute()
5555
$this->_initSession()->_processData();
5656
} catch (\Magento\Framework\Exception\LocalizedException $e) {
5757
$this->_reloadQuote();
58-
$this->messageManager->addError($e->getMessage());
58+
$this->messageManager->addErrorMessage($e->getMessage());
5959
} catch (\Exception $e) {
6060
$this->_reloadQuote();
61-
$this->messageManager->addException($e, $e->getMessage());
61+
$this->messageManager->addExceptionMessage($e, $e->getMessage());
6262
}
6363

6464
$asJson = $request->getParam('json');

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function execute()
4949
->createOrder();
5050

5151
$this->_getSession()->clearStorage();
52-
$this->messageManager->addSuccess(__('You created the order.'));
52+
$this->messageManager->addSuccessMessage(__('You created the order.'));
5353
if ($this->_authorization->isAllowed('Magento_Sales::actions_view')) {
5454
$resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
5555
} else {
@@ -59,19 +59,19 @@ public function execute()
5959
$this->_getOrderCreateModel()->saveQuote();
6060
$message = $e->getMessage();
6161
if (!empty($message)) {
62-
$this->messageManager->addError($message);
62+
$this->messageManager->addErrorMessage($message);
6363
}
6464
$resultRedirect->setPath('sales/*/');
6565
} catch (\Magento\Framework\Exception\LocalizedException $e) {
6666
// customer can be created before place order flow is completed and should be stored in current session
6767
$this->_getSession()->setCustomerId($this->_getSession()->getQuote()->getCustomerId());
6868
$message = $e->getMessage();
6969
if (!empty($message)) {
70-
$this->messageManager->addError($message);
70+
$this->messageManager->addErrorMessage($message);
7171
}
7272
$resultRedirect->setPath('sales/*/');
7373
} catch (\Exception $e) {
74-
$this->messageManager->addException($e, __('Order saving error: %1', $e->getMessage()));
74+
$this->messageManager->addExceptionMessage($e, __('Order saving error: %1', $e->getMessage()));
7575
$resultRedirect->setPath('sales/*/');
7676
}
7777
return $resultRedirect;

‎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]);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function execute()
109109
$this->creditmemoSender->send($creditmemo);
110110
}
111111

112-
$this->messageManager->addSuccess(__('You created the credit memo.'));
112+
$this->messageManager->addSuccessMessage(__('You created the credit memo.'));
113113
$this->_getSession()->getCommentText(true);
114114
$resultRedirect->setPath('sales/order/view', ['order_id' => $creditmemo->getOrderId()]);
115115
return $resultRedirect;
@@ -119,11 +119,11 @@ public function execute()
119119
return $resultForward;
120120
}
121121
} catch (\Magento\Framework\Exception\LocalizedException $e) {
122-
$this->messageManager->addError($e->getMessage());
122+
$this->messageManager->addErrorMessage($e->getMessage());
123123
$this->_getSession()->setFormData($data);
124124
} catch (\Exception $e) {
125125
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
126-
$this->messageManager->addError(__('We can\'t save the credit memo right now.'));
126+
$this->messageManager->addErrorMessage(__('We can\'t save the credit memo right now.'));
127127
}
128128
$resultRedirect->setPath('sales/*/new', ['_current' => true]);
129129
return $resultRedirect;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ public function execute()
6464
$transactionSave->addObject($creditmemo->getInvoice());
6565
}
6666
$transactionSave->save();
67-
$this->messageManager->addSuccess(__('You voided the credit memo.'));
67+
$this->messageManager->addSuccessMessage(__('You voided the credit memo.'));
6868
} catch (\Magento\Framework\Exception\LocalizedException $e) {
69-
$this->messageManager->addError($e->getMessage());
69+
$this->messageManager->addErrorMessage($e->getMessage());
7070
} catch (\Exception $e) {
71-
$this->messageManager->addError(__('We can\'t void the credit memo.'));
71+
$this->messageManager->addErrorMessage(__('We can\'t void the credit memo.'));
7272
}
7373
$resultRedirect = $this->resultRedirectFactory->create();
7474
$resultRedirect->setPath('sales/*/view', ['creditmemo_id' => $creditmemo->getId()]);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ protected function _canCreditmemo($order)
138138
* Check order existing
139139
*/
140140
if (!$order->getId()) {
141-
$this->messageManager->addError(__('The order no longer exists.'));
141+
$this->messageManager->addErrorMessage(__('The order no longer exists.'));
142142
return false;
143143
}
144144

145145
/**
146146
* Check creditmemo create availability
147147
*/
148148
if (!$order->canCreditmemo()) {
149-
$this->messageManager->addError(__('We can\'t create credit memo for the order.'));
149+
$this->messageManager->addErrorMessage(__('We can\'t create credit memo for the order.'));
150150
return false;
151151
}
152152
return true;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public function execute()
3636
$resultRedirect->setPath('sales/order/');
3737
}
3838
} catch (\Magento\Framework\Exception\LocalizedException $e) {
39-
$this->messageManager->addError($e->getMessage());
39+
$this->messageManager->addErrorMessage($e->getMessage());
4040
$resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
4141
} catch (\Exception $e) {
42-
$this->messageManager->addException($e, $e->getMessage());
42+
$this->messageManager->addExceptionMessage($e, $e->getMessage());
4343
$resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
4444
}
4545
return $resultRedirect;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public function execute()
2525
if ($order) {
2626
try {
2727
$this->orderManagement->notify($order->getEntityId());
28-
$this->messageManager->addSuccess(__('You sent the order email.'));
28+
$this->messageManager->addSuccessMessage(__('You sent the order email.'));
2929
} catch (\Magento\Framework\Exception\LocalizedException $e) {
30-
$this->messageManager->addError($e->getMessage());
30+
$this->messageManager->addErrorMessage($e->getMessage());
3131
} catch (\Exception $e) {
32-
$this->messageManager->addError(__('We can\'t send the email order right now.'));
32+
$this->messageManager->addErrorMessage(__('We can\'t send the email order right now.'));
3333
$this->logger->critical($e);
3434
}
3535
return $this->resultRedirectFactory->create()->setPath(

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ public function execute()
2323
{
2424
$resultRedirect = $this->resultRedirectFactory->create();
2525
if (!$this->isValidPostRequest()) {
26-
$this->messageManager->addError(__('You have not put the order on hold.'));
26+
$this->messageManager->addErrorMessage(__('You have not put the order on hold.'));
2727
return $resultRedirect->setPath('sales/*/');
2828
}
2929
$order = $this->_initOrder();
3030
if ($order) {
3131
try {
3232
$this->orderManagement->hold($order->getEntityId());
33-
$this->messageManager->addSuccess(__('You put the order on hold.'));
33+
$this->messageManager->addSuccessMessage(__('You put the order on hold.'));
3434
} catch (\Magento\Framework\Exception\LocalizedException $e) {
35-
$this->messageManager->addError($e->getMessage());
35+
$this->messageManager->addErrorMessage($e->getMessage());
3636
} catch (\Exception $e) {
37-
$this->messageManager->addError(__('You have not put the order on hold.'));
37+
$this->messageManager->addErrorMessage(__('You have not put the order on hold.'));
3838
}
3939
$resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]);
4040
return $resultRedirect;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public function execute()
3131
)->addObject(
3232
$invoice->getOrder()
3333
)->save();
34-
$this->messageManager->addSuccess(__('You canceled the invoice.'));
34+
$this->messageManager->addSuccessMessage(__('You canceled the invoice.'));
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(__('Invoice canceling error'));
38+
$this->messageManager->addErrorMessage(__('Invoice canceling error'));
3939
}
4040
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
4141
$resultRedirect = $this->resultRedirectFactory->create();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ public function execute()
3333
)->addObject(
3434
$invoice->getOrder()
3535
)->save();
36-
$this->messageManager->addSuccess(__('The invoice has been captured.'));
36+
$this->messageManager->addSuccessMessage(__('The invoice has been captured.'));
3737
} catch (\Magento\Framework\Exception\LocalizedException $e) {
38-
$this->messageManager->addError($e->getMessage());
38+
$this->messageManager->addErrorMessage($e->getMessage());
3939
} catch (\Exception $e) {
40-
$this->messageManager->addError(__('Invoice capturing error'));
40+
$this->messageManager->addErrorMessage(__('Invoice capturing error'));
4141
}
4242
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
4343
$resultRedirect = $this->resultRedirectFactory->create();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ public function execute()
112112
$resultPage->getConfig()->getTitle()->prepend(__('New Invoice'));
113113
return $resultPage;
114114
} catch (\Magento\Framework\Exception\LocalizedException $exception) {
115-
$this->messageManager->addError($exception->getMessage());
115+
$this->messageManager->addErrorMessage($exception->getMessage());
116116
return $this->_redirectToOrder($orderId);
117117
} catch (\Exception $exception) {
118-
$this->messageManager->addException($exception, 'Cannot create an invoice.');
118+
$this->messageManager->addExceptionMessage($exception, 'Cannot create an invoice.');
119119
return $this->_redirectToOrder($orderId);
120120
}
121121
}

0 commit comments

Comments
 (0)