Merge branch 'ACP2E-2704' of https://github.com/adobe-commerce-tier-4/magento2ce into L3-PR-2024-02-16

Author: ArtemVasyliev

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

@@ -12,6 +12,7 @@
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Quote\Api\Data\PaymentInterface;
@@ -1619,7 +1620,7 @@ public function addItem(\Magento\Quote\Model\Quote\Item $item)
      * Add product. Returns error message if product type instance can't prepare product.
      *
      * @param mixed $product
-     * @param null|float|\Magento\Framework\DataObject $request
+     * @param null|float|DataObject $request
      * @param null|string $processMode
      * @return \Magento\Quote\Model\Quote\Item|string
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -1637,11 +1638,12 @@ public function addProduct(
         if (is_numeric($request)) {
             $request = $this->objectFactory->create(['qty' => $request]);
         }
-        if (!$request instanceof \Magento\Framework\DataObject) {
+        if (!$request instanceof DataObject) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We found an invalid request for adding product to quote.')
             );
         }
+        $invalidProductAddFlag = $this->checkForInvalidProductAdd($request);
 
         if (!$product->isSalable()) {
             throw new \Magento\Framework\Exception\LocalizedException(
@@ -1699,7 +1701,9 @@ public function addProduct(
 
             // collect errors instead of throwing first one
             if ($item->getHasError()) {
-                $this->deleteItem($item);
+                if (!$invalidProductAddFlag) {
+                    $this->deleteItem($item);
+                }
                 foreach ($item->getMessage(false) as $message) {
                     if (!in_array($message, $errors)) {
                         // filter duplicate messages
@@ -1717,6 +1721,20 @@ public function addProduct(
         return $parentItem;
     }
 
+    /**
+     * Checks if invalid products should be added to quote
+     *
+     * @param DataObject $request
+     * @return bool
+     */
+    private function checkForInvalidProductAdd(DataObject $request): bool
+    {
+        $forceAdd = $request->getAddToCartInvalidProduct();
+        $request->unsetData('add_to_cart_invalid_product');
+
+        return (bool) $forceAdd;
+    }
+
     /**
      * Adding catalog product object data to quote
      *
@@ -1772,8 +1790,8 @@ protected function _addCatalogProduct(\Magento\Catalog\Model\Product $product, $
      * For more options see \Magento\Catalog\Helper\Product->addParamsToBuyRequest()
      *
      * @param int $itemId
-     * @param \Magento\Framework\DataObject $buyRequest
-     * @param null|array|\Magento\Framework\DataObject $params
+     * @param DataObject $buyRequest
+     * @param null|array|DataObject $params
      * @return \Magento\Quote\Model\Quote\Item
      * @throws \Magento\Framework\Exception\LocalizedException
      *
@@ -1795,9 +1813,9 @@ public function updateItem($itemId, $buyRequest, $params = null)
         $product = clone $this->productRepository->getById($productId, false, $this->getStore()->getId());
 
         if (!$params) {
-            $params = new \Magento\Framework\DataObject();
+            $params = new DataObject();
         } elseif (is_array($params)) {
-            $params = new \Magento\Framework\DataObject($params);
+            $params = new DataObject($params);
         }
         $params->setCurrentConfig($item->getBuyRequest());
         $buyRequest = $this->_catalogProduct->addParamsToBuyRequest($buyRequest, $params);
@@ -2146,7 +2164,7 @@ protected function _clearErrorInfo()
      * @param string|null $origin Usually a name of module, that embeds error
      * @param int|null $code Error code, unique for origin, that sets it
      * @param string|null $message Error message
-     * @param \Magento\Framework\DataObject|null $additionalData Any additional data, that caller would like to store
+     * @param DataObject|null $additionalData Any additional data, that caller would like to store
      * @return $this
      */
     public function addErrorInfo(

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[]
+     */
+    public function dataProviderForTestAddProductItem(): array
+    {
+        return [
+            'not_invalid_product_add' => [null, false],
+            'invalid_product_add' => [
+                new DataObject(
+                    [
+                        'add_to_cart_invalid_product' => true,
+                        'qty' => 1
+                    ]
+                ),
+                true
+            ]
+        ];
+    }
+
     /**
      * @return void
      */

app/code/Magento/Sales/Controller/AbstractController/Reorder.php

@@ -94,16 +94,6 @@ public function execute()
         // to session for guest customer, as it does \Magento\Checkout\Model\Cart::save which is deprecated.
         $this->checkoutSession->setQuoteId($reorderOutput->getCart()->getId());
 
-        $errors = $reorderOutput->getErrors();
-        if (!empty($errors)) {
-            $useNotice = $this->_objectManager->get(\Magento\Checkout\Model\Session::class)->getUseNotice(true);
-            foreach ($errors as $error) {
-                $useNotice
-                    ? $this->messageManager->addNoticeMessage($error->getMessage())
-                    : $this->messageManager->addErrorMessage($error->getMessage());
-            }
-        }
-
         return $resultRedirect->setPath('checkout/cart');
     }
 }

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

@@ -111,6 +111,11 @@ class Reorder
      */
     private $storeManager;
 
+    /**
+     * @var bool
+     */
+    private bool $addToCartInvalidProduct;
+
     /**
      * @param OrderFactory $orderFactory
      * @param CustomerCartResolver $customerCartProvider
@@ -121,6 +126,9 @@ class Reorder
      * @param ProductCollectionFactory $productCollectionFactory
      * @param OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter
      * @param StoreManagerInterface|null $storeManager
+     * @param bool $addToCartInvalidProduct
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         OrderFactory $orderFactory,
@@ -131,7 +139,8 @@ public function __construct(
         LoggerInterface $logger,
         ProductCollectionFactory $productCollectionFactory,
         OrderInfoBuyRequestGetter $orderInfoBuyRequestGetter,
-        ?StoreManagerInterface   $storeManager = null
+        ?StoreManagerInterface   $storeManager = null,
+        bool $addToCartInvalidProduct = false
     ) {
         $this->orderFactory = $orderFactory;
         $this->cartRepository = $cartRepository;
@@ -143,6 +152,7 @@ public function __construct(
         $this->orderInfoBuyRequestGetter = $orderInfoBuyRequestGetter;
         $this->storeManager = $storeManager
             ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->addToCartInvalidProduct = $addToCartInvalidProduct;
     }
 
     /**
@@ -276,6 +286,7 @@ private function addItemToCart(OrderItemInterface $orderItem, Quote $cart, Produ
 
         $addProductResult = null;
         try {
+            $infoBuyRequest->setAddToCartInvalidProduct($this->addToCartInvalidProduct);
             $addProductResult = $cart->addProduct($product, $infoBuyRequest);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->addError($this->getCartItemErrorMessage($orderItem, $product, $e->getMessage()));

app/code/Magento/Sales/etc/frontend/di.xml

@@ -22,4 +22,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Reorder\Reorder">
+        <arguments>
+            <argument name="addToCartInvalidProduct" xsi:type="boolean">true</argument>
+        </arguments>
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Sales/Controller/Order/ReorderTest.php

@@ -108,13 +108,7 @@ public function testReorderProductLowQty(): void
         $order = $this->orderFactory->create()->loadByIncrementId('55555555');
         $this->customerSession->setCustomerId($order->getCustomerId());
         $this->dispatchReorderRequest((int)$order->getId());
-        $origMessage = (string)__('The requested qty is not available');
-        $message = $this->escaper->escapeHtml(
-            __('Could not add the product with SKU "%1" to the shopping cart: %2', 'simple-1', $origMessage)
-        );
-        $constraint = $this->logicalOr($this->containsEqual($origMessage), $this->containsEqual($message));
-        $this->assertThat($this->getMessages(MessageInterface::TYPE_ERROR), $constraint);
-        $this->quote = $this->checkoutSession->getQuote();
+        $this->assertRedirect($this->stringContains('checkout/cart'));
     }
 
     /**

dev/tests/integration/testsuite/Magento/Sales/Controller/Order/ReorderWithDifferentStoreTest.php

@@ -117,7 +117,7 @@ public function testReorderWithDifferentStoreAndGlobalCustomerAccount(): void
         $this->dispatch('sales/order/reorder/');
         $this->assertRedirect($this->stringContains('checkout/cart'));
         $this->quote = $this->checkoutSession->getQuote();
-        $quoteItemsCollection = $this->quote->getAllItems();
-        $this->assertCount(0, $quoteItemsCollection);
+
+        $this->assertCount(1, $this->quote->getErrors());
     }
 }