ACP2E-1197: Order grid date filter issue in customer edit section

Author: lakshmana

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

@@ -6,6 +6,8 @@
 
 namespace Magento\Sales\Plugin\Model\ResourceModel\Order;
 
+use DateTime;
+use DateTimeInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
@@ -44,11 +46,16 @@ public function aroundAddFieldToFilter(
         $field,
         $condition = null
     ) {
-
         if ($field === 'created_at' || $field === 'order_created_at') {
             if (is_array($condition)) {
                 foreach ($condition as $key => $value) {
-                    $condition[$key] = $this->timeZone->convertConfigTimeToUtc($value);
+                    if ($value instanceof DateTimeInterface
+                        && $value->getTimezone()->getName() !== $this->timeZone->getConfigTimezone()) {
+                        $value->setTimezone(new \DateTimeZone($this->timeZone->getConfigTimezone()));
+                    }
+                    if ($this->isValidDate($value)) {
+                        $condition[$key] = $this->timeZone->convertConfigTimeToUtc($value);
+                    }
                 }
             }
 
@@ -61,4 +68,23 @@ public function aroundAddFieldToFilter(
 
         return $proceed($field, $condition);
     }
+
+    /**
+     * Validate date string
+     *
+     * @param string|DateTimeInterface $datetime
+     * @return bool
+     */
+    private function isValidDate($datetime): bool
+    {
+        try {
+            $dt = is_string($datetime) ? new DateTime($datetime) : $datetime;
+            if ($dt instanceof DateTimeInterface) {
+                return true;
+            }
+        } catch (\Exception $e) {
+            return false;
+        }
+        return false;
+    }
 }

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

@@ -11,6 +11,7 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo;
+use Magento\Sales\Model\ResourceModel\Order\Grid\Collection as OrderCollection;
 use Magento\Sales\Model\ResourceModel\Order\Invoice;
 use Magento\Sales\Model\ResourceModel\Order\Shipment;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -130,6 +131,11 @@ public function getCollectionFiltersDataProvider(): array
                 'mainTable' => 'sales_creditmemo_grid',
                 'resourceModel' => Creditmemo::class,
                 'field' => 'order_created_at',
+            ],
+            'customer_orders_grid_collection_for_order_created_at' => [
+                'mainTable' => 'sales_order_grid',
+                'resourceModel' => OrderCollection::class,
+                'field' => 'created_at',
             ]
         ];
     }