Merge remote-tracking branch 'origin/AC-15286' into spartans_pr_02122025

Author: glo60612

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

@@ -168,6 +168,7 @@ protected function _processData()
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
+    // phpcs:disable Generic.Metrics.NestingLevel
     protected function _processActionData($action = null)
     {
         $eventData = [
@@ -253,7 +254,62 @@ protected function _processActionData($action = null)
         ) {
             $items = $this->getRequest()->getPost('item');
             $items = $this->_processFiles($items);
-            $this->_getOrderCreateModel()->addProducts($items);
+            /**
+             * Filter out products that are already in the quote with required options
+             * when the current bulk payload does not contain any options for them.
+             * This avoids accidental re-adding of previously configured products with qty=1.
+             */
+            if (is_array($items)) {
+                $filtered = [];
+                foreach ($items as $productId => $config) {
+                    $config = is_array($config) ? $config : [];
+                    $hasOptionsInConfig = false;
+                    if (isset($config['options']) && is_array($config['options'])) {
+                        $opts = $config['options'];
+                        unset($opts['files_prefix']);
+                        $opts = array_filter(
+                            $opts,
+                            function ($v) {
+                                if (is_array($v)) {
+                                    return !empty($v);
+                                }
+
+                                return $v !== '' && $v !== null;
+                            }
+                        );
+                        $hasOptionsInConfig = !empty($opts);
+                    }
+                    if ($this->_getQuote()->hasProductId((int)$productId) && !$hasOptionsInConfig) {
+                        try {
+                            /** @var \Magento\Catalog\Model\Product $product */
+                            $product = $this
+                                ->_objectManager
+                                ->create(\Magento\Catalog\Model\Product::class)
+                                ->load($productId);
+                            if ($product->getId() && $product->getHasOptions()) {
+                                $hasRequired = false;
+                                foreach ($product->getOptions() as $option) {
+                                    if ($option->getIsRequire()) {
+                                        $hasRequired = true;
+                                        break;
+                                    }
+                                }
+                                if ($hasRequired) {
+                                    continue;
+                                }
+                            }
+                        //phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+                        } catch (\Throwable $e) {
+                            // Intentionally swallow any exception during pre-check to allow normal add flow.
+                        }
+                    }
+                    $filtered[$productId] = $config;
+                }
+                $items = $filtered;
+            }
+            if (!empty($items)) {
+                $this->_getOrderCreateModel()->addProducts($items);
+            }
         }
 
         /**

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlockTest.php

@@ -221,16 +221,16 @@ public function testJsonResponseWithJsVarnameUsesCompressionToPreventSessionBloa
             $backendSession->hasUpdateResult(),
             'Session should contain compressed updateResult'
         );
-        
+
         $sessionData = $backendSession->getUpdateResult();
         $this->assertIsArray($sessionData, 'Session data should be array for compressed format');
         $this->assertTrue($sessionData['compressed'], 'Data should be marked as compressed');
         $this->assertArrayHasKey('data', $sessionData, 'Compressed data should exist');
-        
+
         // Verify compression actually reduces size
         $decompressed = gzdecode($sessionData['data']);
         $this->assertNotEmpty($decompressed, 'Decompressed data should not be empty');
-        
+
         $originalSize = strlen($decompressed);
         $compressedSize = strlen($sessionData['data']);
         $this->assertLessThan(
@@ -346,6 +346,107 @@ public function testAddProductToOrderFromWishList(): void
         $this->assertCount(1, $quoteItems);
     }
 
+    /**
+     * Verify that when another product is added from the grid, a previously configured product
+     * (with required options) is NOT re-added due to presence of options[files_prefix] only.
+     *
+     * Uses new DataFixture-based products to avoid URL rewrite collisions.
+     */
+    public function testGridAddSkipsConfiguredProductWithoutOptions(): void
+    {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $this->_objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        // Create two fresh products (unique skus) using Product fixture
+        /** @var \Magento\Catalog\Test\Fixture\Product $productFixture */
+        $productFixture = $this->_objectManager->get(\Magento\Catalog\Test\Fixture\Product::class);
+        $productFixture->apply(['sku' => 'custom_options_p1', 'price' => 10]);
+        $productFixture->apply(['sku' => 'plain_p1', 'price' => 10]);
+        $customProduct = $productRepository->get('custom_options_p1');
+        $simpleProduct = $productRepository->get('plain_p1');
+
+        // Programmatically add one required text custom option to the custom product
+        /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+        $customOptionFactory = $this->_objectManager
+            ->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+        $requiredTextOption = $customOptionFactory->create(
+            [
+                'data' => [
+                    'title' => 'Req Text',
+                    'type' => 'field',
+                    'is_require' => 1,
+                    'sort_order' => 0,
+                    'price' => 1,
+                    'price_type' => 'fixed',
+                    'sku' => 'opt_text_1',
+                    'max_characters' => 100,
+                ],
+            ]
+        );
+        $requiredTextOption->setProductSku($customProduct->getSku());
+        $customProduct->setCanSaveCustomOptions(true)->setHasOptions(true);
+        $customProduct->setOptions([$requiredTextOption]);
+        $productRepository->save($customProduct);
+
+        // Add the product with required custom options to the admin create quote with qty 10
+        $options = [];
+        foreach ($customProduct->getOptions() as $option) {
+            $value = null;
+            if ($option->getValues()) {
+                $values = $option->getValues();
+                $first = reset($values);
+                $value = $first ? (int)$first->getOptionTypeId() : null;
+            }
+            if ($value === null) {
+                $value = 'test';
+            }
+            $options[(int)$option->getId()] = $value;
+        }
+        /** @var \Magento\Sales\Model\AdminOrder\Create $orderCreate */
+        $orderCreate = $this->_objectManager->get(\Magento\Sales\Model\AdminOrder\Create::class);
+        $orderCreate->addProduct(
+            (int)$customProduct->getId(),
+            ['qty' => 10, 'options' => $options]
+        );
+
+        // Emulate grid submit where the first (already configured) product comes with only files_prefix.
+        // Avoid rendering the sidebar (to prevent wishlist creation) and do not set a customer in session.
+        $params = $this->hydrateParams([
+            'block' => 'items,shipping_method,billing_method,totals,giftmessage'
+        ]);
+        $post = $this->hydratePost([
+            'customer_id' => 0,
+            'item' => [
+                (int)$customProduct->getId() => [
+                    'options' => ['files_prefix' => 'item_' . (int)$customProduct->getId() . '_'],
+                ],
+                (int)$simpleProduct->getId() => ['qty' => 1],
+            ],
+        ]);
+        $this->dispatchWitParams($params, $post);
+
+        // Assert custom product wasn't re-added and quantities are as expected
+        $quote = $this->session->getQuote();
+        $items = $quote->getItemsCollection(false)->getItems();
+        $customCount = 0;
+        $customQty = 0.0;
+        $simpleCount = 0;
+        $simpleQty = 0.0;
+        foreach ($items as $item) {
+            if ((int)$item->getProductId() === (int)$customProduct->getId()) {
+                $customCount++;
+                $customQty += (float)$item->getQty();
+            }
+            if ((int)$item->getProductId() === (int)$simpleProduct->getId()) {
+                $simpleCount++;
+                $simpleQty += (float)$item->getQty();
+            }
+        }
+        $this->assertEquals(1, $customCount);
+        $this->assertEquals(10.0, $customQty);
+        $this->assertEquals(1, $simpleCount);
+        $this->assertEquals(1.0, $simpleQty);
+    }
+
     /**
      * Check that customer notification is NOT disabled after comment is updated.
      *