fc-landmark 1.0.1 → 1.0.2
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/core.js +1 -2
- package/dist/core.js.map +1 -1
- package/dist/index.js +0 -1
- package/dist/index.js.map +1 -1
- package/dist/landmark.js +15 -14
- package/dist/landmark.js.map +1 -1
- package/dist/shipment.js +5 -5
- package/dist/shipment.js.map +1 -1
- package/dist/tracking.js +7 -4
- package/dist/tracking.js.map +1 -1
- package/package.json +1 -1
- package/src/landmark.ts +15 -13
- package/src/shipment.ts +3 -3
- package/src/tracking.ts +5 -2
package/dist/core.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.setRequredGlobals = void 0;
|
|
7
7
|
const globals_1 = require("./globals");
|
|
8
8
|
const axios_1 = __importDefault(require("./axios"));
|
|
9
|
-
|
|
9
|
+
exports.setRequredGlobals = (logger, flclerror, rootRequestId, requestId) => {
|
|
10
10
|
globals_1.MyGlobal.logger = logger || undefined;
|
|
11
11
|
globals_1.MyGlobal.flclError = flclerror || undefined;
|
|
12
12
|
globals_1.MyGlobal.rootRequestId = rootRequestId || '';
|
|
@@ -15,5 +15,4 @@ const setRequredGlobals = (logger, flclerror, rootRequestId, requestId) => {
|
|
|
15
15
|
globals_1.MyGlobal.ship_url = "https://api.landmarkglobal.com/v2/Import.php",
|
|
16
16
|
globals_1.MyGlobal.track_url = "https://api.landmarkglobal.com/v2/Track.php";
|
|
17
17
|
};
|
|
18
|
-
exports.setRequredGlobals = setRequredGlobals;
|
|
19
18
|
//# sourceMappingURL=core.js.map
|
package/dist/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA4C;AAE5C,oDAAsC;
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../src/core.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA4C;AAE5C,oDAAsC;AACzB,QAAA,iBAAiB,GAAG,CAAC,MAAmB,EAAE,SAAqB,EAAE,aAAsB,EAAE,SAAkB,EAAE,EAAE;IACxH,kBAAG,CAAC,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC;IACjC,kBAAG,CAAC,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC;IACvC,kBAAG,CAAC,aAAa,GAAG,aAAa,IAAI,EAAE,CAAC;IACxC,kBAAG,CAAC,SAAS,GAAG,SAAS,IAAI,EAAE,CAAC;IAChC,kBAAG,CAAC,KAAK,GAAG,eAAe,CAAC;IAC5B,kBAAG,CAAC,QAAQ,GAAG,8CAA8C;QAC7D,kBAAG,CAAC,SAAS,GAAG,6CAA6C,CAAA;AACjE,CAAC,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.LandMark = void 0;
|
|
4
3
|
var landmark_1 = require("./landmark");
|
|
5
4
|
Object.defineProperty(exports, "LandMark", { enumerable: true, get: function () { return landmark_1.LandMark; } });
|
|
6
5
|
//export default ECMS;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,uCAAuC;AAA7B,oGAAA,QAAQ,OAAA;AAElB,sBAAsB"}
|
package/dist/landmark.js
CHANGED
|
@@ -18,20 +18,21 @@ const tracking_1 = __importDefault(require("./tracking"));
|
|
|
18
18
|
const core_1 = require("./core");
|
|
19
19
|
const globals_1 = require("./globals");
|
|
20
20
|
class LandMark {
|
|
21
|
-
constructor(username, password, test, logger, flclerror, rootRequestId, requestId) {
|
|
21
|
+
constructor(username, password, clientId, test, logger, flclerror, rootRequestId, requestId) {
|
|
22
22
|
this.username = username;
|
|
23
23
|
this.password = password;
|
|
24
24
|
this.test = test;
|
|
25
|
-
|
|
25
|
+
this.clientId = clientId;
|
|
26
|
+
core_1.setRequredGlobals(logger, flclerror, rootRequestId, requestId);
|
|
26
27
|
}
|
|
27
28
|
createShipmet(args) {
|
|
28
29
|
var _a, _b, _c, _d;
|
|
29
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
31
|
try {
|
|
31
32
|
let shipObj = new shipment_1.default();
|
|
32
|
-
(_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: '
|
|
33
|
-
let landmarkShipmentRequest = shipObj.buildShipmentRequest(args, this.username, this.password, this.test);
|
|
34
|
-
(_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: '
|
|
33
|
+
(_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentInput', propertyValue: args });
|
|
34
|
+
let landmarkShipmentRequest = shipObj.buildShipmentRequest(args, this.username, this.password, this.test, this.clientId);
|
|
35
|
+
(_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentRequest', propertyValue: landmarkShipmentRequest });
|
|
35
36
|
let landmarkShipmentRes = yield shipObj.createShipment(landmarkShipmentRequest);
|
|
36
37
|
if (landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']) {
|
|
37
38
|
throw new Error(landmarkShipmentRes['ImportResponse']['Errors']['Error']['ErrorMessage']['_text']);
|
|
@@ -41,7 +42,7 @@ class LandMark {
|
|
|
41
42
|
return response;
|
|
42
43
|
}
|
|
43
44
|
catch (e) {
|
|
44
|
-
(_d = globals_1.MyGlobal.logger) === null || _d === void 0 ? void 0 : _d.error(globals_1.MyGlobal.flclError.create({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: '
|
|
45
|
+
(_d = globals_1.MyGlobal.logger) === null || _d === void 0 ? void 0 : _d.error(globals_1.MyGlobal.flclError.create({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while creating shipment in Landmark' }));
|
|
45
46
|
throw e;
|
|
46
47
|
}
|
|
47
48
|
});
|
|
@@ -52,18 +53,18 @@ class LandMark {
|
|
|
52
53
|
try {
|
|
53
54
|
let trackObj = new tracking_1.default();
|
|
54
55
|
(_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkInput', propertyValue: args });
|
|
55
|
-
let landmarkTrackRequest = trackObj.buildTrackingRequest(args, this.username, this.password, this.test);
|
|
56
|
-
(_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
57
|
-
let
|
|
58
|
-
if (
|
|
59
|
-
throw new Error(
|
|
56
|
+
let landmarkTrackRequest = trackObj.buildTrackingRequest(args, this.username, this.password, this.test, this.clientId);
|
|
57
|
+
(_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkTrackRequest', propertyValue: landmarkTrackRequest });
|
|
58
|
+
let landMarkTrackingRes = yield trackObj.trackInfo(landmarkTrackRequest);
|
|
59
|
+
if (landMarkTrackingRes.hasOwnProperty("TrackResponse") && landMarkTrackingRes['TrackResponse']['Errors']) {
|
|
60
|
+
throw new Error(landMarkTrackingRes['TrackResponse']['Errors']['Error']['ErrorMessage']['_text']);
|
|
60
61
|
}
|
|
61
|
-
let response = trackObj.buildResponse(
|
|
62
|
-
(_c = globals_1.MyGlobal.logger) === null || _c === void 0 ? void 0 : _c.info({ npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
62
|
+
let response = trackObj.buildResponse(landMarkTrackingRes, args);
|
|
63
|
+
(_c = globals_1.MyGlobal.logger) === null || _c === void 0 ? void 0 : _c.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'response', propertyValue: response });
|
|
63
64
|
return response;
|
|
64
65
|
}
|
|
65
66
|
catch (e) {
|
|
66
|
-
(_d = globals_1.MyGlobal.logger) === null || _d === void 0 ? void 0 : _d.error(globals_1.MyGlobal.flclError.create({ npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
67
|
+
(_d = globals_1.MyGlobal.logger) === null || _d === void 0 ? void 0 : _d.error(globals_1.MyGlobal.flclError.create({ npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while get trackinfo in Landmark' }));
|
|
67
68
|
throw e;
|
|
68
69
|
}
|
|
69
70
|
});
|
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;
|
|
1
|
+
{"version":3,"file":"landmark.js","sourceRoot":"","sources":["../src/landmark.ts"],"names":[],"mappings":"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"}
|
package/dist/shipment.js
CHANGED
|
@@ -49,7 +49,7 @@ class Shipment {
|
|
|
49
49
|
};
|
|
50
50
|
return shipper;
|
|
51
51
|
}
|
|
52
|
-
buildShipmentRequest(args, username, password, test) {
|
|
52
|
+
buildShipmentRequest(args, username, password, test, clientId) {
|
|
53
53
|
try {
|
|
54
54
|
let importRequest = {
|
|
55
55
|
"Login": {
|
|
@@ -57,13 +57,13 @@ class Shipment {
|
|
|
57
57
|
"Password": password
|
|
58
58
|
},
|
|
59
59
|
"Test": test,
|
|
60
|
-
"ClientID":
|
|
60
|
+
"ClientID": clientId,
|
|
61
61
|
"Reference": args.reference,
|
|
62
62
|
"ShipTo": this.getConsignee(args),
|
|
63
63
|
"ShippingLane": {
|
|
64
64
|
"Region": "Landmark BUF"
|
|
65
65
|
},
|
|
66
|
-
"ShipMethod": args._carrierRateObj.
|
|
66
|
+
"ShipMethod": args._carrierRateObj.servicecode,
|
|
67
67
|
"OrderTotal": args.shipment_total_usd,
|
|
68
68
|
"ItemsCurrency": args.currency,
|
|
69
69
|
"ProduceLabel": true,
|
|
@@ -98,7 +98,7 @@ class Shipment {
|
|
|
98
98
|
let request = {
|
|
99
99
|
"ImportRequest": importRequest
|
|
100
100
|
};
|
|
101
|
-
const xmlData =
|
|
101
|
+
const xmlData = xml_js_1.js2xml(request, { compact: true, ignoreComment: true, spaces: 4 });
|
|
102
102
|
return xmlData;
|
|
103
103
|
}
|
|
104
104
|
catch (e) {
|
|
@@ -117,7 +117,7 @@ class Shipment {
|
|
|
117
117
|
let resp = yield globals_1.MyGlobal.axios.post(globals_1.MyGlobal.ship_url, ShipmentRequest, configs);
|
|
118
118
|
console.log(resp.data);
|
|
119
119
|
(_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'Landmark-RAW-RESPOSNE', propertyValue: resp.data });
|
|
120
|
-
let responsejson =
|
|
120
|
+
let responsejson = xml_js_1.xml2json(resp.data, { compact: true, spaces: 4 });
|
|
121
121
|
return JSON.parse(responsejson);
|
|
122
122
|
}
|
|
123
123
|
catch (e) {
|
package/dist/shipment.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shipment.js","sourceRoot":"","sources":["../src/shipment.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,uCAA4C;AAC5C,mCAA0C;AAE1C,MAAqB,QAAQ;IACzB;IAEA,CAAC;IACD,YAAY,CAAC,MAAW;QAEpB,MAAM,eAAe,GAAG,MAAM,CAAC,cAAc,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC;QAC3I,IAAI,SAAS,GAAQ;YACjB,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;YAC/C,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;YAC9D,UAAU,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,EAAC,EAAE,CAAC;YAC3C,UAAU,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,EAAC,GAAG,CAAC;YAC7C,UAAU,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,EAAC,GAAG,CAAC;YAC9C,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI;YAClC,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK;YACpC,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG;YACvC,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO;YAC1F,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE;YAC/C,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK;YACpC,gBAAgB,EAAE,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;SACrG,CAAC;QACF,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,cAAc,CAAC,MAAW;QACtB,MAAM,eAAe,GAAG,MAAM,CAAC,gBAAgB,CAAC,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC;QACjJ,IAAI,OAAO,GAAQ;YACf,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;YACjD,WAAW,EAAE,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;YAChE,UAAU,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,EAAC,EAAE,CAAC;YAC3C,UAAU,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,EAAC,GAAG,CAAC;YAC7C,UAAU,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,EAAC,GAAG,CAAC;YAC9C,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,IAAI;YACpC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK;YACtC,YAAY,EAAE,MAAM,CAAC,gBAAgB,CAAC,GAAG;YACzC,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO;YAC5F,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE;YACjD,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK;SACzC,CAAC;QACF,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,oBAAoB,CAAC,IAAS,EAAC,QAAe,EAAC,QAAe,EAAC,IAAY;
|
|
1
|
+
{"version":3,"file":"shipment.js","sourceRoot":"","sources":["../src/shipment.ts"],"names":[],"mappings":"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"}
|
package/dist/tracking.js
CHANGED
|
@@ -14,7 +14,7 @@ const xml_js_1 = require("xml-js");
|
|
|
14
14
|
class Tracking {
|
|
15
15
|
constructor() {
|
|
16
16
|
}
|
|
17
|
-
buildTrackingRequest(args, username, password, test) {
|
|
17
|
+
buildTrackingRequest(args, username, password, test, clientId) {
|
|
18
18
|
try {
|
|
19
19
|
let trackRequest = {
|
|
20
20
|
"Login": {
|
|
@@ -22,14 +22,14 @@ class Tracking {
|
|
|
22
22
|
"Password": password
|
|
23
23
|
},
|
|
24
24
|
"Test": test,
|
|
25
|
-
"ClientID":
|
|
25
|
+
"ClientID": clientId,
|
|
26
26
|
"TrackingNumber": args.tracking_number,
|
|
27
27
|
"RetrievalType": "Historical"
|
|
28
28
|
};
|
|
29
29
|
let request = {
|
|
30
30
|
"TrackRequest": trackRequest
|
|
31
31
|
};
|
|
32
|
-
const xmlData =
|
|
32
|
+
const xmlData = xml_js_1.js2xml(request, { compact: true, ignoreComment: true, spaces: 4 });
|
|
33
33
|
return xmlData;
|
|
34
34
|
}
|
|
35
35
|
catch (e) {
|
|
@@ -47,7 +47,7 @@ class Tracking {
|
|
|
47
47
|
};
|
|
48
48
|
let resp = yield globals_1.MyGlobal.axios.post(globals_1.MyGlobal.track_url, ShipmentRequest, configs);
|
|
49
49
|
(_a = globals_1.MyGlobal.logger) === null || _a === void 0 ? void 0 : _a.info({ npm: 'fc-landmark', className: 'Tracking', methodName: 'trackInfo', propertyName: 'landmark-RAW-RESPOSNE', propertyValue: resp.data });
|
|
50
|
-
let responsejson =
|
|
50
|
+
let responsejson = xml_js_1.xml2json(resp.data, { compact: true, spaces: 4 });
|
|
51
51
|
return JSON.parse(responsejson);
|
|
52
52
|
}
|
|
53
53
|
catch (e) {
|
|
@@ -63,6 +63,9 @@ class Tracking {
|
|
|
63
63
|
tracking_number: args.tracking_number,
|
|
64
64
|
tracking_history: []
|
|
65
65
|
};
|
|
66
|
+
if (!Array.isArray(resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'])) {
|
|
67
|
+
resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'] = [resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event']];
|
|
68
|
+
}
|
|
66
69
|
for (let i = 0; i < resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'].length; i++) {
|
|
67
70
|
let history = {};
|
|
68
71
|
let code = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['EventCode']['_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,MAAqB,QAAQ;IACzB;IAEA,CAAC;IAED,oBAAoB,CAAC,IAAS,EAAC,QAAgB,EAAC,QAAgB,EAAE,IAAY;
|
|
1
|
+
{"version":3,"file":"tracking.js","sourceRoot":"","sources":["../src/tracking.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/landmark.ts
CHANGED
|
@@ -8,10 +8,12 @@ export class LandMark {
|
|
|
8
8
|
private username : string;
|
|
9
9
|
private password : string;
|
|
10
10
|
private test : boolean;
|
|
11
|
-
|
|
11
|
+
private clientId : number;
|
|
12
|
+
constructor(username:string,password:string,clientId:number,test:boolean, logger?: FlclLogger, flclerror?: FlclError, rootRequestId?: string, requestId?: string) {
|
|
12
13
|
this.username = username;
|
|
13
14
|
this.password = password;
|
|
14
15
|
this.test = test;
|
|
16
|
+
this.clientId = clientId;
|
|
15
17
|
setRequredGlobals(logger, flclerror, rootRequestId, requestId);
|
|
16
18
|
}
|
|
17
19
|
|
|
@@ -19,9 +21,9 @@ export class LandMark {
|
|
|
19
21
|
try {
|
|
20
22
|
|
|
21
23
|
let shipObj = new Shipment();
|
|
22
|
-
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: '
|
|
23
|
-
let landmarkShipmentRequest: string = shipObj.buildShipmentRequest(args,this.username,this.password,this.test);
|
|
24
|
-
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: '
|
|
24
|
+
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentInput', propertyValue: args});
|
|
25
|
+
let landmarkShipmentRequest: string = shipObj.buildShipmentRequest(args,this.username,this.password,this.test,this.clientId);
|
|
26
|
+
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentRequest', propertyValue: landmarkShipmentRequest});
|
|
25
27
|
let landmarkShipmentRes: any = await shipObj.createShipment(landmarkShipmentRequest);
|
|
26
28
|
if(landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']){
|
|
27
29
|
throw new Error(landmarkShipmentRes['ImportResponse']['Errors']['Error']['ErrorMessage']['_text']) ;
|
|
@@ -30,7 +32,7 @@ export class LandMark {
|
|
|
30
32
|
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'response', propertyValue: response});
|
|
31
33
|
return response;
|
|
32
34
|
} catch(e) {
|
|
33
|
-
app.logger?.error(app.flclError!.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: '
|
|
35
|
+
app.logger?.error(app.flclError!.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while creating shipment in Landmark'}));
|
|
34
36
|
throw e;
|
|
35
37
|
}
|
|
36
38
|
}
|
|
@@ -40,17 +42,17 @@ export class LandMark {
|
|
|
40
42
|
|
|
41
43
|
let trackObj = new Tracking();
|
|
42
44
|
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkInput', propertyValue: args});
|
|
43
|
-
let landmarkTrackRequest: string = trackObj.buildTrackingRequest(args,this.username,this.password,this.test);
|
|
44
|
-
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
45
|
-
let
|
|
46
|
-
if(
|
|
47
|
-
throw new Error(
|
|
45
|
+
let landmarkTrackRequest: string = trackObj.buildTrackingRequest(args,this.username,this.password,this.test,this.clientId);
|
|
46
|
+
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkTrackRequest', propertyValue: landmarkTrackRequest});
|
|
47
|
+
let landMarkTrackingRes: any = await trackObj.trackInfo(landmarkTrackRequest);
|
|
48
|
+
if(landMarkTrackingRes.hasOwnProperty("TrackResponse") && landMarkTrackingRes['TrackResponse']['Errors']){
|
|
49
|
+
throw new Error(landMarkTrackingRes['TrackResponse']['Errors']['Error']['ErrorMessage']['_text']) ;
|
|
48
50
|
}
|
|
49
|
-
let response: FlavorcloudTrackingResponse = trackObj.buildResponse(
|
|
50
|
-
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
51
|
+
let response: FlavorcloudTrackingResponse = trackObj.buildResponse(landMarkTrackingRes, args);
|
|
52
|
+
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'response', propertyValue: response});
|
|
51
53
|
return response;
|
|
52
54
|
} catch(e) {
|
|
53
|
-
app.logger?.error(app.flclError!.create({npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
55
|
+
app.logger?.error(app.flclError!.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'landMark_ERROR', cause: e, message: 'Exception while get trackinfo in Landmark'}));
|
|
54
56
|
throw e;
|
|
55
57
|
}
|
|
56
58
|
}
|
package/src/shipment.ts
CHANGED
|
@@ -43,7 +43,7 @@ export default class Shipment {
|
|
|
43
43
|
};
|
|
44
44
|
return shipper;
|
|
45
45
|
}
|
|
46
|
-
buildShipmentRequest(args: any,username:string,password:string,test:boolean): string{
|
|
46
|
+
buildShipmentRequest(args: any,username:string,password:string,test:boolean,clientId:number): string{
|
|
47
47
|
try {
|
|
48
48
|
let importRequest :any = {
|
|
49
49
|
"Login": {
|
|
@@ -51,13 +51,13 @@ export default class Shipment {
|
|
|
51
51
|
"Password": password
|
|
52
52
|
},
|
|
53
53
|
"Test": test,
|
|
54
|
-
"ClientID":
|
|
54
|
+
"ClientID": clientId ,
|
|
55
55
|
"Reference": args.reference,
|
|
56
56
|
"ShipTo": this.getConsignee( args),
|
|
57
57
|
"ShippingLane": {
|
|
58
58
|
"Region" : "Landmark BUF"
|
|
59
59
|
},
|
|
60
|
-
"ShipMethod": args._carrierRateObj.
|
|
60
|
+
"ShipMethod": args._carrierRateObj.servicecode,
|
|
61
61
|
"OrderTotal": args.shipment_total_usd,
|
|
62
62
|
"ItemsCurrency": args.currency,
|
|
63
63
|
"ProduceLabel": true,
|
package/src/tracking.ts
CHANGED
|
@@ -7,7 +7,7 @@ export default class Tracking {
|
|
|
7
7
|
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
buildTrackingRequest(args: any,username: string,password: string, test:boolean): string{
|
|
10
|
+
buildTrackingRequest(args: any,username: string,password: string, test:boolean,clientId:number): string{
|
|
11
11
|
try {
|
|
12
12
|
let trackRequest :any = {
|
|
13
13
|
"Login": {
|
|
@@ -15,7 +15,7 @@ export default class Tracking {
|
|
|
15
15
|
"Password": password
|
|
16
16
|
},
|
|
17
17
|
"Test": test,
|
|
18
|
-
"ClientID":
|
|
18
|
+
"ClientID": clientId ,
|
|
19
19
|
"TrackingNumber": args.tracking_number,
|
|
20
20
|
"RetrievalType":"Historical"
|
|
21
21
|
|
|
@@ -55,6 +55,9 @@ export default class Tracking {
|
|
|
55
55
|
tracking_number: args.tracking_number,
|
|
56
56
|
tracking_history : []
|
|
57
57
|
};
|
|
58
|
+
if(! Array.isArray(resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'])){
|
|
59
|
+
resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'] = [resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event']]
|
|
60
|
+
}
|
|
58
61
|
for(let i = 0; i < resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'].length; i++){
|
|
59
62
|
let history: any = {};
|
|
60
63
|
let code :any = resp['TrackResponse']['Result']['Packages']['Package']['Events']['Event'][i]['EventCode']['_text'] ;
|