Merge remote-tracking branch 'l3/ACP2E-2377' into Tier4-PR-Delivery-12-1-23

Author: veloraven

app/code/Magento/SalesRule/Model/RulesApplier.php

@@ -223,16 +223,22 @@ protected function applyRule($item, $rule, $address, $couponCode)
     {
         if ($item->getChildren() && $item->isChildrenCalculated()) {
             $cloneItem = clone $item;
-            /**
-             * validate without children
-             */
-            $applyAll = $rule->getActions()->validate($cloneItem);
+
+            $applyToChildren = false;
             foreach ($item->getChildren() as $childItem) {
-                if ($applyAll || $rule->getActions()->validate($childItem)) {
+                if ($rule->getActions()->validate($childItem)) {
                     $discountData = $this->getDiscountData($childItem, $rule, $address);
                     $this->setDiscountData($discountData, $childItem);
+                    $applyToChildren = true;
                 }
             }
+            /**
+             * validate without children
+             */
+            if (!$applyToChildren && $rule->getActions()->validate($cloneItem)) {
+                $discountData = $this->getDiscountData($item, $rule, $address);
+                $this->setDiscountData($discountData, $item);
+            }
         } else {
             $discountData = $this->getDiscountData($item, $rule, $address);
             $this->setDiscountData($discountData, $item);

dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php

@@ -190,9 +190,9 @@ public function bundleProductWithDynamicPriceAndCartPriceRuleDataProvider(): arr
             [
                 'bundle_cc',
                 [
-                    'bundle_product_with_dynamic_price-simple1-simple2' => 0,
-                    'simple1' => 3,
-                    'simple2' => 7.99,
+                    'bundle_product_with_dynamic_price-simple1-simple2' => 10.99,
+                    'simple1' => 0,
+                    'simple2' => 0,
                 ],
                 -10.99
             ],