@feedmepos/mf-order-setting 0.0.33 → 0.0.34

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 (30) hide show
  1. package/dist/{KioskDevicesView-CxZI99me.js → KioskDevicesView-BHzBoF_O.js} +1 -1
  2. package/dist/{KioskDevicesView.vue_vue_type_script_setup_true_lang-EGj4fxeN.js → KioskDevicesView.vue_vue_type_script_setup_true_lang-C5JpMDP_.js} +2 -2
  3. package/dist/KioskSettingView-i8tgH3dF.js +841 -0
  4. package/dist/{KioskView-IUQTvUF8.js → KioskView-DW7vX6rJ.js} +41 -34
  5. package/dist/{OrderSettingsView-VLE9yxNt.js → OrderSettingsView-D3SQHET3.js} +4 -4
  6. package/dist/{app-cd45Ryph.js → app-C15xKXga.js} +16 -10
  7. package/dist/app.js +1 -1
  8. package/dist/{dayjs.min-CRAlrjJy.js → dayjs.min-KE7XM_kc.js} +1 -1
  9. package/dist/frontend/mf-order/src/app.d.ts +6 -0
  10. package/dist/frontend/mf-order/src/main.d.ts +6 -0
  11. package/dist/frontend/mf-order/src/stores/order-setting/index.d.ts +12 -0
  12. package/dist/frontend/mf-order/src/stores/order-setting/mapper.d.ts +3 -3
  13. package/dist/frontend/mf-order/src/views/kiosk/settings/KioskPaymentTypeSection.vue.d.ts +8 -0
  14. package/dist/frontend/mf-order/tsconfig.app.tsbuildinfo +1 -1
  15. package/dist/{index-DLWAy-3K.js → index-DGfFxIZo.js} +2 -2
  16. package/dist/{menu.dto-DGDI6XwH.js → menu.dto-CLARGRsi.js} +6 -2
  17. package/dist/package/entity/order/order.enum.d.ts +1 -1
  18. package/dist/package/entity/order-setting/kiosk/kiosk.do.d.ts +42 -0
  19. package/dist/package/entity/order-setting/kiosk/kiosk.dto.d.ts +32 -0
  20. package/dist/package/entity/order-setting/order-setting.do.d.ts +22 -0
  21. package/dist/package/entity/order-setting/order-setting.dto.d.ts +44 -0
  22. package/dist/package/entity/restaurant/restaurant.dto.d.ts +22 -0
  23. package/dist/package/entity/websocket/websocket.dto.d.ts +48 -0
  24. package/package.json +1 -1
  25. package/src/locales/en-US.json +2 -0
  26. package/src/locales/th-TH.json +2 -0
  27. package/src/locales/zh-CN.json +2 -0
  28. package/src/stores/order-setting/mapper.ts +230 -168
  29. package/src/views/kiosk/settings/KioskPaymentTypeSection.vue +31 -1
  30. package/dist/KioskSettingView-CTDY8__s.js +0 -821
package/dist/package/entity/websocket/websocket.dto.d.ts CHANGED
@@ -403,12 +403,18 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
403
403
  eWallet: z.ZodObject<{
404
404
  qrPay: z.ZodDefault<z.ZodBoolean>;
405
405
  scanPay: z.ZodDefault<z.ZodBoolean>;
406
+ terminalScanPay: z.ZodDefault<z.ZodBoolean>;
407
+ terminalQrPay: z.ZodDefault<z.ZodBoolean>;
406
408
  }, "strip", z.ZodTypeAny, {
407
409
  qrPay: boolean;
408
410
  scanPay: boolean;
411
+ terminalScanPay: boolean;
412
+ terminalQrPay: boolean;
409
413
  }, {
410
414
  qrPay?: boolean | undefined;
411
415
  scanPay?: boolean | undefined;
416
+ terminalScanPay?: boolean | undefined;
417
+ terminalQrPay?: boolean | undefined;
412
418
  }>;
413
419
  }, "strip", z.ZodTypeAny, {
414
420
  card: {
@@ -418,6 +424,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
418
424
  eWallet: {
419
425
  qrPay: boolean;
420
426
  scanPay: boolean;
427
+ terminalScanPay: boolean;
428
+ terminalQrPay: boolean;
421
429
  };
422
430
  }, {
423
431
  card: {
@@ -427,6 +435,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
427
435
  eWallet: {
428
436
  qrPay?: boolean | undefined;
429
437
  scanPay?: boolean | undefined;
438
+ terminalScanPay?: boolean | undefined;
439
+ terminalQrPay?: boolean | undefined;
430
440
  };
431
441
  }>>>;
432
442
  }, "strip", z.ZodTypeAny, {
@@ -443,6 +453,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
443
453
  eWallet: {
444
454
  qrPay: boolean;
445
455
  scanPay: boolean;
456
+ terminalScanPay: boolean;
457
+ terminalQrPay: boolean;
446
458
  };
447
459
  } | null | undefined;
448
460
  }, {
@@ -459,6 +471,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
459
471
  eWallet: {
460
472
  qrPay?: boolean | undefined;
461
473
  scanPay?: boolean | undefined;
474
+ terminalScanPay?: boolean | undefined;
475
+ terminalQrPay?: boolean | undefined;
462
476
  };
463
477
  } | null | undefined;
464
478
  }>>>;
@@ -516,6 +530,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
516
530
  eWallet: {
517
531
  qrPay: boolean;
518
532
  scanPay: boolean;
533
+ terminalScanPay: boolean;
534
+ terminalQrPay: boolean;
519
535
  };
520
536
  } | null | undefined;
521
537
  } | null | undefined;
@@ -569,6 +585,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
569
585
  eWallet: {
570
586
  qrPay?: boolean | undefined;
571
587
  scanPay?: boolean | undefined;
588
+ terminalScanPay?: boolean | undefined;
589
+ terminalQrPay?: boolean | undefined;
572
590
  };
573
591
  } | null | undefined;
574
592
  } | null | undefined;
@@ -624,6 +642,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
624
642
  eWallet: {
625
643
  qrPay: boolean;
626
644
  scanPay: boolean;
645
+ terminalScanPay: boolean;
646
+ terminalQrPay: boolean;
627
647
  };
628
648
  } | null | undefined;
629
649
  } | null | undefined;
@@ -680,6 +700,8 @@ export declare const WebSocketEventDto: z.ZodDiscriminatedUnion<"type", z.Primit
680
700
  eWallet: {
681
701
  qrPay?: boolean | undefined;
682
702
  scanPay?: boolean | undefined;
703
+ terminalScanPay?: boolean | undefined;
704
+ terminalQrPay?: boolean | undefined;
683
705
  };
684
706
  } | null | undefined;
685
707
  } | null | undefined;
@@ -1058,12 +1080,18 @@ export declare const WebSocketReqDto: z.ZodObject<{
1058
1080
  eWallet: z.ZodObject<{
1059
1081
  qrPay: z.ZodDefault<z.ZodBoolean>;
1060
1082
  scanPay: z.ZodDefault<z.ZodBoolean>;
1083
+ terminalScanPay: z.ZodDefault<z.ZodBoolean>;
1084
+ terminalQrPay: z.ZodDefault<z.ZodBoolean>;
1061
1085
  }, "strip", z.ZodTypeAny, {
1062
1086
  qrPay: boolean;
1063
1087
  scanPay: boolean;
1088
+ terminalScanPay: boolean;
1089
+ terminalQrPay: boolean;
1064
1090
  }, {
1065
1091
  qrPay?: boolean | undefined;
1066
1092
  scanPay?: boolean | undefined;
1093
+ terminalScanPay?: boolean | undefined;
1094
+ terminalQrPay?: boolean | undefined;
1067
1095
  }>;
1068
1096
  }, "strip", z.ZodTypeAny, {
1069
1097
  card: {
@@ -1073,6 +1101,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1073
1101
  eWallet: {
1074
1102
  qrPay: boolean;
1075
1103
  scanPay: boolean;
1104
+ terminalScanPay: boolean;
1105
+ terminalQrPay: boolean;
1076
1106
  };
1077
1107
  }, {
1078
1108
  card: {
@@ -1082,6 +1112,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1082
1112
  eWallet: {
1083
1113
  qrPay?: boolean | undefined;
1084
1114
  scanPay?: boolean | undefined;
1115
+ terminalScanPay?: boolean | undefined;
1116
+ terminalQrPay?: boolean | undefined;
1085
1117
  };
1086
1118
  }>>>;
1087
1119
  }, "strip", z.ZodTypeAny, {
@@ -1098,6 +1130,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1098
1130
  eWallet: {
1099
1131
  qrPay: boolean;
1100
1132
  scanPay: boolean;
1133
+ terminalScanPay: boolean;
1134
+ terminalQrPay: boolean;
1101
1135
  };
1102
1136
  } | null | undefined;
1103
1137
  }, {
@@ -1114,6 +1148,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1114
1148
  eWallet: {
1115
1149
  qrPay?: boolean | undefined;
1116
1150
  scanPay?: boolean | undefined;
1151
+ terminalScanPay?: boolean | undefined;
1152
+ terminalQrPay?: boolean | undefined;
1117
1153
  };
1118
1154
  } | null | undefined;
1119
1155
  }>>>;
@@ -1171,6 +1207,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1171
1207
  eWallet: {
1172
1208
  qrPay: boolean;
1173
1209
  scanPay: boolean;
1210
+ terminalScanPay: boolean;
1211
+ terminalQrPay: boolean;
1174
1212
  };
1175
1213
  } | null | undefined;
1176
1214
  } | null | undefined;
@@ -1224,6 +1262,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1224
1262
  eWallet: {
1225
1263
  qrPay?: boolean | undefined;
1226
1264
  scanPay?: boolean | undefined;
1265
+ terminalScanPay?: boolean | undefined;
1266
+ terminalQrPay?: boolean | undefined;
1227
1267
  };
1228
1268
  } | null | undefined;
1229
1269
  } | null | undefined;
@@ -1279,6 +1319,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1279
1319
  eWallet: {
1280
1320
  qrPay: boolean;
1281
1321
  scanPay: boolean;
1322
+ terminalScanPay: boolean;
1323
+ terminalQrPay: boolean;
1282
1324
  };
1283
1325
  } | null | undefined;
1284
1326
  } | null | undefined;
@@ -1335,6 +1377,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1335
1377
  eWallet: {
1336
1378
  qrPay?: boolean | undefined;
1337
1379
  scanPay?: boolean | undefined;
1380
+ terminalScanPay?: boolean | undefined;
1381
+ terminalQrPay?: boolean | undefined;
1338
1382
  };
1339
1383
  } | null | undefined;
1340
1384
  } | null | undefined;
@@ -1439,6 +1483,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1439
1483
  eWallet: {
1440
1484
  qrPay: boolean;
1441
1485
  scanPay: boolean;
1486
+ terminalScanPay: boolean;
1487
+ terminalQrPay: boolean;
1442
1488
  };
1443
1489
  } | null | undefined;
1444
1490
  } | null | undefined;
@@ -1544,6 +1590,8 @@ export declare const WebSocketReqDto: z.ZodObject<{
1544
1590
  eWallet: {
1545
1591
  qrPay?: boolean | undefined;
1546
1592
  scanPay?: boolean | undefined;
1593
+ terminalScanPay?: boolean | undefined;
1594
+ terminalQrPay?: boolean | undefined;
1547
1595
  };
1548
1596
  } | null | undefined;
1549
1597
  } | null | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@feedmepos/mf-order-setting",
3
- "version": "0.0.33",
3
+ "version": "0.0.34",
4
4
  "type": "module",
5
5
  "module": "./dist/app.js",
6
6
  "license": "UNLICENSED",
package/src/locales/en-US.json CHANGED
@@ -193,6 +193,8 @@
193
193
  "productSelected": "product(s) selected",
194
194
  "promptAnonymousLoginDialog": "Prompt Login Dialog For Anonymous Order",
195
195
  "qrPay": "QR Pay",
196
+ "terminalScanPay": "Terminal Scan Pay",
197
+ "terminalQrPay": "Terminal QR Pay",
196
198
  "rate": "Rate",
197
199
  "remoteId": "Remote ID",
198
200
  "restaurant": "Restaurant",
package/src/locales/th-TH.json CHANGED
@@ -190,6 +190,8 @@
190
190
  "productSelected": "ผลิตภัณฑ์ที่เลือก",
191
191
  "promptAnonymousLoginDialog": "กล่องโต้ตอบพร้อมท์เข้าสู่ระบบสำหรับคำสั่งซื้อแบบไม่เปิดเผยตัวตน",
192
192
  "qrPay": "ชำระเงินด้วย QR",
193
+ "terminalScanPay": "ชำระเงินด้วยการสแกนเทอร์มินัล",
194
+ "terminalQrPay": "ชำระเงินด้วย QR เทอร์มินัล",
193
195
  "rate": "อัตรา",
194
196
  "remoteId": "รหัสประจำตัวระยะไกล",
195
197
  "restaurant": "ร้านอาหาร",
package/src/locales/zh-CN.json CHANGED
@@ -194,6 +194,8 @@
194
194
  "productSelected": "已选择商品",
195
195
  "promptAnonymousLoginDialog": "为匿名用户弹出登入对话框",
196
196
  "qrPay": "二维码支付",
197
+ "terminalScanPay": "终端扫描支付",
198
+ "terminalQrPay": "终端二维码支付",
197
199
  "rate": "费率",
198
200
  "remoteId": "平台注册ID",
199
201
  "restaurant": "餐厅",
package/src/stores/order-setting/mapper.ts CHANGED
@@ -1,206 +1,268 @@
1
- import { OrderSettingsDto, OrderKioskDineIn, OrderKioskDineInSequenceDto, FdoOrderKioskDineInSequence, FdoEPaymentMethod } from "@entity";
2
- import type { MfKioskOrderSetting, MfKioskDineInSetting, MfDisplayStandSetting, KioskTakeawaySettingForm, MfKioskOrderSettingForm, MfKioskPaymentSetting, MfKioskSubmitOrderInstruction, KioskPickAtCounterSettingForm } from '@/modules/order-setting/kiosk/interface';
3
- import type { MfOrderSetting } from "@/modules/order-setting/interface";
4
- import type { OrderKioskSettings, OrderKioskPaymentSetting } from "@entity";
1
+ import {
2
+ OrderSettingsDto,
3
+ OrderKioskDineIn,
4
+ OrderKioskDineInSequenceDto,
5
+ FdoOrderKioskDineInSequence,
6
+ FdoEPaymentMethod
7
+ } from '@entity'
8
+ import type {
9
+ MfKioskOrderSetting,
10
+ MfKioskDineInSetting,
11
+ MfDisplayStandSetting,
12
+ KioskTakeawaySettingForm,
13
+ MfKioskOrderSettingForm,
14
+ MfKioskPaymentSetting,
15
+ MfKioskSubmitOrderInstruction,
16
+ KioskPickAtCounterSettingForm
17
+ } from '@/modules/order-setting/kiosk/interface'
18
+ import type { MfOrderSetting } from '@/modules/order-setting/interface'
19
+ import type { OrderKioskSettings, OrderKioskPaymentSetting } from '@entity'
5
20
 
6
21
  export const defaultDisplayStand: MfDisplayStandSetting = {
7
- enabled: false,
8
- prefix: null,
9
- padDigit: 0,
10
- standSlotRange: {
11
- min: 1,
12
- max: 10,
13
- },
14
- enablePaxDialog: false,
15
- submitOrderInstruction: {
16
- payAtCounter: null,
17
- paid: null,
18
- },
22
+ enabled: false,
23
+ prefix: null,
24
+ padDigit: 0,
25
+ standSlotRange: {
26
+ min: 1,
27
+ max: 10
28
+ },
29
+ enablePaxDialog: false,
30
+ submitOrderInstruction: {
31
+ payAtCounter: null,
32
+ paid: null
33
+ }
19
34
  }
20
35
 
21
36
  export const defaultTakeaway: KioskTakeawaySettingForm = {
22
- enabled: false,
23
- submitOrderInstruction: {
24
- payAtCounter: null,
25
- paid: null,
26
- },
37
+ enabled: false,
38
+ submitOrderInstruction: {
39
+ payAtCounter: null,
40
+ paid: null
41
+ }
27
42
  }
28
43
 
29
44
  export const defaultPickUp: KioskPickAtCounterSettingForm = {
30
- enabled: false,
31
- submitOrderInstruction: {
32
- payAtCounter: null,
33
- paid: null,
34
- },
35
- enablePaxDialog: false,
45
+ enabled: false,
46
+ submitOrderInstruction: {
47
+ payAtCounter: null,
48
+ paid: null
49
+ },
50
+ enablePaxDialog: false
36
51
  }
37
52
 
38
53
  export const defaultKioskOrderSetting: MfKioskOrderSettingForm = {
39
- dineIn: {
40
- enabled: false,
41
- pickUp: defaultPickUp,
42
- sequenceNumber: FdoOrderKioskDineInSequence.parse({}),
43
- displayStand: defaultDisplayStand,
44
- },
45
- takeaway: defaultTakeaway,
46
- paymentSetting: {
47
- paymentTypes: [],
48
- offlinePaymentTypes: [],
49
- ePaymentTypes: {
50
- card: {
51
- terminal: false,
52
- nfc: false
53
- },
54
- eWallet: {
55
- qrPay: false,
56
- scanPay: false
57
- }
58
- },
59
- },
60
- menuItem: {
61
- showAllOnly: false,
54
+ dineIn: {
55
+ enabled: false,
56
+ pickUp: defaultPickUp,
57
+ sequenceNumber: FdoOrderKioskDineInSequence.parse({}),
58
+ displayStand: defaultDisplayStand
59
+ },
60
+ takeaway: defaultTakeaway,
61
+ paymentSetting: {
62
+ paymentTypes: [],
63
+ offlinePaymentTypes: [],
64
+ ePaymentTypes: {
65
+ card: {
66
+ terminal: false,
67
+ nfc: false
68
+ },
69
+ eWallet: {
70
+ qrPay: false,
71
+ scanPay: false,
72
+ terminalScanPay: false,
73
+ terminalQrPay: false
74
+ }
62
75
  }
76
+ },
77
+ menuItem: {
78
+ showAllOnly: false
79
+ }
63
80
  }
64
81
 
65
82
  export const defaultSubmitOrderInstruction: MfKioskSubmitOrderInstruction = {
66
- payAtCounter: null,
67
- paid: null,
83
+ payAtCounter: null,
84
+ paid: null
68
85
  }
69
86
 
70
87
  const convertOrderSettingDto = (dto: OrderSettingsDto): MfOrderSetting => {
71
- return {
72
- kiosk: toKiosk(dto.kioskSettings, dto.sequenceSettings?.kioskDineIn),
73
- };
88
+ return {
89
+ kiosk: toKiosk(dto.kioskSettings, dto.sequenceSettings?.kioskDineIn)
90
+ }
74
91
  }
75
92
 
76
- const toKiosk = (kioskOrderSettings: OrderKioskSettings, kioskDineInSeq?: OrderKioskDineInSequenceDto): MfKioskOrderSetting => {
77
- return {
78
- dineIn: toKioskDineInSetting(kioskDineInSeq ?? {
79
- current: 0,
80
- prefix: '#K',
81
- }, kioskOrderSettings.dineIn ?? undefined),
82
- takeaway: {
83
- enabled: kioskOrderSettings?.canTakeaway ?? false,
84
- submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction ? {
85
- payAtCounter: kioskOrderSettings.takeaway.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
86
- paid: kioskOrderSettings.takeaway.submitOrderInstruction?.paid?.['en'] ?? null,
87
- } : defaultSubmitOrderInstruction,
88
- },
89
- paymentSetting: {
90
- paymentTypes: kioskOrderSettings?.paymentSetting?.paymentTypes ?? [],
91
- offlinePaymentTypes: kioskOrderSettings?.paymentSetting?.offlinePaymentTypes ?? [],
92
- ePaymentTypes: kioskOrderSettings?.paymentSetting?.ePaymentTypes ?? FdoEPaymentMethod.parse({
93
- card: {
94
- terminal: false,
95
- nfc: false
96
- },
97
- eWallet: {
98
- qrPay: false,
99
- scanPay: false
100
- }
101
- }),
102
- },
103
- menuItem: {
104
- showAllOnly: kioskOrderSettings.menuItem?.showAllOnly ?? false,
105
- }
93
+ const toKiosk = (
94
+ kioskOrderSettings: OrderKioskSettings,
95
+ kioskDineInSeq?: OrderKioskDineInSequenceDto
96
+ ): MfKioskOrderSetting => {
97
+ return {
98
+ dineIn: toKioskDineInSetting(
99
+ kioskDineInSeq ?? {
100
+ current: 0,
101
+ prefix: '#K'
102
+ },
103
+ kioskOrderSettings.dineIn ?? undefined
104
+ ),
105
+ takeaway: {
106
+ enabled: kioskOrderSettings?.canTakeaway ?? false,
107
+ submitOrderInstruction: kioskOrderSettings?.takeaway?.submitOrderInstruction
108
+ ? {
109
+ payAtCounter:
110
+ kioskOrderSettings.takeaway.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
111
+ paid: kioskOrderSettings.takeaway.submitOrderInstruction?.paid?.['en'] ?? null
112
+ }
113
+ : defaultSubmitOrderInstruction
114
+ },
115
+ paymentSetting: {
116
+ paymentTypes: kioskOrderSettings?.paymentSetting?.paymentTypes ?? [],
117
+ offlinePaymentTypes: kioskOrderSettings?.paymentSetting?.offlinePaymentTypes ?? [],
118
+ ePaymentTypes:
119
+ kioskOrderSettings?.paymentSetting?.ePaymentTypes ??
120
+ FdoEPaymentMethod.parse({
121
+ card: {
122
+ terminal: false,
123
+ nfc: false
124
+ },
125
+ eWallet: {
126
+ qrPay: false,
127
+ scanPay: false,
128
+ terminalScanPay: false,
129
+ terminalQrPay: false
130
+ }
131
+ })
132
+ },
133
+ menuItem: {
134
+ showAllOnly: kioskOrderSettings.menuItem?.showAllOnly ?? false
106
135
  }
136
+ }
107
137
  }
108
138
 
109
- const toKioskDineInSetting = (kioskDineInSeq: OrderKioskDineInSequenceDto, kioskDineInSetting?: OrderKioskDineIn): MfKioskDineInSetting => {
110
- return {
111
- enabled: !!kioskDineInSetting,
112
- sequenceNumber: kioskDineInSeq,
113
- pickUp: kioskDineInSetting?.pickUp ? {
114
- ...kioskDineInSetting.pickUp,
115
- submitOrderInstruction: kioskDineInSetting.pickUp.submitOrderInstruction ? {
116
- payAtCounter: kioskDineInSetting.pickUp.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
117
- paid: kioskDineInSetting.pickUp.submitOrderInstruction?.paid?.['en'] ?? null,
118
- } : defaultSubmitOrderInstruction,
119
- enablePaxDialog: kioskDineInSetting.pickUp.enablePaxDialog ? kioskDineInSetting.pickUp.enablePaxDialog : false,
120
- } : defaultPickUp,
121
- displayStand: kioskDineInSetting?.displayStand ? {
122
- enabled: kioskDineInSetting.displayStand.enabled,
123
- standSlotRange: kioskDineInSetting.displayStand.standSlotRange,
124
- prefix: kioskDineInSetting.displayStand.prefix,
125
- padDigit: kioskDineInSetting.displayStand.padDigit,
126
- enablePaxDialog: kioskDineInSetting.displayStand.enablePaxDialog ?? false,
127
- submitOrderInstruction: kioskDineInSetting.displayStand.submitOrderInstruction ? {
128
- payAtCounter: kioskDineInSetting.displayStand.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
129
- paid: kioskDineInSetting.displayStand.submitOrderInstruction?.paid?.['en'] ?? null,
130
- } : defaultSubmitOrderInstruction,
131
- } : defaultDisplayStand
132
- }
139
+ const toKioskDineInSetting = (
140
+ kioskDineInSeq: OrderKioskDineInSequenceDto,
141
+ kioskDineInSetting?: OrderKioskDineIn
142
+ ): MfKioskDineInSetting => {
143
+ return {
144
+ enabled: !!kioskDineInSetting,
145
+ sequenceNumber: kioskDineInSeq,
146
+ pickUp: kioskDineInSetting?.pickUp
147
+ ? {
148
+ ...kioskDineInSetting.pickUp,
149
+ submitOrderInstruction: kioskDineInSetting.pickUp.submitOrderInstruction
150
+ ? {
151
+ payAtCounter:
152
+ kioskDineInSetting.pickUp.submitOrderInstruction?.payAtCounter?.['en'] ?? null,
153
+ paid: kioskDineInSetting.pickUp.submitOrderInstruction?.paid?.['en'] ?? null
154
+ }
155
+ : defaultSubmitOrderInstruction,
156
+ enablePaxDialog: kioskDineInSetting.pickUp.enablePaxDialog
157
+ ? kioskDineInSetting.pickUp.enablePaxDialog
158
+ : false
159
+ }
160
+ : defaultPickUp,
161
+ displayStand: kioskDineInSetting?.displayStand
162
+ ? {
163
+ enabled: kioskDineInSetting.displayStand.enabled,
164
+ standSlotRange: kioskDineInSetting.displayStand.standSlotRange,
165
+ prefix: kioskDineInSetting.displayStand.prefix,
166
+ padDigit: kioskDineInSetting.displayStand.padDigit,
167
+ enablePaxDialog: kioskDineInSetting.displayStand.enablePaxDialog ?? false,
168
+ submitOrderInstruction: kioskDineInSetting.displayStand.submitOrderInstruction
169
+ ? {
170
+ payAtCounter:
171
+ kioskDineInSetting.displayStand.submitOrderInstruction?.payAtCounter?.['en'] ??
172
+ null,
173
+ paid: kioskDineInSetting.displayStand.submitOrderInstruction?.paid?.['en'] ?? null
174
+ }
175
+ : defaultSubmitOrderInstruction
176
+ }
177
+ : defaultDisplayStand
178
+ }
133
179
  }
134
- const toOrderKioskSettingsDto = (kioskSetting: MfKioskOrderSetting): {
135
- kioskSettings: OrderKioskSettings,
136
- kioskDineIn?: OrderKioskDineInSequenceDto
180
+ const toOrderKioskSettingsDto = (
181
+ kioskSetting: MfKioskOrderSetting
182
+ ): {
183
+ kioskSettings: OrderKioskSettings
184
+ kioskDineIn?: OrderKioskDineInSequenceDto
137
185
  } => {
138
- const createDineInSettings = (dineInSetting: MfKioskDineInSetting): OrderKioskDineIn => ({
139
- requiredSlot: !!dineInSetting.displayStand,
140
- displayStand: {
141
- ...dineInSetting.displayStand,
142
- submitOrderInstruction: {
143
- payAtCounter: dineInSetting.displayStand.submitOrderInstruction?.payAtCounter ? {
144
- en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter,
145
- } : null,
146
- paid: dineInSetting.displayStand.submitOrderInstruction?.paid ? {
147
- en: dineInSetting.displayStand.submitOrderInstruction.paid,
148
- } : null,
186
+ const createDineInSettings = (dineInSetting: MfKioskDineInSetting): OrderKioskDineIn => ({
187
+ requiredSlot: !!dineInSetting.displayStand,
188
+ displayStand: {
189
+ ...dineInSetting.displayStand,
190
+ submitOrderInstruction: {
191
+ payAtCounter: dineInSetting.displayStand.submitOrderInstruction?.payAtCounter
192
+ ? {
193
+ en: dineInSetting.displayStand.submitOrderInstruction.payAtCounter
149
194
  }
150
- },
151
- pickUp: {
152
- ...dineInSetting.pickUp,
153
- submitOrderInstruction: {
154
- payAtCounter: dineInSetting.pickUp.submitOrderInstruction?.payAtCounter ? {
155
- en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter,
156
- } : null,
157
- paid: dineInSetting.pickUp.submitOrderInstruction?.paid ? {
158
- en: dineInSetting.pickUp.submitOrderInstruction.paid,
159
- } : null,
195
+ : null,
196
+ paid: dineInSetting.displayStand.submitOrderInstruction?.paid
197
+ ? {
198
+ en: dineInSetting.displayStand.submitOrderInstruction.paid
160
199
  }
161
- }
162
- })
163
-
164
- const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
165
- canTakeaway: kioskSetting.takeaway.enabled,
166
- dineIn,
167
- menuItem: kioskSetting.menuItem,
168
- paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
169
- takeaway: kioskSetting.takeaway.submitOrderInstruction ? {
170
- submitOrderInstruction: {
171
- payAtCounter: kioskSetting.takeaway.submitOrderInstruction.payAtCounter ? {
172
- en: kioskSetting.takeaway.submitOrderInstruction.payAtCounter,
173
- } : null,
174
- paid: kioskSetting.takeaway.submitOrderInstruction.paid ? {
175
- en: kioskSetting.takeaway.submitOrderInstruction.paid,
176
- } : null,
200
+ : null
201
+ }
202
+ },
203
+ pickUp: {
204
+ ...dineInSetting.pickUp,
205
+ submitOrderInstruction: {
206
+ payAtCounter: dineInSetting.pickUp.submitOrderInstruction?.payAtCounter
207
+ ? {
208
+ en: dineInSetting.pickUp.submitOrderInstruction.payAtCounter
177
209
  }
178
- } : undefined
179
- })
180
-
181
- const createPaymentSettings = (paymentSetting: MfKioskPaymentSetting): OrderKioskPaymentSetting | undefined => {
182
- return {
183
- paymentTypes: paymentSetting.paymentTypes,
184
- offlinePaymentTypes: paymentSetting.offlinePaymentTypes,
185
- ePaymentTypes: paymentSetting.ePaymentTypes,
186
- }
210
+ : null,
211
+ paid: dineInSetting.pickUp.submitOrderInstruction?.paid
212
+ ? {
213
+ en: dineInSetting.pickUp.submitOrderInstruction.paid
214
+ }
215
+ : null
216
+ }
187
217
  }
218
+ })
188
219
 
189
- if (!kioskSetting.dineIn.enabled) {
190
- return {
191
- kioskSettings: createKioskSettings()
220
+ const createKioskSettings = (dineIn?: OrderKioskDineIn): OrderKioskSettings => ({
221
+ canTakeaway: kioskSetting.takeaway.enabled,
222
+ dineIn,
223
+ menuItem: kioskSetting.menuItem,
224
+ paymentSetting: createPaymentSettings(kioskSetting.paymentSetting),
225
+ takeaway: kioskSetting.takeaway.submitOrderInstruction
226
+ ? {
227
+ submitOrderInstruction: {
228
+ payAtCounter: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
229
+ ? {
230
+ en: kioskSetting.takeaway.submitOrderInstruction.payAtCounter
231
+ }
232
+ : null,
233
+ paid: kioskSetting.takeaway.submitOrderInstruction.paid
234
+ ? {
235
+ en: kioskSetting.takeaway.submitOrderInstruction.paid
236
+ }
237
+ : null
238
+ }
192
239
  }
193
- }
240
+ : undefined
241
+ })
194
242
 
243
+ const createPaymentSettings = (
244
+ paymentSetting: MfKioskPaymentSetting
245
+ ): OrderKioskPaymentSetting | undefined => {
195
246
  return {
196
- kioskSettings: createKioskSettings(createDineInSettings(kioskSetting.dineIn)),
197
- kioskDineIn: kioskSetting.dineIn.sequenceNumber,
247
+ paymentTypes: paymentSetting.paymentTypes,
248
+ offlinePaymentTypes: paymentSetting.offlinePaymentTypes,
249
+ ePaymentTypes: paymentSetting.ePaymentTypes
198
250
  }
199
- }
251
+ }
200
252
 
253
+ if (!kioskSetting.dineIn.enabled) {
254
+ return {
255
+ kioskSettings: createKioskSettings()
256
+ }
257
+ }
201
258
 
259
+ return {
260
+ kioskSettings: createKioskSettings(createDineInSettings(kioskSetting.dineIn)),
261
+ kioskDineIn: kioskSetting.dineIn.sequenceNumber
262
+ }
263
+ }
202
264
 
203
265
  export const OrderSettingMapper = {
204
- convertOrderSettingDto,
205
- toOrderKioskSettingsDto,
206
- };
266
+ convertOrderSettingDto,
267
+ toOrderKioskSettingsDto
268
+ }