magento#12817: Coupon code with canceled order.

Author: p-bystritsky

app/code/Magento/SalesRule/Model/Coupon/QuantityManager.php renamed to app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php

@@ -13,9 +13,9 @@
 use Magento\SalesRule\Model\RuleFactory;
 
 /**
- * Calculates the coupon usages.
+ * Updates the coupon usages.
  */
-class QuantityManager
+class UpdateCouponUsages
 {
     /**
      * @var RuleFactory
@@ -56,13 +56,13 @@ public function __construct(
     }
 
     /**
-     * Updates coupon usages.
+     * Executes the current command.
      *
      * @param Order $subject
      * @param bool $increment
      * @return Order
      */
-    public function updateCouponUsages(Order $subject, bool $increment)
+    public function execute(Order $subject, bool $increment)
     {
         if (!$subject || !$subject->getAppliedRuleIds()) {
             return $subject;

app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php

@@ -7,19 +7,19 @@
 namespace Magento\SalesRule\Plugin;
 
 use Magento\Sales\Model\Order;
-use Magento\SalesRule\Model\Coupon\QuantityManager;
+use Magento\SalesRule\Model\Coupon\UpdateCouponUsages;
 
 class CouponUsagesDecrement
 {
     /**
-     * @var QuantityManager
+     * @var UpdateCouponUsages
      */
-    private $quantityManager;
+    private $updateCouponUsages;
 
     public function __construct(
-        QuantityManager $quantityManager
+        UpdateCouponUsages $updateCouponUsages
     ) {
-        $this->quantityManager = $quantityManager;
+        $this->updateCouponUsages = $updateCouponUsages;
     }
 
     /**
@@ -34,7 +34,7 @@ public function aroundCancel(Order $subject, callable $proceed)
         $canCancel = $subject->canCancel();
         $returnValue = $proceed();
         if ($canCancel) {
-            $returnValue = $this->quantityManager->updateCouponUsages($returnValue, false);
+            $returnValue = $this->updateCouponUsages->execute($returnValue, false);
         }
 
         return $returnValue;

app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php

@@ -7,19 +7,19 @@
 namespace Magento\SalesRule\Plugin;
 
 use Magento\Sales\Model\Order;
-use Magento\SalesRule\Model\Coupon\QuantityManager;
+use Magento\SalesRule\Model\Coupon\UpdateCouponUsages;
 
 class CouponUsagesIncrement
 {
     /**
-     * @var QuantityManager
+     * @var UpdateCouponUsages
      */
-    private $quantityManager;
+    private $updateCouponUsages;
 
     public function __construct(
-        QuantityManager $quantityManager
+        UpdateCouponUsages $updateCouponUsages
     ) {
-        $this->quantityManager = $quantityManager;
+        $this->updateCouponUsages = $updateCouponUsages;
     }
 
     /**
@@ -32,7 +32,7 @@ public function __construct(
      */
     public function afterPlace(Order $subject, Order $result)
     {
-        $this->quantityManager->updateCouponUsages($subject, true);
+        $this->updateCouponUsages->execute($subject, true);
 
         return $subject;
     }