@things-factory/operato-mms 3.7.10 → 3.7.14
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.
- package/client/pages/catalogue-variation/product-variations.js +1 -1
- package/client/pages/reports/sales-by-platform/shopee-sales-report.js +136 -23
- package/package.json +6 -6
- package/translations/en.json +10 -0
- package/translations/ko.json +10 -0
- package/translations/ms.json +10 -0
- package/translations/zh.json +10 -0
|
@@ -270,7 +270,7 @@ class ProductVariations extends localize(i18next)(PageView) {
|
|
|
270
270
|
}
|
|
271
271
|
|
|
272
272
|
async _fetchProducts({ page, limit, sorters = [{ name: 'status' }] }) {
|
|
273
|
-
let filters = []
|
|
273
|
+
let filters = [{ name: 'status', operator: 'noteq', value: 'INACTIVE' }]
|
|
274
274
|
if (this.store) {
|
|
275
275
|
filters.push({
|
|
276
276
|
name: 'marketplaceStoreId',
|
|
@@ -127,6 +127,14 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
127
127
|
imex: { header: i18next.t('field.store_name'), key: 'marketplaceStore', width: 50, type: 'string' },
|
|
128
128
|
width: 200
|
|
129
129
|
},
|
|
130
|
+
{
|
|
131
|
+
type: 'string',
|
|
132
|
+
name: 'fulfilmentCenter',
|
|
133
|
+
header: i18next.t('field.fulfilment_center'),
|
|
134
|
+
sortable: false,
|
|
135
|
+
imex: { header: i18next.t('field.fulfilment_center'), key: 'fulfilmentCenter', width: 50, type: 'string' },
|
|
136
|
+
width: 200
|
|
137
|
+
},
|
|
130
138
|
{
|
|
131
139
|
type: 'string',
|
|
132
140
|
name: 'orderNo',
|
|
@@ -137,19 +145,11 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
137
145
|
},
|
|
138
146
|
{
|
|
139
147
|
type: 'string',
|
|
140
|
-
name: '
|
|
141
|
-
header: i18next.t('field.
|
|
142
|
-
sortable: false,
|
|
143
|
-
imex: { header: i18next.t('field.item'), key: 'marketplaceOrderItem', width: 120, type: 'string' },
|
|
144
|
-
width: 400
|
|
145
|
-
},
|
|
146
|
-
{
|
|
147
|
-
type: 'integer',
|
|
148
|
-
name: 'qty',
|
|
149
|
-
header: i18next.t('field.qty'),
|
|
148
|
+
name: 'buyerUsername',
|
|
149
|
+
header: i18next.t('field.buyer_username'),
|
|
150
150
|
sortable: false,
|
|
151
|
-
imex: { header: i18next.t('field.
|
|
152
|
-
width:
|
|
151
|
+
imex: { header: i18next.t('field.buyer_username'), key: 'buyerUsername', width: 30, type: 'string' },
|
|
152
|
+
width: 200
|
|
153
153
|
},
|
|
154
154
|
{
|
|
155
155
|
type: 'datetime',
|
|
@@ -159,20 +159,44 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
159
159
|
imex: { header: i18next.t('field.order_created_date'), key: 'orderCreatedAt', width: 30, type: 'string' },
|
|
160
160
|
width: 200
|
|
161
161
|
},
|
|
162
|
+
{
|
|
163
|
+
type: 'datetime',
|
|
164
|
+
name: 'payTime',
|
|
165
|
+
header: i18next.t('field.pay_time'),
|
|
166
|
+
sortable: false,
|
|
167
|
+
imex: { header: i18next.t('field.pay_time'), key: 'payTime', width: 20, type: 'string' },
|
|
168
|
+
width: 150
|
|
169
|
+
},
|
|
170
|
+
{
|
|
171
|
+
type: 'string',
|
|
172
|
+
name: 'sku',
|
|
173
|
+
header: i18next.t('field.sku'),
|
|
174
|
+
sortable: false,
|
|
175
|
+
imex: { header: i18next.t('field.sku'), key: 'sku', width: 80, type: 'string' },
|
|
176
|
+
width: 200
|
|
177
|
+
},
|
|
162
178
|
{
|
|
163
179
|
type: 'string',
|
|
164
|
-
name: '
|
|
165
|
-
header: i18next.t('field.
|
|
180
|
+
name: 'variationId',
|
|
181
|
+
header: i18next.t('field.variation_id'),
|
|
166
182
|
sortable: false,
|
|
167
|
-
imex: { header: i18next.t('field.
|
|
183
|
+
imex: { header: i18next.t('field.variation_id'), key: 'variationId', width: 80, type: 'string' },
|
|
168
184
|
width: 200
|
|
169
185
|
},
|
|
170
186
|
{
|
|
171
|
-
type: '
|
|
172
|
-
name: '
|
|
173
|
-
header: i18next.t('field.
|
|
187
|
+
type: 'string',
|
|
188
|
+
name: 'variationName',
|
|
189
|
+
header: i18next.t('field.variation_name'),
|
|
174
190
|
sortable: false,
|
|
175
|
-
imex: { header: i18next.t('field.
|
|
191
|
+
imex: { header: i18next.t('field.variation_name'), key: 'variationName', width: 160, type: 'string' },
|
|
192
|
+
width: 400
|
|
193
|
+
},
|
|
194
|
+
{
|
|
195
|
+
type: 'integer',
|
|
196
|
+
name: 'qty',
|
|
197
|
+
header: i18next.t('field.qty'),
|
|
198
|
+
sortable: false,
|
|
199
|
+
imex: { header: i18next.t('field.qty'), key: 'qty', width: 20, type: 'integer' },
|
|
176
200
|
width: 150
|
|
177
201
|
},
|
|
178
202
|
{
|
|
@@ -212,6 +236,14 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
212
236
|
imex: { header: i18next.t('field.product_discount'), key: 'productDiscount', width: 30, type: 'float' },
|
|
213
237
|
width: 200
|
|
214
238
|
},
|
|
239
|
+
{
|
|
240
|
+
type: 'float',
|
|
241
|
+
name: 'voucherAmount',
|
|
242
|
+
header: i18next.t('field.voucher_amt'),
|
|
243
|
+
sortable: false,
|
|
244
|
+
imex: { header: i18next.t('field.voucher_amt'), key: 'voucherAmount', width: 30, type: 'float' },
|
|
245
|
+
width: 200
|
|
246
|
+
},
|
|
215
247
|
{
|
|
216
248
|
type: 'float',
|
|
217
249
|
name: 'shippingFee',
|
|
@@ -220,6 +252,14 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
220
252
|
imex: { header: i18next.t('field.shipping_fee'), key: 'shippingFee', width: 30, type: 'float' },
|
|
221
253
|
width: 200
|
|
222
254
|
},
|
|
255
|
+
{
|
|
256
|
+
type: 'float',
|
|
257
|
+
name: 'shippingRebate',
|
|
258
|
+
header: i18next.t('field.shipping_rebate'),
|
|
259
|
+
sortable: false,
|
|
260
|
+
imex: { header: i18next.t('field.shipping_rebate'), key: 'shippingRebate', width: 30, type: 'float' },
|
|
261
|
+
width: 200
|
|
262
|
+
},
|
|
223
263
|
{
|
|
224
264
|
type: 'float',
|
|
225
265
|
name: 'actualShippingFee',
|
|
@@ -240,6 +280,67 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
240
280
|
sortable: false,
|
|
241
281
|
imex: { header: i18next.t('field.shipping_provider'), key: 'shippingProvider', width: 30, type: 'string' },
|
|
242
282
|
width: 200
|
|
283
|
+
},
|
|
284
|
+
{
|
|
285
|
+
type: 'string',
|
|
286
|
+
name: 'shippingMode',
|
|
287
|
+
header: i18next.t('field.shipping_mode'),
|
|
288
|
+
sortable: false,
|
|
289
|
+
imex: { header: i18next.t('field.shipping_mode'), key: 'shippingMode', width: 30, type: 'string' },
|
|
290
|
+
width: 200
|
|
291
|
+
},
|
|
292
|
+
{
|
|
293
|
+
type: 'float',
|
|
294
|
+
name: 'commissionFee',
|
|
295
|
+
header: i18next.t('field.comission_fee'),
|
|
296
|
+
sortable: false,
|
|
297
|
+
imex: { header: i18next.t('field.comission_fee'), key: 'commissionFee', width: 30, type: 'float' },
|
|
298
|
+
width: 200
|
|
299
|
+
},
|
|
300
|
+
{
|
|
301
|
+
type: 'float',
|
|
302
|
+
name: 'serviceFee',
|
|
303
|
+
header: i18next.t('field.service_fee'),
|
|
304
|
+
sortable: false,
|
|
305
|
+
imex: { header: i18next.t('field.voucher_amt'), key: 'serviceFee', width: 30, type: 'float' },
|
|
306
|
+
width: 200
|
|
307
|
+
},
|
|
308
|
+
{
|
|
309
|
+
type: 'float',
|
|
310
|
+
name: 'transactionFee',
|
|
311
|
+
header: i18next.t('field.transaction_fee'),
|
|
312
|
+
sortable: false,
|
|
313
|
+
imex: { header: i18next.t('field.transaction_fee'), key: 'transactionFee', width: 30, type: 'float' },
|
|
314
|
+
width: 200
|
|
315
|
+
},
|
|
316
|
+
{
|
|
317
|
+
type: 'float',
|
|
318
|
+
name: 'totalRealeasedAmount',
|
|
319
|
+
header: i18next.t('field.total_released_amt'),
|
|
320
|
+
sortable: false,
|
|
321
|
+
imex: {
|
|
322
|
+
header: i18next.t('field.total_released_amt'),
|
|
323
|
+
key: 'totalRealeasedAmount',
|
|
324
|
+
width: 30,
|
|
325
|
+
type: 'float'
|
|
326
|
+
},
|
|
327
|
+
width: 200
|
|
328
|
+
},
|
|
329
|
+
{
|
|
330
|
+
type: 'string',
|
|
331
|
+
name: 'voucherCode',
|
|
332
|
+
header: i18next.t('field.voucher_code'),
|
|
333
|
+
sortable: false,
|
|
334
|
+
imex: { header: i18next.t('field.voucher_code'), key: 'voucherCode', width: 30, type: 'string' },
|
|
335
|
+
width: 200
|
|
336
|
+
},
|
|
337
|
+
{
|
|
338
|
+
type: 'string',
|
|
339
|
+
name: 'status',
|
|
340
|
+
header: i18next.t('field.status'),
|
|
341
|
+
sortable: false,
|
|
342
|
+
imex: { header: i18next.t('field.status'), key: 'status', width: 30, type: 'string' },
|
|
343
|
+
width: 200
|
|
243
344
|
}
|
|
244
345
|
]
|
|
245
346
|
}
|
|
@@ -256,6 +357,15 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
256
357
|
query marketplaceSalesReports($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
|
|
257
358
|
marketplaceSalesReports(filters: $filters, pagination: $pagination, sortings: $sortings) {
|
|
258
359
|
items {
|
|
360
|
+
fulfilmentCenter
|
|
361
|
+
voucherAmount
|
|
362
|
+
shippingRebate
|
|
363
|
+
commissionFee
|
|
364
|
+
serviceFee
|
|
365
|
+
transactionFee
|
|
366
|
+
totalRealeasedAmount
|
|
367
|
+
voucherCode
|
|
368
|
+
shippingMode
|
|
259
369
|
orderNo
|
|
260
370
|
orderCreatedAt
|
|
261
371
|
buyerUsername
|
|
@@ -270,7 +380,8 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
270
380
|
paidPrice
|
|
271
381
|
sku
|
|
272
382
|
qty
|
|
273
|
-
|
|
383
|
+
variationId
|
|
384
|
+
variationName
|
|
274
385
|
productName
|
|
275
386
|
productSku
|
|
276
387
|
productDiscount
|
|
@@ -279,6 +390,7 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
279
390
|
actualShippingFee
|
|
280
391
|
marketplaceShippingFeeVoucher
|
|
281
392
|
sellerShippingFeeVoucher
|
|
393
|
+
status
|
|
282
394
|
}
|
|
283
395
|
total
|
|
284
396
|
}
|
|
@@ -293,7 +405,7 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
293
405
|
records: response.data.marketplaceSalesReports.items.map(item => {
|
|
294
406
|
return {
|
|
295
407
|
...item,
|
|
296
|
-
marketplaceOrderItem:
|
|
408
|
+
marketplaceOrderItem: item.variationSku,
|
|
297
409
|
marketplaceStore: `${item.storeName} ${item.storeDescription ? `(${item.storeDescription})` : ''}`,
|
|
298
410
|
refundAmount: this._getRoundedValue(item.refundAmount),
|
|
299
411
|
originalPrice: this._getRoundedValue(item.originalPrice),
|
|
@@ -334,14 +446,15 @@ class ShopeeSalesReport extends connect(store)(localize(i18next)(PageView)) {
|
|
|
334
446
|
})
|
|
335
447
|
}
|
|
336
448
|
|
|
337
|
-
_exportableData() {
|
|
449
|
+
async _exportableData() {
|
|
338
450
|
const headerSetting = this._config.columns
|
|
339
451
|
.filter(column => column.type !== 'gutter' && column.imex !== undefined)
|
|
340
452
|
.map(column => {
|
|
341
453
|
return column.imex
|
|
342
454
|
})
|
|
343
455
|
|
|
344
|
-
const data = this.
|
|
456
|
+
// const data = (await this.fetchHandler({ page: 1, limit: 999999 })).records
|
|
457
|
+
const data = (await this.fetchHandler({ page: 1, limit: 999999 })).records.map(item => {
|
|
345
458
|
return {
|
|
346
459
|
...this._config.columns
|
|
347
460
|
.filter(column => column.type !== 'gutter' && column.imex !== undefined)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-mms",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.14",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -59,14 +59,14 @@
|
|
|
59
59
|
"@things-factory/help": "^3.7.5",
|
|
60
60
|
"@things-factory/i18n-ui": "^3.7.5",
|
|
61
61
|
"@things-factory/integration-fulfillment": "^3.7.7",
|
|
62
|
-
"@things-factory/integration-lmd": "^3.7.
|
|
62
|
+
"@things-factory/integration-lmd": "^3.7.11",
|
|
63
63
|
"@things-factory/lite-menu": "^3.7.5",
|
|
64
|
-
"@things-factory/marketplace-base": "^3.7.
|
|
64
|
+
"@things-factory/marketplace-base": "^3.7.11",
|
|
65
65
|
"@things-factory/more-ui": "^3.7.5",
|
|
66
66
|
"@things-factory/notification": "^3.7.5",
|
|
67
67
|
"@things-factory/oauth2-client": "^3.7.5",
|
|
68
68
|
"@things-factory/pdf": "^3.7.5",
|
|
69
|
-
"@things-factory/product-base": "^3.7.
|
|
69
|
+
"@things-factory/product-base": "^3.7.14",
|
|
70
70
|
"@things-factory/resource-ui": "^3.7.7",
|
|
71
71
|
"@things-factory/scene-chartjs": "^3.7.5",
|
|
72
72
|
"@things-factory/scene-clock": "^3.7.5",
|
|
@@ -99,11 +99,11 @@
|
|
|
99
99
|
"@things-factory/scene-wheel-sorter": "^3.7.5",
|
|
100
100
|
"@things-factory/setting-ui": "^3.7.5",
|
|
101
101
|
"@things-factory/system-ui": "^3.7.5",
|
|
102
|
-
"@things-factory/warehouse-base": "^3.7.
|
|
102
|
+
"@things-factory/warehouse-base": "^3.7.14"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
105
|
"@things-factory/builder": "^3.7.5",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "b8736fcc7bbaa2102e70b4f4ab1c409743e2eb6c"
|
|
109
109
|
}
|
package/translations/en.json
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"field.variation_id": "variation id",
|
|
3
|
+
"field.voucher_amt": "voucher amt",
|
|
4
|
+
"field.shipping_rebate": "shipping rebate",
|
|
5
|
+
"field.shipping_mode": "shipping mode",
|
|
6
|
+
"field.service_fee": "service fee",
|
|
7
|
+
"field.transaction_fee": "transaction fee",
|
|
8
|
+
"field.total_released_amt": "total release amt",
|
|
9
|
+
"field.voucher_code": "voucher code",
|
|
10
|
+
"field.comission_fee": "comission fee",
|
|
11
|
+
"field.fulfilment_center": "fulfilment center",
|
|
2
12
|
"button.add_product": "add product",
|
|
3
13
|
"button.add": "add",
|
|
4
14
|
"button.airway_bill": "airway bill",
|
package/translations/ko.json
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"field.variation_id": "[ko] variation id",
|
|
3
|
+
"field.voucher_amt": "[ko] voucher amt",
|
|
4
|
+
"field.shipping_rebate": "[ko] shipping rebate",
|
|
5
|
+
"field.shipping_mode": "[ko] shipping mode",
|
|
6
|
+
"field.service_fee": "[ko] service fee",
|
|
7
|
+
"field.transaction_fee": "[ko] transaction fee",
|
|
8
|
+
"field.total_released_amt": "[ko] total release amt",
|
|
9
|
+
"field.voucher_code": "[ko] voucher code",
|
|
10
|
+
"field.comission_fee": "[ko] comission fee",
|
|
11
|
+
"field.fulfilment_center": "[ko] fulfilment center",
|
|
2
12
|
"button.add_product": "[ko] add product",
|
|
3
13
|
"button.add": "[ko] add",
|
|
4
14
|
"button.airway_bill": "[ko] airway bill",
|
package/translations/ms.json
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"field.variation_id": "[ms] variation id",
|
|
3
|
+
"field.voucher_amt": "[ms] voucher amt",
|
|
4
|
+
"field.shipping_rebate": "[ms] shipping rebate",
|
|
5
|
+
"field.shipping_mode": "[ms] shipping mode",
|
|
6
|
+
"field.service_fee": "[ms] service fee",
|
|
7
|
+
"field.transaction_fee": "[ms] transaction fee",
|
|
8
|
+
"field.total_released_amt": "[ms] total release amt",
|
|
9
|
+
"field.voucher_code": "[ms] voucher code",
|
|
10
|
+
"field.comission_fee": "[ms] comission fee",
|
|
11
|
+
"field.fulfilment_center": "[ms] fulfilment center",
|
|
2
12
|
"button.add_product": "[ms] add product",
|
|
3
13
|
"button.add": "[ms] add",
|
|
4
14
|
"button.airway_bill": "[ms] airway bill",
|
package/translations/zh.json
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"field.variation_id": "[zh] variation id",
|
|
3
|
+
"field.voucher_amt": "[zh] voucher amt",
|
|
4
|
+
"field.shipping_rebate": "[zh] shipping rebate",
|
|
5
|
+
"field.shipping_mode": "[zh] shipping mode",
|
|
6
|
+
"field.service_fee": "[zh] service fee",
|
|
7
|
+
"field.transaction_fee": "[zh] transaction fee",
|
|
8
|
+
"field.total_released_amt": "[zh] total release amt",
|
|
9
|
+
"field.voucher_code": "[zh] voucher code",
|
|
10
|
+
"field.comission_fee": "[zh] comission fee",
|
|
11
|
+
"field.fulfilment_center": "[zh] fulfilment center",
|
|
2
12
|
"button.add_product": "[zh] add product",
|
|
3
13
|
"button.add": "[zh] add",
|
|
4
14
|
"button.airway_bill": "[zh] airway bill",
|