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

…reating invoice & shipment simultaniously #20142
magento · Jan 27, 2019 · 153eef7 · 153eef7
2 parents fdc163f + 28d6d93
commit 153eef7
Showing 1 changed file with 8 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
@@ -18,6 +18,8 @@
 use Magento\Sales\Model\Service\InvoiceService;
 
 /**
+ * Save invoice controller.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
@@ -103,6 +105,7 @@ protected function _prepareShipment($invoice)
 
     /**
      * Save invoice
+     *
      * We can save only new invoice. Existing invoices are not editable
      *
      * @return \Magento\Framework\Controller\ResultInterface
@@ -194,12 +197,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 +216,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) {