MAGETWO-57835: [Github] Cannot save customer dob attribute if admin interface locale is en_GB #6323

- add ability for filtering by time

Author: vgoncharenko

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

@@ -79,15 +79,26 @@ protected function applyFilter()
             }
 
             if (is_array($value)) {
+                $dateFrom = null;
+                $dateTo = null;
+
                 if (isset($value['from'])) {
-                    $this->applyFilterByType(
-                        'gteq',
-                        $this->wrappedComponent->convertDate($value['from'], 0, 0, 0, $this->getData('config/skipTime'))
-                    );
+                    $dateFrom = $this->wrappedComponent->convertDate($value['from']);
+                    if ($this->getData('config/skipTime')) {
+                        $dateFrom->setTime(0, 0, 0);
+                    }
+                    $this->applyFilterByType('gteq', $dateFrom);
                 }
 
                 if (isset($value['to'])) {
-                    $this->applyFilterByType('lteq', $this->wrappedComponent->convertDate($value['to'], 23, 59, 59));
+                    $dateTo = $this->wrappedComponent->convertDate($value['to']);
+                    if ($this->getData('config/skipTime')) {
+                        $dateTo->setTime(0, 0, 0);
+                    }
+                    if ($dateFrom == $dateTo) {
+                        $dateTo->setTime(23, 59, 59);
+                    }
+                    $this->applyFilterByType('lteq', $dateTo);
                 }
             } else {
                 $this->applyFilterByType('eq', $this->wrappedComponent->convertDate($value));

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

@@ -97,13 +97,9 @@ public function getComponentName()
      * Convert given date to default (UTC) timezone
      *
      * @param int $date
-     * @param int $hour
-     * @param int $minute
-     * @param int $second
-     * @param bool $skipTime
      * @return \DateTime|null
      */
-    public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $skipTime = false)
+    public function convertDate($date)
     {
         try {
             $dateObj = $this->localeDate->date(
@@ -114,12 +110,8 @@ public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $skipTim
                 $this->getLocale(),
                 true
             );
-            $dateObj->setTime($hour, $minute, $second);
             //convert store date to default date in UTC timezone without DST
             $dateObj->setTimezone(new \DateTimeZone('UTC'));
-            if ($skipTime) {
-                $dateObj->setTime(0, 0, 0);
-            }
             return $dateObj;
         } catch (\Exception $e) {
             return null;