MC-24023: Placing order in Admin for more stock than is available is allowed and does not show error

Author: rostyslav-hymon

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

@@ -118,6 +118,10 @@ public function initialize(
             $product->getStore()->getWebsiteId()
         );
 
+        if ($result->getHasError() === true && in_array($result->getErrorCode(), ['qty_available', 'out_stock'])) {
+            $quoteItem->setHasError(true);
+        }
+
         /* We need to ensure that any possible plugin will not erase the data */
         $backOrdersQty = $this->stockStateProvider->checkQuoteItemQty($stockItem, $rowQty, $qtyForCheck, $qty)
             ->getItemBackorders();

app/code/Magento/CatalogInventory/Model/StockStateProvider.php

@@ -14,7 +14,7 @@
 use Magento\Framework\Math\Division as MathDivision;
 
 /**
- * Interface StockStateProvider
+ * Provider stocks state
  */
 class StockStateProvider implements StockStateProviderInterface
 {
@@ -156,6 +156,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
 
         if (!$stockItem->getIsInStock()) {
             $result->setHasError(true)
+                ->setErrorCode('out_stock')
                 ->setMessage(__('This product is out of stock.'))
                 ->setQuoteMessage(__('Some of the products are out of stock.'))
                 ->setQuoteMessageIndex('stock');
@@ -165,7 +166,11 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
 
         if (!$this->checkQty($stockItem, $summaryQty) || !$this->checkQty($stockItem, $qty)) {
             $message = __('The requested qty is not available');
-            $result->setHasError(true)->setMessage($message)->setQuoteMessage($message)->setQuoteMessageIndex('qty');
+            $result->setHasError(true)
+                ->setErrorCode('qty_available')
+                ->setMessage($message)
+                ->setQuoteMessage($message)
+                ->setQuoteMessageIndex('qty');
             return $result;
         } else {
             if ($stockItem->getQty() - $summaryQty < 0) {

app/code/Magento/CatalogInventory/etc/adminhtml/di.xml

@@ -14,11 +14,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogInventory\Model\Spi\StockStateProviderInterface">
-        <arguments>
-            <argument name="qtyCheckApplicable" xsi:type="boolean">false</argument>
-        </arguments>
-    </type>
     <type name="Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider">
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">

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

@@ -157,7 +157,12 @@
         <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
-        <waitForPageLoad stepKey="waitForSuccess"/>
-        <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForError"/>
+        <!-- Check that error remains -->
+        <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
+            <argument name="productName" value="$createConfigChildProduct2.name$"/>
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="This product is out of stock."/>
+        </actionGroup>
     </test>
 </tests>

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php

@@ -14,6 +14,9 @@
  */
 class Messages extends \Magento\Framework\View\Element\Messages
 {
+
+    private const ITEMS_GRID = 'items_grid';
+
     /**
      * Preparing global layout
      *
@@ -22,6 +25,24 @@ class Messages extends \Magento\Framework\View\Element\Messages
     protected function _prepareLayout()
     {
         $this->addMessages($this->messageManager->getMessages(true));
+        $itemsBlock = $this->getLayout()->getBlock(self::ITEMS_GRID);
+        if (!$itemsBlock) {
+            return;
+        }
+        $items = $itemsBlock->getItems();
+        foreach ($items as $item) {
+            if ($item->getHasError()) {
+                $messageCollection = $this->getMessageCollection();
+                foreach ($messageCollection->getItems() as $blockMessage) {
+                    if ($item->getMessage(true) === $blockMessage->getText()) {
+                        /* Remove duplicated messages.*/
+                        $messageCollection->deleteMessageByIdentifier($blockMessage->getIdentifier());
+                    }
+                }
+                $this->setMessages($messageCollection);
+            }
+        }
+
         parent::_prepareLayout();
     }
 }

app/code/Magento/Sales/Test/Mftf/Test/AdminAddSelectedProductToOrderTest.xml

@@ -72,7 +72,7 @@
         <!-- Check that error remains -->
         <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
             <argument name="productName" value="$simpleProduct.name$"/>
-            <argument name="messageType" value="notice"/>
+            <argument name="messageType" value="error"/>
         </actionGroup>
     </test>
 </tests>