Merge remote-tracking branch 'origin/MC-39104' into 2.4-develop-pr48

Author: Serhii Balko

app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php

@@ -157,11 +157,17 @@ public function validate(Observer $observer)
             if ($stockStatus->getStockStatus() === Stock::STOCK_OUT_OF_STOCK
                     || $parentStockStatus && $parentStockStatus->getStockStatus() == Stock::STOCK_OUT_OF_STOCK
             ) {
-                $quoteItem->addErrorInfo(
-                    'cataloginventory',
-                    Data::ERROR_QTY,
-                    __('This product is out of stock.')
-                );
+                $hasError = $quoteItem->getStockStateResult()
+                    ? $quoteItem->getStockStateResult()->getHasError() : false;
+                if (!$hasError) {
+                    $quoteItem->addErrorInfo(
+                        'cataloginventory',
+                        Data::ERROR_QTY,
+                        __('This product is out of stock.')
+                    );
+                } else {
+                    $quoteItem->addErrorInfo(null, Data::ERROR_QTY);
+                }
                 $quoteItem->getQuote()->addErrorInfo(
                     'stock',
                     'cataloginventory',

app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php

@@ -153,7 +153,7 @@ protected function setUp(): void
             ->getMock();
         $this->storeMock = $this->createMock(Store::class);
         $this->quoteItemMock = $this->getMockBuilder(Item::class)
-            ->addMethods(['getProductId', 'getHasError'])
+            ->addMethods(['getProductId', 'getHasError', 'getStockStateResult'])
             ->onlyMethods(
                 [
                     'getQuote',
@@ -460,6 +460,53 @@ public function testException()
         $this->quantityValidator->validate($this->observerMock);
     }
 
+    /**
+     * This tests the scenario when the error is in the quote item already
+     *
+     * @return void
+     */
+    public function testValidateOutStockWithAlreadyErrorInQuoteItem(): void
+    {
+        $this->createInitialStub(1);
+        $resultMock = $this->getMockBuilder(DataObject::class)
+            ->addMethods(['checkQtyIncrements', 'getMessage', 'getQuoteMessage', 'getHasError'])
+            ->getMock();
+        $resultMock->method('getHasError')
+            ->willReturn(true);
+        $this->stockRegistryMock->method('getStockItem')
+            ->willReturn($this->stockItemMock);
+        $this->stockRegistryMock->expects($this->at(1))
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
+        $this->quoteItemMock->method('getParentItem')
+            ->willReturn($this->parentItemMock);
+        $this->quoteItemMock->method('getStockStateResult')
+            ->willReturn($resultMock);
+        $this->stockRegistryMock->expects($this->at(2))
+            ->method('getStockStatus')
+            ->willReturn($this->parentStockItemMock);
+        $this->parentStockItemMock->method('getStockStatus')
+            ->willReturn(0);
+        $this->stockStatusMock->expects($this->atLeastOnce())
+            ->method('getStockStatus')
+            ->willReturn(1);
+        $this->quoteItemMock->expects($this->once())
+            ->method('addErrorInfo')
+            ->with(
+                null,
+                Data::ERROR_QTY,
+            );
+        $this->quoteMock->expects($this->once())
+            ->method('addErrorInfo')
+            ->with(
+                'stock',
+                'cataloginventory',
+                Data::ERROR_QTY,
+                __('Some of the products are out of stock.')
+            );
+        $this->quantityValidator->validate($this->observerMock);
+    }
+
     /**
      * @param $qty
      * @param $hasError

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml

@@ -125,7 +125,7 @@
         <actionGroup ref="AdminSetStockStatusActionGroup" stepKey="outOfStockStatus">
             <argument name="stockStatus" value="Out of Stock"/>
         </actionGroup>
-      
+
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSecondProductForm"/>
         <!-- Go to created customer page -->
         <comment userInput="Go to created customer page" stepKey="goToCreatedCustomerPage"/>
@@ -158,7 +158,7 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickToAddProductToOrder"/>
         <waitForPageLoad stepKey="waitForNewOrderPageLoad"/>
-        <see userInput="This product is out of stock." stepKey="seeTheErrorMessageDisplayed"/>
+        <see userInput="There are no source items with the in stock status" stepKey="seeTheErrorMessageDisplayed"/>
 
         <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderThirdTime">
             <argument name="customer" value="$createCustomer$"/>

dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php

@@ -326,7 +326,7 @@ public function updateItemDataProvider(): array
                     'use_config_backorders' => 0,
                     'backorders' => Stock::BACKORDERS_NO,
                 ],
-                'This product is out of stock.'
+                'There are no source items with the in stock status'
             ],
             [
                 [