ACP2E-56 : [On Prem] Magento invoice order date filter not working

Author: pradeep1819

app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFilter.php

@@ -18,7 +18,7 @@ class CollectionFilter extends SearchResult
     /**
      * @var TimezoneInterface
      */
-    private $timeZone;
+    private TimezoneInterface $timeZone;
 
     /**
      * Initialize dependencies.

app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/CollectionFilter.php

@@ -22,7 +22,7 @@ class CollectionFilter extends SearchResult
     /**
      * @var TimezoneInterface
      */
-    private $timeZone;
+    private TimezoneInterface $timeZone;
 
     /**
      * Initialize dependencies.
@@ -55,9 +55,10 @@ public function _initSelect()
     {
         parent::_initSelect();
 
-        $tableDescription = $this->getConnection()->describeTable($this->getMainTable());
-        if ($tableDescription) {
-            foreach ($tableDescription as $columnInfo) {
+        $invoiceTableDescription = $this->getConnection()->describeTable($this->getMainTable());
+
+        if ($invoiceTableDescription) {
+            foreach ($invoiceTableDescription as $columnInfo) {
                 $this->addFilterToMap($columnInfo['COLUMN_NAME'], 'main_table.'.$columnInfo['COLUMN_NAME']);
             }
         }
@@ -68,16 +69,16 @@ public function _initSelect()
     /**
      * @inheritDoc
      */
-    public function addFieldToFilter($field, $condition = null)
+    public function addFieldToFilter($column, $condition = null)
     {
-        if ($field === 'created_at' || $field === 'order_created_at') {
+        if ($column === 'created_at' || $column === 'order_created_at') {
             if (is_array($condition)) {
                 foreach ($condition as $key => $value) {
                     $condition[$key] = $this->timeZone->convertConfigTimeToUtc($value);
                 }
             }
         }
 
-        return parent::addFieldToFilter($field, $condition);
+        return parent::addFieldToFilter($column, $condition);
     }
 }

dev/tests/integration/testsuite/Magento/Cms/Model/ResourceModel/Block/Grid/CollectionTest.php

@@ -51,7 +51,7 @@ public function testAddFieldToFilter($field): void
 
         $collection = $gridCollection->addFieldToFilter($field, ['qteq' => $filterDate]);
         $expectedSelect = "SELECT `main_table`.* FROM `cms_block` AS `main_table` " .
-            "WHERE ((((`{$field}` = '{$convertedDate}')))) AND (main_table.created_in <= 1) AND (main_table.updated_in > 1)";
+            "WHERE (((`{$field}` = '{$convertedDate}')))";
 
         $this->assertEquals($expectedSelect, $collection->getSelectSql(true));
     }

dev/tests/integration/testsuite/Magento/Cms/Model/ResourceModel/Page/Grid/CollectionTest.php

@@ -51,7 +51,7 @@ public function testAddFieldToFilter($field): void
 
         $collection = $gridCollection->addFieldToFilter($field, ['qteq' => $filterDate]);
         $expectedSelect = "SELECT `main_table`.* FROM `cms_page` AS `main_table` " .
-            "WHERE ((((`{$field}` = '{$convertedDate}')))) AND (main_table.created_in <= 1) AND (main_table.updated_in > 1)";
+            "WHERE (((`{$field}` = '{$convertedDate}')))";
 
         $this->assertEquals($expectedSelect, $collection->getSelectSql(true));
     }