diff --git a/www/assets/js/toolbox_track.js b/www/assets/js/toolbox_track.js index 5ab25a9..01e4786 100644 --- a/www/assets/js/toolbox_track.js +++ b/www/assets/js/toolbox_track.js @@ -63,7 +63,8 @@ function openTrackingHistory(code) { url: SETTINGS.trackingapi, dataType: 'json', data: { - code: trackingcode + code: trackingcode, + nocache: (refresh ? "1" : "") }, timeout: 15 * 1000, success: function (resp) { @@ -76,14 +77,14 @@ function openTrackingHistory(code) { var infocontext = resp; infocontext.current.location.display = locationArrayToString(infocontext.current.location); - infocontext.current.date = timestampToDateTimeString(infocontext.current.date); + infocontext.current.date = infocontext.current.nicetime; infocontext.current.status = trackingStatusToNiceString(infocontext.current.status, true); infocontext.addresses.from = locationArrayToString(infocontext.addresses.from); infocontext.addresses.to = locationArrayToString(infocontext.addresses.to); for (var i = 0; i < infocontext.history.length; i++) { infocontext.history[i].location.display = locationArrayToString(infocontext.history[i].location); - infocontext.history[i].date = timestampToDateTimeString(infocontext.history[i].date); + infocontext.history[i].date = infocontext.history[i].nicetime; infocontext.history[i].status = trackingStatusToNiceString(infocontext.history[i].status, true); } @@ -120,7 +121,7 @@ function openTrackingHistory(code) { }); } } else { - app.dialog.alert(resp.message, "Error"); + app.dialog.alert(resp.msg, "Error"); } }, error: function (jqXHR, status, errorThrown) { diff --git a/www/pages/toolbox/trackinginfo.html b/www/pages/toolbox/trackinginfo.html index 95c0df2..199bfb4 100644 --- a/www/pages/toolbox/trackinginfo.html +++ b/www/pages/toolbox/trackinginfo.html @@ -35,7 +35,7 @@
{{status}}
{{date}}
-
{{details}}
+
{{#if containerscan}} {{/if}}{{details}}
{{location.display}}
{{/with}} @@ -66,7 +66,7 @@
{{status}}
{{date}}
-
{{details}}
+
{{#if containerscan}} {{/if}}{{details}}
{{location.display}}
diff --git a/www/settings.js b/www/settings.js index 6c3feb8..1ff0faf 100644 --- a/www/settings.js +++ b/www/settings.js @@ -372,7 +372,7 @@ var SETTINGS = { geocodecacheexpiry: 604800, // One week geocodeapi: "https://apis.netsyms.net/packagehelper/geocode.php", geocodebarcodeapi: "https://apis.netsyms.net/packagehelper/geocode_barcode.php", - trackingapi: "https://apis.netsyms.net/packagehelper/track.php", + trackingapi: "https://data.netsyms.net/v1/logistics/tracking/", weatherapi: "https://apis.netsyms.net/packagehelper/weather.php", geoipapi: "https://apis.netsyms.net/packagehelper/geoip.php", sharelistapi: "https://apis.netsyms.net/packagehelper/sharepackagelist.php",