Merge branch 'ACP2E-2627' of https://github.com/adobe-commerce-tier-4/magento2ce into T4-PR-03-18-2024

Author: thiaramus

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

@@ -72,5 +72,6 @@ public function execute(CartInterface $quote, bool $increment): void
 
         $this->couponUsagePublisher->publish($updateInfo);
         $this->processor->updateCustomerRulesUsages($updateInfo);
+        $this->processor->updateCouponUsages($updateInfo);
     }
 }

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

@@ -12,6 +12,7 @@
 use Magento\SalesRule\Model\Coupon\Usage\Processor as CouponUsageProcessor;
 use Magento\SalesRule\Model\Coupon\Usage\UpdateInfo;
 use Magento\SalesRule\Model\Coupon\Usage\UpdateInfoFactory;
+use Magento\SalesRule\Model\Service\CouponUsagePublisher;
 
 /**
  * Updates the coupon usages
@@ -28,16 +29,25 @@ class UpdateCouponUsages
      */
     private $updateInfoFactory;
 
+    /**
+     * @var CouponUsagePublisher
+     */
+    private $couponUsagePublisher;
+
     /**
      * @param CouponUsageProcessor $couponUsageProcessor
      * @param UpdateInfoFactory $updateInfoFactory
+     * @param ?CouponUsagePublisher $couponUsagePublisher
      */
     public function __construct(
         CouponUsageProcessor $couponUsageProcessor,
-        UpdateInfoFactory $updateInfoFactory
+        UpdateInfoFactory $updateInfoFactory,
+        ?CouponUsagePublisher $couponUsagePublisher = null
     ) {
         $this->couponUsageProcessor = $couponUsageProcessor;
         $this->updateInfoFactory = $updateInfoFactory;
+        $this->couponUsagePublisher = $couponUsagePublisher
+            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CouponUsagePublisher::class);
     }
 
     /**
@@ -66,7 +76,9 @@ public function execute(OrderInterface $subject, bool $increment): OrderInterfac
             $updateInfo->setCouponAlreadyApplied(true);
         }
 
-        $this->couponUsageProcessor->process($updateInfo);
+        $this->couponUsagePublisher->publish($updateInfo);
+        $this->couponUsageProcessor->updateCustomerRulesUsages($updateInfo);
+        $this->couponUsageProcessor->updateCouponUsages($updateInfo);
 
         return $subject;
     }

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

@@ -89,7 +89,7 @@ public function updateRuleUsages(UpdateInfo $updateInfo): void
             }
 
             $rule->loadCouponCode();
-            if ($isIncrement || $rule->getTimesUsed() > 0) {
+            if ((!$updateInfo->isCouponAlreadyApplied() && $isIncrement) || !$isIncrement) {
                 $rule->setTimesUsed($rule->getTimesUsed() + ($isIncrement ? 1 : -1));
                 $rule->save();
             }

app/code/Magento/SalesRule/Model/CouponUsageConsumer.php

@@ -80,7 +80,6 @@ public function process(OperationInterface $operation): void
             $data = $this->serializer->unserialize($serializedData);
             $updateInfo = $this->updateInfoFactory->create();
             $updateInfo->setData($data);
-            $this->processor->updateCouponUsages($updateInfo);
             $this->processor->updateRuleUsages($updateInfo);
         } catch (NotFoundException $e) {
             $this->logger->critical($e->getMessage());

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

@@ -36,7 +36,7 @@
                 default="0" comment="Discount Step"/>
         <column xsi:type="smallint" name="apply_to_shipping" unsigned="true" nullable="false"
                 identity="false" default="0" comment="Apply To Shipping"/>
-        <column xsi:type="int" name="times_used" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="times_used" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Times Used"/>
         <column xsi:type="smallint" name="is_rss" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Is Rss"/>

dev/tests/integration/testsuite/Magento/SalesRule/Model/Coupon/UpdateCouponUsagesTest.php

@@ -124,4 +124,44 @@ public function testCancelOrderBeforeUsageConsumerExecution(): void
         $this->cartManagement->placeOrder($cart->getId());
         $consumer->process(1);
     }
+
+    #[
+        DataFixture(ProductFixture::class, as: 'p1'),
+        DataFixture(
+            SalesRuleFixture::class,
+            ['coupon_code' => 'once', 'uses_per_coupon' => 1, 'discount_amount' => 10]
+        ),
+        DataFixture(Customer::class, as: 'customer'),
+
+        DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart1'),
+        DataFixture(AddProductToCart::class, ['cart_id' => '$cart1.id$', 'product_id' => '$p1.id$']),
+        DataFixture(SetBillingAddress::class, ['cart_id' => '$cart1.id$']),
+        DataFixture(SetShippingAddress::class, ['cart_id' => '$cart1.id$']),
+        DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart1.id$']),
+        DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart1.id$']),
+
+        DataFixture(GuestCart::class, as: 'cart2'),
+        DataFixture(AddProductToCart::class, ['cart_id' => '$cart2.id$', 'product_id' => '$p1.id$']),
+        DataFixture(SetBillingAddress::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(SetShippingAddress::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart2.id$']),
+        DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart2.id$']),
+    ]
+    public function testCancelOrderBeforeConsumerAndRuleTimesUsed(): void
+    {
+        $cart = $this->fixtures->get('cart1');
+        $this->couponManagement->set($cart->getId(), 'once');
+        $orderId = $this->cartManagement->placeOrder($cart->getId());
+        $this->orderManagement->cancel($orderId);
+        $consumer = $this->consumerFactory->get('sales.rule.update.coupon.usage');
+        $consumer->process(2);
+
+        $cart = $this->fixtures->get('cart2');
+        $customer = $this->fixtures->get('customer');
+        $this->cartManagement->assignCustomer($cart->getId(), $customer->getId(), 1);
+        $cart = $this->cartRepository->get($cart->getId());
+        $this->couponManagement->set($cart->getId(), 'once');
+        $this->cartManagement->placeOrder($cart->getId());
+        $consumer->process(1);
+    }
 }