Merge branch 'ACP2E-1516' of https://github.com/magento-l3/magento2ce into PR01262023

Author: chittima

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

@@ -413,7 +413,7 @@ public function setAppliedRuleIds(AbstractItem $item, array $appliedRuleIds)
         $address = $item->getAddress();
         $quote = $item->getQuote();
 
-        $item->setAppliedRuleIds($this->validatorUtility->mergeIds($item->getAppliedRuleIds(), $appliedRuleIds));
+        $item->setAppliedRuleIds(join(',', $appliedRuleIds));
         $address->setAppliedRuleIds($this->validatorUtility->mergeIds($address->getAppliedRuleIds(), $appliedRuleIds));
         $quote->setAppliedRuleIds($this->validatorUtility->mergeIds($quote->getAppliedRuleIds(), $appliedRuleIds));
 

app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php

@@ -236,8 +236,15 @@ protected function getPreparedItem(): AbstractItem
          * @var AbstractItem|MockObject $item
          */
         $item = $this->getMockBuilder(Item::class)
-            ->addMethods(['setDiscountAmount', 'setBaseDiscountAmount', 'setDiscountPercent', 'setAppliedRuleIds'])
-            ->onlyMethods(['getAddress', 'getChildren', 'getExtensionAttributes', 'getProduct'])
+            ->addMethods(
+                [
+                    'setDiscountAmount',
+                    'setBaseDiscountAmount',
+                    'setDiscountPercent',
+                    'setAppliedRuleIds',
+                    'getAppliedRuleIds'
+                ]
+            )->onlyMethods(['getAddress', 'getChildren', 'getExtensionAttributes', 'getProduct', 'getQuote'])
             ->disableOriginalConstructor()
             ->getMock();
         $itemExtension = $this->getMockBuilder(ExtensionAttributesInterface::class)
@@ -253,6 +260,9 @@ protected function getPreparedItem(): AbstractItem
         $address->expects($this->any())
             ->method('getQuote')
             ->willReturn($quote);
+        $item->expects($this->any())
+            ->method('getQuote')
+            ->willReturn($quote);
 
         return $item;
     }
@@ -290,4 +300,19 @@ protected function applyRule(MockObject $item, MockObject $rule): void
             ->with($this->anything())
             ->willReturn($discountCalc);
     }
+
+    public function testSetAppliedRuleIds()
+    {
+        $item = $this->getPreparedItem();
+        $ruleId = 1;
+        $appliedRuleIds = [$ruleId => $ruleId];
+
+        $item->expects($this->once())
+            ->method('setAppliedRuleIds')
+            ->with($ruleId);
+        $item->expects($this->never())
+            ->method('getAppliedRuleIds');
+
+        $this->rulesApplier->setAppliedRuleIds($item, $appliedRuleIds);
+    }
 }