MAGETWO-61004: Show correct store local date - use timezone configuration

Author: svitja

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

@@ -60,16 +60,14 @@ public function __construct(
     public function prepare()
     {
         $config = $this->getData('config');
-
-        if (!isset($config['timeOffset'])) {
-            $config['timeOffset'] = (new \DateTime(
-                'now',
-                new \DateTimeZone(
-                    $this->localeDate->getConfigTimezone()
-                )
-            ))->getOffset();
+        if (!isset($config['storeTimeZone'])) {
+            $storeTimeZone = $this->localeDate->getConfigTimezone();
+            $config['storeTimeZone'] = $storeTimeZone;
         }
-
+        // Set date format pattern by current locale
+        $localeDateFormat = $this->localeDate->getDateFormat();
+        $config['options']['dateFormat'] = $localeDateFormat;
+        $config['outputDateFormat'] = $localeDateFormat;
         $this->setData('config', $config);
 
         parent::prepare();

dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Source/Date.php

@@ -6,13 +6,15 @@
 
 namespace Magento\Backend\Test\Fixture\Source;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Mtf\Fixture\DataSource;
 
 /**
  * Class Date.
  *
  * Data keys:
  *  - pattern (Format a local time/date with delta, e.g. 'm/d/Y -3 days' = current day - 3 days)
+ *  - apply_timezone (true if it is needed to apply timezone)
  */
 class Date extends DataSource
 {
@@ -35,7 +37,16 @@ public function __construct(array $params, $data = [])
             if (!$timestamp) {
                 throw new \Exception('Invalid date format for "' . $this->params['attribute_code'] . '" field');
             }
-            $date = date(str_replace($delta, '', $data['pattern']), $timestamp);
+            if (isset($data['apply_timezone']) && $data['apply_timezone'] === true) {
+                $timezone = ObjectManager::getInstance()
+                    ->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+                $date = new \DateTime();
+                $date->setTimestamp($timestamp);
+                $date->setTimezone(new \DateTimeZone($timezone->getConfigTimezone()));
+                $date = $date->format(str_replace($delta, '', $data['pattern']));
+            } else {
+                $date = date(str_replace($delta, '', $data['pattern']), $timestamp);
+            }
             if (!$date) {
                 $date = date('m/d/Y');
             }