Merge branch 'ACP2E-3618' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-02-11-2025

Author: chittima

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\CatalogInventory\Model;
@@ -159,7 +159,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         if (!$stockItem->getIsInStock()) {
             $result->setHasError(true)
                 ->setErrorCode('out_stock')
-                ->setMessage(__('This product is out of stock.'))
+                ->setMessage(__('Product %name is out of stock.', ['name' => $stockItem->getProductName()]))
                 ->setQuoteMessage(__('Some of the products are out of stock.'))
                 ->setQuoteMessageIndex('stock');
             $result->setItemUseOldQty(true);

app/code/Magento/CatalogInventory/i18n/en_US.csv

@@ -77,3 +77,4 @@ Stock,Stock
 "Only %s of %s available","Only %s of %s available"
 "Not enough items for sale","Not enough items for sale"
 "The requested qty. is not available","The requested qty. is not available"
+"Product %name is out of stock.","Product %name is out of stock."

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

@@ -708,6 +708,7 @@ protected function _initShippingAddressFromOrder(\Magento\Sales\Model\Order $ord
      * @param int $qty
      * @return \Magento\Quote\Model\Quote\Item|string|$this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws LocalizedException
      */
     public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $qty = null)
     {
@@ -733,9 +734,14 @@ 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')) {

app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -18,6 +18,9 @@
 use Magento\Customer\Model\Metadata\FormFactory;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
@@ -44,57 +47,67 @@ class CreateTest extends TestCase
     /**
      * @var Create
      */
-    private $adminOrderCreate;
+    private Create $adminOrderCreate;
 
     /**
      * @var CartRepositoryInterface|MockObject
      */
-    private $quoteRepository;
+    private CartRepositoryInterface $quoteRepository;
 
     /**
      * @var QuoteFactory|MockObject
      */
-    private $quoteFactory;
+    private QuoteFactory $quoteFactory;
 
     /**
      * @var SessionQuote|MockObject
      */
-    private $sessionQuote;
+    private SessionQuote $sessionQuote;
 
     /**
      * @var FormFactory|MockObject
      */
-    private $formFactory;
+    private FormFactory $formFactory;
 
     /**
      * @var CustomerInterfaceFactory|MockObject
      */
-    private $customerFactory;
+    private CustomerInterfaceFactory $customerFactory;
 
     /**
      * @var Updater|MockObject
      */
-    private $itemUpdater;
+    private Updater $itemUpdater;
 
     /**
      * @var Mapper|MockObject
      */
-    private $customerMapper;
+    private Mapper $customerMapper;
 
     /**
      * @var GroupRepositoryInterface|MockObject
      */
-    private $groupRepository;
+    private GroupRepositoryInterface $groupRepository;
 
     /**
      * @var DataObjectHelper|MockObject
      */
-    private $dataObjectHelper;
+    private DataObjectHelper $dataObjectHelper;
 
     /**
      * @var Order|MockObject
      */
-    private $orderMock;
+    private Order $orderMock;
+
+    /**
+     * @var ObjectManagerInterface|ObjectManagerInterface&MockObject|MockObject
+     */
+    private ObjectManagerInterface $objectManager;
+
+    /**
+     * @var ManagerInterface|ManagerInterface&MockObject|MockObject
+     */
+    private ManagerInterface $messageManager;
 
     /**
      * @inheritdoc
@@ -166,10 +179,14 @@ protected function setUp(): void
             )
             ->getMock();
 
+        $this->objectManager = $this->createMock(ObjectManagerInterface::class);
+        $this->messageManager = $this->createMock(ManagerInterface::class);
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->adminOrderCreate = $objectManagerHelper->getObject(
             Create::class,
             [
+                '_objectManager' => $this->objectManager,
+                'messageManager' => $this->messageManager,
                 'quoteSession' => $this->sessionQuote,
                 'metadataFormFactory' => $this->formFactory,
                 'customerFactory' => $this->customerFactory,
@@ -183,6 +200,46 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * @return void
+     * @throws \PHPUnit\Framework\MockObject\Exception|LocalizedException
+     */
+    public function testInitFromOrderItemNoExceptionThrownOnAddProduct(): void
+    {
+        $orderItemId = $productId = 1;
+        $exceptionMessage = 'Exception message';
+
+        $buyRequest = $this->createMock(\Magento\Framework\DataObject::class);
+
+        $orderItem = $this->createMock(\Magento\Sales\Model\Order\Item::class);
+        $orderItem->expects($this->once())->method('getId')->willReturn($orderItemId);
+        $orderItem->expects($this->once())->method('getProductId')->willReturn($productId);
+        $orderItem->expects($this->once())->method('getBuyRequest')->willReturn($buyRequest);
+        $orderItem->expects($this->once())->method('getProductOptions')->willReturn(null);
+
+        $product = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $product->expects($this->once())->method('setStoreId')->willReturnSelf();
+        $product->expects($this->once())->method('load')->willReturnSelf();
+        $product->expects($this->once())->method('getId')->willReturn($productId);
+        $this->objectManager->expects($this->once())->method('create')->willReturn($product);
+
+        $exception = new LocalizedException(__($exceptionMessage));
+        $quote = $this->createMock(Quote::class);
+        $quote->expects($this->once())
+            ->method('addProduct')
+            ->with($product, $buyRequest)
+            ->willThrowException($exception);
+        $this->sessionQuote->method('getQuote')
+            ->willReturn($quote);
+
+        $this->messageManager->expects($this->once())
+            ->method('addErrorMessage')
+            ->with(__($exceptionMessage))
+            ->willReturnSelf();
+
+        $this->adminOrderCreate->initFromOrderItem($orderItem);
+    }
+
     public function testSetAccountData()
     {
         $taxClassId = 1;