AC-15286::Order creation in backoffice with multiple products of which at least one contains custom options, leads to unwanted extra products to get added to the order

Author: glo60612

app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php

@@ -15,7 +15,7 @@
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Sales\Model\Order\Create\ValidateCoupon;
-use Magento\Catalog\Api\ProductRepositoryInterface;
+ use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * Adminhtml sales orders creation process controller
@@ -61,7 +61,7 @@ abstract class Create extends \Magento\Backend\App\Action
     /**
      * @var ProductRepositoryInterface
      */
-    private ProductRepositoryInterface $productRepository;
+    private ?ProductRepositoryInterface $productRepository = null;
 
     /**
      * @param Context $context
@@ -86,8 +86,7 @@ public function __construct(
         $this->escaper = $escaper;
         $this->resultPageFactory = $resultPageFactory;
         $this->resultForwardFactory = $resultForwardFactory;
-        $this->productRepository = $productRepository ?: ObjectManager::getInstance()
-            ->get(ProductRepositoryInterface::class);
+        $this->productRepository = $productRepository;
         $this->validateCoupon = $validateCoupon ?: ObjectManager::getInstance()->get(ValidateCoupon::class);
     }
 
@@ -295,7 +294,13 @@ function ($v) {
                     if ($this->_getQuote()->hasProductId((int)$productId) && !$hasOptionsInConfig) {
                         try {
                             /** @var Product $product */
-                            $product = $this->productRepository->getById($productId);
+                            $product = ($this->productRepository ?: ObjectManager::getInstance()
+                                ->get(ProductRepositoryInterface::class))
+                                ->getById(
+                                    (int)$productId,
+                                    false,
+                                    (int)$this->_getOrderCreateModel()->getQuote()->getStoreId()
+                                );
                             if ($product->getId() && $product->getHasOptions()) {
                                 $hasRequired = false;
                                 foreach ($product->getOptions() as $option) {