Netsyms/data.netsyms.net
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix UPS tracking errors when there's only one status entry (their API sucks)

Browse Source
This commit is contained in:
Skylar Ittner 2021-12-19 19:00:06 -07:00
parent 55f0842b60
commit ba8061f806
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Tracking_UPS.lib.php
View File

@ -93,7 +93,12 @@ class Tracking_UPS {
$info->setCarrierLogo(CarrierAssets::getLogo(Carriers::getCarrierCode($info->getCarrier()))); $info->setCarrierLogo(CarrierAssets::getLogo(Carriers::getCarrierCode($info->getCarrier())));
if (count($trackinfo["Package"]["Activity"]) > 0) { if (count($trackinfo["Package"]["Activity"]) > 0) {
$current = $trackinfo["Package"]["Activity"][0]; // If there's only one entry, it might not be an array
if (isset($trackinfo["Package"]["Activity"][0])) {
$current = $trackinfo["Package"]["Activity"][0];
} else {
$current = $trackinfo["Package"]["Activity"];
}
$current_status = new TrackingEntry( $current_status = new TrackingEntry(
TrackingStatus::UPSEventTypeToStatus($current["Status"]["Type"]), TrackingStatus::UPSEventTypeToStatus($current["Status"]["Type"]),
$current["Status"]["Description"] ?? "Unknown", $current["Status"]["Description"] ?? "Unknown",
@ -131,6 +136,12 @@ class Tracking_UPS {
// //
// $info->setFrom($from); // $info->setFrom($from);
// Only one entry, so put it in itself so the loop works
if (!isset($trackinfo["Package"]["Activity"][0])) {
$trackinfo["Package"]["Activity"] = [
$trackinfo["Package"]["Activity"]
];
}
foreach ($trackinfo["Package"]["Activity"] as $history) { foreach ($trackinfo["Package"]["Activity"] as $history) {
$location = new Location(); $location = new Location();
$location->city = $history["ActivityLocation"]["Address"]["City"] ?? ""; $location->city = $history["ActivityLocation"]["Address"]["City"] ?? "";