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

Author: pradeep1819

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

@@ -8,8 +8,6 @@
 
 /**
  * Rule report resource model with aggregation by created at
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
 {
@@ -102,7 +100,12 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                     ) . ' + ' . $connection->getIfNullSql(
                         'base_tax_amount - ' . $connection->getIfNullSql('base_tax_canceled', 0),
                         0
-                    ) . ')
+                    ) . ' + ' . $connection->getIfNullSql(
+                        'base_discount_tax_compensation_amount - '
+                        . $connection->getIfNullSql('base_discount_tax_compensation_refunded', 0),
+                        0
+                    ) . ' - ' . $connection->getIfNullSql('ABS(base_shipping_discount_tax_compensation_amnt)', 0)
+                    . ')
                         * base_to_global_rate)',
                     0
                 ),
@@ -135,7 +138,13 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                     ) . ' + ' . $connection->getIfNullSql(
                         'base_tax_invoiced - ' . $connection->getIfNullSql('base_tax_refunded', 0),
                         0
-                    ) . ') * base_to_global_rate)',
+                    ) . ' + ' . $connection->getIfNullSql(
+                        'base_discount_tax_compensation_invoiced - '
+                        . $connection->getIfNullSql('base_discount_tax_compensation_refunded', 0),
+                        0
+                    ) . ' - ' . $connection->getIfNullSql('ABS(base_shipping_discount_tax_compensation_amnt)', 0)
+                    . ')
+                    * base_to_global_rate)',
                     0
                 ),
             ];