@things-factory/operato-mms 4.1.4 → 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.
@@ -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
 
@@ -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',
@@ -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.4",
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.2",
63
- "@things-factory/attachment-base": "^4.1.2",
64
- "@things-factory/auth-ui": "^4.1.2",
65
- "@things-factory/biz-base": "^4.1.2",
66
- "@things-factory/board-service": "^4.1.2",
67
- "@things-factory/board-ui": "^4.1.2",
68
- "@things-factory/code-ui": "^4.1.3",
69
- "@things-factory/context-ui": "^4.1.2",
70
- "@things-factory/dashboard": "^4.1.2",
71
- "@things-factory/export-ui": "^4.1.2",
72
- "@things-factory/export-ui-csv": "^4.1.2",
73
- "@things-factory/export-ui-excel": "^4.1.2",
74
- "@things-factory/geography": "^4.1.2",
75
- "@things-factory/grist-ui": "^4.1.2",
76
- "@things-factory/help": "^4.1.2",
77
- "@things-factory/i18n-base": "^4.1.2",
78
- "@things-factory/integration-fulfillment": "^4.1.3",
79
- "@things-factory/integration-lmd": "^4.1.3",
80
- "@things-factory/lite-menu": "^4.1.2",
81
- "@things-factory/marketplace-base": "^4.1.4",
82
- "@things-factory/more-ui": "^4.1.2",
83
- "@things-factory/notification": "^4.1.2",
84
- "@things-factory/oauth2-client": "^4.1.2",
85
- "@things-factory/pdf": "^4.1.2",
86
- "@things-factory/product-base": "^4.1.2",
87
- "@things-factory/resource-ui": "^4.1.3",
88
- "@things-factory/scene-data-transform": "^4.1.2",
89
- "@things-factory/scene-excel": "^4.1.2",
90
- "@things-factory/scene-firebase": "^4.1.2",
91
- "@things-factory/scene-form": "^4.1.2",
92
- "@things-factory/scene-google-map": "^4.1.2",
93
- "@things-factory/scene-graphql": "^4.1.2",
94
- "@things-factory/scene-label": "^4.1.2",
95
- "@things-factory/scene-marker": "^4.1.2",
96
- "@things-factory/scene-mqtt": "^4.1.2",
97
- "@things-factory/scene-news-ticker": "^4.1.2",
98
- "@things-factory/scene-restful": "^4.1.2",
99
- "@things-factory/scene-visualizer": "^4.1.2",
100
- "@things-factory/setting-ui": "^4.1.3",
101
- "@things-factory/system-ui": "^4.1.2",
102
- "@things-factory/warehouse-base": "^4.1.4"
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.2",
105
+ "@things-factory/builder": "^4.1.6",
106
106
  "@types/node-fetch": "^2.5.7"
107
107
  },
108
- "gitHead": "fe43ed4363f25856ee6b7028a726f228b1aec945"
108
+ "gitHead": "3b0bbe1cd54f9585579fb85c64cce3338b45fa30"
109
109
  }
@@ -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 = {
@@ -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",
@@ -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",
@@ -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",
@@ -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",