Merge branch 'ACP2E-1195' of https://github.com/magento-l3/magento2ce into PR-2023-02-24

Author: vkolesny

app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Save.php

@@ -93,7 +93,6 @@ public function execute()
                 }
 
                 $session = $this->_objectManager->get(\Magento\Backend\Model\Session::class);
-
                 $validateResult = $model->validateData(new \Magento\Framework\DataObject($data));
                 if ($validateResult !== true) {
                     foreach ($validateResult as $errorMessage) {
@@ -120,13 +119,14 @@ public function execute()
                     $data['actions'] = $data['rule']['actions'];
                 }
                 unset($data['rule']);
+
+                $data = $this->updateCouponData($data);
                 $model->loadPost($data);
 
                 $useAutoGeneration = (int)(
                     !empty($data['use_auto_generation']) && $data['use_auto_generation'] !== 'false'
                 );
                 $model->setUseAutoGeneration($useAutoGeneration);
-
                 $session->setPageData($model->getData());
 
                 $model->save();
@@ -177,4 +177,21 @@ private function checkRuleExists(\Magento\SalesRule\Model\Rule $model): bool
         }
         return true;
     }
+
+    /**
+     * Update data related to Coupon
+     *
+     * @param array $data
+     * @return array
+     */
+    private function updateCouponData(array $data): array
+    {
+        if (isset($data['uses_per_coupon']) && $data['uses_per_coupon'] === '') {
+            $data['uses_per_coupon'] = 0;
+        }
+        if (isset($data['uses_per_customer']) && $data['uses_per_customer'] === '') {
+            $data['uses_per_customer'] = 0;
+        }
+        return $data;
+    }
 }

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

@@ -6,6 +6,9 @@
 namespace Magento\SalesRule\Model\ResourceModel;
 
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\DateTime as Date;
 
 /**
  * SalesRule Resource Coupon
@@ -15,6 +18,33 @@
 class Coupon extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
     \Magento\SalesRule\Model\Spi\CouponResourceInterface
 {
+    /**
+     * @var Date
+     */
+    private $date;
+
+    /**
+     * @var DateTime
+     */
+    private $dateTime;
+
+    /**
+     * @param Context $context
+     * @param Date $date
+     * @param DateTime $dateTime
+     * @param string|null $connectionName
+     */
+    public function __construct(
+        Context $context,
+        Date $date,
+        DateTime $dateTime,
+        $connectionName = null
+    ) {
+        parent::__construct($context, $connectionName);
+        $this->date = $date;
+        $this->dateTime = $dateTime;
+    }
+
     /**
      * Constructor adds unique fields
      *
@@ -37,6 +67,9 @@ public function _beforeSave(AbstractModel $object)
         // maintain single primary coupon per rule
         $object->setIsPrimary($object->getIsPrimary() ? 1 : null);
 
+        $object->setUsageLimit($object->getUsageLimit() ?? 0);
+        $object->setUsagePerCustomer($object->getUsagePerCustomer() ?? 0);
+        $object->setCreatedAt($object->getCreatedAt() ?? $this->dateTime->formatDate($this->date->gmtTimestamp()));
         return parent::_beforeSave($object);
     }
 

dev/tests/integration/testsuite/Magento/SalesRule/Model/CouponTest.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ */
+class CouponTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var CouponRepositoryInterface
+     */
+    private $couponRepository;
+
+    /**
+     * @var RuleFactory
+     */
+    private $ruleFactory;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        /** @var CouponRepositoryInterface couponRepository */
+        $this->couponRepository = Bootstrap::getObjectManager()->create(CouponRepositoryInterface::class);
+        /** @var RuleFactory ruleFactory */
+        $this->ruleFactory = Bootstrap::getObjectManager()->create(RuleFactory::class);
+    }
+
+    /**
+     * Check that non-autogenerated coupon contains necessary fields received from sales rule
+     */
+    public function testNonAutogeneratedCouponBelongingToRule()
+    {
+        $couponCode = '_coupon__code_';
+        $rule = $this->ruleFactory->create();
+        $rule->setCouponType(2)
+        ->setUseAutoGeneration(0)
+        ->setCouponCode($couponCode)
+        ->setUsesPerCustomer(null)
+        ->setUsesPerCoupon(null)
+        ->save();
+
+        /** @var SearchCriteriaBuilder $criteriaBuilder */
+        $criteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
+        $couponSearchResult = $this->couponRepository->getList(
+            $criteriaBuilder->addFilter('code', $couponCode, 'like')->create()
+        );
+        $coupons = $couponSearchResult->getItems();
+        $coupon = array_pop($coupons);
+
+        $this->assertEquals(0, $coupon->getUsagePerCustomer());
+        $this->assertEquals(0, $coupon->getUsageLimit());
+        $this->assertEquals(0, $coupon->getTimesUsed());
+        $this->assertEquals(0, $coupon->getType());
+        $this->assertNotEmpty($coupon->getCreatedAt());
+    }
+}