Merge remote-tracking branch 'origin/MC-34063' into 2.4-develop-pr31

Author: serhii-balko

app/code/Magento/Quote/Model/Quote/Item/Processor.php

@@ -97,7 +97,9 @@ public function prepare(Item $item, DataObject $request, Product $candidate): vo
         $item->addQty($candidate->getCartQty());
 
         $customPrice = $request->getCustomPrice();
-        $item->setPrice($candidate->getFinalPrice());
+        if (!$item->getParentItem() || $item->getParentItem()->isChildrenCalculated()) {
+            $item->setPrice($candidate->getFinalPrice());
+        }
         if (!empty($customPrice)) {
             $item->setCustomPrice($customPrice);
             $item->setOriginalCustomPrice($customPrice);

app/code/Magento/Quote/Test/Unit/Model/Quote/Item/ProcessorTest.php

@@ -77,7 +77,16 @@ protected function setUp(): void
 
         $this->itemMock = $this->getMockBuilder(Item::class)
             ->addMethods(['setOriginalCustomPrice'])
-            ->onlyMethods(['getId', 'setOptions', 'setProduct', 'addQty', 'setCustomPrice', 'setData', 'setPrice'])
+            ->onlyMethods([
+                'getId',
+                'setOptions',
+                'setProduct',
+                'addQty',
+                'setCustomPrice',
+                'setData',
+                'setPrice',
+                'getParentItem'
+            ])
             ->disableOriginalConstructor()
             ->getMock();
         $this->quoteItemFactoryMock->expects($this->any())
@@ -438,4 +447,41 @@ public function testPrepareWithResetCountAndNotStickAndSameItemId()
 
         $this->processor->prepare($this->itemMock, $this->objectMock, $this->productMock);
     }
+
+    /**
+     * @param bool $isChildrenCalculated
+     * @dataProvider prepareChildProductDataProvider
+     */
+    public function testPrepareChildProduct(bool $isChildrenCalculated): void
+    {
+        $finalPrice = 10;
+        $this->objectMock->method('getResetCount')
+            ->willReturn(false);
+        $this->productMock->method('getFinalPrice')
+            ->willReturn($finalPrice);
+        $this->itemMock->expects($isChildrenCalculated ? $this->once() : $this->never())
+            ->method('setPrice')
+            ->with($finalPrice)
+            ->willReturnSelf();
+        $parentItem = $this->createConfiguredMock(
+            \Magento\Quote\Model\Quote\Item::class,
+            [
+                'isChildrenCalculated' => $isChildrenCalculated
+            ]
+        );
+        $this->itemMock->method('getParentItem')
+            ->willReturn($parentItem);
+        $this->processor->prepare($this->itemMock, $this->objectMock, $this->productMock);
+    }
+
+    /**
+     * @return array
+     */
+    public function prepareChildProductDataProvider(): array
+    {
+        return [
+            [false],
+            [true]
+        ];
+    }
 }