@things-factory/operato-mms 5.0.0-alpha.38 → 5.0.0-alpha.40

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 (5) hide show
  1. package/config.development.js +88 -0
  2. package/dist-server/routers/etrax-router.js +19 -2
  3. package/dist-server/routers/etrax-router.js.map +1 -1
  4. package/package.json +60 -60
  5. package/server/routers/etrax-router.ts +30 -2
package/config.development.js ADDED
@@ -0,0 +1,88 @@
1
+ module.exports = {
2
+ domainType: 'company',
3
+ ormconfig: {
4
+ name: 'default',
5
+ type: 'sqlite',
6
+ database: 'db.sqlite',
7
+ synchronize: false,
8
+ logging: true,
9
+ logger: 'debug'
10
+ // name: 'default',
11
+ // type: 'postgres',
12
+ // database: 'postgres',
13
+ // username: 'postgres',
14
+ // password: 'abcd1234',
15
+ // host: 'localhost',
16
+ // port: 15432,
17
+ // synchronize: true,
18
+ // logging: true
19
+ },
20
+ oauth2: {
21
+ platforms: [
22
+ {
23
+ name: 'Operato Hub',
24
+ apiURL: 'http://operato-m.localhost:3000/api'
25
+ }
26
+ ]
27
+ },
28
+ useVirtualHostBasedDomain: false,
29
+ port: 5000,
30
+ uploads: 'uploads',
31
+ attachmentsPath: 'attachments',
32
+ SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
33
+ logger: {
34
+ file: {
35
+ filename: 'logs/application-%DATE%.log',
36
+ datePattern: 'YYYY-MM-DD-HH',
37
+ zippedArchive: true,
38
+ maxSize: '200m',
39
+ maxFiles: '1m',
40
+ level: 'info'
41
+ }
42
+ },
43
+ fulfillmentIntegrationOperato: {
44
+ host: 'operatohub.com',
45
+ platform: 'operato',
46
+ application: 'Operato MMS',
47
+ appKey: '480d19cbfb0655357878119559d47333',
48
+ appSecret: 'dc5078bc17d50a18ef6fc3188934bbbd',
49
+ callback: 'https://www.myoperato.com/callback-operato'
50
+ },
51
+ marketplaceIntegrationShopee: {
52
+ platform: 'shopee',
53
+ isUAT: false,
54
+ application: 'Operato MMS',
55
+ partnerId: 846025,
56
+ partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64'
57
+ },
58
+ marketplaceIntegrationLazada: {
59
+ platform: 'lazada',
60
+ application: 'operato-mms',
61
+ appKey: '120961',
62
+ appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
63
+ callback: 'https://myoperato.com/lazada-callback'
64
+ },
65
+ notification: {
66
+ fcm: {
67
+ serviceAccount: {
68
+ project_id: 'operato',
69
+ private_key:
70
+ '-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDYNOfyNjPMSeG9\nzU1qs0cpVK5cVfadcUaw5g+hkQZMOMlAA7uqW2eX4vkayj7MzbYUayH+sei8044Q\nJIyl6f26dNX1VT3UgTmSmCS0v48EBEZHCgusrUGFjduLRN6OS6uvrXW1xKA18k9q\nai1C2EHCXF2AE4PTvf239RC1UIOnVePcMtT7rMTdHRO4s8OKVuSDbzIt8k1cV3Zt\nES0YsJlkELqBisYpV//2/ZSILTt39J9JzrVef03X9kkoo9p+YnNyy6tWsfQPfgJO\nybiRGBNxiyJ/E2pxRo/WqU0go9OzYJlGaSUrUx09heNiRD1b0MAOmyPDJz/6AaTk\nkU/A+kLzAgMBAAECggEADQ5s2gtR53VSujk1V/Xe8e0Di99DwaWUj5w6YhcK7/wX\nPdQRN4Fw6RLeLjL7xeG/rCNSwzm6hKSrQJL5zLnWW7XbMdyQRk6jdmnVAEv3zACi\nFH9+eFK3e+Q214XfgWz/v4p/FZdRLCYni5VBNHcwyWxLLS/V1ynzB3KM1sDiTRmI\npcT7+uTtwrKgJq64sXtFE2pYrFxDdCiyqzkhv/2ed4YIowAjpKBbbcCDKeVxVkoz\nC1P4PAzs9EeUuKSWYrWaUjN17lqtRlYeT1ylR1PIJuWqd4cKfgoEgz+lHwRPDCEX\nAYbk3nofiJIPBhSfCHrXS755wK48mY8vMwFdfCPJeQKBgQDsz4tjYTHdat5A25n5\nekwMxZwFQ5OvMV4eulwZUDMypTAYSz1iB6sDlgwKDm5omZIfuneqCEIvrqxV/kx3\n5wV/DANHO3hYxdp/NV7rM23xmqlaKZhHQbDono1Fm/LP6DEmJiD7N2eFKsXYcPpR\nSAIdCv0X3zkDQ4zRi51yJlCXzQKBgQDpufJBxCoXngiQJ2j14lWVAeOOdQ6zh5Ip\nBcDwF0X67cNSN3Wl40bS4yLFdolhEAyj5m0WPuYYXpjzhHhZ0W3V3ItdBkrmwIvy\nWOWu26qN0ZbwxVS2qVpHuj6iHWJKHuDZZUkFtJg3BeeBSOUHSA8TvjnA0xd83xeb\n8ZJasWoFvwKBgQDFs/gQ/gIdcq0exLfluh5nw0qgcmyHpNWJHdjqITS9IX/nqFkU\n0IYLtmdStf2jQiLmbkydHcvz9wZVvLqml67VBHhwLcwpgPULoskd34/4V0Dvzy4c\nv1Esw8H5zVqIDLeLu+VpFjZMzQrjyl6RIWbyTExEc84rVWfpQYAu3qIGOQKBgAFr\nXatEk7TdAtRNSPflTfu/rTAaSeKROjQBkvBiU8x4US1YpOBDBxUUyAtG8wKh5FHC\nfnsaGq+fM3KXJVv2R6J62mXQOfg4xyDLpWlwcBK4aSBBMoiBcsjouqSlZQlqMpdf\nZBgixqHe6U8BsFJg/6ZxC0y+e3AIss4Bo4/lb+1lAoGAFOexvaBh21K6W3inmRW4\nLlkVYJaBJ20OwokXg5aXjBiHxqmk7VLAuFbkpb5LOKH2xPILRQ0OEkn51yVymS3T\n9lLpHOFTQXt5tF2/F7NW7kaQJNlLr/h5jPi3O9XHeFmuaN2z150ZB6zzgjeGKzr8\ni+1fgTsRfDtNw8xkSH9qL1Y=\n-----END PRIVATE KEY-----\n',
71
+ client_email: 'firebase-adminsdk-xmm2e@operato.iam.gserviceaccount.com'
72
+ },
73
+ appConfig: {
74
+ apiKey: 'AIzaSyDdTM2BTLHSt2LNS0G5QB8G0i4KBXFiG7U',
75
+ projectId: 'operato',
76
+ messagingSenderId: 79537064975,
77
+ appId: '1:79537064975:web:32f53119e9c8c6ee2a277a'
78
+ },
79
+ serverKey:
80
+ 'AAAAEoTHTA8:APA91bGwt-4HT82Dfwf_VwbQaKT0_qHd0Y3tuW41udjWz5Lz0Ko0mEMD6WbHHSILvQpa6yuoGGKCMsrU7VW2qWRrUm3CYpyG9oSwshNm1tIhljAnOuUfwHCoawbVLwf9qlWpHt4dwCoc'
81
+ },
82
+ vapidKey: {
83
+ subject: 'mailto:heartyoh@hatiolab.com',
84
+ publicKey: 'BAkVkITsCXBIsYL1yeaBmx5_dn57we-ZXMjirPPHzC2dan82cdEnAio_53PQ-1_w3ykWCBPrrFAWQ_d9N4cFF0o',
85
+ privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
86
+ }
87
+ }
88
+ }
package/dist-server/routers/etrax-router.js CHANGED
@@ -67,7 +67,8 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
67
67
  'marketplaceOrderItems',
68
68
  'marketplaceOrderItems.marketplaceOrderShippingItems',
69
69
  'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
70
- 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter'
70
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter',
71
+ 'marketplaceOrderItems.marketplaceProductVariation',
71
72
  ]
72
73
  });
73
74
  let orderItems = order.marketplaceOrderItems;
@@ -119,10 +120,26 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
119
120
  if (marketplaceStore.platform === 'woocommerce') {
120
121
  await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
121
122
  orderId: order.name,
122
- status: 'READY_TO_SHIP'
123
+ status: 'DELIVERED'
123
124
  });
124
125
  }
125
126
  }
127
+ try {
128
+ const updatedOrder = await integration_marketplace_1.StoreAPI.getStoreOrder(marketplaceStore, { orderId: order.name });
129
+ order.status = updatedOrder.status;
130
+ order.orderUpdatedAt = updatedOrder.orderUpdatedAt;
131
+ order.trackingNo = updatedOrder.trackingNo;
132
+ order.shippingProvider = updatedOrder.shippingProvider;
133
+ await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(order);
134
+ for (let idx = 0; idx < order.marketplaceOrderItems.length; idx++) {
135
+ let matchItem = updatedOrder.orderItems.find(i => i.variationId == order.marketplaceOrderItems[idx].marketplaceProductVariation.variationId);
136
+ if (matchItem) {
137
+ let targetMarketplaceOrderItem = Object.assign(Object.assign({}, order.marketplaceOrderItems[idx]), { shippingProvider: matchItem.shippingProvider, trackingCode: matchItem.trackingNo, status: matchItem.status });
138
+ await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderItem).save(targetMarketplaceOrderItem);
139
+ }
140
+ }
141
+ }
142
+ catch (e) { }
126
143
  const resp = {
127
144
  Status: 'SUCCESS',
128
145
  Code: 200,
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": "5.0.0-alpha.38",
3
+ "version": "5.0.0-alpha.40",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -41,67 +41,67 @@
41
41
  "@material/mwc-formfield": "^0.25.3",
42
42
  "@material/mwc-linear-progress": "^0.25.3",
43
43
  "@material/mwc-radio": "^0.25.3",
44
- "@operato/ghost-print": "1.0.0-beta.5",
45
- "@operato/scene-chartjs": "^1.0.0-alpha.12",
46
- "@operato/scene-clock": "^1.0.0-alpha.12",
47
- "@operato/scene-clone": "^1.0.0-alpha.12",
48
- "@operato/scene-compass": "^1.0.0-alpha.12",
49
- "@operato/scene-excel": "^1.0.0-alpha.12",
50
- "@operato/scene-form": "^1.0.0-alpha.12",
51
- "@operato/scene-gauge": "^1.0.0-alpha.12",
52
- "@operato/scene-graphql": "^1.0.0-alpha.12",
53
- "@operato/scene-grist": "^1.0.0-alpha.12",
54
- "@operato/scene-half-roundrect": "^1.0.0-alpha.12",
55
- "@operato/scene-indoor-map": "^1.0.0-alpha.12",
56
- "@operato/scene-integration": "^1.0.0-alpha.12",
57
- "@operato/scene-label": "^1.0.0-alpha.12",
58
- "@operato/scene-legend": "^1.0.0-alpha.12",
59
- "@operato/scene-marker": "^1.0.0-alpha.12",
60
- "@operato/scene-news-ticker": "^1.0.0-alpha.12",
61
- "@operato/scene-progressbar": "^1.0.0-alpha.12",
62
- "@operato/scene-random": "^1.0.0-alpha.12",
63
- "@operato/scene-restful": "^1.0.0-alpha.12",
64
- "@operato/scene-switch": "^1.0.0-alpha.12",
65
- "@operato/scene-tab": "^1.0.0-alpha.12",
66
- "@operato/scene-table": "^1.0.0-alpha.12",
67
- "@operato/scene-timer": "^1.0.0-alpha.12",
68
- "@operato/scene-wheel-sorter": "^1.0.0-alpha.12",
69
- "@things-factory/apptool-ui": "^5.0.0-alpha.38",
70
- "@things-factory/attachment-base": "^5.0.0-alpha.38",
71
- "@things-factory/auth-ui": "^5.0.0-alpha.38",
72
- "@things-factory/biz-base": "^5.0.0-alpha.38",
73
- "@things-factory/board-service": "^5.0.0-alpha.38",
74
- "@things-factory/board-ui": "^5.0.0-alpha.38",
75
- "@things-factory/code-ui": "^5.0.0-alpha.38",
76
- "@things-factory/context-ui": "^5.0.0-alpha.38",
77
- "@things-factory/dashboard": "^5.0.0-alpha.38",
78
- "@things-factory/export-ui": "^5.0.0-alpha.38",
79
- "@things-factory/export-ui-csv": "^5.0.0-alpha.38",
80
- "@things-factory/export-ui-excel": "^5.0.0-alpha.38",
81
- "@things-factory/geography": "^5.0.0-alpha.38",
82
- "@things-factory/grist-ui": "^5.0.0-alpha.38",
83
- "@things-factory/help": "^5.0.0-alpha.38",
84
- "@things-factory/i18n-base": "^5.0.0-alpha.38",
85
- "@things-factory/integration-fulfillment": "^5.0.0-alpha.38",
86
- "@things-factory/integration-lmd": "^5.0.0-alpha.38",
87
- "@things-factory/lite-menu": "^5.0.0-alpha.38",
88
- "@things-factory/marketplace-base": "^5.0.0-alpha.38",
89
- "@things-factory/more-ui": "^5.0.0-alpha.38",
90
- "@things-factory/notification": "^5.0.0-alpha.38",
91
- "@things-factory/oauth2-client": "^5.0.0-alpha.38",
92
- "@things-factory/pdf": "^5.0.0-alpha.38",
93
- "@things-factory/product-base": "^5.0.0-alpha.38",
94
- "@things-factory/resource-ui": "^5.0.0-alpha.38",
95
- "@things-factory/scene-data-transform": "^5.0.0-alpha.38",
96
- "@things-factory/scene-google-map": "^5.0.0-alpha.38",
97
- "@things-factory/scene-visualizer": "^5.0.0-alpha.38",
98
- "@things-factory/setting-ui": "^5.0.0-alpha.38",
99
- "@things-factory/system-ui": "^5.0.0-alpha.38",
100
- "@things-factory/warehouse-base": "^5.0.0-alpha.38"
44
+ "@operato/ghost-print": "1.0.0-beta.7",
45
+ "@operato/scene-chartjs": "^1.0.0-alpha.13",
46
+ "@operato/scene-clock": "^1.0.0-alpha.13",
47
+ "@operato/scene-clone": "^1.0.0-alpha.13",
48
+ "@operato/scene-compass": "^1.0.0-alpha.13",
49
+ "@operato/scene-excel": "^1.0.0-alpha.13",
50
+ "@operato/scene-form": "^1.0.0-alpha.13",
51
+ "@operato/scene-gauge": "^1.0.0-alpha.13",
52
+ "@operato/scene-graphql": "^1.0.0-alpha.13",
53
+ "@operato/scene-grist": "^1.0.0-alpha.13",
54
+ "@operato/scene-half-roundrect": "^1.0.0-alpha.13",
55
+ "@operato/scene-indoor-map": "^1.0.0-alpha.13",
56
+ "@operato/scene-integration": "^1.0.0-alpha.13",
57
+ "@operato/scene-label": "^1.0.0-alpha.13",
58
+ "@operato/scene-legend": "^1.0.0-alpha.13",
59
+ "@operato/scene-marker": "^1.0.0-alpha.13",
60
+ "@operato/scene-news-ticker": "^1.0.0-alpha.13",
61
+ "@operato/scene-progressbar": "^1.0.0-alpha.13",
62
+ "@operato/scene-random": "^1.0.0-alpha.13",
63
+ "@operato/scene-restful": "^1.0.0-alpha.13",
64
+ "@operato/scene-switch": "^1.0.0-alpha.13",
65
+ "@operato/scene-tab": "^1.0.0-alpha.13",
66
+ "@operato/scene-table": "^1.0.0-alpha.13",
67
+ "@operato/scene-timer": "^1.0.0-alpha.13",
68
+ "@operato/scene-wheel-sorter": "^1.0.0-alpha.13",
69
+ "@things-factory/apptool-ui": "^5.0.0-alpha.40",
70
+ "@things-factory/attachment-base": "^5.0.0-alpha.40",
71
+ "@things-factory/auth-ui": "^5.0.0-alpha.40",
72
+ "@things-factory/biz-base": "^5.0.0-alpha.40",
73
+ "@things-factory/board-service": "^5.0.0-alpha.40",
74
+ "@things-factory/board-ui": "^5.0.0-alpha.40",
75
+ "@things-factory/code-ui": "^5.0.0-alpha.40",
76
+ "@things-factory/context-ui": "^5.0.0-alpha.40",
77
+ "@things-factory/dashboard": "^5.0.0-alpha.40",
78
+ "@things-factory/export-ui": "^5.0.0-alpha.40",
79
+ "@things-factory/export-ui-csv": "^5.0.0-alpha.40",
80
+ "@things-factory/export-ui-excel": "^5.0.0-alpha.40",
81
+ "@things-factory/geography": "^5.0.0-alpha.40",
82
+ "@things-factory/grist-ui": "^5.0.0-alpha.40",
83
+ "@things-factory/help": "^5.0.0-alpha.40",
84
+ "@things-factory/i18n-base": "^5.0.0-alpha.40",
85
+ "@things-factory/integration-fulfillment": "^5.0.0-alpha.40",
86
+ "@things-factory/integration-lmd": "^5.0.0-alpha.40",
87
+ "@things-factory/lite-menu": "^5.0.0-alpha.40",
88
+ "@things-factory/marketplace-base": "^5.0.0-alpha.40",
89
+ "@things-factory/more-ui": "^5.0.0-alpha.40",
90
+ "@things-factory/notification": "^5.0.0-alpha.40",
91
+ "@things-factory/oauth2-client": "^5.0.0-alpha.40",
92
+ "@things-factory/pdf": "^5.0.0-alpha.40",
93
+ "@things-factory/product-base": "^5.0.0-alpha.40",
94
+ "@things-factory/resource-ui": "^5.0.0-alpha.40",
95
+ "@things-factory/scene-data-transform": "^5.0.0-alpha.40",
96
+ "@things-factory/scene-google-map": "^5.0.0-alpha.40",
97
+ "@things-factory/scene-visualizer": "^5.0.0-alpha.40",
98
+ "@things-factory/setting-ui": "^5.0.0-alpha.40",
99
+ "@things-factory/system-ui": "^5.0.0-alpha.40",
100
+ "@things-factory/warehouse-base": "^5.0.0-alpha.40"
101
101
  },
102
102
  "devDependencies": {
103
- "@things-factory/builder": "^5.0.0-alpha.38",
103
+ "@things-factory/builder": "^5.0.0-alpha.40",
104
104
  "@types/node-fetch": "^2.5.7"
105
105
  },
106
- "gitHead": "b5e6badbf7bfb3e509c5d065da635da7c084ffce"
106
+ "gitHead": "c64462e85c9b744250f5649d28c0ec4bd56a1b38"
107
107
  }
package/server/routers/etrax-router.ts CHANGED
@@ -77,7 +77,8 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
77
77
  'marketplaceOrderItems',
78
78
  'marketplaceOrderItems.marketplaceOrderShippingItems',
79
79
  'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
80
- 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter'
80
+ 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter',
81
+ 'marketplaceOrderItems.marketplaceProductVariation',
81
82
  ]
82
83
  })
83
84
  let orderItems: MarketplaceOrderItem[] = order.marketplaceOrderItems
@@ -144,11 +145,38 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
144
145
  if (marketplaceStore.platform === 'woocommerce') {
145
146
  await StoreAPI.updateOrderStatus(marketplaceStore, {
146
147
  orderId: order.name,
147
- status: 'READY_TO_SHIP'
148
+ status: 'DELIVERED'
148
149
  })
149
150
  }
150
151
  }
151
152
 
153
+ try {
154
+ const updatedOrder = await StoreAPI.getStoreOrder(marketplaceStore, { orderId: order.name })
155
+
156
+ order.status = updatedOrder.status
157
+ order.orderUpdatedAt = updatedOrder.orderUpdatedAt
158
+ order.trackingNo = updatedOrder.trackingNo
159
+ order.shippingProvider = updatedOrder.shippingProvider
160
+ await getRepository(MarketplaceOrder).save(order)
161
+
162
+ for (let idx = 0; idx < order.marketplaceOrderItems.length; idx++) {
163
+ let matchItem = updatedOrder.orderItems.find(
164
+ i => i.variationId == order.marketplaceOrderItems[idx].marketplaceProductVariation.variationId
165
+ )
166
+
167
+ if (matchItem) {
168
+ let targetMarketplaceOrderItem = {
169
+ ...order.marketplaceOrderItems[idx],
170
+ shippingProvider: matchItem.shippingProvider,
171
+ trackingCode: matchItem.trackingNo,
172
+ status: matchItem.status
173
+ }
174
+
175
+ await getRepository(MarketplaceOrderItem).save(targetMarketplaceOrderItem)
176
+ }
177
+ }
178
+ } catch(e) {}
179
+
152
180
  const resp = {
153
181
  Status: 'SUCCESS',
154
182
  Code: 200,