Skip to content

Commit a6e1426

Browse files
committed
ACP2E-2738: fix data conversion impacted by timezone
1 parent 1475eb2 commit a6e1426

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

app/code/Magento/Fedex/Model/Carrier.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ private function processTrackingDetails($trackInfo): array
15671567
}
15681568

15691569
if ($datetime) {
1570-
$result['shippeddate'] = gmdate('Y-m-d', $datetime->getTimestamp());
1570+
$result['shippeddate'] = gmdate('Y-m-d H:i:s', $datetime->getTimestamp());
15711571
}
15721572
}
15731573

@@ -1586,7 +1586,7 @@ private function processTrackingDetails($trackInfo): array
15861586

15871587
$datetime = $this->getDeliveryDateTime($trackInfo);
15881588
if ($datetime) {
1589-
$result['deliverydate'] = gmdate('Y-m-d', $datetime->getTimestamp());
1589+
$result['deliverydate'] = gmdate('Y-m-d H:i:s', $datetime->getTimestamp());
15901590
$result['deliverytime'] = gmdate('H:i:s', $datetime->getTimestamp());
15911591
}
15921592

@@ -1699,7 +1699,7 @@ private function processTrackDetailsEvents(array $events): array
16991699

17001700
$datetime = $this->parseDate(!empty($event['date']) ? $event['date'] : null);
17011701
if ($datetime) {
1702-
$item['deliverydate'] = gmdate('Y-m-d', $datetime->getTimestamp());
1702+
$item['deliverydate'] = gmdate('Y-m-d H:i:s', $datetime->getTimestamp());
17031703
$item['deliverytime'] = gmdate('H:i:s', $datetime->getTimestamp());
17041704
}
17051705

app/code/Magento/Shipping/Block/Tracking/Popup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function formatDeliveryDate($date)
9292
public function formatDeliveryTime($time, $date = null)
9393
{
9494
if (!empty($date)) {
95-
$time = $date . ' ' . $time;
95+
$time = $date;
9696
}
9797

9898
$format = $this->_localeDate->getTimeFormat(\IntlDateFormatter::SHORT);

app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $track = $block->getData('track');
2222
<tbody>
2323
<?php foreach ($track->getProgressdetail() as $detail) : ?>
2424
<?php $detailDate = (!empty($detail['deliverydate']) ?
25-
$parentBlock->formatDeliveryDate($detail['deliverydate'] . ' ' . $detail['deliverytime']) :
25+
$parentBlock->formatDeliveryDate($detail['deliverydate']) :
2626
''); ?>
2727
<?php $detailTime = (!empty($detail['deliverytime']) ?
2828
$parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) :

0 commit comments

Comments
 (0)