Merge remote-tracking branch 'origin/MC-35690' into 2.4-develop-pr119

Author: zakdma

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)
@@ -84,19 +84,21 @@ public function processOptions(CartItemInterface $cartItem)
         $productOptions = [];
         $bundleOptions = $cartItem->getBuyRequest()->getBundleOption();
         $bundleOptionsQty = $cartItem->getBuyRequest()->getBundleOptionQty();
+        $bundleOptionsQty = is_array($bundleOptionsQty) ? $bundleOptionsQty : [];
         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 (isset($bundleOptionsQty[$optionId])) {
+                    $productOption->setOptionQty($bundleOptionsQty[$optionId]);
+                }
                 $productOptions[] = $productOption;
             }
 

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

@@ -214,6 +214,8 @@ public function testGetJsonConfigFixedPriceBundleNoOption()
 
     public function testGetJsonConfigFixedPriceBundle()
     {
+        $optionId = 1;
+        $optionQty = 2;
         $baseAmount = 123;
         $basePriceValue = 123123;
         $selections = [
@@ -230,7 +232,6 @@ public function testGetJsonConfigFixedPriceBundle()
                 true
             )
         ];
-
         $bundleProductPrice = $this->getMockBuilder(Price::class)
             ->disableOriginalConstructor()
             ->setMethods(['getLowestPrice'])
@@ -246,10 +247,8 @@ public function testGetJsonConfigFixedPriceBundle()
         $this->bundleProductPriceFactory->expects($this->once())
             ->method('create')
             ->willReturn($bundleProductPrice);
+        $options = [$this->createOption($optionId, 'Title `1', $selections)];
 
-        $options = [
-            $this->createOption(1, 'Title `1', $selections),
-        ];
         $finalPriceMock = $this->getPriceMock(
             [
                 'getPriceWithoutOption' => new DataObject(
@@ -289,7 +288,10 @@ public function testGetJsonConfigFixedPriceBundle()
         $preconfiguredValues = new DataObject(
             [
                 'bundle_option' => [
-                    1 => 123123111,
+                    $optionId => [123123111],
+                ],
+                'bundle_option_qty' => [
+                    $optionId => $optionQty,
                 ],
             ]
         );
@@ -306,7 +308,8 @@ public function testGetJsonConfigFixedPriceBundle()
         $this->assertEquals(110, $jsonConfig['prices']['oldPrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['basePrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['finalPrice']['amount']);
-        $this->assertEquals([1], $jsonConfig['positions']);
+        $this->assertEquals([$optionId], $jsonConfig['positions']);
+        $this->assertEquals($optionQty, $jsonConfig['options'][$optionId]['selections'][1123]['qty']);
     }
 
     /**