Merge branch 'time_zone' of https://github.corp.magento.com/magento2/magento2ce into time_zone

Author: Igor Melnikov

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -200,10 +200,7 @@ public function setValue($value)
     protected function _convertDate($date)
     {
         $adminTimeZone = new \DateTimeZone(
-            $this->_scopeConfig->getValue(
-                $this->_localeDate->getDefaultTimezonePath(),
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
+            $this->_localeDate->getConfigTimezone()
         );
         $formatter = new \IntlDateFormatter(
             $this->localeResolver->getLocale(),

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

@@ -69,10 +69,7 @@ protected function _convertDate($date)
         if ($this->getColumn()->getFilterTime()) {
             try {
                 $adminTimeZone = new \DateTimeZone(
-                    $this->_scopeConfig->getValue(
-                        $this->_localeDate->getDefaultTimezonePath(),
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    )
+                    $this->_localeDate->getConfigTimezone()
                 );
                 $simpleRes = new \DateTime($date, $adminTimeZone);
                 $simpleRes->setTimezone(new \DateTimeZone('UTC'));

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php

@@ -75,9 +75,13 @@ protected function _getFormat()
     public function render(\Magento\Framework\DataObject $row)
     {
         if ($data = $row->getData($this->getColumn()->getIndex())) {
+            $timezone = $this->getColumn()->getTimezone() !== false ? $this->_localeDate->getConfigTimezone() : 'UTC';
             return $this->dateTimeFormatter->formatObject(
                 $this->_localeDate->date(
-                    new \DateTime($data, new \DateTimeZone($this->_localeDate->getConfigTimezone()))
+                    new \DateTime(
+                        $data,
+                        new \DateTimeZone($timezone)
+                    )
                 ),
                 $this->_getFormat()
             );

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php

@@ -20,11 +20,13 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
     public function render(\Magento\Framework\DataObject $row)
     {
         $format = $this->getColumn()->getFormat();
-        if ($data = $this->_getValue($row)) {
-            return $this->_localeDate->formatDate(
-                $data,
+        if ($date = $this->_getValue($row)) {
+            return $this->_localeDate->formatDateTime(
+                $date instanceof \DateTimeInterface ? $date : new \DateTime($date),
                 $format ?: \IntlDateFormatter::MEDIUM,
-                true
+                $format ?: \IntlDateFormatter::MEDIUM,
+                null,
+                $this->getColumn()->getTimezone() !== false ? null : 'UTC'
             );
         }
         return $this->getColumn()->getDefault();

app/code/Magento/Customer/Test/Unit/Ui/Component/ColumnFactoryTest.php

@@ -91,7 +91,8 @@ public function testCreate()
                             'label' => 'Label',
                             'value' => 'Value'
                         ]
-                    ]
+                    ],
+                    'component' => 'Magento_Ui/js/grid/columns/column',
                 ],
             ],
             'context' => $this->context,

app/code/Magento/Customer/Ui/Component/ColumnFactory.php

@@ -60,7 +60,12 @@ public function create(array $attributeData, $columnName, $context, array $confi
             'dataType' => $this->getDataType($attributeData[AttributeMetadata::FRONTEND_INPUT]),
             'align' => 'left',
             'visible' => (bool)$attributeData[AttributeMetadata::IS_VISIBLE_IN_GRID],
+            'component' => $this->getJsComponent($this->getDataType($attributeData[AttributeMetadata::FRONTEND_INPUT])),
         ], $config);
+        if ($attributeData[AttributeMetadata::FRONTEND_INPUT] == 'date') {
+            $config['dateFormat'] = 'MMM d, y';
+            $config['timezone'] = false;
+        }
         if (count($attributeData[AttributeMetadata::OPTIONS]) && !isset($config[AttributeMetadata::OPTIONS])) {
             $config[AttributeMetadata::OPTIONS] = $attributeData[AttributeMetadata::OPTIONS];
         }

app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml

@@ -390,6 +390,8 @@
                     <item name="dataType" xsi:type="string">date</item>
                     <item name="label" xsi:type="string" translate="true">Date of Birth</item>
                     <item name="sortOrder" xsi:type="number">170</item>
+                    <item name="timezone" xsi:type="boolean">false</item>
+                    <item name="dateFormat" xsi:type="string">MMM d, y</item>
                 </item>
             </argument>
         </column>

app/code/Magento/Sales/view/frontend/email/order_new.html

@@ -37,7 +37,7 @@
     <tr class="email-summary">
         <td>
             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
-            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(1) |raw}}</p>
+            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(2) |raw}}</p>
         </td>
     </tr>
     <tr class="email-information">

app/code/Magento/Sales/view/frontend/email/order_new_guest.html

@@ -9,7 +9,7 @@
 "var formattedBillingAddress|raw":"Billing Address",
 "var order.getEmailCustomerNote()":"Email Order Note",
 "var order.getBillingAddress().getName()":"Guest Customer Name",
-"var order.getCreatedAtFormatted(1)":"Order Created At (datetime)",
+"var order.getCreatedAtFormatted(2)":"Order Created At (datetime)",
 "var order.increment_id":"Order Id",
 "layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
@@ -35,7 +35,7 @@
     <tr class="email-summary">
         <td>
             <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
-            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(1) |raw}}</p>
+            <p>{{trans 'Placed on <span class="no-link">%created_at</span>' created_at=$order.getCreatedAtFormatted(2) |raw}}</p>
         </td>
     </tr>
     <tr class="email-information">

app/code/Magento/Ui/Component/Filters/Type/Date.php

@@ -76,7 +76,7 @@ protected function applyFilter()
                 }
 
                 if (isset($value['to'])) {
-                    $this->applyFilterByType('lteq', $this->wrappedComponent->convertDate($value['to']));
+                    $this->applyFilterByType('lteq', $this->wrappedComponent->convertDate($value['to'], 23, 59, 59));
                 }
             } else {
                 $this->applyFilterByType('eq', $this->wrappedComponent->convertDate($value));

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

@@ -92,13 +92,23 @@ public function getComponentName()
      * Convert given date to default (UTC) timezone
      *
      * @param int $date
+     * @param int $hour
+     * @param int $minute
+     * @param int $second
      * @return \DateTime|null
      */
-    public function convertDate($date)
+    public function convertDate($date, $hour = 0, $minute = 0, $second = 0)
     {
         try {
-            $dateObj = $this->localeDate->date(new \DateTime($date), $this->getLocale(), false);
-            $dateObj->setTime(0, 0, 0);
+            $dateObj = $this->localeDate->date(
+                new \DateTime(
+                    $date,
+                    new \DateTimeZone($this->localeDate->getConfigTimezone())
+                ),
+                $this->getLocale(),
+                true
+            );
+            $dateObj->setTime($hour, $minute, $second);
             //convert store date to default date in UTC timezone without DST
             $dateObj->setTimezone(new \DateTimeZone('UTC'));
             return $dateObj;

app/code/Magento/Ui/Component/Listing/Columns/Date.php

@@ -47,6 +47,9 @@ public function prepareDataSource(array $dataSource)
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$this->getData('name')])) {
                     $date = $this->timezone->date(new \DateTime($item[$this->getData('name')]));
+                    if (isset($this->getConfiguration()['timezone']) && !$this->getConfiguration()['timezone']) {
+                        $date = new \DateTime($item[$this->getData('name')]);
+                    }
                     $item[$this->getData('name')] = $date->format('Y-m-d H:i:s');
                 }
             }

lib/internal/Magento/Framework/Data/Form/Element/Date.php

@@ -41,13 +41,13 @@ public function __construct(
         TimezoneInterface $localeDate,
         $data = []
     ) {
+        $this->localeDate = $localeDate;
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
         $this->setType('text');
         $this->setExtType('textfield');
         if (isset($data['value'])) {
             $this->setValue($data['value']);
         }
-        $this->localeDate = $localeDate;
     }
 
     /**

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -149,7 +149,7 @@ public function date($date = null, $locale = null, $useTimezone = true)
     {
         $locale = $locale ?: $this->_localeResolver->getLocale();
         $timezone = $useTimezone
-            ? $this->_scopeConfig->getValue($this->getDefaultTimezonePath(), $this->_scopeType)
+            ? $this->getConfigTimezone()
             : date_default_timezone_get();
 
         if (empty($date)) {