magento#12817: Coupon code with canceled order.

Author: p-bystritsky

app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php

@@ -67,46 +67,77 @@ public function execute(Order $subject, bool $increment)
         if (!$subject || !$subject->getAppliedRuleIds()) {
             return $subject;
         }
-
         // lookup rule ids
         $ruleIds = explode(',', $subject->getAppliedRuleIds());
         $ruleIds = array_unique($ruleIds);
-
-        $ruleCustomer = null;
-        $customerId = $subject->getCustomerId();
-
+        $customerId = (int)$subject->getCustomerId();
         // use each rule (and apply to customer, if applicable)
         foreach ($ruleIds as $ruleId) {
             if (!$ruleId) {
                 continue;
             }
-            /** @var \Magento\SalesRule\Model\Rule $rule */
-            $rule = $this->ruleFactory->create();
-            $rule->load($ruleId);
-            if ($rule->getId()) {
-                $rule->loadCouponCode();
-                if ($increment || $rule->getTimesUsed() > 0) {
-                    $rule->setTimesUsed($rule->getTimesUsed() + ($increment ? 1 : -1));
-                    $rule->save();
-                }
+            $this->updateRuleUsages($increment, (int)$ruleId, $customerId);
+        }
+        $this->updateCouponUsages($subject, $increment, $customerId);
 
-                if ($customerId) {
-                    /** @var \Magento\SalesRule\Model\Rule\Customer $ruleCustomer */
-                    $ruleCustomer = $this->ruleCustomerFactory->create();
-                    $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
+        return $subject;
+    }
 
-                    if ($ruleCustomer->getId()) {
-                        if ($increment || $ruleCustomer->getTimesUsed() > 0) {
-                            $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + ($increment ? 1 : -1));
-                        }
-                    } elseif ($increment) {
-                        $ruleCustomer->setCustomerId($customerId)->setRuleId($ruleId)->setTimesUsed(1);
-                    }
-                    $ruleCustomer->save();
-                }
+    /**
+     * Update the number of rule usages.
+     *
+     * @param bool $increment
+     * @param int $ruleId
+     * @param int $customerId
+     */
+    private function updateRuleUsages(bool $increment, int $ruleId, int $customerId)
+    {
+        /** @var \Magento\SalesRule\Model\Rule $rule */
+        $rule = $this->ruleFactory->create();
+        $rule->load($ruleId);
+        if ($rule->getId()) {
+            $rule->loadCouponCode();
+            if ($increment || $rule->getTimesUsed() > 0) {
+                $rule->setTimesUsed($rule->getTimesUsed() + ($increment ? 1 : -1));
+                $rule->save();
+            }
+            if ($customerId) {
+                $this->updateCustomerRuleUsages($increment, $ruleId, $customerId);
             }
         }
+    }
 
+    /**
+     * Update the number of rule usages per customer.
+     *
+     * @param bool $increment
+     * @param int $ruleId
+     * @param int $customerId
+     */
+    private function updateCustomerRuleUsages(bool $increment, int $ruleId, int $customerId)
+    {
+        /** @var \Magento\SalesRule\Model\Rule\Customer $ruleCustomer */
+        $ruleCustomer = $this->ruleCustomerFactory->create();
+        $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
+        if ($ruleCustomer->getId()) {
+            if ($increment || $ruleCustomer->getTimesUsed() > 0) {
+                $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + ($increment ? 1 : -1));
+            }
+        } elseif ($increment) {
+            $ruleCustomer->setCustomerId($customerId)->setRuleId($ruleId)->setTimesUsed(1);
+        }
+        $ruleCustomer->save();
+    }
+
+    /**
+     * Update the number of coupon usages.
+     *
+     * @param Order $subject
+     * @param bool $increment
+     * @param int $customerId
+     */
+    private function updateCouponUsages(Order $subject, bool $increment, int $customerId)
+    {
         $this->coupon->load($subject->getCouponCode(), 'code');
         if ($this->coupon->getId()) {
             if ($increment || $this->coupon->getTimesUsed() > 0) {
@@ -117,7 +148,5 @@ public function execute(Order $subject, bool $increment)
                 $this->couponUsage->updateCustomerCouponTimesUsed($customerId, $this->coupon->getId(), $increment);
             }
         }
-
-        return $subject;
     }
 }