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

Author: slopukhov

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

@@ -457,9 +457,6 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
                 break;
         }
 
-        $dateStart->setTimezone(new \DateTimeZone('Etc/UTC'));
-        $dateEnd->setTimezone(new \DateTimeZone('Etc/UTC'));
-
         if ($returnObjects) {
             return [$dateStart, $dateEnd];
         } else {

app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php

@@ -465,37 +465,4 @@ protected function _getTZOffsetTransitions($timezone, $from = null, $to = null)
 
         return $tzTransitions;
     }
-
-    /**
-     * Retrieve store timezone offset from UTC in the form acceptable by SQL's CONVERT_TZ()
-     *
-     * @param null|mixed $store
-     * @return string
-     */
-    protected function _getStoreTimezoneUtcOffset($store = null)
-    {
-        return $this->_localeDate->scopeDate($store)->format('P');
-    }
-
-    /**
-     * Retrieve date in UTC timezone
-     *
-     * @param mixed $date
-     * @return null|\DateTime
-     */
-    protected function _dateToUtc($date)
-    {
-        if ($date === null) {
-            return null;
-        }
-
-        if ($date instanceof \DateTimeInterface) {
-            $dateUtc = $date;
-        } else {
-            $dateUtc = new \DateTime($date);
-        }
-
-        $dateUtc->setTimezone(new \DateTimeZone('UTC'));
-        return $dateUtc->format('Y-m-d H:i:s');
-    }
 }

app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php

@@ -98,10 +98,6 @@ public function aggregate($from = null, $to = null)
         $mainTable = $this->getMainTable();
         $adapter = $this->_getWriteAdapter();
 
-        // convert input dates to UTC to be comparable with DATETIME fields in DB
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         if ($from !== null || $to !== null) {
             $subSelect = $this->_getTableDateRangeSelect(
                 $this->getTable('report_event'),

app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php

@@ -96,10 +96,6 @@ protected function _construct()
      */
     public function aggregate($from = null, $to = null)
     {
-        // convert input dates to UTC to be comparable with DATETIME fields in DB
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         $adapter = $this->_getWriteAdapter();
         //$this->_getWriteAdapter()->beginTransaction();
 

app/code/Magento/Sales/Model/Resource/Report/Invoiced.php

@@ -31,10 +31,6 @@ protected function _construct()
      */
     public function aggregate($from = null, $to = null)
     {
-        // convert input dates to UTC to be comparable with DATETIME fields in DB
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         $this->_aggregateByOrderCreatedAt($from, $to);
         $this->_aggregateByInvoiceCreatedAt($from, $to);
 

app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php

@@ -47,10 +47,6 @@ public function aggregate($from = null, $to = null)
      */
     protected function _aggregateByField($aggregationField, $from, $to)
     {
-        // convert input dates to UTC to be comparable with DATETIME fields in DB
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         $adapter = $this->_getWriteAdapter();
 
         $adapter->beginTransaction();

app/code/Magento/Sales/Model/Resource/Report/Refunded.php

@@ -31,10 +31,6 @@ protected function _construct()
      */
     public function aggregate($from = null, $to = null)
     {
-        // convert input dates to UTC to be comparable with DATETIME fields in DB
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         $this->_aggregateByOrderCreatedAt($from, $to);
         $this->_aggregateByRefundCreatedAt($from, $to);
 

app/code/Magento/Sales/Model/Resource/Report/Shipping.php

@@ -31,10 +31,6 @@ protected function _construct()
      */
     public function aggregate($from = null, $to = null)
     {
-        // convert input dates to UTC to be comparable with DATETIME fields in DB
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         $this->_aggregateByOrderCreatedAt($from, $to);
         $this->_aggregateByShippingCreatedAt($from, $to);
         $this->_setFlagData(\Magento\Reports\Model\Flag::REPORT_SHIPPING_FLAG_CODE);

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

@@ -49,9 +49,6 @@ public function aggregate($from = null, $to = null)
      */
     protected function _aggregateByOrder($aggregationField, $from, $to)
     {
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         $table = $this->getMainTable();
         $sourceTable = $this->getTable('sales_order');
         $adapter = $this->_getWriteAdapter();

app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php

@@ -46,10 +46,6 @@ public function aggregate($from = null, $to = null)
      */
     protected function _aggregateByOrder($aggregationField, $from, $to)
     {
-        // convert input dates to UTC to be comparable with DATETIME fields in DB
-        $from = $this->_dateToUtc($from);
-        $to = $this->_dateToUtc($to);
-
         $writeAdapter = $this->_getWriteAdapter();
         $salesAdapter = $this->_resources->getConnection('sales_read');