Merge remote-tracking branch 'magento-l3/ACP2E-22' into L3_PR_21-12-13

Author: veloraven

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

@@ -89,10 +89,13 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                     0
                 ),
                 'total_amount' => $connection->getIfNullSql(
-                    'SUM((base_subtotal - ' . $connection->getIfNullSql(
+                    'SUM(((base_subtotal - ' . $connection->getIfNullSql(
                         'base_subtotal_canceled',
                         0
-                    ) . ' - ' . $connection->getIfNullSql(
+                    ) . ' + ' . $connection->getIfNullSql(
+                        'base_shipping_amount - ' . $connection->getIfNullSql('base_shipping_canceled', 0),
+                        0
+                    ) . ') - ' . $connection->getIfNullSql(
                         'ABS(base_discount_amount) - ABS('
                         . $connection->getIfNullSql('base_discount_canceled', 0) . ')',
                         0
@@ -119,17 +122,20 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                     0
                 ),
                 'total_amount_actual' => $connection->getIfNullSql(
-                    'SUM((base_subtotal_invoiced - ' . $connection->getIfNullSql(
+                    'SUM(((base_subtotal_invoiced - ' . $connection->getIfNullSql(
                         'base_subtotal_refunded',
                         0
-                    ) . ' - ' . $connection->getIfNullSql(
+                    ) . ' + ' . $connection->getIfNullSql(
+                        'base_shipping_invoiced - ' . $connection->getIfNullSql('base_shipping_refunded', 0),
+                        0
+                    ) . ') - ' . $connection->getIfNullSql(
                         'ABS(base_discount_invoiced) - ABS('
                         . $connection->getIfNullSql('base_discount_refunded', 0) . ')',
                         0
                     ) . ' + ' . $connection->getIfNullSql(
                         'base_tax_invoiced - ' . $connection->getIfNullSql('base_tax_refunded', 0),
                         0
-                    )   . ') * base_to_global_rate)',
+                    ) . ') * base_to_global_rate)',
                     0
                 ),
             ];

dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Report/Rule/CreatedatTest.php

@@ -58,7 +58,8 @@ public function testTotals($orderParams)
     private function getTotalAmount(\Magento\Sales\Model\Order $order)
     {
         return (
-            $order->getBaseSubtotal() - $order->getBaseSubtotalCanceled()
+            ($order->getBaseSubtotal() - $order->getBaseSubtotalCanceled()
+            + ($order->getBaseShippingAmount() - $order->getBaseShippingCanceled()))
             - (abs((float) $order->getBaseDiscountAmount()) - abs((float) $order->getBaseDiscountCanceled()))
             + ($order->getBaseTaxAmount() - $order->getBaseTaxCanceled())
         ) * $order->getBaseToGlobalRate();
@@ -73,7 +74,8 @@ private function getTotalAmount(\Magento\Sales\Model\Order $order)
     private function getTotalAmountActual(\Magento\Sales\Model\Order $order)
     {
         return (
-            $order->getBaseSubtotalInvoiced() - $order->getSubtotalRefunded()
+            ($order->getBaseSubtotalInvoiced() - $order->getSubtotalRefunded()
+            + ($order->getBaseShippingInvoiced() - $order->getBaseShippingRefunded()))
             - abs((float) $order->getBaseDiscountInvoiced()) - abs((float) $order->getBaseDiscountRefunded())
             + $order->getBaseTaxInvoiced() - $order->getBaseTaxRefunded()
         ) * $order->getBaseToGlobalRate();