From a02e5ccbd26bf683ee5260668633e20bf72989c5 Mon Sep 17 00:00:00 2001 From: Tiago Sampaio Date: Tue, 7 Aug 2018 01:00:03 -0300 Subject: [PATCH 1/4] Removing deprecated code. --- .../SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php | 8 ++++---- .../SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php | 2 +- .../Controller/Adminhtml/Promo/Quote/Generate.php | 2 +- .../SalesRule/Controller/Adminhtml/Promo/Quote/Save.php | 8 ++++---- .../SalesRule/Observer/CheckSalesRulesAvailability.php | 2 +- .../Controller/Adminhtml/Promo/Quote/GenerateTest.php | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php index 9adb62583985d..28993e159499b 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Delete.php @@ -21,13 +21,13 @@ public function execute() $model = $this->_objectManager->create(\Magento\SalesRule\Model\Rule::class); $model->load($id); $model->delete(); - $this->messageManager->addSuccess(__('You deleted the rule.')); + $this->messageManager->addSuccessMessage(__('You deleted the rule.')); $this->_redirect('sales_rule/*/'); return; } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __('We can\'t delete the rule right now. Please review the log and try again.') ); $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); @@ -35,7 +35,7 @@ public function execute() return; } } - $this->messageManager->addError(__('We can\'t find a rule to delete.')); + $this->messageManager->addErrorMessage(__('We can\'t find a rule to delete.')); $this->_redirect('sales_rule/*/'); } } diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php index 7221f49b852d3..717c71fde4837 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Edit.php @@ -51,7 +51,7 @@ public function execute() if ($id) { $model->load($id); if (!$model->getRuleId()) { - $this->messageManager->addError(__('This rule no longer exists.')); + $this->messageManager->addErrorMessage(__('This rule no longer exists.')); $this->_redirect('sales_rule/*'); return; } diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php index 297db7d96939d..12d34b8320d07 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php @@ -64,7 +64,7 @@ public function execute() $couponCodes = $this->couponGenerator->generateCodes($data); $generated = count($couponCodes); - $this->messageManager->addSuccess(__('%1 coupon(s) have been generated.', $generated)); + $this->messageManager->addSuccessMessage(__('%1 coupon(s) have been generated.', $generated)); $this->_view->getLayout()->initMessages(); $result['messages'] = $this->_view->getLayout()->getMessagesBlock()->getGroupedHtml(); } catch (\Magento\Framework\Exception\InputException $inputException) { diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php index f28b245ee04ab..a5b71130e70eb 100644 --- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php +++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php @@ -50,7 +50,7 @@ public function execute() $validateResult = $model->validateData(new \Magento\Framework\DataObject($data)); if ($validateResult !== true) { foreach ($validateResult as $errorMessage) { - $this->messageManager->addError($errorMessage); + $this->messageManager->addErrorMessage($errorMessage); } $session->setPageData($data); $this->_redirect('sales_rule/*/edit', ['id' => $model->getId()]); @@ -82,7 +82,7 @@ public function execute() $session->setPageData($model->getData()); $model->save(); - $this->messageManager->addSuccess(__('You saved the rule.')); + $this->messageManager->addSuccessMessage(__('You saved the rule.')); $session->setPageData(false); if ($this->getRequest()->getParam('back')) { $this->_redirect('sales_rule/*/edit', ['id' => $model->getId()]); @@ -91,7 +91,7 @@ public function execute() $this->_redirect('sales_rule/*/'); return; } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $id = (int)$this->getRequest()->getParam('rule_id'); if (!empty($id)) { $this->_redirect('sales_rule/*/edit', ['id' => $id]); @@ -100,7 +100,7 @@ public function execute() } return; } catch (\Exception $e) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __('Something went wrong while saving the rule data. Please review the error log.') ); $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); diff --git a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php index 4b66d2b98642c..f2819a06fe1bf 100644 --- a/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php +++ b/app/code/Magento/SalesRule/Observer/CheckSalesRulesAvailability.php @@ -54,7 +54,7 @@ public function checkSalesRulesAvailability($attributeCode) } if ($disabledRulesCount) { - $this->messageManager->addWarning( + $this->messageManager->addWarningMessage( __( '%1 Cart Price Rules based on "%2" attribute have been disabled.', $disabledRulesCount, diff --git a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php index 8bcffcab9ca0a..219f342cdb949 100644 --- a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php +++ b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php @@ -143,7 +143,7 @@ public function testExecute() ->with($requestData) ->willReturn(['some_data', 'some_data_2']); $this->messageManager->expects($this->once()) - ->method('addSuccess'); + ->method('addSuccessMessage'); $this->responseMock->expects($this->once()) ->method('representJson') ->with(); From 20069c4846043d90755d978c799b1e358ef2fe4f Mon Sep 17 00:00:00 2001 From: Tiago Sampaio Date: Tue, 7 Aug 2018 10:09:28 -0300 Subject: [PATCH 2/4] Replacing deprecated methods from Magento_Sales module. --- .../Controller/AbstractController/Reorder.php | 9 ++++++--- .../Creditmemo/AbstractCreditmemo/Email.php | 2 +- .../Adminhtml/Invoice/AbstractInvoice/Email.php | 2 +- .../Adminhtml/Invoice/AbstractInvoice/View.php | 2 +- .../Sales/Controller/Adminhtml/Order.php | 4 ++-- .../Adminhtml/Order/AbstractMassAction.php | 2 +- .../Controller/Adminhtml/Order/AddressSave.php | 6 +++--- .../Sales/Controller/Adminhtml/Order/Cancel.php | 8 ++++---- .../Sales/Controller/Adminhtml/Order/Create.php | 6 +++--- .../Adminhtml/Order/Create/LoadBlock.php | 4 ++-- .../Controller/Adminhtml/Order/Create/Save.php | 8 ++++---- .../Adminhtml/Order/Creditmemo/Cancel.php | 6 +++--- .../Adminhtml/Order/Creditmemo/Save.php | 6 +++--- .../Adminhtml/Order/Creditmemo/VoidAction.php | 6 +++--- .../Adminhtml/Order/CreditmemoLoader.php | 4 ++-- .../Controller/Adminhtml/Order/Edit/Start.php | 4 ++-- .../Sales/Controller/Adminhtml/Order/Email.php | 6 +++--- .../Sales/Controller/Adminhtml/Order/Hold.php | 8 ++++---- .../Adminhtml/Order/Invoice/Cancel.php | 6 +++--- .../Adminhtml/Order/Invoice/Capture.php | 6 +++--- .../Adminhtml/Order/Invoice/NewAction.php | 4 ++-- .../Controller/Adminhtml/Order/Invoice/Save.php | 17 ++++++++++------- .../Adminhtml/Order/Invoice/VoidAction.php | 6 +++--- .../Controller/Adminhtml/Order/MassCancel.php | 6 +++--- .../Controller/Adminhtml/Order/MassHold.php | 6 +++--- .../Controller/Adminhtml/Order/MassUnhold.php | 6 +++--- .../Adminhtml/Order/PdfDocumentsMassAction.php | 2 +- .../Adminhtml/Order/Pdfcreditmemos.php | 2 +- .../Controller/Adminhtml/Order/Pdfdocs.php | 2 +- .../Controller/Adminhtml/Order/Pdfinvoices.php | 2 +- .../Controller/Adminhtml/Order/Pdfshipments.php | 2 +- .../Adminhtml/Order/ReviewPayment.php | 6 +++--- .../Adminhtml/Order/Status/AssignPost.php | 8 ++++---- .../Controller/Adminhtml/Order/Status/Edit.php | 2 +- .../Controller/Adminhtml/Order/Status/Save.php | 9 +++++---- .../Adminhtml/Order/Status/Unassign.php | 8 ++++---- .../Sales/Controller/Adminhtml/Order/Unhold.php | 8 ++++---- .../Sales/Controller/Adminhtml/Order/View.php | 2 +- .../Adminhtml/Order/View/Giftmessage/Save.php | 4 ++-- .../Controller/Adminhtml/Order/VoidPayment.php | 6 +++--- .../Sales/Controller/Adminhtml/Transactions.php | 2 +- .../Controller/Adminhtml/Transactions/Fetch.php | 6 +++--- app/code/Magento/Sales/Helper/Guest.php | 2 +- .../Magento/Sales/Model/AdminOrder/Create.php | 4 ++-- .../Sales/Model/AdminOrder/EmailSender.php | 2 +- .../Creditmemo/AbstractCreditmemo/EmailTest.php | 7 +++++-- .../Invoice/AbstractInvoice/EmailTest.php | 2 +- .../Controller/Adminhtml/Order/CancelTest.php | 4 ++-- .../Adminhtml/Order/Create/ProcessDataTest.php | 6 +++++- .../Adminhtml/Order/Create/ReorderTest.php | 2 +- .../Adminhtml/Order/Creditmemo/CancelTest.php | 2 +- .../Adminhtml/Order/Creditmemo/SaveTest.php | 2 +- .../Order/Creditmemo/VoidActionTest.php | 2 +- .../Controller/Adminhtml/Order/EmailTest.php | 6 +++--- .../Controller/Adminhtml/Order/HoldTest.php | 4 ++-- .../Adminhtml/Order/Invoice/CancelTest.php | 6 +++--- .../Adminhtml/Order/Invoice/CaptureTest.php | 6 +++--- .../Adminhtml/Order/Invoice/SaveTest.php | 2 +- .../Adminhtml/Order/Invoice/VoidActionTest.php | 8 ++++---- .../Adminhtml/Order/MassCancelTest.php | 8 ++++---- .../Controller/Adminhtml/Order/MassHoldTest.php | 6 +++--- .../Adminhtml/Order/MassUnholdTest.php | 6 +++--- .../Adminhtml/Order/ReviewPaymentTest.php | 4 ++-- .../Controller/Adminhtml/Order/UnholdTest.php | 4 ++-- .../Controller/Adminhtml/Order/ViewTest.php | 4 ++-- .../Adminhtml/PdfDocumentsMassActionTest.php | 4 ++-- .../Unit/Model/AdminOrder/EmailSenderTest.php | 2 +- 67 files changed, 170 insertions(+), 156 deletions(-) diff --git a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php index d7ab99377e1b5..dd4d73930cc8f 100644 --- a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php +++ b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php @@ -59,13 +59,16 @@ public function execute() $cart->addOrderItem($item); } catch (\Magento\Framework\Exception\LocalizedException $e) { if ($this->_objectManager->get(\Magento\Checkout\Model\Session::class)->getUseNotice(true)) { - $this->messageManager->addNotice($e->getMessage()); + $this->messageManager->addNoticeMessage($e->getMessage()); } else { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } return $resultRedirect->setPath('*/*/history'); } catch (\Exception $e) { - $this->messageManager->addException($e, __('We can\'t add this item to your shopping cart right now.')); + $this->messageManager->addExceptionMessage( + $e, + __('We can\'t add this item to your shopping cart right now.') + ); return $resultRedirect->setPath('checkout/cart'); } } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php index ac34af6f4ce6e..e3571f3cc02bc 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Email.php @@ -33,7 +33,7 @@ public function execute() $this->_objectManager->create(\Magento\Sales\Api\CreditmemoManagementInterface::class) ->notify($creditmemoId); - $this->messageManager->addSuccess(__('You sent the message.')); + $this->messageManager->addSuccessMessage(__('You sent the message.')); $resultRedirect = $this->resultRedirectFactory->create(); $resultRedirect->setPath('sales/order_creditmemo/view', ['creditmemo_id' => $creditmemoId]); return $resultRedirect; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php index e491dd78db617..c645df152ba8f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Email.php @@ -57,7 +57,7 @@ public function execute() \Magento\Sales\Api\InvoiceManagementInterface::class )->notify($invoice->getEntityId()); - $this->messageManager->addSuccess(__('You sent the message.')); + $this->messageManager->addSuccessMessage(__('You sent the message.')); return $this->resultRedirectFactory->create()->setPath( 'sales/invoice/view', ['order_id' => $invoice->getOrder()->getId(), 'invoice_id' => $invoiceId] diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php index 3615f3033ca81..300b7ee37f2ef 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/View.php @@ -79,7 +79,7 @@ protected function getInvoice() ->get($this->getRequest()->getParam('invoice_id')); $this->registry->register('current_invoice', $invoice); } catch (\Exception $e) { - $this->messageManager->addError(__('Invoice capturing error')); + $this->messageManager->addErrorMessage(__('Invoice capturing error')); return false; } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order.php b/app/code/Magento/Sales/Controller/Adminhtml/Order.php index c2299374c798c..0066c5f4c828a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order.php @@ -154,11 +154,11 @@ protected function _initOrder() try { $order = $this->orderRepository->get($id); } catch (NoSuchEntityException $e) { - $this->messageManager->addError(__('This order no longer exists.')); + $this->messageManager->addErrorMessage(__('This order no longer exists.')); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); return false; } catch (InputException $e) { - $this->messageManager->addError(__('This order no longer exists.')); + $this->messageManager->addErrorMessage(__('This order no longer exists.')); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); return false; } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php index 05066fe5b125e..c6b45f282debc 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php @@ -61,7 +61,7 @@ public function execute() $collection = $this->filter->getCollection($this->collectionFactory->create()); return $this->massAction($collection); } catch (\Exception $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); return $resultRedirect->setPath($this->redirectUrl); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php index dde2192c3b82c..c71de8cb0252d 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php @@ -114,12 +114,12 @@ public function execute() 'order_id' => $address->getParentId() ] ); - $this->messageManager->addSuccess(__('You updated the order address.')); + $this->messageManager->addSuccessMessage(__('You updated the order address.')); return $resultRedirect->setPath('sales/*/view', ['order_id' => $address->getParentId()]); } catch (LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addException($e, __('We can\'t update the order address right now.')); + $this->messageManager->addExceptionMessage($e, __('We can\'t update the order address right now.')); } return $resultRedirect->setPath('sales/*/address', ['address_id' => $address->getId()]); } else { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php index de41c3c737968..7e41c7417b38d 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Cancel.php @@ -24,18 +24,18 @@ public function execute() { $resultRedirect = $this->resultRedirectFactory->create(); if (!$this->isValidPostRequest()) { - $this->messageManager->addError(__('You have not canceled the item.')); + $this->messageManager->addErrorMessage(__('You have not canceled the item.')); return $resultRedirect->setPath('sales/*/'); } $order = $this->_initOrder(); if ($order) { try { $this->orderManagement->cancel($order->getEntityId()); - $this->messageManager->addSuccess(__('You canceled the order.')); + $this->messageManager->addSuccessMessage(__('You canceled the order.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('You have not canceled the item.')); + $this->messageManager->addErrorMessage(__('You have not canceled the item.')); $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); } return $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php index a7b41d0a780f3..dcf5e617d055c 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php @@ -317,7 +317,7 @@ protected function _processActionData($action = null) } } if (!$isApplyDiscount) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __( '"%1" coupon code was not applied. Do not apply discount is selected for item(s)', $this->escaper->escapeHtml($couponCode) @@ -325,14 +325,14 @@ protected function _processActionData($action = null) ); } else { if ($this->_getQuote()->getCouponCode() !== $couponCode) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __( 'The "%1" coupon code isn\'t valid. Verify the code and try again.', $this->escaper->escapeHtml($couponCode) ) ); } else { - $this->messageManager->addSuccess(__('The coupon code has been accepted.')); + $this->messageManager->addSuccessMessage(__('The coupon code has been accepted.')); } } } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php index 6a9d0a5dcb8ed..bc4eb3cfba423 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php @@ -55,10 +55,10 @@ public function execute() $this->_initSession()->_processData(); } catch (\Magento\Framework\Exception\LocalizedException $e) { $this->_reloadQuote(); - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { $this->_reloadQuote(); - $this->messageManager->addException($e, $e->getMessage()); + $this->messageManager->addExceptionMessage($e, $e->getMessage()); } $asJson = $request->getParam('json'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php index 621705c7937cb..256bfe2fbb64f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Save.php @@ -49,7 +49,7 @@ public function execute() ->createOrder(); $this->_getSession()->clearStorage(); - $this->messageManager->addSuccess(__('You created the order.')); + $this->messageManager->addSuccessMessage(__('You created the order.')); if ($this->_authorization->isAllowed('Magento_Sales::actions_view')) { $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]); } else { @@ -59,7 +59,7 @@ public function execute() $this->_getOrderCreateModel()->saveQuote(); $message = $e->getMessage(); if (!empty($message)) { - $this->messageManager->addError($message); + $this->messageManager->addErrorMessage($message); } $resultRedirect->setPath('sales/*/'); } catch (\Magento\Framework\Exception\LocalizedException $e) { @@ -67,11 +67,11 @@ public function execute() $this->_getSession()->setCustomerId($this->_getSession()->getQuote()->getCustomerId()); $message = $e->getMessage(); if (!empty($message)) { - $this->messageManager->addError($message); + $this->messageManager->addErrorMessage($message); } $resultRedirect->setPath('sales/*/'); } catch (\Exception $e) { - $this->messageManager->addException($e, __('Order saving error: %1', $e->getMessage())); + $this->messageManager->addExceptionMessage($e, __('Order saving error: %1', $e->getMessage())); $resultRedirect->setPath('sales/*/'); } return $resultRedirect; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php index eedf49a6cae9a..1ca0b53ee8784 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Cancel.php @@ -47,11 +47,11 @@ public function execute() \Magento\Sales\Api\CreditmemoManagementInterface::class ); $creditmemoManagement->cancel($creditmemoId); - $this->messageManager->addSuccess(__('The credit memo has been canceled.')); + $this->messageManager->addSuccessMessage(__('The credit memo has been canceled.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('Credit memo has not been canceled.')); + $this->messageManager->addErrorMessage(__('Credit memo has not been canceled.')); } $resultRedirect = $this->resultRedirectFactory->create(); $resultRedirect->setPath('sales/*/view', ['creditmemo_id' => $creditmemoId]); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php index 826a2a2a8b6c1..2a2445d2b2ae0 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php @@ -109,7 +109,7 @@ public function execute() $this->creditmemoSender->send($creditmemo); } - $this->messageManager->addSuccess(__('You created the credit memo.')); + $this->messageManager->addSuccessMessage(__('You created the credit memo.')); $this->_getSession()->getCommentText(true); $resultRedirect->setPath('sales/order/view', ['order_id' => $creditmemo->getOrderId()]); return $resultRedirect; @@ -119,11 +119,11 @@ public function execute() return $resultForward; } } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $this->_getSession()->setFormData($data); } catch (\Exception $e) { $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); - $this->messageManager->addError(__('We can\'t save the credit memo right now.')); + $this->messageManager->addErrorMessage(__('We can\'t save the credit memo right now.')); } $resultRedirect->setPath('sales/*/new', ['_current' => true]); return $resultRedirect; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php index e7bd891fbfbff..146514265517a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php @@ -64,11 +64,11 @@ public function execute() $transactionSave->addObject($creditmemo->getInvoice()); } $transactionSave->save(); - $this->messageManager->addSuccess(__('You voided the credit memo.')); + $this->messageManager->addSuccessMessage(__('You voided the credit memo.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('We can\'t void the credit memo.')); + $this->messageManager->addErrorMessage(__('We can\'t void the credit memo.')); } $resultRedirect = $this->resultRedirectFactory->create(); $resultRedirect->setPath('sales/*/view', ['creditmemo_id' => $creditmemo->getId()]); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php index 057e72b6176d3..0c5864e954a4f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php @@ -138,7 +138,7 @@ protected function _canCreditmemo($order) * Check order existing */ if (!$order->getId()) { - $this->messageManager->addError(__('The order no longer exists.')); + $this->messageManager->addErrorMessage(__('The order no longer exists.')); return false; } @@ -146,7 +146,7 @@ protected function _canCreditmemo($order) * Check creditmemo create availability */ if (!$order->canCreditmemo()) { - $this->messageManager->addError(__('We can\'t create credit memo for the order.')); + $this->messageManager->addErrorMessage(__('We can\'t create credit memo for the order.')); return false; } return true; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php index 14c630542dbde..b1eba5f661c2e 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit/Start.php @@ -36,10 +36,10 @@ public function execute() $resultRedirect->setPath('sales/order/'); } } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]); } catch (\Exception $e) { - $this->messageManager->addException($e, $e->getMessage()); + $this->messageManager->addExceptionMessage($e, $e->getMessage()); $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]); } return $resultRedirect; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php index 1573a07710b65..3500de798979a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Email.php @@ -25,11 +25,11 @@ public function execute() if ($order) { try { $this->orderManagement->notify($order->getEntityId()); - $this->messageManager->addSuccess(__('You sent the order email.')); + $this->messageManager->addSuccessMessage(__('You sent the order email.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('We can\'t send the email order right now.')); + $this->messageManager->addErrorMessage(__('We can\'t send the email order right now.')); $this->logger->critical($e); } return $this->resultRedirectFactory->create()->setPath( diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php index feb307ca19c31..7d2c713eece48 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Hold.php @@ -23,18 +23,18 @@ public function execute() { $resultRedirect = $this->resultRedirectFactory->create(); if (!$this->isValidPostRequest()) { - $this->messageManager->addError(__('You have not put the order on hold.')); + $this->messageManager->addErrorMessage(__('You have not put the order on hold.')); return $resultRedirect->setPath('sales/*/'); } $order = $this->_initOrder(); if ($order) { try { $this->orderManagement->hold($order->getEntityId()); - $this->messageManager->addSuccess(__('You put the order on hold.')); + $this->messageManager->addSuccessMessage(__('You put the order on hold.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('You have not put the order on hold.')); + $this->messageManager->addErrorMessage(__('You have not put the order on hold.')); } $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]); return $resultRedirect; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php index a031591b37fae..e4a74329502f1 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Cancel.php @@ -31,11 +31,11 @@ public function execute() )->addObject( $invoice->getOrder() )->save(); - $this->messageManager->addSuccess(__('You canceled the invoice.')); + $this->messageManager->addSuccessMessage(__('You canceled the invoice.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('Invoice canceling error')); + $this->messageManager->addErrorMessage(__('Invoice canceling error')); } /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php index 030ccc9d9d3f6..43270264ecbda 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Capture.php @@ -33,11 +33,11 @@ public function execute() )->addObject( $invoice->getOrder() )->save(); - $this->messageManager->addSuccess(__('The invoice has been captured.')); + $this->messageManager->addSuccessMessage(__('The invoice has been captured.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('Invoice capturing error')); + $this->messageManager->addErrorMessage(__('Invoice capturing error')); } /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php index 359bbafd45105..2d7826807a6c3 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewAction.php @@ -112,10 +112,10 @@ public function execute() $resultPage->getConfig()->getTitle()->prepend(__('New Invoice')); return $resultPage; } catch (\Magento\Framework\Exception\LocalizedException $exception) { - $this->messageManager->addError($exception->getMessage()); + $this->messageManager->addErrorMessage($exception->getMessage()); return $this->_redirectToOrder($orderId); } catch (\Exception $exception) { - $this->messageManager->addException($exception, 'Cannot create an invoice.'); + $this->messageManager->addExceptionMessage($exception, 'Cannot create an invoice.'); return $this->_redirectToOrder($orderId); } } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php index d804dff5d48a0..71338c818c418 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php @@ -118,7 +118,8 @@ public function execute() $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest()); $isPost = $this->getRequest()->isPost(); if (!$formKeyIsValid || !$isPost) { - $this->messageManager->addError(__("The invoice can't be saved at this time. Please try again later.")); + $this->messageManager + ->addErrorMessage(__("The invoice can't be saved at this time. Please try again later.")); return $resultRedirect->setPath('sales/order/index'); } @@ -193,9 +194,9 @@ public function execute() $transactionSave->save(); if (!empty($data['do_shipment'])) { - $this->messageManager->addSuccess(__('You created the invoice and shipment.')); + $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.')); } else { - $this->messageManager->addSuccess(__('The invoice has been created.')); + $this->messageManager->addSuccessMessage(__('The invoice has been created.')); } // send invoice/shipment emails @@ -205,7 +206,7 @@ public function execute() } } catch (\Exception $e) { $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); - $this->messageManager->addError(__('We can\'t send the invoice email right now.')); + $this->messageManager->addErrorMessage(__('We can\'t send the invoice email right now.')); } if ($shipment) { try { @@ -214,15 +215,17 @@ public function execute() } } catch (\Exception $e) { $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); - $this->messageManager->addError(__('We can\'t send the shipment right now.')); + $this->messageManager->addErrorMessage(__('We can\'t send the shipment right now.')); } } $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true); return $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]); } catch (LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__("The invoice can't be saved at this time. Please try again later.")); + $this->messageManager->addErrorMessage( + __("The invoice can't be saved at this time. Please try again later.") + ); $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); } return $resultRedirect->setPath('sales/*/new', ['order_id' => $orderId]); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php index 6c91001cbb3da..4888ed555234c 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php @@ -34,11 +34,11 @@ public function execute() )->addObject( $invoice->getOrder() )->save(); - $this->messageManager->addSuccess(__('The invoice has been voided.')); + $this->messageManager->addSuccessMessage(__('The invoice has been voided.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('Invoice voiding error')); + $this->messageManager->addErrorMessage(__('Invoice voiding error')); } /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php index 8488e402caf69..32cf6dbfc7c35 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php @@ -61,13 +61,13 @@ protected function massAction(AbstractCollection $collection) $countNonCancelOrder = $collection->count() - $countCancelOrder; if ($countNonCancelOrder && $countCancelOrder) { - $this->messageManager->addError(__('%1 order(s) cannot be canceled.', $countNonCancelOrder)); + $this->messageManager->addErrorMessage(__('%1 order(s) cannot be canceled.', $countNonCancelOrder)); } elseif ($countNonCancelOrder) { - $this->messageManager->addError(__('You cannot cancel the order(s).')); + $this->messageManager->addErrorMessage(__('You cannot cancel the order(s).')); } if ($countCancelOrder) { - $this->messageManager->addSuccess(__('We canceled %1 order(s).', $countCancelOrder)); + $this->messageManager->addSuccessMessage(__('We canceled %1 order(s).', $countCancelOrder)); } $resultRedirect = $this->resultRedirectFactory->create(); $resultRedirect->setPath($this->getComponentRefererUrl()); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php index e894957dc8b6c..241255f68e39f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php @@ -62,13 +62,13 @@ protected function massAction(AbstractCollection $collection) $countNonHoldOrder = $collection->count() - $countHoldOrder; if ($countNonHoldOrder && $countHoldOrder) { - $this->messageManager->addError(__('%1 order(s) were not put on hold.', $countNonHoldOrder)); + $this->messageManager->addErrorMessage(__('%1 order(s) were not put on hold.', $countNonHoldOrder)); } elseif ($countNonHoldOrder) { - $this->messageManager->addError(__('No order(s) were put on hold.')); + $this->messageManager->addErrorMessage(__('No order(s) were put on hold.')); } if ($countHoldOrder) { - $this->messageManager->addSuccess(__('You have put %1 order(s) on hold.', $countHoldOrder)); + $this->messageManager->addSuccessMessage(__('You have put %1 order(s) on hold.', $countHoldOrder)); } $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php index 2eb54c9814ef7..5e8ea9c4ad071 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php @@ -64,15 +64,15 @@ protected function massAction(AbstractCollection $collection) $countNonUnHoldOrder = $collection->count() - $countUnHoldOrder; if ($countNonUnHoldOrder && $countUnHoldOrder) { - $this->messageManager->addError( + $this->messageManager->addErrorMessage( __('%1 order(s) were not released from on hold status.', $countNonUnHoldOrder) ); } elseif ($countNonUnHoldOrder) { - $this->messageManager->addError(__('No order(s) were released from on hold status.')); + $this->messageManager->addErrorMessage(__('No order(s) were released from on hold status.')); } if ($countUnHoldOrder) { - $this->messageManager->addSuccess( + $this->messageManager->addSuccessMessage( __('%1 order(s) have been released from on hold status.', $countUnHoldOrder) ); } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php index c53e4d48925c0..eeda8699a8b10 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/PdfDocumentsMassAction.php @@ -27,7 +27,7 @@ public function execute() $collection = $this->filter->getCollection($this->getOrderCollection()->create()); return $this->massAction($collection); } catch (\Exception $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); return $resultRedirect->setPath($this->redirectUrl); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php index f96e2fd09c2b0..d53ff790f4171 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php @@ -82,7 +82,7 @@ protected function massAction(AbstractCollection $collection) $creditmemoCollection = $this->collectionFactory->create()->setOrderFilter(['in' => $collection->getAllIds()]); if (!$creditmemoCollection->getSize()) { - $this->messageManager->addError(__('There are no printable documents related to selected orders.')); + $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.')); return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl()); } return $this->fileFactory->create( diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php index d68cfe696b0ef..06e027308a87c 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php @@ -134,7 +134,7 @@ protected function massAction(AbstractCollection $collection) } if (empty($documents)) { - $this->messageManager->addError(__('There are no printable documents related to selected orders.')); + $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.')); return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl()); } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php index fee124a91410d..1b4af8f9764d0 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php @@ -80,7 +80,7 @@ protected function massAction(AbstractCollection $collection) { $invoicesCollection = $this->collectionFactory->create()->setOrderFilter(['in' => $collection->getAllIds()]); if (!$invoicesCollection->getSize()) { - $this->messageManager->addError(__('There are no printable documents related to selected orders.')); + $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.')); return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl()); } return $this->fileFactory->create( diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php index 1aa5bfdb83878..e13962ae9cc19 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php @@ -84,7 +84,7 @@ protected function massAction(AbstractCollection $collection) ->create() ->setOrderFilter(['in' => $collection->getAllIds()]); if (!$shipmentsCollection->getSize()) { - $this->messageManager->addError(__('There are no printable documents related to selected orders.')); + $this->messageManager->addErrorMessage(__('There are no printable documents related to selected orders.')); return $this->resultRedirectFactory->create()->setPath($this->getComponentRefererUrl()); } return $this->fileFactory->create( diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php index 88abdb76d26f7..09a52a113617a 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php @@ -53,15 +53,15 @@ public function execute() throw new \Exception(sprintf('Action "%s" is not supported.', $action)); } $this->orderRepository->save($order); - $this->messageManager->addSuccess($message); + $this->messageManager->addSuccessMessage($message); } else { $resultRedirect->setPath('sales/*/'); return $resultRedirect; } } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('We can\'t update the payment right now.')); + $this->messageManager->addErrorMessage(__('We can\'t update the payment right now.')); $this->logger->critical($e); } $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getEntityId()]); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php index 89820b41a68da..3b98d206d5f66 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/AssignPost.php @@ -26,18 +26,18 @@ public function execute() if ($status && $status->getStatus()) { try { $status->assignState($state, $isDefault, $visibleOnFront); - $this->messageManager->addSuccess(__('You assigned the order status.')); + $this->messageManager->addSuccessMessage(__('You assigned the order status.')); return $resultRedirect->setPath('sales/*/'); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addException( + $this->messageManager->addExceptionMessage( $e, __('Something went wrong while assigning the order status.') ); } } else { - $this->messageManager->addError(__('We can\'t find this order status.')); + $this->messageManager->addErrorMessage(__('We can\'t find this order status.')); } return $resultRedirect->setPath('sales/*/assign'); } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php index 69e051b20c4dd..7a4a1918bc1a2 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php @@ -48,7 +48,7 @@ public function execute() $resultPage->getConfig()->getTitle()->prepend(__('Edit Order Status')); return $resultPage; } else { - $this->messageManager->addError(__('We can\'t find this order status.')); + $this->messageManager->addErrorMessage(__('We can\'t find this order status.')); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); return $resultRedirect->setPath('sales/'); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php index 849a7e2d0c817..57ac3776fc3e9 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php @@ -40,7 +40,8 @@ public function execute() $status = $this->_objectManager->create(\Magento\Sales\Model\Order\Status::class)->load($statusCode); // check if status exist if ($isNew && $status->getStatus()) { - $this->messageManager->addError(__('We found another order status with the same order status code.')); + $this->messageManager + ->addErrorMessage(__('We found another order status with the same order status code.')); $this->_getSession()->setFormData($data); return $resultRedirect->setPath('sales/*/new'); } @@ -49,12 +50,12 @@ public function execute() try { $status->save(); - $this->messageManager->addSuccess(__('You saved the order status.')); + $this->messageManager->addSuccessMessage(__('You saved the order status.')); return $resultRedirect->setPath('sales/*/'); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addException( + $this->messageManager->addExceptionMessage( $e, __('We can\'t add the order status right now.') ); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php index 04db430e1ffa4..2723d483dd38b 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Unassign.php @@ -18,17 +18,17 @@ public function execute() if ($status) { try { $status->unassignState($state); - $this->messageManager->addSuccess(__('You have unassigned the order status.')); + $this->messageManager->addSuccessMessage(__('You have unassigned the order status.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addException( + $this->messageManager->addExceptionMessage( $e, __('Something went wrong while unassigning the order.') ); } } else { - $this->messageManager->addError(__('We can\'t find this order status.')); + $this->messageManager->addErrorMessage(__('We can\'t find this order status.')); } /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultRedirectFactory->create(); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php index fa9676856a442..8d7f27069eeb7 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php @@ -23,7 +23,7 @@ public function execute() { $resultRedirect = $this->resultRedirectFactory->create(); if (!$this->isValidPostRequest()) { - $this->messageManager->addError(__('Can\'t unhold order.')); + $this->messageManager->addErrorMessage(__('Can\'t unhold order.')); return $resultRedirect->setPath('sales/*/'); } $order = $this->_initOrder(); @@ -33,11 +33,11 @@ public function execute() throw new \Magento\Framework\Exception\LocalizedException(__('Can\'t unhold order.')); } $this->orderManagement->unHold($order->getEntityId()); - $this->messageManager->addSuccess(__('You released the order from holding status.')); + $this->messageManager->addSuccessMessage(__('You released the order from holding status.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('The order was not on hold.')); + $this->messageManager->addErrorMessage(__('The order was not on hold.')); } $resultRedirect->setPath('sales/order/view', ['order_id' => $order->getId()]); return $resultRedirect; diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php index 7be17f865312e..8906d11dd776f 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php @@ -31,7 +31,7 @@ public function execute() $resultPage->getConfig()->getTitle()->prepend(__('Orders')); } catch (\Exception $e) { $this->logger->critical($e); - $this->messageManager->addError(__('Exception occurred during order load')); + $this->messageManager->addErrorMessage(__('Exception occurred during order load')); $resultRedirect->setPath('sales/order/index'); return $resultRedirect; } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php index 61dc325c05c91..88fdbe58271f6 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage/Save.php @@ -18,9 +18,9 @@ public function execute() $this->getRequest()->getParam('giftmessage') )->saveAllInOrder(); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('Something went wrong while saving the gift message.')); + $this->messageManager->addErrorMessage(__('Something went wrong while saving the gift message.')); } if ($this->getRequest()->getParam('type') == 'order_item') { diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php index 3e7ce50f9a6f1..4ead8885087c3 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/VoidPayment.php @@ -21,11 +21,11 @@ public function execute() // workaround for backwards compatibility $order->getPayment()->void(new \Magento\Framework\DataObject()); $order->save(); - $this->messageManager->addSuccess(__('The payment has been voided.')); + $this->messageManager->addSuccessMessage(__('The payment has been voided.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('We can\'t void the payment right now.')); + $this->messageManager->addErrorMessage(__('We can\'t void the payment right now.')); $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); } $resultRedirect->setPath('sales/*/view', ['order_id' => $order->getId()]); diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php index d5c1186964076..e344b258c5198 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php @@ -82,7 +82,7 @@ protected function _initTransaction() ); if (!$txn->getId()) { - $this->messageManager->addError(__('Please correct the transaction ID and try again.')); + $this->messageManager->addErrorMessage(__('Please correct the transaction ID and try again.')); $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true); return false; } diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php index e77c65716fdd7..1b72ce3f13e33 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php @@ -38,11 +38,11 @@ public function execute() ->setOrder($txn->getOrder()) ->importTransactionInfo($txn); $txn->save(); - $this->messageManager->addSuccess(__('The transaction details have been updated.')); + $this->messageManager->addSuccessMessage(__('The transaction details have been updated.')); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { - $this->messageManager->addError(__('We can\'t update the transaction details.')); + $this->messageManager->addErrorMessage(__('We can\'t update the transaction details.')); $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e); } diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php index 8407ce5a8d7cb..a3f2ac6ba3556 100644 --- a/app/code/Magento/Sales/Helper/Guest.php +++ b/app/code/Magento/Sales/Helper/Guest.php @@ -165,7 +165,7 @@ public function loadValidOrder(App\RequestInterface $request) $this->coreRegistry->register('current_order', $order); return true; } catch (InputException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); return $this->resultRedirectFactory->create()->setPath('sales/guest/form'); } } diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php index 07716ff8274c6..0fb9ab5833055 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/Create.php +++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php @@ -1075,7 +1075,7 @@ public function addProducts(array $products) try { $this->addProduct($productId, $config); } catch (\Magento\Framework\Exception\LocalizedException $e) { - $this->messageManager->addError($e->getMessage()); + $this->messageManager->addErrorMessage($e->getMessage()); } catch (\Exception $e) { return $e; } @@ -2002,7 +2002,7 @@ protected function _validate() $logger = ObjectManager::getInstance()->get(LoggerInterface::class); foreach ($this->_errors as $error) { $logger->error($error); - $this->messageManager->addError($error); + $this->messageManager->addErrorMessage($error); } throw new \Magento\Framework\Exception\LocalizedException(__('Validation is failed.')); diff --git a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php index 8ba0b5b071395..4e068eb571deb 100644 --- a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php +++ b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php @@ -55,7 +55,7 @@ public function send(Order $order) $this->orderSender->send($order); } catch (\Magento\Framework\Exception\MailException $exception) { $this->logger->critical($exception); - $this->messageManager->addWarning( + $this->messageManager->addWarningMessage( __('You did not email your customer. Please check your email settings.') ); return false; diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php index c6f1be2a88540..cece68c544779 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/EmailTest.php @@ -98,7 +98,10 @@ protected function setUp() \Magento\Framework\ObjectManager\ObjectManager::class, ['create'] ); - $this->messageManager = $this->createPartialMock(\Magento\Framework\Message\Manager::class, ['addSuccess']); + $this->messageManager = $this->createPartialMock( + \Magento\Framework\Message\Manager::class, + ['addSuccessMessage'] + ); $this->session = $this->createPartialMock(\Magento\Backend\Model\Session::class, ['setIsUrlNotice']); $this->actionFlag = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get']); $this->helper = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']); @@ -147,7 +150,7 @@ public function testEmail() ->method('notify') ->willReturn(true); $this->messageManager->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('You sent the message.'); $this->assertInstanceOf( diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php index f71d98f94a82a..e7182878b4a4a 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php @@ -196,7 +196,7 @@ public function testEmail() ->with($invoiceId) ->willReturn(true); $this->messageManager->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('You sent the message.'); $this->resultRedirectFactory->expects($this->atLeastOnce()) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php index 363f78e738f12..9f8c3a60bacc5 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CancelTest.php @@ -77,7 +77,7 @@ protected function setUp() ->disableOriginalConstructor()->getMock(); $this->messageManager = $this->createPartialMock( \Magento\Framework\Message\Manager::class, - ['addSuccess', 'addError'] + ['addSuccessMessage', 'addErrorMessage'] ); $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class) ->disableOriginalConstructor() @@ -117,7 +117,7 @@ public function testExecuteNotPost() ->method('isPost') ->willReturn(false); $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('You have not canceled the item.'); $this->resultRedirect->expects($this->once()) ->method('setPath') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php index e818b1edbc1d7..2bc33b3bad6de 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ProcessDataTest.php @@ -226,7 +226,11 @@ public function testExecute($noDiscount, $couponCode, $errorMessage, $actualCoup ); $this->escaper->expects($this->once())->method('escapeHtml')->with($couponCode)->willReturn($couponCode); - $this->messageManager->expects($this->once())->method('addError')->with($errorMessageManager)->willReturnSelf(); + $this->messageManager + ->expects($this->once()) + ->method('addErrorMessage') + ->with($errorMessageManager) + ->willReturnSelf(); $this->resultForward->expects($this->once()) ->method('forward') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php index 1fdd9759f5045..f2ec969eb83fe 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php @@ -189,7 +189,7 @@ public function testExecuteRedirectBack() $this->createRedirect(); $this->getOrderId($this->orderId); $this->getUnavailableProducts([1, 3]); - $this->messageManagerMock->expects($this->any())->method('addErrorMessage'); + $this->messageManagerMock->expects($this->any())->method('addErrorMessageMessage'); $this->setPath('sales/order/view', ['order_id' => $this->orderId]); $this->assertInstanceOf(Redirect::class, $this->reorder->execute()); diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php index af218903a3868..3e9e6af0b4181 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/CancelTest.php @@ -292,7 +292,7 @@ public function testExecute() ->method('cancel') ->with($creditmemoId); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('The credit memo has been canceled.'); $this->resultRedirectFactoryMock->expects($this->once()) ->method('create') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php index 490203563bb36..0112d09eb735f 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php @@ -235,7 +235,7 @@ public function testSaveActionWithNegativeCreditmemo() */ protected function _setSaveActionExpectationForMageCoreException($data, $errorMessage) { - $this->_messageManager->expects($this->once())->method('addError')->with($this->equalTo($errorMessage)); + $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($this->equalTo($errorMessage)); $this->_sessionMock->expects($this->once())->method('setFormData')->with($this->equalTo($data)); } } diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php index 7e0163002b437..04adb63bc88ac 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php @@ -335,7 +335,7 @@ public function testExecute() ->method('getInvoice') ->willReturn($invoiceMock); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('You voided the credit memo.'); $this->resultRedirectFactoryMock->expects($this->once()) ->method('create') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php index bb826be85850c..6286cd521d9db 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/EmailTest.php @@ -119,7 +119,7 @@ protected function setUp() ->disableOriginalConstructor()->getMock(); $this->messageManager = $this->createPartialMock( \Magento\Framework\Message\Manager::class, - ['addSuccess', 'addError'] + ['addSuccessMessage', 'addErrorMessage'] ); $this->orderMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderInterface::class) @@ -171,7 +171,7 @@ public function testEmail() ->with($orderId) ->willReturn(true); $this->messageManager->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('You sent the order email.'); $this->resultRedirect->expects($this->once()) ->method('setPath') @@ -200,7 +200,7 @@ public function testEmailNoOrderId() ) ); $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('This order no longer exists.'); $this->actionFlag->expects($this->once()) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php index 68ce75781db78..e7245016c0d74 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/HoldTest.php @@ -77,7 +77,7 @@ protected function setUp() ->disableOriginalConstructor()->getMock(); $this->messageManager = $this->createPartialMock( \Magento\Framework\Message\Manager::class, - ['addSuccess', 'addError'] + ['addSuccessMessage', 'addErrorMessage'] ); $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class) ->disableOriginalConstructor() @@ -117,7 +117,7 @@ public function testExecuteNotPost() ->method('isPost') ->willReturn(false); $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('You have not put the order on hold.'); $this->resultRedirect->expects($this->once()) ->method('setPath') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php index 83b897656d185..667b6775384cf 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php @@ -213,7 +213,7 @@ public function testExecute() ->method('save'); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('You canceled the invoice.'); $this->invoiceRepository->expects($this->once()) @@ -295,7 +295,7 @@ public function testExecuteModelException() ->will($this->throwException($e)); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with($message); $invoiceMock->expects($this->once()) @@ -343,7 +343,7 @@ public function testExecuteException() ->will($this->throwException($e)); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with($message); $invoiceMock->expects($this->once()) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php index 0fabc24dd4421..fd53d91b9d9ea 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php @@ -223,7 +223,7 @@ public function testExecute() ->method('save'); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('The invoice has been captured.'); $invoiceMock->expects($this->once()) @@ -304,7 +304,7 @@ public function testExecuteModelException() ->getMock(); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with($message); $invoiceMock->expects($this->once()) @@ -355,7 +355,7 @@ public function testExecuteException() ->getMock(); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with($message); $invoiceMock->expects($this->once()) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php index 3ffa0971770b1..17dc3f42a2fe2 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php @@ -122,7 +122,7 @@ public function testExecuteNotValidPost() ->method('isPost') ->willReturn(false); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with("The invoice can't be saved at this time. Please try again later."); $redirectMock->expects($this->once()) ->method('setPath') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php index d7766d79e9c30..0fbff061650f8 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php @@ -250,7 +250,7 @@ public function testExecute() ->will($this->returnValue($transactionMock)); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('The invoice has been voided.'); $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class) @@ -283,9 +283,9 @@ public function testExecuteNoInvoice() ->willReturn(null); $this->messageManagerMock->expects($this->never()) - ->method('addError'); + ->method('addErrorMessage'); $this->messageManagerMock->expects($this->never()) - ->method('addSuccess'); + ->method('addSuccessMessage'); $resultForward = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Forward::class) ->disableOriginalConstructor() @@ -334,7 +334,7 @@ public function testExecuteModelException() ->willReturn($invoiceMock); $this->messageManagerMock->expects($this->once()) - ->method('addError'); + ->method('addErrorMessage'); $resultRedirect = $this->getMockBuilder(\Magento\Backend\Model\View\Result\Redirect::class) ->disableOriginalConstructor() diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php index 756bade3c83c9..8e2620135255b 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassCancelTest.php @@ -201,11 +201,11 @@ public function testExecuteCanCancelOneOrder() $this->orderManagementMock->expects($this->at(1))->method('cancel')->with($order2id)->willReturn(false); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('1 order(s) cannot be canceled.'); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('We canceled 1 order(s).'); $this->resultRedirectMock->expects($this->once()) @@ -251,7 +251,7 @@ public function testExcludedCannotCancelOrders() $this->orderManagementMock->expects($this->atLeastOnce())->method('cancel')->willReturn(false); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('You cannot cancel the order(s).'); $this->resultRedirectMock->expects($this->once()) @@ -283,7 +283,7 @@ public function testException() $this->orderManagementMock->expects($this->atLeastOnce())->method('cancel')->willThrowException($exception); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('Can not cancel'); $this->massAction->execute(); diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php index 02ff208445596..6bfbdf24b45a9 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassHoldTest.php @@ -196,11 +196,11 @@ public function testExecuteOneOrderPutOnHold() ->willReturn(false); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('1 order(s) were not put on hold.'); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('You have put 1 order(s) on hold.'); $this->resultRedirectMock->expects($this->once()) @@ -240,7 +240,7 @@ public function testExecuteNoOrdersPutOnHold() ->willReturn(false); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('No order(s) were put on hold.'); $this->resultRedirectMock->expects($this->once()) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php index cddb503925987..096abdce6d2a9 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php @@ -196,11 +196,11 @@ public function testExecuteOneOrdersReleasedFromHold() $this->orderManagementMock->expects($this->atLeastOnce())->method('unHold')->willReturn(true); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('1 order(s) were not released from on hold status.'); $this->messageManagerMock->expects($this->once()) - ->method('addSuccess') + ->method('addSuccessMessage') ->with('1 order(s) have been released from on hold status.'); $this->resultRedirectMock->expects($this->once()) @@ -239,7 +239,7 @@ public function testExecuteNoReleasedOrderFromHold() ->willReturn(false); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('No order(s) were released from on hold status.'); $this->resultRedirectMock->expects($this->once()) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php index 27bbbd4eb0043..9d5b33b4a0b59 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ReviewPaymentTest.php @@ -75,7 +75,7 @@ protected function setUp() ->getMockForAbstractClass(); $this->messageManagerMock = $this->createPartialMock( \Magento\Framework\Message\Manager::class, - ['addSuccess', 'addError'] + ['addSuccessMessage', 'addErrorMessage'] ); $this->resultRedirectFactoryMock = $this->createPartialMock( @@ -137,7 +137,7 @@ public function testExecuteUpdateAction() $this->paymentMock->expects($this->once())->method('update'); $this->paymentMock->expects($this->any())->method('getIsTransactionApproved')->willReturn(true); - $this->messageManagerMock->expects($this->once())->method('addSuccess'); + $this->messageManagerMock->expects($this->once())->method('addSuccessMessage'); $this->resultRedirectMock->expects($this->once()) ->method('setPath') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php index 7720b7615c3fa..efa9235dc42f5 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/UnholdTest.php @@ -77,7 +77,7 @@ protected function setUp() ->disableOriginalConstructor()->getMock(); $this->messageManager = $this->createPartialMock( \Magento\Framework\Message\Manager::class, - ['addSuccess', 'addError'] + ['addSuccessMessage', 'addErrorMessage'] ); $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class) ->disableOriginalConstructor() @@ -117,7 +117,7 @@ public function testExecuteNotPost() ->method('isPost') ->willReturn(false); $this->messageManager->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('Can\'t unhold order.'); $this->resultRedirect->expects($this->once()) ->method('setPath') diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php index 97b3fe630aa52..9884f1604c756 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php @@ -251,7 +251,7 @@ public function testGlobalException() ->method('critical') ->with($exception); $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('Exception occurred during order load') ->willReturnSelf(); $this->setPath('sales/order/index'); @@ -292,7 +292,7 @@ protected function initOrderSuccess() protected function initOrderFail() { $this->messageManagerMock->expects($this->once()) - ->method('addError') + ->method('addErrorMessage') ->with('This order no longer exists.') ->willReturnSelf(); $this->actionFlagMock->expects($this->once()) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php index 0841e239429a5..b201ed0753554 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/PdfDocumentsMassActionTest.php @@ -46,7 +46,7 @@ protected function setUp() $this->messageManager = $this->createPartialMock( \Magento\Framework\Message\Manager::class, - ['addSuccess', 'addError'] + ['addSuccessMessage', 'addErrorMessage'] ); $this->orderCollectionMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class); @@ -88,7 +88,7 @@ public function testExecute() ->method('getCollection') ->with($this->orderCollectionMock) ->willThrowException($exception); - $this->messageManager->expects($this->once())->method('addError'); + $this->messageManager->expects($this->once())->method('addErrorMessage'); $this->resultRedirect->expects($this->once())->method('setPath')->willReturnSelf(); $this->controller->execute($exception); diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php index ccc0bfe309f0c..87dd8b2be5a30 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php @@ -57,7 +57,7 @@ public function testSendFailure() ->method('send') ->willThrowException(new \Magento\Framework\Exception\MailException(__('test message'))); $this->messageManagerMock->expects($this->once()) - ->method('addWarning'); + ->method('addWarningMessage'); $this->loggerMock->expects($this->once()) ->method('critical'); From ad286026c5dde49f6f62d63e99032b43b00d2944 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Wed, 8 Aug 2018 11:19:13 +0300 Subject: [PATCH 3/4] Fixed typo issue --- .../Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php index f2ec969eb83fe..1fdd9759f5045 100644 --- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php @@ -189,7 +189,7 @@ public function testExecuteRedirectBack() $this->createRedirect(); $this->getOrderId($this->orderId); $this->getUnavailableProducts([1, 3]); - $this->messageManagerMock->expects($this->any())->method('addErrorMessageMessage'); + $this->messageManagerMock->expects($this->any())->method('addErrorMessage'); $this->setPath('sales/order/view', ['order_id' => $this->orderId]); $this->assertInstanceOf(Redirect::class, $this->reorder->execute()); From 9a701c78e5e1ebbaf1a3dd127b3dd915679972c9 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Wed, 8 Aug 2018 11:35:43 +0300 Subject: [PATCH 4/4] Fixed cyclomatic complexity --- .../Adminhtml/Order/Status/Save.php | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php index 57ac3776fc3e9..6cedae096f2f8 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Save.php @@ -61,12 +61,22 @@ public function execute() ); } $this->_getSession()->setFormData($data); - if ($isNew) { - return $resultRedirect->setPath('sales/*/new'); - } else { - return $resultRedirect->setPath('sales/*/edit', ['status' => $this->getRequest()->getParam('status')]); - } + return $this->getRedirect($resultRedirect, $isNew); } return $resultRedirect->setPath('sales/*/'); } + + /** + * @param \Magento\Backend\Model\View\Result\Redirect $resultRedirect + * @param $isNew + * @return \Magento\Backend\Model\View\Result\Redirect + */ + private function getRedirect(\Magento\Backend\Model\View\Result\Redirect $resultRedirect, $isNew) + { + if ($isNew) { + return $resultRedirect->setPath('sales/*/new'); + } else { + return $resultRedirect->setPath('sales/*/edit', ['status' => $this->getRequest()->getParam('status')]); + } + } }