MAGETWO-70327: Customer admin grid incorrectly filters by Date of Birth field

Author: slopukhov

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

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

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

@@ -31,6 +31,11 @@ class Date extends AbstractDataType
      */
     protected $wrappedComponent;
 
+    /**
+     * @var TimezoneInterface
+     */
+    protected $localeDate;
+
     /**
      * Constructor
      *
@@ -97,9 +102,13 @@ public function getComponentName()
      * Convert given date to default (UTC) timezone
      *
      * @param int $date
+     * @param int $hour
+     * @param int $minute
+     * @param int $second
+     * @param bool $setUtcTimeZone
      * @return \DateTime|null
      */
-    public function convertDate($date)
+    public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
     {
         try {
             $dateObj = $this->localeDate->date(
@@ -110,8 +119,11 @@ public function convertDate($date)
                 $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 ($setUtcTimeZone) {
+                $dateObj->setTimezone(new \DateTimeZone('UTC'));
+            }
             return $dateObj;
         } catch (\Exception $e) {
             return null;