Skip to content

Commit c3efd74

Browse files
committed
ACP2E-4239: Date Filter not working according to store timezone on Credit Memos grid
1 parent 8ba0c79 commit c3efd74

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ public function testAddFieldToFilter($field): void
4747
'resourceModel' => Page::class
4848
]
4949
);
50+
$filterDate = new \DateTime($filterDate);
51+
$filterDate->setTimezone(new \DateTimeZone($timeZone->getConfigTimezone()));
5052
$convertedDate = $timeZone->convertConfigTimeToUtc($filterDate);
5153

52-
$collection = $gridCollection->addFieldToFilter($field, ['qteq' => $filterDate]);
54+
$collection = $gridCollection->addFieldToFilter($field, ['qteq' => $filterDate->format('Y-m-d H:i:s')]);
5355
$expectedSelectCondition = "`{$field}` = '{$convertedDate}'";
5456

5557
$this->assertStringContainsString($expectedSelectCondition, $collection->getSelectSql(true));

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,13 @@ public function testAddFieldToFilter(): void
8181
/** @var Collection $gridCollection */
8282
$gridCollection = Bootstrap::getObjectManager()
8383
->get(Collection::class);
84+
$filterDate = new \DateTime($filterDate);
85+
$filterDate->setTimezone(new \DateTimeZone($timeZone->getConfigTimezone()));
8486
$convertedDate = $timeZone->convertConfigTimeToUtc($filterDate);
85-
$collection = $gridCollection->addFieldToFilter('created_at', ['qteq' => $filterDate]);
87+
$collection = $gridCollection->addFieldToFilter(
88+
'created_at',
89+
['qteq' => $filterDate->format('Y-m-d H:i:s')]
90+
);
8691
$expectedSelect = "WHERE (((`main_table`.`created_at` = '{$convertedDate}')))";
8792

8893
$this->assertStringContainsString($expectedSelect, $collection->getSelectSql(true));

dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Grid/CollectionTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,14 @@ public function testAddFieldToFilter(): void
6969
$timeZone = $this->objectManager->get(TimezoneInterface::class);
7070
/** @var Collection $gridCollection */
7171
$gridCollection = $this->objectManager->get(Collection::class);
72+
$filterDate = new \DateTime($filterDate);
73+
$filterDate->setTimezone(new \DateTimeZone($timeZone->getConfigTimezone()));
7274
$convertedDate = $timeZone->convertConfigTimeToUtc($filterDate);
7375

74-
$collection = $gridCollection->addFieldToFilter('created_at', ['qteq' => $filterDate]);
76+
$collection = $gridCollection->addFieldToFilter(
77+
'created_at',
78+
['qteq' => $filterDate->format('Y-m-d H:i:s')]
79+
);
7580
$expectedSelect = "SELECT `main_table`.* FROM `sales_order_grid` AS `main_table` " .
7681
"WHERE (((`main_table`.`created_at` = '{$convertedDate}')))";
7782

0 commit comments

Comments
 (0)