@things-factory/integration-powrup 4.3.617 → 4.3.637
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-server/controllers/powrup/apis/initiate-shipment.js +5 -2
- package/dist-server/controllers/powrup/apis/initiate-shipment.js.map +1 -1
- package/dist-server/controllers/powrup/apis/pack-order.js +3 -4
- package/dist-server/controllers/powrup/apis/pack-order.js.map +1 -1
- package/package.json +7 -7
- package/server/controllers/powrup/apis/initiate-shipment.ts +9 -2
- package/server/controllers/powrup/apis/pack-order.ts +5 -2
|
@@ -6,10 +6,13 @@ function initiateShipment() {
|
|
|
6
6
|
method: 'post',
|
|
7
7
|
path: '/wms/order-rts',
|
|
8
8
|
denormalize(req) {
|
|
9
|
-
const { refOrderId, packageId, lmdOption, trackingNo, shipperName } = req;
|
|
10
|
-
let payload = { orderId: refOrderId
|
|
9
|
+
const { refOrderId, packageId, lmdOption, trackingNo, shipperName, platform } = req;
|
|
10
|
+
let payload = { orderId: refOrderId };
|
|
11
11
|
if (lmdOption) {
|
|
12
12
|
payload = Object.assign(Object.assign({}, payload), { trackingNo, shippingCarrier: shipperName });
|
|
13
|
+
if (platform == 'LZD') {
|
|
14
|
+
payload = Object.assign(Object.assign({}, payload), { packageId });
|
|
15
|
+
}
|
|
13
16
|
switch (shipperName) {
|
|
14
17
|
case 'DHL_MY':
|
|
15
18
|
payload.trackingUrl = `https://www.tracking.my/dhl-ecommerce/${trackingNo}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initiate-shipment.js","sourceRoot":"","sources":["../../../../server/controllers/powrup/apis/initiate-shipment.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB;IAC9B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,gBAAgB;QACtB,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"initiate-shipment.js","sourceRoot":"","sources":["../../../../server/controllers/powrup/apis/initiate-shipment.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB;IAC9B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,gBAAgB;QACtB,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YAEnF,IAAI,OAAO,GAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,CAAA;YAC1C,IAAI,SAAS,EAAE;gBACb,OAAO,mCACF,OAAO,KACV,UAAU,EACV,eAAe,EAAE,WAAW,GAC7B,CAAA;gBAED,IAAI,QAAQ,IAAI,KAAK,EAAE;oBACrB,OAAO,mCACF,OAAO,KACV,SAAS,GACV,CAAA;iBACF;gBAED,QAAQ,WAAW,EAAE;oBACnB,KAAK,QAAQ;wBACX,OAAO,CAAC,WAAW,GAAG,yCAAyC,UAAU,EAAE,CAAA;wBAC3E,MAAK;oBAEP,KAAK,SAAS,CAAC;oBACf,KAAK,YAAY;wBACf,OAAO,CAAC,WAAW,GAAG,+BAA+B,UAAU,EAAE,CAAA;wBACjE,MAAK;oBAEP,KAAK,WAAW;wBACd,OAAO,CAAC,WAAW,GAAG,6CAA6C,UAAU,EAAE,CAAA;wBAC/E,MAAK;iBACR;aACF;YAED,OAAO;gBACL,OAAO;aACR,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA9CD,4CA8CC"}
|
|
@@ -6,17 +6,16 @@ function packOrder() {
|
|
|
6
6
|
method: 'post',
|
|
7
7
|
path: '/wms/order-pack',
|
|
8
8
|
denormalize(req) {
|
|
9
|
-
const { refOrderId } = req;
|
|
9
|
+
const { refOrderId, isSof, packages } = req;
|
|
10
10
|
return {
|
|
11
|
-
payload: {
|
|
12
|
-
orderId: refOrderId
|
|
13
|
-
}
|
|
11
|
+
payload: Object.assign({ orderId: refOrderId, isSof: isSof ? isSof : false }, (packages && packages.length > 0 ? { packages } : {}))
|
|
14
12
|
};
|
|
15
13
|
},
|
|
16
14
|
normalize(res) {
|
|
17
15
|
const { orderId, packages } = res.resultObject;
|
|
18
16
|
const orderPackages = packages.map(pkg => {
|
|
19
17
|
return {
|
|
18
|
+
orderPackageId: pkg.orderPackageId,
|
|
20
19
|
packageId: pkg.packageId,
|
|
21
20
|
items: pkg.items.map(item => {
|
|
22
21
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pack-order.js","sourceRoot":"","sources":["../../../../server/controllers/powrup/apis/pack-order.ts"],"names":[],"mappings":";;;AAAA,SAAgB,SAAS;IACvB,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,iBAAiB;QACvB,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"pack-order.js","sourceRoot":"","sources":["../../../../server/controllers/powrup/apis/pack-order.ts"],"names":[],"mappings":";;;AAAA,SAAgB,SAAS;IACvB,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,iBAAiB;QACvB,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;YAE3C,OAAO;gBACL,OAAO,kBACL,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IACzB,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACzD;aACF,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,YAAY,CAAA;YAE9C,MAAM,aAAa,GAAU,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC9C,OAAO;oBACL,cAAc,EAAE,GAAG,CAAC,cAAc;oBAClC,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBAC1B,OAAO;4BACL,OAAO,EAAE,IAAI,CAAC,mBAAmB;4BACjC,GAAG,EAAE,IAAI,CAAC,QAAQ;yBACnB,CAAA;oBACH,CAAC,CAAC;iBACH,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAA;QAC7C,CAAC;KACF,CAAA;AACH,CAAC;AAlCD,8BAkCC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-powrup",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.637",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -26,15 +26,15 @@
|
|
|
26
26
|
"@things-factory/apptool-ui": "^4.3.591",
|
|
27
27
|
"@things-factory/auth-ui": "^4.3.591",
|
|
28
28
|
"@things-factory/biz-base": "^4.3.595",
|
|
29
|
-
"@things-factory/code-ui": "^4.3.
|
|
29
|
+
"@things-factory/code-ui": "^4.3.637",
|
|
30
30
|
"@things-factory/context-ui": "^4.3.591",
|
|
31
|
-
"@things-factory/grist-ui": "^4.3.
|
|
31
|
+
"@things-factory/grist-ui": "^4.3.637",
|
|
32
32
|
"@things-factory/i18n-base": "^4.3.591",
|
|
33
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
+
"@things-factory/integration-marketplace": "^4.3.637",
|
|
34
34
|
"@things-factory/integration-ui": "^4.3.616",
|
|
35
35
|
"@things-factory/more-ui": "^4.3.591",
|
|
36
|
-
"@things-factory/resource-ui": "^4.3.
|
|
37
|
-
"@things-factory/setting-ui": "^4.3.
|
|
36
|
+
"@things-factory/resource-ui": "^4.3.637",
|
|
37
|
+
"@things-factory/setting-ui": "^4.3.637",
|
|
38
38
|
"@things-factory/system-ui": "^4.3.591",
|
|
39
39
|
"debug": "^4.1.1",
|
|
40
40
|
"node-fetch": "^2.6.0",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"nock": "^13.0.2",
|
|
51
51
|
"should": "^13.2.3"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "67af35bd054b84ae5e72c48b1f61917be5d8debb"
|
|
54
54
|
}
|
|
@@ -3,9 +3,9 @@ export function initiateShipment() {
|
|
|
3
3
|
method: 'post',
|
|
4
4
|
path: '/wms/order-rts',
|
|
5
5
|
denormalize(req) {
|
|
6
|
-
const { refOrderId, packageId, lmdOption, trackingNo, shipperName } = req
|
|
6
|
+
const { refOrderId, packageId, lmdOption, trackingNo, shipperName, platform } = req
|
|
7
7
|
|
|
8
|
-
let payload: any = { orderId: refOrderId
|
|
8
|
+
let payload: any = { orderId: refOrderId }
|
|
9
9
|
if (lmdOption) {
|
|
10
10
|
payload = {
|
|
11
11
|
...payload,
|
|
@@ -13,6 +13,13 @@ export function initiateShipment() {
|
|
|
13
13
|
shippingCarrier: shipperName
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
if (platform == 'LZD') {
|
|
17
|
+
payload = {
|
|
18
|
+
...payload,
|
|
19
|
+
packageId
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
16
23
|
switch (shipperName) {
|
|
17
24
|
case 'DHL_MY':
|
|
18
25
|
payload.trackingUrl = `https://www.tracking.my/dhl-ecommerce/${trackingNo}`
|
|
@@ -3,11 +3,13 @@ export function packOrder() {
|
|
|
3
3
|
method: 'post',
|
|
4
4
|
path: '/wms/order-pack',
|
|
5
5
|
denormalize(req) {
|
|
6
|
-
const { refOrderId } = req
|
|
6
|
+
const { refOrderId, isSof, packages } = req
|
|
7
7
|
|
|
8
8
|
return {
|
|
9
9
|
payload: {
|
|
10
|
-
orderId: refOrderId
|
|
10
|
+
orderId: refOrderId,
|
|
11
|
+
isSof: isSof ? isSof : false,
|
|
12
|
+
...(packages && packages.length > 0 ? { packages } : {})
|
|
11
13
|
}
|
|
12
14
|
}
|
|
13
15
|
},
|
|
@@ -16,6 +18,7 @@ export function packOrder() {
|
|
|
16
18
|
|
|
17
19
|
const orderPackages: any[] = packages.map(pkg => {
|
|
18
20
|
return {
|
|
21
|
+
orderPackageId: pkg.orderPackageId,
|
|
19
22
|
packageId: pkg.packageId,
|
|
20
23
|
items: pkg.items.map(item => {
|
|
21
24
|
return {
|