Merge branch '2.2-develop' of github.com:magento/magento2ce into MPI-PR

Author: YevSent

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');

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

@@ -3,23 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Controller\Adminhtml\Order\Create;
 
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\PaymentException;
 
 class Save extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
     /**
      * Saving quote and create order
      *
-     * @return \Magento\Backend\Model\View\Result\Forward|\Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\ResultInterface
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-        $resultRedirect = $this->resultRedirectFactory->create();
+        $path = 'sales/*/';
+        $pathParams = [];
+
         try {
             // check if the creation of a new customer is allowed
             if (!$this->_authorization->isAllowed('Magento_Customer::manage')
@@ -49,31 +52,30 @@ 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()]);
+                $pathParams = ['order_id' => $order->getId()];
+                $path = 'sales/order/view';
             } else {
-                $resultRedirect->setPath('sales/order/index');
+                $path = 'sales/order/index';
             }
         } catch (PaymentException $e) {
             $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) {
             // customer can be created before place order flow is completed and should be stored in current session
-            $this->_getSession()->setCustomerId($this->_getSession()->getQuote()->getCustomerId());
+            $this->_getSession()->setCustomerId((int)$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()));
-            $resultRedirect->setPath('sales/*/');
+            $this->messageManager->addExceptionMessage($e, __('Order saving error: %1', $e->getMessage()));
         }
-        return $resultRedirect;
+
+        return $this->resultRedirectFactory->create()->setPath($path, $pathParams);
     }
 }

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -1948,21 +1948,17 @@ public function createOrder()
      */
     protected function _validate()
     {
-        $customerId = $this->getSession()->getCustomerId();
-        if ($customerId === null) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Please select a customer'));
-        }
-
         if (!$this->getSession()->getStore()->getId()) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Please select a store'));
         }
         $items = $this->getQuote()->getAllItems();
 
-        if (count($items) == 0) {
+        if (count($items) === 0) {
             $this->_errors[] = __('Please specify order items.');
         }
 
         foreach ($items as $item) {
+            /** @var \Magento\Quote\Model\Quote\Item $item */
             $messages = $item->getMessage(false);
             if ($item->getHasError() && is_array($messages) && !empty($messages)) {
                 $this->_errors = array_merge($this->_errors, $messages);
@@ -1991,7 +1987,7 @@ protected function _validate()
         }
         if (!empty($this->_errors)) {
             foreach ($this->_errors as $error) {
-                $this->messageManager->addError($error);
+                $this->messageManager->addErrorMessage($error);
             }
             throw new \Magento\Framework\Exception\LocalizedException(__('Validation is failed.'));
         }