@things-factory/worksheet-base 4.3.322 → 4.3.323

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 (19) hide show
  1. package/dist-server/controllers/ecommerce/ecommerce-controller.js +9 -1
  2. package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
  3. package/dist-server/controllers/render-manifest.js +5 -4
  4. package/dist-server/controllers/render-manifest.js.map +1 -1
  5. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +16 -13
  6. package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
  7. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +18 -13
  8. package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
  9. package/dist-server/index.js +1 -0
  10. package/dist-server/index.js.map +1 -1
  11. package/dist-server/utils/lmd-util.js +39 -10
  12. package/dist-server/utils/lmd-util.js.map +1 -1
  13. package/package.json +3 -3
  14. package/server/controllers/ecommerce/ecommerce-controller.ts +11 -1
  15. package/server/controllers/render-manifest.ts +7 -4
  16. package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +18 -14
  17. package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +23 -18
  18. package/server/index.ts +1 -0
  19. package/server/utils/lmd-util.ts +58 -36
package/dist-server/controllers/ecommerce/ecommerce-controller.js CHANGED
@@ -135,7 +135,7 @@ class EcommerceController extends worksheet_controller_1.WorksheetController {
135
135
  }
136
136
  }
137
137
  }
138
- async createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain) {
138
+ async createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain, ownTrackingNo = null) {
139
139
  let marketplaceOrderShipping;
140
140
  if (marketplaceOrder.isSplitted) {
141
141
  marketplaceOrderShipping = await this.trxMgr.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
@@ -147,6 +147,14 @@ class EcommerceController extends worksheet_controller_1.WorksheetController {
147
147
  where: { domain: companyDomain, marketplaceStore, orderNoRef: releaseGood.refNo }
148
148
  });
149
149
  }
150
+ if (ownTrackingNo) {
151
+ let platform = releaseGood.lastMileDelivery.platform;
152
+ marketplaceOrderShipping.ownTrackingNo = ownTrackingNo;
153
+ marketplaceOrderShipping.ownTransporter = platform;
154
+ await this.trxMgr
155
+ .getRepository(marketplace_base_1.MarketplaceOrderShipping)
156
+ .update({ id: marketplaceOrderShipping.id }, { ownTrackingNo: ownTrackingNo, ownTransporter: platform });
157
+ }
150
158
  const trackingNo = marketplaceOrderShipping.ownTrackingNo
151
159
  ? marketplaceOrderShipping.ownTrackingNo
152
160
  : marketplaceOrderShipping.trackingNo;
package/dist-server/controllers/ecommerce/ecommerce-controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ecommerce-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/ecommerce-controller.ts"],"names":[],"mappings":"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"}
package/dist-server/controllers/render-manifest.js CHANGED
@@ -26,10 +26,11 @@ async function renderManifest({ manifestNo }, context) {
26
26
  relations: ['domain']
27
27
  });
28
28
  // find release good
29
- let orderPackages = await (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).find({
30
- where: { domain, manifest },
31
- relations: ['releaseGood', 'releaseGood.bizplace']
32
- });
29
+ let qb = (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).createQueryBuilder('opk');
30
+ qb.innerJoinAndSelect('opk.releaseGood', 'rg').where('opk.manifest_id = :manifestId', { manifestId: manifest.id });
31
+ qb.innerJoinAndSelect('rg.bizplace', 'b');
32
+ qb.orderBy('opk.trackingNo');
33
+ const orderPackages = await qb.getMany();
33
34
  // 7. find grn template based on category
34
35
  const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
35
36
  where: { domain, category: constants_1.TEMPLATE_TYPE.MANIFEST_TEMPLATE }
package/dist-server/controllers/render-manifest.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render-manifest.js","sourceRoot":"","sources":["../../server/controllers/render-manifest.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAC9B,qCAAuC;AAEvC,qEAAqE;AACrE,6CAA4C;AAC5C,2DAAgF;AAChF,iDAA8C;AAC9C,uDAAuE;AAEvE,4CAA4C;AAC5C,0DAA0D;AAE1D,MAAM,cAAc,GAAG,YAAM,CAAC,GAAG,CAAC,cAAc,EAAE,6CAA6C,CAAC,CAAA;AAEzF,KAAK,UAAU,cAAc,CAAC,EAAE,UAAU,EAAE,EAAE,OAAY;IAC/D,iBAAiB;IACjB,MAAM,MAAM,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC;QACzD,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE;KACvC,CAAC,CAAA;IAEF,mBAAmB;IACnB,MAAM,QAAQ,GAAa,MAAM,IAAA,uBAAa,EAAC,qBAAQ,CAAC,CAAC,OAAO,CAAC;QAC/D,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,SAAS,EAAE,CAAC,QAAQ,CAAC;KACtB,CAAC,CAAA;IAEF,oBAAoB;IACpB,IAAI,aAAa,GAAmB,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,IAAI,CAAC;QACzE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAC3B,SAAS,EAAE,CAAC,aAAa,EAAE,sBAAsB,CAAC;KACnD,CAAC,CAAA;IAEF,yCAAyC;IACzC,MAAM,aAAa,GAAe,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,OAAO,CAAC;QACxE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,yBAAa,CAAC,iBAAiB,EAAE;KAC7D,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,MAAM,yBAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAEpE,MAAM,IAAI,GAAG;QACX,iBAAiB,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB;QAC7C,WAAW,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI;QAC3B,aAAa,EAAE,iCAAiB,CAAC,IAAI,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,CAAC,CAAC,QAAQ,EAAE;QACrE,UAAU,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,KAAI,CAAC;QACtC,YAAY,EAAE,MAAM,OAAO,CAAC,GAAG,CAC7B,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;;YACpC,MAAM,kBAAkB,GAAW,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAA;YAC/D,MAAM,mBAAmB,GAAa,MAAM,IAAA,6BAAkB,EAAC,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAA;YAC9F,OAAO;gBACL,OAAO,EAAE,GAAG,GAAG,CAAC;gBAChB,QAAQ,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,KAAK;gBAClC,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;gBAC7B,KAAK,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,MAAM;gBAChC,aAAa,EAAE,iCAAiB,CAAC,IAAI,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY,CAAC,CAAC,QAAQ,EAAE;gBACxE,YAAY,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,WAAW;gBAC5C,gBAAgB,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,gBAAgB;gBACrD,gBAAgB,EAAE,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,UAAU,KAAK,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,IAAI,EAAE;gBAChF,MAAM,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,MAAM;gBACjC,MAAM,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,0CAAE,MAAM;gBACjC,mBAAmB,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI;aACrD,CAAA;QACH,CAAC,CAAC,CACH;KACF,CAAA;IAED,MAAM,QAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC/B,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACrC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;IAEnD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,cAAc,EAAE;QAC3C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,QAAQ;KACf,CAAC,CAAA;IAEF,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;AAC9B,CAAC;AA7DD,wCA6DC"}
1
+ {"version":3,"file":"render-manifest.js","sourceRoot":"","sources":["../../server/controllers/render-manifest.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js CHANGED
@@ -23,7 +23,7 @@ exports.completeBatchPickingResolver = {
23
23
  if (obsolete) {
24
24
  return { obsolete: true };
25
25
  }
26
- // disabled notification to users due to performance issue by @ChrisLim-git
26
+ // disabled notification to users due to performance issue by @ChrisLim-git
27
27
  // const bizplace: Bizplace = await getMyBizplace(domain, user)
28
28
  // const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)
29
29
  // await worksheetController.notifyToCustomer(bizplace, {
@@ -80,6 +80,20 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
80
80
  // Integration triggers
81
81
  for (let i = 0; i < uniqueReleaseGoods.length; i++) {
82
82
  let foundReleaseGood = uniqueReleaseGoods[i];
83
+ const companyDomain = foundReleaseGood.bizplace.company.domain;
84
+ let marketplaceOrder;
85
+ if (foundReleaseGood.source == auth_base_1.ApplicationType.MMS || foundReleaseGood.lmdOption) {
86
+ marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
87
+ where: { orderNo: foundReleaseGood.refNo, domain: companyDomain },
88
+ relations: [
89
+ 'marketplaceStore',
90
+ 'marketplaceStore.marketplaceDistributors',
91
+ 'marketplaceOrderItems',
92
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
93
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
94
+ ]
95
+ });
96
+ }
83
97
  const orderSource = foundReleaseGood.source;
84
98
  switch (orderSource) {
85
99
  case auth_base_1.ApplicationType.SELLERCRAFT:
@@ -129,17 +143,6 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
129
143
  }
130
144
  break;
131
145
  case auth_base_1.ApplicationType.MMS:
132
- const companyDomain = foundReleaseGood.bizplace.company.domain;
133
- const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
134
- where: { orderNo: foundReleaseGood.refNo, domain: companyDomain },
135
- relations: [
136
- 'marketplaceOrderItems',
137
- 'marketplaceOrderItems.marketplaceOrderShippingItems',
138
- 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
139
- 'marketplaceStore',
140
- 'marketplaceStore.marketplaceDistributors'
141
- ]
142
- });
143
146
  const marketplaceStore = marketplaceOrder.marketplaceStore;
144
147
  const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
145
148
  if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
@@ -221,7 +224,7 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
221
224
  foundReleaseGood.lmdOption &&
222
225
  foundReleaseGood.lastMileDelivery &&
223
226
  ((_b = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
224
- await (0, utils_1.createLmdParcel)([foundReleaseGood], tx);
227
+ await (0, utils_1.createLmdParcel)([foundReleaseGood], tx, domain, user, marketplaceOrder);
225
228
  // trigger RTS
226
229
  try {
227
230
  const orderSource = foundReleaseGood.source;
package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js CHANGED
@@ -64,6 +64,20 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
64
64
  'updater'
65
65
  ]
66
66
  });
67
+ const companyDomain = releaseGood.bizplace.company.domain;
68
+ let marketplaceOrder;
69
+ if (releaseGood.source == auth_base_1.ApplicationType.MMS || releaseGood.lmdOption) {
70
+ marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
71
+ where: { orderNo: releaseGood.refNo, domain: companyDomain },
72
+ relations: [
73
+ 'marketplaceStore',
74
+ 'marketplaceStore.marketplaceDistributors',
75
+ 'marketplaceOrderItems',
76
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
77
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
78
+ ]
79
+ });
80
+ }
67
81
  if (releaseGood) {
68
82
  const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
69
83
  'worksheetDetails',
@@ -139,24 +153,15 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
139
153
  }
140
154
  break;
141
155
  case auth_base_1.ApplicationType.MMS:
142
- const companyDomain = releaseGood.bizplace.company.domain;
143
- let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
144
- where: { orderNo: releaseGood.refNo, domain: companyDomain },
145
- relations: [
146
- 'marketplaceStore',
147
- 'marketplaceStore.marketplaceDistributors',
148
- 'marketplaceOrderItems',
149
- 'marketplaceOrderItems.marketplaceOrderShippingItems',
150
- 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
151
- ]
152
- });
153
156
  if (marketplaceOrder) {
154
157
  const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
155
158
  const marketplaceStore = marketplaceOrder.marketplaceStore;
156
159
  let eTraxOption;
157
160
  if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
158
161
  await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
159
- await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
162
+ if (!releaseGood.lmdOption) {
163
+ await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
164
+ }
160
165
  }
161
166
  if (!marketplaceOrder) {
162
167
  throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
@@ -372,7 +377,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
372
377
  releaseGood.lmdOption &&
373
378
  releaseGood.lastMileDelivery &&
374
379
  ((_d = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _d === void 0 ? void 0 : _d.some(op => op.parcelId == null))) {
375
- await (0, utils_1.createLmdParcel)([releaseGood], tx);
380
+ await (0, utils_1.createLmdParcel)([releaseGood], tx, domain, user, marketplaceOrder);
376
381
  // trigger RTS
377
382
  try {
378
383
  const orderSource = releaseGood.source;
package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
package/dist-server/index.js CHANGED
@@ -30,4 +30,5 @@ __exportStar(require("./controllers/render-kimeda-grn"), exports);
30
30
  __exportStar(require("./controllers/render-orientage-grn"), exports);
31
31
  __exportStar(require("./controllers/render-orientage-do"), exports);
32
32
  __exportStar(require("./controllers/render-ro-do"), exports);
33
+ __exportStar(require("./controllers/ecommerce/ecommerce-controller"), exports);
33
34
  //# sourceMappingURL=index.js.map
package/dist-server/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,+CAA4B;AAC5B,0CAAuB;AACvB,2DAAwC;AACxC,kEAA+C;AAC/C,iEAA8C;AAC9C,8DAA2C;AAC3C,kEAA+C;AAC/C,qEAAkD;AAClD,oEAAiD;AACjD,6DAA0C"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAiB;AAEjB,8CAA2B;AAC3B,6CAA0B;AAC1B,4CAAyB;AACzB,mHAAgG;AAChG,+GAA4F;AAC5F,+CAA4B;AAC5B,0CAAuB;AACvB,2DAAwC;AACxC,kEAA+C;AAC/C,iEAA8C;AAC9C,8DAA2C;AAC3C,kEAA+C;AAC/C,qEAAkD;AAClD,oEAAiD;AACjD,6DAA0C;AAC1C,+EAA4D"}
package/dist-server/utils/lmd-util.js CHANGED
@@ -16,13 +16,15 @@ const geography_1 = require("@things-factory/geography");
16
16
  const integration_base_1 = require("@things-factory/integration-base");
17
17
  const integration_lmd_1 = require("@things-factory/integration-lmd");
18
18
  const sales_base_1 = require("@things-factory/sales-base");
19
+ const index_1 = require("../index");
20
+ const marketplace_base_1 = require("@things-factory/marketplace-base");
19
21
  const debug = require('debug')('things-factory:worksheet-base:lmd-util');
20
22
  // import { SellercraftController } from '../controllers'
21
23
  const LMD_BOARDS = {
22
24
  // dhl: 'operato-lmd-dhl-awb',
23
25
  airspeed: 'operato-lmd-airspeed-awb'
24
26
  };
25
- async function createLmdParcel(releaseGoods, tx) {
27
+ async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder) {
26
28
  var _a, _b, _c, _d, _e, _f, _g;
27
29
  try {
28
30
  let parcelsRequest = [];
@@ -67,7 +69,9 @@ async function createLmdParcel(releaseGoods, tx) {
67
69
  city: (_b = releaseGood.city) === null || _b === void 0 ? void 0 : _b.toUpperCase(),
68
70
  postcode: releaseGood.postalCode,
69
71
  district: ((_c = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.district) === null || _c === void 0 ? void 0 : _c.toUpperCase()) || ((_d = releaseGood.city) === null || _d === void 0 ? void 0 : _d.toUpperCase()),
70
- state: ((_e = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.state) === null || _e === void 0 ? void 0 : _e.toUpperCase()) || ((_f = recipientGeoArea === null || recipientGeoArea === void 0 ? void 0 : recipientGeoArea.stateName) === null || _f === void 0 ? void 0 : _f.toUpperCase()) || ((_g = releaseGood.city) === null || _g === void 0 ? void 0 : _g.toUpperCase()),
72
+ state: ((_e = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.state) === null || _e === void 0 ? void 0 : _e.toUpperCase()) ||
73
+ ((_f = recipientGeoArea === null || recipientGeoArea === void 0 ? void 0 : recipientGeoArea.stateName) === null || _f === void 0 ? void 0 : _f.toUpperCase()) ||
74
+ ((_g = releaseGood.city) === null || _g === void 0 ? void 0 : _g.toUpperCase()),
71
75
  country: releaseGood.country,
72
76
  pSender: bizplace.name,
73
77
  pAddress: bizplace.address,
@@ -128,6 +132,8 @@ async function createLmdParcel(releaseGoods, tx) {
128
132
  .innerJoinAndSelect('op.releaseGood', 'rg')
129
133
  .innerJoinAndSelect('rg.domain', 'd')
130
134
  .innerJoinAndSelect('rg.bizplace', 'b')
135
+ .innerJoinAndSelect('b.company', 'c')
136
+ .innerJoinAndSelect('c.domain', 'companyDomain')
131
137
  .innerJoinAndSelect('b.domain', 'd2')
132
138
  .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
133
139
  .where('op.name IN (:...orderPackageIds)', {
@@ -136,7 +142,7 @@ async function createLmdParcel(releaseGoods, tx) {
136
142
  })
137
143
  });
138
144
  const orderPackages = await qb.getMany();
139
- await processAwbAndTrackingNo(orderPackages, tx);
145
+ await processAwbAndTrackingNo(orderPackages, tx, domain, user, marketplaceOrder);
140
146
  }
141
147
  }
142
148
  catch (e) {
@@ -144,19 +150,21 @@ async function createLmdParcel(releaseGoods, tx) {
144
150
  }
145
151
  }
146
152
  exports.createLmdParcel = createLmdParcel;
147
- async function processAwbAndTrackingNo(orderPackages, tx) {
153
+ async function processAwbAndTrackingNo(orderPackages, tx, domain, user, marketplaceOrder) {
148
154
  var _a;
155
+ const ecommerceCtrl = new index_1.EcommerceController(tx, domain, user);
149
156
  let releaseOrders = [];
150
157
  for (let orderPackage of orderPackages) {
151
158
  // await getConnection().transaction(async tx => {
152
159
  try {
160
+ let releaseGood = orderPackage.releaseGood;
153
161
  let awbRes = await integration_lmd_1.LastMileAPI.getAwb(Object.assign(Object.assign({}, orderPackage.releaseGood.lastMileDelivery), { platform: 'lmdMiddleware' }), { parcelId: orderPackage.parcelId, staging: (_a = orderPackage.releaseGood.lastMileDelivery) === null || _a === void 0 ? void 0 : _a.staging });
154
162
  if (awbRes) {
155
163
  let awbContent;
156
164
  let awb;
157
165
  const { deliveryConfirmationNo, tracking_no } = awbRes;
158
166
  if (awbRes.content) {
159
- if (orderPackage.releaseGood.lastMileDelivery.platform == 'VIETTEL_POST') {
167
+ if (releaseGood.lastMileDelivery.platform == 'VIETTEL_POST') {
160
168
  try {
161
169
  var puppeteer = require('puppeteer');
162
170
  const browser = await puppeteer.launch({ headless: true });
@@ -173,8 +181,8 @@ async function processAwbAndTrackingNo(orderPackages, tx) {
173
181
  console.log(e);
174
182
  }
175
183
  }
176
- else if (orderPackage.releaseGood.lastMileDelivery.platform == 'POSLAJU' ||
177
- orderPackage.releaseGood.lastMileDelivery.platform == 'SAPX') {
184
+ else if (releaseGood.lastMileDelivery.platform == 'POSLAJU' ||
185
+ releaseGood.lastMileDelivery.platform == 'SAPX') {
178
186
  try {
179
187
  const response = await (0, node_fetch_1.default)(awbRes.content, {
180
188
  method: 'get'
@@ -196,11 +204,11 @@ async function processAwbAndTrackingNo(orderPackages, tx) {
196
204
  await tx
197
205
  .getRepository(sales_base_1.OrderPackage)
198
206
  .update({ name: orderPackage.name }, { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no });
199
- releaseOrders.push(orderPackage.releaseGood);
207
+ releaseOrders.push(releaseGood);
200
208
  const integration = await tx.getRepository(integration_base_1.Integration).findOne({
201
209
  where: {
202
- domain: orderPackage.releaseGood.domain,
203
- bizplace: orderPackage.releaseGood.bizplace,
210
+ domain: releaseGood.domain,
211
+ bizplace: releaseGood.bizplace,
204
212
  active: true,
205
213
  platform: integration_base_1.Platform.OTHERS
206
214
  }
@@ -208,6 +216,27 @@ async function processAwbAndTrackingNo(orderPackages, tx) {
208
216
  if (integration) {
209
217
  await processCallback({ orderPackage, tracking_no });
210
218
  }
219
+ // update tracking no to mms then to Magento
220
+ const companyDomain = releaseGood.bizplace.company.domain;
221
+ if (!marketplaceOrder) {
222
+ marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
223
+ where: { orderNo: releaseGood.refNo, domain: companyDomain },
224
+ relations: [
225
+ 'marketplaceStore',
226
+ 'marketplaceStore.marketplaceDistributors',
227
+ 'marketplaceOrderItems',
228
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
229
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
230
+ ]
231
+ });
232
+ }
233
+ if (marketplaceOrder) {
234
+ const ecommerceCtrl = new index_1.EcommerceController(tx, domain, user);
235
+ const marketplaceStore = marketplaceOrder.marketplaceStore;
236
+ if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
237
+ await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain, tracking_no);
238
+ }
239
+ }
211
240
  }
212
241
  }
213
242
  catch (e) {
package/dist-server/utils/lmd-util.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.322",
3
+ "version": "4.3.323",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -36,7 +36,7 @@
36
36
  "@things-factory/integration-sftp": "^4.3.319",
37
37
  "@things-factory/marketplace-base": "^4.3.318",
38
38
  "@things-factory/notification": "^4.3.281",
39
- "@things-factory/sales-base": "^4.3.321",
39
+ "@things-factory/sales-base": "^4.3.323",
40
40
  "@things-factory/setting-base": "^4.3.281",
41
41
  "@things-factory/shell": "^4.3.281",
42
42
  "@things-factory/transport-base": "^4.3.301",
@@ -45,5 +45,5 @@
45
45
  "puppeteer": "21.0.3",
46
46
  "uuid": "^9.0.0"
47
47
  },
48
- "gitHead": "c5d7ae00a340ee35d829d4cd1b0fb2b7bc3452e2"
48
+ "gitHead": "12b40eb70ae76ad2bb5ac77e5e157b097faca233"
49
49
  }
package/server/controllers/ecommerce/ecommerce-controller.ts CHANGED
@@ -179,7 +179,8 @@ export class EcommerceController extends WorksheetController {
179
179
  releaseGood: ReleaseGood,
180
180
  marketplaceStore: MarketplaceStore,
181
181
  marketplaceOrder: MarketplaceOrder,
182
- companyDomain: Domain
182
+ companyDomain: Domain,
183
+ ownTrackingNo: String = null
183
184
  ): Promise<void> {
184
185
  let marketplaceOrderShipping: MarketplaceOrderShipping
185
186
 
@@ -193,6 +194,15 @@ export class EcommerceController extends WorksheetController {
193
194
  })
194
195
  }
195
196
 
197
+ if (ownTrackingNo) {
198
+ let platform = releaseGood.lastMileDelivery.platform
199
+ marketplaceOrderShipping.ownTrackingNo = ownTrackingNo
200
+ marketplaceOrderShipping.ownTransporter = platform
201
+ await this.trxMgr
202
+ .getRepository(MarketplaceOrderShipping)
203
+ .update({ id: marketplaceOrderShipping.id }, { ownTrackingNo: ownTrackingNo, ownTransporter: platform })
204
+ }
205
+
196
206
  const trackingNo: string = marketplaceOrderShipping.ownTrackingNo
197
207
  ? marketplaceOrderShipping.ownTrackingNo
198
208
  : marketplaceOrderShipping.trackingNo
package/server/controllers/render-manifest.ts CHANGED
@@ -26,10 +26,13 @@ export async function renderManifest({ manifestNo }, context: any) {
26
26
  })
27
27
 
28
28
  // find release good
29
- let orderPackages: OrderPackage[] = await getRepository(OrderPackage).find({
30
- where: { domain, manifest },
31
- relations: ['releaseGood', 'releaseGood.bizplace']
32
- })
29
+ let qb: any = getRepository(OrderPackage).createQueryBuilder('opk')
30
+ qb.innerJoinAndSelect('opk.releaseGood', 'rg').where('opk.manifest_id = :manifestId', { manifestId: manifest.id })
31
+ qb.innerJoinAndSelect('rg.bizplace', 'b')
32
+
33
+ qb.orderBy('opk.trackingNo')
34
+
35
+ const orderPackages: OrderPackage[] = await qb.getMany()
33
36
 
34
37
  // 7. find grn template based on category
35
38
  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts CHANGED
@@ -42,7 +42,7 @@ export const completeBatchPickingResolver = {
42
42
  return { obsolete: true }
43
43
  }
44
44
 
45
- // disabled notification to users due to performance issue by @ChrisLim-git
45
+ // disabled notification to users due to performance issue by @ChrisLim-git
46
46
  // const bizplace: Bizplace = await getMyBizplace(domain, user)
47
47
  // const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)
48
48
  // await worksheetController.notifyToCustomer(bizplace, {
@@ -114,6 +114,22 @@ export async function completeBatchPicking(
114
114
  for (let i = 0; i < uniqueReleaseGoods.length; i++) {
115
115
  let foundReleaseGood: ReleaseGood = uniqueReleaseGoods[i]
116
116
 
117
+ const companyDomain: Domain = foundReleaseGood.bizplace.company.domain
118
+
119
+ let marketplaceOrder: MarketplaceOrder
120
+ if (foundReleaseGood.source == ApplicationType.MMS || foundReleaseGood.lmdOption) {
121
+ marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
122
+ where: { orderNo: foundReleaseGood.refNo, domain: companyDomain },
123
+ relations: [
124
+ 'marketplaceStore',
125
+ 'marketplaceStore.marketplaceDistributors',
126
+ 'marketplaceOrderItems',
127
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
128
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
129
+ ]
130
+ })
131
+ }
132
+
117
133
  const orderSource: string = foundReleaseGood.source
118
134
  switch (orderSource) {
119
135
  case ApplicationType.SELLERCRAFT:
@@ -173,17 +189,6 @@ export async function completeBatchPicking(
173
189
  break
174
190
 
175
191
  case ApplicationType.MMS:
176
- const companyDomain: Domain = foundReleaseGood.bizplace.company.domain
177
- const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
178
- where: { orderNo: foundReleaseGood.refNo, domain: companyDomain },
179
- relations: [
180
- 'marketplaceOrderItems',
181
- 'marketplaceOrderItems.marketplaceOrderShippingItems',
182
- 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
183
- 'marketplaceStore',
184
- 'marketplaceStore.marketplaceDistributors'
185
- ]
186
- })
187
192
  const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
188
193
 
189
194
  const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
@@ -282,7 +287,7 @@ export async function completeBatchPicking(
282
287
  foundReleaseGood.lastMileDelivery &&
283
288
  foundReleaseGood?.orderPackages?.some(op => op.parcelId == null)
284
289
  ) {
285
- await createLmdParcel([foundReleaseGood], tx)
290
+ await createLmdParcel([foundReleaseGood], tx, domain, user, marketplaceOrder)
286
291
  // trigger RTS
287
292
  try {
288
293
  const orderSource: string = foundReleaseGood.source
@@ -369,5 +374,4 @@ export async function completeBatchPicking(
369
374
  } finally {
370
375
  console.timeEnd(`complete-batch-picking[completeBatchPicking]: {domain:${domain.id}, taskNo:${taskNo}}`)
371
376
  }
372
-
373
377
  }
package/server/graphql/resolvers/worksheet/picking/complete-picking.ts CHANGED
@@ -99,6 +99,22 @@ export async function completePicking(
99
99
  ]
100
100
  })
101
101
 
102
+ const companyDomain: Domain = releaseGood.bizplace.company.domain
103
+
104
+ let marketplaceOrder: MarketplaceOrder
105
+ if (releaseGood.source == ApplicationType.MMS || releaseGood.lmdOption) {
106
+ marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
107
+ where: { orderNo: releaseGood.refNo, domain: companyDomain },
108
+ relations: [
109
+ 'marketplaceStore',
110
+ 'marketplaceStore.marketplaceDistributors',
111
+ 'marketplaceOrderItems',
112
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
113
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
114
+ ]
115
+ })
116
+ }
117
+
102
118
  if (releaseGood) {
103
119
  const worksheet: Worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
104
120
  'worksheetDetails',
@@ -188,18 +204,6 @@ export async function completePicking(
188
204
  break
189
205
 
190
206
  case ApplicationType.MMS:
191
- const companyDomain: Domain = releaseGood.bizplace.company.domain
192
- let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
193
- where: { orderNo: releaseGood.refNo, domain: companyDomain },
194
- relations: [
195
- 'marketplaceStore',
196
- 'marketplaceStore.marketplaceDistributors',
197
- 'marketplaceOrderItems',
198
- 'marketplaceOrderItems.marketplaceOrderShippingItems',
199
- 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
200
- ]
201
- })
202
-
203
207
  if (marketplaceOrder) {
204
208
  const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
205
209
  const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
@@ -208,7 +212,9 @@ export async function completePicking(
208
212
  if (marketplaceStore?.isAutoUpdateShipment) {
209
213
  await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
210
214
 
211
- await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
215
+ if (!releaseGood.lmdOption) {
216
+ await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
217
+ }
212
218
  }
213
219
 
214
220
  if (!marketplaceOrder) {
@@ -458,7 +464,7 @@ export async function completePicking(
458
464
  releaseGood.lastMileDelivery &&
459
465
  releaseGood?.orderPackages?.some(op => op.parcelId == null)
460
466
  ) {
461
- await createLmdParcel([releaseGood], tx)
467
+ await createLmdParcel([releaseGood], tx, domain, user, marketplaceOrder)
462
468
  // trigger RTS
463
469
  try {
464
470
  const orderSource: string = releaseGood.source
@@ -478,12 +484,11 @@ export async function completePicking(
478
484
  sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
479
485
  }
480
486
  }
481
- }
482
- else if (orderSource == ApplicationType.POWRUP) {
487
+ } else if (orderSource == ApplicationType.POWRUP) {
483
488
  const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true, platform: 'POWRUP' })
484
-
489
+
485
490
  if (powrup) {
486
- const powrupController: PowrupController = new PowrupController ()
491
+ const powrupController: PowrupController = new PowrupController()
487
492
  const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
488
493
  where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
489
494
  })
package/server/index.ts CHANGED
@@ -15,3 +15,4 @@ export * from './controllers/render-kimeda-grn'
15
15
  export * from './controllers/render-orientage-grn'
16
16
  export * from './controllers/render-orientage-do'
17
17
  export * from './controllers/render-ro-do'
18
+ export * from './controllers/ecommerce/ecommerce-controller'
package/server/utils/lmd-util.ts CHANGED
@@ -1,37 +1,21 @@
1
1
  import 'jspdf'
2
2
 
3
3
  import fetch from 'node-fetch'
4
- import {
5
- getRepository,
6
- SelectQueryBuilder
7
- } from 'typeorm'
4
+ import { getRepository, SelectQueryBuilder } from 'typeorm'
8
5
  import { v4 as uuidv4 } from 'uuid'
9
6
 
10
- import {
11
- Attachment,
12
- uploadAwb
13
- } from '@things-factory/attachment-base'
7
+ import { Attachment, uploadAwb } from '@things-factory/attachment-base'
14
8
  import { Bizplace } from '@things-factory/biz-base'
15
- import {
16
- Board,
17
- headlessModel,
18
- pdf
19
- } from '@things-factory/board-service'
9
+ import { Domain } from '@things-factory/shell'
10
+ import { Board, headlessModel, pdf } from '@things-factory/board-service'
20
11
  import { logger } from '@things-factory/env'
21
12
  import { GeoArea } from '@things-factory/geography'
22
- import {
23
- Integration,
24
- Platform
25
- } from '@things-factory/integration-base'
26
- import {
27
- LastMileAPI,
28
- LastMileDelivery,
29
- refreshAccessTokenNinjavan
30
- } from '@things-factory/integration-lmd'
31
- import {
32
- OrderPackage,
33
- ReleaseGood
34
- } from '@things-factory/sales-base'
13
+ import { Integration, Platform } from '@things-factory/integration-base'
14
+ import { LastMileAPI, LastMileDelivery, refreshAccessTokenNinjavan } from '@things-factory/integration-lmd'
15
+ import { OrderPackage, ReleaseGood } from '@things-factory/sales-base'
16
+ import { EcommerceController } from '../index'
17
+ import { MarketplaceOrder } from '@things-factory/marketplace-base'
18
+ import { MarketplaceStore } from '@things-factory/integration-marketplace'
35
19
 
36
20
  const debug = require('debug')('things-factory:worksheet-base:lmd-util')
37
21
 
@@ -42,7 +26,7 @@ const LMD_BOARDS = {
42
26
  airspeed: 'operato-lmd-airspeed-awb'
43
27
  }
44
28
 
45
- export async function createLmdParcel(releaseGoods, tx) {
29
+ export async function createLmdParcel(releaseGoods, tx, domain, user, marketplaceOrder) {
46
30
  try {
47
31
  let parcelsRequest = []
48
32
  for (let releaseGood of releaseGoods) {
@@ -92,7 +76,10 @@ export async function createLmdParcel(releaseGoods, tx) {
92
76
  city: releaseGood.city?.toUpperCase(),
93
77
  postcode: releaseGood.postalCode,
94
78
  district: releaseGood?.district?.toUpperCase() || releaseGood.city?.toUpperCase(),
95
- state: releaseGood?.state?.toUpperCase() || recipientGeoArea?.stateName?.toUpperCase()|| releaseGood.city?.toUpperCase(),
79
+ state:
80
+ releaseGood?.state?.toUpperCase() ||
81
+ recipientGeoArea?.stateName?.toUpperCase() ||
82
+ releaseGood.city?.toUpperCase(),
96
83
  country: releaseGood.country,
97
84
 
98
85
  pSender: bizplace.name,
@@ -166,6 +153,8 @@ export async function createLmdParcel(releaseGoods, tx) {
166
153
  .innerJoinAndSelect('op.releaseGood', 'rg')
167
154
  .innerJoinAndSelect('rg.domain', 'd')
168
155
  .innerJoinAndSelect('rg.bizplace', 'b')
156
+ .innerJoinAndSelect('b.company', 'c')
157
+ .innerJoinAndSelect('c.domain', 'companyDomain')
169
158
  .innerJoinAndSelect('b.domain', 'd2')
170
159
  .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
171
160
  .where('op.name IN (:...orderPackageIds)', {
@@ -175,19 +164,21 @@ export async function createLmdParcel(releaseGoods, tx) {
175
164
  })
176
165
 
177
166
  const orderPackages: OrderPackage[] = await qb.getMany()
178
- await processAwbAndTrackingNo(orderPackages, tx)
167
+ await processAwbAndTrackingNo(orderPackages, tx, domain, user, marketplaceOrder)
179
168
  }
180
169
  } catch (e) {
181
170
  logger.error(`[lmd-create-parcel]: ${e}`)
182
171
  }
183
172
  }
184
173
 
185
- export async function processAwbAndTrackingNo(orderPackages, tx) {
174
+ export async function processAwbAndTrackingNo(orderPackages, tx, domain, user, marketplaceOrder) {
175
+ const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
186
176
  let releaseOrders: ReleaseGood = []
187
177
 
188
178
  for (let orderPackage of orderPackages) {
189
179
  // await getConnection().transaction(async tx => {
190
180
  try {
181
+ let releaseGood = orderPackage.releaseGood
191
182
  let awbRes = await LastMileAPI.getAwb(
192
183
  { ...orderPackage.releaseGood.lastMileDelivery, platform: 'lmdMiddleware' },
193
184
  { parcelId: orderPackage.parcelId, staging: orderPackage.releaseGood.lastMileDelivery?.staging }
@@ -199,7 +190,7 @@ export async function processAwbAndTrackingNo(orderPackages, tx) {
199
190
  const { deliveryConfirmationNo, tracking_no } = awbRes
200
191
 
201
192
  if (awbRes.content) {
202
- if (orderPackage.releaseGood.lastMileDelivery.platform == 'VIETTEL_POST') {
193
+ if (releaseGood.lastMileDelivery.platform == 'VIETTEL_POST') {
203
194
  try {
204
195
  var puppeteer = require('puppeteer')
205
196
  const browser = await puppeteer.launch({ headless: true })
@@ -216,8 +207,8 @@ export async function processAwbAndTrackingNo(orderPackages, tx) {
216
207
  console.log(e)
217
208
  }
218
209
  } else if (
219
- orderPackage.releaseGood.lastMileDelivery.platform == 'POSLAJU' ||
220
- orderPackage.releaseGood.lastMileDelivery.platform == 'SAPX'
210
+ releaseGood.lastMileDelivery.platform == 'POSLAJU' ||
211
+ releaseGood.lastMileDelivery.platform == 'SAPX'
221
212
  ) {
222
213
  try {
223
214
  const response: any = await fetch(awbRes.content, {
@@ -240,12 +231,12 @@ export async function processAwbAndTrackingNo(orderPackages, tx) {
240
231
  { name: orderPackage.name },
241
232
  { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no }
242
233
  )
243
- releaseOrders.push(orderPackage.releaseGood)
234
+ releaseOrders.push(releaseGood)
244
235
 
245
236
  const integration: Integration = await tx.getRepository(Integration).findOne({
246
237
  where: {
247
- domain: orderPackage.releaseGood.domain,
248
- bizplace: orderPackage.releaseGood.bizplace,
238
+ domain: releaseGood.domain,
239
+ bizplace: releaseGood.bizplace,
249
240
  active: true,
250
241
  platform: Platform.OTHERS
251
242
  }
@@ -254,6 +245,37 @@ export async function processAwbAndTrackingNo(orderPackages, tx) {
254
245
  if (integration) {
255
246
  await processCallback({ orderPackage, tracking_no })
256
247
  }
248
+
249
+ // update tracking no to mms then to Magento
250
+
251
+ const companyDomain: Domain = releaseGood.bizplace.company.domain
252
+ if (!marketplaceOrder) {
253
+ marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
254
+ where: { orderNo: releaseGood.refNo, domain: companyDomain },
255
+ relations: [
256
+ 'marketplaceStore',
257
+ 'marketplaceStore.marketplaceDistributors',
258
+ 'marketplaceOrderItems',
259
+ 'marketplaceOrderItems.marketplaceOrderShippingItems',
260
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
261
+ ]
262
+ })
263
+ }
264
+
265
+ if (marketplaceOrder) {
266
+ const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
267
+ const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
268
+
269
+ if (marketplaceStore?.isAutoUpdateShipment) {
270
+ await ecommerceCtrl.createOrderShip(
271
+ releaseGood,
272
+ marketplaceStore,
273
+ marketplaceOrder,
274
+ companyDomain,
275
+ tracking_no
276
+ )
277
+ }
278
+ }
257
279
  }
258
280
  } catch (e) {
259
281
  logger.error(e)