Skip to content

Commit 044f039

Browse files
author
Roman Ganin
committed
Merge remote-tracking branch 'origin/MAGETWO-37325' into develop
2 parents 9b4e3e8 + ae6e859 commit 044f039

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

app/code/Magento/Reports/Model/Resource/Order/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,8 @@ public function addCreateAtPeriodFilter($period)
900900
$this->addFieldToFilter(
901901
$fieldToFilter,
902902
[
903-
'from' => $from->format(\Magento\Framework\Stdlib\DateTime::DATETIME_INTERNAL_FORMAT),
904-
'to' => $to->format(\Magento\Framework\Stdlib\DateTime::DATETIME_INTERNAL_FORMAT)
903+
'from' => $from->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
904+
'to' => $to->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT)
905905
]
906906
);
907907

dev/tools/performance-toolkit/fixtures/orders.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ public function execute()
190190
$country = 'US';
191191
$zip = '11111';
192192
$phone = '911';
193-
$time = date("Y-m-d h:i:s");
193+
$dateStart = new \DateTime();
194+
$dateStart->setTimezone(new \DateTimeZone('Etc/UTC'));
195+
$time = $dateStart->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
194196

195197
$simpleProductIdLen[0] = strlen($simpleProductId[0]($entityId));
196198
$simpleProductIdLen[1] = strlen($simpleProductId[1]($entityId));

0 commit comments

Comments
 (0)