diff --git a/env.sample.php b/env.sample.php index 03488e2..541337e 100644 --- a/env.sample.php +++ b/env.sample.php @@ -50,4 +50,5 @@ $SETTINGS = [ "ups_user_account" => "", "ups_password" => "", "shippo_key" => "", + "easypost_key" => "", ]; \ No newline at end of file diff --git a/lib/CarrierAssets.lib.php b/lib/CarrierAssets.lib.php new file mode 100644 index 0000000..f9fa836 --- /dev/null +++ b/lib/CarrierAssets.lib.php @@ -0,0 +1,49 @@ + "ups", "name" => "UPS" ], + "upsdap" => [ + "code" => "ups", + "name" => "UPS" + ], "ups_mi_datamatrix" => [ "code" => "usps", "name" => "USPS" diff --git a/lib/Tracking.lib.php b/lib/Tracking.lib.php index d7b1887..c84dd6e 100644 --- a/lib/Tracking.lib.php +++ b/lib/Tracking.lib.php @@ -30,7 +30,8 @@ class Tracking { case "ups": return Tracking_UPS::track($barcode->getSanitized()); default: - return Tracking_Shippo::track($barcode->getSanitized()); + return Tracking_EasyPost::track($barcode->getSanitized()); + //return Tracking_Shippo::track($barcode->getSanitized()); } } diff --git a/lib/TrackingStatus.lib.php b/lib/TrackingStatus.lib.php index 0d3a903..2208ff2 100644 --- a/lib/TrackingStatus.lib.php +++ b/lib/TrackingStatus.lib.php @@ -22,14 +22,19 @@ class TrackingStatus { case "TRANSIT": case "IN_TRANSIT": case "ACCEPTED": + case "OUT_FOR_DELIVERY": return TrackingStatus::TRACKING_STATUS_TRANSIT; case "DELIVERED": + case "AVAILABLE_FOR_PICKUP": return TrackingStatus::TRACKING_STATUS_DELIVERED; case "RETURNED": + case "RETURN_TO_SENDER": return TrackingStatus::TRACKING_STATUS_RETURNED; case "FAILURE": case "DELIVERY ATTEMPT": case "ALERT": + case "ERROR": + case "CANCELLED": return TrackingStatus::TRACKING_STATUS_FAILURE; default: return TrackingStatus::TRACKING_STATUS_UNKNOWN; diff --git a/lib/Tracking_EasyPost.lib.php b/lib/Tracking_EasyPost.lib.php new file mode 100644 index 0000000..f847ff9 --- /dev/null +++ b/lib/Tracking_EasyPost.lib.php @@ -0,0 +1,101 @@ + $code + )); + } else { + $trackinginfo["carrier"] = $carrier; + $tracker = \EasyPost\Tracker::create(array( + "tracking_code" => $code, + "carrier" => $carrier + )); + } + } catch (Exception $ex) { + throw new TrackingException("There was a server problem. This code cannot be tracked right now."); + } + + $info = new TrackingInfo(); + + $info->setCode($tracker->tracking_code); + $info->setCarrier(strtolower($tracker->carrier)); + $info->setCarrierAttributionText(CarrierAssets::getAttribution(Carriers::getCarrierCode($info->getCarrier()))); + $info->setCarrierLogo(CarrierAssets::getLogo(Carriers::getCarrierCode($info->getCarrier()))); + + if (!empty($tracker->tracking_details) && count($tracker->tracking_details) > 0) { + + $events_sorted = $tracker->tracking_details; + + // start https://stackoverflow.com/a/2910637 + function date_compare($a, $b) { + $t1 = strtotime($a->datetime); + $t2 = strtotime($b->datetime); + return $t2 - $t1; + } + usort($events_sorted, 'date_compare'); + // end https://stackoverflow.com/a/2910637 + + foreach ($events_sorted as $history) { + $location = new Location(); + $location->city = $history->tracking_location["city"]; + $location->state = $history->tracking_location["state"]; + $location->zip = $history->tracking_location["zip"]; + $location->country = $history->tracking_location["country"]; + $info->appendHistoryEntry(new TrackingEntry(TrackingStatus::stringToStatus($history->status), $history->message, $history->datetime, $location)); + } + + $current_status = new TrackingEntry( + TrackingStatus::stringToStatus( + $events_sorted[0]->status), + $events_sorted[0]->message, + $events_sorted[0]->datetime + ); + if (!empty($events_sorted[0]->tracking_location)) { + $current_location = new Location(); + $current_location->city = $events_sorted[0]->tracking_location->city; + $current_location->state = $events_sorted[0]->tracking_location->state; + $current_location->zip = $events_sorted[0]->tracking_location->zip; + $current_location->country = $events_sorted[0]->tracking_location->country; + $current_status->setLocation($current_location); + } + $info->setCurrentStatus($current_status); + } + + if (!empty($tracker->carrier_detail->origin_tracking_location)) { + $from = new Location(); + $from->city = $tracker->carrier_detail->origin_tracking_location->city ?? ""; + $from->state = $tracker->carrier_detail->origin_tracking_location->state ?? ""; + $from->zip = $tracker->carrier_detail->origin_tracking_location->zip ?? ""; + $from->country = $tracker->carrier_detail->origin_tracking_location->country ?? ""; + + $info->setFrom($from); + } + + if (!empty($tracker->carrier_detail->destination_tracking_location)) { + $to = new Location(); + $to->city = $tracker->carrier_detail->destination_tracking_location->city ?? ""; + $to->state = $tracker->carrier_detail->destination_tracking_location->state ?? ""; + $to->zip = $tracker->carrier_detail->destination_tracking_location->zip ?? ""; + $to->country = $tracker->carrier_detail->destination_tracking_location->country ?? ""; + + $info->setTo($to); + } + + return $info; + } + +} diff --git a/lib/Tracking_HelenaExpress.lib.php b/lib/Tracking_HelenaExpress.lib.php index 9d7b602..22e9808 100644 --- a/lib/Tracking_HelenaExpress.lib.php +++ b/lib/Tracking_HelenaExpress.lib.php @@ -14,9 +14,8 @@ class Tracking_HelenaExpress { $barcode = new TrackingBarcode($code); - try { - $status = json_decode(file_get_contents("https://helena.express/tracker/api.php?code=" . $barcode->getCode())); + $status = json_decode(file_get_contents("https://helena.express/apis/track/?code=" . $barcode->getCode())); } catch (Exception $ex) { throw new TrackingException("There was a server problem. This code cannot be tracked right now."); } @@ -30,6 +29,8 @@ class Tracking_HelenaExpress { $info->setCode($barcode->getCode()); $info->setCarrier($status->info->carrier); $info->setService(new Service("", "Local Courier")); + $info->setCarrierAttributionText(CarrierAssets::getAttribution(Carriers::getCarrierCode($info->getCarrier()))); + $info->setCarrierLogo(CarrierAssets::getLogo(Carriers::getCarrierCode($info->getCarrier()))); if (!empty($status->events)) { $current_status = new TrackingEntry( diff --git a/lib/Tracking_Shippo.lib.php b/lib/Tracking_Shippo.lib.php index 6809fd0..09711bb 100644 --- a/lib/Tracking_Shippo.lib.php +++ b/lib/Tracking_Shippo.lib.php @@ -31,6 +31,8 @@ class Tracking_Shippo { $info->setCode($barcode->getCode()); $info->setCarrier($barcode->getCarrier()); $info->setService(new Service($status->servicelevel->token, $status->servicelevel->name)); + $info->setCarrierAttributionText(CarrierAssets::getAttribution(Carriers::getCarrierCode($info->getCarrier()))); + $info->setCarrierLogo(CarrierAssets::getLogo(Carriers::getCarrierCode($info->getCarrier()))); if (!empty($status->tracking_status)) { $current_status = new TrackingEntry( diff --git a/lib/Tracking_UPS.lib.php b/lib/Tracking_UPS.lib.php index 33cf86e..b461157 100644 --- a/lib/Tracking_UPS.lib.php +++ b/lib/Tracking_UPS.lib.php @@ -89,10 +89,8 @@ class Tracking_UPS { $info->setCarrier("ups"); $info->setService(new Service($trackinfo["Service"]["Code"], $trackinfo["Service"]["Description"])); - $info->setCarrierLogo("data:image/svg+xml;base64,PHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDEyLjYzNSAxNS4zNjggMjI3LjMwNSAyNzkuNDQzIiBoZWlnaHQ9IjI3OS40NDMiIHZpZXdCb3g9IjEyLjYzNSAxNS4zNjggMjI3LjMwNSAyNzkuNDQzIiB3aWR0aD0iMjI3LjMwNSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+PGNsaXBQYXRoIGlkPSJhIj48cGF0aCBkPSJtMjM5LjkzOCA0MC4yNzFjLTIzLjg1NC0xMy4xNzYtNTAuOTE2LTE5LjM5My03Mi42NDktMjIuMzE5LTIzLjczMS0zLjE4OC00MS4xMDEtMi40Ni00MS4wMTUtMi41ODQuMDUyLjA2Ni00LjU4Mi0uMDk4LTEyLjM1LjE2Ny03LjkyNC4yNzYtMTkuMTE0Ljk5Ni0zMS45MzggMi44NzYtMTAuMTEzIDEuNDg2LTIxLjIzNiAzLjY4OS0zMi41NzYgNi45NTEtMTIuMzUyIDMuNTU5LTI0Ljk1MiA4LjM4MS0zNi43NzUgMTQuOTA5djI3LjQ5NiAxMC40NzggMjAuMDgyIDc2LjYzNmMuMDA3IDI3LjI3MSA5LjM5NyA1MS4yMzUgMjkuOTQ5IDY4LjMxNyA0LjY1OCAzLjkzOCAxMS44MDcgOC40MzcgMjAuMDE2IDEzLjAwNCA2Ljk2MiAzLjg2NSAxNC42OSA3Ljc4MyAyMi4yODQgMTEuNDY2IDguOTU3IDQuMzMzIDE3LjczNSA4LjMxNSAyNC44ODQgMTEuNDc2IDkuODExIDQuMzM0IDE2LjU2IDcuMTA2IDE2LjUwNSA3LjA1My0uMDgyLjA3MiAxNC45MzItNi4xMDQgMzIuNjgzLTE0LjM4OSAxOC44OTctOC44MjggNDAuODgyLTIwLjAyNyA1MS4wMjEtMjguNjA3IDIwLjU2Mi0xNy4wODEgMjkuOTYzLTQxLjA0OSAyOS45NjMtNjguMzI2IDAtMjUuNTM1IDAtNTEuMDgzIDAtNzYuNjI3IDAtNy41MjkgMC0xMy4zODcgMC0yMC45MTUgMC0yLjY1OSAwLTYuOTg1IDAtOS42NDUtLjAwMi05LjE2OC0uMDAyLTE4LjMzNS0uMDAyLTI3LjQ5OSIvPjwvY2xpcFBhdGg+PGNsaXBQYXRoIGlkPSJiIj48cGF0aCBkPSJtMjMxLjAyMyA0Mi4wMjhjLTMzLjI1LTMuNDk3LTY5Ljg5Mi00LjQxNC0xMDYuMzYyIDIuODU1LTEwLjU4NSAyLjEyOC0yMS4xNTcgNC45MzgtMzEuNTg5IDguNTkxLTExLjE0NyAzLjkwOC0yMi4xMjYgOC43NjgtMzIuNzg0IDE0Ljc2OC0xMy42MjcgNy42NzUtMjYuNzEzIDE3LjIxNC0zOC45MjUgMjguOTc4LS4wMDIgMi41MTctLjAwOSA1LjAzMy0uMDE2IDcuNTQ3LS4wMTggMTIuMDc0LS4wMjkgMjQuMTU5LS4wMzQgMzYuMjQ1LS4wMDkgMTEuMzQyIDAgMjIuNjkuMDA5IDM0LjAzOS4wMTggMjUuMzAyIDkuMTEgNDYuNTg5IDI2Ljg5NyA2MS4zNjYgMTAuOTM4IDUuNjYxIDIxLjg3OCAxMS4zMjYgMzIuODIyIDE2Ljk5MSA4LjM1NSA0LjMzMyAxNi43MTYgOC42NTUgMjUuMDc0IDEyLjk4NyA2LjcyMSAzLjQ3NyAxMy40NDEgNi45NTMgMjAuMTYyIDEwLjQ0IDEzLjM5Ni01LjU4NCA2Mi4yMTEtMjcuMDI0IDc4LjA2Ny00MC40MjEgMTcuNzkxLTE0Ljc3NyAyNi44NzItMzYuMDY0IDI2Ljg5Mi02MS4zNjYuMDI3LTI0LjM4Ny4wMTUtNDguNzg4LS4wMjYtNzMuMTUtLjAzNi0xNi41NTEtLjA4MS0zMy4wODYtLjE0Ni00OS41NjktLjAxNy0zLjQzMi0uMDI2LTYuODY4LS4wNDEtMTAuMzAxIi8+PC9jbGlwUGF0aD48Y2xpcFBhdGggaWQ9ImMiPjxwYXRoIGQ9Im0yMDMuODYzIDE3MS40NTVjLS4xMzctNi4zNzktMy42MzctOS44MjYtMTIuNDQ2LTE1LjA1Ni0xNi41OS05Ljg0LTE5LjY1MS0xNy45OS0xOS42OTgtMjguODYyLS4xLTE2LjQ5MiAxMy44MTUtMjYuMDE5IDI2LjkyOC0yNi4yNjYgMTAuOTctLjIxIDE4LjMwMyA0LjA1NiAyMS43NTggNi44MDcuMDE5IDUuODM5LjAzMSAxMS42ODkuMDM1IDE3LjUzNS00LjA4OC00LjM0Ni0xMC43MjktOC4zMjgtMTcuNy04LjQ1Mi01LjY1NS0uMTA2LTExLjU2NCAyLjM4OC0xMS43NDUgOS42MjUtLjE2MyA3LjM5MSA1Ljc3MSAxMC4zNDEgMTMuMTY1IDE0Ljc5NCAxNi41OTkgMTAuMDE0IDE5LjYxIDE4Ljg1OCAxOS4yOTEgMzAuNjI0LS40MjcgMTIuODk1LTguOTk5IDI3LjA4LTI4Ljc3OCAyNy4yOTctNy45MjUuMDgxLTE1Ljc5NS0yLjM2Ny0yMi4xMTktNi4xMDcuMDI2LTYuMjQ4LjA0Ny0xMi41MDYuMDU1LTE4Ljc4NSA1LjE3OSA0LjY1MiAxMi44ODEgOC4yMDMgMTkuMjcyIDguMjAzIDcuMzM0LS4wMDIgMTIuMTQtNC4zMDkgMTEuOTgyLTExLjM1N20tODIuMzU1LTUyLjcwM2MxLjY1My0uODAyIDQuNDg2LTEuNDYxIDcuMjQyLTEuNDYxIDExLjg3NyAwIDE2LjgxMSA5LjQ3OSAxNi44MjkgMzIuNDM1LS4wMTEgMjIuMzgxLTUuNjUyIDMzLjE3LTE3LjQzNSAzMy4xNy0yLjc1MiAwLTUuMTY2LS42ODgtNi42MzktMS4yMzgtLjAwMi0yMC45MjUgMC00MS45ODQuMDAzLTYyLjkwNnptLjA0IDEyMS45OTNjLS4wMDktMTMuOTc5LS4wMjQtMjguMTQzLS4wMjYtNDIuNDA5IDIuMDI3LjU5NyA1LjAyIDEuMTQgOS4yMDcgMS4xMzQgMjIuNjQ1LS4wMjEgMzUuNjk0LTIwLjQxIDM1LjY5NC01MC4yODctLjAxNC0yOS43OTUtMTMuNDMyLTQ4LjI3Mi0zNy44MjMtNDguMjg4LTExLjExOCAwLTIwLjExNiAyLjQ3Mi0yNy40OTMgNy4yODMtLjEwMiA0NC4yMDMtLjA0MSA4OS4yNDYuMTc2IDEzMi41MDggNi43NS4wMzggMTMuNTA5LjA1NCAyMC4yNjUuMDU5em0tNjAuMDAzLTU4LjQzYzQuMDg2LjAyNiA3LjM0Ni0uODk1IDkuNTI4LTIuNDAyLS4wNzItMjUuNTYyLS4wNS01MS4yODIuMDc1LTc2Ljc0NyA2LjcxMS0uMDU3IDEzLjQ1OC0uMTAzIDIwLjIyMi0uMTMxLS4wOTkgMjkuMzYzLS4xMDYgNTkuMTE2LS4wMTggODguNTQyLTcuNzYyIDUuMjctMTguMTQ2IDguMDY4LTMwLjQzIDcuOTU1LTE5LjgzNi0uMjAyLTI5LjU2Ny0xMS4xODItMjkuNjA1LTMyLjUyMiAwLTIxLjE0NS4wMDItNDIuMzE5LjAwMi02My40MTkgNi41MzUtLjA5MyAxMy4xNDMtLjE2NSAxOS43OTEtLjIzOS0uMTAyIDIxLjQ2OS0uMTM4IDQzLjA4Ni0uMTAyIDY0LjY0OC4wMTcgNS43MjggMS4zNzIgMTQuMjUzIDEwLjUzNyAxNC4zMTV6Ii8+PC9jbGlwUGF0aD48cGF0aCBjbGlwLXBhdGg9InVybCgjYSkiIGQ9Im05IDEzaDIzNS41djI3M2gtMjM1LjV6IiBmaWxsPSIjZmViMzAyIi8+PHBhdGggY2xpcC1wYXRoPSJ1cmwoI2IpIiBkPSJtMjAgMzYuNWgyMTV2MjQyLjVoLTIxNXoiIGZpbGw9IiMzNTFjMTUiLz48ZyBmaWxsPSIjZmViMzAyIj48cGF0aCBjbGlwLXBhdGg9InVybCgjYykiIGQ9Im0yMDMuODYzIDE3MS40NTVjLS4xMzctNi4zNzktMy42MzctOS44MjYtMTIuNDQ2LTE1LjA1Ni0xNi41OS05Ljg0LTE5LjY1MS0xNy45OS0xOS42OTgtMjguODYyLS4xLTE2LjQ5MiAxMy44MTUtMjYuMDE5IDI2LjkyOC0yNi4yNjYgMTAuOTctLjIxIDE4LjMwMyA0LjA1NiAyMS43NTggNi44MDcuMDE5IDUuODM5LjAzMSAxMS42ODkuMDM1IDE3LjUzNS00LjA4OC00LjM0Ni0xMC43MjktOC4zMjgtMTcuNy04LjQ1Mi01LjY1NS0uMTA2LTExLjU2NCAyLjM4OC0xMS43NDUgOS42MjUtLjE2MyA3LjM5MSA1Ljc3MSAxMC4zNDEgMTMuMTY1IDE0Ljc5NCAxNi41OTkgMTAuMDE0IDE5LjYxIDE4Ljg1OCAxOS4yOTEgMzAuNjI0LS40MjcgMTIuODk1LTguOTk5IDI3LjA4LTI4Ljc3OCAyNy4yOTctNy45MjUuMDgxLTE1Ljc5NS0yLjM2Ny0yMi4xMTktNi4xMDcuMDI2LTYuMjQ4LjA0Ny0xMi41MDYuMDU1LTE4Ljc4NSA1LjE3OSA0LjY1MiAxMi44ODEgOC4yMDMgMTkuMjcyIDguMjAzIDcuMzM0LS4wMDIgMTIuMTQtNC4zMDkgMTEuOTgyLTExLjM1N20tODIuMzU1LTUyLjcwM2MxLjY1My0uODAyIDQuNDg2LTEuNDYxIDcuMjQyLTEuNDYxIDExLjg3NyAwIDE2LjgxMSA5LjQ3OSAxNi44MjkgMzIuNDM1LS4wMTEgMjIuMzgxLTUuNjUyIDMzLjE3LTE3LjQzNSAzMy4xNy0yLjc1MiAwLTUuMTY2LS42ODgtNi42MzktMS4yMzgtLjAwMi0yMC45MjUgMC00MS45ODQuMDAzLTYyLjkwNnptLjA0IDEyMS45OTNjLS4wMDktMTMuOTc5LS4wMjQtMjguMTQzLS4wMjYtNDIuNDA5IDIuMDI3LjU5NyA1LjAyIDEuMTQgOS4yMDcgMS4xMzQgMjIuNjQ1LS4wMjEgMzUuNjk0LTIwLjQxIDM1LjY5NC01MC4yODctLjAxNC0yOS43OTUtMTMuNDMyLTQ4LjI3Mi0zNy44MjMtNDguMjg4LTExLjExOCAwLTIwLjExNiAyLjQ3Mi0yNy40OTMgNy4yODMtLjEwMiA0NC4yMDMtLjA0MSA4OS4yNDYuMTc2IDEzMi41MDggNi43NS4wMzggMTMuNTA5LjA1NCAyMC4yNjUuMDU5em0tNjAuMDAzLTU4LjQzYzQuMDg2LjAyNiA3LjM0Ni0uODk1IDkuNTI4LTIuNDAyLS4wNzItMjUuNTYyLS4wNS01MS4yODIuMDc1LTc2Ljc0NyA2LjcxMS0uMDU3IDEzLjQ1OC0uMTAzIDIwLjIyMi0uMTMxLS4wOTkgMjkuMzYzLS4xMDYgNTkuMTE2LS4wMTggODguNTQyLTcuNzYyIDUuMjctMTguMTQ2IDguMDY4LTMwLjQzIDcuOTU1LTE5LjgzNi0uMjAyLTI5LjU2Ny0xMS4xODItMjkuNjA1LTMyLjUyMiAwLTIxLjE0NS4wMDItNDIuMzE5LjAwMi02My40MTkgNi41MzUtLjA5MyAxMy4xNDMtLjE2NSAxOS43OTEtLjIzOS0uMTAyIDIxLjQ2OS0uMTM4IDQzLjA4Ni0uMTAyIDY0LjY0OC4wMTcgNS43MjggMS4zNzIgMTQuMjUzIDEwLjUzNyAxNC4zMTV6Ii8+PHBhdGggZD0ibTIwNi44MjYgMjgyLjg1OGMwIDYuNjk3LTUuMjU4IDExLjk1My0xMi4wOTggMTEuOTUzLTYuNzcgMC0xMi4xNy01LjI1Ni0xMi4xNy0xMS45NTMgMC02LjU1MyA1LjQtMTEuODEgMTIuMTctMTEuODEgNi44NC4wMDEgMTIuMDk4IDUuMjU4IDEyLjA5OCAxMS44MXptLTIxLjI0MiAwYzAgNS4yNTcgMy44ODkgOS40MzQgOS4yMTcgOS40MzQgNS4xODYgMCA5LjAwMS00LjE3NyA5LjAwMS05LjM2MSAwLTUuMjU2LTMuODE1LTkuNTA1LTkuMDczLTkuNTA1LTUuMjU2LS4wMDEtOS4xNDUgNC4yNDgtOS4xNDUgOS40MzJ6bTcuMjcxIDYuMTkzaC0yLjczNXYtMTEuODFjMS4wOC0uMjE3IDIuNTkzLS4zNiA0LjUzNi0uMzYgMi4yMzIgMCAzLjI0LjM2IDQuMTA0Ljg2NC42NDguNTA1IDEuMTUyIDEuNDM5IDEuMTUyIDIuNTkzIDAgMS4yOTYtMS4wMDggMi4zMDQtMi40NDggMi43MzZ2LjE0NGMxLjE1Mi40MzQgMS44IDEuMjk3IDIuMTYgMi44ODEuMzYgMS44MDEuNTc2IDIuNTIxLjg2NCAyLjk1MmgtMi45NTJjLS4zNi0uNDMzLS41NzYtMS41MTMtLjkzNy0yLjg4MS0uMjE3LTEuMjk2LS45MzctMS44NzItMi40NDktMS44NzJoLTEuMjk1em0uMDc1LTYuNjk3aDEuMjk1YzEuNTEyIDAgMi43MzYtLjUwNCAyLjczNi0xLjcyOSAwLTEuMDgtLjc5Mi0xLjc5OS0yLjUyMS0xLjc5OS0uNzE5IDAtMS4yMjQuMDcxLTEuNTEyLjE0M3YzLjM4NmguMDAyeiIvPjwvZz48L3N2Zz4="); - $info->setCarrierAttributionText("UPS, the UPS brand mark, and the Color Brown are " - . "trademarks of United Parcel Service of America, Inc. All Rights Reserved."); - + $info->setCarrierAttributionText(CarrierAssets::getAttribution(Carriers::getCarrierCode($info->getCarrier()))); + $info->setCarrierLogo(CarrierAssets::getLogo(Carriers::getCarrierCode($info->getCarrier()))); if (count($trackinfo["Package"]["Activity"]) > 0) { $current = $trackinfo["Package"]["Activity"][0]; diff --git a/lib/Tracking_USPS.lib.php b/lib/Tracking_USPS.lib.php index eea0815..cf26e89 100644 --- a/lib/Tracking_USPS.lib.php +++ b/lib/Tracking_USPS.lib.php @@ -51,8 +51,8 @@ class Tracking_USPS { $info->setCarrier("usps"); $info->setService(new Service((string) $trackinfo->ClassofMailCode, (string) $trackinfo->Class)); - $info->setCarrierLogo("data:image/svg+xml;base64,<svg enable-background="new 0 0 659.055 110.036" height="110.036" viewBox="0 0 659.055 110.036" width="659.055" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd" fill-rule="evenodd"><g fill="#004c82"><path d="m23.382.555h.826l1.379.269 1.648.276 4.402 1.103 6.05 1.096 3.305.83 3.575.826 3.85.549 3.852 1.1 4.127.548 4.125 1.102 13.205 2.474 4.128 1.103 4.402.823 3.848.826 4.128.826 3.847.824 3.853.553 3.301.826 3.305.547 2.751.824 2.473.553 2.199.273 1.927.276 1.379.277.825.273h.546l3.578.825 3.303.552 2.752.825 2.197.55 2.203.824 1.652.551 2.197 1.102.824.552 1.379 1.371v.276l.278.277v.269h11.823l1.104.278h1.101l.824.277h.824l.824.276 2.204 1.095.273.555 1.926 3.025.552 3.574-.552 4.402-1.375 4.129-1.65 4.124-1.655 3.304-1.371 2.2-.549.826-.552.276-1.375.547-1.926.825-2.75 1.1-3.029 1.098-3.847 1.656-4.131 1.648-4.676 1.648-5.228 2.205-5.5 1.926-5.499 2.197-12.105 4.959-6.329 2.475-6.328 2.198-6.326 2.746-6.599 2.483-6.328 2.197-6.055 2.754-6.325 2.198-5.779 2.197-11.004 4.409-4.951 1.919-4.677 1.655-4.124 1.648-3.575 1.377-3.029 1.377-2.472.828-1.928.827-1.101.264-.278.278h142.227l23.105-109.486h-155.428z"/><path d="m129.847 36.039-.829.276-5.499 1.095h-1.377l-1.102.278h-1.095l-1.655.277-.824.275-.55.272-.278.555v.548l.555.549h1.097l1.102.275h2.75l1.648-.275h1.65l3.854-.549h1.927l2.2-.279 1.923-.269 1.657-.276 1.921-.279h7.429l.822.279.556.276.546.824v1.097l-.275 1.1-.271 1.379-.556 1.65-.822 1.928-.55 1.926-.277 1.097.55.552.553-.279 1.102-1.1.546-.824.828-1.372.825-1.651.824-1.927.822-1.65.553-1.653.273-1.373v-1.65l-.547-1.379-.824-.825-1.101-.823-1.377-.551-1.651-.274-1.923-.277h-11.556l-.275.277h-.276l-.547.274-.555 1.103-.547.271-.55.552z"/><path d="m18.156 25.313-18.156 84.173.829-.278 1.648-1.091 2.752-1.107 3.578-1.926 4.122-1.926 4.68-2.468 5.502-2.476 5.226-2.754 5.501-2.483 5.227-2.746 5.226-2.476 4.949-2.475 4.13-2.205 3.575-1.648 2.751-1.377 1.926-.82 2.752-1.377 2.476-1.377 3.025-1.377 3.026-1.648 2.75-1.377 3.302-1.377 3.026-1.648 3.3-1.37 3.304-1.662 16.503-6.87 7.43-2.476 1.099-.277 1.097-.547 1.38-.276 4.948-1.65 5.778-1.654 1.927-.276 5.775-1.65 3.305-.546 1.097-.276.824-.278h.829l.824-.27.551-.554h.277v-.277l-.555-1.095-.824-.276-1.102-.279h-1.097l-1.648-.271h-1.657l-1.923.271-3.303.279-3.576.545-3.849.826-4.129.831-4.122 1.097-4.403 1.377-4.129 1.373-4.4 1.377-4.124 1.652-4.131 1.372-3.849 1.378-3.574 1.377-3.305 1.649-2.75 1.098-2.476 1.106-1.926 1.098-10.452-32.464h66.574l.271-1.372-1.097-1.379-1.653-.825-2.476-.824-2.752-.824-7.152-1.103-11.552-.821z"/></g><path d="m658.385 57.299h-466.093l.668-7.004h466.095z" fill="#ea4156"/><path d="m213.472 41.817-3.574-.276-3.576-.824-2.752-.826-2.476-1.651-1.648-1.925-1.102-2.479-.276-2.747.276-3.305 1.377-6.05 1.097-5.502 1.103-4.68.822-3.847.557-3.303.548-2.476.276-1.372.269-.554h9.079l-.275 1.1-.549 2.752-1.103 4.125-.824 4.676-1.102 4.68-1.372 6.875-.278.824-.273 2.203v3.853l.551 1.372 1.099 1.102 1.375.824 1.926.549 2.203.276 2.474-.276 1.926-.271 1.927-.83 1.373-1.375 1.103-1.372 1.102-1.657 1.65-4.398.271-2.199.824-3.303.832-4.125.822-4.402 1.099-4.129.555-3.576.547-2.476.275-.822h9.08l-1.653 7.978-.824 4.129-.551 1.373v.548l-.278 1.655-.824 4.123-1.922 7.978-.276 1.648-.824 1.657-.555 1.372-.824 1.375-1.099 1.377-2.201 2.197-1.379.83-1.648.828-1.375.824-1.648.548-1.651.278-1.655.545-3.847.555h-2.204zm423.093-35.213h-12.931l-2.197.547-1.651 1.103-.278.547-.274.828v1.099l.274 1.103.824 1.102.827 1.374 2.476 2.474 1.648 1.101 1.377 1.102 1.651 1.375 2.75 2.75 1.103 1.375 1.647 3.301.279 1.648-.279 1.928-.545 1.928-.832 1.924-1.373 1.65-1.926 1.377-2.197 1.097-2.754.828-3.574.553-3.853.271h-14.03l1.652-6.601h14.854l1.377-.273 1.099-.278.827-.547.828-1.101.545-1.099-.274-2.205-1.651-2.201-2.75-2.201-2.75-2.474-3.025-2.75-2.479-3.027-1.647-3.028-.275-3.574.55-1.924 1.103-2.201 1.102-1.651 1.92-1.377 2.479-1.097 2.476-.824 3.3-.555h15.956zm-31.915 0h-20.625l-2.482 10.73h18.16l-1.373 5.773h-18.157l-2.204 11.279h20.632l-1.377 6.601h-29.707l8.803-40.987h29.711zm-35.76 0h-12.648l-7.431 34.383h-9.078l7.427-34.383h-12.931l1.651-6.604h34.387zm-63.27 34.384 3.578-6.601h12.931l-3.578-26.133-18.157 32.733h-9.078l23.661-40.987h10.727l6.331 40.988zm-1.648-34.384h-12.656l-7.43 34.383h-9.079l7.431-34.383h-12.928l1.648-6.604h34.387zm-39.338 0h-12.656l-1.377.271-1.099.276-.824.553-1.103 1.097v1.926l.278 1.103.546 1.102 1.103 1.374 2.476 2.474 1.373 1.101 1.655 1.102 4.124 4.125 1.102 1.375 1.096 1.651.557 1.65.274 1.648v1.928l-.554 1.928-.823 1.924-1.651 1.65-1.648 1.377-2.476 1.097-2.754.828-3.3.553-4.127.271h-13.756l1.377-6.601h15.128l1.377-.273 1.099-.278.824-.547.827-1.101.275-1.099-.275-2.205-1.651-2.201-2.476-2.201-2.75-2.474-3.028-2.75-2.476-3.027-1.648-3.028-.278-3.574.557-1.924.82-2.201 1.377-1.651 1.927-1.377 2.201-1.097 2.75-.824 3.302-.555h15.952zm-83.079 13.753-4.127 20.63h18.432l2.2-.271h2.201l3.85-1.103 2.2-.824 1.931-1.102 3.299-2.199 3.296-3.301 2.754-3.851 1.099-2.203.824-2.199.557-2.479.274-1.099.271-1.651.549-3.849-.271-3.574-.824-3.028-1.381-2.75-2.197-2.476-2.75-1.65-3.574-1.102-4.132-.276h-20.079zm29.985 0-.278 1.377-.823 1.65-.55 1.377-.546 1.651-.831 1.093-1.095 1.379-2.205 2.205-2.75 1.65-1.373.549-1.652.547-3.303.551h-8.254l2.754-14.03 3.024-13.753h11.829l2.197.826 1.658 1.101 1.37 1.65.827 1.65.546 2.197v4.405l-.546 1.651v.274zm-33.56-13.753h-20.361l-2.472 10.73h17.879l-1.103 5.773h-18.153l-2.201 11.279h20.354l-1.095 6.601h-29.711l8.801-40.987h29.437zm-35.489 0h-12.927l-7.43 34.383h-8.8l7.425-34.383h-12.927l1.371-6.604h34.387zm-48.14 34.384h-8.804l8.527-40.988h9.077zm-17.606 0h-11.279l-10.181-30.531h-.272l-6.326 30.531h-7.977l8.8-40.988h11.552l9.904 30.813 6.329-30.813h8.252z"/><path d="m201.372 93.805h-1.103l-.549-.271h-1.653l-.549-.278h-.548l-.553-5.771h2.201l.272.271h1.653l2.197-.271 3.302-1.105 1.102-1.099 1.65-2.205.551-1.099v-1.099l.273-1.377v-1.369l-.273-1.106-.551-.82-1.65-1.105h-1.102l-1.095-.271h-7.43l-7.429 34.38h-9.078l8.805-40.986h19.53l3.023.278 2.205 1.106 1.924 1.369 1.103 1.927.549 1.926.276 2.197v2.205l-.276 1.926-.826 2.747-1.377 2.476-1.652 2.197-2.195 1.934-2.203 1.377-5.504 1.647zm452.798-18.977h-20.903l-2.205 10.73h18.16l-1.38 6.05h-18.153l-2.201 11.279h20.633l-1.377 6.32h-29.711l8.804-40.986h29.711zm-36.585.549-1.102-.278h-.828l-2.197-.55-1.377-.271h-1.373l-1.103-.278h-1.647l-3.029.278-2.754.82-2.75 1.105-2.472 1.927-1.927 1.919-1.926 2.482-1.099 3.025-1.103 3.296-.553 3.303.278 3.025.82 2.476 1.103 1.926 1.651 1.648 2.2 1.377 2.477.827 2.754.271h1.647l1.651-.271h1.377l2.75-.549h1.1l1.377-.278 1.102-.271-2.204 6.87-1.099.278h-1.373l-1.103.278h-1.374l-1.102.271h-6.328l-4.402-.55-1.926-.542-1.927-.827-1.647-.828-1.652-1.099-1.377-1.105-1.373-1.377-.824-1.648-.823-1.926-.828-1.648-.274-2.197v-2.204l.274-2.476.271-2.754.827-2.476.824-2.747 2.201-4.401 1.373-1.927 3.309-3.301 1.927-1.377 3.849-2.197 4.398-1.655 2.204-.55 2.197-.278 2.479-.264h5.775l1.099.264h1.105l1.099.278h1.099l1.103.278zm-45.392 33.831h-9.078l8.804-40.986h9.078zm-29.161 0h-10.727l-6.054-40.986h9.079l4.127 33.011 18.156-33.011h8.801zm-33.289-17.6 6.606 17.6h-9.905l-7.428-22.28h5.23l1.651-.271 1.647-.55 1.373-.827 1.103-.82 1.103-1.106.546-1.377.557-1.647.267-1.099v-1.099l-.545-1.655-.55-.55-1.099-.549-2.754-.55h-8.254l-7.431 34.38h-9.071l8.804-40.986h18.981l2.742.278 2.483.55 1.926.827 1.374 1.099 1.098 1.37.828 1.934.274 2.197v2.197l-.274 2.754-.828 2.476-1.098 2.204-1.374 1.648-1.655 1.647-2.197 1.106-1.926.82zm-26.129-16.78h-20.633l-2.2 10.73h17.878l-1.099 6.05h-18.153l-2.204 11.279h20.632l-1.373 6.32h-29.985l8.8-40.986h29.711zm-37.416 0h-11.554l-2.75.55-1.099.278-.55.549-.827.55-.546 1.099v1.377l.271 1.099.554 1.099 1.099 1.105 1.099 1.37 1.377 1.099 1.373 1.377 1.647 1.105 1.381 1.37 1.648 1.105 1.102 1.648 1.103 1.369 1.099 1.655.553 1.377.271 1.927v1.647l-.549 2.205-.824 1.647-3.304 3.304-2.2 1.099-3.029.827-3.296.542h-17.882l1.377-6.32h15.132l1.373-.278 1.103-.55.824-.549.824-.82.545-1.106-.545-2.204-1.648-2.197-2.476-2.476-2.754-2.476-3.028-2.476-2.476-3.025-1.648-3.303-.278-3.296.553-2.205.826-1.926 1.373-1.655 1.927-1.37 2.197-1.099 2.754-.827 3.303-.55 3.846-.278h12.106zm-48.966 34.38h-27.784l8.532-40.986h9.35l-7.427 34.666h18.706zm-58.864 0 3.574-6.32h12.927l-3.849-26.411-17.881 32.731h-9.08l23.387-40.986h10.997l6.328 40.986zm-1.652-34.38h-12.931l-7.431 34.38h-9.078l7.431-34.38h-12.656l1.378-6.606h34.382zm-39.338 0h-11.558l-2.75.55-.826.278-.826.549-1.095 1.099-.276.55v1.377l.276 1.099 1.65 2.204 1.097 1.37 1.377 1.099 1.374 1.377 1.653 1.105 1.651 1.37 1.372 1.105 1.102 1.648 1.375 1.369.824 1.655.553 1.377.547 1.927-.273 1.647-.551 2.205-.827 1.647-1.372 1.648-1.654 1.655-2.476 1.099-3.023.827-3.305.542h-17.604l1.103-6.32h15.406l1.095-.278 2.203-1.099.549-.82.553-1.106-.276-2.204-1.65-2.197-2.474-2.476-3.028-2.476-2.752-2.476-2.474-3.025-1.65-3.303-.555-3.296.555-2.205 1.098-1.925 1.377-1.655 1.65-1.37 2.203-1.099 3.023-.827 3.301-.55 3.574-.278h12.107zm-76.476 14.026-.555 4.401.83 5.779 1.651 3.303 1.097 1.648 2.479 2.476 1.648 1.099 1.651.827 1.926.82 2.199.557 2.201.271h4.68l4.398-.55 2.199-.542 2.203-.827 1.926-.828 1.65-1.099 1.926-1.105 1.651-1.377 1.372-1.648 1.653-1.647 1.097-1.927 2.204-4.401.824-2.476.549-2.754.553-2.197v-4.124l-.278-2.204-.275-1.927-1.652-3.303-2.195-2.754-1.379-1.092-1.649-1.105-1.652-.82-2.201-.828-1.928-.557-2.197-.264h-4.678l-4.4.542-2.199.55-2.203.835-1.927.82-1.649 1.099-1.926 1.377-1.648 1.098-1.65 1.655-1.377 1.926-1.375 1.648-1.101 2.197-.826 2.204-.824 2.747zm34.383 0-.826 3.303-1.373 3.025-1.379 2.476-1.919 1.926-2.205 1.648-2.476 1.377-2.474.827-3.027.271-3.029-.271-2.199-1.099-1.926-1.377-1.375-1.926-.828-1.927-.547-2.746v-2.754l.547-2.754.828-3.296 1.375-3.025 1.375-2.482 1.926-1.919 2.199-1.927 2.477-1.105 2.472-.82 3.032-.279 2.754.549 2.474.55 1.926 1.655 1.373 1.647.826 2.205.551 2.468v2.754z"/></g></svg>"); - $info->setCarrierAttributionText("Information provided by www.usps.com."); + $info->setCarrierAttributionText(CarrierAssets::getAttribution(Carriers::getCarrierCode($info->getCarrier()))); + $info->setCarrierLogo(CarrierAssets::getLogo(Carriers::getCarrierCode($info->getCarrier()))); $current_status = new TrackingEntry( TrackingStatus::USPSEventCodeToStatus($trackinfo->TrackSummary->EventCode),