magento#12817: Coupon code with canceled order.

Author: p-bystritsky

app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php

@@ -45,7 +45,7 @@ public function updateCustomerCouponTimesUsed($customerId, $couponId, $increment
 
         $timesUsed = $connection->fetchOne($select, [':coupon_id' => $couponId, ':customer_id' => $customerId]);
 
-        if ($timesUsed > 0) {
+        if ($timesUsed !== false) {
             $this->getConnection()->update(
                 $this->getMainTable(),
                 ['times_used' => $timesUsed + ($increment ? 1 : -1)],

app/code/Magento/SalesRule/Observer/SalesOrderAfterCancelObserver.php

@@ -91,7 +91,7 @@ public function execute(EventObserver $observer)
 
                     if ($ruleCustomer->getId()) {
                         if ($ruleCustomer->getTimesUsed() > 0) {
-                            $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + 1);
+                            $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() - 1);
                         }
                     } else {
                         $ruleCustomer->setCustomerId($customerId)->setRuleId($ruleId)->setTimesUsed(0);

dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Coupon/UsageTest.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Model\ResourceModel\Coupon;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Tests accounting of coupon usages.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ */
+class UsageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Usage
+     */
+    private $usage;
+
+    /**
+     * @var DataObject
+     */
+    private $couponUsage;
+
+    /**
+     * Tests incrementing and decrementing of coupon usages.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/SalesRule/_files/coupons_limited.php
+     */
+    public function testUpdateCustomerCouponTimesUsed()
+    {
+        $customerId = 1;
+        $couponCode = 'one_usage';
+
+        $this->coupon->loadByCode($couponCode);
+
+        $testCases = [
+            ['increment' => true, 'expected' => 1],
+            ['increment' => false, 'expected' => 0],
+            ['increment' => false, 'expected' => 0],
+            ['increment' => true, 'expected' => 1],
+            ['increment' => true, 'expected' => 2],
+        ];
+
+        foreach ($testCases as $testCase) {
+            $this->usage->updateCustomerCouponTimesUsed($customerId, $this->coupon->getId(), $testCase['increment']);
+            $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $this->coupon->getId());
+
+            self::assertEquals(
+                $testCase['expected'],
+                $this->couponUsage->getTimesUsed()
+            );
+        }
+    }
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->coupon = $this->objectManager->get(Coupon::class);
+        $this->usage = $this->objectManager->get(Usage::class);
+        $this->couponUsage = $this->objectManager->get(DataObject::class);
+    }
+}

dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\SalesRule\Model\Coupon;
+
+require_once 'rules.php';
+
+$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
+);
+$items = array_values($collection->getItems());
+
+/** @var Coupon $coupon */
+$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
+$coupon->setRuleId($items[0]->getId())
+    ->setCode('one_usage')
+    ->setType(0)
+    ->setUsageLimit(1)
+    ->save();
+
+$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
+$coupon->setRuleId($items[1]->getId())
+    ->setCode('one_usage_per_customer')
+    ->setType(0)
+    ->setUsagePerCustomer(1)
+    ->save();

dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_rollback.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\SalesRule\Model\Coupon;
+
+$couponCodes = [
+    'one_usage',
+    'one_usage_per_customer',
+];
+
+/** @var Coupon $coupon */
+$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
+
+foreach ($couponCodes as $couponCode) {
+    $coupon->loadByCode($couponCode);
+    $coupon->delete();
+}
+
+require_once 'rules_rollback.php';