ENGCOM-3828: Fixed issue #19942 Success message is not showing when c…

…reating invoice & shipment simultaniously #20142 - Merge Pull Request #20142 from Surabhi-Cedcoss/magento2:2.3-develop-pr3 - Merged commits: 1. e6c41ba
magento · Jan 11, 2019 · 0aa8296 · 0aa8296
2 parents d7ac52b + e6c41ba
commit 0aa8296
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -194,12 +194,6 @@ public function execute()
             }
             $transactionSave->save();
 
-            if (!empty($data['do_shipment'])) {
-                $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.'));
-            } else {
-                $this->messageManager->addSuccessMessage(__('The invoice has been created.'));
-            }
-
             // send invoice/shipment emails
             try {
                 if (!empty($data['send_email'])) {
@@ -219,6 +213,11 @@ public function execute()
                     $this->messageManager->addErrorMessage(__('We can\'t send the shipment right now.'));
                 }
             }
+            if (!empty($data['do_shipment'])) {
+                $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.'));
+            } else {
+                $this->messageManager->addSuccessMessage(__('The invoice has been created.'));
+            }
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
             return $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
         } catch (LocalizedException $e) {