fc-landmark 2.0.0 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/landmark.js +2 -2
- package/dist/landmark.js.map +1 -1
- package/dist/shipment.js +34 -11
- package/dist/shipment.js.map +1 -1
- package/dist/tracking.js +5 -34
- package/dist/tracking.js.map +1 -1
- package/package.json +31 -31
- package/src/landmark.ts +2 -2
- package/src/shipment.ts +32 -9
- package/src/tracking.ts +8 -37
- package/src/trackingEvents.json +0 -24
package/dist/landmark.js
CHANGED
|
@@ -27,13 +27,13 @@ class LandMark {
|
|
|
27
27
|
this.vendorIOSSNumber = vendorIOSSNumber;
|
|
28
28
|
(0, core_1.setRequredGlobals)(logger, flclerror, rootRequestId, requestId);
|
|
29
29
|
}
|
|
30
|
-
createShipmet(args) {
|
|
30
|
+
createShipmet(args, dangerousGoodsDeatils = "", regionValue = "") {
|
|
31
31
|
var _a, _b, _c, _d;
|
|
32
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
33
33
|
try {
|
|
34
34
|
let shipObj = new shipment_1.default();
|
|
35
35
|
(_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentInput', propertyValue: args });
|
|
36
|
-
let landmarkShipmentRequest = shipObj.buildShipmentRequest(args, this.username, this.password, this.test, this.clientId, this.vendorEORINumber, this.vendorIOSSNumber);
|
|
36
|
+
let landmarkShipmentRequest = shipObj.buildShipmentRequest(args, dangerousGoodsDeatils, this.username, this.password, this.test, this.clientId, this.vendorEORINumber, this.vendorIOSSNumber, regionValue);
|
|
37
37
|
(_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentRequest', propertyValue: landmarkShipmentRequest });
|
|
38
38
|
let landmarkShipmentRes = yield shipObj.createShipment(landmarkShipmentRequest);
|
|
39
39
|
if (landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']) {
|
package/dist/landmark.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"landmark.js","sourceRoot":"","sources":["../src/landmark.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAkC;AAClC,0DAAkC;AAClC,iCAA2C;AAC3C,uCAA4C;AAG5C,MAAa,QAAQ;IAOjB,YAAY,QAAe,EAAC,QAAe,EAAC,QAAe,EAAC,IAAY,EAAC,gBAAuB,EAAC,gBAAuB,EAAE,MAAmB,EAAE,SAAqB,EAAE,aAAsB,EAAE,SAAkB;QAC5M,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAA,wBAAiB,EAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC;IAEK,aAAa,CAAC,IAAS;;;
|
|
1
|
+
{"version":3,"file":"landmark.js","sourceRoot":"","sources":["../src/landmark.ts"],"names":[],"mappings":"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"}
|
package/dist/shipment.js
CHANGED
|
@@ -70,10 +70,11 @@ class Shipment {
|
|
|
70
70
|
};
|
|
71
71
|
return shipper;
|
|
72
72
|
}
|
|
73
|
-
buildShipmentRequest(args, username, password, test, clientId, vendorEORINumber, vendorIOSSNumber) {
|
|
73
|
+
buildShipmentRequest(args, dangerousGoodsDeatils = "", username, password, test, clientId, vendorEORINumber, vendorIOSSNumber, reqRegionValue) {
|
|
74
74
|
try {
|
|
75
75
|
const EUCountries = ["BE", "BG", "CZ", "DK", "DE", "EE", "IE", "EL", "ES", "FR", "HR", "IT", "CY", "LV", "LT", "LU", "HU", "MT", "NL", "AT", "PL", "PT", "RO", "SI", "SK", "FI", "SE"];
|
|
76
76
|
let iossNumber = "";
|
|
77
|
+
let regionValue = (reqRegionValue && reqRegionValue != "") ? reqRegionValue : "Landmark BUF";
|
|
77
78
|
if (EUCountries.indexOf(args.shipto_address.country.toUpperCase()) != -1 || EUCountries.indexOf(args.targetToCountry.toUpperCase()) != -1) {
|
|
78
79
|
iossNumber = vendorIOSSNumber;
|
|
79
80
|
}
|
|
@@ -91,7 +92,7 @@ class Shipment {
|
|
|
91
92
|
"Reference": args.reference,
|
|
92
93
|
"ShipTo": this.getConsignee(args.shipto_address, args.targetToCountry),
|
|
93
94
|
"ShippingLane": {
|
|
94
|
-
"Region":
|
|
95
|
+
"Region": regionValue
|
|
95
96
|
},
|
|
96
97
|
"ShipMethod": args._carrierRateObj.servicecode,
|
|
97
98
|
"OrderTotal": args.shipment_total_usd,
|
|
@@ -114,18 +115,40 @@ class Shipment {
|
|
|
114
115
|
"VendorInformation": this.getVendorInfo(args.shipfrom_address, args.targetFromCountry, eroiNumber, iossNumber),
|
|
115
116
|
"IsCommercialShipment": args.b2b ? 1 : 0,
|
|
116
117
|
};
|
|
118
|
+
// let items = args.pieces.map((item:any)=>{
|
|
119
|
+
// return {"Item":{
|
|
120
|
+
// "Sku": item.sku || 12345,
|
|
121
|
+
// "Description": item.description.substr(0,100),
|
|
122
|
+
// "Quantity": item.quantity,
|
|
123
|
+
// "UnitPrice": (item.sale_price == 0) ? 0.01 : item.sale_price,
|
|
124
|
+
// "HSCode": item.hs_code,
|
|
125
|
+
// "CountryOfOrigin": item.origin_country_code
|
|
126
|
+
// }
|
|
127
|
+
// }
|
|
128
|
+
// })
|
|
117
129
|
let items = args.pieces.map((item) => {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
}
|
|
130
|
+
let itemObj = {
|
|
131
|
+
"Sku": item.sku || 12345,
|
|
132
|
+
"Description": item.description.substr(0, 100),
|
|
133
|
+
"Quantity": item.quantity,
|
|
134
|
+
"UnitPrice": (item.sale_price == 0) ? 0.01 : item.sale_price,
|
|
135
|
+
"HSCode": item.hs_code,
|
|
136
|
+
"CountryOfOrigin": item.origin_country_code
|
|
126
137
|
};
|
|
138
|
+
if (dangerousGoodsDeatils && dangerousGoodsDeatils[item.sku] && dangerousGoodsDeatils[item.sku]['UNCode']) {
|
|
139
|
+
let dangerousGoodInformation = {
|
|
140
|
+
"ContainsDangerousGoods": 1,
|
|
141
|
+
"UNCode": dangerousGoodsDeatils[item.sku]['UNCode'] || "",
|
|
142
|
+
"PackingGroup": dangerousGoodsDeatils[item.sku]['CategoryCode'] || "",
|
|
143
|
+
"PackingInstructions": dangerousGoodsDeatils[item.sku]['PackingInstructions'] || "",
|
|
144
|
+
"ItemWeight": item.weight,
|
|
145
|
+
"ItemWeightUnit": args.weight_unit
|
|
146
|
+
};
|
|
147
|
+
itemObj["DangerousGoodsInformation"] = dangerousGoodInformation;
|
|
148
|
+
}
|
|
149
|
+
return itemObj;
|
|
127
150
|
});
|
|
128
|
-
importRequest["Items"] = items;
|
|
151
|
+
importRequest["Items"] = { "Item": items };
|
|
129
152
|
let request = {
|
|
130
153
|
"ImportRequest": importRequest
|
|
131
154
|
};
|
package/dist/shipment.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shipment.js","sourceRoot":"","sources":["../src/shipment.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shipment.js","sourceRoot":"","sources":["../src/shipment.ts"],"names":[],"mappings":"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"}
|
package/dist/tracking.js
CHANGED
|
@@ -11,30 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const globals_1 = require("./globals");
|
|
13
13
|
const xml_js_1 = require("xml-js");
|
|
14
|
-
let eventMappings = {
|
|
15
|
-
"50": "In Progress",
|
|
16
|
-
"60": "In Progress",
|
|
17
|
-
"75": "In Transit",
|
|
18
|
-
"80": "In Transit",
|
|
19
|
-
"90": "Customs Hold",
|
|
20
|
-
"100": "In Transit",
|
|
21
|
-
"125": "Cleared Customs",
|
|
22
|
-
"135": "Customs Delay",
|
|
23
|
-
"150": "In Transit",
|
|
24
|
-
"155": "In Transit",
|
|
25
|
-
"200": "In Transit",
|
|
26
|
-
"225": "Arrived at Import Gateway",
|
|
27
|
-
"250": "In Transit",
|
|
28
|
-
"275": "In Transit - Last Mile",
|
|
29
|
-
"300": "Out For Delivery",
|
|
30
|
-
"400": "In Transit",
|
|
31
|
-
"410": "In Transit",
|
|
32
|
-
"450": "In Transit",
|
|
33
|
-
"500": "Delivered",
|
|
34
|
-
"550": "Delivered",
|
|
35
|
-
"800": "In Transit",
|
|
36
|
-
"900": "Attempted Delivery"
|
|
37
|
-
};
|
|
38
14
|
class Tracking {
|
|
39
15
|
constructor() {
|
|
40
16
|
}
|
|
@@ -93,18 +69,13 @@ class Tracking {
|
|
|
93
69
|
for (let i = 0; i < resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'].length; i++) {
|
|
94
70
|
let history = {};
|
|
95
71
|
let code = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['EventCode']['_text'];
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
72
|
+
if (code == '50' || code == '60') {
|
|
73
|
+
history.status = "In Progress";
|
|
74
|
+
}
|
|
75
|
+
else if (code == '500') {
|
|
76
|
+
history.status = "Delivered";
|
|
99
77
|
}
|
|
100
78
|
else {
|
|
101
|
-
// if(code == '50' || code == '60' ){
|
|
102
|
-
// history.status = "In Progress";
|
|
103
|
-
// }
|
|
104
|
-
// else if(code == '500'){
|
|
105
|
-
// history.status = "Delivered";
|
|
106
|
-
// }
|
|
107
|
-
// else{
|
|
108
79
|
history.status = "In Transit";
|
|
109
80
|
}
|
|
110
81
|
history.status_date = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['DateTime']['_text'];
|
package/dist/tracking.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracking.js","sourceRoot":"","sources":["../src/tracking.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,uCAA4C;AAC5C,mCAA0C;AAE1C,
|
|
1
|
+
{"version":3,"file":"tracking.js","sourceRoot":"","sources":["../src/tracking.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "fc-landmark",
|
|
3
|
-
"version": "2.
|
|
4
|
-
"description": "landmark Shipment and Tracking API.",
|
|
5
|
-
"main": "./dist/index.js",
|
|
6
|
-
"scripts": {
|
|
7
|
-
"build": "rm -rf ./dist && tsc",
|
|
8
|
-
"test": "echo \"Error: no test specified\" && exit 1"
|
|
9
|
-
},
|
|
10
|
-
"author": "Midhun",
|
|
11
|
-
"license": "ISC",
|
|
12
|
-
"dependencies": {
|
|
13
|
-
"@types/xml2js": "0.4.11",
|
|
14
|
-
"@types/redis": "^2.8.25",
|
|
15
|
-
"@types/redlock": "^4.0.1",
|
|
16
|
-
"@types/uuid": "^8.3.0",
|
|
17
|
-
"app-root-path": "^3.0.0",
|
|
18
|
-
"axios": "^0.19.0",
|
|
19
|
-
"fc-logger": "^4.2.0",
|
|
20
|
-
"fs": "0.0.1-security",
|
|
21
|
-
"redis": "^3.0.2",
|
|
22
|
-
"redlock": "^4.1.0",
|
|
23
|
-
"request": "^2.88.2",
|
|
24
|
-
"uuid": "^8.3.0",
|
|
25
|
-
"xml-js": "1.6.11"
|
|
26
|
-
},
|
|
27
|
-
"devDependencies": {
|
|
28
|
-
"@types/request": "^2.48.7",
|
|
29
|
-
"typescript": "^4.9.5"
|
|
30
|
-
}
|
|
31
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "fc-landmark",
|
|
3
|
+
"version": "2.1.0",
|
|
4
|
+
"description": "landmark Shipment and Tracking API.",
|
|
5
|
+
"main": "./dist/index.js",
|
|
6
|
+
"scripts": {
|
|
7
|
+
"build": "rm -rf ./dist && tsc",
|
|
8
|
+
"test": "echo \"Error: no test specified\" && exit 1"
|
|
9
|
+
},
|
|
10
|
+
"author": "Midhun",
|
|
11
|
+
"license": "ISC",
|
|
12
|
+
"dependencies": {
|
|
13
|
+
"@types/xml2js": "0.4.11",
|
|
14
|
+
"@types/redis": "^2.8.25",
|
|
15
|
+
"@types/redlock": "^4.0.1",
|
|
16
|
+
"@types/uuid": "^8.3.0",
|
|
17
|
+
"app-root-path": "^3.0.0",
|
|
18
|
+
"axios": "^0.19.0",
|
|
19
|
+
"fc-logger": "^4.2.0",
|
|
20
|
+
"fs": "0.0.1-security",
|
|
21
|
+
"redis": "^3.0.2",
|
|
22
|
+
"redlock": "^4.1.0",
|
|
23
|
+
"request": "^2.88.2",
|
|
24
|
+
"uuid": "^8.3.0",
|
|
25
|
+
"xml-js": "1.6.11"
|
|
26
|
+
},
|
|
27
|
+
"devDependencies": {
|
|
28
|
+
"@types/request": "^2.48.7",
|
|
29
|
+
"typescript": "^4.9.5"
|
|
30
|
+
}
|
|
31
|
+
}
|
package/src/landmark.ts
CHANGED
|
@@ -21,12 +21,12 @@ export class LandMark {
|
|
|
21
21
|
setRequredGlobals(logger, flclerror, rootRequestId, requestId);
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
async createShipmet(args: any) {
|
|
24
|
+
async createShipmet(args: any, dangerousGoodsDeatils: any = "", regionValue: string = "") {
|
|
25
25
|
try {
|
|
26
26
|
|
|
27
27
|
let shipObj = new Shipment();
|
|
28
28
|
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentInput', propertyValue: args});
|
|
29
|
-
let landmarkShipmentRequest: string = shipObj.buildShipmentRequest(args,this.username,this.password,this.test,this.clientId,this.vendorEORINumber,this.vendorIOSSNumber);
|
|
29
|
+
let landmarkShipmentRequest: string = shipObj.buildShipmentRequest(args, dangerousGoodsDeatils, this.username,this.password,this.test,this.clientId,this.vendorEORINumber,this.vendorIOSSNumber, regionValue);
|
|
30
30
|
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentRequest', propertyValue: landmarkShipmentRequest});
|
|
31
31
|
let landmarkShipmentRes: any = await shipObj.createShipment(landmarkShipmentRequest);
|
|
32
32
|
if(landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']){
|
package/src/shipment.ts
CHANGED
|
@@ -66,10 +66,11 @@ export default class Shipment {
|
|
|
66
66
|
return shipper;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
buildShipmentRequest(args: any,username:string,password:string,test:boolean,clientId:number,vendorEORINumber:any,vendorIOSSNumber:any): string{
|
|
69
|
+
buildShipmentRequest(args: any, dangerousGoodsDeatils: any = "", username:string,password:string,test:boolean,clientId:number,vendorEORINumber:any,vendorIOSSNumber:any,reqRegionValue:string): string{
|
|
70
70
|
try {
|
|
71
71
|
const EUCountries = ["BE", "BG", "CZ", "DK", "DE", "EE", "IE", "EL", "ES", "FR", "HR", "IT", "CY", "LV", "LT", "LU", "HU", "MT", "NL", "AT", "PL", "PT", "RO", "SI", "SK", "FI", "SE"];
|
|
72
72
|
let iossNumber=""
|
|
73
|
+
let regionValue = (reqRegionValue && reqRegionValue != "") ? reqRegionValue : "Landmark BUF"
|
|
73
74
|
if( EUCountries.indexOf(args.shipto_address.country.toUpperCase()) != -1 || EUCountries.indexOf(args.targetToCountry.toUpperCase()) != -1 ){
|
|
74
75
|
iossNumber = vendorIOSSNumber
|
|
75
76
|
}
|
|
@@ -87,7 +88,7 @@ export default class Shipment {
|
|
|
87
88
|
"Reference": args.reference,
|
|
88
89
|
"ShipTo": this.getConsignee(args.shipto_address,args.targetToCountry),
|
|
89
90
|
"ShippingLane": {
|
|
90
|
-
"Region" :
|
|
91
|
+
"Region" : regionValue
|
|
91
92
|
},
|
|
92
93
|
"ShipMethod": args._carrierRateObj.servicecode,
|
|
93
94
|
"OrderTotal": args.shipment_total_usd,
|
|
@@ -110,18 +111,40 @@ export default class Shipment {
|
|
|
110
111
|
"VendorInformation": this.getVendorInfo(args.shipfrom_address,args.targetFromCountry,eroiNumber,iossNumber),
|
|
111
112
|
"IsCommercialShipment": args.b2b ? 1 : 0,
|
|
112
113
|
}
|
|
113
|
-
let items = args.pieces.map((item:any)=>{
|
|
114
|
-
|
|
114
|
+
// let items = args.pieces.map((item:any)=>{
|
|
115
|
+
// return {"Item":{
|
|
116
|
+
// "Sku": item.sku || 12345,
|
|
117
|
+
// "Description": item.description.substr(0,100),
|
|
118
|
+
// "Quantity": item.quantity,
|
|
119
|
+
// "UnitPrice": (item.sale_price == 0) ? 0.01 : item.sale_price,
|
|
120
|
+
// "HSCode": item.hs_code,
|
|
121
|
+
// "CountryOfOrigin": item.origin_country_code
|
|
122
|
+
// }
|
|
123
|
+
// }
|
|
124
|
+
// })
|
|
125
|
+
let items = args.pieces.map((item:any) => {
|
|
126
|
+
let itemObj: any = {
|
|
115
127
|
"Sku": item.sku || 12345,
|
|
116
|
-
"Description": item.description.substr(0,100),
|
|
128
|
+
"Description": item.description.substr(0, 100),
|
|
117
129
|
"Quantity": item.quantity,
|
|
118
|
-
"UnitPrice":
|
|
130
|
+
"UnitPrice": (item.sale_price == 0) ? 0.01 : item.sale_price,
|
|
119
131
|
"HSCode": item.hs_code,
|
|
120
132
|
"CountryOfOrigin": item.origin_country_code
|
|
133
|
+
};
|
|
134
|
+
if(dangerousGoodsDeatils && dangerousGoodsDeatils[item.sku] && dangerousGoodsDeatils[item.sku]['UNCode']){
|
|
135
|
+
let dangerousGoodInformation = {
|
|
136
|
+
"ContainsDangerousGoods": 1,
|
|
137
|
+
"UNCode": dangerousGoodsDeatils[item.sku]['UNCode'] || "",
|
|
138
|
+
"PackingGroup": dangerousGoodsDeatils[item.sku]['CategoryCode'] || "",
|
|
139
|
+
"PackingInstructions": dangerousGoodsDeatils[item.sku]['PackingInstructions'] || "",
|
|
140
|
+
"ItemWeight": item.weight,
|
|
141
|
+
"ItemWeightUnit": args.weight_unit
|
|
142
|
+
}
|
|
143
|
+
itemObj["DangerousGoodsInformation"] = dangerousGoodInformation;
|
|
121
144
|
}
|
|
122
|
-
|
|
123
|
-
})
|
|
124
|
-
importRequest["Items"] =
|
|
145
|
+
return itemObj;
|
|
146
|
+
});
|
|
147
|
+
importRequest["Items"] = { "Item": items };
|
|
125
148
|
let request :any = {
|
|
126
149
|
"ImportRequest": importRequest
|
|
127
150
|
}
|
package/src/tracking.ts
CHANGED
|
@@ -2,31 +2,6 @@ import { FlavorcloudTrackingResponse} from "./types";
|
|
|
2
2
|
import { MyGlobal as app } from './globals';
|
|
3
3
|
import { js2xml , xml2json} from 'xml-js';
|
|
4
4
|
|
|
5
|
-
let eventMappings:any = {
|
|
6
|
-
"50" : "In Progress",
|
|
7
|
-
"60" : "In Progress",
|
|
8
|
-
"75" : "In Transit",
|
|
9
|
-
"80" : "In Transit",
|
|
10
|
-
"90" : "Customs Hold",
|
|
11
|
-
"100" : "In Transit",
|
|
12
|
-
"125" : "Cleared Customs",
|
|
13
|
-
"135" : "Customs Delay",
|
|
14
|
-
"150" : "In Transit",
|
|
15
|
-
"155" : "In Transit",
|
|
16
|
-
"200" : "In Transit",
|
|
17
|
-
"225" : "Arrived at Import Gateway",
|
|
18
|
-
"250" : "In Transit",
|
|
19
|
-
"275" : "In Transit - Last Mile",
|
|
20
|
-
"300" : "Out For Delivery",
|
|
21
|
-
"400" : "In Transit",
|
|
22
|
-
"410" : "In Transit",
|
|
23
|
-
"450" : "In Transit",
|
|
24
|
-
"500" : "Delivered",
|
|
25
|
-
"550" : "Delivered",
|
|
26
|
-
"800" : "In Transit",
|
|
27
|
-
"900" : "Attempted Delivery"
|
|
28
|
-
}
|
|
29
|
-
|
|
30
5
|
export default class Tracking {
|
|
31
6
|
constructor() {
|
|
32
7
|
|
|
@@ -86,17 +61,13 @@ export default class Tracking {
|
|
|
86
61
|
for(let i = 0; i < resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'].length; i++){
|
|
87
62
|
let history: any = {};
|
|
88
63
|
let code :any = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['EventCode']['_text'] ;
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
// else if(code == '500'){
|
|
97
|
-
// history.status = "Delivered";
|
|
98
|
-
// }
|
|
99
|
-
// else{
|
|
64
|
+
if(code == '50' || code == '60' ){
|
|
65
|
+
history.status = "In Progress";
|
|
66
|
+
}
|
|
67
|
+
else if(code == '500'){
|
|
68
|
+
history.status = "Delivered";
|
|
69
|
+
}
|
|
70
|
+
else{
|
|
100
71
|
history.status = "In Transit";
|
|
101
72
|
}
|
|
102
73
|
history.status_date = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['DateTime']['_text'];
|
|
@@ -109,4 +80,4 @@ export default class Tracking {
|
|
|
109
80
|
}
|
|
110
81
|
return response;
|
|
111
82
|
}
|
|
112
|
-
}
|
|
83
|
+
}
|
package/src/trackingEvents.json
DELETED
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"50" : "In Progress",
|
|
3
|
-
"60" : "In Progress",
|
|
4
|
-
"75" : "In Transit",
|
|
5
|
-
"80" : "In Transit",
|
|
6
|
-
"90" : "Customs Hold",
|
|
7
|
-
"100" : "In Transit",
|
|
8
|
-
"125" : "Cleared Customs",
|
|
9
|
-
"135" : "Customs Delay",
|
|
10
|
-
"150" : "In Transit",
|
|
11
|
-
"155" : "In Transit",
|
|
12
|
-
"200" : "In Transit",
|
|
13
|
-
"225" : "Arrived at Import Gateway",
|
|
14
|
-
"250" : "In Transit",
|
|
15
|
-
"275" : "In Transit - Last Mile",
|
|
16
|
-
"300" : "Out For Delivery",
|
|
17
|
-
"400" : "In Transit",
|
|
18
|
-
"410" : "In Transit",
|
|
19
|
-
"450" : "In Transit",
|
|
20
|
-
"500" : "Delivered",
|
|
21
|
-
"550" : "Delivered",
|
|
22
|
-
"800" : "In Transit",
|
|
23
|
-
"900" : "Attempted Delivery"
|
|
24
|
-
}
|