Skip to content

Commit d2628bf

Browse files
author
Michael Logvin
committed
MAGETWO-45496: Filtering by date is not working in grids
1 parent eeff57c commit d2628bf

File tree

1 file changed

+8
-1
lines changed
  • app/code/Magento/Backend/Block/Widget/Grid/Column/Filter

1 file changed

+8
-1
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
*/
1414
class Date extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
1515
{
16+
/**
17+
* Value of DATE_TYPE means that date value don't need to convert back to UTC
18+
*/
19+
const DATE_TYPE = 'static';
20+
1621
/**
1722
* @var \Magento\Framework\Math\Random
1823
*/
@@ -210,7 +215,9 @@ protected function _convertDate($date)
210215
$simpleRes = new \DateTime(null, $adminTimeZone);
211216
$simpleRes->setTimestamp($formatter->parse($date));
212217
$simpleRes->setTime(0, 0, 0);
213-
$simpleRes->setTimezone(new \DateTimeZone('UTC'));
218+
if ($this->getColumn()->getData('date_type') !== static::DATE_TYPE) {
219+
$simpleRes->setTimezone(new \DateTimeZone('UTC'));
220+
}
214221
return $simpleRes;
215222
}
216223
}

0 commit comments

Comments
 (0)