ts-glitter 20.4.9 → 20.5.0
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/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/cms-plugin/module/data.ts +1 -1
- package/lowcode/cms-plugin/module/order-setting.js +19 -8
- package/lowcode/cms-plugin/module/order-setting.ts +22 -16
- package/lowcode/cms-plugin/shopping-order-manager.js +252 -223
- package/lowcode/cms-plugin/shopping-order-manager.ts +64 -37
- package/lowcode/cms-plugin/stock-history.js +6 -7
- package/lowcode/cms-plugin/stock-history.ts +17 -16
- package/lowcode/glitter-base/route/shopping.ts +1 -1
- package/lowcode/public-components/checkout/index.js +7 -1
- package/lowcode/public-components/checkout/index.ts +6 -1
- package/lowcode/public-components/user-manager/um-class.js +1 -0
- package/lowcode/public-components/user-manager/um-class.ts +1 -0
- package/lowcode/public-components/user-manager/um-order.js +35 -2
- package/lowcode/public-components/user-manager/um-order.ts +40 -4
- package/lowcode/public-models/order-info.js +2 -3
- package/lowcode/public-models/order-info.ts +2 -2
- package/lowcode/src/glitterBundle/Glitter.js +1 -1
- package/lowcode/src/glitterBundle/Glitter.ts +1 -1
- package/lowcode/src/glitterBundle/GlitterInitial.js +1 -1
- package/lowcode/src/glitterBundle/GlitterInitial.ts +1 -1
- package/lowcode/src/glitterBundle/module/Animation.js +13 -7
- package/lowcode/src/glitterBundle/module/Enum.js +6 -2
- package/lowcode/src/glitterBundle/module/Html_generate.js +42 -50
- package/lowcode/src/glitterBundle/module/PageManager.js +30 -23
- package/lowcode/src/glitterBundle/plugins/click-event.js +19 -25
- package/lowcode/src/glitterBundle/plugins/dialog-style-editor.js +16 -13
- package/lowcode/src/glitterBundle/plugins/editor-elem.js +6 -1
- package/lowcode/src/glitterBundle/plugins/editor.js +5 -1
- package/lowcode/src/glitterBundle/plugins/html-render.js +5 -2
- package/lowcode/src/glitterBundle/plugins/plugin-creater.js +22 -28
- package/lowcode/src/glitterBundle/plugins/seo-manager.js +5 -1
- package/lowcode/src/glitterBundle/plugins/style-attr.js +5 -1
- package/lowcode/src/glitterBundle/plugins/style-editor.js +3 -1
- package/package.json +1 -1
- package/src/Language.js.map +1 -1
- package/src/api-public/controllers/ai-points.js.map +1 -1
- package/src/api-public/controllers/chat.js.map +1 -1
- package/src/api-public/controllers/customer-sessions.js.map +1 -1
- package/src/api-public/controllers/fb-message.js.map +1 -1
- package/src/api-public/controllers/fb-service.js.map +1 -1
- package/src/api-public/controllers/invoice.js.map +1 -1
- package/src/api-public/controllers/line-message.js.map +1 -1
- package/src/api-public/controllers/oauth.js.map +1 -1
- package/src/api-public/controllers/recommend.js.map +1 -1
- package/src/api-public/controllers/reconciliation.js.map +1 -1
- package/src/api-public/controllers/shop.js +1 -3
- package/src/api-public/controllers/shop.js.map +1 -1
- package/src/api-public/controllers/shop.ts +12 -6
- package/src/api-public/controllers/shopee.js.map +1 -1
- package/src/api-public/controllers/sms-points.js.map +1 -1
- package/src/api-public/controllers/sms.js.map +1 -1
- package/src/api-public/controllers/smtp.js.map +1 -1
- package/src/api-public/controllers/stock.js.map +1 -1
- package/src/api-public/controllers/track.js.map +1 -1
- package/src/api-public/controllers/voucher.js.map +1 -1
- package/src/api-public/controllers/wallet.js.map +1 -1
- package/src/api-public/services/EcInvoice.js.map +1 -1
- package/src/api-public/services/article.js.map +1 -1
- package/src/api-public/services/ezpay/tool.d.ts +0 -1
- package/src/api-public/services/ezpay/tool.js.map +1 -1
- package/src/api-public/services/filter-protect-data.js.map +1 -1
- package/src/api-public/services/financial-service.js.map +1 -1
- package/src/api-public/services/financial-service.ts +2 -3
- package/src/api-public/services/form-check.js.map +1 -1
- package/src/api-public/services/graph-api.js.map +1 -1
- package/src/api-public/services/mail.js.map +1 -1
- package/src/api-public/services/model/handlePaymentTransaction.d.ts +9 -0
- package/src/api-public/services/model/handlePaymentTransaction.js +54 -0
- package/src/api-public/services/model/handlePaymentTransaction.js.map +1 -0
- package/src/api-public/services/model/handlePaymentTransaction.ts +120 -0
- package/src/api-public/services/product-initial.js.map +1 -1
- package/src/api-public/services/rebate.js +6 -6
- package/src/api-public/services/rebate.js.map +1 -1
- package/src/api-public/services/rebate.ts +6 -6
- package/src/api-public/services/reconciliation.js.map +1 -1
- package/src/api-public/services/shopping.d.ts +6 -4
- package/src/api-public/services/shopping.js +169 -26
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +261 -50
- package/src/api-public/services/terms-check.js.map +1 -1
- package/src/api-public/services/updated-table-checked.js +22 -0
- package/src/api-public/services/updated-table-checked.js.map +1 -1
- package/src/api-public/services/updated-table-checked.ts +28 -0
- package/src/api-public/services/user-service.d.ts +9 -0
- package/src/api-public/services/user-service.js +9 -0
- package/src/api-public/services/user-service.js.map +1 -0
- package/src/api-public/services/user-service.ts +11 -0
- package/src/api-public/services/user-update.js +10 -6
- package/src/api-public/services/user-update.js.map +1 -1
- package/src/api-public/services/user-update.ts +9 -2
- package/src/api-public/services/user.js +9 -8
- package/src/api-public/services/user.js.map +1 -1
- package/src/api-public/services/user.ts +9 -10
- package/src/api-public/utils/ut-database.js.map +1 -1
- package/src/app-project/serverless/src/controllers/index.js.map +1 -1
- package/src/app-project/serverless/src/controllers/sample.js.map +1 -1
- package/src/app-project/serverless/src/modules/database.d.ts +1 -2
- package/src/app-project/serverless/src/modules/database.js.map +1 -1
- package/src/app-project/serverless/src/modules/exception.js.map +1 -1
- package/src/app-project/serverless/src/modules/hooks.js.map +1 -1
- package/src/app-project/serverless/src/modules/logger.js.map +1 -1
- package/src/app-project/serverless/src/modules/redis.d.ts +1 -1
- package/src/app-project/serverless/src/modules/redis.js.map +1 -1
- package/src/app-project/serverless/src/modules/response.js.map +1 -1
- package/src/app-project/serverless/src/modules/ssh.js.map +1 -1
- package/src/controllers/ai.js.map +1 -1
- package/src/controllers/global-event.js.map +1 -1
- package/src/controllers/page.js.map +1 -1
- package/src/controllers/private_config.js.map +1 -1
- package/src/export/export-test.js.map +1 -1
- package/src/firebase/message.js +1 -2
- package/src/firebase/message.js.map +1 -1
- package/src/helper/app_creater.js +1 -2
- package/src/helper/app_creater.js.map +1 -1
- package/src/helper/glitter-util.d.ts +0 -1
- package/src/helper/glitter-util.js.map +1 -1
- package/src/lambda/interface.d.ts +1 -1
- package/src/lambda/interface.js +2 -2
- package/src/lambda/interface.js.map +1 -1
- package/src/modules/caught-error.js.map +1 -1
- package/src/modules/exception.js.map +1 -1
- package/src/modules/hooks.js.map +1 -1
- package/src/modules/response.js.map +1 -1
- package/src/modules/ssh.js.map +1 -1
- package/src/services/ses.js +1 -2
- package/src/services/ses.js.map +1 -1
- package/src/services/system-schedule.js.map +1 -1
- package/src/update-script.js.map +1 -1
|
@@ -312,225 +312,230 @@ export class ShoppingOrderManager {
|
|
|
312
312
|
if (vm.filter_type !== 'all') {
|
|
313
313
|
vm.apiJSON.is_pos = vm.filter_type === 'pos';
|
|
314
314
|
}
|
|
315
|
-
ApiShop.getOrder(vm.apiJSON).then(data => {
|
|
315
|
+
ApiShop.getOrder(vm.apiJSON).then((data) => __awaiter(this, void 0, void 0, function* () {
|
|
316
316
|
function getDatalist() {
|
|
317
|
-
return
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
317
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
318
|
+
const payment_support = yield PaymentConfig.getSupportPayment();
|
|
319
|
+
return data.response.data.map((dd) => {
|
|
320
|
+
var _a;
|
|
321
|
+
dd.orderData.total = dd.orderData.total || 0;
|
|
322
|
+
dd.orderData.customer_info = (_a = dd.orderData.customer_info) !== null && _a !== void 0 ? _a : {};
|
|
323
|
+
if (query.isShipment) {
|
|
324
|
+
return [
|
|
325
|
+
{
|
|
326
|
+
key: '訂單編號',
|
|
327
|
+
value: html ` <div class="d-flex align-items-center gap-2" style="min-width: 200px;">
|
|
326
328
|
${dd.cart_token}${(() => {
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
329
|
+
switch (dd.order_source) {
|
|
330
|
+
case 'manual':
|
|
331
|
+
return BgWidget.primaryInsignia('手動', { type: 'border' });
|
|
332
|
+
case 'combine':
|
|
333
|
+
return BgWidget.warningInsignia('合併', { type: 'border' });
|
|
334
|
+
case 'POS':
|
|
335
|
+
return BgWidget.primaryInsignia('POS', { type: 'border' });
|
|
336
|
+
default:
|
|
337
|
+
return '';
|
|
338
|
+
}
|
|
339
|
+
})()}
|
|
338
340
|
</div>`,
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
341
|
+
},
|
|
342
|
+
{
|
|
343
|
+
key: '出貨日期',
|
|
344
|
+
value: dd.orderData.user_info.shipment_date
|
|
345
|
+
? glitter.ut.dateFormat(new Date(dd.orderData.user_info.shipment_date), 'yyyy-MM-dd hh:mm')
|
|
346
|
+
: '尚未設定',
|
|
347
|
+
},
|
|
348
|
+
{
|
|
349
|
+
key: '訂購人',
|
|
350
|
+
value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : `匿名`,
|
|
351
|
+
},
|
|
352
|
+
{
|
|
353
|
+
key: '出貨狀態',
|
|
354
|
+
value: (() => {
|
|
355
|
+
var _a;
|
|
356
|
+
switch ((_a = dd.orderData.progress) !== null && _a !== void 0 ? _a : 'wait') {
|
|
357
|
+
case 'pre_order':
|
|
358
|
+
return BgWidget.notifyInsignia('待預購');
|
|
359
|
+
case 'wait':
|
|
360
|
+
if (dd.orderData.user_info.shipment_number) {
|
|
361
|
+
return BgWidget.secondaryInsignia('備貨中');
|
|
362
|
+
}
|
|
363
|
+
else {
|
|
364
|
+
return BgWidget.notifyInsignia('未出貨');
|
|
365
|
+
}
|
|
366
|
+
case 'shipping':
|
|
367
|
+
return BgWidget.warningInsignia('已出貨');
|
|
368
|
+
case 'finish':
|
|
369
|
+
return BgWidget.infoInsignia('已取貨');
|
|
370
|
+
case 'arrived':
|
|
371
|
+
return BgWidget.warningInsignia('已送達');
|
|
372
|
+
case 'returns':
|
|
373
|
+
return BgWidget.dangerInsignia('已退貨');
|
|
374
|
+
}
|
|
375
|
+
})(),
|
|
376
|
+
},
|
|
377
|
+
{
|
|
378
|
+
key: '出貨單號碼',
|
|
379
|
+
value: dd.orderData.user_info.shipment_number,
|
|
380
|
+
},
|
|
381
|
+
].map((dd) => {
|
|
382
|
+
dd.value = html ` <div style="line-height:40px;">${dd.value}</div>`;
|
|
383
|
+
return dd;
|
|
384
|
+
});
|
|
385
|
+
}
|
|
386
|
+
else {
|
|
387
|
+
return [
|
|
388
|
+
{
|
|
389
|
+
key: '訂單編號',
|
|
390
|
+
value: html ` <div class="d-flex align-items-center gap-2" style="min-width: 200px;">
|
|
389
391
|
${dd.cart_token}${(() => {
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
392
|
+
switch (dd.orderData.orderSource) {
|
|
393
|
+
case 'manual':
|
|
394
|
+
return BgWidget.primaryInsignia('手動', { type: 'border' });
|
|
395
|
+
case 'combine':
|
|
396
|
+
return BgWidget.warningInsignia('合併', { type: 'border' });
|
|
397
|
+
case 'POS':
|
|
398
|
+
if (vm.filter_type === 'pos') {
|
|
399
|
+
return '';
|
|
400
|
+
}
|
|
401
|
+
return BgWidget.primaryInsignia('POS', { type: 'border' });
|
|
402
|
+
case 'split':
|
|
403
|
+
return BgWidget.warningInsignia('拆分', { type: 'border' });
|
|
404
|
+
default:
|
|
397
405
|
return '';
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
default:
|
|
401
|
-
return '';
|
|
402
|
-
}
|
|
403
|
-
})()}
|
|
406
|
+
}
|
|
407
|
+
})()}
|
|
404
408
|
</div>`,
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
+
},
|
|
410
|
+
{
|
|
411
|
+
key: '訂單日期',
|
|
412
|
+
value: html ` <div style="width: 120px;">
|
|
409
413
|
${glitter.ut.dateFormat(new Date(dd.created_time), 'yyyy-MM-dd')}
|
|
410
414
|
</div>`,
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
415
|
+
},
|
|
416
|
+
{
|
|
417
|
+
key: '訂購人',
|
|
418
|
+
value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : `匿名`,
|
|
419
|
+
},
|
|
420
|
+
{
|
|
421
|
+
key: '訂單金額',
|
|
422
|
+
value: `$ ${dd.orderData.total.toLocaleString()}`,
|
|
423
|
+
},
|
|
424
|
+
{
|
|
425
|
+
key: '付款狀態',
|
|
426
|
+
value: (() => {
|
|
427
|
+
switch (dd.status) {
|
|
428
|
+
case 0:
|
|
429
|
+
if (dd.orderData.proof_purchase) {
|
|
430
|
+
return BgWidget.warningInsignia('待核款');
|
|
431
|
+
}
|
|
432
|
+
if (dd.orderData.customer_info.payment_select == 'cash_on_delivery') {
|
|
433
|
+
return BgWidget.warningInsignia('貨到付款');
|
|
434
|
+
}
|
|
435
|
+
return BgWidget.notifyInsignia('未付款');
|
|
436
|
+
case 3:
|
|
437
|
+
return BgWidget.warningInsignia('部分付款');
|
|
438
|
+
case 1:
|
|
439
|
+
return BgWidget.infoInsignia('已付款');
|
|
440
|
+
case -1:
|
|
441
|
+
return BgWidget.notifyInsignia('付款失敗');
|
|
442
|
+
case -2:
|
|
443
|
+
return BgWidget.notifyInsignia('已退款');
|
|
444
|
+
}
|
|
445
|
+
})(),
|
|
446
|
+
},
|
|
447
|
+
{
|
|
448
|
+
key: '出貨狀態',
|
|
449
|
+
value: (() => {
|
|
450
|
+
var _a;
|
|
451
|
+
switch ((_a = dd.orderData.progress) !== null && _a !== void 0 ? _a : 'wait') {
|
|
452
|
+
case 'pre_order':
|
|
453
|
+
return BgWidget.notifyInsignia('待預購');
|
|
454
|
+
case 'wait':
|
|
455
|
+
if (dd.orderData.user_info.shipment_number) {
|
|
456
|
+
return BgWidget.secondaryInsignia('備貨中');
|
|
457
|
+
}
|
|
458
|
+
else {
|
|
459
|
+
return BgWidget.notifyInsignia('未出貨');
|
|
460
|
+
}
|
|
461
|
+
case 'shipping':
|
|
462
|
+
return BgWidget.warningInsignia('已出貨');
|
|
463
|
+
case 'finish':
|
|
464
|
+
return BgWidget.infoInsignia('已取貨');
|
|
465
|
+
case 'arrived':
|
|
466
|
+
return BgWidget.warningInsignia('已送達');
|
|
467
|
+
case 'returns':
|
|
468
|
+
return BgWidget.dangerInsignia('已退貨');
|
|
469
|
+
}
|
|
470
|
+
})(),
|
|
471
|
+
},
|
|
472
|
+
{
|
|
473
|
+
key: '訂單狀態',
|
|
474
|
+
value: (() => {
|
|
475
|
+
var _a;
|
|
476
|
+
switch ((_a = dd.orderData.orderStatus) !== null && _a !== void 0 ? _a : '0') {
|
|
477
|
+
case '-1':
|
|
478
|
+
return BgWidget.notifyInsignia('已取消');
|
|
479
|
+
case '0':
|
|
480
|
+
return BgWidget.warningInsignia('處理中');
|
|
481
|
+
case '1':
|
|
482
|
+
return BgWidget.infoInsignia('已完成');
|
|
483
|
+
}
|
|
484
|
+
})(),
|
|
485
|
+
},
|
|
486
|
+
{
|
|
487
|
+
key: '運送方式',
|
|
488
|
+
value: html ` <div style="width: 120px;">
|
|
485
489
|
${OrderInfo.shipmetSelector(dd, OrderModule.supportShipmentMethod())}
|
|
486
490
|
</div>`,
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
491
|
+
},
|
|
492
|
+
{
|
|
493
|
+
key: '付款方式',
|
|
494
|
+
value: OrderInfo.paymentSelector(gvc, dd, payment_support),
|
|
495
|
+
},
|
|
496
|
+
{
|
|
497
|
+
key: '付款時間',
|
|
498
|
+
value: html ` <div style="width: 160px;">
|
|
495
499
|
${(() => {
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
500
|
+
if (!dd.orderData.editRecord) {
|
|
501
|
+
return '-';
|
|
502
|
+
}
|
|
503
|
+
const record = dd.orderData.editRecord.find((item) => item.record === '付款成功');
|
|
504
|
+
return record ? Tool.formatDateTime(record.time) : '-';
|
|
505
|
+
})()}
|
|
502
506
|
</div>`,
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
507
|
+
},
|
|
508
|
+
{
|
|
509
|
+
key: '對帳狀態',
|
|
510
|
+
value: OrderInfo.reconciliationStatus(dd),
|
|
511
|
+
},
|
|
512
|
+
{
|
|
513
|
+
key: '發票號碼',
|
|
514
|
+
value: dd.invoice_no || '-',
|
|
515
|
+
},
|
|
516
|
+
]
|
|
517
|
+
.filter(item => {
|
|
518
|
+
return vm.headerConfig.includes(item.key);
|
|
519
|
+
})
|
|
520
|
+
.map((dd) => {
|
|
521
|
+
dd.value = html ` <div style="line-height:40px;">${dd.value}</div>`;
|
|
522
|
+
return dd;
|
|
523
|
+
});
|
|
524
|
+
}
|
|
525
|
+
});
|
|
521
526
|
});
|
|
522
527
|
}
|
|
523
528
|
vm.dataList = data.response.data;
|
|
524
529
|
vmi.pageSize = Math.ceil(data.response.total / limit);
|
|
525
530
|
vmi.originalData = vm.dataList;
|
|
526
|
-
vmi.tableData = getDatalist();
|
|
531
|
+
vmi.tableData = yield getDatalist();
|
|
527
532
|
vmi.loading = false;
|
|
528
533
|
if (vmi.pageSize != 0 && vmi.page > vmi.pageSize) {
|
|
529
534
|
ShoppingOrderManager.vm.page = 1;
|
|
530
535
|
gvc.notifyDataChange(vm.id);
|
|
531
536
|
}
|
|
532
537
|
vmi.callback();
|
|
533
|
-
});
|
|
538
|
+
}));
|
|
534
539
|
},
|
|
535
540
|
rowClick: (_, index) => {
|
|
536
541
|
vm.data = vm.dataList[index];
|
|
@@ -1015,10 +1020,11 @@ export class ShoppingOrderManager {
|
|
|
1015
1020
|
limit: 1,
|
|
1016
1021
|
search: cart_token,
|
|
1017
1022
|
data_from: 'manager',
|
|
1018
|
-
searchType: '
|
|
1023
|
+
searchType: 'cart_token_exact',
|
|
1019
1024
|
});
|
|
1020
1025
|
orderData = structuredClone(orderDataNew.response.data[0]);
|
|
1021
1026
|
originData = structuredClone(orderData);
|
|
1027
|
+
console.log('orderDataNew.response.data -- ', orderDataNew.response.data);
|
|
1022
1028
|
}
|
|
1023
1029
|
orderData.orderData.progress = (_b = orderData.orderData.progress) !== null && _b !== void 0 ? _b : 'wait';
|
|
1024
1030
|
if (orderData.orderData.shipment_selector &&
|
|
@@ -1079,6 +1085,26 @@ export class ShoppingOrderManager {
|
|
|
1079
1085
|
}
|
|
1080
1086
|
});
|
|
1081
1087
|
}
|
|
1088
|
+
const funBTN = () => {
|
|
1089
|
+
gvc.addStyle(html `
|
|
1090
|
+
.funInsignia{ border-radius: 10px; background: #EAEAEA; display: flex; padding: 6px 18px; justify-content:
|
|
1091
|
+
center; align-items: center; gap: 8px; font-size: 16px; font-weight: 700; cursor: pointer; }
|
|
1092
|
+
`);
|
|
1093
|
+
return {
|
|
1094
|
+
splitOrder: () => {
|
|
1095
|
+
return html ` <div
|
|
1096
|
+
class="funInsignia"
|
|
1097
|
+
style=""
|
|
1098
|
+
onclick="${gvc.event(() => {
|
|
1099
|
+
console.log('orderData -- ', orderData);
|
|
1100
|
+
OrderSetting.splitOrder(gvc, orderData.orderData, () => gvc.notifyDataChange(vm.id));
|
|
1101
|
+
})}"
|
|
1102
|
+
>
|
|
1103
|
+
拆分訂單
|
|
1104
|
+
</div>`;
|
|
1105
|
+
},
|
|
1106
|
+
};
|
|
1107
|
+
};
|
|
1082
1108
|
function getBadgeList() {
|
|
1083
1109
|
const vt = OrderSetting.getAllStatusBadge(orderData);
|
|
1084
1110
|
return html ` <div style="display: flex; gap: 10px; justify-content: flex-end;">
|
|
@@ -1649,7 +1675,7 @@ export class ShoppingOrderManager {
|
|
|
1649
1675
|
(() => {
|
|
1650
1676
|
let map = [];
|
|
1651
1677
|
if (orderData.orderData.user_info.invoice_method) {
|
|
1652
|
-
map.push(html
|
|
1678
|
+
map.push(html ` <div class="tx_700">發票開立資訊</div>`);
|
|
1653
1679
|
map.push(`開立時機: ${(() => {
|
|
1654
1680
|
switch (orderData.orderData.user_info.invoice_method) {
|
|
1655
1681
|
case 'nouse':
|
|
@@ -1684,13 +1710,13 @@ export class ShoppingOrderManager {
|
|
|
1684
1710
|
`發票寄送信箱: ${orderData.orderData.user_info.email || '未填寫'}`,
|
|
1685
1711
|
]
|
|
1686
1712
|
.map(dd => {
|
|
1687
|
-
return html
|
|
1713
|
+
return html ` <div>${dd}</div>`;
|
|
1688
1714
|
})
|
|
1689
1715
|
.join(BgWidget.mbContainer(8));
|
|
1690
1716
|
default:
|
|
1691
1717
|
return [`發票寄送信箱: ${orderData.orderData.user_info.email || '未填寫'}`]
|
|
1692
1718
|
.map(dd => {
|
|
1693
|
-
return html
|
|
1719
|
+
return html ` <div>${dd}</div>`;
|
|
1694
1720
|
})
|
|
1695
1721
|
.join(BgWidget.mbContainer(8));
|
|
1696
1722
|
}
|
|
@@ -1698,7 +1724,7 @@ export class ShoppingOrderManager {
|
|
|
1698
1724
|
}
|
|
1699
1725
|
return map
|
|
1700
1726
|
.map(dd => {
|
|
1701
|
-
return html
|
|
1727
|
+
return html ` <div>${dd}</div>`;
|
|
1702
1728
|
})
|
|
1703
1729
|
.join(BgWidget.mbContainer(8));
|
|
1704
1730
|
})(),
|
|
@@ -1743,6 +1769,7 @@ export class ShoppingOrderManager {
|
|
|
1743
1769
|
${document.body.clientWidth > 768 ? getBadgeList() : ''}
|
|
1744
1770
|
</div>
|
|
1745
1771
|
${document.body.clientWidth > 768 ? '' : html ` <div class="mt-1 mb-3">${getBadgeList()}</div>`}
|
|
1772
|
+
<div class="d-flex justify-content-end">${funBTN().splitOrder()}</div>
|
|
1746
1773
|
${BgWidget.container1x2({
|
|
1747
1774
|
html: [
|
|
1748
1775
|
!is_shipment ? '' : shipment_card,
|
|
@@ -1827,15 +1854,15 @@ export class ShoppingOrderManager {
|
|
|
1827
1854
|
</div>
|
|
1828
1855
|
<div class="d-flex flex-column">
|
|
1829
1856
|
${dd.is_hidden
|
|
1830
|
-
? html
|
|
1857
|
+
? html ` <div style="width:auto;">
|
|
1831
1858
|
${BgWidget.secondaryInsignia('隱形商品')}
|
|
1832
1859
|
</div>`
|
|
1833
1860
|
: ''}
|
|
1834
1861
|
<div class="tx_700 d-flex align-items-center" style="gap:4px;">
|
|
1835
1862
|
<div>${dd.title}</div>
|
|
1836
|
-
${dd.is_gift ? html
|
|
1837
|
-
${dd.is_add_on_items ? html
|
|
1838
|
-
${dd.pre_order ? html
|
|
1863
|
+
${dd.is_gift ? html ` <div>${showTag('#FFE9B2', '贈品')}</div>` : ''}
|
|
1864
|
+
${dd.is_add_on_items ? html ` <div>${showTag('#D8E7EC', '加購品')}</div>` : ''}
|
|
1865
|
+
${dd.pre_order ? html ` <div>${showTag('#D8E7EC', '預購')}</div>` : ''}
|
|
1839
1866
|
</div>
|
|
1840
1867
|
${dd.spec.length > 0 ? BgWidget.grayNote(dd.spec.join(', ')) : ''}
|
|
1841
1868
|
${BgWidget.grayNote(`存貨單位 (SKU):${dd.sku && dd.sku.length > 0 ? dd.sku : '無'}`)}
|
|
@@ -1979,7 +2006,7 @@ export class ShoppingOrderManager {
|
|
|
1979
2006
|
})
|
|
1980
2007
|
.join(BgWidget.mbContainer(18))}
|
|
1981
2008
|
${`${(_c = orderData.orderData.orderStatus) !== null && _c !== void 0 ? _c : 0}` === '0'
|
|
1982
|
-
? html
|
|
2009
|
+
? html ` <div class="d-flex justify-content-end mt-3">
|
|
1983
2010
|
${BgWidget.blueNote('手動調整訂單價格', gvc.event(() => {
|
|
1984
2011
|
const cloneData = orderData.orderData;
|
|
1985
2012
|
PosFunction.manualDiscount({
|
|
@@ -2171,7 +2198,7 @@ export class ShoppingOrderManager {
|
|
|
2171
2198
|
<div>
|
|
2172
2199
|
${(cash_flow.TradeStatus === '1'
|
|
2173
2200
|
? [
|
|
2174
|
-
html
|
|
2201
|
+
html ` <div class="d-flex align-items-center">
|
|
2175
2202
|
金流交易結果:
|
|
2176
2203
|
${(cash_flow.credit_receipt && cash_flow.credit_receipt.status) ||
|
|
2177
2204
|
'已付款'}
|
|
@@ -2388,7 +2415,7 @@ export class ShoppingOrderManager {
|
|
|
2388
2415
|
${invoiceDataList
|
|
2389
2416
|
.map((invoiceData) => {
|
|
2390
2417
|
var _a;
|
|
2391
|
-
return html
|
|
2418
|
+
return html ` <div class="d-flex" style="height:55px;">
|
|
2392
2419
|
<div class="col-3 d-flex align-items-center ">
|
|
2393
2420
|
${invoiceData.create_date.split('T')[0]}
|
|
2394
2421
|
</div>
|
|
@@ -2451,7 +2478,7 @@ export class ShoppingOrderManager {
|
|
|
2451
2478
|
var _a;
|
|
2452
2479
|
const renderReconciliationInfo = (orderData) => {
|
|
2453
2480
|
if (!orderData.reconciliation_date) {
|
|
2454
|
-
return html
|
|
2481
|
+
return html ` <div>尚未入帳</div>`;
|
|
2455
2482
|
}
|
|
2456
2483
|
return html `
|
|
2457
2484
|
<div class="rounded-3 w-100 border p-2" style="background: whitesmoke;">
|
|
@@ -2510,8 +2537,8 @@ export class ShoppingOrderManager {
|
|
|
2510
2537
|
.slice()
|
|
2511
2538
|
.reverse()
|
|
2512
2539
|
.map(renderOffsetRecord)
|
|
2513
|
-
.map(dd => html
|
|
2514
|
-
.join(html
|
|
2540
|
+
.map(dd => html ` <div class="w-100">${dd}</div>`)
|
|
2541
|
+
.join(html ` <div class="w-100 border-top my-2"></div>`);
|
|
2515
2542
|
BgWidget.mainCard(html `
|
|
2516
2543
|
<div class="tx_700">對帳記錄</div>
|
|
2517
2544
|
${BgWidget.mbContainer(18)}
|
|
@@ -2536,6 +2563,7 @@ export class ShoppingOrderManager {
|
|
|
2536
2563
|
const source = {
|
|
2537
2564
|
pos: 'POS',
|
|
2538
2565
|
combine: '合併訂單',
|
|
2566
|
+
split: '拆分',
|
|
2539
2567
|
};
|
|
2540
2568
|
return (_a = source[orderData.orderData.orderSource]) !== null && _a !== void 0 ? _a : '線上';
|
|
2541
2569
|
})()}
|
|
@@ -2601,7 +2629,7 @@ export class ShoppingOrderManager {
|
|
|
2601
2629
|
let view = [];
|
|
2602
2630
|
if (orderData.orderData.user_info.shipment !== 'now') {
|
|
2603
2631
|
view.push([
|
|
2604
|
-
html
|
|
2632
|
+
html ` <div style="font-size: 16px;font-weight: 700;color:#393939">
|
|
2605
2633
|
收件人資料
|
|
2606
2634
|
</div>`,
|
|
2607
2635
|
gvc.bindView(() => {
|
|
@@ -2702,7 +2730,7 @@ export class ShoppingOrderManager {
|
|
|
2702
2730
|
if (formData.form) {
|
|
2703
2731
|
mapView.push(formData.form
|
|
2704
2732
|
.map((dd) => {
|
|
2705
|
-
return html
|
|
2733
|
+
return html ` <div class="d-flex flex-wrap w-100">
|
|
2706
2734
|
<span class="me-2 fw-normal fs-6"
|
|
2707
2735
|
>${Language.getLanguageCustomText(dd.title)}:</span
|
|
2708
2736
|
>
|
|
@@ -3300,11 +3328,12 @@ export class ShoppingOrderManager {
|
|
|
3300
3328
|
title: '',
|
|
3301
3329
|
id: data.id,
|
|
3302
3330
|
spec: variant.spec,
|
|
3303
|
-
count: (_b = variant.qty) !== null && _b !== void 0 ? _b :
|
|
3331
|
+
count: (_b = variant.qty) !== null && _b !== void 0 ? _b : '1',
|
|
3304
3332
|
sale_price: variant.sale_price,
|
|
3305
|
-
sku: variant.sku
|
|
3333
|
+
sku: variant.sku,
|
|
3306
3334
|
});
|
|
3307
|
-
orderDetail.subtotal +=
|
|
3335
|
+
orderDetail.subtotal +=
|
|
3336
|
+
Number(orderDetail.lineItems[index].count) * orderDetail.lineItems[index].sale_price;
|
|
3308
3337
|
});
|
|
3309
3338
|
if (orderDetailRefresh) {
|
|
3310
3339
|
dialog.dataLoading({ text: '計算中', visible: true });
|
|
@@ -3731,7 +3760,7 @@ export class ShoppingOrderManager {
|
|
|
3731
3760
|
.join('')}
|
|
3732
3761
|
</select>
|
|
3733
3762
|
`
|
|
3734
|
-
: html
|
|
3763
|
+
: html ` <div
|
|
3735
3764
|
class="d-flex align-items-center"
|
|
3736
3765
|
style="height: 34px;color: #8D8D8D;font-size: 14px;font-weight: 400;"
|
|
3737
3766
|
>
|
|
@@ -4364,7 +4393,7 @@ export class ShoppingOrderManager {
|
|
|
4364
4393
|
}),
|
|
4365
4394
|
]
|
|
4366
4395
|
.map(dd => {
|
|
4367
|
-
return html
|
|
4396
|
+
return html ` <div class="col-12 col-lg-6">${dd}</div>`;
|
|
4368
4397
|
})
|
|
4369
4398
|
.join('')}
|
|
4370
4399
|
</div>
|
|
@@ -4451,7 +4480,7 @@ export class ShoppingOrderManager {
|
|
|
4451
4480
|
returnHTML = html `
|
|
4452
4481
|
<div class="d-flex flex-column">
|
|
4453
4482
|
${[
|
|
4454
|
-
html
|
|
4483
|
+
html ` <div class="d-flex align-items-center pt-2">
|
|
4455
4484
|
<img
|
|
4456
4485
|
style="width: 23px;height: 23px;margin-right: 8px;"
|
|
4457
4486
|
src="${(_b = ShipmentConfig.list.find(dd => {
|
|
@@ -4468,10 +4497,10 @@ export class ShoppingOrderManager {
|
|
|
4468
4497
|
點擊更換門市
|
|
4469
4498
|
</div>
|
|
4470
4499
|
</div>`,
|
|
4471
|
-
html
|
|
4472
|
-
html
|
|
4473
|
-
html
|
|
4474
|
-
].join(html
|
|
4500
|
+
html ` <div class="d-flex">門市名稱: ${orderDetail.user_info.CVSStoreName}</div>`,
|
|
4501
|
+
html ` <div class="d-flex">門市店號: ${orderDetail.user_info.CVSStoreID}</div>`,
|
|
4502
|
+
html ` <div class="d-flex">門市地址: ${orderDetail.user_info.CVSAddress}</div>`,
|
|
4503
|
+
].join(html ` <div class="my-2 w-100 border-top"></div>`)}
|
|
4475
4504
|
</div>
|
|
4476
4505
|
`;
|
|
4477
4506
|
return html `
|