ACP2E-3618: [CLOUD] Re-order button functionality

Author: aplapana

app/code/Magento/Quote/Model/Cart/AddProductsToCart.php

@@ -168,17 +168,11 @@ private function addItemToCart(
                 $stockItemQuantity
             );
         }
-//here $result has errors
+
         if (is_string($result)) {
             foreach (array_unique(explode("\n", $result)) as $error) {
                 $errors[] = $this->error->create(__($error)->render(), $cartItemPosition, $stockItemQuantity);
             }
-        } elseif ($result->getHasError() && $result->getStockStateResult()->getHasError()) {
-            $errors[] = $this->error->create(
-                __($result->getStockStateResult()->getMessage())->render(),
-                $cartItemPosition,
-                $stockItemQuantity
-            );
         }
 
         return $errors;

app/code/Magento/Quote/Model/Quote.php

@@ -1668,6 +1668,8 @@ public function addProduct(
         }
 
         $parentItem = null;
+        $errors = [];
+        $item = null;
         $items = [];
         foreach ($cartCandidates as $candidate) {
             // Child items can be sticked together only within their parent
@@ -1697,12 +1699,23 @@ public function addProduct(
 
             $this->itemProcessor->prepare($item, $request, $candidate);
 
+            // collect errors instead of throwing first one
             if ($item->getHasError()) {
                 if (!$invalidProductAddFlag) {
                     $this->deleteItem($item);
                 }
+                foreach ($item->getMessage(false) as $message) {
+                    if (!in_array($message, $errors)) {
+                        // filter duplicate messages
+                        $errors[] = $message;
+                    }
+                }
+                break;
             }
         }
+        if (!empty($errors)) {
+            throw new \Magento\Framework\Exception\LocalizedException(__(implode("\n", $errors)));
+        }
 
         $this->_eventManager->dispatch('sales_quote_product_add_after', ['items' => $items]);
         return $parentItem;

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

@@ -598,11 +598,6 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
                     if (is_string($item)) {
                         throw new \Magento\Framework\Exception\LocalizedException(__($item));
                     }
-                    if ($item->getStockStateResult() && $item->getStockStateResult()->getHasError()) {
-                        $this->messageManager->addErrorMessage(
-                            __('The product with SKU %sku is out of stock.', ['sku' => $item->getSku()])
-                        );
-                    }
                 }
             }
         }
@@ -738,11 +733,17 @@ public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $q
 
             $this->formattedOptions($product, $buyRequest, $productOptions);
 
-            $item = $this->getQuote()->addProduct($product, $buyRequest);
-            if (is_string($item)) {
-                return $item;
+            try {
+                $item = $this->getQuote()->addProduct($product, $buyRequest);
+                if (is_string($item)) {
+                    return $item;
+                }
+            } catch (LocalizedException $e) {
+                $this->messageManager->addErrorMessage(__($e->getMessage()));
+                return $this;
             }
 
+
             if ($additionalOptions = $orderItem->getProductOptionByCode('additional_options')) {
                 $item->addOption(
                     new \Magento\Framework\DataObject(