magento#12817: Coupon code with canceled order.

Author: p-bystritsky

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

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\SalesRule\Plugin;
+namespace Magento\SalesRule\Model\Coupon;
 
 use Magento\Sales\Model\Order;
 use Magento\SalesRule\Model\Coupon;
@@ -13,9 +13,9 @@
 use Magento\SalesRule\Model\RuleFactory;
 
 /**
- * Abstract class for plugins that are accounting the coupon uses.
+ * Calculates the coupon usages.
  */
-abstract class AbstractCouponUses
+class QuantityManager
 {
     /**
      * @var RuleFactory
@@ -56,13 +56,13 @@ public function __construct(
     }
 
     /**
-     * Updates coupon uses.
+     * Updates coupon usages.
      *
      * @param Order $subject
      * @param bool $increment
      * @return Order
      */
-    protected function updateCouponUses(Order $subject, bool $increment)
+    public function updateCouponUsages(Order $subject, bool $increment)
     {
         if (!$subject || !$subject->getAppliedRuleIds()) {
             return $subject;

app/code/Magento/SalesRule/Plugin/CouponUsesDecrement.php renamed to app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php

@@ -7,11 +7,23 @@
 namespace Magento\SalesRule\Plugin;
 
 use Magento\Sales\Model\Order;
+use Magento\SalesRule\Model\Coupon\QuantityManager;
 
-class CouponUsesDecrement extends AbstractCouponUses
+class CouponUsagesDecrement
 {
     /**
-     * Decrements number of coupon uses after cancelling order.
+     * @var QuantityManager
+     */
+    private $quantityManager;
+
+    public function __construct(
+        QuantityManager $quantityManager
+    ) {
+        $this->quantityManager = $quantityManager;
+    }
+
+    /**
+     * Decrements number of coupon usages after cancelling order.
      *
      * @param Order $subject
      * @param callable $proceed
@@ -22,7 +34,7 @@ public function aroundCancel(Order $subject, callable $proceed)
         $canCancel = $subject->canCancel();
         $returnValue = $proceed();
         if ($canCancel) {
-            $returnValue = $this->updateCouponUses($returnValue, false);
+            $returnValue = $this->quantityManager->updateCouponUsages($returnValue, false);
         }
 
         return $returnValue;

app/code/Magento/SalesRule/Plugin/CouponUsesIncrement.php renamed to app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php

@@ -7,11 +7,23 @@
 namespace Magento\SalesRule\Plugin;
 
 use Magento\Sales\Model\Order;
+use Magento\SalesRule\Model\Coupon\QuantityManager;
 
-class CouponUsesIncrement extends AbstractCouponUses
+class CouponUsagesIncrement
 {
     /**
-     * Increments number of coupon uses after placing order.
+     * @var QuantityManager
+     */
+    private $quantityManager;
+
+    public function __construct(
+        QuantityManager $quantityManager
+    ) {
+        $this->quantityManager = $quantityManager;
+    }
+
+    /**
+     * Increments number of coupon usages after placing order.
      *
      * @param Order $subject
      * @param Order $result
@@ -20,7 +32,7 @@ class CouponUsesIncrement extends AbstractCouponUses
      */
     public function afterPlace(Order $subject, Order $result)
     {
-        $this->updateCouponUses($subject, true);
+        $this->quantityManager->updateCouponUsages($subject, true);
 
         return $subject;
     }

app/code/Magento/SalesRule/etc/di.xml

@@ -182,7 +182,7 @@
         <plugin name="coupon_label_plugin" type="Magento\SalesRule\Plugin\CartTotalRepository" />
     </type>
     <type name="\Magento\Sales\Model\Order">
-        <plugin name="coupon_uses_increment_plugin" type="Magento\SalesRule\Plugin\CouponUsesIncrement" />
-        <plugin name="coupon_uses_decrement_plugin" type="Magento\SalesRule\Plugin\CouponUsesDecrement" />
+        <plugin name="coupon_uses_increment_plugin" type="Magento\SalesRule\Plugin\CouponUsagesIncrement" />
+        <plugin name="coupon_uses_decrement_plugin" type="Magento\SalesRule\Plugin\CouponUsagesDecrement" />
     </type>
 </config>

dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsesTest.php renamed to dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php

@@ -19,7 +19,7 @@
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  */
-class CouponUsesTest extends \PHPUnit\Framework\TestCase
+class CouponUsagesTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ObjectManagerInterface