LYNX-341: Multicoupon labels

Author: sivaschenko

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

@@ -112,10 +112,11 @@ public function __construct(
      * @param AbstractItem $item
      * @param array $rules
      * @param bool $skipValidation
+     * @param string $couponCodes
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function applyRules($item, $rules, $skipValidation)
+    public function applyRules($item, $rules, $skipValidation, array $couponCodes = [])
     {
         $address = $item->getAddress();
         $appliedRuleIds = [];
@@ -142,7 +143,7 @@ public function applyRules($item, $rules, $skipValidation)
                 }
             }
 
-            $this->applyRule($item, $rule, $address);
+            $this->applyRule($item, $rule, $address, $couponCodes);
             $appliedRuleIds[$rule->getRuleId()] = $rule->getRuleId();
         }
 
@@ -228,18 +229,19 @@ public function addShippingDiscountDescription(
      *
      * @param AbstractItem $item
      * @param Rule $rule
-     * @param \Magento\Quote\Model\Quote\Address $address
+     * @param Address $address
+     * @param string[] $couponCodes
      * @return $this
      */
-    protected function applyRule($item, $rule, $address)
+    protected function applyRule($item, $rule, $address, array $couponCodes = [])
     {
         if ($item->getChildren() && $item->isChildrenCalculated()) {
             $cloneItem = clone $item;
 
             $applyToChildren = false;
             foreach ($item->getChildren() as $childItem) {
                 if ($rule->getActions()->validate($childItem)) {
-                    $discountData = $this->getDiscountData($childItem, $rule, $address);
+                    $discountData = $this->getDiscountData($childItem, $rule, $address, $couponCodes);
                     $this->setDiscountData($discountData, $childItem);
                     $applyToChildren = true;
                 }
@@ -248,15 +250,15 @@ protected function applyRule($item, $rule, $address)
              * validate without children
              */
             if (!$applyToChildren && $rule->getActions()->validate($cloneItem)) {
-                $discountData = $this->getDiscountData($item, $rule, $address);
+                $discountData = $this->getDiscountData($item, $rule, $address, $couponCodes);
                 $this->setDiscountData($discountData, $item);
             }
         } else {
-            $discountData = $this->getDiscountData($item, $rule, $address);
+            $discountData = $this->getDiscountData($item, $rule, $address, $couponCodes);
             $this->setDiscountData($discountData, $item);
         }
 
-        $this->addDiscountDescription($address, $rule);
+        $this->addDiscountDescription($address, $rule, $couponCodes);
         $this->maintainAddressCouponCode($address, $rule, $address->getQuote()->getCouponCode());
 
         return $this;
@@ -267,10 +269,11 @@ protected function applyRule($item, $rule, $address)
      *
      * @param AbstractItem $item
      * @param \Magento\SalesRule\Model\Rule $rule
-     * @param \Magento\Quote\Model\Quote\Address $address
+     * @param Address $address
+     * @param string[] $couponCodes
      * @return Data
      */
-    protected function getDiscountData($item, $rule, $address)
+    protected function getDiscountData($item, $rule, $address, array $couponCodes = [])
     {
         $qty = $this->validatorUtility->getItemQty($item, $rule);
 
@@ -279,7 +282,7 @@ protected function getDiscountData($item, $rule, $address)
         $discountData = $discountCalculator->calculate($rule, $item, $qty);
         $this->eventFix($discountData, $item, $rule, $qty);
         $this->validatorUtility->deltaRoundingFix($discountData, $item);
-        $this->setDiscountBreakdown($discountData, $item, $rule, $address);
+        $this->setDiscountBreakdown($discountData, $item, $rule, $address, $couponCodes);
 
         /**
          * We can't use row total here because row total not include tax
@@ -297,10 +300,11 @@ protected function getDiscountData($item, $rule, $address)
      * @param Data $discountData
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param \Magento\SalesRule\Model\Rule $rule
-     * @param \Magento\Quote\Model\Quote\Address $address
+     * @param Address $address
+     * @param string[] $couponCodes
      * @return $this
      */
-    private function setDiscountBreakdown($discountData, $item, $rule, $address)
+    private function setDiscountBreakdown($discountData, $item, $rule, $address, array $couponCodes = [])
     {
         if ($discountData->getAmount() > 0 && $item->getExtensionAttributes()) {
             $data = [
@@ -310,10 +314,9 @@ private function setDiscountBreakdown($discountData, $item, $rule, $address)
                 'base_original_amount' => $discountData->getBaseOriginalAmount()
             ];
             $itemDiscount = $this->discountDataInterfaceFactory->create(['data' => $data]);
-            $ruleLabel = $rule->getStoreLabel($address->getQuote()->getStore()) ?: __('Discount');
             $data = [
                 'discount' => $itemDiscount,
-                'rule' => $ruleLabel,
+                'rule' => $this->getRuleLabel($address, $rule, $couponCodes),
                 'rule_id' => $rule->getId(),
             ];
             /** @var RuleDiscount $itemDiscount */

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

@@ -395,10 +395,20 @@ public function process(AbstractItem $item, Rule $rule)
             return $this;
         }
 
+        $couponCodes = [];
+        if ($this->getCouponCode()) {
+            $couponCodes = [$this->getCouponCode()];
+        }
+
+        if ($this->getCouponCodes()) {
+            $couponCodes = $this->getCouponCodes();
+        }
+
         $appliedRuleIds = $this->rulesApplier->applyRules(
             $item,
             [$rule],
-            $this->_skipActionsValidation
+            $this->_skipActionsValidation,
+            $couponCodes
         );
         $this->rulesApplier->setAppliedRuleIds($item, $appliedRuleIds);
 

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

@@ -15,13 +15,16 @@
 use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Rule\Model\Action\Collection;
+use Magento\SalesRule\Api\Data\DiscountDataInterfaceFactory;
+use Magento\SalesRule\Api\Data\RuleDiscountInterfaceFactory;
 use Magento\SalesRule\Model\Quote\ChildrenValidationLocator;
 use Magento\SalesRule\Model\Rule;
 use Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory;
 use Magento\SalesRule\Model\Rule\Action\Discount\Data;
 use Magento\SalesRule\Model\Rule\Action\Discount\DataFactory;
 use Magento\SalesRule\Model\Rule\Action\Discount\DiscountInterface;
 use Magento\SalesRule\Model\RulesApplier;
+use Magento\SalesRule\Model\SelectRuleCoupon;
 use Magento\SalesRule\Model\Utility;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -87,7 +90,10 @@ protected function setUp(): void
             $this->eventManager,
             $this->validatorUtility,
             $this->childrenValidationLocator,
-            $this->discountFactory
+            $this->discountFactory,
+            $this->createMock(RuleDiscountInterfaceFactory::class),
+            $this->createMock(DiscountDataInterfaceFactory::class),
+            $this->createMock(SelectRuleCoupon::class),
         );
     }
 
@@ -170,7 +176,7 @@ public function testApplyRules(
             $this->applyRule($item, $rule);
         }
 
-        $result = $this->rulesApplier->applyRules($item, [$rule], $skipValidation, $couponCode);
+        $result = $this->rulesApplier->applyRules($item, [$rule], $skipValidation, [$couponCode]);
         $this->assertEquals($appliedRuleIds, $result);
     }