ACP2E-2704: Getting Unable to send the cookie. Size of 'mage-messages' while trying to Reorder

Author: aplapana

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

@@ -1699,7 +1699,9 @@ public function addProduct(
 
             // collect errors instead of throwing first one
             if ($item->getHasError()) {
-                $this->deleteItem($item);
+                if (!$request->getForceAddToCart()) {
+                    $this->deleteItem($item);
+                }
                 foreach ($item->getMessage(false) as $message) {
                     if (!in_array($message, $errors)) {
                         // filter duplicate messages

app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php

@@ -30,6 +30,7 @@
 use Magento\Framework\DataObject\Copy;
 use Magento\Framework\DataObject\Factory;
 use Magento\Framework\Event\Manager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Phrase;
@@ -1072,17 +1073,28 @@ public function testAddProductItemPreparation(): void
     }
 
     /**
+     * @param $request
+     * @param $hasError
      * @return void
+     * @throws LocalizedException
+     * @dataProvider dataProviderForTestAddProductItem
      */
-    public function testAddProductItemNew(): void
+    public function testAddProductItemNew($request, $hasError): void
     {
-        $itemMock = $this->createMock(Item::class);
+        $itemMock = $this->getMockBuilder(Item::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getHasError'])
+            ->onlyMethods(['representProduct', 'setProduct', 'setOptions', 'setQuote', 'getProduct'])
+            ->getMock();
+        $itemMock->expects($this->once())->method('getHasError')->willReturn($hasError);
+        $product = $this->createMock(Product::class);
+        $itemMock->expects($this->any())->method('getProduct')->willReturn($product);
 
         $expectedResult = $itemMock;
         $requestMock = $this->createMock(
             DataObject::class
         );
-        $this->objectFactoryMock->expects($this->once())
+        $this->objectFactoryMock->expects($this->any())
             ->method('create')
             ->with(['qty' => 1])
             ->willReturn($requestMock);
@@ -1145,10 +1157,29 @@ public function testAddProductItemNew(): void
             ->method('getTypeInstance')
             ->willReturn($typeInstanceMock);
 
-        $result = $this->quote->addProduct($this->productMock, null);
+        $result = $this->quote->addProduct($this->productMock, $request);
         $this->assertEquals($expectedResult, $result);
     }
 
+    /**
+     * @return array[]
+     */
+    private function dataProviderForTestAddProductItem(): array
+    {
+        return [
+            'not_force_item' => [null, false],
+            'force_item' => [
+                new DataObject(
+                    [
+                        'force_add_to_cart' => true,
+                        'qty' => 1
+                    ]
+                ),
+                true
+            ]
+        ];
+    }
+
     /**
      * @return void
      */

app/code/Magento/Sales/Model/Reorder/Reorder.php

@@ -264,6 +264,7 @@ private function addItemToCart(OrderItemInterface $orderItem, Quote $cart, Produ
 
         $addProductResult = null;
         try {
+            $infoBuyRequest->setForceAddToCart(true);
             $addProductResult = $cart->addProduct($product, $infoBuyRequest);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->addError($this->getCartItemErrorMessage($orderItem, $product, $e->getMessage()));