MAGETWO-35057: Columns 'Interval', 'Price Rule' have incorrect values in Coupon Usage report.

slopukhov · Roman Ganin · commit be9c5e8b0322 · 2015-05-26T17:02:41.000+03:00
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php
@@ -110,7 +110,7 @@ public function aggregate($from = null, $to = null)
             $subSelect = null;
         }
         $this->_clearTableByDateRange($mainTable, $from, $to, $subSelect);
-        // convert dates from UTC to current admin timezone
+        // convert dates to current admin timezone
         $periodExpr = $adapter->getDatePartSql(
             $this->getStoreTZOffsetQuery(
                 ['source_table' => $this->getTable('report_event')],
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
@@ -113,7 +113,7 @@ public function aggregate($from = null, $to = null)
             }
 
             $this->_clearTableByDateRange($this->getMainTable(), $from, $to, $subSelect);
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $adapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery(
                     ['source_table' => $this->getTable('sales_order')],
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
@@ -72,7 +72,7 @@ protected function _aggregateByInvoiceCreatedAt($from, $to)
             }
 
             $this->_clearTableByDateRange($table, $from, $to, $subSelect);
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $adapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery(
                     ['source_table' => $sourceTable],
@@ -183,7 +183,7 @@ protected function _aggregateByOrderCreatedAt($from, $to)
         }
 
         $this->_clearTableByDateRange($table, $from, $to, $subSelect);
-        // convert dates from UTC to current admin timezone
+        // convert dates to current admin timezone
         $periodExpr = $adapter->getDatePartSql($this->getStoreTZOffsetQuery($sourceTable, 'created_at', $from, $to));
 
         $columns = [
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Refunded.php b/app/code/Magento/Sales/Model/Resource/Report/Refunded.php
@@ -61,7 +61,7 @@ protected function _aggregateByOrderCreatedAt($from, $to)
             }
 
             $this->_clearTableByDateRange($table, $from, $to, $subSelect);
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $adapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery($sourceTable, 'created_at', $from, $to)
             );
@@ -158,7 +158,7 @@ protected function _aggregateByRefundCreatedAt($from, $to)
             }
 
             $this->_clearTableByDateRange($table, $from, $to, $subSelect);
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $adapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery(
                     ['source_table' => $sourceTable],
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
@@ -60,7 +60,7 @@ protected function _aggregateByOrderCreatedAt($from, $to)
             }
 
             $this->_clearTableByDateRange($table, $from, $to, $subSelect);
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $adapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery($sourceTable, 'created_at', $from, $to)
             );
@@ -162,7 +162,7 @@ protected function _aggregateByShippingCreatedAt($from, $to)
             }
 
             $this->_clearTableByDateRange($table, $from, $to, $subSelect);
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $adapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery(
                     ['source_table' => $sourceTable],
diff --git a/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/Magento/SalesRule/Model/Resource/Report/Rule/Createdat.php
@@ -64,7 +64,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
 
             $this->_clearTableByDateRange($table, $from, $to, $subSelect, false, $salesAdapter);
 
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $adapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery($sourceTable, $aggregationField, $from, $to, null, $salesAdapter)
             );
diff --git a/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php b/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php
@@ -65,7 +65,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
             }
 
             $this->_clearTableByDateRange($this->getMainTable(), $from, $to, $subSelect, false, $salesAdapter);
-            // convert dates from UTC to current admin timezone
+            // convert dates to current admin timezone
             $periodExpr = $writeAdapter->getDatePartSql(
                 $this->getStoreTZOffsetQuery(
                     ['e' => $this->getTable('sales_order')],

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function aggregate($from = null, $to = null)`
`110`	`110`	`$subSelect = null;`
`111`	`111`	`}`
`112`	`112`	`$this->_clearTableByDateRange($mainTable, $from, $to, $subSelect);`
`113`		`- // convert dates from UTC to current admin timezone`
	`113`	`+ // convert dates to current admin timezone`
`114`	`114`	`$periodExpr = $adapter->getDatePartSql(`
`115`	`115`	`$this->getStoreTZOffsetQuery(`
`116`	`116`	`['source_table' => $this->getTable('report_event')],`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function aggregate($from = null, $to = null)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`$this->_clearTableByDateRange($this->getMainTable(), $from, $to, $subSelect);`
`116`		`- // convert dates from UTC to current admin timezone`
	`116`	`+ // convert dates to current admin timezone`
`117`	`117`	`$periodExpr = $adapter->getDatePartSql(`
`118`	`118`	`$this->getStoreTZOffsetQuery(`
`119`	`119`	`['source_table' => $this->getTable('sales_order')],`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected function _aggregateByInvoiceCreatedAt($from, $to)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`$this->_clearTableByDateRange($table, $from, $to, $subSelect);`
`75`		`- // convert dates from UTC to current admin timezone`
	`75`	`+ // convert dates to current admin timezone`
`76`	`76`	`$periodExpr = $adapter->getDatePartSql(`
`77`	`77`	`$this->getStoreTZOffsetQuery(`
`78`	`78`	`['source_table' => $sourceTable],`
`@@ -183,7 +183,7 @@ protected function _aggregateByOrderCreatedAt($from, $to)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`$this->_clearTableByDateRange($table, $from, $to, $subSelect);`
`186`		`- // convert dates from UTC to current admin timezone`
	`186`	`+ // convert dates to current admin timezone`
`187`	`187`	`$periodExpr = $adapter->getDatePartSql($this->getStoreTZOffsetQuery($sourceTable, 'created_at', $from, $to));`
`188`	`188`
`189`	`189`	`$columns = [`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`$this->_clearTableByDateRange($this->getMainTable(), $from, $to, $subSelect, false, $salesAdapter);`
`68`		`- // convert dates from UTC to current admin timezone`
	`68`	`+ // convert dates to current admin timezone`
`69`	`69`	`$periodExpr = $writeAdapter->getDatePartSql(`
`70`	`70`	`$this->getStoreTZOffsetQuery(`
`71`	`71`	`['e' => $this->getTable('sales_order')],`