File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed
app/code/Magento/Fedex/Model Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -1570,7 +1570,8 @@ private function processTrackingDetails(\stdClass $trackInfo)
1570
1570
'progressdetail ' => [],
1571
1571
];
1572
1572
1573
- if (!empty ($ trackInfo ->ShipTimestamp ) && ($ datetime = $ this ->parseDate ($ trackInfo ->ShipTimestamp )) !== false ) {
1573
+ $ datetime = $ this ->parseDate (!empty ($ trackInfo ->ShipTimestamp ) ? $ trackInfo ->ShipTimestamp : null );
1574
+ if ($ datetime ) {
1574
1575
$ result ['shippeddate ' ] = gmdate ('Y-m-d ' , $ datetime ->getTimestamp ());
1575
1576
}
1576
1577
@@ -1684,7 +1685,8 @@ private function processTrackDetailsEvents(array $events)
1684
1685
'deliverylocation ' => null
1685
1686
];
1686
1687
1687
- if (!empty ($ event ->Timestamp ) && ($ datetime = $ this ->parseDate ($ event ->Timestamp )) !== false ) {
1688
+ $ datetime = $ this ->parseDate (!empty ($ event ->Timestamp ) ? $ event ->Timestamp : null );
1689
+ if ($ datetime ) {
1688
1690
$ item ['deliverydate ' ] = gmdate ('Y-m-d ' , $ datetime ->getTimestamp ());
1689
1691
$ item ['deliverytime ' ] = gmdate ('H:i:s ' , $ datetime ->getTimestamp ());
1690
1692
}
@@ -1725,6 +1727,9 @@ private function appendTrackingError($trackingValue, $errorMessage)
1725
1727
*/
1726
1728
private function parseDate ($ timestamp )
1727
1729
{
1730
+ if ($ timestamp === null ) {
1731
+ return false ;
1732
+ }
1728
1733
$ formats = [\DateTime::ATOM , 'Y-m-d\TH:i:s ' ];
1729
1734
$ tz = date_default_timezone_get ();
1730
1735
You can’t perform that action at this time.
0 commit comments