Skip to content

Commit f5db9bf

Browse files
committed
MAGETWO-63215: FedEx Shipment Tracking fails for valid tracking number
- Refactored code according to review comments
1 parent 0db3e20 commit f5db9bf

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,8 @@ private function processTrackingDetails(\stdClass $trackInfo)
15701570
'progressdetail' => [],
15711571
];
15721572

1573-
if (!empty($trackInfo->ShipTimestamp) && ($datetime = $this->parseDate($trackInfo->ShipTimestamp)) !== false) {
1573+
$datetime = $this->parseDate(!empty($trackInfo->ShipTimestamp) ? $trackInfo->ShipTimestamp : null);
1574+
if ($datetime) {
15741575
$result['shippeddate'] = gmdate('Y-m-d', $datetime->getTimestamp());
15751576
}
15761577

@@ -1684,7 +1685,8 @@ private function processTrackDetailsEvents(array $events)
16841685
'deliverylocation' => null
16851686
];
16861687

1687-
if (!empty($event->Timestamp) && ($datetime = $this->parseDate($event->Timestamp)) !== false) {
1688+
$datetime = $this->parseDate(!empty($event->Timestamp) ? $event->Timestamp : null);
1689+
if ($datetime) {
16881690
$item['deliverydate'] = gmdate('Y-m-d', $datetime->getTimestamp());
16891691
$item['deliverytime'] = gmdate('H:i:s', $datetime->getTimestamp());
16901692
}
@@ -1725,6 +1727,9 @@ private function appendTrackingError($trackingValue, $errorMessage)
17251727
*/
17261728
private function parseDate($timestamp)
17271729
{
1730+
if ($timestamp === null) {
1731+
return false;
1732+
}
17281733
$formats = [\DateTime::ATOM, 'Y-m-d\TH:i:s'];
17291734
$tz = date_default_timezone_get();
17301735

0 commit comments

Comments
 (0)