🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #21944: [Backport] Fixed calculation of 'Total' column under "Last Orders" listing on the admin dashboard (by @eduard13)
 - #21535: [Backport] Fix Broken Tax Rate Search Filter Admin grid #21521 (by @tuyennn)


Fixed GitHub Issues:
 - #18754: Negative order amount in dashboard latest order when order is cancelled where coupon has been used (reported by @albsa) has been fixed in #21944 by @eduard13 in 2.2-develop branch
   Related commits:
     1. 7d81b55
     2. 0cea562
     3. 891e2e1
     4. a54bba3

 - #21281: Wrong order amount on dashboard on Last orders listing when order has discount and it is partially refunded (reported by @rav-redchamps) has been fixed in #21944 by @eduard13 in 2.2-develop branch
   Related commits:
     1. 7d81b55
     2. 0cea562
     3. 891e2e1
     4. a54bba3

 - #21521: Broken Tax Rate Search Filter - SQLSTATE[23000] (reported by @robyerevan) has been fixed in #21535 by @tuyennn in 2.2-develop branch
   Related commits:
     1. d935998
     2. fb2d354

Author: magento-engcom-team

app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php

@@ -769,11 +769,12 @@ public function addOrdersCount()
      */
     public function addRevenueToSelect($convertCurrency = false)
     {
-        $expr = $this->getTotalsExpression(
+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
             !$convertCurrency,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
         );
         $this->getSelect()->columns(['revenue' => $expr]);
 
@@ -791,11 +792,12 @@ public function addSumAvgTotals($storeId = 0)
         /**
          * calculate average and total amount
          */
-        $expr = $this->getTotalsExpression(
+        $expr = $this->getTotalsExpressionWithDiscountRefunded(
             $storeId,
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_refunded', 0),
             $this->getConnection()->getIfNullSql('main_table.base_subtotal_canceled', 0),
-            $this->getConnection()->getIfNullSql('main_table.base_discount_canceled', 0)
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_refunded)', 0),
+            $this->getConnection()->getIfNullSql('ABS(main_table.base_discount_canceled)', 0)
         );
 
         $this->getSelect()->columns(
@@ -808,13 +810,15 @@ public function addSumAvgTotals($storeId = 0)
     }
 
     /**
-     * Get SQL expression for totals
+     * Get SQL expression for totals.
      *
      * @param int $storeId
      * @param string $baseSubtotalRefunded
      * @param string $baseSubtotalCanceled
      * @param string $baseDiscountCanceled
      * @return string
+     * @deprecated
+     * @see getTotalsExpressionWithDiscountRefunded
      */
     protected function getTotalsExpression(
         $storeId,
@@ -825,10 +829,40 @@ protected function getTotalsExpression(
         $template = ($storeId != 0)
             ? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
             : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
-                . ' * main_table.base_to_global_rate)';
+            . ' * main_table.base_to_global_rate)';
         return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
     }
 
+    /**
+     * Get SQL expression for totals with discount refunded.
+     *
+     * @param int $storeId
+     * @param string $baseSubtotalRefunded
+     * @param string $baseSubtotalCanceled
+     * @param string $baseDiscountRefunded
+     * @param string $baseDiscountCanceled
+     * @return string
+     */
+    private function getTotalsExpressionWithDiscountRefunded(
+        $storeId,
+        $baseSubtotalRefunded,
+        $baseSubtotalCanceled,
+        $baseDiscountRefunded,
+        $baseDiscountCanceled
+    ) {
+        $template = ($storeId != 0)
+            ? '(main_table.base_subtotal - %2$s - %1$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s))'
+            : '((main_table.base_subtotal - %1$s - %2$s - (ABS(main_table.base_discount_amount) - %3$s - %4$s)) '
+                . ' * main_table.base_to_global_rate)';
+        return sprintf(
+            $template,
+            $baseSubtotalRefunded,
+            $baseSubtotalCanceled,
+            $baseDiscountRefunded,
+            $baseDiscountCanceled
+        );
+    }
+
     /**
      * Sort order by total amount
      *

app/code/Magento/Tax/etc/di.xml

@@ -143,6 +143,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>
@@ -154,6 +155,7 @@
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
                 <item name="id" xsi:type="string">tax_calculation_rule_id</item>
+                <item name="code" xsi:type="string">main_table.code</item>
                 <item name="tax_rate_ids" xsi:type="string">tax_calculation_rate_id</item>
                 <item name="customer_tax_class_ids" xsi:type="string">cd.customer_tax_class_id</item>
                 <item name="product_tax_class_ids" xsi:type="string">cd.product_tax_class_id</item>