@things-factory/operato-wms 4.3.727 → 4.3.729

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.
@@ -26,6 +26,15 @@ import {
26
26
  PALLET_LABEL_SETTING_KEY
27
27
  } from '../constants'
28
28
 
29
+ // Excel/import often provides numbers as strings ("0", "1.5", "").
30
+ // GraphQL Float rejects NaN, so normalize invalid/blank to undefined.
31
+ const toFloatOrUndefined = v => {
32
+ if (v === null || v === undefined) return undefined
33
+ if (typeof v === 'string' && v.trim() === '') return undefined
34
+ const n = Number(v)
35
+ return Number.isFinite(n) ? n : undefined
36
+ }
37
+
29
38
  class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
30
39
  static get styles() {
31
40
  return [
@@ -1097,9 +1106,11 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
1097
1106
  row.location = row.location ? { id: row.location.id } : undefined
1098
1107
  row.productDetailId = row.product ? row.product.id : undefined
1099
1108
  row.product = row.product ? { id: row.product.productId } : undefined
1100
- row.uomValue = row.uomValue ? parseFloat(row.uomValue) : undefined
1101
- row.unitCost = row.unitCost ? parseFloat(row.unitCost) : undefined
1109
+ row.uomValue = toFloatOrUndefined(row.uomValue)
1110
+ row.unitCost = toFloatOrUndefined(row.unitCost)
1102
1111
  row.packingSize = row.packingSize ? parseInt(row.packingSize) : undefined
1112
+ row.transferQty = toFloatOrUndefined(row.transferQty)
1113
+ row.transferUomValue = toFloatOrUndefined(row.transferUomValue)
1103
1114
 
1104
1115
  if (row?.inventoryItemChanges) {
1105
1116
  row.inventoryItemChangesJson = row.inventoryItemChanges
@@ -1203,6 +1214,8 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
1203
1214
  itm.qty = parseFloat(itm.qty)
1204
1215
  itm.packingSize = parseFloat(itm.packingSize)
1205
1216
  itm.uomValue = parseFloat(itm.uomValue)
1217
+ itm.transferQty = toFloatOrUndefined(itm.transferQty)
1218
+ itm.transferUomValue = toFloatOrUndefined(itm.transferUomValue)
1206
1219
 
1207
1220
  if (itm.unitCost == null && itm.unitCost != 0) {
1208
1221
  itm.unitCost = null
@@ -4,118 +4,86 @@ module.exports = {
4
4
  useVirtualHostBasedDomain: false,
5
5
  fallbackRoute: '/',
6
6
  subdomainOffset: 2,
7
- port: 4000,
7
+ port: 4011,
8
8
  inspect: '9330',
9
-
10
-
11
- storage: {
12
- type: 's3',
13
- accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
14
- secretAccessKey: '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',
15
- bucketName: 'opa-one',
16
- region: 'ap-southeast-1'
17
- },
9
+ // ormconfig: {
10
+ // name: 'default',
11
+ // type: 'postgres',
12
+ // database: 'EMS',
13
+ // username: 'postgres',
14
+ // password: 'hatio',
15
+ // host: '192.168.0.161',
16
+ // port: 15432,
17
+ // synchronize: false,
18
+ // logging: true
19
+ // },
18
20
  ormconfig: {
19
21
  name: 'default',
20
22
  type: 'postgres',
21
- database: 'arif',
23
+ database: 'postgres',
22
24
  username: 'postgres',
23
- password: 'hatio',
24
- host: '10.254.29.189',
25
- port: 15432,
25
+ password: 't62dgT#Ns*GerhuZ9wnzm^',
26
+ host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
27
+ port: 55432,
26
28
  synchronize: false,
27
29
  logging: true
28
30
  },
29
31
  // ormconfig: {
30
32
  // name: 'default',
31
33
  // type: 'postgres',
32
- // host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
33
- // port: 55432,
34
- // database: 'postgres',
35
- // username: 'postgres',
36
- // password: 'abcd1234',
37
- // synchronize: false,
38
- // logging: true,
39
- // connectTimeoutMS: 30000,
40
- // extra: { poolSize: 30 }
41
- // },
42
- //db izzah
43
- // ormconfig: {
44
- // name: 'default',
45
- // type: 'postgres',
46
- // database: '06072023',
34
+ // database: 'operato',
47
35
  // username: 'postgres',
48
36
  // password: 'hatio',
49
37
  // host: '192.168.0.153',
50
- // port: 15432,f
51
- // synchronize: true,
38
+ // port: 15432,
39
+ // synchronize: false,
52
40
  // logging: true
53
41
  // },
54
42
  // ormconfig: {
55
43
  // name: 'default',
56
44
  // type: 'postgres',
57
- // database: 'postgres',
58
- // username: 'postgres',
59
- // password: 'hatio',
60
- // host: '192.168.0.151',
61
- // port: 15432,
45
+ // database: 'operato',
46
+ // username: 'operato',
47
+ // password: 'abcd1234',
48
+ // host: 'localhost',
49
+ // port: 25432,
62
50
  // synchronize: false,
63
51
  // logging: true
64
52
  // },
65
-
66
- // //ERIC
67
53
  // ormconfig: {
68
54
  // name: 'default',
69
55
  // type: 'postgres',
70
- // database: 'eric',
56
+ // database: 'operato',
71
57
  // username: 'postgres',
72
58
  // password: 'hatio',
73
- // host: '192.168.0.153',
59
+ // host: '192.168.0.151',
74
60
  // port: 15432,
75
61
  // synchronize: false,
76
62
  // logging: true
77
63
  // },
78
-
79
- //eric 2
64
+ //arif
80
65
  // ormconfig: {
81
66
  // name: 'default',
82
67
  // type: 'postgres',
83
- // database: 'eric2',
68
+ // database: 'arif',
84
69
  // username: 'postgres',
85
70
  // password: 'hatio',
86
- // host: '192.168.0.153',
71
+ // host: '10.254.29.189',
87
72
  // port: 15432,
88
73
  // synchronize: false,
89
74
  // logging: true
90
75
  // },
91
-
92
76
  // ormconfig: {
93
77
  // name: 'default',
94
78
  // type: 'postgres',
95
- // host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
96
- // port: 55432,
97
- // database: 'postgres',
79
+ // database: 'operato-eric',
98
80
  // username: 'postgres',
99
- // password: 'abcd1234',
81
+ // password: 'hatio',
82
+ // host: '192.168.0.249',
83
+ // port: 5432,
100
84
  // synchronize: false,
101
- // logging: true,
102
- // connectTimeoutMS: 30000,
103
- // extra: { poolSize: 30 }
85
+ // logging: true
104
86
  // },
105
- //ormconfig: {
106
- // name: 'default',
107
- // type: 'postgres',
108
- // database: 'dev2',
109
- // username: 'postgres',
110
- // password: 'hatio',
111
- // host: 'localhost',
112
- // port: 15432,
113
- // synchronize: false,
114
- // logging: true,
115
- // connectTimeoutMS: 30000,
116
- // extra: { poolSize: 30 }
117
- //},
118
- SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
119
87
  password: {
120
88
  lowerCase: true,
121
89
  upperCase: false,
@@ -128,8 +96,22 @@ module.exports = {
128
96
  looseCharacterLength: 4,
129
97
  history: 2
130
98
  },
99
+ sftpFileStorage: {
100
+ type: 's3',
101
+ accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
102
+ secretAccessKey: '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',
103
+ bucketName: 'operato-sftp'
104
+ },
105
+ // storage: {
106
+ // type: 's3',
107
+ // accessKeyId: 'AKIAUQEOPWEJCDH6AR5H',
108
+ // secretAccessKey: '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',
109
+ // bucketName: 'opa-one',
110
+ // region: 'ap-southeast-1'
111
+ // },
131
112
  uploads: 'uploads',
132
113
  attachmentsPath: 'attachments',
114
+ SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
133
115
  logger: {
134
116
  file: {
135
117
  filename: 'logs/application-%DATE%.log',
@@ -145,7 +127,7 @@ module.exports = {
145
127
  port: 587,
146
128
  secure: false, // true for 465, false for other ports
147
129
  auth: {
148
- user: 'no-reply@hatiolab.com', // generated ethereal user
130
+ user: 'noreply@hatiolab.com', // generated ethereal user
149
131
  pass: 'h@ti0LAB1008' // generated ethereal password
150
132
  },
151
133
  secureConnection: false,
@@ -153,7 +135,7 @@ module.exports = {
153
135
  ciphers: 'SSLv3'
154
136
  }
155
137
  },
156
- sender: 'no-reply@hatiolab.com',
138
+ sender: 'noreply@hatiolab.com',
157
139
  notification: {
158
140
  // fcm: {
159
141
  // serviceAccount: {
@@ -177,30 +159,80 @@ module.exports = {
177
159
  // privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
178
160
  // }
179
161
  },
180
- // reportApiUrl:
181
- // 'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.elb.ap-southeast-1.amazonaws.com/rest/report/show_html',
182
- // reportApiUrl: 'http://192.168.0.153:8888/rest/report/show_html',
183
- // reportApiUrl: 'http://192.168.0.153:8888/rest/report/show_html',
184
- // reportApiUrl: 'http://10.100.109.66:8090/rest/report/show_html',
162
+ fulfillmentIntegrationOperato: {
163
+ host: '192.168.0.161:3000',
164
+ protocol: 'http',
165
+ platform: 'operato',
166
+ application: 'Operato MMS',
167
+ appKey: 'a9bf751e622bf146662b240d58971051',
168
+ appSecret: '1c385935dc131c4b902b9bbf6a4798af',
169
+ callback: 'http://192.168.0.161:5000/callback-operato'
170
+ },
171
+ marketplaceIntegrationShopee: {
172
+ platform: 'shopee',
173
+ isUAT: false,
174
+ application: 'Operato MMS',
175
+ partnerId: 846025,
176
+ partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64',
177
+ v2: true
178
+ },
179
+ marketplaceIntegrationLazada: {
180
+ platform: 'lazada',
181
+ application: 'operato-mms',
182
+ appKey: '120961',
183
+ appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
184
+ callback: 'https://maybank.operato-m.com/lazada-callback'
185
+ },
186
+
187
+ //testinglazada
188
+ // marketplaceIntegrationLazada: {
189
+ // platform: 'lazada',
190
+ // application: 'powrup_bi',
191
+ // appKey: '117890',
192
+ // appSecret: 'tQVllnUa7irAHoNxAwXEVxoP1we1bUjE',
193
+ // callback: 'https://73c5-175-141-30-142.ngrok-free.app/lazada-callback'
194
+ // },
195
+
196
+ accountingIntegrationXero: {
197
+ platform: 'xero',
198
+ application: 'Operato WMS',
199
+ apiKey: '6B12D1AAC05347DC92159C2AEC812859',
200
+ apiSecret: 'T139_ItMjObC82mmy7iwnNflhd2iV0kUvDBj0P_201EmA7Sj',
201
+ callback: 'http://operato-h.com:3000/callback-xero',
202
+ hostname: 'http://operato-h.com:3000/'
203
+ },
204
+ lmdIntegrationNinjavan: {
205
+ clientId: 'P8WCEwMo0FHNlPECwTLetwN3diAmt5KF',
206
+ secretKey: '1D0yNZGseOjhxnwri29xmuZiiuRp131L',
207
+ refreshThreshold: 43200
208
+ },
209
+
210
+ lmdIntegrationEms: { refreshThreshold: 43200 },
211
+
212
+ lmdIntegrationCitylink: { refreshThreshold: 172800000 },
185
213
  awbFileStorage: {
186
214
  type: 's3',
187
- accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
188
- secretAccessKey: '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',
215
+ accessKeyId: 'AKIAUQEOPWEJPXIVER74',
216
+ secretAccessKey: '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',
189
217
  bucketName: 'operato-awb',
190
218
  region: 'ap-southeast-1'
191
219
  },
192
- invoiceFileStorage: {
193
- type: 's3',
194
- accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
195
- secretAccessKey: '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',
196
- invoiceBucket: 'operato-invoice',
197
- region: 'ap-southeast-1'
198
- },
199
220
  lambda: {
200
221
  region: 'ap-southeast-1',
201
- accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
202
- secretAccessKey: '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'
222
+ accessKeyId: 'AKIAUQEOPWEJPXIVER74',
223
+ secretAccessKey: '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'
224
+ },
225
+ lmdIntegrationConfig: {
226
+ version: {
227
+ v1: 'lmdMiddleware',
228
+ v2: 'lmdMiddlewareV2'
229
+ }
230
+ },
231
+ awsSesEmail: {
232
+ accessKeyId: 'AKIAUQEOPWEJPXIVER74',
233
+ secretAccessKey: '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',
234
+ email: 'support@hatio.asia'
203
235
  },
204
236
  reportApiUrl:
205
- 'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
237
+ 'http://k8s-default-operator-2fd6178d98-66c66a0f76c09575.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
206
238
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-wms",
3
- "version": "4.3.727",
3
+ "version": "4.3.729",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -62,60 +62,60 @@
62
62
  "@operato/scene-tab": "^0.1.8",
63
63
  "@operato/scene-table": "^0.1.8",
64
64
  "@operato/scene-wheel-sorter": "^0.1.8",
65
- "@things-factory/apptool-ui": "^4.3.727",
66
- "@things-factory/attachment-ui": "^4.3.727",
67
- "@things-factory/auth-ui": "^4.3.727",
68
- "@things-factory/barcode-ui": "^4.3.727",
69
- "@things-factory/biz-ui": "^4.3.727",
70
- "@things-factory/board-service": "^4.3.727",
71
- "@things-factory/board-ui": "^4.3.727",
72
- "@things-factory/code-ui": "^4.3.727",
73
- "@things-factory/context-ui": "^4.3.727",
74
- "@things-factory/export-ui": "^4.3.727",
75
- "@things-factory/export-ui-csv": "^4.3.727",
76
- "@things-factory/export-ui-excel": "^4.3.727",
77
- "@things-factory/fav-base": "^4.3.727",
78
- "@things-factory/form-ui": "^4.3.727",
79
- "@things-factory/geography": "^4.3.727",
80
- "@things-factory/grist-ui": "^4.3.727",
81
- "@things-factory/help": "^4.3.727",
82
- "@things-factory/i18n-base": "^4.3.727",
83
- "@things-factory/id-rule-base": "^4.3.727",
84
- "@things-factory/import-ui": "^4.3.727",
85
- "@things-factory/import-ui-excel": "^4.3.727",
86
- "@things-factory/menu-ui": "^4.3.727",
87
- "@things-factory/more-ui": "^4.3.727",
88
- "@things-factory/notification": "^4.3.727",
89
- "@things-factory/pdf": "^4.3.727",
90
- "@things-factory/print-proxy-service": "^4.3.727",
91
- "@things-factory/print-ui": "^4.3.727",
92
- "@things-factory/product-base": "^4.3.727",
93
- "@things-factory/resource-ui": "^4.3.727",
94
- "@things-factory/sales-ui": "^4.3.727",
95
- "@things-factory/scene-data-transform": "^4.3.727",
96
- "@things-factory/scene-excel": "^4.3.727",
97
- "@things-factory/scene-firebase": "^4.3.727",
98
- "@things-factory/scene-form": "^4.3.727",
99
- "@things-factory/scene-google-map": "^4.3.727",
100
- "@things-factory/scene-graphql": "^4.3.727",
101
- "@things-factory/scene-label": "^4.3.727",
102
- "@things-factory/scene-marker": "^4.3.727",
103
- "@things-factory/scene-mqtt": "^4.3.727",
104
- "@things-factory/scene-restful": "^4.3.727",
105
- "@things-factory/scene-visualizer": "^4.3.727",
106
- "@things-factory/setting-ui": "^4.3.727",
107
- "@things-factory/system-ui": "^4.3.727",
108
- "@things-factory/transport-base": "^4.3.727",
109
- "@things-factory/tutorial-ui": "^4.3.727",
110
- "@things-factory/warehouse-base": "^4.3.727",
111
- "@things-factory/worksheet-base": "^4.3.727"
65
+ "@things-factory/apptool-ui": "^4.3.729",
66
+ "@things-factory/attachment-ui": "^4.3.729",
67
+ "@things-factory/auth-ui": "^4.3.729",
68
+ "@things-factory/barcode-ui": "^4.3.729",
69
+ "@things-factory/biz-ui": "^4.3.729",
70
+ "@things-factory/board-service": "^4.3.729",
71
+ "@things-factory/board-ui": "^4.3.729",
72
+ "@things-factory/code-ui": "^4.3.729",
73
+ "@things-factory/context-ui": "^4.3.729",
74
+ "@things-factory/export-ui": "^4.3.729",
75
+ "@things-factory/export-ui-csv": "^4.3.729",
76
+ "@things-factory/export-ui-excel": "^4.3.729",
77
+ "@things-factory/fav-base": "^4.3.729",
78
+ "@things-factory/form-ui": "^4.3.729",
79
+ "@things-factory/geography": "^4.3.729",
80
+ "@things-factory/grist-ui": "^4.3.729",
81
+ "@things-factory/help": "^4.3.729",
82
+ "@things-factory/i18n-base": "^4.3.729",
83
+ "@things-factory/id-rule-base": "^4.3.729",
84
+ "@things-factory/import-ui": "^4.3.729",
85
+ "@things-factory/import-ui-excel": "^4.3.729",
86
+ "@things-factory/menu-ui": "^4.3.729",
87
+ "@things-factory/more-ui": "^4.3.729",
88
+ "@things-factory/notification": "^4.3.729",
89
+ "@things-factory/pdf": "^4.3.729",
90
+ "@things-factory/print-proxy-service": "^4.3.729",
91
+ "@things-factory/print-ui": "^4.3.729",
92
+ "@things-factory/product-base": "^4.3.729",
93
+ "@things-factory/resource-ui": "^4.3.729",
94
+ "@things-factory/sales-ui": "^4.3.729",
95
+ "@things-factory/scene-data-transform": "^4.3.729",
96
+ "@things-factory/scene-excel": "^4.3.729",
97
+ "@things-factory/scene-firebase": "^4.3.729",
98
+ "@things-factory/scene-form": "^4.3.729",
99
+ "@things-factory/scene-google-map": "^4.3.729",
100
+ "@things-factory/scene-graphql": "^4.3.729",
101
+ "@things-factory/scene-label": "^4.3.729",
102
+ "@things-factory/scene-marker": "^4.3.729",
103
+ "@things-factory/scene-mqtt": "^4.3.729",
104
+ "@things-factory/scene-restful": "^4.3.729",
105
+ "@things-factory/scene-visualizer": "^4.3.729",
106
+ "@things-factory/setting-ui": "^4.3.729",
107
+ "@things-factory/system-ui": "^4.3.729",
108
+ "@things-factory/transport-base": "^4.3.729",
109
+ "@things-factory/tutorial-ui": "^4.3.729",
110
+ "@things-factory/warehouse-base": "^4.3.729",
111
+ "@things-factory/worksheet-base": "^4.3.729"
112
112
  },
113
113
  "devDependencies": {
114
- "@things-factory/builder": "^4.3.727",
114
+ "@things-factory/builder": "^4.3.729",
115
115
  "cypress": "^9.4.1",
116
116
  "cypress-file-upload": "^5.0.8",
117
117
  "cypress-localstorage-commands": "^1.6.1",
118
118
  "eslint-plugin-cypress": "^2.12.1"
119
119
  },
120
- "gitHead": "a9ec8bb490580678c9982e1234dc735278d6d9ac"
120
+ "gitHead": "5db084b2dac5f691f401f5dbdf368f57371cb020"
121
121
  }