From f6602e450f42e00e0be1e8eebddc16366f36019c Mon Sep 17 00:00:00 2001 From: sambit Date: Wed, 2 Nov 2022 23:00:48 +0100 Subject: [PATCH 1/2] TM-1311 added tracking_destination_country field in Tracking --- src/main/java/com/aftership/sdk/Tracking.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/aftership/sdk/Tracking.java b/src/main/java/com/aftership/sdk/Tracking.java index 4252fbe..9d9c5a4 100644 --- a/src/main/java/com/aftership/sdk/Tracking.java +++ b/src/main/java/com/aftership/sdk/Tracking.java @@ -112,6 +112,8 @@ public class Tracking { /**Tracking key of the shipment for a specific courier. Required by some couriers, such assic-teliway and total-express**/ private String trackingKey; + private String trackingDestinationCountry; + public Tracking(String trackingNumber) { this.trackingNumber = trackingNumber; this.title = trackingNumber; @@ -141,6 +143,9 @@ public Tracking(JSONObject trackingJSON) throws JSONException,AftershipAPIExcept this.trackingKey = trackingJSON.isNull("tracking_key")?null: trackingJSON.getString("tracking_key"); + this.trackingDestinationCountry = trackingJSON.isNull("tracking_destination_country")?null: + trackingJSON.getString("tracking_destination_country"); + JSONArray smsesArray =trackingJSON.isNull("smses")?null:trackingJSON.getJSONArray("smses"); if(smsesArray !=null && smsesArray.length()!=0){ this.smses = new ArrayList(); @@ -421,6 +426,14 @@ public void setTrackingShipDate(String trackingShipDate) { this.trackingShipDate = trackingShipDate; } + public String getTrackingDestinationCountry() { + return trackingDestinationCountry; + } + + public void setTrackingDestinationCountry(String trackingDestinationCountry) { + this.trackingDestinationCountry = trackingDestinationCountry; + } + public JSONObject generateJSON() throws JSONException{ JSONObject globalJSON = new JSONObject(); JSONObject trackingJSON = new JSONObject(); @@ -447,6 +460,7 @@ public JSONObject generateJSON() throws JSONException{ if (this.trackingPostalCode != null) trackingJSON.put("tracking_postal_code", this.trackingPostalCode); if (this.trackingShipDate != null) trackingJSON.put("tracking_ship_date", this.trackingShipDate); if (this.trackingKey != null) trackingJSON.put("tracking_key", this.trackingKey); + if (this.trackingDestinationCountry != null) trackingJSON.put("tracking_destination_country", this.trackingDestinationCountry); if (this.customFields != null) { customFieldsJSON = new JSONObject(); @@ -516,6 +530,7 @@ public String toString() { sb.append((tag==null)?"":"\n\ttag=" +tag ); sb.append("\n\t" + "trackedCount=" + trackedCount); sb.append((checkpoints==null)?"": "\n\tcheckpoints=" +checkpoints); + sb.append((trackingDestinationCountry==null)?"": "\n\ttrackingDestinationCountry=" +trackingDestinationCountry); sb.append("\n}"); return sb.toString(); } @@ -539,6 +554,11 @@ public String getQueryRequiredFields(){ qs.add("tracking_key", this.trackingKey); containsInfo=true; } + if (this.trackingDestinationCountry!=null){ + qs.add("tracking_destination_country", this.trackingKey); + containsInfo=true; + } + if(containsInfo){ return qs.toString(); } From f9f332b763a437647a9c2e0f2b30460f455bc9e5 Mon Sep 17 00:00:00 2001 From: sambit Date: Thu, 3 Nov 2022 11:52:35 +0100 Subject: [PATCH 2/2] TM-1311 corrected getQueryRequiredFields method --- src/main/java/com/aftership/sdk/Tracking.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/aftership/sdk/Tracking.java b/src/main/java/com/aftership/sdk/Tracking.java index 9d9c5a4..ec6b02b 100644 --- a/src/main/java/com/aftership/sdk/Tracking.java +++ b/src/main/java/com/aftership/sdk/Tracking.java @@ -555,7 +555,7 @@ public String getQueryRequiredFields(){ containsInfo=true; } if (this.trackingDestinationCountry!=null){ - qs.add("tracking_destination_country", this.trackingKey); + qs.add("tracking_destination_country", this.trackingDestinationCountry); containsInfo=true; }