Merge branch 'ACP2E-3349' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-10-01-2024

Author: chittima

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

@@ -188,7 +188,7 @@ public function collect(
         $items = $this->calculator->sortItemsByPriority($items, $address);
         $itemsToApplyRules = $items;
         $rules = $this->calculator->getRules($address);
-        $totalDiscount = 0;
+        $totalDiscount = [];
         $address->setBaseDiscountAmount(0);
         /** @var Rule $rule */
         foreach ($rules as $rule) {
@@ -221,9 +221,9 @@ public function collect(
                     unset($itemsToApplyRules[$key]);
                 }
 
-                $totalDiscount += $item->getBaseDiscountAmount();
+                $totalDiscount[$item->getId()] = $item->getBaseDiscountAmount();
             }
-            $address->setBaseDiscountAmount($totalDiscount);
+            $address->setBaseDiscountAmount(array_sum(array_values($totalDiscount)));
         }
         $this->calculator->initTotals($items, $address);
         foreach ($items as $item) {

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

@@ -90,6 +90,10 @@ class DiscountTest extends TestCase
      */
     private $rulesApplierMock;
 
+    /**
+     * @return void
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
     protected function setUp(): void
     {
         $this->storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
@@ -176,6 +180,9 @@ function ($argument) {
             ->willReturn($discountData);
     }
 
+    /**
+     * @return void
+     */
     public function testCollectItemNoDiscount()
     {
         $itemNoDiscount = $this->getMockBuilder(Item::class)
@@ -234,6 +241,9 @@ public function testCollectItemNoDiscount()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testCollectItemHasParent()
     {
         $itemWithParentId = $this->getMockBuilder(Item::class)
@@ -290,6 +300,9 @@ public function testCollectItemHasParent()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testCollectItemHasNoChildren()
     {
         $itemWithChildren = $this->getMockBuilder(Item::class)
@@ -370,6 +383,10 @@ public function testCollectItemHasNoChildren()
         );
     }
 
+    /**
+     * @return void
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
     public function testFetch()
     {
         $discountAmount = 100;
@@ -391,4 +408,71 @@ public function testFetch()
         $totalMock->expects($this->once())->method('getDiscountDescription')->willReturn($discountDescription);
         $this->assertEquals($expectedResult, $this->discount->fetch($quoteMock, $totalMock));
     }
+
+    /**
+     * @return void
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testCollectAddressBaseDiscountAmount(): void
+    {
+        $storeId = 1;
+        $quote = $this->createMock(Quote::class);
+        $quote->expects($this->once())->method('getStoreId')->willReturn($storeId);
+        $total = $this->getMockBuilder(Total::class)
+            ->addMethods(
+                [
+                    'getBaseDiscountAmount'
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $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);
+
+        $rule1 = $this->createMock(Rule::class);
+        $rule1->expects($this->any())->method('getSimpleAction')
+            ->willReturn(null);
+        $rule2 = $this->createMock(Rule::class);
+        $rule2->expects($this->any())->method('getSimpleAction')
+            ->willReturn(null);
+        $this->validatorMock->expects($this->once())->method('getRules')
+            ->with($this->addressMock)
+            ->willReturn([$rule1, $rule2]);
+        $item = $this->getMockBuilder(Item::class)
+            ->addMethods(['getNoDiscount', 'getBaseDiscountAmount'])
+            ->onlyMethods(['getParentItem', 'getId', 'getExtensionAttributes', 'getAddress'])
+            ->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);
+        $index = 1;
+        $item->expects($this->any())->method('getBaseDiscountAmount')->willReturnCallback(function () use (&$index) {
+            $value = $index * 10;
+            $index++;
+            return $value;
+        });
+        $this->addressMock->expects($this->any())->method('getAllItems')->willReturn([$item]);
+        $this->shippingAssignmentMock->expects($this->any())->method('getItems')->willReturn([$item]);
+        $quote->expects($this->any())->method('getAllAddresses')->willReturn([$this->addressMock]);
+        $this->validatorMock->expects($this->any())->method('sortItemsByPriority')
+            ->with([$item], $this->addressMock)
+            ->willReturnArgument(0);
+
+        $this->addressMock->expects($this->exactly(5))
+            ->method('setBaseDiscountAmount')
+            ->with($this->logicalOr(
+                $this->equalTo(0),
+                $this->equalTo(10),
+                $this->equalTo(20),
+                $this->equalTo(20),
+                $this->equalTo(20.00)
+            ));
+
+        $this->discount->collect($quote, $this->shippingAssignmentMock, $total);
+    }
 }