Merge remote-tracking branch 'origin/ACP2E-3973' into PR_2025_08_04_chittima

chittima · chittima · commit b0abb227064b · 2025-08-04T16:07:22.000-05:00
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -191,7 +191,6 @@ public function collect(
         $address->setBaseDiscountAmount(0);
         /** @var Rule $rule */
         foreach ($rules as $rule) {
-            $ruleTotalDiscount = 0;
             /** @var Item $item */
             foreach ($itemsToApplyRules as $key => $item) {
                 if ($item->getNoDiscount() || !$this->calculator->canApplyDiscount($item) || $item->getParentItem()) {
@@ -220,15 +219,27 @@ public function collect(
                 if ($rule->getStopRulesProcessing() && in_array($rule->getId(), $appliedRuleIds)) {
                     unset($itemsToApplyRules[$key]);
                 }
-
+            }
+            $baseDiscountAmount = 0;
+            $discountAmount = 0;
+            // $itemsAggregate are items specific to the current shipping address
+            foreach ($itemsAggregate as $item) {
+                if ($item->getParentItem()) {
+                    continue;
+                }
                 if ($item->getChildren() && $item->isChildrenCalculated()) {
                     foreach ($item->getChildren() as $child) {
-                        $ruleTotalDiscount += $child->getBaseDiscountAmount();
+                        $baseDiscountAmount += $child->getBaseDiscountAmount();
+                        $discountAmount += $child->getDiscountAmount();
                     }
                 }
-                $ruleTotalDiscount += $item->getBaseDiscountAmount();
+                $baseDiscountAmount += $item->getBaseDiscountAmount();
+                $discountAmount += $item->getDiscountAmount();
             }
-            $address->setBaseDiscountAmount($ruleTotalDiscount);
+            $address->setBaseDiscountAmount(-$baseDiscountAmount);
+            $address->setDiscountAmount(-$discountAmount);
+            $address->setBaseSubtotalWithDiscount($address->getBaseSubtotal() - $baseDiscountAmount);
+            $address->setSubtotalWithDiscount($address->getSubtotal() - $discountAmount);
         }
         $this->calculator->initTotals($items, $address);
         foreach ($items as $item) {
diff --git a/app/code/Magento/SalesRule/Test/Fixture/Rule.php b/app/code/Magento/SalesRule/Test/Fixture/Rule.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -16,6 +16,71 @@
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
+/**
+ * Cart price rule fixture
+ *
+ * Example 1: Using array list: (base_subtotal > 1000) AND (sku in (simple1,simple3))
+ *
+ * ```php
+ *    #[
+ *        DataFixture(
+ *            RuleFixture::class,
+ *            [
+ *                'discount_amount' => 25,
+ *                'conditions' => [
+ *                    [
+ *                        'attribute' => 'base_subtotal',
+ *                        'operator' => '>',
+ *                        'value' => 1000
+ *                    ],
+ *                 ],
+ *                'actions' => [
+ *                    [
+ *                        'attribute' => 'sku',
+ *                        'operator' => '()',
+ *                        'value' => 'simple1,simple3'
+ *                    ]
+ *                ]
+ *            ],
+ *            'rule'
+ *        )
+ *    ]
+ * ```
+ *
+ * Example 2: Using associative conditions: (category_ids in (1, 2) AND attribute_set_id=default) OR (sku=simple3)
+ *
+ * ```php
+ *    #[
+ *        DataFixture(
+ *            RuleFixture::class,
+ *            [
+ *                'discount_amount' => 25,
+ *                'actions' => [
+ *                    'aggregator' => 'any',
+ *                    'conditions' => [
+ *                        [
+ *                            [
+ *                                'attribute' => 'category_ids',
+ *                                'operator' => '()',
+ *                                'value' => '1,2',
+ *                            ],
+ *                           [
+ *                                'attribute' => 'attribute_set_id',
+ *                                'value' => 'default',
+ *                           ],
+ *                        ],
+ *                        [
+ *                            'attribute' => 'sku',
+ *                            'value' => 'simple3'
+ *                        ]
+ *                    ],
+ *                ],
+ *            ],
+ *            'rule'
+ *        )
+ *    ]
+ * ```
+ */
 class Rule implements RevertibleDataFixtureInterface
 {
     private const DEFAULT_DATA = [
@@ -145,32 +210,17 @@ public function revert(DataObject $data): void
     private function prepareData(array $data): array
     {
         $data = array_merge($this->prepareDefaultData(), $data);
-        $data['conditions'] = $data['conditions'] ?? [];
-        $data['actions'] = $data['actions'] ?? [];
-
-        if ($data['conditions'] instanceof DataObject) {
-            $data['conditions'] = $data['conditions']->toArray();
-        } else {
-            $conditions = $data['conditions'];
-            $data['conditions'] = Conditions::DEFAULT_DATA;
-            foreach ($conditions as $condition) {
-                $data['conditions']['conditions'][] = $condition instanceof DataObject
-                    ? $condition->toArray()
-                    : $condition;
-            }
-        }
 
-        if ($data['actions'] instanceof DataObject) {
-            $data['actions'] = $data['actions']->toArray();
-        } else {
-            $conditions = $data['actions'];
-            $data['actions'] = ProductConditions::DEFAULT_DATA;
-            foreach ($conditions as $condition) {
-                $data['actions']['conditions'][] = $condition instanceof DataObject
-                    ? $condition->toArray()
-                    : $condition;
-            }
-        }
+        $data['conditions'] = $this->prepareConditionsData(
+            $data['conditions'] instanceof DataObject ? $data['conditions']->toArray() : $data['conditions'],
+            Conditions::DEFAULT_DATA,
+            AddressCondition::DEFAULT_DATA
+        );
+        $data['actions'] = $this->prepareConditionsData(
+            $data['actions'] instanceof DataObject ? $data['actions']->toArray() : $data['actions'],
+            ProductConditions::DEFAULT_DATA,
+            ProductCondition::DEFAULT_DATA
+        );
 
         if (!empty($data['coupon_code'])) {
             $data['coupon_type'] = \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC;
@@ -179,6 +229,44 @@ private function prepareData(array $data): array
         return $this->dataProcessor->process($this, $data);
     }
 
+    /**
+     * Prepare conditions data
+     *
+     * @param array $conditions
+     * @param array $defaultConditionsData
+     * @param array $defaultConditionData
+     * @return array
+     */
+    private function prepareConditionsData(
+        array $conditions,
+        array $defaultConditionsData,
+        array $defaultConditionData
+    ): array {
+        $conditionsArray = array_is_list($conditions)
+            ? ['conditions' => $conditions]
+            : $conditions;
+        $conditionsArray += $defaultConditionsData;
+        $subConditions = $conditionsArray['conditions'];
+        $conditionsArray['conditions'] = [];
+        foreach ($subConditions as $condition) {
+            $conditionArray = $condition instanceof DataObject
+                ? $condition->toArray()
+                : $condition;
+            // Condition is a combine
+            if (array_is_list($conditionArray) || isset($conditionArray['conditions'])) {
+                $conditionArray = $this->prepareConditionsData(
+                    $conditionArray,
+                    $defaultConditionsData,
+                    $defaultConditionData
+                );
+            } else {
+                $conditionArray += $defaultConditionData;
+            }
+            $conditionsArray['conditions'][] = $conditionArray;
+        }
+        return $conditionsArray;
+    }
+
     /**
      * Prepares rule default data
      *
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Event\Manager;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 use Magento\Quote\Api\Data\ShippingInterface;
 use Magento\Quote\Model\Quote;
@@ -426,7 +427,7 @@ public function testCollectAddressBaseDiscountAmountIncludingItemChildren(): voi
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $total->expects($this->any())->method('getBaseDiscountAmount')->willReturn(20.00);
+        $total->expects($this->any())->method('getBaseDiscountAmount')->willReturn(-20.00);
 
         $store = $this->createMock(Store::class);
         $this->storeManagerMock->expects($this->once())->method('getStore')->with($storeId)->willReturn($store);
@@ -463,8 +464,8 @@ public function testCollectAddressBaseDiscountAmountIncludingItemChildren(): voi
             ->addMethods(['getBaseDiscountAmount'])
             ->disableOriginalConstructor()
             ->getMock();
-        $item->expects($this->exactly(2))->method('getChildren')->willReturn([$child]);
-        $item->expects($this->once())->method('isChildrenCalculated')->willReturn(true);
+        $item->expects($this->any())->method('getChildren')->willReturn([$child]);
+        $item->expects($this->any())->method('isChildrenCalculated')->willReturn(true);
         $index = 1;
         $child->expects($this->any())->method('getBaseDiscountAmount')->willReturnCallback(function () use (&$index) {
             $value = $index * 10;
@@ -479,14 +480,23 @@ public function testCollectAddressBaseDiscountAmountIncludingItemChildren(): voi
             ->willReturnArgument(0);
 
         $this->addressMock->expects($this->exactly(5))
+            ->method('setBaseDiscountAmount');
+
+        $this->addressMock->expects(new MethodInvokedAtIndex(0))
+            ->method('setBaseDiscountAmount')
+            ->with(0);
+        $this->addressMock->expects(new MethodInvokedAtIndex(1))
+            ->method('setBaseDiscountAmount')
+            ->with(0);
+        $this->addressMock->expects(new MethodInvokedAtIndex(2))
+            ->method('setBaseDiscountAmount')
+            ->with(-10);
+        $this->addressMock->expects(new MethodInvokedAtIndex(3))
+            ->method('setBaseDiscountAmount')
+            ->with(-20);
+        $this->addressMock->expects(new MethodInvokedAtIndex(4))
             ->method('setBaseDiscountAmount')
-            ->with($this->logicalOr(
-                $this->equalTo(0),
-                $this->equalTo(10),
-                $this->equalTo(20),
-                $this->equalTo(20),
-                $this->equalTo(20.00)
-            ));
+            ->with(-20);
 
         $this->discount->collect($quote, $this->shippingAssignmentMock, $total);
     }
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php
