@things-factory/integration-marketplace 4.1.33 → 4.2.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-server/controllers/shopee/apis/get-store-order.js +8 -2
- package/dist-server/controllers/shopee/apis/get-store-order.js.map +1 -1
- package/dist-server/controllers/woocommerce/apis/get-store-products.js +3 -3
- package/dist-server/controllers/woocommerce/apis/get-store-products.js.map +1 -1
- package/package.json +15 -15
- package/server/controllers/shopee/apis/get-store-order.ts +8 -2
- package/server/controllers/woocommerce/apis/get-store-products.ts +3 -3
|
@@ -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:
|
|
69
|
-
actualShippingFee:
|
|
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,
|
|
@@ -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"}
|
|
@@ -36,7 +36,7 @@ function getStoreProducts() {
|
|
|
36
36
|
return {
|
|
37
37
|
native_attribute_id: attribute.id,
|
|
38
38
|
attribute_key: attribute.name,
|
|
39
|
-
|
|
39
|
+
values: attribute.options
|
|
40
40
|
};
|
|
41
41
|
}),
|
|
42
42
|
isVerified: product.purchasable,
|
|
@@ -56,7 +56,7 @@ function getStoreProducts() {
|
|
|
56
56
|
return {
|
|
57
57
|
native_attribute_id: attribute.id,
|
|
58
58
|
attribute_key: attribute.name,
|
|
59
|
-
|
|
59
|
+
values: attribute.options
|
|
60
60
|
};
|
|
61
61
|
}),
|
|
62
62
|
isEnabled: product.purchasable,
|
|
@@ -81,7 +81,7 @@ function getStoreProducts() {
|
|
|
81
81
|
return {
|
|
82
82
|
native_attribute_id: attribute.id,
|
|
83
83
|
attribute_key: attribute.name,
|
|
84
|
-
|
|
84
|
+
values: [attribute.option]
|
|
85
85
|
};
|
|
86
86
|
}),
|
|
87
87
|
isEnabled: variant.purchasable,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-products.js","sourceRoot":"","sources":["../../../../server/controllers/woocommerce/apis/get-store-products.ts"],"names":[],"mappings":";;;AAAA,oHAAoH;AACpH,+CAA0C;AAE1C,SAAgB,gBAAgB;IAC9B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,WAAW;QACjB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI,EAAE,CAAA;YAC9B,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;YAE3D,IAAI,OAAO,GAAQ;gBACjB,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,IAAI,GAAG,KAAK;aACrB,CAAA;YAED,OAAO,EAAE,OAAO,EAAE,CAAA;QACpB,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YAE5B,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAEhD,IAAI,OAAO,GAAU,EAAE,CAAA;YAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,OAAO,GAAQ,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC7B,MAAM,iBAAiB,GAAU,MAAM,oBAAQ,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;gBAE5F,MAAM,MAAM,GAAG;oBACb,MAAM,EAAE,OAAO,CAAC,EAAE;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;oBAC1D,UAAU,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,MAAM,IAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;oBAC5E,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;wBACjC,OAAO,KAAK,CAAC,GAAG,CAAA;oBAClB,CAAC,CAAC;oBACF,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBAC7C,OAAO;4BACL,mBAAmB,EAAE,SAAS,CAAC,EAAE;4BACjC,aAAa,EAAE,SAAS,CAAC,IAAI;4BAC7B,
|
|
1
|
+
{"version":3,"file":"get-store-products.js","sourceRoot":"","sources":["../../../../server/controllers/woocommerce/apis/get-store-products.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-marketplace",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -25,19 +25,19 @@
|
|
|
25
25
|
"test": "DEBUG=things-factory:* NODE_ENV=development npx mocha -r ts-node/register ./test/**/*spec.ts"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@things-factory/apptool-ui": "^4.1.
|
|
29
|
-
"@things-factory/auth-ui": "^4.1.
|
|
30
|
-
"@things-factory/biz-base": "^4.1.
|
|
31
|
-
"@things-factory/code-ui": "^4.1.
|
|
32
|
-
"@things-factory/context-ui": "^4.1.
|
|
33
|
-
"@things-factory/grist-ui": "^4.1.
|
|
34
|
-
"@things-factory/i18n-base": "^4.1.
|
|
35
|
-
"@things-factory/integration-lmd": "^4.1.
|
|
36
|
-
"@things-factory/integration-ui": "^4.1.
|
|
37
|
-
"@things-factory/more-ui": "^4.1.
|
|
38
|
-
"@things-factory/resource-ui": "^4.1.
|
|
39
|
-
"@things-factory/setting-ui": "^4.1.
|
|
40
|
-
"@things-factory/system-ui": "^4.1.
|
|
28
|
+
"@things-factory/apptool-ui": "^4.1.40",
|
|
29
|
+
"@things-factory/auth-ui": "^4.1.40",
|
|
30
|
+
"@things-factory/biz-base": "^4.1.40",
|
|
31
|
+
"@things-factory/code-ui": "^4.1.40",
|
|
32
|
+
"@things-factory/context-ui": "^4.1.40",
|
|
33
|
+
"@things-factory/grist-ui": "^4.1.40",
|
|
34
|
+
"@things-factory/i18n-base": "^4.1.40",
|
|
35
|
+
"@things-factory/integration-lmd": "^4.1.40",
|
|
36
|
+
"@things-factory/integration-ui": "^4.1.40",
|
|
37
|
+
"@things-factory/more-ui": "^4.1.40",
|
|
38
|
+
"@things-factory/resource-ui": "^4.1.40",
|
|
39
|
+
"@things-factory/setting-ui": "^4.1.40",
|
|
40
|
+
"@things-factory/system-ui": "^4.1.40",
|
|
41
41
|
"debug": "^4.1.1",
|
|
42
42
|
"node-fetch": "^2.6.0",
|
|
43
43
|
"querystring": "^0.2.1"
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"nock": "^13.0.2",
|
|
53
53
|
"should": "^13.2.3"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "ea20ff47ca0caa48313ae9d7c527e866f7eb1571"
|
|
56
56
|
}
|
|
@@ -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:
|
|
98
|
-
actualShippingFee:
|
|
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 })
|
|
@@ -40,7 +40,7 @@ export function getStoreProducts() {
|
|
|
40
40
|
return {
|
|
41
41
|
native_attribute_id: attribute.id,
|
|
42
42
|
attribute_key: attribute.name,
|
|
43
|
-
|
|
43
|
+
values: attribute.options
|
|
44
44
|
}
|
|
45
45
|
}),
|
|
46
46
|
isVerified: product.purchasable,
|
|
@@ -61,7 +61,7 @@ export function getStoreProducts() {
|
|
|
61
61
|
return {
|
|
62
62
|
native_attribute_id: attribute.id,
|
|
63
63
|
attribute_key: attribute.name,
|
|
64
|
-
|
|
64
|
+
values: attribute.options
|
|
65
65
|
}
|
|
66
66
|
}),
|
|
67
67
|
isEnabled: product.purchasable,
|
|
@@ -87,7 +87,7 @@ export function getStoreProducts() {
|
|
|
87
87
|
return {
|
|
88
88
|
native_attribute_id: attribute.id,
|
|
89
89
|
attribute_key: attribute.name,
|
|
90
|
-
|
|
90
|
+
values: [attribute.option]
|
|
91
91
|
}
|
|
92
92
|
}),
|
|
93
93
|
isEnabled: variant.purchasable,
|