@things-factory/marketplace-base 3.6.26 → 3.6.34

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 (16) hide show
  1. package/dist-server/entities/marketplace-order.js +2 -2
  2. package/dist-server/entities/marketplace-order.js.map +1 -1
  3. package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js +32 -12
  4. package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map +1 -1
  5. package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js +21 -5
  6. package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map +1 -1
  7. package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js +21 -5
  8. package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map +1 -1
  9. package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js +14 -19
  10. package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js.map +1 -1
  11. package/package.json +5 -5
  12. package/server/entities/marketplace-order.ts +2 -2
  13. package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts +39 -16
  14. package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts +37 -4
  15. package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts +37 -4
  16. package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts +21 -22
package/dist-server/entities/marketplace-order.js CHANGED
@@ -56,8 +56,8 @@ __decorate([
56
56
  __metadata("design:type", Number)
57
57
  ], MarketplaceOrder.prototype, "itemCount", void 0);
58
58
  __decorate([
59
- (0, typeorm_1.Column)({ nullable: true }),
60
- __metadata("design:type", String)
59
+ (0, typeorm_1.Column)({ type: 'float', nullable: true }),
60
+ __metadata("design:type", Number)
61
61
  ], MarketplaceOrder.prototype, "totalAmount", void 0);
62
62
  __decorate([
63
63
  (0, typeorm_1.Column)({ nullable: true }),
package/dist-server/entities/marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js CHANGED
@@ -1,22 +1,42 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.marketplaceOrdersResolver = void 0;
4
- const shell_1 = require("@things-factory/shell");
5
4
  const typeorm_1 = require("typeorm");
5
+ const shell_1 = require("@things-factory/shell");
6
6
  const entities_1 = require("../../../entities");
7
7
  exports.marketplaceOrdersResolver = {
8
8
  async marketplaceOrders(_, params, context) {
9
- const convertedParams = (0, shell_1.convertListParams)(params, context.state.domain.id);
10
- const [items, total] = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: [
11
- 'domain',
12
- 'marketplaceStore',
13
- 'marketplaceOrderItems',
14
- 'marketplaceOrderItems.marketplaceProductVariation',
15
- 'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct',
16
- 'marketplaceOrderItems.marketplaceOrderShipping',
17
- 'creator',
18
- 'updater'
19
- ] }));
9
+ var _a;
10
+ let postCodeSorter = params.sortings.filter(sort => sort.name === 'postCode');
11
+ params.sortings = params.sortings.filter(sort => sort.name !== 'postCode');
12
+ let qb = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).createQueryBuilder('mo');
13
+ (0, shell_1.buildQuery)(qb, params, context);
14
+ qb.leftJoinAndSelect('mo.domain', 'domain')
15
+ .leftJoinAndSelect('mo.marketplaceStore', 'ms')
16
+ .leftJoinAndSelect('mo.marketplaceOrderItems', 'mi')
17
+ .leftJoinAndSelect('mi.marketplaceProductVariation', 'mpv')
18
+ .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
19
+ .leftJoinAndSelect('mi.marketplaceOrderShipping', 'mos')
20
+ .leftJoinAndSelect('mo.creator', 'creator')
21
+ .leftJoinAndSelect('mo.updater', 'updater');
22
+ if (postCodeSorter) {
23
+ qb.addOrderBy('mos.postCode', ((_a = postCodeSorter[0]) === null || _a === void 0 ? void 0 : _a.desc) ? 'DESC' : 'ASC');
24
+ }
25
+ let [items, total] = await qb.getManyAndCount();
26
+ // const convertedParams = convertListParams(params, context.state.domain.id)
27
+ // const [items, total] = await getRepository(MarketplaceOrder).findAndCount({
28
+ // ...convertedParams,
29
+ // relations: [
30
+ // 'domain',
31
+ // 'marketplaceStore',
32
+ // 'marketplaceOrderItems',
33
+ // 'marketplaceOrderItems.marketplaceProductVariation',
34
+ // 'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct',
35
+ // 'marketplaceOrderItems.marketplaceOrderShipping',
36
+ // 'creator',
37
+ // 'updater'
38
+ // ]
39
+ // })
20
40
  return { items, total };
21
41
  }
22
42
  };
package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,iDAAoE;AACpE,qCAAuC;AACvC,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC1E,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,YAAY,iCACpE,eAAe,KAClB,SAAS,EAAE;gBACT,QAAQ;gBACR,kBAAkB;gBAClB,uBAAuB;gBACvB,mDAAmD;gBACnD,sEAAsE;gBACtE,gDAAgD;gBAChD,SAAS;gBACT,SAAS;aACV,IACD,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC7D,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE7E,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE1E,IAAI,EAAE,GAAyC,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACvG,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;aACxC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC;aAC9C,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC;aACnD,iBAAiB,CAAC,gCAAgC,EAAE,KAAK,CAAC;aAC1D,iBAAiB,CAAC,wBAAwB,EAAE,IAAI,CAAC;aACjD,iBAAiB,CAAC,6BAA6B,EAAE,KAAK,CAAC;aACvD,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAE7C,IAAI,cAAc,EAAE;YAClB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA,MAAA,cAAc,CAAC,CAAC,CAAC,0CAAE,IAAI,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACxE;QAED,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAE/C,6EAA6E;QAC7E,8EAA8E;QAC9E,wBAAwB;QACxB,iBAAiB;QACjB,gBAAgB;QAChB,0BAA0B;QAC1B,+BAA+B;QAC/B,2DAA2D;QAC3D,8EAA8E;QAC9E,wDAAwD;QACxD,iBAAiB;QACjB,gBAAgB;QAChB,MAAM;QACN,KAAK;QAEL,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js CHANGED
@@ -40,6 +40,7 @@ exports.syncAllMarketplaceOrder = {
40
40
  var order = marketplaceOrders[m];
41
41
  let marketplaceOrderItems = [];
42
42
  let tracking_code = '';
43
+ let deliveryProvider;
43
44
  if (marketplaceStore.platform == 'lazada') {
44
45
  if (order.trackingNo != '') {
45
46
  tracking_code = JSON.parse(order.trackingNo)
@@ -51,6 +52,12 @@ exports.syncAllMarketplaceOrder = {
51
52
  }, [])
52
53
  .join(',');
53
54
  }
55
+ const shippingProviderInfo = {};
56
+ order.shippingProvider.split(', ').forEach(s => {
57
+ var [key, value] = s.split(': ');
58
+ shippingProviderInfo[key] = value;
59
+ });
60
+ deliveryProvider = shippingProviderInfo.Delivery;
54
61
  }
55
62
  let marketplaceOrder = new entities_1.MarketplaceOrder();
56
63
  marketplaceOrder.name = order.name;
@@ -75,7 +82,12 @@ exports.syncAllMarketplaceOrder = {
75
82
  ]
76
83
  });
77
84
  if (existingMarketplaceOrder) {
78
- marketplaceOrder = Object.assign(Object.assign(Object.assign({}, existingMarketplaceOrder), marketplaceOrder), { updater: user });
85
+ let otherInfoJSON = {};
86
+ if ((existingMarketplaceOrder === null || existingMarketplaceOrder === void 0 ? void 0 : existingMarketplaceOrder.otherInfoJSON) && deliveryProvider) {
87
+ otherInfoJSON = JSON.parse(existingMarketplaceOrder.otherInfoJSON);
88
+ otherInfoJSON.shippingProvider = deliveryProvider;
89
+ }
90
+ marketplaceOrder = Object.assign(Object.assign(Object.assign({}, existingMarketplaceOrder), marketplaceOrder), { otherInfoJSON: otherInfoJSON ? JSON.stringify(otherInfoJSON) : null, updater: user });
79
91
  const cancelStatuses = ['cancelled', 'canceled'];
80
92
  if (cancelStatuses.includes(marketplaceOrder.status) && (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.releaseOrderId)) {
81
93
  if (existingMarketplaceOrder.isSplitted) {
@@ -193,7 +205,8 @@ exports.syncAllMarketplaceOrder = {
193
205
  if (existingMarketplaceOrder.isSplitted) {
194
206
  let existingOrderItems = [];
195
207
  existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems;
196
- marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name);
208
+ marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name &&
209
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
197
210
  marketplaceOrderItems = marketplaceOrderItems.map(marketplaceOrderitem => {
198
211
  return Object.assign(Object.assign({}, marketplaceOrderitem), { status: order.status, marketplaceProductVariation: foundVariation, trackingCode: order.trackingNo });
199
212
  });
@@ -204,7 +217,8 @@ exports.syncAllMarketplaceOrder = {
204
217
  if (existingOrderItems.length > marketplaceOrderItems.length) {
205
218
  let nonMatchedOrderItems = [];
206
219
  existingOrderItems.map(item => {
207
- const matchedOrderItem = marketplaceOrderItems.find(itm => itm.name === item.name);
220
+ const matchedOrderItem = marketplaceOrderItems.find(itm => itm.name === item.name &&
221
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
208
222
  if (!matchedOrderItem) {
209
223
  nonMatchedOrderItems.push(Object.assign({}, item));
210
224
  }
@@ -212,7 +226,8 @@ exports.syncAllMarketplaceOrder = {
212
226
  if (nonMatchedOrderItems.length > 0)
213
227
  await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderItem).delete(nonMatchedOrderItems);
214
228
  existingOrderItems = marketplaceOrderItems.map(item => {
215
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name);
229
+ const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name &&
230
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
216
231
  if (matchedOrderItem) {
217
232
  return Object.assign(Object.assign(Object.assign({}, matchedOrderItem), item), { updater: user });
218
233
  }
@@ -220,7 +235,8 @@ exports.syncAllMarketplaceOrder = {
220
235
  }
221
236
  else {
222
237
  existingOrderItems = marketplaceOrderItems.map(item => {
223
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name);
238
+ const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name &&
239
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
224
240
  if (matchedOrderItem) {
225
241
  return Object.assign(Object.assign(Object.assign({}, matchedOrderItem), item), { updater: user });
226
242
  }
package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sync-all-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sync-all-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js CHANGED
@@ -28,6 +28,7 @@ exports.syncMarketplaceOrder = {
28
28
  var order = marketplaceOrders[i];
29
29
  let marketplaceOrderItems = [];
30
30
  let tracking_code = '';
31
+ let deliveryProvider;
31
32
  if (marketplaceStore.platform == 'lazada') {
32
33
  if (order.trackingNo != '') {
33
34
  tracking_code = JSON.parse(order.trackingNo)
@@ -39,6 +40,12 @@ exports.syncMarketplaceOrder = {
39
40
  }, [])
40
41
  .join(',');
41
42
  }
43
+ const shippingProviderInfo = {};
44
+ order.shippingProvider.split(', ').forEach(s => {
45
+ var [key, value] = s.split(': ');
46
+ shippingProviderInfo[key] = value;
47
+ });
48
+ deliveryProvider = shippingProviderInfo.Delivery;
42
49
  }
43
50
  let marketplaceOrder = new entities_1.MarketplaceOrder();
44
51
  marketplaceOrder.name = order.name;
@@ -63,7 +70,12 @@ exports.syncMarketplaceOrder = {
63
70
  ]
64
71
  });
65
72
  if (existingMarketplaceOrder) {
66
- marketplaceOrder = Object.assign(Object.assign(Object.assign({}, existingMarketplaceOrder), marketplaceOrder), { updater: user });
73
+ let otherInfoJSON = {};
74
+ if ((existingMarketplaceOrder === null || existingMarketplaceOrder === void 0 ? void 0 : existingMarketplaceOrder.otherInfoJSON) && deliveryProvider) {
75
+ otherInfoJSON = JSON.parse(existingMarketplaceOrder.otherInfoJSON);
76
+ otherInfoJSON.shippingProvider = deliveryProvider;
77
+ }
78
+ marketplaceOrder = Object.assign(Object.assign(Object.assign({}, existingMarketplaceOrder), marketplaceOrder), { otherInfoJSON: otherInfoJSON ? JSON.stringify(otherInfoJSON) : null, updater: user });
67
79
  const cancelStatuses = ['cancelled', 'canceled'];
68
80
  if (cancelStatuses.includes(marketplaceOrder.status) && (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.releaseOrderId)) {
69
81
  if (existingMarketplaceOrder.isSplitted) {
@@ -185,7 +197,8 @@ exports.syncMarketplaceOrder = {
185
197
  if (existingMarketplaceOrder.isSplitted) {
186
198
  let existingOrderItems = [];
187
199
  existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems;
188
- marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name);
200
+ marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name &&
201
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
189
202
  marketplaceOrderItems = marketplaceOrderItems.map(marketplaceOrderitem => {
190
203
  return Object.assign(Object.assign({}, marketplaceOrderitem), { status: order.status, marketplaceProductVariation: foundVariation, trackingCode: order.trackingNo });
191
204
  });
@@ -196,7 +209,8 @@ exports.syncMarketplaceOrder = {
196
209
  if (existingOrderItems.length > marketplaceOrderItems.length) {
197
210
  let nonMatchedOrderItems = [];
198
211
  existingOrderItems.map(item => {
199
- const matchedOrderItem = marketplaceOrderItems.find(itm => itm.name === item.name);
212
+ const matchedOrderItem = marketplaceOrderItems.find(itm => itm.name === item.name &&
213
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
200
214
  if (!matchedOrderItem) {
201
215
  nonMatchedOrderItems.push(Object.assign({}, item));
202
216
  }
@@ -204,7 +218,8 @@ exports.syncMarketplaceOrder = {
204
218
  if (nonMatchedOrderItems.length > 0)
205
219
  await tx.getRepository(entities_1.MarketplaceOrderItem).delete(nonMatchedOrderItems);
206
220
  existingOrderItems = marketplaceOrderItems.map(item => {
207
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name);
221
+ const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name &&
222
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
208
223
  if (matchedOrderItem) {
209
224
  return Object.assign(Object.assign(Object.assign({}, matchedOrderItem), item), { updater: user });
210
225
  }
@@ -212,7 +227,8 @@ exports.syncMarketplaceOrder = {
212
227
  }
213
228
  else {
214
229
  existingOrderItems = marketplaceOrderItems.map(item => {
215
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name);
230
+ const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name &&
231
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
216
232
  if (matchedOrderItem) {
217
233
  return Object.assign(Object.assign(Object.assign({}, matchedOrderItem), item), { updater: user });
218
234
  }
package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sync-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sync-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js CHANGED
@@ -20,12 +20,10 @@ exports.updateOrderReadyToShip = {
20
20
  const storeId = foundMarketplaceOrder.marketplaceStore.id;
21
21
  const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
22
22
  let trackingInfoArr = [];
23
- let orderItemIds = [];
24
23
  let marketplaceOrderShippings = [];
25
24
  foundMarketplaceOrder.marketplaceOrderItems.map(item => {
26
- const marketplaceOrderShipping = item.marketplaceOrderShipping;
27
- if (marketplaceOrderShipping) {
28
- marketplaceOrderShippings.push(marketplaceOrderShipping);
25
+ if (item === null || item === void 0 ? void 0 : item.marketplaceOrderShipping) {
26
+ marketplaceOrderShippings.push(item.marketplaceOrderShipping);
29
27
  }
30
28
  });
31
29
  const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
@@ -35,23 +33,20 @@ exports.updateOrderReadyToShip = {
35
33
  uniqueMarketplaceOrderShippings.map((orderShipping) => {
36
34
  if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.trackingNo) {
37
35
  const trackingNoInfo = JSON.parse(orderShipping.trackingNo);
38
- const orderTrackingNo = trackingNoInfo.map(item => item.tracking_code)[0];
39
- const orderItemId = trackingNoInfo.map(item => item.order_item_id)[0];
40
- if (!(trackingInfoArr === null || trackingInfoArr === void 0 ? void 0 : trackingInfoArr.length)) {
41
- // first loop, create new object with format { orderItemIds: [], trackingNo: '' }
42
- orderItemIds.push(orderItemId);
43
- trackingInfoArr.push({ orderItemIds, trackingNo: orderTrackingNo });
36
+ const orderTrackingNos = trackingNoInfo.map(item => item.tracking_code);
37
+ const uniqueTrackingNos = [...new Set(orderTrackingNos)];
38
+ let orderItemIds = [];
39
+ if ((uniqueTrackingNos === null || uniqueTrackingNos === void 0 ? void 0 : uniqueTrackingNos.length) == 1) {
40
+ orderItemIds = trackingNoInfo.map(item => item.order_item_id);
41
+ trackingInfoArr.push({ orderItemIds, trackingNo: uniqueTrackingNos[0] });
44
42
  }
45
43
  else {
46
- // if new tracking no. detected, create a new object
47
- if (!trackingInfoArr.map(info => info.trackingNo).includes(orderTrackingNo)) {
48
- orderItemIds.push(orderItemId);
49
- trackingInfoArr.push({ orderItemIds, trackingNo: orderTrackingNo });
50
- }
51
- else {
52
- const foundTrackingInfo = trackingInfoArr.find(info => info.trackingNo === orderTrackingNo);
53
- foundTrackingInfo.orderItemIds.push(orderItemId);
54
- }
44
+ uniqueTrackingNos.map(trackingNo => {
45
+ orderItemIds = trackingNoInfo
46
+ .filter(info => info.tracking_code === trackingNo)
47
+ .map(filteredInfo => filteredInfo.order_item_id);
48
+ trackingInfoArr.push({ orderItemIds, trackingNo });
49
+ });
55
50
  }
56
51
  }
57
52
  });
package/dist-server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-order-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-order-ready-to-ship.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/marketplace-base",
3
- "version": "3.6.26",
3
+ "version": "3.6.34",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,9 +24,9 @@
24
24
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
25
25
  },
26
26
  "dependencies": {
27
- "@things-factory/integration-fulfillment": "^3.6.26",
28
- "@things-factory/integration-marketplace": "^3.6.26",
29
- "@things-factory/shell": "^3.6.26"
27
+ "@things-factory/integration-fulfillment": "^3.6.33",
28
+ "@things-factory/integration-marketplace": "^3.6.33",
29
+ "@things-factory/shell": "^3.6.33"
30
30
  },
31
- "gitHead": "a45f00a06bb6370fd7b046d62662273233d6bae9"
31
+ "gitHead": "026c859918f474fae1c3d5c2e5604627afe8a95b"
32
32
  }
package/server/entities/marketplace-order.ts CHANGED
@@ -50,8 +50,8 @@ export class MarketplaceOrder {
50
50
  @Column({ type: 'int', nullable: true })
51
51
  itemCount: number
52
52
 
53
- @Column({ nullable: true })
54
- totalAmount: string
53
+ @Column({ type: 'float', nullable: true })
54
+ totalAmount: number
55
55
 
56
56
  @Column({ nullable: true })
57
57
  paymentMethod: string
package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts CHANGED
@@ -1,23 +1,46 @@
1
- import { ListParam, convertListParams } from '@things-factory/shell'
2
- import { getRepository } from 'typeorm'
1
+ import { getRepository, SelectQueryBuilder } from 'typeorm'
2
+
3
+ import { buildQuery, ListParam } from '@things-factory/shell'
4
+
3
5
  import { MarketplaceOrder } from '../../../entities'
4
6
 
5
7
  export const marketplaceOrdersResolver = {
6
8
  async marketplaceOrders(_: any, params: ListParam, context: any) {
7
- const convertedParams = convertListParams(params, context.state.domain.id)
8
- const [items, total] = await getRepository(MarketplaceOrder).findAndCount({
9
- ...convertedParams,
10
- relations: [
11
- 'domain',
12
- 'marketplaceStore',
13
- 'marketplaceOrderItems',
14
- 'marketplaceOrderItems.marketplaceProductVariation',
15
- 'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct',
16
- 'marketplaceOrderItems.marketplaceOrderShipping',
17
- 'creator',
18
- 'updater'
19
- ]
20
- })
9
+ let postCodeSorter = params.sortings.filter(sort => sort.name === 'postCode')
10
+
11
+ params.sortings = params.sortings.filter(sort => sort.name !== 'postCode')
12
+
13
+ let qb: SelectQueryBuilder<MarketplaceOrder> = getRepository(MarketplaceOrder).createQueryBuilder('mo')
14
+ buildQuery(qb, params, context)
15
+ qb.leftJoinAndSelect('mo.domain', 'domain')
16
+ .leftJoinAndSelect('mo.marketplaceStore', 'ms')
17
+ .leftJoinAndSelect('mo.marketplaceOrderItems', 'mi')
18
+ .leftJoinAndSelect('mi.marketplaceProductVariation', 'mpv')
19
+ .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
20
+ .leftJoinAndSelect('mi.marketplaceOrderShipping', 'mos')
21
+ .leftJoinAndSelect('mo.creator', 'creator')
22
+ .leftJoinAndSelect('mo.updater', 'updater')
23
+
24
+ if (postCodeSorter) {
25
+ qb.addOrderBy('mos.postCode', postCodeSorter[0]?.desc ? 'DESC' : 'ASC')
26
+ }
27
+
28
+ let [items, total] = await qb.getManyAndCount()
29
+
30
+ // const convertedParams = convertListParams(params, context.state.domain.id)
31
+ // const [items, total] = await getRepository(MarketplaceOrder).findAndCount({
32
+ // ...convertedParams,
33
+ // relations: [
34
+ // 'domain',
35
+ // 'marketplaceStore',
36
+ // 'marketplaceOrderItems',
37
+ // 'marketplaceOrderItems.marketplaceProductVariation',
38
+ // 'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct',
39
+ // 'marketplaceOrderItems.marketplaceOrderShipping',
40
+ // 'creator',
41
+ // 'updater'
42
+ // ]
43
+ // })
21
44
 
22
45
  return { items, total }
23
46
  }
package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts CHANGED
@@ -54,6 +54,7 @@ export const syncAllMarketplaceOrder = {
54
54
 
55
55
  let marketplaceOrderItems = []
56
56
  let tracking_code = ''
57
+ let deliveryProvider: string
57
58
 
58
59
  if (marketplaceStore.platform == 'lazada') {
59
60
  if (order.trackingNo != '') {
@@ -66,6 +67,14 @@ export const syncAllMarketplaceOrder = {
66
67
  }, [])
67
68
  .join(',')
68
69
  }
70
+
71
+ const shippingProviderInfo: any = {}
72
+ order.shippingProvider.split(', ').forEach(s => {
73
+ var [key, value] = s.split(': ')
74
+ shippingProviderInfo[key] = value
75
+ })
76
+
77
+ deliveryProvider = shippingProviderInfo.Delivery
69
78
  }
70
79
 
71
80
  let marketplaceOrder: MarketplaceOrder = new MarketplaceOrder()
@@ -93,9 +102,17 @@ export const syncAllMarketplaceOrder = {
93
102
  })
94
103
 
95
104
  if (existingMarketplaceOrder) {
105
+ let otherInfoJSON: any = {}
106
+
107
+ if (existingMarketplaceOrder?.otherInfoJSON && deliveryProvider) {
108
+ otherInfoJSON = JSON.parse(existingMarketplaceOrder.otherInfoJSON)
109
+ otherInfoJSON.shippingProvider = deliveryProvider
110
+ }
111
+
96
112
  marketplaceOrder = {
97
113
  ...existingMarketplaceOrder,
98
114
  ...marketplaceOrder,
115
+ otherInfoJSON: otherInfoJSON ? JSON.stringify(otherInfoJSON) : null,
99
116
  updater: user
100
117
  }
101
118
 
@@ -259,7 +276,11 @@ export const syncAllMarketplaceOrder = {
259
276
  let existingOrderItems: MarketplaceOrderItem[] = []
260
277
  existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
261
278
 
262
- marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name)
279
+ marketplaceOrderItems = existingOrderItems.filter(
280
+ itm =>
281
+ itm.name == item.name &&
282
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
283
+ )
263
284
  marketplaceOrderItems = marketplaceOrderItems.map(marketplaceOrderitem => {
264
285
  return {
265
286
  ...marketplaceOrderitem,
@@ -275,7 +296,11 @@ export const syncAllMarketplaceOrder = {
275
296
  if (existingOrderItems.length > marketplaceOrderItems.length) {
276
297
  let nonMatchedOrderItems = []
277
298
  existingOrderItems.map(item => {
278
- const matchedOrderItem = marketplaceOrderItems.find(itm => itm.name === item.name)
299
+ const matchedOrderItem = marketplaceOrderItems.find(
300
+ itm =>
301
+ itm.name === item.name &&
302
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
303
+ )
279
304
  if (!matchedOrderItem) {
280
305
  nonMatchedOrderItems.push({ ...item })
281
306
  }
@@ -284,7 +309,11 @@ export const syncAllMarketplaceOrder = {
284
309
  await getRepository(MarketplaceOrderItem).delete(nonMatchedOrderItems)
285
310
 
286
311
  existingOrderItems = marketplaceOrderItems.map(item => {
287
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name)
312
+ const matchedOrderItem = existingOrderItems.find(
313
+ itm =>
314
+ itm.name == item.name &&
315
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
316
+ )
288
317
  if (matchedOrderItem) {
289
318
  return {
290
319
  ...matchedOrderItem,
@@ -295,7 +324,11 @@ export const syncAllMarketplaceOrder = {
295
324
  })
296
325
  } else {
297
326
  existingOrderItems = marketplaceOrderItems.map(item => {
298
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name)
327
+ const matchedOrderItem = existingOrderItems.find(
328
+ itm =>
329
+ itm.name == item.name &&
330
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
331
+ )
299
332
  if (matchedOrderItem) {
300
333
  return {
301
334
  ...matchedOrderItem,
package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts CHANGED
@@ -40,6 +40,7 @@ export const syncMarketplaceOrder = {
40
40
 
41
41
  let marketplaceOrderItems = []
42
42
  let tracking_code = ''
43
+ let deliveryProvider: string
43
44
 
44
45
  if (marketplaceStore.platform == 'lazada') {
45
46
  if (order.trackingNo != '') {
@@ -52,6 +53,14 @@ export const syncMarketplaceOrder = {
52
53
  }, [])
53
54
  .join(',')
54
55
  }
56
+
57
+ const shippingProviderInfo: any = {}
58
+ order.shippingProvider.split(', ').forEach(s => {
59
+ var [key, value] = s.split(': ')
60
+ shippingProviderInfo[key] = value
61
+ })
62
+
63
+ deliveryProvider = shippingProviderInfo.Delivery
55
64
  }
56
65
 
57
66
  let marketplaceOrder: MarketplaceOrder = new MarketplaceOrder()
@@ -79,9 +88,17 @@ export const syncMarketplaceOrder = {
79
88
  })
80
89
 
81
90
  if (existingMarketplaceOrder) {
91
+ let otherInfoJSON: any = {}
92
+
93
+ if (existingMarketplaceOrder?.otherInfoJSON && deliveryProvider) {
94
+ otherInfoJSON = JSON.parse(existingMarketplaceOrder.otherInfoJSON)
95
+ otherInfoJSON.shippingProvider = deliveryProvider
96
+ }
97
+
82
98
  marketplaceOrder = {
83
99
  ...existingMarketplaceOrder,
84
100
  ...marketplaceOrder,
101
+ otherInfoJSON: otherInfoJSON ? JSON.stringify(otherInfoJSON) : null,
85
102
  updater: user
86
103
  }
87
104
 
@@ -241,7 +258,11 @@ export const syncMarketplaceOrder = {
241
258
  let existingOrderItems: MarketplaceOrderItem[] = []
242
259
  existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems
243
260
 
244
- marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name)
261
+ marketplaceOrderItems = existingOrderItems.filter(
262
+ itm =>
263
+ itm.name == item.name &&
264
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
265
+ )
245
266
  marketplaceOrderItems = marketplaceOrderItems.map(marketplaceOrderitem => {
246
267
  return {
247
268
  ...marketplaceOrderitem,
@@ -257,7 +278,11 @@ export const syncMarketplaceOrder = {
257
278
  if (existingOrderItems.length > marketplaceOrderItems.length) {
258
279
  let nonMatchedOrderItems = []
259
280
  existingOrderItems.map(item => {
260
- const matchedOrderItem = marketplaceOrderItems.find(itm => itm.name === item.name)
281
+ const matchedOrderItem = marketplaceOrderItems.find(
282
+ itm =>
283
+ itm.name === item.name &&
284
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
285
+ )
261
286
  if (!matchedOrderItem) {
262
287
  nonMatchedOrderItems.push({ ...item })
263
288
  }
@@ -266,7 +291,11 @@ export const syncMarketplaceOrder = {
266
291
  await tx.getRepository(MarketplaceOrderItem).delete(nonMatchedOrderItems)
267
292
 
268
293
  existingOrderItems = marketplaceOrderItems.map(item => {
269
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name)
294
+ const matchedOrderItem = existingOrderItems.find(
295
+ itm =>
296
+ itm.name == item.name &&
297
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
298
+ )
270
299
  if (matchedOrderItem) {
271
300
  return {
272
301
  ...matchedOrderItem,
@@ -277,7 +306,11 @@ export const syncMarketplaceOrder = {
277
306
  })
278
307
  } else {
279
308
  existingOrderItems = marketplaceOrderItems.map(item => {
280
- const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name)
309
+ const matchedOrderItem = existingOrderItems.find(
310
+ itm =>
311
+ itm.name == item.name &&
312
+ itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId
313
+ )
281
314
  if (matchedOrderItem) {
282
315
  return {
283
316
  ...matchedOrderItem,
package/server/graphql/resolvers/marketplace-order/update-order-ready-to-ship.ts CHANGED
@@ -1,5 +1,7 @@
1
- import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
2
1
  import { EntityManager } from 'typeorm'
2
+
3
+ import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
4
+
3
5
  import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '../../../entities'
4
6
 
5
7
  export const updateOrderReadyToShip = {
@@ -20,14 +22,11 @@ export const updateOrderReadyToShip = {
20
22
  const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
21
23
 
22
24
  let trackingInfoArr: any[] = []
23
- let orderItemIds: string[] = []
24
25
  let marketplaceOrderShippings: MarketplaceOrderShipping[] = []
25
26
 
26
27
  foundMarketplaceOrder.marketplaceOrderItems.map(item => {
27
- const marketplaceOrderShipping = item.marketplaceOrderShipping
28
-
29
- if (marketplaceOrderShipping) {
30
- marketplaceOrderShippings.push(marketplaceOrderShipping)
28
+ if (item?.marketplaceOrderShipping) {
29
+ marketplaceOrderShippings.push(item.marketplaceOrderShipping)
31
30
  }
32
31
  })
33
32
 
@@ -38,23 +37,23 @@ export const updateOrderReadyToShip = {
38
37
  if (uniqueMarketplaceOrderShippings.some(marketplaceOrderShipping => marketplaceOrderShipping.trackingNo != null)) {
39
38
  uniqueMarketplaceOrderShippings.map((orderShipping: MarketplaceOrderShipping) => {
40
39
  if (orderShipping?.trackingNo) {
41
- const trackingNoInfo: any = JSON.parse(orderShipping.trackingNo)
42
- const orderTrackingNo: string = trackingNoInfo.map(item => item.tracking_code)[0]
43
- const orderItemId: string = trackingNoInfo.map(item => item.order_item_id)[0]
44
-
45
- if (!trackingInfoArr?.length) {
46
- // first loop, create new object with format { orderItemIds: [], trackingNo: '' }
47
- orderItemIds.push(orderItemId)
48
- trackingInfoArr.push({ orderItemIds, trackingNo: orderTrackingNo })
40
+ const trackingNoInfo: any[] = JSON.parse(orderShipping.trackingNo)
41
+ const orderTrackingNos: string[] = trackingNoInfo.map(item => item.tracking_code)
42
+ const uniqueTrackingNos = [...new Set(orderTrackingNos)]
43
+
44
+ let orderItemIds: string[] = []
45
+
46
+ if (uniqueTrackingNos?.length == 1) {
47
+ orderItemIds = trackingNoInfo.map(item => item.order_item_id)
48
+ trackingInfoArr.push({ orderItemIds, trackingNo: uniqueTrackingNos[0] })
49
49
  } else {
50
- // if new tracking no. detected, create a new object
51
- if (!trackingInfoArr.map(info => info.trackingNo).includes(orderTrackingNo)) {
52
- orderItemIds.push(orderItemId)
53
- trackingInfoArr.push({ orderItemIds, trackingNo: orderTrackingNo })
54
- } else {
55
- const foundTrackingInfo = trackingInfoArr.find(info => info.trackingNo === orderTrackingNo)
56
- foundTrackingInfo.orderItemIds.push(orderItemId)
57
- }
50
+ uniqueTrackingNos.map(trackingNo => {
51
+ orderItemIds = trackingNoInfo
52
+ .filter(info => info.tracking_code === trackingNo)
53
+ .map(filteredInfo => filteredInfo.order_item_id)
54
+
55
+ trackingInfoArr.push({ orderItemIds, trackingNo })
56
+ })
58
57
  }
59
58
  }
60
59
  })