Fixed deletd orders being used in widget calculations fixes #1490

CHANGELOG.md

@@ -5,6 +5,9 @@
 ### Added
 - Added the `craft\commerce\services\Sales::EVENT_AFTER_DELETE_SALE` event.
 
+### Fixed
+- Fixed a bug where reporting widgets were including deleted orders in calculations. ([#1490](https://github.com/craftcms/commerce/issues/1490))
+
 ## 3.1.7 - 2020-06-02
 
 ### Fixed

src/base/Stat.php

@@ -423,9 +423,11 @@ protected function _createStatQuery()
     {
         return (new Query)
             ->from(Table::ORDERS . ' orders')
+            ->innerJoin('{{%elements}} elements', '[[elements.id]] = [[orders.id]]')
             ->where(['>=', 'dateOrdered', Db::prepareDateForDb($this->_startDate)])
             ->andWhere(['<=', 'dateOrdered', Db::prepareDateForDb($this->_endDate)])
-            ->andWhere(['isCompleted' => 1]);
+            ->andWhere(['isCompleted' => 1])
+            ->andWhere(['elements.dateDeleted' => null]);
     }
 
     /**

src/stats/AverageOrderTotal.php

@@ -34,7 +34,7 @@ class AverageOrderTotal extends Stat
     public function getData()
     {
         $query = $this->_createStatQuery();
-        $query->select([new Expression('ROUND(SUM([[total]]) / COUNT([[id]]), 4) as averageOrderTotal')]);
+        $query->select([new Expression('ROUND(SUM([[total]]) / COUNT([[orders.id]]), 4) as averageOrderTotal')]);
 
         return $query->scalar();
     }

src/stats/RepeatCustomers.php

@@ -35,7 +35,7 @@ public function getData()
             ->count();
 
         $repeatRows = $this->_createStatQuery()
-            ->select([new Expression('COUNT([[id]])')])
+            ->select([new Expression('COUNT([[orders.id]])')])
             ->groupBy('customerId')
             ->column();
 

src/stats/TopCustomers.php

@@ -54,16 +54,16 @@ public function getData()
         $topCustomers = $this->_createStatQuery()
             ->select([
                 new Expression('SUM([[total]]) as total'),
-                new Expression('ROUND((SUM([[total]]) / COUNT([[id]])), 4) as average'),
+                new Expression('ROUND((SUM([[total]]) / COUNT([[orders.id]])), 4) as average'),
                 'customerId',
                 '[[orders.email]] as email',
-                new Expression('COUNT([[id]]) as count'),
+                new Expression('COUNT([[orders.id]]) as count'),
             ])
             ->groupBy(['[[orders.customerId]]', '[[orders.email]]'])
             ->limit($this->limit);
 
         if ($this->type == 'average') {
-            $topCustomers->orderBy(new Expression('ROUND((SUM([[total]]) / COUNT([[id]])), 4) DESC'));
+            $topCustomers->orderBy(new Expression('ROUND((SUM([[total]]) / COUNT([[orders.id]])), 4) DESC'));
         } else {
             $topCustomers->orderBy(new Expression('SUM([[total]]) DESC'));
         }

src/stats/TotalOrders.php

@@ -29,10 +29,10 @@ class TotalOrders extends Stat
     public function getData()
     {
         $query = $this->_createStatQuery();
-        $query->select([new Expression('COUNT([[id]]) as total')]);
+        $query->select([new Expression('COUNT([[orders.id]]) as total')]);
 
         $chartData = $this->_createChartQuery([
-            new Expression('COUNT([[id]]) as total'),
+            new Expression('COUNT([[orders.id]]) as total'),
         ], [
             'total' => 0,
         ]);

src/stats/TotalRevenue.php

@@ -32,7 +32,7 @@ public function getData()
         return $this->_createChartQuery(
             [
                 new Expression('SUM([[total]]) as revenue'),
-                new Expression('COUNT([[id]]) as count'),
+                new Expression('COUNT([[orders.id]]) as count'),
             ],
             [
                 'revenue' => 0,