ACP2E-4239: Date Filter not working according to store timezone on Credit Memos grid

Author: aplapana

app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php

@@ -8,14 +8,12 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\Search\AggregationInterface;
 use Magento\Cms\Model\ResourceModel\Block\Collection as BlockCollection;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Data\Collection\EntityFactoryInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -24,11 +22,6 @@
  */
 class Collection extends BlockCollection implements SearchResultInterface
 {
-    /**
-     * @var TimezoneInterface
-     */
-    private $timeZone;
-
     /**
      * @var AggregationInterface
      */
@@ -54,7 +47,6 @@ class Collection extends BlockCollection implements SearchResultInterface
      * @param string $model
      * @param AdapterInterface|string|null $connection
      * @param AbstractDb $resource
-     * @param TimezoneInterface|null $timeZone
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -71,8 +63,7 @@ public function __construct(
         $resourceModel,
         $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
         $connection = null,
-        ?AbstractDb $resource = null,
-        ?TimezoneInterface $timeZone = null
+        ?AbstractDb $resource = null
     ) {
         $this->resourceModel = $resourceModel;
         $this->model = $model;
@@ -90,7 +81,6 @@ public function __construct(
         $this->_eventObject = $eventObject;
         $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
-        $this->timeZone = $timeZone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
     /**
@@ -102,22 +92,6 @@ public function _resetState(): void
         $this->_init($this->model, $this->resourceModel);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function addFieldToFilter($field, $condition = null)
-    {
-        if ($field === 'creation_time' || $field === 'update_time') {
-            if (is_array($condition)) {
-                foreach ($condition as $key => $value) {
-                    $condition[$key] = $this->timeZone->convertConfigTimeToUtc($value);
-                }
-            }
-        }
-
-        return parent::addFieldToFilter($field, $condition);
-    }
-
     /**
      * Get aggregation interface instance
      *

app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php

@@ -8,13 +8,11 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\Search\AggregationInterface;
 use Magento\Cms\Model\ResourceModel\Page\Collection as PageCollection;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Data\Collection\EntityFactoryInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -24,11 +22,6 @@
  */
 class Collection extends PageCollection implements SearchResultInterface
 {
-    /**
-     * @var TimezoneInterface
-     */
-    private $timeZone;
-
     /**
      * @var AggregationInterface
      */
@@ -54,7 +47,6 @@ class Collection extends PageCollection implements SearchResultInterface
      * @param string $model
      * @param mixed|null $connection
      * @param AbstractDb|null $resource
-     * @param TimezoneInterface|null $timeZone
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -71,8 +63,7 @@ public function __construct(
         $resourceModel,
         $model = \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class,
         $connection = null,
-        ?AbstractDb $resource = null,
-        ?TimezoneInterface $timeZone = null
+        ?AbstractDb $resource = null
     ) {
         $this->resourceModel = $resourceModel;
         $this->model = $model;
@@ -90,7 +81,6 @@ public function __construct(
         $this->_eventObject = $eventObject;
         $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
-        $this->timeZone = $timeZone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
     }
 
     /**
@@ -102,22 +92,6 @@ public function _resetState(): void
         $this->_init($this->model, $this->resourceModel);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function addFieldToFilter($field, $condition = null)
-    {
-        if ($field === 'creation_time' || $field === 'update_time') {
-            if (is_array($condition)) {
-                foreach ($condition as $key => $value) {
-                    $condition[$key] = $this->timeZone->convertConfigTimeToUtc($value);
-                }
-            }
-        }
-
-        return parent::addFieldToFilter($field, $condition);
-    }
-
     /**
      * Get aggregation interface instance
      *