Merge branch 'ACP2E-3377' of https://github.com/adobe-commerce-tier-4/magento2ce into ACP2E-3403

Author: aplapana

app/code/Magento/SalesRule/Model/Quote/Discount.php

@@ -221,7 +221,15 @@ public function collect(
                     unset($itemsToApplyRules[$key]);
                 }
 
-                $totalDiscount[$item->getId()] = $item->getBaseDiscountAmount();
+                if ($item->getChildren() && $item->isChildrenCalculated()) {
+                    $childTotal = 0;
+                    foreach ($item->getChildren() as $child) {
+                        $childTotal += $child->getBaseDiscountAmount();
+                    }
+                    $totalDiscount[$item->getId()] = $childTotal;
+                } else {
+                    $totalDiscount[$item->getId()] = $item->getBaseDiscountAmount();
+                }
             }
             $address->setBaseDiscountAmount(array_sum(array_values($totalDiscount)));
         }

app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php

@@ -183,7 +183,7 @@ function ($argument) {
     /**
      * @return void
      */
-    public function testCollectItemNoDiscount()
+    public function testCollectItemNoDiscount(): void
     {
         $itemNoDiscount = $this->getMockBuilder(Item::class)
             ->addMethods(['getNoDiscount'])
@@ -244,7 +244,7 @@ public function testCollectItemNoDiscount()
     /**
      * @return void
      */
-    public function testCollectItemHasParent()
+    public function testCollectItemHasParent(): void
     {
         $itemWithParentId = $this->getMockBuilder(Item::class)
             ->addMethods(['getNoDiscount'])
@@ -303,7 +303,7 @@ public function testCollectItemHasParent()
     /**
      * @return void
      */
-    public function testCollectItemHasNoChildren()
+    public function testCollectItemHasNoChildren(): void
     {
         $itemWithChildren = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
@@ -387,7 +387,7 @@ public function testCollectItemHasNoChildren()
      * @return void
      * @throws \PHPUnit\Framework\MockObject\Exception
      */
-    public function testFetch()
+    public function testFetch(): void
     {
         $discountAmount = 100;
         $discountDescription = 100;
@@ -413,7 +413,7 @@ public function testFetch()
      * @return void
      * @throws \PHPUnit\Framework\MockObject\Exception
      */
-    public function testCollectAddressBaseDiscountAmount(): void
+    public function testCollectAddressBaseDiscountAmountIncludingItemChildren(): void
     {
         $storeId = 1;
         $quote = $this->createMock(Quote::class);
@@ -442,16 +442,31 @@ public function testCollectAddressBaseDiscountAmount(): void
             ->willReturn([$rule1, $rule2]);
         $item = $this->getMockBuilder(Item::class)
             ->addMethods(['getNoDiscount', 'getBaseDiscountAmount'])
-            ->onlyMethods(['getParentItem', 'getId', 'getExtensionAttributes', 'getAddress'])
+            ->onlyMethods(
+                [
+                    'getParentItem',
+                    'getId',
+                    'getExtensionAttributes',
+                    'getAddress',
+                    'getChildren',
+                    'isChildrenCalculated'
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
         $item->expects($this->any())->method('getNoDiscount')->willReturn(false);
         $item->expects($this->any())->method('getId')->willReturn(1);
         $item->expects($this->any())->method('getParentItem')->willReturn(false);
         $item->expects($this->any())->method('getExtensionAttributes')->willReturn(false);
         $item->expects($this->once())->method('getAddress')->willReturn($this->addressMock);
+        $child = $this->getMockBuilder(Item::class)
+            ->addMethods(['getBaseDiscountAmount'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $item->expects($this->exactly(2))->method('getChildren')->willReturn([$child]);
+        $item->expects($this->once())->method('isChildrenCalculated')->willReturn(true);
         $index = 1;
-        $item->expects($this->any())->method('getBaseDiscountAmount')->willReturnCallback(function () use (&$index) {
+        $child->expects($this->any())->method('getBaseDiscountAmount')->willReturnCallback(function () use (&$index) {
             $value = $index * 10;
             $index++;
             return $value;