File tree Expand file tree Collapse file tree 1 file changed +8
-1
lines changed
app/code/Magento/Backend/Block/Widget/Grid/Column/Filter Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change 13
13
*/
14
14
class Date extends \Magento \Backend \Block \Widget \Grid \Column \Filter \AbstractFilter
15
15
{
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
+
16
21
/**
17
22
* @var \Magento\Framework\Math\Random
18
23
*/
@@ -210,7 +215,9 @@ protected function _convertDate($date)
210
215
$ simpleRes = new \DateTime (null , $ adminTimeZone );
211
216
$ simpleRes ->setTimestamp ($ formatter ->parse ($ date ));
212
217
$ 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
+ }
214
221
return $ simpleRes ;
215
222
}
216
223
}
You can’t perform that action at this time.
0 commit comments