ACP2E-3302: [Cloud] Incorrect Calculations in Coupon Usage Report

Author: pradeep1819

app/code/Magento/Quote/Test/Fixture/ApplyCoupon.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Test\Fixture;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Fixture\DataFixtureInterface;
+
+class ApplyCoupon implements DataFixtureInterface
+{
+    /**
+     * @var CartRepositoryInterface
+     */
+    public CartRepositoryInterface $quoteRepository;
+
+    /**
+     * @param CartRepositoryInterface $quoteRepository
+     */
+    public function __construct(
+        CartRepositoryInterface $quoteRepository
+    ) {
+        $this->quoteRepository = $quoteRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param array $data Parameters
+     * <pre>
+     *    $data = [
+     *      'cart_id'    => (string) Cart ID. Required.
+     *      'coupon_codes' => (array) Coupon Codes. Required.
+     *    ]
+     * </pre>
+     * @throws NoSuchEntityException
+     */
+    public function apply(array $data = []): ?DataObject
+    {
+        if (empty($data['cart_id']) || empty($data['coupon_codes'])) {
+            throw new \InvalidArgumentException('cart_id or coupon_codes is missing!');
+        }
+        $quote = $this->quoteRepository->getActive($data['cart_id']);
+        $quote->setCouponCode(reset($data['coupon_codes']));
+        $quote->getExtensionAttributes()->setCouponCodes($data['coupon_codes']);
+        $this->quoteRepository->save($quote->collectTotals());
+        return $quote;
+    }
+}

app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php

@@ -6,11 +6,50 @@
 
 namespace Magento\SalesRule\Model\ResourceModel\Report\Rule;
 
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Stdlib\DateTime\Timezone\Validator;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Reports\Model\FlagFactory;
+use Magento\Tax\Model\Config;
+use Psr\Log\LoggerInterface;
+
 /**
  * Rule report resource model with aggregation by created at
  */
 class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
+    /**
+     * @param Context $context
+     * @param LoggerInterface $logger
+     * @param TimezoneInterface $localeDate
+     * @param FlagFactory $reportsFlagFactory
+     * @param Validator $timezoneValidator
+     * @param DateTime $dateTime
+     * @param Config $taxConfig
+     * @param string|null $connectionName
+     */
+    public function __construct(
+        private readonly Context $context,
+        private readonly LoggerInterface $logger,
+        private readonly TimezoneInterface $localeDate,
+        private readonly FlagFactory $reportsFlagFactory,
+        private readonly Validator $timezoneValidator,
+        DateTime $dateTime,
+        private Config $taxConfig,
+        string $connectionName = null
+    ) {
+        parent::__construct(
+            $context,
+            $logger,
+            $localeDate,
+            $reportsFlagFactory,
+            $timezoneValidator,
+            $dateTime,
+            $connectionName
+        );
+    }
+
     /**
      * Resource Report Rule constructor
      *
@@ -65,6 +104,13 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                 $this->getStoreTZOffsetQuery($sourceTable, $aggregationField, $from, $to, null, $salesAdapter)
             );
 
+            $subtotalAmountFiled = 'base_subtotal';
+            $subtotalAmountActualFiled = 'base_subtotal_invoiced';
+            if ($this->taxConfig->displaySalesSubtotalInclTax()) {
+                $subtotalAmountFiled = 'base_subtotal_incl_tax';
+                $subtotalAmountActualFiled = 'base_subtotal_incl_tax';
+            }
+
             $columns = [
                 'period' => $periodExpr,
                 'store_id' => 'store_id',
@@ -73,7 +119,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                 'rule_name' => 'coupon_rule_name',
                 'coupon_uses' => 'COUNT(entity_id)',
                 'subtotal_amount' => $connection->getIfNullSql(
-                    'SUM((base_subtotal - ' . $connection->getIfNullSql(
+                    'SUM((' . $subtotalAmountFiled . ' - ' . $connection->getIfNullSql(
                         'base_subtotal_canceled',
                         0
                     ) . ') * base_to_global_rate)',
@@ -110,7 +156,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                     0
                 ),
                 'subtotal_amount_actual' => $connection->getIfNullSql(
-                    'SUM((base_subtotal_invoiced - ' . $connection->getIfNullSql(
+                    'SUM((' . $subtotalAmountActualFiled . ' - ' . $connection->getIfNullSql(
                         'base_subtotal_refunded',
                         0
                     ) . ') * base_to_global_rate)',

app/code/Magento/SalesRule/composer.json

@@ -28,7 +28,8 @@
         "magento/module-checkout": "*",
         "magento/module-authorization": "*",
         "magento/module-asynchronous-operations": "*",
-        "magento/module-multishipping": "*"
+        "magento/module-multishipping": "*",
+        "magento/module-tax": "*"
     },
     "suggest": {
         "magento/module-sales-rule-sample-data": "*"