MC-35690: [B2B] Unexpected results of editing of a Bundle Product in the Shopping Cart, added from a Requisition List

Author: SmVladyslav

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -184,10 +184,6 @@ public function getJsonConfig()
                 $configValue = $preConfiguredValues->getData('bundle_option/' . $optionId);
                 if ($configValue) {
                     $defaultValues[$optionId] = $configValue;
-                    $configQty = $preConfiguredValues->getData('bundle_option_qty/' . $optionId);
-                    if ($configQty) {
-                        $options[$optionId]['selections'][$configValue]['qty'] = $configQty;
-                    }
                 }
                 $options = $this->processOptions($optionId, $options, $preConfiguredValues);
             }

app/code/Magento/Bundle/Model/CartItemProcessor.php

@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
@@ -73,7 +73,7 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function processOptions(CartItemInterface $cartItem)
@@ -83,20 +83,21 @@ public function processOptions(CartItemInterface $cartItem)
         }
         $productOptions = [];
         $bundleOptions = $cartItem->getBuyRequest()->getBundleOption();
-        $bundleOptionsQty = $cartItem->getBuyRequest()->getBundleOptionQty();
+        $bundleOptionsQty = $cartItem->getBuyRequest()->getBundleOptionQty() ?? [];
         if (is_array($bundleOptions)) {
             foreach ($bundleOptions as $optionId => $optionSelections) {
                 if (empty($optionSelections)) {
                     continue;
                 }
                 $optionSelections = is_array($optionSelections) ? $optionSelections : [$optionSelections];
-                $optionQty = isset($bundleOptionsQty[$optionId]) ? $bundleOptionsQty[$optionId] : 1;
 
                 /** @var \Magento\Bundle\Api\Data\BundleOptionInterface $productOption */
                 $productOption = $this->bundleOptionFactory->create();
                 $productOption->setOptionId($optionId);
                 $productOption->setOptionSelections($optionSelections);
-                $productOption->setOptionQty($optionQty);
+                if (is_array($bundleOptionsQty) && isset($bundleOptionsQty[$optionId])) {
+                    $productOption->setOptionQty($bundleOptionsQty[$optionId]);
+                }
                 $productOptions[] = $productOption;
             }
 

dev/tests/integration/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php

@@ -8,14 +8,17 @@
 namespace Magento\Bundle\Block\Catalog\Product\View\Type;
 
 use Magento\Bundle\Model\Product\Price;
+use Magento\Bundle\Model\Product\Type;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\Product as ProductHelper;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\LayoutInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\DataObject\Factory as DataObjectFactory;
 
 /**
  * Class checks bundle product view behaviour
@@ -87,6 +90,41 @@ public function testGetJsonConfig(): void
         $this->assertEquals(5, $selection['prices']['finalPrice']['amount']);
     }
 
+    /**
+     * Check that selection qty is calculated correctly for Bundle config.
+     *
+     * @return void
+     */
+    public function testGetJsonConfigWithPreconfiguredValues(): void
+    {
+        $optionQty = 3;
+        $bundleProduct = $this->productRepository->get('bundle-product');
+        $bundleSelection = $this->productRepository->get('simple');
+
+        /** @var Type $typeInstance */
+        $typeInstance = $bundleProduct->getTypeInstance();
+        $typeInstance->setStoreFilter($bundleProduct->getStoreId(), $bundleProduct);
+        $optionCollection = $typeInstance->getOptionsCollection($bundleProduct);
+        $optionId = $optionCollection->getFirstItem()->getId();
+        $preconfiguredValues = $this->objectManager->get(DataObjectFactory::class)->create([
+            'bundle_option' => [
+                $optionId => [$bundleSelection->getId()]
+            ],
+            'bundle_option_qty' => [
+                $optionId => $optionQty
+            ],
+        ]);
+
+        /** @var ProductHelper $productHelper */
+        $productHelper = $this->objectManager->get(ProductHelper::class);
+        $productHelper->prepareProductOptions($bundleProduct, $preconfiguredValues);
+        $this->registerProduct($bundleProduct);
+
+        $resultConfig = $this->json->unserialize($this->block->getJsonConfig());
+        $this->assertTrue(isset($resultConfig['options'][$optionId]['selections'][$optionId]['qty']));
+        $this->assertEquals($optionQty, $resultConfig['options'][$optionId]['selections'][$optionId]['qty']);
+    }
+
     /**
      * @dataProvider isSalableForStockStatusProvider
      *