@things-factory/operato-mms 4.1.1 → 4.1.6

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 (22) hide show
  1. package/client/pages/order/logistics/batch-init-popup.js +14 -2
  2. package/client/pages/order/logistics/lazada-order-init-batch-popup.js +32 -27
  3. package/client/pages/order/logistics/order-init-popup.js +13 -10
  4. package/client/pages/order/logistics/order-shipping-items.js +23 -26
  5. package/client/pages/order/logistics/request-ro-popup.js +18 -16
  6. package/client/pages/order/logistics/shopee-order-init-batch-popup.js +32 -27
  7. package/client/pages/order/order-by-store.js +34 -29
  8. package/client/pages/order/select-datetime-popup.js +2 -2
  9. package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +25 -24
  10. package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
  11. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +24 -23
  12. package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
  13. package/dist-server/routers/etrax-router.js +20 -2
  14. package/dist-server/routers/etrax-router.js.map +1 -1
  15. package/package.json +44 -44
  16. package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +41 -33
  17. package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +40 -32
  18. package/server/routers/etrax-router.ts +21 -2
  19. package/translations/en.json +1 -0
  20. package/translations/ko.json +1 -0
  21. package/translations/ms.json +1 -0
  22. package/translations/zh.json +1 -0
package/client/pages/order/logistics/batch-init-popup.js CHANGED
@@ -223,6 +223,15 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
223
223
  sortable: false,
224
224
  width: 130
225
225
  },
226
+ {
227
+ type: 'string',
228
+ name: 'trackingUrl',
229
+ header: i18next.t('field.tracking_url'),
230
+ record: { editable: true },
231
+ label: true,
232
+ sortable: false,
233
+ width: 130
234
+ },
226
235
  {
227
236
  type: 'string',
228
237
  name: 'shippingProvider',
@@ -360,6 +369,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
360
369
  weightUnit
361
370
  totalVolume
362
371
  volumeUnit
372
+ trackingUrl
363
373
  marketplaceStore {
364
374
  id
365
375
  name
@@ -406,7 +416,7 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
406
416
  return {
407
417
  ...itm,
408
418
  status: itm.marketplaceOrder.status,
409
- idSplitted: itm.marketplaceOrder.isSplitted,
419
+ isSplitted: itm.marketplaceOrder.isSplitted,
410
420
  shippingProvider: itm.transporter,
411
421
  ownShippingProvider: itm.ownTransporter,
412
422
  orderCreatedAt: itm.marketplaceOrder.orderCreatedAt,
@@ -504,7 +514,9 @@ class BatchInitPopup extends localize(i18next)(LitElement) {
504
514
  id: patch.id,
505
515
  orderNo: patch.marketplaceOrder.orderNo,
506
516
  trackingNo: patch?.trackingNo,
507
- shippingProvider: patch?.shippingProvider
517
+ shippingProvider: patch?.shippingProvider,
518
+ ownTrackingNo: patch?.ownTrackingNo,
519
+ trackingUrl: patch?.trackingUrl
508
520
  }
509
521
  })
510
522
 
package/client/pages/order/logistics/lazada-order-init-batch-popup.js CHANGED
@@ -314,29 +314,31 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
314
314
  description
315
315
  }
316
316
  marketplaceOrderItems {
317
- marketplaceOrderShipping {
318
- id
319
- name
320
- address1
321
- address2
322
- address3
323
- address4
324
- address5
325
- city
326
- postCode
327
- country
328
- state
329
- phone1
330
- phone2
331
- attentionTo
332
- trackingNo
333
- ownTrackingNo
334
- transporter
335
- ownTransporter
336
- totalWeight
337
- weightUnit
338
- totalVolume
339
- volumeUnit
317
+ marketplaceOrderShippingItems {
318
+ marketplaceOrderShipping {
319
+ id
320
+ name
321
+ address1
322
+ address2
323
+ address3
324
+ address4
325
+ address5
326
+ city
327
+ postCode
328
+ country
329
+ state
330
+ phone1
331
+ phone2
332
+ attentionTo
333
+ trackingNo
334
+ ownTrackingNo
335
+ transporter
336
+ ownTransporter
337
+ totalWeight
338
+ weightUnit
339
+ totalVolume
340
+ volumeUnit
341
+ }
340
342
  }
341
343
  marketplaceProductVariation {
342
344
  name
@@ -423,11 +425,14 @@ class LazadaOrderInitBatchPopup extends localize(i18next)(LitElement) {
423
425
  let marketplaceOrderShippings = []
424
426
 
425
427
  marketplaceOrderItems.map(item => {
426
- const marketplaceOrderShipping = item.marketplaceOrderShipping
428
+ const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
429
+ marketplaceOrderShippingItems.map(itm => {
430
+ const marketplaceOrderShipping = itm.marketplaceOrderShipping
427
431
 
428
- if (marketplaceOrderShipping) {
429
- marketplaceOrderShippings.push(marketplaceOrderShipping)
430
- }
432
+ if (marketplaceOrderShipping) {
433
+ marketplaceOrderShippings.push(marketplaceOrderShipping)
434
+ }
435
+ })
431
436
  })
432
437
 
433
438
  const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
package/client/pages/order/logistics/order-init-popup.js CHANGED
@@ -1,13 +1,13 @@
1
1
  import '@things-factory/component-ui'
2
- import { MultiColumnFormStyles } from '@things-factory/form-ui'
3
2
  import '@things-factory/grist-ui'
4
- import { i18next, localize } from '@things-factory/i18n-base'
5
- import { isMobileDevice } from '@things-factory/utils'
6
- import { css, html, LitElement } from 'lit-element'
7
- import { PLATFORM } from '../../constants'
8
-
9
3
  import './order-items'
10
4
  import './order-shipping'
5
+
6
+ import { css, html, LitElement } from 'lit-element'
7
+
8
+ import { MultiColumnFormStyles } from '@things-factory/form-ui'
9
+ import { i18next, localize } from '@things-factory/i18n-base'
10
+
11
11
  class OrderInitPopup extends localize(i18next)(LitElement) {
12
12
  static get properties() {
13
13
  return {
@@ -88,11 +88,14 @@ class OrderInitPopup extends localize(i18next)(LitElement) {
88
88
  const marketplaceOrderItems = this.orderInformation.marketplaceOrderItems
89
89
 
90
90
  marketplaceOrderItems.map(item => {
91
- const marketplaceOrderShipping = item.marketplaceOrderShipping
91
+ const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
92
+ marketplaceOrderShippingItems.map(itm => {
93
+ const marketplaceOrderShipping = itm.marketplaceOrderShipping
92
94
 
93
- if (marketplaceOrderShipping) {
94
- marketplaceOrderShippings.push(marketplaceOrderShipping)
95
- }
95
+ if (marketplaceOrderShipping) {
96
+ marketplaceOrderShippings.push(marketplaceOrderShipping)
97
+ }
98
+ })
96
99
  })
97
100
 
98
101
  return Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
package/client/pages/order/logistics/order-shipping-items.js CHANGED
@@ -240,18 +240,6 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
240
240
  header: i18next.t('field.product_name'),
241
241
  width: 400
242
242
  },
243
- {
244
- type: 'string',
245
- name: 'variationSku',
246
- header: i18next.t('field.variation_sku'),
247
- width: 200
248
- },
249
- {
250
- type: 'string',
251
- name: 'sku',
252
- header: i18next.t('field.variation_name'),
253
- width: 200
254
- },
255
243
  {
256
244
  type: 'float',
257
245
  name: 'qty',
@@ -279,17 +267,23 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
279
267
  ownTrackingNo
280
268
  transporter
281
269
  ownTransporter
282
- marketplaceOrderItems {
283
- marketplaceProductVariation {
284
- marketplaceProduct {
285
- isku
286
- name
287
- }
270
+ marketplaceOrderShippingItems {
271
+ product {
272
+ sku
288
273
  name
289
- variationSku
290
274
  }
291
275
  qty
292
- paidPrice
276
+ marketplaceOrderItem {
277
+ marketplaceProductVariation {
278
+ marketplaceProduct {
279
+ isku
280
+ name
281
+ }
282
+ name
283
+ variationSku
284
+ }
285
+ paidPrice
286
+ }
293
287
  }
294
288
  }
295
289
  }
@@ -300,15 +294,18 @@ class OrderShippingItems extends localize(i18next)(LitElement) {
300
294
  if (!response.errors) {
301
295
  this.fillUpForm(this.shippingForm, this.massageOrderShippingInformation())
302
296
 
297
+ const marketplaceOrderShippingItems = response.data.marketplaceOrderShipping.marketplaceOrderShippingItems
303
298
  return {
304
299
  records:
305
- response.data.marketplaceOrderShipping.marketplaceOrderItems.map(item => {
300
+ marketplaceOrderShippingItems.map(mosi => {
301
+ const product = mosi.product
302
+ const marketplaceOrderItem = mosi.marketplaceOrderItem
306
303
  return {
307
- ...item,
308
- ...item.marketplaceProductVariation,
309
- sku: item.marketplaceProductVariation.name,
310
- productSku: item.marketplaceProductVariation.marketplaceProduct.isku,
311
- productName: item.marketplaceProductVariation.marketplaceProduct.name
304
+ ...marketplaceOrderItem,
305
+ ...marketplaceOrderItem.marketplaceProductVariation,
306
+ qty: mosi.qty,
307
+ productSku: product.sku,
308
+ productName: product.name
312
309
  }
313
310
  }) || []
314
311
  }
package/client/pages/order/logistics/request-ro-popup.js CHANGED
@@ -381,22 +381,24 @@ class RequestROPopup extends LitElement {
381
381
  description
382
382
  }
383
383
  marketplaceOrderItems {
384
- marketplaceOrderShipping {
385
- id
386
- name
387
- address1
388
- address2
389
- address3
390
- address4
391
- address5
392
- city
393
- postCode
394
- country
395
- state
396
- phone1
397
- phone2
398
- attentionTo
399
- trackingNo
384
+ marketplaceOrderShippingItems {
385
+ marketplaceOrderShipping {
386
+ id
387
+ name
388
+ address1
389
+ address2
390
+ address3
391
+ address4
392
+ address5
393
+ city
394
+ postCode
395
+ country
396
+ state
397
+ phone1
398
+ phone2
399
+ attentionTo
400
+ trackingNo
401
+ }
400
402
  }
401
403
  marketplaceProductVariation {
402
404
  marketplaceProduct {
package/client/pages/order/logistics/shopee-order-init-batch-popup.js CHANGED
@@ -378,29 +378,31 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
378
378
  description
379
379
  }
380
380
  marketplaceOrderItems {
381
- marketplaceOrderShipping {
382
- id
383
- name
384
- address1
385
- address2
386
- address3
387
- address4
388
- address5
389
- city
390
- postCode
391
- country
392
- state
393
- phone1
394
- phone2
395
- attentionTo
396
- trackingNo
397
- ownTrackingNo
398
- transporter
399
- ownTransporter
400
- totalWeight
401
- weightUnit
402
- totalVolume
403
- volumeUnit
381
+ marketplaceOrderShippingItems {
382
+ marketplaceOrderShipping {
383
+ id
384
+ name
385
+ address1
386
+ address2
387
+ address3
388
+ address4
389
+ address5
390
+ city
391
+ postCode
392
+ country
393
+ state
394
+ phone1
395
+ phone2
396
+ attentionTo
397
+ trackingNo
398
+ ownTrackingNo
399
+ transporter
400
+ ownTransporter
401
+ totalWeight
402
+ weightUnit
403
+ totalVolume
404
+ volumeUnit
405
+ }
404
406
  }
405
407
  marketplaceProductVariation {
406
408
  name
@@ -573,11 +575,14 @@ class ShopeeOrderInitBatchPopup extends localize(i18next)(LitElement) {
573
575
  let marketplaceOrderShippings = []
574
576
 
575
577
  marketplaceOrderItems.map(item => {
576
- const marketplaceOrderShipping = item.marketplaceOrderShipping
578
+ const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
579
+ marketplaceOrderShippingItems.map(itm => {
580
+ const marketplaceOrderShipping = itm.marketplaceOrderShipping
577
581
 
578
- if (marketplaceOrderShipping) {
579
- marketplaceOrderShippings.push(marketplaceOrderShipping)
580
- }
582
+ if (marketplaceOrderShipping) {
583
+ marketplaceOrderShippings.push(marketplaceOrderShipping)
584
+ }
585
+ })
581
586
  })
582
587
 
583
588
  const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
package/client/pages/order/order-by-store.js CHANGED
@@ -441,31 +441,33 @@ class OrderByStore extends localize(i18next)(PageView) {
441
441
  description
442
442
  }
443
443
  marketplaceOrderItems {
444
- marketplaceOrderShipping {
445
- id
446
- name
447
- address1
448
- address2
449
- address3
450
- address4
451
- address5
452
- city
453
- postCode
454
- country
455
- state
456
- phone1
457
- phone2
458
- attentionTo
459
- trackingNo
460
- ownTrackingNo
461
- totalWeight
462
- weightUnit
463
- totalVolume
464
- volumeUnit
465
- transporter
466
- ownTransporter
467
- orderNoRef
468
- subOrderNoRef
444
+ marketplaceOrderShippingItems {
445
+ marketplaceOrderShipping {
446
+ id
447
+ name
448
+ address1
449
+ address2
450
+ address3
451
+ address4
452
+ address5
453
+ city
454
+ postCode
455
+ country
456
+ state
457
+ phone1
458
+ phone2
459
+ attentionTo
460
+ trackingNo
461
+ ownTrackingNo
462
+ totalWeight
463
+ weightUnit
464
+ totalVolume
465
+ volumeUnit
466
+ transporter
467
+ ownTransporter
468
+ orderNoRef
469
+ subOrderNoRef
470
+ }
469
471
  }
470
472
  marketplaceProductVariation {
471
473
  marketplaceProduct {
@@ -523,11 +525,14 @@ class OrderByStore extends localize(i18next)(PageView) {
523
525
  let marketplaceOrderShippings = []
524
526
 
525
527
  marketplaceOrderItems.map(item => {
526
- const marketplaceOrderShipping = item.marketplaceOrderShipping
528
+ const marketplaceOrderShippingItems = item.marketplaceOrderShippingItems
529
+ marketplaceOrderShippingItems.map(itm => {
530
+ const marketplaceOrderShipping = itm.marketplaceOrderShipping
527
531
 
528
- if (marketplaceOrderShipping) {
529
- marketplaceOrderShippings.push(marketplaceOrderShipping)
530
- }
532
+ if (marketplaceOrderShipping) {
533
+ marketplaceOrderShippings.push(marketplaceOrderShipping)
534
+ }
535
+ })
531
536
  })
532
537
 
533
538
  const uniqueMarketplaceOrderShippings = Array.from(new Set(marketplaceOrderShippings.map(a => a.id))).map(id => {
package/client/pages/order/select-datetime-popup.js CHANGED
@@ -72,8 +72,8 @@ export class SelectDateTimePopup extends localize(i18next)(LitElement) {
72
72
  `,
73
73
  variables: {
74
74
  storeId: this.storeId,
75
- fromDate: this._getInputByName('fromDate').value,
76
- toDate: this._getInputByName('toDate').value
75
+ fromDate: new Date(this._getInputByName('fromDate').value).toISOString(),
76
+ toDate: new Date(this._getInputByName('toDate').value).toISOString()
77
77
  }
78
78
  })
79
79
 
package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js CHANGED
@@ -21,22 +21,29 @@ exports.addReleaseOrderResolver = {
21
21
  relations: [
22
22
  'marketplaceOrderItems',
23
23
  'marketplaceOrderItems.marketplaceProductVariation',
24
- 'marketplaceOrderItems.marketplaceOrderShipping',
24
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
25
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
25
26
  'marketplaceStore'
26
27
  ]
27
28
  });
28
29
  let marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
29
30
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
30
31
  order: { subOrderNoRef: 'ASC' },
31
- relations: ['marketplaceOrderItems']
32
+ relations: [
33
+ 'marketplaceOrderShippingItems',
34
+ 'marketplaceOrderShippingItems.marketplaceOrderItem',
35
+ 'marketplaceOrderShippingItems.product'
36
+ ]
32
37
  });
33
- for (var j = 0; j < marketplaceOrderShippings.length; j++) {
38
+ for (let j = 0; j < marketplaceOrderShippings.length; j++) {
34
39
  let marketplaceOrderShipping = marketplaceOrderShippings[j];
40
+ let marketplaceOrderShippingItems = marketplaceOrderShipping.marketplaceOrderShippingItems;
35
41
  if (!(marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.releaseOrderId)) {
36
42
  const date = new Date();
37
- const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
43
+ const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
44
+ .getDate()
38
45
  .toString()
39
- .padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
46
+ .padStart(2, '0')}`;
40
47
  const newReleaseOrder = {
41
48
  releaseDate,
42
49
  type: 'b2c',
@@ -68,19 +75,12 @@ exports.addReleaseOrderResolver = {
68
75
  marketplaceOrderStatus: marketplaceOrder.status,
69
76
  airwayBill: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.airwayBill) ? marketplaceOrderShipping.airwayBill : null,
70
77
  invoice: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.invoice) ? marketplaceOrderShipping.invoice : null,
71
- orderInventories: marketplaceOrder.marketplaceOrderItems
72
- .filter(item => {
73
- if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
74
- return item;
75
- }
76
- })
77
- .map((orderItem) => {
78
- const { marketplaceProductVariation: productVariation } = orderItem;
78
+ orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
79
79
  return {
80
80
  product: {
81
- sku: productVariation.sku
81
+ sku: marketplaceOrderShippingItem.product.sku
82
82
  },
83
- releaseQty: orderItem.qty
83
+ releaseQty: marketplaceOrderShippingItem.qty
84
84
  };
85
85
  })
86
86
  };
@@ -89,6 +89,14 @@ exports.addReleaseOrderResolver = {
89
89
  customerBizplaceId,
90
90
  releaseOrder: newReleaseOrder
91
91
  });
92
+ marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
93
+ marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
94
+ await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
95
+ if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
96
+ marketplaceOrder.releaseOrderId = releaseOrder.id;
97
+ marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
98
+ await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
99
+ }
92
100
  }
93
101
  catch (e) { }
94
102
  var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
@@ -100,7 +108,8 @@ exports.addReleaseOrderResolver = {
100
108
  where: { domain, sku: oi.product.sku }
101
109
  });
102
110
  }
103
- let moi = marketplaceOrder.marketplaceOrderItems.find(moi => moi.marketplaceProductVariation.sku === product.sku);
111
+ let mosis = marketplaceOrderShippingItems.filter(mosi => mosi.product.sku === product.sku);
112
+ let moi = mosis[0].marketplaceOrderItem;
104
113
  return {
105
114
  sku: product.sku,
106
115
  name: product.name,
@@ -111,9 +120,6 @@ exports.addReleaseOrderResolver = {
111
120
  paidPrice: ((moi === null || moi === void 0 ? void 0 : moi.paidPrice) || 0) / moi.qty
112
121
  };
113
122
  }));
114
- marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
115
- marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
116
- await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
117
123
  let newInvoice = {
118
124
  invoiceProducts,
119
125
  releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
@@ -163,11 +169,6 @@ exports.addReleaseOrderResolver = {
163
169
  catch (e) { }
164
170
  }
165
171
  }
166
- if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
167
- marketplaceOrder.releaseOrderId = releaseOrder.id;
168
- marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
169
- await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
170
- }
171
172
  }
172
173
  }
173
174
  };
package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js CHANGED
@@ -32,15 +32,22 @@ exports.autoAddReleaseOrderResolver = {
32
32
  const marketplaceOrder = marketplaceOrders[i];
33
33
  const marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
34
34
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
35
- order: { subOrderNoRef: 'ASC' }
35
+ order: { subOrderNoRef: 'ASC' },
36
+ relations: [
37
+ 'marketplaceOrderShippingItems',
38
+ 'marketplaceOrderShippingItems.marketplaceOrderItem',
39
+ 'marketplaceOrderShippingItems.product'
40
+ ]
36
41
  });
37
- for (var j = 0; j < marketplaceOrderShippings.length; j++) {
42
+ for (let j = 0; j < marketplaceOrderShippings.length; j++) {
38
43
  let marketplaceOrderShipping = marketplaceOrderShippings[j];
44
+ let marketplaceOrderShippingItems = marketplaceOrderShipping.marketplaceOrderShippingItems;
39
45
  if (!(marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.releaseOrderId)) {
40
46
  const date = new Date();
41
- const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
47
+ const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
48
+ .getDate()
42
49
  .toString()
43
- .padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
50
+ .padStart(2, '0')}`;
44
51
  const newReleaseOrder = {
45
52
  releaseDate,
46
53
  type: 'b2c',
@@ -72,19 +79,12 @@ exports.autoAddReleaseOrderResolver = {
72
79
  marketplaceOrderStatus: marketplaceOrder.status,
73
80
  airwayBill: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.airwayBill) ? marketplaceOrderShipping.airwayBill : null,
74
81
  invoice: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.invoice) ? marketplaceOrderShipping.invoice : null,
75
- orderInventories: marketplaceOrder.marketplaceOrderItems
76
- .filter(item => {
77
- if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
78
- return item;
79
- }
80
- })
81
- .map((orderItem) => {
82
- const { marketplaceProductVariation: productVariation } = orderItem;
82
+ orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
83
83
  return {
84
84
  product: {
85
- sku: productVariation.sku
85
+ sku: marketplaceOrderShippingItem.product.sku
86
86
  },
87
- releaseQty: orderItem.qty
87
+ releaseQty: marketplaceOrderShippingItem.qty
88
88
  };
89
89
  })
90
90
  };
@@ -93,6 +93,14 @@ exports.autoAddReleaseOrderResolver = {
93
93
  customerBizplaceId,
94
94
  releaseOrder: newReleaseOrder
95
95
  });
96
+ marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
97
+ marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
98
+ await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
99
+ if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
100
+ marketplaceOrder.releaseOrderId = releaseOrder.id;
101
+ marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
102
+ await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
103
+ }
96
104
  }
97
105
  catch (e) { }
98
106
  var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
@@ -104,7 +112,8 @@ exports.autoAddReleaseOrderResolver = {
104
112
  where: { domain, sku: oi.product.sku }
105
113
  });
106
114
  }
107
- let moi = marketplaceOrder.marketplaceOrderItems.find(moi => moi.marketplaceProductVariation.sku === product.sku);
115
+ let mosis = marketplaceOrderShippingItems.filter(mosi => mosi.product.sku === product.sku);
116
+ let moi = mosis[0].marketplaceOrderItem;
108
117
  return {
109
118
  sku: product.sku,
110
119
  name: product.name,
@@ -115,9 +124,6 @@ exports.autoAddReleaseOrderResolver = {
115
124
  paidPrice: ((moi === null || moi === void 0 ? void 0 : moi.paidPrice) || 0) / moi.qty
116
125
  };
117
126
  }));
118
- marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
119
- marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
120
- await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
121
127
  let newInvoice = {
122
128
  invoiceProducts,
123
129
  releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
@@ -167,11 +173,6 @@ exports.autoAddReleaseOrderResolver = {
167
173
  catch (e) { }
168
174
  }
169
175
  }
170
- if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
171
- marketplaceOrder.releaseOrderId = releaseOrder.id;
172
- marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
173
- await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
174
- }
175
176
  }
176
177
  }
177
178
  };
package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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"}
package/dist-server/routers/etrax-router.js CHANGED
@@ -100,9 +100,27 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
100
100
  const storeId = order.marketplaceStore.id;
101
101
  const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
102
102
  // to-do update tracking no to every marketplaces
103
- if (marketplaceStore.platform === 'woocommerce') {
103
+ if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
104
104
  const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
105
- await integration_marketplace_1.StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note });
105
+ let orderInfo = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne({
106
+ where: {
107
+ name: order.name
108
+ },
109
+ relations: ['marketplaceOrderItems', 'marketplaceOrderItems.marketplaceProductVariation']
110
+ });
111
+ const result = await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
112
+ orderId: order.name,
113
+ trackingUrl: note,
114
+ trackingNo,
115
+ order: orderInfo,
116
+ note
117
+ });
118
+ if (marketplaceStore.platform === 'woocommerce') {
119
+ await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
120
+ orderId: order.name,
121
+ status: 'READY_TO_SHIP'
122
+ });
123
+ }
106
124
  }
107
125
  const resp = {
108
126
  Status: 'SUCCESS',
package/dist-server/routers/etrax-router.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-mms",
3
- "version": "4.1.1",
3
+ "version": "4.1.6",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -59,51 +59,51 @@
59
59
  "@operato/scene-table": "^0.1.4",
60
60
  "@operato/scene-timer": "^0.1.4",
61
61
  "@operato/scene-wheel-sorter": "^0.1.4",
62
- "@things-factory/apptool-ui": "^4.1.1",
63
- "@things-factory/attachment-base": "^4.1.1",
64
- "@things-factory/auth-ui": "^4.1.1",
65
- "@things-factory/biz-base": "^4.1.1",
66
- "@things-factory/board-service": "^4.1.1",
67
- "@things-factory/board-ui": "^4.1.1",
68
- "@things-factory/code-ui": "^4.1.1",
69
- "@things-factory/context-ui": "^4.1.1",
70
- "@things-factory/dashboard": "^4.1.1",
71
- "@things-factory/export-ui": "^4.1.1",
72
- "@things-factory/export-ui-csv": "^4.1.1",
73
- "@things-factory/export-ui-excel": "^4.1.1",
74
- "@things-factory/geography": "^4.1.1",
75
- "@things-factory/grist-ui": "^4.1.1",
76
- "@things-factory/help": "^4.1.1",
77
- "@things-factory/i18n-base": "^4.1.1",
78
- "@things-factory/integration-fulfillment": "^4.1.1",
79
- "@things-factory/integration-lmd": "^4.1.1",
80
- "@things-factory/lite-menu": "^4.1.1",
81
- "@things-factory/marketplace-base": "^4.1.1",
82
- "@things-factory/more-ui": "^4.1.1",
83
- "@things-factory/notification": "^4.1.1",
84
- "@things-factory/oauth2-client": "^4.1.1",
85
- "@things-factory/pdf": "^4.1.1",
86
- "@things-factory/product-base": "^4.1.1",
87
- "@things-factory/resource-ui": "^4.1.1",
88
- "@things-factory/scene-data-transform": "^4.1.1",
89
- "@things-factory/scene-excel": "^4.1.1",
90
- "@things-factory/scene-firebase": "^4.1.1",
91
- "@things-factory/scene-form": "^4.1.1",
92
- "@things-factory/scene-google-map": "^4.1.1",
93
- "@things-factory/scene-graphql": "^4.1.1",
94
- "@things-factory/scene-label": "^4.1.1",
95
- "@things-factory/scene-marker": "^4.1.1",
96
- "@things-factory/scene-mqtt": "^4.1.1",
97
- "@things-factory/scene-news-ticker": "^4.1.1",
98
- "@things-factory/scene-restful": "^4.1.1",
99
- "@things-factory/scene-visualizer": "^4.1.1",
100
- "@things-factory/setting-ui": "^4.1.1",
101
- "@things-factory/system-ui": "^4.1.1",
102
- "@things-factory/warehouse-base": "^4.1.1"
62
+ "@things-factory/apptool-ui": "^4.1.6",
63
+ "@things-factory/attachment-base": "^4.1.6",
64
+ "@things-factory/auth-ui": "^4.1.6",
65
+ "@things-factory/biz-base": "^4.1.6",
66
+ "@things-factory/board-service": "^4.1.6",
67
+ "@things-factory/board-ui": "^4.1.6",
68
+ "@things-factory/code-ui": "^4.1.6",
69
+ "@things-factory/context-ui": "^4.1.6",
70
+ "@things-factory/dashboard": "^4.1.6",
71
+ "@things-factory/export-ui": "^4.1.6",
72
+ "@things-factory/export-ui-csv": "^4.1.6",
73
+ "@things-factory/export-ui-excel": "^4.1.6",
74
+ "@things-factory/geography": "^4.1.6",
75
+ "@things-factory/grist-ui": "^4.1.6",
76
+ "@things-factory/help": "^4.1.6",
77
+ "@things-factory/i18n-base": "^4.1.6",
78
+ "@things-factory/integration-fulfillment": "^4.1.6",
79
+ "@things-factory/integration-lmd": "^4.1.6",
80
+ "@things-factory/lite-menu": "^4.1.6",
81
+ "@things-factory/marketplace-base": "^4.1.6",
82
+ "@things-factory/more-ui": "^4.1.6",
83
+ "@things-factory/notification": "^4.1.6",
84
+ "@things-factory/oauth2-client": "^4.1.6",
85
+ "@things-factory/pdf": "^4.1.6",
86
+ "@things-factory/product-base": "^4.1.6",
87
+ "@things-factory/resource-ui": "^4.1.6",
88
+ "@things-factory/scene-data-transform": "^4.1.6",
89
+ "@things-factory/scene-excel": "^4.1.6",
90
+ "@things-factory/scene-firebase": "^4.1.6",
91
+ "@things-factory/scene-form": "^4.1.6",
92
+ "@things-factory/scene-google-map": "^4.1.6",
93
+ "@things-factory/scene-graphql": "^4.1.6",
94
+ "@things-factory/scene-label": "^4.1.6",
95
+ "@things-factory/scene-marker": "^4.1.6",
96
+ "@things-factory/scene-mqtt": "^4.1.6",
97
+ "@things-factory/scene-news-ticker": "^4.1.6",
98
+ "@things-factory/scene-restful": "^4.1.6",
99
+ "@things-factory/scene-visualizer": "^4.1.6",
100
+ "@things-factory/setting-ui": "^4.1.6",
101
+ "@things-factory/system-ui": "^4.1.6",
102
+ "@things-factory/warehouse-base": "^4.1.6"
103
103
  },
104
104
  "devDependencies": {
105
- "@things-factory/builder": "^4.1.1",
105
+ "@things-factory/builder": "^4.1.6",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "09378a57e788038c086c6c40e6135cf14082b185"
108
+ "gitHead": "3b0bbe1cd54f9585579fb85c64cce3338b45fa30"
109
109
  }
package/server/graphql/resolvers/interface-with-hub/add-release-order.ts CHANGED
@@ -2,7 +2,12 @@ import { getRepository } from 'typeorm'
2
2
 
3
3
  import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
4
4
  import { FulfillmentAPI, FulfillmentCenter } from '@things-factory/integration-fulfillment'
5
- import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
5
+ import {
6
+ MarketplaceOrder,
7
+ MarketplaceOrderItem,
8
+ MarketplaceOrderShipping,
9
+ MarketplaceOrderShippingItem
10
+ } from '@things-factory/marketplace-base'
6
11
  import { Product, ProductBundle } from '@things-factory/product-base'
7
12
  import { Domain } from '@things-factory/shell'
8
13
 
@@ -31,7 +36,8 @@ export const addReleaseOrderResolver = {
31
36
  relations: [
32
37
  'marketplaceOrderItems',
33
38
  'marketplaceOrderItems.marketplaceProductVariation',
34
- 'marketplaceOrderItems.marketplaceOrderShipping',
39
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
40
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
35
41
  'marketplaceStore'
36
42
  ]
37
43
  })
@@ -39,17 +45,24 @@ export const addReleaseOrderResolver = {
39
45
  let marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
40
46
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
41
47
  order: { subOrderNoRef: 'ASC' },
42
- relations: ['marketplaceOrderItems']
48
+ relations: [
49
+ 'marketplaceOrderShippingItems',
50
+ 'marketplaceOrderShippingItems.marketplaceOrderItem',
51
+ 'marketplaceOrderShippingItems.product'
52
+ ]
43
53
  })
44
54
 
45
- for (var j = 0; j < marketplaceOrderShippings.length; j++) {
55
+ for (let j = 0; j < marketplaceOrderShippings.length; j++) {
46
56
  let marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
57
+ let marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
58
+ marketplaceOrderShipping.marketplaceOrderShippingItems
47
59
 
48
60
  if (!marketplaceOrderShipping?.releaseOrderId) {
49
61
  const date: Date = new Date()
50
- const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
62
+ const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
63
+ .getDate()
51
64
  .toString()
52
- .padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
65
+ .padStart(2, '0')}`
53
66
 
54
67
  const newReleaseOrder: any = {
55
68
  releaseDate,
@@ -83,21 +96,14 @@ export const addReleaseOrderResolver = {
83
96
  marketplaceOrderStatus: marketplaceOrder.status,
84
97
  airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
85
98
  invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
86
- orderInventories: marketplaceOrder.marketplaceOrderItems
87
- .filter(item => {
88
- if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
89
- return item
90
- }
91
- })
92
- .map((orderItem: any) => {
93
- const { marketplaceProductVariation: productVariation }: any = orderItem
94
- return {
95
- product: {
96
- sku: productVariation.sku
97
- },
98
- releaseQty: orderItem.qty
99
- }
100
- })
99
+ orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
100
+ return {
101
+ product: {
102
+ sku: marketplaceOrderShippingItem.product.sku
103
+ },
104
+ releaseQty: marketplaceOrderShippingItem.qty
105
+ }
106
+ })
101
107
  }
102
108
 
103
109
  try {
@@ -105,6 +111,16 @@ export const addReleaseOrderResolver = {
105
111
  customerBizplaceId,
106
112
  releaseOrder: newReleaseOrder
107
113
  })
114
+
115
+ marketplaceOrderShipping.releaseOrderId = releaseOrder.id
116
+ marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
117
+ await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
118
+
119
+ if (releaseOrder && releaseOrder?.id) {
120
+ marketplaceOrder.releaseOrderId = releaseOrder.id
121
+ marketplaceOrder.fulfillmentCenter = fulfilmentCenter
122
+ await getRepository(MarketplaceOrder).save(marketplaceOrder)
123
+ }
108
124
  } catch (e) {}
109
125
 
110
126
  var invoiceProducts = await Promise.all(
@@ -119,10 +135,12 @@ export const addReleaseOrderResolver = {
119
135
  })
120
136
  }
121
137
 
122
- let moi: MarketplaceOrderItem = marketplaceOrder.marketplaceOrderItems.find(
123
- moi => moi.marketplaceProductVariation.sku === product.sku
138
+ let mosis: MarketplaceOrderShippingItem[] = marketplaceOrderShippingItems.filter(
139
+ mosi => mosi.product.sku === product.sku
124
140
  )
125
141
 
142
+ let moi: MarketplaceOrderItem = mosis[0].marketplaceOrderItem
143
+
126
144
  return {
127
145
  sku: product.sku,
128
146
  name: product.name,
@@ -135,10 +153,6 @@ export const addReleaseOrderResolver = {
135
153
  })
136
154
  )
137
155
 
138
- marketplaceOrderShipping.releaseOrderId = releaseOrder.id
139
- marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
140
- await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
141
-
142
156
  let newInvoice = {
143
157
  invoiceProducts,
144
158
  releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
@@ -188,12 +202,6 @@ export const addReleaseOrderResolver = {
188
202
  } catch (e) {}
189
203
  }
190
204
  }
191
-
192
- if (releaseOrder && releaseOrder?.id) {
193
- marketplaceOrder.releaseOrderId = releaseOrder.id
194
- marketplaceOrder.fulfillmentCenter = fulfilmentCenter
195
- await getRepository(MarketplaceOrder).save(marketplaceOrder)
196
- }
197
205
  }
198
206
  }
199
207
  }
package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts CHANGED
@@ -2,7 +2,12 @@ import { createQueryBuilder, getRepository, SelectQueryBuilder } from 'typeorm'
2
2
 
3
3
  import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
4
4
  import { FulfillmentAPI } from '@things-factory/integration-fulfillment'
5
- import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
5
+ import {
6
+ MarketplaceOrder,
7
+ MarketplaceOrderItem,
8
+ MarketplaceOrderShipping,
9
+ MarketplaceOrderShippingItem
10
+ } from '@things-factory/marketplace-base'
6
11
  import { Product, ProductBundle } from '@things-factory/product-base'
7
12
  import { Domain } from '@things-factory/shell'
8
13
 
@@ -38,17 +43,25 @@ export const autoAddReleaseOrderResolver = {
38
43
 
39
44
  const marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
40
45
  where: { orderNoRef: marketplaceOrder.orderNo, domain },
41
- order: { subOrderNoRef: 'ASC' }
46
+ order: { subOrderNoRef: 'ASC' },
47
+ relations: [
48
+ 'marketplaceOrderShippingItems',
49
+ 'marketplaceOrderShippingItems.marketplaceOrderItem',
50
+ 'marketplaceOrderShippingItems.product'
51
+ ]
42
52
  })
43
53
 
44
- for (var j = 0; j < marketplaceOrderShippings.length; j++) {
54
+ for (let j = 0; j < marketplaceOrderShippings.length; j++) {
45
55
  let marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
56
+ let marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
57
+ marketplaceOrderShipping.marketplaceOrderShippingItems
46
58
 
47
59
  if (!marketplaceOrderShipping?.releaseOrderId) {
48
60
  const date: Date = new Date()
49
- const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
61
+ const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
62
+ .getDate()
50
63
  .toString()
51
- .padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
64
+ .padStart(2, '0')}`
52
65
 
53
66
  const newReleaseOrder: any = {
54
67
  releaseDate,
@@ -82,21 +95,14 @@ export const autoAddReleaseOrderResolver = {
82
95
  marketplaceOrderStatus: marketplaceOrder.status,
83
96
  airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
84
97
  invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
85
- orderInventories: marketplaceOrder.marketplaceOrderItems
86
- .filter(item => {
87
- if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
88
- return item
89
- }
90
- })
91
- .map((orderItem: any) => {
92
- const { marketplaceProductVariation: productVariation }: any = orderItem
93
- return {
94
- product: {
95
- sku: productVariation.sku
96
- },
97
- releaseQty: orderItem.qty
98
- }
99
- })
98
+ orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
99
+ return {
100
+ product: {
101
+ sku: marketplaceOrderShippingItem.product.sku
102
+ },
103
+ releaseQty: marketplaceOrderShippingItem.qty
104
+ }
105
+ })
100
106
  }
101
107
 
102
108
  try {
@@ -104,6 +110,16 @@ export const autoAddReleaseOrderResolver = {
104
110
  customerBizplaceId,
105
111
  releaseOrder: newReleaseOrder
106
112
  })
113
+
114
+ marketplaceOrderShipping.releaseOrderId = releaseOrder.id
115
+ marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
116
+ await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
117
+
118
+ if (releaseOrder && releaseOrder?.id) {
119
+ marketplaceOrder.releaseOrderId = releaseOrder.id
120
+ marketplaceOrder.fulfillmentCenter = fulfilmentCenter
121
+ await getRepository(MarketplaceOrder).save(marketplaceOrder)
122
+ }
107
123
  } catch (e) {}
108
124
 
109
125
  var invoiceProducts = await Promise.all(
@@ -118,10 +134,12 @@ export const autoAddReleaseOrderResolver = {
118
134
  })
119
135
  }
120
136
 
121
- let moi: MarketplaceOrderItem = marketplaceOrder.marketplaceOrderItems.find(
122
- moi => moi.marketplaceProductVariation.sku === product.sku
137
+ let mosis: MarketplaceOrderShippingItem[] = marketplaceOrderShippingItems.filter(
138
+ mosi => mosi.product.sku === product.sku
123
139
  )
124
140
 
141
+ let moi: MarketplaceOrderItem = mosis[0].marketplaceOrderItem
142
+
125
143
  return {
126
144
  sku: product.sku,
127
145
  name: product.name,
@@ -134,10 +152,6 @@ export const autoAddReleaseOrderResolver = {
134
152
  })
135
153
  )
136
154
 
137
- marketplaceOrderShipping.releaseOrderId = releaseOrder.id
138
- marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter
139
- await getRepository(MarketplaceOrderShipping).save(marketplaceOrderShipping)
140
-
141
155
  let newInvoice = {
142
156
  invoiceProducts,
143
157
  releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
@@ -187,12 +201,6 @@ export const autoAddReleaseOrderResolver = {
187
201
  } catch (e) {}
188
202
  }
189
203
  }
190
-
191
- if (releaseOrder && releaseOrder?.id) {
192
- marketplaceOrder.releaseOrderId = releaseOrder.id
193
- marketplaceOrder.fulfillmentCenter = fulfilmentCenter
194
- await getRepository(MarketplaceOrder).save(marketplaceOrder)
195
- }
196
204
  }
197
205
  }
198
206
  }
package/server/routers/etrax-router.ts CHANGED
@@ -119,9 +119,28 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
119
119
  const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
120
120
 
121
121
  // to-do update tracking no to every marketplaces
122
- if (marketplaceStore.platform === 'woocommerce') {
122
+ if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
123
123
  const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
124
- await StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note })
124
+ let orderInfo: MarketplaceOrder = await getRepository(MarketplaceOrder).findOne({
125
+ where: {
126
+ name: order.name
127
+ },
128
+ relations: ['marketplaceOrderItems', 'marketplaceOrderItems.marketplaceProductVariation']
129
+ })
130
+ const result = await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
131
+ orderId: order.name,
132
+ trackingUrl: note,
133
+ trackingNo,
134
+ order: orderInfo,
135
+ note
136
+ })
137
+
138
+ if (marketplaceStore.platform === 'woocommerce') {
139
+ await StoreAPI.updateOrderStatus(marketplaceStore, {
140
+ orderId: order.name,
141
+ status: 'READY_TO_SHIP'
142
+ })
143
+ }
125
144
  }
126
145
 
127
146
  const resp = {
package/translations/en.json CHANGED
@@ -144,6 +144,7 @@
144
144
  "field.total_weight": "total weight",
145
145
  "field.town": "town",
146
146
  "field.tracking_no": "tracking no",
147
+ "field.tracking_url": "tracking URL",
147
148
  "field.type": "type",
148
149
  "field.unit": "unit",
149
150
  "field.uom_value": "UOM value",
package/translations/ko.json CHANGED
@@ -143,6 +143,7 @@
143
143
  "field.total_weight": "[ko] total weight",
144
144
  "field.town": "[ko] town",
145
145
  "field.tracking_no": "[ko] tracking no",
146
+ "field.tracking_url": "[ko] tracking URL",
146
147
  "field.type": "[ko] type",
147
148
  "field.unit": "[ko] unit",
148
149
  "field.uom_value": "[ko] UOM value",
package/translations/ms.json CHANGED
@@ -143,6 +143,7 @@
143
143
  "field.total_weight": "[ms] total weight",
144
144
  "field.town": "[ms] town",
145
145
  "field.tracking_no": "[ms] tracking no",
146
+ "field.tracking_url": "[ms] tracking URL",
146
147
  "field.type": "[ms] type",
147
148
  "field.unit": "[ms] unit",
148
149
  "field.uom_value": "[ms] UOM value",
package/translations/zh.json CHANGED
@@ -143,6 +143,7 @@
143
143
  "field.total_weight": "[zh] total weight",
144
144
  "field.town": "[zh] town",
145
145
  "field.tracking_no": "[zh] tracking no",
146
+ "field.tracking_url": "[zh] tracking URL",
146
147
  "field.type": "[zh] type",
147
148
  "field.unit": "[zh] unit",
148
149
  "field.uom_value": "[zh] UOM value",