Merge remote-tracking branch 'm2mainline/develop' into MAGETWO-37985

Leonid Poluyanov · Leonid Poluyanov · commit 872a7e78c829 · 2015-05-28T20:28:56.000+03:00
diff --git a/app/code/Magento/Reports/Model/Resource/Order/Collection.php b/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 {
diff --git a/app/code/Magento/Reports/Model/Resource/Report/AbstractReport.php b/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');
-    }
 }
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed.php b/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'),
@@ -114,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
@@ -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();
 
@@ -117,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
@@ -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);
 
@@ -76,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],
@@ -187,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/Order/Createdat.php b/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();
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Refunded.php b/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);
 
@@ -65,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)
             );
@@ -162,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
@@ -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);
@@ -64,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)
             );
@@ -166,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
@@ -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();
@@ -67,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
@@ -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');
 
@@ -69,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')],
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
@@ -34,16 +34,16 @@ public function processAssert(SalesCouponReportView $salesCouponReportView, Orde
         $discount = $data['price']['discount'] != 0
             ? '-' . $currency . number_format($data['price']['discount'], 2)
             : $currency . '0.00';
-        $roleName = $data['coupon_code']->getName();
+        $couponCode = $data['coupon_code']->getCouponCode();
         $filter = [
-            'coupon_code' => $data['coupon_code']->getCouponCode(),
-            'rule_name' => $roleName,
+            'coupon_code' => $couponCode,
+            'rule_name' => $data['coupon_code']->getName(),
             'subtotal' => $currency . number_format($data['price']['subtotal'], 2),
             'discount' => $discount,
         ];
         \PHPUnit_Framework_Assert::assertTrue(
             $salesCouponReportView->getGridBlock()->isRowVisible($filter, false),
-            "Coupon '$roleName' is not visible."
+            "Coupon with code - '$couponCode' is not visible."
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
@@ -34,17 +34,6 @@ public function testExecuteWithError()
         $this->dispatch('backend/reports/report_product/viewed/filter/' .
             'cGVyaW9kX3R5cGU9ZGF5JmZyb209NyUyRjElMkY2NyZ0bz1odG1sJTIwZm90bSZzaG93X2VtcHR5X3Jvd3M9MA==');
         $actual = $this->getResponse()->getBody();
-
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        /** @var $messageManager \Magento\Framework\Message\Manager */
-        $messageManager = $objectManager->get('Magento\Framework\Message\Manager');
-
-        $this->assertContains(
-            'An error occurred while showing the product views report.',
-            (string)$messageManager->getMessages()->getLastAddedMessage()->getText()
-        );
-
         $this->assertEquals('', $actual);
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2230,4 +2230,6 @@
     ['assignData', 'Magento\OfflinePayments\Model\Checkmo'],
     ['timeShift', 'Magento\Reports\Model\Resource\Report\Collection'],
     ['Magento\Catalog\Model\Product\Attribute\Backend\Startdate', 'Magento\Catalog\Model\Attribute\Backend\Startdate'],
+    ['_getStoreTimezoneUtcOffset', 'Magento\Reports\Model\Resource\Report\AbstractReport'],
+    ['_dateToUtc', 'Magento\Reports\Model\Resource\Report\AbstractReport'],
 ];
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -146,7 +146,7 @@ public function date($date = null, $locale = null, $useTimezone = true)
         $locale = $locale ?: $this->_localeResolver->getLocale();
         $timezone = $useTimezone
             ? $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType)
-            : 'UTC';
+            : date_default_timezone_get();
 
         if (empty($date)) {
             return new \DateTime('now', new \DateTimeZone($timezone));
diff --git a/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php b/setup/src/Magento/Setup/Fixtures/CategoriesFixture.php
@@ -52,7 +52,7 @@ public function execute()
                 ->setName("Category $categoryIndex")
                 ->setParentId($parentCategoryId[$groupNumber])
                 ->setPath($nestingPath[$groupNumber])
-                ->setLevel($nestingLevel[$groupNumber])
+                ->setLevel($nestingLevel[$groupNumber] + 1)
                 ->setAvailableSortBy('name')
                 ->setDefaultSortBy('name')
                 ->setIsActive(true)
diff --git a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
@@ -194,7 +194,6 @@ public function execute()
             $zip = '11111';
             $phone = '911';
             $dateStart = new \DateTime();
-            $dateStart->setTimezone(new \DateTimeZone('Etc/UTC'));
             $time = $dateStart->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
 
             $simpleProductIdLen[0] = strlen($simpleProductId[0]($entityId));
@@ -268,7 +267,7 @@ public function execute()
             $queries[] = "INSERT INTO `{$salesOrderStatusHistoryTableName}` (`entity_id`, `parent_id`, `is_customer_notified`, `is_visible_on_front`, `comment`, `status`, `created_at`, `entity_name`) VALUES ({$salesOrderStatusHistoryId}, {$salesOrderId}, 1, 0, NULL, 'pending', '{$time}', 'order');";
 
             // @codingStandardsIgnoreEnd
-            foreach($queries as $query) {
+            foreach ($queries as $query) {
                 $writeAdapter->query($query);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -457,9 +457,6 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =`
`457`	`457`	`break;`
`458`	`458`	`}`
`459`	`459`
`460`		`- $dateStart->setTimezone(new \DateTimeZone('Etc/UTC'));`
`461`		`- $dateEnd->setTimezone(new \DateTimeZone('Etc/UTC'));`
`462`		`-`
`463`	`460`	`if ($returnObjects) {`
`464`	`461`	`return [$dateStart, $dateEnd];`
`465`	`462`	`} else {`