@things-factory/operato-mms 4.1.23 → 4.1.29

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 (7) hide show
  1. package/dist-server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.js +26 -12
  2. package/dist-server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.js.map +1 -1
  3. package/dist-server/routers/etrax-router.js +8 -9
  4. package/dist-server/routers/etrax-router.js.map +1 -1
  5. package/package.json +43 -43
  6. package/server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.ts +25 -11
  7. package/server/routers/etrax-router.ts +10 -11
package/dist-server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.js CHANGED
@@ -70,7 +70,7 @@ exports.autoUpdateAllMarketplaceProductVariationQuantityResolver = {
70
70
  });
71
71
  for (let j = 0; j < inventoryProducts.length; j++) {
72
72
  await (0, typeorm_1.getConnection)().transaction(async (tx) => {
73
- var _a;
73
+ var _a, _b;
74
74
  const inventoryProduct = inventoryProducts[j];
75
75
  const marketplaceProductVariations = await tx
76
76
  .getRepository(marketplace_base_1.MarketplaceProductVariation)
@@ -101,17 +101,31 @@ exports.autoUpdateAllMarketplaceProductVariationQuantityResolver = {
101
101
  if (marketplaceStore.marketplaceDistributors) {
102
102
  validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(distributor => distributor.status === 'ACTIVE');
103
103
  }
104
- await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
105
- {
106
- itemId: storeProductVariation.marketplaceProduct.itemId,
107
- variationId: storeProductVariation.variationId,
108
- variationSku: storeProductVariation.variationSku,
109
- qty: adjustQty,
110
- locationId: productVariationLocationId,
111
- inventoryItemId: storeProductVariation.inventoryItemId,
112
- distributors: validMarketplaceDistributors
113
- }
114
- ]);
104
+ const hasVariation = (_b = storeProductVariation === null || storeProductVariation === void 0 ? void 0 : storeProductVariation.marketplaceProduct) === null || _b === void 0 ? void 0 : _b.hasVariation;
105
+ if (hasVariation) {
106
+ await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
107
+ {
108
+ itemId: storeProductVariation.marketplaceProduct.itemId,
109
+ variationId: storeProductVariation.variationId,
110
+ variationSku: storeProductVariation.variationSku,
111
+ qty: adjustQty,
112
+ locationId: productVariationLocationId,
113
+ inventoryItemId: storeProductVariation.inventoryItemId,
114
+ distributors: validMarketplaceDistributors
115
+ }
116
+ ]);
117
+ }
118
+ else {
119
+ await integration_marketplace_1.StoreAPI.updateStoreProductStock(marketplaceStore, [
120
+ {
121
+ itemId: storeProductVariation.marketplaceProduct.itemId,
122
+ variationId: storeProductVariation.variationId,
123
+ variationSku: storeProductVariation.variationSku,
124
+ qty: adjustQty,
125
+ distributors: validMarketplaceDistributors
126
+ }
127
+ ]);
128
+ }
115
129
  storeProductVariation.qty = remainQty;
116
130
  await tx.getRepository(marketplace_base_1.MarketplaceProductVariation).save(storeProductVariation);
117
131
  }
package/dist-server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auto-update-all-marketplace-product-variation-quantity.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,qFAAwE;AACxE,qFAAwG;AACxG,uEAA8E;AAC9E,+DAAqE;AACrE,iDAA8C;AAC9C,mEAAsH;AAEzG,QAAA,wDAAwD,GAAG;IACtE,KAAK,CAAC,gDAAgD,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,OAAY;QAC3G,MAAM,aAAa,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAElF,MAAM,iBAAiB,GAAuB,MAAM,IAAA,uBAAa,EAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;YACvF,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE;YAClD,SAAS,EAAE,CAAC,yBAAyB,CAAC;SACvC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAG,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC/E,MAAM,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAClD,MAAM,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QAEvG,IAAI,QAAQ,GAAc,MAAM,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAC,IAAI,CAAC;YAC1D,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;YAChC,SAAS,EAAE,CAAC,gBAAgB,CAAC;SAC9B,CAAC,CAAA;QAEF,IAAI,iBAAiB,GAAU,MAAM,OAAO,CAAC,GAAG,CAC9C,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YAC3B,MAAM,cAAc,GAAoB,OAAO,CAAC,cAAc,CAAA;YAC9D,MAAM,oBAAoB,GAAkB,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;YAE9G,IAAI,EAAE,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;YACjE,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC;iBACxC,QAAQ,CAAC,+BAA+B,CAAC;iBACzC,QAAQ,CAAC,iCAAiC,CAAC;iBAC3C,QAAQ,CAAC,2BAA2B,CAAC;iBACrC,QAAQ,CAAC,yCAAyC,CAAC;iBACnD,aAAa,CAAC;gBACb,QAAQ,EAAE,eAAe,CAAC,EAAE;gBAC5B,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,MAAM,EAAE,iCAAgB,CAAC,UAAU;gBACnC,aAAa,EAAE,CAAC,8BAAa,CAAC,UAAU,EAAE,8BAAa,CAAC,OAAO,CAAC;aACjE,CAAC,CAAA;YAEJ,IAAI,WAAW,GAAgB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;YAEjD,MAAM,YAAY,GAAW,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;gBACtE,KAAK,IAAI,YAAY,CAAC,GAAG,CAAA;gBACzB,OAAO,KAAK,CAAA;YACd,CAAC,EAAE,CAAC,CAAC,CAAA;YAEL,MAAM,kBAAkB,GAAW,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;gBAC5E,KAAK,IAAI,YAAY,CAAC,SAAS,CAAA;gBAC/B,OAAO,KAAK,CAAA;YACd,CAAC,EAAE,CAAC,CAAC,CAAA;YAEL,OAAO;gBACL,OAAO;gBACP,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,WAAW,EAAE,oBAAoB,CAAC,WAAW;gBAC7C,WAAW,EAAE,oBAAoB,CAAC,WAAW;gBAC7C,GAAG,EAAE,oBAAoB,CAAC,GAAG;gBAC7B,GAAG,EAAE,YAAY,GAAG,kBAAkB;aACvC,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,IAAI,wBAAwB,GAAU,MAAM,IAAA,0CAAyB,EACnE,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,EAAE,CACH,CAAA;YAED,wBAAwB,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;gBACpD,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;YAChD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI;gBACF,MAAM,gBAAgB,GAAqB,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAE/D,MAAM,kBAAkB,GAAuB,MAAM,IAAA,uBAAa,EAAC,4CAAkB,CAAC,CAAC,OAAO,CAAC;oBAC7F,KAAK,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB,EAAE;iBAC1D,CAAC,CAAA;gBAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjD,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;;wBAC3C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;wBAC7C,MAAM,4BAA4B,GAAkC,MAAM,EAAE;6BACzE,aAAa,CAAC,8CAA2B,CAAC;6BAC1C,IAAI,CAAC;4BACJ,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,GAAG,EAAE;4BAC3D,SAAS,EAAE,CAAC,oBAAoB,EAAE,qCAAqC,CAAC;yBACzE,CAAC,CAAA;wBAEJ,IAAI,sBAAsB,GAAkC,4BAA4B,CAAC,MAAM,CAC7F,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,KAAK,gBAAgB,CAAC,EAAE,CACpG,CAAA;wBAED,IAAI,eAAe,GAAW,GAAG,CAAA;wBACjC,IAAI,sBAAsB,EAAE;4BAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,sBAAsB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gCACtD,IAAI,qBAAqB,GAAgC,sBAAsB,CAAC,CAAC,CAAC,CAAA;gCAClF,IAAI,kBAAkB,EAAE;oCACtB,eAAe,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;iCACrD;gCAED,IAAI,SAAS,GAAW,IAAI,CAAC,KAAK,CAChC,CAAC,gBAAgB,CAAC,GAAG,GAAG,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,CACpF,CAAA;gCACD,IAAI,SAAS,GAAG,CAAC;oCAAE,SAAS,GAAG,CAAC,CAAA;gCAEhC,IAAI,0BAA0B,GAAG,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,UAAU,CAAA;gCAClE,IAAI,SAAS,GAAW,SAAS,CAAA;gCAEjC,IAAI,gBAAgB,CAAC,QAAQ,KAAK,SAAS,EAAE;oCAC3C,IAAI,WAAW,GAAU,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;oCAC/D,SAAS,GAAG,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAA;oCACjD,IAAI,MAAA,WAAW,CAAC,CAAC,CAAC,0CAAE,WAAW;wCAAE,0BAA0B,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;iCACzF;gCAED,IAAI,4BAA4B,GAAU,EAAE,CAAA;gCAC5C,IAAI,gBAAgB,CAAC,uBAAuB,EAAE;oCAC5C,4BAA4B,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,MAAM,CAC5E,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,QAAQ,CAC/C,CAAA;iCACF;gCAED,MAAM,kCAAQ,CAAC,gCAAgC,CAAC,gBAAgB,EAAE;oCAChE;wCACE,MAAM,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,MAAM;wCACvD,WAAW,EAAE,qBAAqB,CAAC,WAAW;wCAC9C,YAAY,EAAE,qBAAqB,CAAC,YAAY;wCAChD,GAAG,EAAE,SAAS;wCACd,UAAU,EAAE,0BAA0B;wCACtC,eAAe,EAAE,qBAAqB,CAAC,eAAe;wCACtD,YAAY,EAAE,4BAA4B;qCAC3C;iCACF,CAAC,CAAA;gCAEF,qBAAqB,CAAC,GAAG,GAAG,SAAS,CAAA;gCACrC,MAAM,EAAE,CAAC,aAAa,CAAC,8CAA2B,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;6BAChF;yBACF;oBACH,CAAC,CAAC,CAAA;iBACH;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;aACf;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"auto-update-all-marketplace-product-variation-quantity.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.ts"],"names":[],"mappings":"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"}
package/dist-server/routers/etrax-router.js CHANGED
@@ -71,21 +71,21 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
71
71
  ]
72
72
  });
73
73
  let orderItems = order.marketplaceOrderItems;
74
+ const marketplaceStore = order.marketplaceStore;
75
+ const marketplaceTransporter = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceTransporter).findOne({
76
+ where: { marketplaceStore },
77
+ relations: ['pickupTransporter']
78
+ });
74
79
  for (const orderItem of orderItems) {
75
80
  if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
76
81
  const orderShippingItems = orderItem.marketplaceOrderShippingItems;
77
82
  const orderShipping = orderShippingItems[0].marketplaceOrderShipping;
78
83
  const fulfillmentCenter = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.fulfillmentCenter;
79
- const marketplaceStore = order.marketplaceStore;
80
84
  const currentDate = new Date();
81
85
  const centerId = fulfillmentCenter.centerId;
82
86
  const warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
83
87
  const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
84
88
  const customerBizplaceId = customerBizplaces.find(customerBizplace => customerBizplace.company.domain.id == (order === null || order === void 0 ? void 0 : order.domain.id)).id;
85
- const marketplaceTransporter = await (0, typeorm_1.getRepository)(integration_marketplace_1.MarketplaceTransporter).findOne({
86
- where: { marketplaceStore },
87
- relations: ['pickupTransporter']
88
- });
89
89
  let patch = {
90
90
  id: orderShipping.releaseOrderId,
91
91
  trackingNo: trackingNo,
@@ -96,11 +96,9 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
96
96
  releaseOrder: Object.assign({}, patch),
97
97
  shippingOrder: null
98
98
  });
99
- await orderShippingRepo.update({ id: orderShipping.id }, { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate });
99
+ await orderShippingRepo.update({ id: orderShipping.id }, { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate, transporter: (marketplaceTransporter === null || marketplaceTransporter === void 0 ? void 0 : marketplaceTransporter.pickupTransporter.name) || orderShipping.transporter });
100
100
  }
101
101
  }
102
- const storeId = order.marketplaceStore.id;
103
- const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
104
102
  // to-do update tracking no to every marketplaces
105
103
  if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
106
104
  const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
@@ -115,7 +113,8 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
115
113
  trackingUrl: note,
116
114
  trackingNo,
117
115
  order: orderInfo,
118
- note
116
+ note,
117
+ transporter: marketplaceTransporter === null || marketplaceTransporter === void 0 ? void 0 : marketplaceTransporter.pickupTransporter.name
119
118
  });
120
119
  if (marketplaceStore.platform === 'woocommerce') {
121
120
  await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
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.23",
3
+ "version": "4.1.29",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -60,50 +60,50 @@
60
60
  "@operato/scene-table": "^0.1.5",
61
61
  "@operato/scene-timer": "^0.1.5",
62
62
  "@operato/scene-wheel-sorter": "^0.1.5",
63
- "@things-factory/apptool-ui": "^4.1.22",
64
- "@things-factory/attachment-base": "^4.1.22",
65
- "@things-factory/auth-ui": "^4.1.22",
66
- "@things-factory/biz-base": "^4.1.22",
67
- "@things-factory/board-service": "^4.1.22",
68
- "@things-factory/board-ui": "^4.1.22",
69
- "@things-factory/code-ui": "^4.1.22",
70
- "@things-factory/context-ui": "^4.1.22",
71
- "@things-factory/dashboard": "^4.1.22",
72
- "@things-factory/export-ui": "^4.1.22",
73
- "@things-factory/export-ui-csv": "^4.1.22",
74
- "@things-factory/export-ui-excel": "^4.1.22",
75
- "@things-factory/geography": "^4.1.22",
76
- "@things-factory/grist-ui": "^4.1.22",
77
- "@things-factory/help": "^4.1.22",
78
- "@things-factory/i18n-base": "^4.1.22",
79
- "@things-factory/integration-fulfillment": "^4.1.22",
80
- "@things-factory/integration-lmd": "^4.1.22",
81
- "@things-factory/lite-menu": "^4.1.22",
82
- "@things-factory/marketplace-base": "^4.1.22",
83
- "@things-factory/more-ui": "^4.1.22",
84
- "@things-factory/notification": "^4.1.22",
85
- "@things-factory/oauth2-client": "^4.1.22",
86
- "@things-factory/pdf": "^4.1.19",
87
- "@things-factory/product-base": "^4.1.22",
88
- "@things-factory/resource-ui": "^4.1.22",
89
- "@things-factory/scene-data-transform": "^4.1.19",
90
- "@things-factory/scene-excel": "^4.1.19",
91
- "@things-factory/scene-firebase": "^4.1.19",
92
- "@things-factory/scene-form": "^4.1.19",
93
- "@things-factory/scene-google-map": "^4.1.19",
94
- "@things-factory/scene-graphql": "^4.1.19",
95
- "@things-factory/scene-label": "^4.1.22",
96
- "@things-factory/scene-marker": "^4.1.19",
97
- "@things-factory/scene-mqtt": "^4.1.19",
98
- "@things-factory/scene-restful": "^4.1.19",
99
- "@things-factory/scene-visualizer": "^4.1.19",
100
- "@things-factory/setting-ui": "^4.1.22",
101
- "@things-factory/system-ui": "^4.1.22",
102
- "@things-factory/warehouse-base": "^4.1.22"
63
+ "@things-factory/apptool-ui": "^4.1.28",
64
+ "@things-factory/attachment-base": "^4.1.28",
65
+ "@things-factory/auth-ui": "^4.1.28",
66
+ "@things-factory/biz-base": "^4.1.28",
67
+ "@things-factory/board-service": "^4.1.28",
68
+ "@things-factory/board-ui": "^4.1.28",
69
+ "@things-factory/code-ui": "^4.1.28",
70
+ "@things-factory/context-ui": "^4.1.28",
71
+ "@things-factory/dashboard": "^4.1.28",
72
+ "@things-factory/export-ui": "^4.1.28",
73
+ "@things-factory/export-ui-csv": "^4.1.28",
74
+ "@things-factory/export-ui-excel": "^4.1.28",
75
+ "@things-factory/geography": "^4.1.28",
76
+ "@things-factory/grist-ui": "^4.1.28",
77
+ "@things-factory/help": "^4.1.28",
78
+ "@things-factory/i18n-base": "^4.1.28",
79
+ "@things-factory/integration-fulfillment": "^4.1.28",
80
+ "@things-factory/integration-lmd": "^4.1.28",
81
+ "@things-factory/lite-menu": "^4.1.28",
82
+ "@things-factory/marketplace-base": "^4.1.29",
83
+ "@things-factory/more-ui": "^4.1.28",
84
+ "@things-factory/notification": "^4.1.28",
85
+ "@things-factory/oauth2-client": "^4.1.28",
86
+ "@things-factory/pdf": "^4.1.28",
87
+ "@things-factory/product-base": "^4.1.28",
88
+ "@things-factory/resource-ui": "^4.1.28",
89
+ "@things-factory/scene-data-transform": "^4.1.28",
90
+ "@things-factory/scene-excel": "^4.1.28",
91
+ "@things-factory/scene-firebase": "^4.1.28",
92
+ "@things-factory/scene-form": "^4.1.28",
93
+ "@things-factory/scene-google-map": "^4.1.28",
94
+ "@things-factory/scene-graphql": "^4.1.28",
95
+ "@things-factory/scene-label": "^4.1.28",
96
+ "@things-factory/scene-marker": "^4.1.28",
97
+ "@things-factory/scene-mqtt": "^4.1.28",
98
+ "@things-factory/scene-restful": "^4.1.28",
99
+ "@things-factory/scene-visualizer": "^4.1.28",
100
+ "@things-factory/setting-ui": "^4.1.28",
101
+ "@things-factory/system-ui": "^4.1.28",
102
+ "@things-factory/warehouse-base": "^4.1.29"
103
103
  },
104
104
  "devDependencies": {
105
- "@things-factory/builder": "^4.1.19",
105
+ "@things-factory/builder": "^4.1.28",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "f13228576595836d2a4c2e5412adf412c0f82f33"
108
+ "gitHead": "8ad57f2550985b4746e3bbb82e4c8516e6be5ca1"
109
109
  }
package/server/graphql/resolvers/interface-with-hub/auto-update-all-marketplace-product-variation-quantity.ts CHANGED
@@ -131,17 +131,31 @@ export const autoUpdateAllMarketplaceProductVariationQuantityResolver = {
131
131
  )
132
132
  }
133
133
 
134
- await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
135
- {
136
- itemId: storeProductVariation.marketplaceProduct.itemId,
137
- variationId: storeProductVariation.variationId,
138
- variationSku: storeProductVariation.variationSku,
139
- qty: adjustQty,
140
- locationId: productVariationLocationId,
141
- inventoryItemId: storeProductVariation.inventoryItemId,
142
- distributors: validMarketplaceDistributors
143
- }
144
- ])
134
+ const hasVariation: boolean = storeProductVariation?.marketplaceProduct?.hasVariation
135
+
136
+ if (hasVariation) {
137
+ await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
138
+ {
139
+ itemId: storeProductVariation.marketplaceProduct.itemId,
140
+ variationId: storeProductVariation.variationId,
141
+ variationSku: storeProductVariation.variationSku,
142
+ qty: adjustQty,
143
+ locationId: productVariationLocationId,
144
+ inventoryItemId: storeProductVariation.inventoryItemId,
145
+ distributors: validMarketplaceDistributors
146
+ }
147
+ ])
148
+ } else {
149
+ await StoreAPI.updateStoreProductStock(marketplaceStore, [
150
+ {
151
+ itemId: storeProductVariation.marketplaceProduct.itemId,
152
+ variationId: storeProductVariation.variationId,
153
+ variationSku: storeProductVariation.variationSku,
154
+ qty: adjustQty,
155
+ distributors: validMarketplaceDistributors
156
+ }
157
+ ])
158
+ }
145
159
 
146
160
  storeProductVariation.qty = remainQty
147
161
  await tx.getRepository(MarketplaceProductVariation).save(storeProductVariation)
package/server/routers/etrax-router.ts CHANGED
@@ -82,12 +82,18 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
82
82
  })
83
83
  let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
84
84
 
85
+ const marketplaceStore: MarketplaceStore = order.marketplaceStore
86
+
87
+ const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
88
+ where: { marketplaceStore },
89
+ relations: ['pickupTransporter']
90
+ })
91
+
85
92
  for (const orderItem of orderItems) {
86
93
  if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
87
94
  const orderShippingItems: MarketplaceOrderShippingItem[] = orderItem.marketplaceOrderShippingItems
88
95
  const orderShipping: MarketplaceOrderShipping = orderShippingItems[0].marketplaceOrderShipping
89
96
  const fulfillmentCenter: FulfillmentCenter = orderShipping?.fulfillmentCenter
90
- const marketplaceStore: MarketplaceStore = order.marketplaceStore
91
97
 
92
98
  const currentDate: Date = new Date()
93
99
 
@@ -98,11 +104,6 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
98
104
  customerBizplace => customerBizplace.company.domain.id == order?.domain.id
99
105
  ).id
100
106
 
101
- const marketplaceTransporter: MarketplaceTransporter = await getRepository(MarketplaceTransporter).findOne({
102
- where: { marketplaceStore },
103
- relations: ['pickupTransporter']
104
- })
105
-
106
107
  let patch = {
107
108
  id: orderShipping.releaseOrderId,
108
109
  trackingNo: trackingNo,
@@ -117,14 +118,11 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
117
118
 
118
119
  await orderShippingRepo.update(
119
120
  { id: orderShipping.id },
120
- { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate }
121
+ { trackingNo: trackingNo, airwayBill: awbUrl, updatedAt: currentDate, transporter: marketplaceTransporter?.pickupTransporter.name || orderShipping.transporter }
121
122
  )
122
123
  }
123
124
  }
124
125
 
125
- const storeId = order.marketplaceStore.id
126
- const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
127
-
128
126
  // to-do update tracking no to every marketplaces
129
127
  if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
130
128
  const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
@@ -139,7 +137,8 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
139
137
  trackingUrl: note,
140
138
  trackingNo,
141
139
  order: orderInfo,
142
- note
140
+ note,
141
+ transporter: marketplaceTransporter?.pickupTransporter.name
143
142
  })
144
143
 
145
144
  if (marketplaceStore.platform === 'woocommerce') {