ACP2E-1068: Incorrect Dashboard YTD values

Author: glo23503

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

@@ -424,7 +424,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
                 break;
             case '24h':
                 $dateEnd = new \DateTime();
-                $dateStart = new \DateTime();$dateEnd->modify('+1 hour');
+                $dateEnd->modify('+1 hour');
                 $dateStart = clone $dateEnd;
                 $dateStart->modify('-1 day');
                 break;
@@ -699,8 +699,8 @@ public function setStoreIds($storeIds)
                     'invoiced' => 'SUM(main_table.base_total_paid)',
                     'refunded' => 'SUM(main_table.base_total_refunded)',
                     'profit' => "SUM({$baseSubtotalInvoiced}) " .
-                        "+ SUM({$baseDiscountRefunded}) - SUM({$baseSubtotalRefunded}) " .
-                        "- SUM({$baseDiscountInvoiced}) - SUM({$baseTotalInvocedCost})",
+                    "+ SUM({$baseDiscountRefunded}) - SUM({$baseSubtotalRefunded}) " .
+                    "- SUM({$baseDiscountInvoiced}) - SUM({$baseTotalInvocedCost})",
                 ]
             );
         } else {
@@ -714,10 +714,10 @@ public function setStoreIds($storeIds)
                     'invoiced' => 'SUM(main_table.base_total_paid * main_table.base_to_global_rate)',
                     'refunded' => 'SUM(main_table.base_total_refunded * main_table.base_to_global_rate)',
                     'profit' => "SUM({$baseSubtotalInvoiced} *  main_table.base_to_global_rate) " .
-                        "+ SUM({$baseDiscountRefunded} * main_table.base_to_global_rate) " .
-                        "- SUM({$baseSubtotalRefunded} * main_table.base_to_global_rate) " .
-                        "- SUM({$baseDiscountInvoiced} * main_table.base_to_global_rate) " .
-                        "- SUM({$baseTotalInvocedCost} * main_table.base_to_global_rate)",
+                    "+ SUM({$baseDiscountRefunded} * main_table.base_to_global_rate) " .
+                    "- SUM({$baseSubtotalRefunded} * main_table.base_to_global_rate) " .
+                    "- SUM({$baseDiscountInvoiced} * main_table.base_to_global_rate) " .
+                    "- SUM({$baseTotalInvocedCost} * main_table.base_to_global_rate)",
                 ]
             );
         }
@@ -855,7 +855,7 @@ private function getTotalsExpressionWithDiscountRefunded(
         $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)';
+                . ' * main_table.base_to_global_rate)';
         return sprintf(
             $template,
             $baseSubtotalRefunded,