fc-landmark 1.0.1 → 1.0.3
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 +16 -13
- package/dist/landmark.js.map +1 -1
- package/dist/shipment.js +59 -28
- package/dist/shipment.js.map +1 -1
- package/dist/tracking.js +5 -2
- package/dist/tracking.js.map +1 -1
- package/package.json +1 -1
- package/src/landmark.ts +19 -13
- package/src/shipment.ts +61 -28
- package/src/tracking.ts +5 -2
package/dist/landmark.js
CHANGED
|
@@ -18,10 +18,13 @@ 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, vendorEORINumber, vendorIOSSNumber, logger, flclerror, rootRequestId, requestId) {
|
|
22
22
|
this.username = username;
|
|
23
23
|
this.password = password;
|
|
24
24
|
this.test = test;
|
|
25
|
+
this.clientId = clientId;
|
|
26
|
+
this.vendorEORINumber = vendorEORINumber;
|
|
27
|
+
this.vendorIOSSNumber = vendorIOSSNumber;
|
|
25
28
|
(0, core_1.setRequredGlobals)(logger, flclerror, rootRequestId, requestId);
|
|
26
29
|
}
|
|
27
30
|
createShipmet(args) {
|
|
@@ -29,9 +32,9 @@ class LandMark {
|
|
|
29
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
33
|
try {
|
|
31
34
|
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: '
|
|
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);
|
|
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 });
|
|
35
38
|
let landmarkShipmentRes = yield shipObj.createShipment(landmarkShipmentRequest);
|
|
36
39
|
if (landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']) {
|
|
37
40
|
throw new Error(landmarkShipmentRes['ImportResponse']['Errors']['Error']['ErrorMessage']['_text']);
|
|
@@ -41,7 +44,7 @@ class LandMark {
|
|
|
41
44
|
return response;
|
|
42
45
|
}
|
|
43
46
|
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: '
|
|
47
|
+
(_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
48
|
throw e;
|
|
46
49
|
}
|
|
47
50
|
});
|
|
@@ -52,18 +55,18 @@ class LandMark {
|
|
|
52
55
|
try {
|
|
53
56
|
let trackObj = new tracking_1.default();
|
|
54
57
|
(_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(
|
|
58
|
+
let landmarkTrackRequest = trackObj.buildTrackingRequest(args, this.username, this.password, this.test, this.clientId);
|
|
59
|
+
(_b = globals_1.MyGlobal.logger) === null || _b === void 0 ? void 0 : _b.info({ npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkTrackRequest', propertyValue: landmarkTrackRequest });
|
|
60
|
+
let landMarkTrackingRes = yield trackObj.trackInfo(landmarkTrackRequest);
|
|
61
|
+
if (landMarkTrackingRes.hasOwnProperty("TrackResponse") && landMarkTrackingRes['TrackResponse']['Errors']) {
|
|
62
|
+
throw new Error(landMarkTrackingRes['TrackResponse']['Errors']['Error']['ErrorMessage']['_text']);
|
|
60
63
|
}
|
|
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: '
|
|
64
|
+
let response = trackObj.buildResponse(landMarkTrackingRes, args);
|
|
65
|
+
(_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
66
|
return response;
|
|
64
67
|
}
|
|
65
68
|
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: '
|
|
69
|
+
(_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
70
|
throw e;
|
|
68
71
|
}
|
|
69
72
|
});
|
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
|
@@ -14,56 +14,86 @@ const xml_js_1 = require("xml-js");
|
|
|
14
14
|
class Shipment {
|
|
15
15
|
constructor() {
|
|
16
16
|
}
|
|
17
|
-
getConsignee(
|
|
18
|
-
const combinedAddress =
|
|
17
|
+
getConsignee(shipto_address, targetToCountry) {
|
|
18
|
+
const combinedAddress = shipto_address.address_line_1 + shipto_address.address_line_2 + shipto_address.address_line_3;
|
|
19
19
|
let consignee = {
|
|
20
|
-
"Name":
|
|
21
|
-
"Attention":
|
|
20
|
+
"Name": shipto_address.name.slice(0, 50),
|
|
21
|
+
"Attention": shipto_address.attention_name.slice(0, 50),
|
|
22
22
|
"Address1": combinedAddress.substring(0, 60),
|
|
23
23
|
"Address2": combinedAddress.substring(61, 120),
|
|
24
24
|
"Address3": combinedAddress.substring(121, 180),
|
|
25
|
-
"City":
|
|
26
|
-
"State":
|
|
27
|
-
"PostalCode":
|
|
28
|
-
"Country":
|
|
29
|
-
"Phone":
|
|
30
|
-
"Email":
|
|
31
|
-
"ConsigneeTaxID":
|
|
25
|
+
"City": shipto_address.city,
|
|
26
|
+
"State": shipto_address.state,
|
|
27
|
+
"PostalCode": shipto_address.zip,
|
|
28
|
+
"Country": targetToCountry ? targetToCountry : shipto_address.country,
|
|
29
|
+
"Phone": shipto_address.phone.toString(),
|
|
30
|
+
"Email": shipto_address.email,
|
|
31
|
+
"ConsigneeTaxID": shipto_address.federal_tax_id ? shipto_address.federal_tax_id : ""
|
|
32
32
|
};
|
|
33
33
|
return consignee;
|
|
34
34
|
}
|
|
35
|
-
getShipperInfo(
|
|
36
|
-
const combinedAddress =
|
|
35
|
+
getShipperInfo(shipfrom_address, targetFromCountry) {
|
|
36
|
+
const combinedAddress = shipfrom_address.address_line_1 + shipfrom_address.address_line_2 + shipfrom_address.address_line_3;
|
|
37
37
|
let shipper = {
|
|
38
|
-
"Name":
|
|
39
|
-
"Attention":
|
|
38
|
+
"Name": shipfrom_address.name.slice(0, 50),
|
|
39
|
+
"Attention": shipfrom_address.attention_name.slice(0, 50),
|
|
40
40
|
"Address1": combinedAddress.substring(0, 60),
|
|
41
41
|
"Address2": combinedAddress.substring(61, 120),
|
|
42
42
|
"Address3": combinedAddress.substring(121, 180),
|
|
43
|
-
"City":
|
|
44
|
-
"State":
|
|
45
|
-
"PostalCode":
|
|
46
|
-
"Country":
|
|
47
|
-
"Phone":
|
|
48
|
-
"Email":
|
|
43
|
+
"City": shipfrom_address.city,
|
|
44
|
+
"State": shipfrom_address.state,
|
|
45
|
+
"PostalCode": shipfrom_address.zip,
|
|
46
|
+
"Country": targetFromCountry ? targetFromCountry : shipfrom_address.country,
|
|
47
|
+
"Phone": shipfrom_address.phone.toString(),
|
|
48
|
+
"Email": shipfrom_address.email
|
|
49
49
|
};
|
|
50
50
|
return shipper;
|
|
51
51
|
}
|
|
52
|
-
|
|
52
|
+
getVendorInfo(shipfrom_address, targetFromCountry, eroiNumber, iossNumber) {
|
|
53
|
+
const combinedAddress = shipfrom_address.address_line_1 + shipfrom_address.address_line_2 + shipfrom_address.address_line_3;
|
|
54
|
+
let shipper = {
|
|
55
|
+
"VendorName": shipfrom_address.name.slice(0, 50),
|
|
56
|
+
"Attention": shipfrom_address.attention_name.slice(0, 50),
|
|
57
|
+
"VendorAddress1": combinedAddress.substring(0, 60),
|
|
58
|
+
"VendorAddress2": combinedAddress.substring(61, 120),
|
|
59
|
+
"VendorAddress3": combinedAddress.substring(121, 180),
|
|
60
|
+
"VendorCity": shipfrom_address.city,
|
|
61
|
+
"VendorState": shipfrom_address.state,
|
|
62
|
+
"VendorPostalCode": shipfrom_address.zip,
|
|
63
|
+
"VendorCountry": targetFromCountry ? targetFromCountry : shipfrom_address.country,
|
|
64
|
+
"VendorPhone": shipfrom_address.phone.toString(),
|
|
65
|
+
"VendorEmail": shipfrom_address.email,
|
|
66
|
+
"VendorBusinessNumber": "",
|
|
67
|
+
"VendorRGRNumber": "",
|
|
68
|
+
"VendorIOSSNumber": iossNumber,
|
|
69
|
+
"VendorEORINumber": eroiNumber
|
|
70
|
+
};
|
|
71
|
+
return shipper;
|
|
72
|
+
}
|
|
73
|
+
buildShipmentRequest(args, username, password, test, clientId, vendorEORINumber, vendorIOSSNumber) {
|
|
53
74
|
try {
|
|
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
|
+
let iossNumber = "";
|
|
77
|
+
if (EUCountries.indexOf(args.shipto_address.country.toUpperCase()) != -1 || EUCountries.indexOf(args.targetToCountry.toUpperCase()) != -1) {
|
|
78
|
+
iossNumber = vendorIOSSNumber;
|
|
79
|
+
}
|
|
80
|
+
let eroiNumber = "";
|
|
81
|
+
if (args.shipto_address.country.toUpperCase() == "GB" || args.shipto_address.country.toUpperCase() == "UK") {
|
|
82
|
+
eroiNumber = vendorEORINumber;
|
|
83
|
+
}
|
|
54
84
|
let importRequest = {
|
|
55
85
|
"Login": {
|
|
56
86
|
"Username": username,
|
|
57
87
|
"Password": password
|
|
58
88
|
},
|
|
59
89
|
"Test": test,
|
|
60
|
-
"ClientID":
|
|
90
|
+
"ClientID": clientId,
|
|
61
91
|
"Reference": args.reference,
|
|
62
|
-
"ShipTo": this.getConsignee(args),
|
|
92
|
+
"ShipTo": this.getConsignee(args.shipto_address, args.targetToCountry),
|
|
63
93
|
"ShippingLane": {
|
|
64
94
|
"Region": "Landmark BUF"
|
|
65
95
|
},
|
|
66
|
-
"ShipMethod": args._carrierRateObj.
|
|
96
|
+
"ShipMethod": args._carrierRateObj.servicecode,
|
|
67
97
|
"OrderTotal": args.shipment_total_usd,
|
|
68
98
|
"ItemsCurrency": args.currency,
|
|
69
99
|
"ProduceLabel": true,
|
|
@@ -80,12 +110,13 @@ class Shipment {
|
|
|
80
110
|
"PackageReference": args.reference
|
|
81
111
|
}
|
|
82
112
|
},
|
|
83
|
-
"SendReturnToAddress": this.getShipperInfo(args),
|
|
113
|
+
"SendReturnToAddress": this.getShipperInfo(args.shipfrom_address, args.targetFromCountry),
|
|
114
|
+
"VendorInformation": this.getVendorInfo(args.shipfrom_address, args.targetFromCountry, eroiNumber, iossNumber),
|
|
84
115
|
"IsCommercialShipment": args.b2b ? 1 : 0,
|
|
85
116
|
};
|
|
86
117
|
let items = args.pieces.map((item) => {
|
|
87
118
|
return { "Item": {
|
|
88
|
-
"Sku": item.sku,
|
|
119
|
+
"Sku": item.sku || 12345,
|
|
89
120
|
"Description": item.description.substr(0, 100),
|
|
90
121
|
"Quantity": item.quantity,
|
|
91
122
|
"UnitPrice": (item.sale_price == 0) ? 0.01 : item.sale_price,
|
|
@@ -138,7 +169,7 @@ class Shipment {
|
|
|
138
169
|
label_type: args.label_format.toLowerCase() == "zpl" ? "zplenc" : "url",
|
|
139
170
|
gross_weight: args.total_weight,
|
|
140
171
|
gross_weight_unit: args.weight_unit,
|
|
141
|
-
submitted_electronically:
|
|
172
|
+
submitted_electronically: true
|
|
142
173
|
};
|
|
143
174
|
return response;
|
|
144
175
|
}
|
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,
|
|
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,7 +22,7 @@ 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
|
};
|
|
@@ -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,16 @@ export class LandMark {
|
|
|
8
8
|
private username : string;
|
|
9
9
|
private password : string;
|
|
10
10
|
private test : boolean;
|
|
11
|
-
|
|
11
|
+
private clientId : number;
|
|
12
|
+
private vendorEORINumber : string;
|
|
13
|
+
private vendorIOSSNumber : string;
|
|
14
|
+
constructor(username:string,password:string,clientId:number,test:boolean,vendorEORINumber:string,vendorIOSSNumber:string, logger?: FlclLogger, flclerror?: FlclError, rootRequestId?: string, requestId?: string) {
|
|
12
15
|
this.username = username;
|
|
13
16
|
this.password = password;
|
|
14
17
|
this.test = test;
|
|
18
|
+
this.clientId = clientId;
|
|
19
|
+
this.vendorEORINumber = vendorEORINumber;
|
|
20
|
+
this.vendorIOSSNumber = vendorIOSSNumber;
|
|
15
21
|
setRequredGlobals(logger, flclerror, rootRequestId, requestId);
|
|
16
22
|
}
|
|
17
23
|
|
|
@@ -19,9 +25,9 @@ export class LandMark {
|
|
|
19
25
|
try {
|
|
20
26
|
|
|
21
27
|
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: '
|
|
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);
|
|
30
|
+
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'landMarkShipmentRequest', propertyValue: landmarkShipmentRequest});
|
|
25
31
|
let landmarkShipmentRes: any = await shipObj.createShipment(landmarkShipmentRequest);
|
|
26
32
|
if(landmarkShipmentRes.hasOwnProperty("ImportResponse") && landmarkShipmentRes['ImportResponse']['Errors']){
|
|
27
33
|
throw new Error(landmarkShipmentRes['ImportResponse']['Errors']['Error']['ErrorMessage']['_text']) ;
|
|
@@ -30,7 +36,7 @@ export class LandMark {
|
|
|
30
36
|
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: 'response', propertyValue: response});
|
|
31
37
|
return response;
|
|
32
38
|
} catch(e) {
|
|
33
|
-
app.logger?.error(app.flclError!.create({npm: 'fc-landmark', className: 'Landmark', methodName: 'createShipmet', propertyName: '
|
|
39
|
+
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
40
|
throw e;
|
|
35
41
|
}
|
|
36
42
|
}
|
|
@@ -40,17 +46,17 @@ export class LandMark {
|
|
|
40
46
|
|
|
41
47
|
let trackObj = new Tracking();
|
|
42
48
|
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(
|
|
49
|
+
let landmarkTrackRequest: string = trackObj.buildTrackingRequest(args,this.username,this.password,this.test,this.clientId);
|
|
50
|
+
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'LandmarkTrackRequest', propertyValue: landmarkTrackRequest});
|
|
51
|
+
let landMarkTrackingRes: any = await trackObj.trackInfo(landmarkTrackRequest);
|
|
52
|
+
if(landMarkTrackingRes.hasOwnProperty("TrackResponse") && landMarkTrackingRes['TrackResponse']['Errors']){
|
|
53
|
+
throw new Error(landMarkTrackingRes['TrackResponse']['Errors']['Error']['ErrorMessage']['_text']) ;
|
|
48
54
|
}
|
|
49
|
-
let response: FlavorcloudTrackingResponse = trackObj.buildResponse(
|
|
50
|
-
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
55
|
+
let response: FlavorcloudTrackingResponse = trackObj.buildResponse(landMarkTrackingRes, args);
|
|
56
|
+
app.logger?.info({npm: 'fc-landmark', className: 'Landmark', methodName: 'getTrackingInfo', propertyName: 'response', propertyValue: response});
|
|
51
57
|
return response;
|
|
52
58
|
} catch(e) {
|
|
53
|
-
app.logger?.error(app.flclError!.create({npm: 'fc-landmark', className: 'Landmark', methodName: '
|
|
59
|
+
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
60
|
throw e;
|
|
55
61
|
}
|
|
56
62
|
}
|
package/src/shipment.ts
CHANGED
|
@@ -6,58 +6,90 @@ export default class Shipment {
|
|
|
6
6
|
constructor() {
|
|
7
7
|
|
|
8
8
|
}
|
|
9
|
-
getConsignee(
|
|
9
|
+
getConsignee(shipto_address: any,targetToCountry:any): any {
|
|
10
10
|
|
|
11
|
-
const combinedAddress =
|
|
11
|
+
const combinedAddress = shipto_address.address_line_1 + shipto_address.address_line_2 + shipto_address.address_line_3;
|
|
12
12
|
let consignee: any = {
|
|
13
|
-
"Name":
|
|
14
|
-
"Attention":
|
|
13
|
+
"Name": shipto_address.name.slice(0, 50) ,
|
|
14
|
+
"Attention": shipto_address.attention_name.slice(0, 50) ,
|
|
15
15
|
"Address1": combinedAddress.substring(0,60),
|
|
16
16
|
"Address2": combinedAddress.substring(61,120),
|
|
17
17
|
"Address3": combinedAddress.substring(121,180),
|
|
18
|
-
"City":
|
|
19
|
-
"State":
|
|
20
|
-
"PostalCode":
|
|
21
|
-
"Country":
|
|
22
|
-
"Phone":
|
|
23
|
-
"Email":
|
|
24
|
-
"ConsigneeTaxID":
|
|
18
|
+
"City": shipto_address.city,
|
|
19
|
+
"State": shipto_address.state,
|
|
20
|
+
"PostalCode": shipto_address.zip,
|
|
21
|
+
"Country": targetToCountry ? targetToCountry : shipto_address.country,
|
|
22
|
+
"Phone": shipto_address.phone.toString(),
|
|
23
|
+
"Email": shipto_address.email,
|
|
24
|
+
"ConsigneeTaxID": shipto_address.federal_tax_id ? shipto_address.federal_tax_id : ""
|
|
25
25
|
};
|
|
26
26
|
return consignee;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
getShipperInfo(
|
|
30
|
-
const combinedAddress =
|
|
29
|
+
getShipperInfo(shipfrom_address: any,targetFromCountry:any) {
|
|
30
|
+
const combinedAddress = shipfrom_address.address_line_1 + shipfrom_address.address_line_2 + shipfrom_address.address_line_3;
|
|
31
31
|
let shipper: any = {
|
|
32
|
-
"Name":
|
|
33
|
-
"Attention":
|
|
32
|
+
"Name": shipfrom_address.name.slice(0, 50) ,
|
|
33
|
+
"Attention": shipfrom_address.attention_name.slice(0, 50) ,
|
|
34
34
|
"Address1": combinedAddress.substring(0,60),
|
|
35
35
|
"Address2": combinedAddress.substring(61,120),
|
|
36
36
|
"Address3": combinedAddress.substring(121,180),
|
|
37
|
-
"City":
|
|
38
|
-
"State":
|
|
39
|
-
"PostalCode":
|
|
40
|
-
"Country":
|
|
41
|
-
"Phone":
|
|
42
|
-
"Email":
|
|
37
|
+
"City": shipfrom_address.city,
|
|
38
|
+
"State": shipfrom_address.state,
|
|
39
|
+
"PostalCode": shipfrom_address.zip,
|
|
40
|
+
"Country": targetFromCountry ? targetFromCountry : shipfrom_address.country,
|
|
41
|
+
"Phone": shipfrom_address.phone.toString(),
|
|
42
|
+
"Email": shipfrom_address.email
|
|
43
43
|
};
|
|
44
44
|
return shipper;
|
|
45
45
|
}
|
|
46
|
-
|
|
46
|
+
|
|
47
|
+
getVendorInfo(shipfrom_address: any,targetFromCountry:any,eroiNumber:any,iossNumber:any) {
|
|
48
|
+
const combinedAddress = shipfrom_address.address_line_1 + shipfrom_address.address_line_2 + shipfrom_address.address_line_3;
|
|
49
|
+
let shipper: any = {
|
|
50
|
+
"VendorName": shipfrom_address.name.slice(0, 50) ,
|
|
51
|
+
"Attention": shipfrom_address.attention_name.slice(0, 50) ,
|
|
52
|
+
"VendorAddress1": combinedAddress.substring(0,60),
|
|
53
|
+
"VendorAddress2": combinedAddress.substring(61,120),
|
|
54
|
+
"VendorAddress3": combinedAddress.substring(121,180),
|
|
55
|
+
"VendorCity": shipfrom_address.city,
|
|
56
|
+
"VendorState": shipfrom_address.state,
|
|
57
|
+
"VendorPostalCode": shipfrom_address.zip,
|
|
58
|
+
"VendorCountry": targetFromCountry ? targetFromCountry : shipfrom_address.country,
|
|
59
|
+
"VendorPhone": shipfrom_address.phone.toString(),
|
|
60
|
+
"VendorEmail": shipfrom_address.email,
|
|
61
|
+
"VendorBusinessNumber": "",
|
|
62
|
+
"VendorRGRNumber":"",
|
|
63
|
+
"VendorIOSSNumber":iossNumber,
|
|
64
|
+
"VendorEORINumber":eroiNumber
|
|
65
|
+
};
|
|
66
|
+
return shipper;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
buildShipmentRequest(args: any,username:string,password:string,test:boolean,clientId:number,vendorEORINumber:any,vendorIOSSNumber:any): string{
|
|
47
70
|
try {
|
|
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
|
+
let iossNumber=""
|
|
73
|
+
if( EUCountries.indexOf(args.shipto_address.country.toUpperCase()) != -1 || EUCountries.indexOf(args.targetToCountry.toUpperCase()) != -1 ){
|
|
74
|
+
iossNumber = vendorIOSSNumber
|
|
75
|
+
}
|
|
76
|
+
let eroiNumber=""
|
|
77
|
+
if(args.shipto_address.country.toUpperCase() == "GB" || args.shipto_address.country.toUpperCase() == "UK"){
|
|
78
|
+
eroiNumber = vendorEORINumber
|
|
79
|
+
}
|
|
48
80
|
let importRequest :any = {
|
|
49
81
|
"Login": {
|
|
50
82
|
"Username": username,
|
|
51
83
|
"Password": password
|
|
52
84
|
},
|
|
53
85
|
"Test": test,
|
|
54
|
-
"ClientID":
|
|
86
|
+
"ClientID": clientId ,
|
|
55
87
|
"Reference": args.reference,
|
|
56
|
-
"ShipTo": this.getConsignee(
|
|
88
|
+
"ShipTo": this.getConsignee(args.shipto_address,args.targetToCountry),
|
|
57
89
|
"ShippingLane": {
|
|
58
90
|
"Region" : "Landmark BUF"
|
|
59
91
|
},
|
|
60
|
-
"ShipMethod": args._carrierRateObj.
|
|
92
|
+
"ShipMethod": args._carrierRateObj.servicecode,
|
|
61
93
|
"OrderTotal": args.shipment_total_usd,
|
|
62
94
|
"ItemsCurrency": args.currency,
|
|
63
95
|
"ProduceLabel": true,
|
|
@@ -74,12 +106,13 @@ export default class Shipment {
|
|
|
74
106
|
"PackageReference":args.reference
|
|
75
107
|
}
|
|
76
108
|
},
|
|
77
|
-
"SendReturnToAddress": this.getShipperInfo(args),
|
|
109
|
+
"SendReturnToAddress": this.getShipperInfo(args.shipfrom_address,args.targetFromCountry),
|
|
110
|
+
"VendorInformation": this.getVendorInfo(args.shipfrom_address,args.targetFromCountry,eroiNumber,iossNumber),
|
|
78
111
|
"IsCommercialShipment": args.b2b ? 1 : 0,
|
|
79
112
|
}
|
|
80
113
|
let items = args.pieces.map((item:any)=>{
|
|
81
114
|
return {"Item":{
|
|
82
|
-
"Sku": item.sku,
|
|
115
|
+
"Sku": item.sku || 12345,
|
|
83
116
|
"Description": item.description.substr(0,100),
|
|
84
117
|
"Quantity": item.quantity,
|
|
85
118
|
"UnitPrice": (item.sale_price == 0) ? 0.01 : item.sale_price,
|
|
@@ -129,7 +162,7 @@ export default class Shipment {
|
|
|
129
162
|
label_type: args.label_format.toLowerCase() == "zpl" ? "zplenc" : "url",
|
|
130
163
|
gross_weight: args.total_weight,
|
|
131
164
|
gross_weight_unit: args.weight_unit,
|
|
132
|
-
submitted_electronically:
|
|
165
|
+
submitted_electronically: true
|
|
133
166
|
};
|
|
134
167
|
return response;
|
|
135
168
|
}
|
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'] ;
|