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

Author: pradeep1819

app/code/Magento/Sales/Plugin/Model/ResourceModel/Order/OrderGridCollectionFilter.php

@@ -44,11 +44,6 @@ public function aroundAddFieldToFilter(
         $field,
         $condition = null
     ) {
-        $fieldMap  = $this->getFilterFieldsMap();
-        $fieldName = $fieldMap['fields'][$field] ?? null;
-        if (!$fieldName) {
-            return $proceed($field, $condition);
-        }
 
         if ($field === 'created_at' || $field === 'order_created_at') {
             if (is_array($condition)) {
@@ -64,21 +59,6 @@ public function aroundAddFieldToFilter(
             return $subject;
         }
 
-        return $proceed();
-    }
-
-    /**
-     * Map the columns needs to filter out
-     *
-     * @return \string[][]
-     */
-    private function getFilterFieldsMap(): array
-    {
-        return [
-            'fields' => [
-                'created_at'       => 'main_table.created_at',
-                'order_created_at' => 'main_table.order_created_at',
-            ],
-        ];
+        return $proceed($field, $condition);
     }
 }

dev/tests/integration/testsuite/Magento/Sales/Plugin/Model/ResourceModel/Order/OrderGridCollectionFilterTest.php

@@ -51,7 +51,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->timeZone = $this->objectManager->get(TimezoneInterface::class);
         $this->proceed = function () {
-           $this->proceed;
+            $this->proceed;
         };
         $this->plugin = $this->objectManager->create(
             OrderGridCollectionFilter::class,
@@ -82,7 +82,12 @@ public function testAroundAddFieldToFilter($mainTable, $resourceModel, $field):
                 'resourceModel' => $resourceModel
             ]
         );
-        $result = $this->plugin->aroundAddFieldToFilter($this->searchResult, $this->proceed, $field, ['qteq' => $filterDate]);
+        $result = $this->plugin->aroundAddFieldToFilter(
+            $this->searchResult,
+            $this->proceed,
+            $field,
+            ['qteq' => $filterDate]
+        );
 
         $expectedSelect = "SELECT `main_table`.* FROM `{$mainTable}` AS `main_table` " .
             "WHERE (((`{$field}` = '{$convertedDate}')))";
@@ -93,21 +98,6 @@ public function testAroundAddFieldToFilter($mainTable, $resourceModel, $field):
     /**
      * @return array
      */
-    public function getCollectionFiltersDataProvider2(): array
-    {
-        return [
-            'shipment_grid_collection_for_created_at' => [
-                'mainTable' => 'sales_shipment_grid',
-                'resourceModel' => Shipment::class,
-                'field' => 'created_at',
-            ],
-            'shipment_grid_collection_for_order_created_at' => [
-                'mainTable' => 'sales_shipment_grid',
-                'resourceModel' => Shipment::class,
-                'field' => 'order_created_at',
-            ]
-        ];
-    }
     public function getCollectionFiltersDataProvider(): array
     {
         return [