From 0b3eec53e595a19be13bb4c216ea9e66a3ced97e Mon Sep 17 00:00:00 2001
From: Skylar Ittner <skylar@netsyms.com>
Date: Fri, 15 Apr 2022 19:59:27 -0600
Subject: [PATCH] Fix USPS current status date/time showing as request
 date/time

---
 endpoints/logistics.tracking.php | 3 +++
 lib/TrackingInfo.lib.php         | 4 +++-
 lib/Tracking_USPS.lib.php        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/endpoints/logistics.tracking.php b/endpoints/logistics.tracking.php
index ce2957e..de44666 100644
--- a/endpoints/logistics.tracking.php
+++ b/endpoints/logistics.tracking.php
@@ -16,6 +16,9 @@ try {
 
     $trackinginfo = Tracking::track($code, $carrier);
 } catch (TrackingException $ex) {
+    if (env("debugmode", false)) {
+        echo $ex->getTraceAsString();
+    }
     $output = [
         "status" => "ERROR",
         "msg" => $ex->getMessage()
diff --git a/lib/TrackingInfo.lib.php b/lib/TrackingInfo.lib.php
index b558f8e..879711e 100644
--- a/lib/TrackingInfo.lib.php
+++ b/lib/TrackingInfo.lib.php
@@ -122,7 +122,9 @@ class TrackingInfo {
             "current" => [
                 "status" => "UNKNOWN",
                 "details" => "No tracking information found.",
-                "date" => time(),
+                "datetime" => date("Y-m-d\TH:i:s", time()),
+                "nicetime" => date("F j g:i a", time()),
+                "containerscan" => false,
                 "location" => [
                     "street" => "",
                     "city" => "",
diff --git a/lib/Tracking_USPS.lib.php b/lib/Tracking_USPS.lib.php
index cf26e89..87aafa2 100644
--- a/lib/Tracking_USPS.lib.php
+++ b/lib/Tracking_USPS.lib.php
@@ -57,7 +57,7 @@ class Tracking_USPS {
         $current_status = new TrackingEntry(
                 TrackingStatus::USPSEventCodeToStatus($trackinfo->TrackSummary->EventCode),
                 ($trackinfo->StatusSummary ?? "Unknown") . (TrackingStatus::USPSEventCodeToStatus($trackinfo->TrackSummary->EventCode) == TrackingStatus::TRACKING_STATUS_UNKNOWN ? " " . $trackinfo->TrackSummary->EventCode : ""),
-                $trackinfo->TrackSummary["EventDate"] . " " . $trackinfo->TrackSummary["EventTime"],
+                $trackinfo->TrackSummary->EventDate . " " . $trackinfo->TrackSummary->EventTime,
                 null,
                 TrackingStatus::isUSPSEventCodeContainerScan($trackinfo->TrackSummary->EventCode)
         );