@things-factory/integration-marketplace 4.1.33 → 4.1.35

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.
Files changed (4) hide show
  1. package/dist-server/controllers/shopee/apis/get-store-order.js +8 -2
  2. package/dist-server/controllers/shopee/apis/get-store-order.js.map +1 -1
  3. package/package.json +2 -2
  4. package/server/controllers/shopee/apis/get-store-order.ts +8 -2
package/dist-server/controllers/shopee/apis/get-store-order.js CHANGED
@@ -49,6 +49,8 @@ function getStoreOrder() {
49
49
  };
50
50
  });
51
51
  const { full_address, zipcode: postCode, phone, country, city, name: attentionTo, state } = recipient_address;
52
+ let shippingFeeFloat = parseFloat(shippingFee);
53
+ let actualShippingFeeFloat = parseFloat(actualShippingFee);
52
54
  var orderShipping = {
53
55
  address1: full_address,
54
56
  address2: null,
@@ -65,8 +67,12 @@ function getStoreOrder() {
65
67
  attentionTo,
66
68
  trackingNo,
67
69
  transporter: shippingProvider,
68
- shippingFee: parseFloat(shippingFee) || null,
69
- actualShippingFee: parseFloat(actualShippingFee) || null
70
+ shippingFee: !isNaN(shippingFeeFloat) ? shippingFeeFloat : null,
71
+ actualShippingFee: !isNaN(order.is_actual_shipping_fee_confirmed ? actualShippingFeeFloat : shippingFeeFloat)
72
+ ? order.is_actual_shipping_fee_confirmed
73
+ ? actualShippingFeeFloat
74
+ : shippingFeeFloat
75
+ : null
70
76
  };
71
77
  let escrowDetails = await store_api_1.StoreAPI.getStoreOrderTransactionDetails(store, { orderNo });
72
78
  return Object.assign({ name,
package/dist-server/controllers/shopee/apis/get-store-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get-store-order.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis/get-store-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"get-store-order.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis/get-store-order.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,+CAA0C;AAE1C,SAAgB,aAAa;IAC3B,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YAErB,OAAO;gBACL,YAAY,EAAE,CAAC,OAAO,CAAC;aACxB,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YACtB,IAAI,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;gBACzC,IAAI,KAAK,CAAC,QAAQ,EAAE;oBAClB,KAAK,CAAC,QAAQ,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;iBACjD;gBACD,IAAI,KAAK,CAAC,sBAAsB,EAAE;oBAChC,KAAK,CAAC,sBAAsB,GAAG,UAAU,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;iBACxE;gBACD,IAAI,KAAK,CAAC,oBAAoB,EAAE;oBAC9B,KAAK,CAAC,oBAAoB,GAAG,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;iBACpE;gBACD,MAAM,EACJ,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,OAAO,EAChB,YAAY,EACZ,gBAAgB,EAAE,gBAAgB,EAClC,WAAW,EACX,WAAW,EACX,SAAS,EAAE,QAAQ,EACnB,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,WAAW,EACzB,WAAW,EACX,iBAAiB,EACjB,KAAK,EACL,cAAc,EAAE,aAAa,EAC7B,QAAQ,EAAE,OAAO,EACjB,sBAAsB,EAAE,WAAW,EACnC,oBAAoB,EAAE,iBAAiB,EACxC,GAAG,KAAK,CAAA;gBACT,IAAI,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAA;gBACvC,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;gBACjD,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;gBACjD,IAAI,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;gBACxD,IAAI,SAAS,GAAG,KAAK,CAAC,MAAM,CAAA;gBAC5B,IAAI,UAAU,GAAG,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAA;gBACxD,IAAI,QAAQ,GAAG,OAAO,CAAA;gBAEtB,IAAI,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACtC,IAAI,EACF,OAAO,EAAE,IAAI,EACb,YAAY,EACZ,4BAA4B,EAAE,GAAG,EACjC,0BAA0B,EAAE,wBAAwB,EACpD,cAAc,EAAE,aAAa,EAC7B,YAAY,EAAE,WAAW,EACzB,YAAY,EAAE,WAAW,EACzB,wBAAwB,EAAE,sBAAsB,EACjD,GAAG,IAAI,CAAA;oBACR,IAAI,WAAW,GAAG,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAA;oBACzD,OAAO;wBACL,IAAI;wBACJ,WAAW;wBACX,GAAG;wBACH,SAAS,EAAE,GAAG,GAAG,wBAAwB;wBACzC,OAAO;wBACP,aAAa;wBACb,WAAW;wBACX,WAAW;wBACX,QAAQ;wBACR,aAAa,EAAE,GAAG,GAAG,sBAAsB;wBAC3C,QAAQ,EAAE,GAAG,GAAG,sBAAsB,GAAG,GAAG,GAAG,wBAAwB;qBACxE,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,iBAAiB,CAAA;gBAE7G,IAAI,gBAAgB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;gBAC9C,IAAI,sBAAsB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAA;gBAC1D,IAAI,aAAa,GAAG;oBAClB,QAAQ,EAAE,YAAY;oBACtB,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE,IAAI;oBACZ,QAAQ;oBACR,IAAI;oBACJ,KAAK;oBACL,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO;oBAChD,kBAAkB,EAAE,IAAI;oBACxB,WAAW;oBACX,UAAU;oBACV,WAAW,EAAE,gBAAgB;oBAC7B,WAAW,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI;oBAC/D,iBAAiB,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,gBAAgB,CAAC;wBAC3G,CAAC,CAAC,KAAK,CAAC,gCAAgC;4BACtC,CAAC,CAAC,sBAAsB;4BACxB,CAAC,CAAC,gBAAgB;wBACpB,CAAC,CAAC,IAAI;iBACT,CAAA;gBAED,IAAI,aAAa,GAAG,MAAM,oBAAQ,CAAC,+BAA+B,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;gBAEtF,uBACE,IAAI;oBACJ,OAAO;oBACP,QAAQ;oBACR,MAAM;oBACN,cAAc;oBACd,cAAc;oBACd,WAAW;oBACX,QAAQ;oBACR,MAAM;oBACN,UAAU;oBACV,gBAAgB;oBAChB,gBAAgB;oBAChB,SAAS;oBACT,UAAU;oBACV,aAAa;oBACb,aAAa;oBACb,OAAO,IACJ,aAAa,EACjB;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAEpB,OAAO,OAAO,CAAA;QAChB,CAAC;KACF,CAAA;AACH,CAAC;AAnID,sCAmIC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-marketplace",
3
- "version": "4.1.33",
3
+ "version": "4.1.35",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -52,5 +52,5 @@
52
52
  "nock": "^13.0.2",
53
53
  "should": "^13.2.3"
54
54
  },
55
- "gitHead": "1be06c783733190b91ab6c4b7b32f34d22aeaed6"
55
+ "gitHead": "a7e4a62c6ab05d18879ab945ac0f10be440a5f34"
56
56
  }
package/server/controllers/shopee/apis/get-store-order.ts CHANGED
@@ -78,6 +78,8 @@ export function getStoreOrder() {
78
78
 
79
79
  const { full_address, zipcode: postCode, phone, country, city, name: attentionTo, state } = recipient_address
80
80
 
81
+ let shippingFeeFloat = parseFloat(shippingFee)
82
+ let actualShippingFeeFloat = parseFloat(actualShippingFee)
81
83
  var orderShipping = {
82
84
  address1: full_address,
83
85
  address2: null,
@@ -94,8 +96,12 @@ export function getStoreOrder() {
94
96
  attentionTo,
95
97
  trackingNo,
96
98
  transporter: shippingProvider,
97
- shippingFee: parseFloat(shippingFee) || null,
98
- actualShippingFee: parseFloat(actualShippingFee) || null
99
+ shippingFee: !isNaN(shippingFeeFloat) ? shippingFeeFloat : null,
100
+ actualShippingFee: !isNaN(order.is_actual_shipping_fee_confirmed ? actualShippingFeeFloat : shippingFeeFloat)
101
+ ? order.is_actual_shipping_fee_confirmed
102
+ ? actualShippingFeeFloat
103
+ : shippingFeeFloat
104
+ : null
99
105
  }
100
106
 
101
107
  let escrowDetails = await StoreAPI.getStoreOrderTransactionDetails(store, { orderNo })