@things-factory/integration-marketplace 4.1.31 → 4.1.40
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/client/pages/marketplace-stores.js +8 -0
- 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/shopify/apis/get-store-orders.js +2 -2
- package/dist-server/controllers/shopify/apis/get-store-orders.js.map +1 -1
- package/dist-server/entities/marketplace-store.js +4 -0
- package/dist-server/entities/marketplace-store.js.map +1 -1
- package/dist-server/graphql/types/marketplace-store/marketplace-store-patch.js +1 -0
- package/dist-server/graphql/types/marketplace-store/marketplace-store-patch.js.map +1 -1
- package/dist-server/graphql/types/marketplace-store/marketplace-store.js +1 -0
- package/dist-server/graphql/types/marketplace-store/marketplace-store.js.map +1 -1
- package/dist-server/graphql/types/marketplace-store/new-marketplace-store.js +1 -0
- package/dist-server/graphql/types/marketplace-store/new-marketplace-store.js.map +1 -1
- package/package.json +15 -15
- package/server/controllers/shopee/apis/get-store-order.ts +8 -2
- package/server/controllers/shopify/apis/get-store-orders.ts +2 -2
- package/server/entities/marketplace-store.ts +3 -0
- package/server/graphql/types/marketplace-store/marketplace-store-patch.ts +1 -0
- package/server/graphql/types/marketplace-store/marketplace-store.ts +1 -0
- package/server/graphql/types/marketplace-store/new-marketplace-store.ts +1 -0
|
@@ -172,6 +172,13 @@ class MarketplaceStores extends localize(i18next)(PageView) {
|
|
|
172
172
|
record: { editable: true },
|
|
173
173
|
width: 100
|
|
174
174
|
},
|
|
175
|
+
{
|
|
176
|
+
type: 'boolean',
|
|
177
|
+
name: 'reserveEnabled',
|
|
178
|
+
header: i18next.t('field.reserve_enabled'),
|
|
179
|
+
record: { editable: true },
|
|
180
|
+
width: 100
|
|
181
|
+
},
|
|
175
182
|
{
|
|
176
183
|
type: 'string',
|
|
177
184
|
name: 'status',
|
|
@@ -227,6 +234,7 @@ class MarketplaceStores extends localize(i18next)(PageView) {
|
|
|
227
234
|
name
|
|
228
235
|
platform
|
|
229
236
|
eTrax
|
|
237
|
+
reserveEnabled
|
|
230
238
|
storeName
|
|
231
239
|
isAutoUpdateStockQty
|
|
232
240
|
isAutoUpdateShipment
|
|
@@ -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":"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"}
|
|
@@ -53,7 +53,7 @@ function getStoreOrders() {
|
|
|
53
53
|
orderCreatedAt: new Date(order.created_at).toUTCString(),
|
|
54
54
|
orderUpdatedAt: new Date(order.updated_at).toUTCString(),
|
|
55
55
|
discountValue: order.total_discounts,
|
|
56
|
-
status: orderStatus,
|
|
56
|
+
status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
|
|
57
57
|
trackingNo: fulfillment.tracking_number,
|
|
58
58
|
shippingProvider: fulfillment.tracking_company,
|
|
59
59
|
recipientAddress: fulfillment.billing_address == null ? fulfillment.shipping_address : fulfillment.billing_address,
|
|
@@ -138,7 +138,7 @@ function getStoreOrders() {
|
|
|
138
138
|
orderUpdatedAt: new Date(order.updated_at).toUTCString(),
|
|
139
139
|
discountValue: order.total_discounts,
|
|
140
140
|
recipientAddress: order.billing_address,
|
|
141
|
-
status: orderStatus,
|
|
141
|
+
status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
|
|
142
142
|
reason: order.cancel_reason,
|
|
143
143
|
orderItems: lineItems
|
|
144
144
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/get-store-orders.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,SAAgB,cAAc;IAC5B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,cAAc;QACpB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,IAAI,EAAE,CAAA;YAC7D,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;YAEhD,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAA;YACrD,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;YACnD,kEAAkE;YAClE,oCAAoC;YACpC,2BAA2B;YAE3B,IAAI,OAAO,GAAQ;gBACjB,KAAK;gBACL,cAAc;gBACd,cAAc;gBACd,MAAM,EAAE,KAAK;aACd,CAAA;YAED,IAAI,WAAW;gBAAE,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;YAEvD,OAAO,EAAE,OAAO,EAAE,CAAA;QACpB,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YAC5B,oBAAoB;YAEpB,2CAA2C;YAE3C,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAA;YAC3B,IAAI,IAAI,GAAY,KAAK,CAAA;YAEzB,IAAI,UAAU,EAAE;gBACd,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;aACjC;YAED,MAAM,gBAAgB,GAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;YAEpB,MAAM,OAAO,GAAU,MAAM;iBAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;iBAC5D,GAAG,CAAC,KAAK,CAAC,EAAE;gBACX,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAA;gBACxB,MAAM,iBAAiB,GAAG,KAAK,CAAC,kBAAkB,CAAA;gBAClD,IAAI,WAAW,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,EAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAA;gBAE3G,IAAI,SAAS,GAAW,CAAC,CAAA;gBACzB,IAAI,MAAW,CAAA;gBAEf,IAAI,iBAAiB,IAAI,IAAI,EAAE;oBAC7B,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;oBAEzC,MAAM,GAAG;wBACP,IAAI,EAAE,WAAW,CAAC,QAAQ;wBAC1B,OAAO,EAAE,KAAK,CAAC,IAAI;wBACnB,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,WAAW,EAAE,KAAK,CAAC,mBAAmB;wBACtC,MAAM,EAAE,KAAK,CAAC,IAAI;wBAClB,cAAc,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE;wBACxD,cAAc,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE;wBACxD,aAAa,EAAE,KAAK,CAAC,eAAe;wBACpC,MAAM,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/shopify/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -101,6 +101,10 @@ __decorate([
|
|
|
101
101
|
(0, typeorm_1.Column)({ default: false }),
|
|
102
102
|
__metadata("design:type", Boolean)
|
|
103
103
|
], MarketplaceStore.prototype, "isOwnTransport", void 0);
|
|
104
|
+
__decorate([
|
|
105
|
+
(0, typeorm_1.Column)({ default: false }),
|
|
106
|
+
__metadata("design:type", Boolean)
|
|
107
|
+
], MarketplaceStore.prototype, "reserveEnabled", void 0);
|
|
104
108
|
__decorate([
|
|
105
109
|
(0, typeorm_1.OneToMany)(type => entities_1.MarketplaceDistributor, marketplaceDistributor => marketplaceDistributor.marketplaceStore),
|
|
106
110
|
__metadata("design:type", Array)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../server/entities/marketplace-store.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAoD;AAIpD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../server/entities/marketplace-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-store-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-store-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;CAkBvC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;CAyBlC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/new-marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,mBAAmB,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"new-marketplace-store.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-store/new-marketplace-store.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,mBAAmB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;CAgBrC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-marketplace",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.40",
|
|
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": "060b5c664e80a6fcba09598f2c7ceffe067e02bf"
|
|
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 })
|
|
@@ -62,7 +62,7 @@ export function getStoreOrders() {
|
|
|
62
62
|
orderCreatedAt: new Date(order.created_at).toUTCString(),
|
|
63
63
|
orderUpdatedAt: new Date(order.updated_at).toUTCString(),
|
|
64
64
|
discountValue: order.total_discounts,
|
|
65
|
-
status: orderStatus,
|
|
65
|
+
status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
|
|
66
66
|
trackingNo: fulfillment.tracking_number,
|
|
67
67
|
shippingProvider: fulfillment.tracking_company,
|
|
68
68
|
recipientAddress:
|
|
@@ -152,7 +152,7 @@ export function getStoreOrders() {
|
|
|
152
152
|
orderUpdatedAt: new Date(order.updated_at).toUTCString(),
|
|
153
153
|
discountValue: order.total_discounts,
|
|
154
154
|
recipientAddress: order.billing_address,
|
|
155
|
-
status: orderStatus,
|
|
155
|
+
status: order.financial_status == 'pending' ? 'unpaid' : orderStatus,
|
|
156
156
|
reason: order.cancel_reason,
|
|
157
157
|
orderItems: lineItems
|
|
158
158
|
}
|
|
@@ -80,6 +80,9 @@ export class MarketplaceStore {
|
|
|
80
80
|
@Column({ default: false })
|
|
81
81
|
isOwnTransport: Boolean
|
|
82
82
|
|
|
83
|
+
@Column({ default: false })
|
|
84
|
+
reserveEnabled: Boolean
|
|
85
|
+
|
|
83
86
|
@OneToMany(type => MarketplaceDistributor, marketplaceDistributor => marketplaceDistributor.marketplaceStore)
|
|
84
87
|
marketplaceDistributors: MarketplaceDistributor[]
|
|
85
88
|
|