@things-factory/integration-marketplace 4.0.23 → 4.0.27
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/lazada/apis/get-store-order.js +1 -0
- package/dist-server/controllers/lazada/apis/get-store-order.js.map +1 -1
- package/dist-server/controllers/lazada/apis/get-store-orders.js +2 -1
- package/dist-server/controllers/lazada/apis/get-store-orders.js.map +1 -1
- package/dist-server/controllers/shopee/apis/get-store-order.js +2 -1
- package/dist-server/controllers/shopee/apis/get-store-order.js.map +1 -1
- package/dist-server/controllers/woocommerce/apis/get-store-orders.js +18 -5
- package/dist-server/controllers/woocommerce/apis/get-store-orders.js.map +1 -1
- package/dist-server/controllers/woocommerce/woocommerce.js +4 -0
- package/dist-server/controllers/woocommerce/woocommerce.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/update-marketplace-setting.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/update-marketplace-setting.js.map +1 -1
- package/dist-server/routers/shopify-install-public-router.js +14 -4
- package/dist-server/routers/shopify-install-public-router.js.map +1 -1
- package/package.json +15 -15
- package/server/controllers/lazada/apis/get-store-order.ts +1 -0
- package/server/controllers/lazada/apis/get-store-orders.ts +2 -1
- package/server/controllers/shopee/apis/get-store-order.ts +2 -1
- package/server/controllers/woocommerce/apis/get-store-orders.ts +23 -5
- package/server/controllers/woocommerce/woocommerce.ts +4 -0
- package/server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts +1 -1
- package/server/routers/shopify-install-public-router.ts +18 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-order.js","sourceRoot":"","sources":["../../../../server/controllers/lazada/apis/get-store-order.ts"],"names":[],"mappings":";AAAA,2GAA2G;;;AAE3G,+CAA0C;AAE1C,SAAgB,aAAa;IAC3B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,YAAY;QAClB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YAE9B,OAAO;gBACL,QAAQ,EAAE,OAAO;aAClB,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YAC5B,IAAI,EACF,QAAQ,EACR,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,WAAW,EAClB,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,UAAU,EACX,GAAG,GAAG,CAAA;YAEP,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAExB,IAAI,OAAO,GAAG,QAAQ,CAAA;YACtB,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;YAC9B,IAAI,eAAe,GAAG,MAAM,oBAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;YAE3E,yBAAyB;YACzB,IAAI,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;YAE9C,+BAA+B;YAC/B,IAAI,gBAAgB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAA;YAE1D,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EAAE,QAAQ,EACnB,KAAK,EACL,MAAM,EACN,OAAO,EACP,IAAI,EACJ,UAAU,EACV,SAAS,EACV,GAAG,gBAAgB,CAAA;YAEpB,IAAI,aAAa,GAAG;gBAClB,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,KAAK;gBACL,MAAM;gBACN,QAAQ;gBACR,IAAI;gBACJ,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO;gBAChD,WAAW,EAAE,GAAG,UAAU,IAAI,SAAS,EAAE;aAC1C,CAAA;YAED,OAAO;gBACL,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,cAAc;gBACd,cAAc;gBACd,WAAW;gBACX,UAAU;gBACV,gBAAgB;gBAChB,SAAS;gBACT,UAAU,EAAE,eAAe;gBAC3B,aAAa;aACd,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"get-store-order.js","sourceRoot":"","sources":["../../../../server/controllers/lazada/apis/get-store-order.ts"],"names":[],"mappings":";AAAA,2GAA2G;;;AAE3G,+CAA0C;AAE1C,SAAgB,aAAa;IAC3B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,YAAY;QAClB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YAE9B,OAAO;gBACL,QAAQ,EAAE,OAAO;aAClB,CAAA;QACH,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE;YAC5B,IAAI,EACF,QAAQ,EACR,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE,WAAW,EAClB,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,UAAU,EACX,GAAG,GAAG,CAAA;YAEP,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;YACvD,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAExB,IAAI,OAAO,GAAG,QAAQ,CAAA;YACtB,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAA;YAC9B,IAAI,eAAe,GAAG,MAAM,oBAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;YAE3E,yBAAyB;YACzB,IAAI,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;YAE9C,+BAA+B;YAC/B,IAAI,gBAAgB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAA;YAE1D,MAAM,EACJ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EAAE,QAAQ,EACnB,KAAK,EACL,MAAM,EACN,OAAO,EACP,IAAI,EACJ,UAAU,EACV,SAAS,EACV,GAAG,gBAAgB,CAAA;YAEpB,IAAI,aAAa,GAAG;gBAClB,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,KAAK;gBACL,MAAM;gBACN,QAAQ;gBACR,IAAI;gBACJ,KAAK,EAAE,QAAQ;gBACf,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO;gBAChD,WAAW,EAAE,GAAG,UAAU,IAAI,SAAS,EAAE;aAC1C,CAAA;YAED,OAAO;gBACL,IAAI;gBACJ,OAAO;gBACP,MAAM;gBACN,cAAc;gBACd,cAAc;gBACd,WAAW;gBACX,UAAU;gBACV,gBAAgB;gBAChB,SAAS;gBACT,UAAU,EAAE,eAAe;gBAC3B,aAAa;aACd,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAlFD,sCAkFC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/lazada/apis/get-store-orders.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/lazada/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ function getStoreOrder() {
|
|
|
48
48
|
discount: qty * variationOriginalPrice - qty * variationDiscountedPrice
|
|
49
49
|
};
|
|
50
50
|
});
|
|
51
|
-
const { full_address, zipcode: postCode, phone, country, city, name: attentionTo } = recipient_address;
|
|
51
|
+
const { full_address, zipcode: postCode, phone, country, city, name: attentionTo, state } = recipient_address;
|
|
52
52
|
var orderShipping = {
|
|
53
53
|
address1: full_address,
|
|
54
54
|
address2: null,
|
|
@@ -59,6 +59,7 @@ function getStoreOrder() {
|
|
|
59
59
|
phone2: null,
|
|
60
60
|
postCode,
|
|
61
61
|
city,
|
|
62
|
+
state,
|
|
62
63
|
country: country === 'MY' ? 'Malaysia' : country,
|
|
63
64
|
collectionCurrency: null,
|
|
64
65
|
attentionTo,
|
|
@@ -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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"}
|
|
@@ -17,7 +17,8 @@ function getStoreOrders() {
|
|
|
17
17
|
// var update_time_to = now
|
|
18
18
|
var payload = {
|
|
19
19
|
offset: page * limit,
|
|
20
|
-
limit,
|
|
20
|
+
per_page: limit,
|
|
21
|
+
page: page + 1,
|
|
21
22
|
after,
|
|
22
23
|
before
|
|
23
24
|
};
|
|
@@ -25,14 +26,18 @@ function getStoreOrders() {
|
|
|
25
26
|
},
|
|
26
27
|
async normalize(res, { store }) {
|
|
27
28
|
// return res.orders
|
|
28
|
-
var { items: orders,
|
|
29
|
+
var { items: orders, link } = res;
|
|
29
30
|
let results = [];
|
|
31
|
+
var more = false;
|
|
32
|
+
if (link) {
|
|
33
|
+
more = checkNextPage(link);
|
|
34
|
+
}
|
|
30
35
|
for (var i = 0; i < orders.length; i++) {
|
|
31
36
|
const order = orders[i];
|
|
32
37
|
const { id: name, number: orderNo, currency, total: totalAmount, payment_method: paymentMethod, status, discount_total: discountValue, date_created_gmt, date_modified_gmt, shipping, billing, line_items } = order;
|
|
33
38
|
let docRefNo = orderNo;
|
|
34
|
-
var orderCreatedAt = new Date(date_created_gmt)
|
|
35
|
-
var orderUpdatedAt = new Date(date_modified_gmt)
|
|
39
|
+
var orderCreatedAt = new Date(date_created_gmt);
|
|
40
|
+
var orderUpdatedAt = new Date(date_modified_gmt);
|
|
36
41
|
let orderItems = line_items.map(item => {
|
|
37
42
|
var { id: name, product_id, variation_id, quantity: qty, price } = item;
|
|
38
43
|
return {
|
|
@@ -84,9 +89,17 @@ function getStoreOrders() {
|
|
|
84
89
|
orderShipping
|
|
85
90
|
});
|
|
86
91
|
}
|
|
87
|
-
return { results };
|
|
92
|
+
return { results, more };
|
|
88
93
|
}
|
|
89
94
|
};
|
|
90
95
|
}
|
|
91
96
|
exports.getStoreOrders = getStoreOrders;
|
|
97
|
+
function checkNextPage(link) {
|
|
98
|
+
let nextPage = false;
|
|
99
|
+
// If there's a previous link, remove the first part of the string entirely
|
|
100
|
+
if (link.indexOf(`rel="next"`) > -1) {
|
|
101
|
+
nextPage = true;
|
|
102
|
+
}
|
|
103
|
+
return nextPage;
|
|
104
|
+
}
|
|
92
105
|
//# sourceMappingURL=get-store-orders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/woocommerce/apis/get-store-orders.ts"],"names":[],"mappings":";AAAA,yFAAyF;AACzF,2BAA2B;;;AAE3B,SAAgB,cAAc;IAC5B,OAAO;QACL,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,SAAS;QACf,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,GAAG,IAAI,EAAE,CAAA;YAChD,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;YAEhD,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAA;YAC5C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;YAC3C,kEAAkE;YAClE,oCAAoC;YACpC,2BAA2B;YAE3B,IAAI,OAAO,GAAG;gBACZ,MAAM,EAAE,IAAI,GAAG,KAAK;gBACpB,KAAK;
|
|
1
|
+
{"version":3,"file":"get-store-orders.js","sourceRoot":"","sources":["../../../../server/controllers/woocommerce/apis/get-store-orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,9 +28,13 @@ class Woocommerce {
|
|
|
28
28
|
}
|
|
29
29
|
});
|
|
30
30
|
const totalItems = response.headers.get('X-WP-Total');
|
|
31
|
+
const totalPages = response.headers.get('X-WP-TotalPages');
|
|
32
|
+
const link = response.headers.get('Link');
|
|
31
33
|
var result = {};
|
|
32
34
|
result.items = await response.json();
|
|
33
35
|
result.totalItems = totalItems;
|
|
36
|
+
result.totalPages = totalPages;
|
|
37
|
+
result.link = link;
|
|
34
38
|
debug('response result', result);
|
|
35
39
|
return result;
|
|
36
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"woocommerce.js","sourceRoot":"","sources":["../../../server/controllers/woocommerce/woocommerce.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAE9B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,oDAAoD,CAAC,CAAA;AASpF,MAAa,WAAW;IAGtB,YAAY,MAAyB;QACnC,IAAI,CAAC,MAAM,qBACN,MAAM,CACV,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,IAAS;QAC/B,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAEhF,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;aAC5B,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,QAAQ,GAAG,GAAG,QAAQ,iBAAiB,IAAI,iBAAiB,YAAY,oBAAoB,eAAe,sBAAsB,eAAe,IACpJ,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAClB,EAAE,CAAA;QACF,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3B,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE;YACrC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"woocommerce.js","sourceRoot":"","sources":["../../../server/controllers/woocommerce/woocommerce.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ exports.updateMarketplaceSetting = {
|
|
|
10
10
|
await Promise.all(marketplaceSettingPatch.map(async (settingPatch) => {
|
|
11
11
|
const marketplaceStore = await marketplaceStoreRepo.findOne(settingPatch === null || settingPatch === void 0 ? void 0 : settingPatch.marketplaceStore.id);
|
|
12
12
|
const marketplaceSetting = await marketplaceSettingRepo.findOne({
|
|
13
|
-
where: { domain, marketplaceStore }
|
|
13
|
+
where: { domain, marketplaceStore, category: settingPatch.category }
|
|
14
14
|
});
|
|
15
15
|
await marketplaceSettingRepo.save(Object.assign(Object.assign(Object.assign({}, marketplaceSetting), settingPatch), { updater: user }));
|
|
16
16
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-marketplace-setting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts"],"names":[],"mappings":";;;AAAA,gDAAwE;AAE3D,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,uBAAuB,EAAE,EAAE,OAAY;QAC9E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,sBAAsB,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAkB,CAAC,CAAA;QACnE,MAAM,oBAAoB,GAAG,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAA;QAE/D,MAAM,OAAO,CAAC,GAAG,CACf,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE;YAC/C,MAAM,gBAAgB,GAAqB,MAAM,oBAAoB,CAAC,OAAO,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB,CAAC,EAAE,CAAC,CAAA;YAChH,MAAM,kBAAkB,GAAuB,MAAM,sBAAsB,CAAC,OAAO,CAAC;gBAClF,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE;
|
|
1
|
+
{"version":3,"file":"update-marketplace-setting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts"],"names":[],"mappings":";;;AAAA,gDAAwE;AAE3D,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,uBAAuB,EAAE,EAAE,OAAY;QAC9E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,sBAAsB,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAkB,CAAC,CAAA;QACnE,MAAM,oBAAoB,GAAG,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAA;QAE/D,MAAM,OAAO,CAAC,GAAG,CACf,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE;YAC/C,MAAM,gBAAgB,GAAqB,MAAM,oBAAoB,CAAC,OAAO,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB,CAAC,EAAE,CAAC,CAAA;YAChH,MAAM,kBAAkB,GAAuB,MAAM,sBAAsB,CAAC,OAAO,CAAC;gBAClF,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE;aACrE,CAAC,CAAA;YAEF,MAAM,sBAAsB,CAAC,IAAI,+CAC5B,kBAAkB,GAClB,YAAY,KACf,OAAO,EAAE,IAAI,IACb,CAAA;QACJ,CAAC,CAAC,CACH,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.shopifyInstallPublicRouter = void 0;
|
|
7
7
|
const koa_router_1 = __importDefault(require("koa-router"));
|
|
8
8
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
9
|
+
const typeorm_1 = require("typeorm");
|
|
9
10
|
const env_1 = require("@things-factory/env");
|
|
10
11
|
const shell_1 = require("@things-factory/shell");
|
|
11
12
|
const shopify_1 = require("../controllers/shopify");
|
|
13
|
+
const entities_1 = require("../entities");
|
|
12
14
|
const debug = require('debug')('things-factory:integration-marketplace:shopify-install-public-router');
|
|
13
15
|
exports.shopifyInstallPublicRouter = new koa_router_1.default();
|
|
14
16
|
exports.shopifyInstallPublicRouter.get('/install-shopify', async (context, next) => {
|
|
@@ -98,14 +100,18 @@ exports.shopifyInstallPublicRouter.get('/callback-shopify-install', async (conte
|
|
|
98
100
|
context.redirect((0, shell_1.getUrlFromContext)(context, '/callback-shopify-post-install'));
|
|
99
101
|
});
|
|
100
102
|
exports.shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next) => {
|
|
101
|
-
const shopifyConfig = env_1.config.get('marketplaceIntegrationShopifyPrivate', {});
|
|
102
|
-
const { apiKey, apiSecret } = shopifyConfig;
|
|
103
103
|
const { secure } = context;
|
|
104
104
|
const { shop: shopUrl } = context.query;
|
|
105
105
|
debug('shop', shopUrl);
|
|
106
106
|
if (!shopUrl) {
|
|
107
107
|
context.throw(400, 'shop not found from the request');
|
|
108
108
|
}
|
|
109
|
+
const marketplaceStore = await (0, typeorm_1.getRepository)(entities_1.MarketplaceStore).findOne({
|
|
110
|
+
where: { storeURL: shopUrl }
|
|
111
|
+
});
|
|
112
|
+
if (!marketplaceStore)
|
|
113
|
+
context.throw(400, 'marketplace store not found');
|
|
114
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore;
|
|
109
115
|
const shop = shopUrl.replace('.myshopify.com', '');
|
|
110
116
|
const shopify = new shopify_1.Shopify({ apiKey, apiSecret, shop });
|
|
111
117
|
const redirectUrl = (0, shell_1.getUrlFromContext)(context, '/callback-shopify-install-private');
|
|
@@ -118,8 +124,6 @@ exports.shopifyInstallPublicRouter.get('/install-shopify-private', async (contex
|
|
|
118
124
|
context.redirect(authUrl);
|
|
119
125
|
});
|
|
120
126
|
exports.shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (context, next) => {
|
|
121
|
-
const shopifyConfig = env_1.config.get('marketplaceIntegrationShopifyPrivate', {});
|
|
122
|
-
const { apiKey, apiSecret } = shopifyConfig;
|
|
123
127
|
const { secure } = context;
|
|
124
128
|
const { shop: shopUrl, code, state } = context.query;
|
|
125
129
|
const stateCookie = context.cookies.get('shopify-install-state');
|
|
@@ -130,6 +134,12 @@ exports.shopifyInstallPublicRouter.get('/callback-shopify-install-private', asyn
|
|
|
130
134
|
secure,
|
|
131
135
|
httpOnly: true
|
|
132
136
|
});
|
|
137
|
+
const marketplaceStore = await (0, typeorm_1.getRepository)(entities_1.MarketplaceStore).findOne({
|
|
138
|
+
where: { storeURL: shopUrl }
|
|
139
|
+
});
|
|
140
|
+
if (!marketplaceStore)
|
|
141
|
+
context.throw(400, 'marketplace store not found');
|
|
142
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore;
|
|
133
143
|
const shop = shopUrl.replace('.myshopify.com', '');
|
|
134
144
|
const shopify = new shopify_1.Shopify({ apiKey, apiSecret, shop });
|
|
135
145
|
if (!shopify.isValidSignature(context.query)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify-install-public-router.js","sourceRoot":"","sources":["../../server/routers/shopify-install-public-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,4DAA8B;AAC9B,6CAA4C;AAC5C,iDAAyD;
|
|
1
|
+
{"version":3,"file":"shopify-install-public-router.js","sourceRoot":"","sources":["../../server/routers/shopify-install-public-router.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.0.
|
|
3
|
+
"version": "4.0.27",
|
|
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.0.
|
|
29
|
-
"@things-factory/auth-ui": "^4.0.
|
|
30
|
-
"@things-factory/biz-base": "^4.0.
|
|
31
|
-
"@things-factory/code-ui": "^4.0.
|
|
32
|
-
"@things-factory/context-ui": "^4.0.
|
|
33
|
-
"@things-factory/grist-ui": "^4.0.
|
|
34
|
-
"@things-factory/i18n-ui": "^4.0.
|
|
35
|
-
"@things-factory/integration-lmd": "^4.0.
|
|
36
|
-
"@things-factory/integration-ui": "^4.0.
|
|
37
|
-
"@things-factory/more-ui": "^4.0.
|
|
38
|
-
"@things-factory/resource-ui": "^4.0.
|
|
39
|
-
"@things-factory/setting-ui": "^4.0.
|
|
40
|
-
"@things-factory/system-ui": "^4.0.
|
|
28
|
+
"@things-factory/apptool-ui": "^4.0.27",
|
|
29
|
+
"@things-factory/auth-ui": "^4.0.27",
|
|
30
|
+
"@things-factory/biz-base": "^4.0.27",
|
|
31
|
+
"@things-factory/code-ui": "^4.0.27",
|
|
32
|
+
"@things-factory/context-ui": "^4.0.27",
|
|
33
|
+
"@things-factory/grist-ui": "^4.0.27",
|
|
34
|
+
"@things-factory/i18n-ui": "^4.0.27",
|
|
35
|
+
"@things-factory/integration-lmd": "^4.0.27",
|
|
36
|
+
"@things-factory/integration-ui": "^4.0.27",
|
|
37
|
+
"@things-factory/more-ui": "^4.0.27",
|
|
38
|
+
"@things-factory/resource-ui": "^4.0.27",
|
|
39
|
+
"@things-factory/setting-ui": "^4.0.27",
|
|
40
|
+
"@things-factory/system-ui": "^4.0.27",
|
|
41
41
|
"debug": "^4.1.1",
|
|
42
42
|
"node-fetch": "^2.6.0",
|
|
43
43
|
"querystring": "^0.2.1"
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"nock": "^13.0.2",
|
|
54
54
|
"should": "^13.2.3"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "276eaface2890c8f229ce6c9f64cde9c6b1e0083"
|
|
57
57
|
}
|
|
@@ -76,7 +76,7 @@ export function getStoreOrder() {
|
|
|
76
76
|
}
|
|
77
77
|
})
|
|
78
78
|
|
|
79
|
-
const { full_address, zipcode: postCode, phone, country, city, name: attentionTo } = recipient_address
|
|
79
|
+
const { full_address, zipcode: postCode, phone, country, city, name: attentionTo, state } = recipient_address
|
|
80
80
|
|
|
81
81
|
var orderShipping = {
|
|
82
82
|
address1: full_address,
|
|
@@ -88,6 +88,7 @@ export function getStoreOrder() {
|
|
|
88
88
|
phone2: null,
|
|
89
89
|
postCode,
|
|
90
90
|
city,
|
|
91
|
+
state,
|
|
91
92
|
country: country === 'MY' ? 'Malaysia' : country,
|
|
92
93
|
collectionCurrency: null,
|
|
93
94
|
attentionTo,
|
|
@@ -17,7 +17,8 @@ export function getStoreOrders() {
|
|
|
17
17
|
|
|
18
18
|
var payload = {
|
|
19
19
|
offset: page * limit,
|
|
20
|
-
limit,
|
|
20
|
+
per_page: limit,
|
|
21
|
+
page: page + 1,
|
|
21
22
|
after,
|
|
22
23
|
before
|
|
23
24
|
}
|
|
@@ -26,9 +27,15 @@ export function getStoreOrders() {
|
|
|
26
27
|
},
|
|
27
28
|
async normalize(res, { store }) {
|
|
28
29
|
// return res.orders
|
|
29
|
-
var { items: orders,
|
|
30
|
+
var { items: orders, link } = res
|
|
30
31
|
let results: any[] = []
|
|
31
32
|
|
|
33
|
+
var more: boolean = false
|
|
34
|
+
|
|
35
|
+
if (link) {
|
|
36
|
+
more = checkNextPage(link)
|
|
37
|
+
}
|
|
38
|
+
|
|
32
39
|
for (var i = 0; i < orders.length; i++) {
|
|
33
40
|
const order = orders[i]
|
|
34
41
|
|
|
@@ -48,8 +55,8 @@ export function getStoreOrders() {
|
|
|
48
55
|
} = order
|
|
49
56
|
|
|
50
57
|
let docRefNo = orderNo
|
|
51
|
-
var orderCreatedAt = new Date(date_created_gmt)
|
|
52
|
-
var orderUpdatedAt = new Date(date_modified_gmt)
|
|
58
|
+
var orderCreatedAt = new Date(date_created_gmt)
|
|
59
|
+
var orderUpdatedAt = new Date(date_modified_gmt)
|
|
53
60
|
|
|
54
61
|
let orderItems = line_items.map(item => {
|
|
55
62
|
var { id: name, product_id, variation_id, quantity: qty, price } = item
|
|
@@ -132,7 +139,18 @@ export function getStoreOrders() {
|
|
|
132
139
|
})
|
|
133
140
|
}
|
|
134
141
|
|
|
135
|
-
return { results }
|
|
142
|
+
return { results, more }
|
|
136
143
|
}
|
|
137
144
|
}
|
|
138
145
|
}
|
|
146
|
+
|
|
147
|
+
function checkNextPage(link) {
|
|
148
|
+
let nextPage: boolean = false
|
|
149
|
+
|
|
150
|
+
// If there's a previous link, remove the first part of the string entirely
|
|
151
|
+
if (link.indexOf(`rel="next"`) > -1) {
|
|
152
|
+
nextPage = true
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
return nextPage
|
|
156
|
+
}
|
|
@@ -42,10 +42,14 @@ export class Woocommerce {
|
|
|
42
42
|
})
|
|
43
43
|
|
|
44
44
|
const totalItems = response.headers.get('X-WP-Total')
|
|
45
|
+
const totalPages = response.headers.get('X-WP-TotalPages')
|
|
46
|
+
const link = response.headers.get('Link')
|
|
45
47
|
|
|
46
48
|
var result: any = {}
|
|
47
49
|
result.items = await response.json()
|
|
48
50
|
result.totalItems = totalItems
|
|
51
|
+
result.totalPages = totalPages
|
|
52
|
+
result.link = link
|
|
49
53
|
|
|
50
54
|
debug('response result', result)
|
|
51
55
|
|
|
@@ -10,7 +10,7 @@ export const updateMarketplaceSetting = {
|
|
|
10
10
|
marketplaceSettingPatch.map(async settingPatch => {
|
|
11
11
|
const marketplaceStore: MarketplaceStore = await marketplaceStoreRepo.findOne(settingPatch?.marketplaceStore.id)
|
|
12
12
|
const marketplaceSetting: MarketplaceSetting = await marketplaceSettingRepo.findOne({
|
|
13
|
-
where: { domain, marketplaceStore }
|
|
13
|
+
where: { domain, marketplaceStore, category: settingPatch.category }
|
|
14
14
|
})
|
|
15
15
|
|
|
16
16
|
await marketplaceSettingRepo.save({
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import Router from 'koa-router'
|
|
2
2
|
import fetch from 'node-fetch'
|
|
3
|
+
import { getRepository } from 'typeorm'
|
|
4
|
+
|
|
3
5
|
import { config } from '@things-factory/env'
|
|
4
6
|
import { getUrlFromContext } from '@things-factory/shell'
|
|
7
|
+
|
|
5
8
|
import { Shopify } from '../controllers/shopify'
|
|
9
|
+
import { MarketplaceStore } from '../entities'
|
|
6
10
|
|
|
7
11
|
const debug = require('debug')('things-factory:integration-marketplace:shopify-install-public-router')
|
|
8
12
|
|
|
@@ -121,15 +125,19 @@ shopifyInstallPublicRouter.get('/callback-shopify-install', async (context, next
|
|
|
121
125
|
})
|
|
122
126
|
|
|
123
127
|
shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next) => {
|
|
124
|
-
const shopifyConfig = config.get('marketplaceIntegrationShopifyPrivate', {})
|
|
125
|
-
const { apiKey, apiSecret } = shopifyConfig
|
|
126
|
-
|
|
127
128
|
const { secure } = context
|
|
128
129
|
const { shop: shopUrl } = context.query
|
|
129
130
|
debug('shop', shopUrl)
|
|
130
131
|
if (!shopUrl) {
|
|
131
132
|
context.throw(400, 'shop not found from the request')
|
|
132
133
|
}
|
|
134
|
+
const marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
|
|
135
|
+
where: { storeURL: shopUrl }
|
|
136
|
+
})
|
|
137
|
+
|
|
138
|
+
if (!marketplaceStore) context.throw(400, 'marketplace store not found')
|
|
139
|
+
|
|
140
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore
|
|
133
141
|
const shop = shopUrl.replace('.myshopify.com', '')
|
|
134
142
|
|
|
135
143
|
const shopify = new Shopify({ apiKey, apiSecret, shop })
|
|
@@ -147,8 +155,6 @@ shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next)
|
|
|
147
155
|
})
|
|
148
156
|
|
|
149
157
|
shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (context, next) => {
|
|
150
|
-
const shopifyConfig = config.get('marketplaceIntegrationShopifyPrivate', {})
|
|
151
|
-
const { apiKey, apiSecret } = shopifyConfig
|
|
152
158
|
const { secure } = context
|
|
153
159
|
const { shop: shopUrl, code, state } = context.query
|
|
154
160
|
const stateCookie = context.cookies.get('shopify-install-state')
|
|
@@ -162,6 +168,13 @@ shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (conte
|
|
|
162
168
|
httpOnly: true
|
|
163
169
|
})
|
|
164
170
|
|
|
171
|
+
const marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
|
|
172
|
+
where: { storeURL: shopUrl }
|
|
173
|
+
})
|
|
174
|
+
|
|
175
|
+
if (!marketplaceStore) context.throw(400, 'marketplace store not found')
|
|
176
|
+
|
|
177
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore
|
|
165
178
|
const shop = shopUrl.replace('.myshopify.com', '')
|
|
166
179
|
|
|
167
180
|
const shopify = new Shopify({ apiKey, apiSecret, shop })
|