@feedmepos/mf-order-setting 0.0.21-beta.2 → 0.0.21-beta.3
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/dist/{KioskDevicesView-TgyDh8aI.js → KioskDevicesView-Cb7Rw7t8.js} +1 -1
- package/dist/{KioskDevicesView.vue_vue_type_script_setup_true_lang-CiYEoMoW.js → KioskDevicesView.vue_vue_type_script_setup_true_lang-raPhhBpi.js} +2 -2
- package/dist/{KioskSettingView-fbOxH9m8.js → KioskSettingView-BQgyeWbo.js} +1 -1
- package/dist/KioskView-BLkuqfZ_.js +371 -0
- package/dist/{OrderSettingsView-mYvRn7u9.js → OrderSettingsView-BJ1b1Qjg.js} +5 -4
- package/dist/{app-A306cfER.js → app-BY258ajB.js} +4 -4
- package/dist/app.js +1 -1
- package/dist/{auth.dto-C5PLip9a.js → auth.dto-BOoRSQkS.js} +21038 -20938
- package/dist/{dayjs.min-CLR5r0qf.js → dayjs.min-4COVK72W.js} +1 -1
- package/dist/frontend/mf-order/src/views/kiosk/KioskSummary.vue.d.ts +1 -0
- package/dist/frontend/mf-order/tsconfig.app.tsbuildinfo +1 -1
- package/dist/{index-BJuGDir8.js → index-t_7ThPjm.js} +2 -2
- package/dist/package/entity/incoming-order/incoming-order.dto.d.ts +3 -0
- package/dist/package/entity/order-platform/foodpanda/foodpanda-order.do.d.ts +93 -0
- package/dist/package/entity/order-platform/foodpanda/foodpanda-order.dto.d.ts +33 -0
- package/dist/package/entity/order-platform/grabfood/grabfood-menu.do.d.ts +1 -0
- package/dist/package/entity/order-platform/grabfood/grabfood-order.do.d.ts +124 -0
- package/dist/package/entity/order-platform/grabfood/grabfood.dto.d.ts +40 -0
- package/package.json +1 -1
- package/src/views/kiosk/KioskSummary.vue +4 -3
- package/src/views/kiosk/KioskView.vue +36 -3
- package/src/views/order-settings/delivery/DeliverySetting.vue +1 -0
- package/dist/KioskView-C0Vn5S89.js +0 -334
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { g as i, s as _, S as p, r as o } from "./dayjs.min-
|
|
2
|
-
import "./auth.dto-
|
|
1
|
+
import { g as i, s as _, S as p, r as o } from "./dayjs.min-4COVK72W.js";
|
|
2
|
+
import "./auth.dto-BOoRSQkS.js";
|
|
3
3
|
async function C() {
|
|
4
4
|
const r = await o().get("/order-settings");
|
|
5
5
|
return i(r);
|
|
@@ -10749,11 +10749,14 @@ export declare const FdtoUpdateIncomingOrder: z.ZodObject<{
|
|
|
10749
10749
|
export declare const FdtoRejectIncomingOrder: z.ZodObject<{
|
|
10750
10750
|
orderId: z.ZodString;
|
|
10751
10751
|
rejectReason: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
10752
|
+
orderCreatedTime: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
10752
10753
|
}, "strip", z.ZodTypeAny, {
|
|
10753
10754
|
rejectReason?: string | null | undefined;
|
|
10755
|
+
orderCreatedTime?: string | null | undefined;
|
|
10754
10756
|
orderId: string;
|
|
10755
10757
|
}, {
|
|
10756
10758
|
rejectReason?: string | null | undefined;
|
|
10759
|
+
orderCreatedTime?: string | null | undefined;
|
|
10757
10760
|
orderId: string;
|
|
10758
10761
|
}>;
|
|
10759
10762
|
export declare const FdtoUpdatePlatformOrder: z.ZodObject<{
|
|
@@ -535,6 +535,19 @@ export declare const FPProduct: z.ZodObject<{
|
|
|
535
535
|
name: string;
|
|
536
536
|
};
|
|
537
537
|
}>;
|
|
538
|
+
export declare const FPCallbackUrls: z.ZodObject<{
|
|
539
|
+
orderAcceptedUrl: z.ZodString;
|
|
540
|
+
orderRejectedUrl: z.ZodString;
|
|
541
|
+
orderPreparedUrl: z.ZodString;
|
|
542
|
+
}, "strip", z.ZodTypeAny, {
|
|
543
|
+
orderAcceptedUrl: string;
|
|
544
|
+
orderRejectedUrl: string;
|
|
545
|
+
orderPreparedUrl: string;
|
|
546
|
+
}, {
|
|
547
|
+
orderAcceptedUrl: string;
|
|
548
|
+
orderRejectedUrl: string;
|
|
549
|
+
orderPreparedUrl: string;
|
|
550
|
+
}>;
|
|
538
551
|
export declare const FPOrder: z.ZodObject<{
|
|
539
552
|
token: z.ZodString;
|
|
540
553
|
code: z.ZodString;
|
|
@@ -970,6 +983,19 @@ export declare const FPOrder: z.ZodObject<{
|
|
|
970
983
|
mobileOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
971
984
|
webOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
972
985
|
vouchers: z.ZodArray<z.ZodString, "many">;
|
|
986
|
+
callbackUrls: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
987
|
+
orderAcceptedUrl: z.ZodString;
|
|
988
|
+
orderRejectedUrl: z.ZodString;
|
|
989
|
+
orderPreparedUrl: z.ZodString;
|
|
990
|
+
}, "strip", z.ZodTypeAny, {
|
|
991
|
+
orderAcceptedUrl: string;
|
|
992
|
+
orderRejectedUrl: string;
|
|
993
|
+
orderPreparedUrl: string;
|
|
994
|
+
}, {
|
|
995
|
+
orderAcceptedUrl: string;
|
|
996
|
+
orderRejectedUrl: string;
|
|
997
|
+
orderPreparedUrl: string;
|
|
998
|
+
}>>>;
|
|
973
999
|
}, "strip", z.ZodTypeAny, {
|
|
974
1000
|
pickup?: {
|
|
975
1001
|
pickupTime?: string | null | undefined;
|
|
@@ -1016,6 +1042,11 @@ export declare const FPOrder: z.ZodObject<{
|
|
|
1016
1042
|
integrationInfo?: unknown;
|
|
1017
1043
|
mobileOrder?: boolean | null | undefined;
|
|
1018
1044
|
webOrder?: boolean | null | undefined;
|
|
1045
|
+
callbackUrls?: {
|
|
1046
|
+
orderAcceptedUrl: string;
|
|
1047
|
+
orderRejectedUrl: string;
|
|
1048
|
+
orderPreparedUrl: string;
|
|
1049
|
+
} | null | undefined;
|
|
1019
1050
|
code: string;
|
|
1020
1051
|
price: {
|
|
1021
1052
|
deliveryFee?: string | null | undefined;
|
|
@@ -1157,6 +1188,11 @@ export declare const FPOrder: z.ZodObject<{
|
|
|
1157
1188
|
integrationInfo?: unknown;
|
|
1158
1189
|
mobileOrder?: boolean | null | undefined;
|
|
1159
1190
|
webOrder?: boolean | null | undefined;
|
|
1191
|
+
callbackUrls?: {
|
|
1192
|
+
orderAcceptedUrl: string;
|
|
1193
|
+
orderRejectedUrl: string;
|
|
1194
|
+
orderPreparedUrl: string;
|
|
1195
|
+
} | null | undefined;
|
|
1160
1196
|
code: string;
|
|
1161
1197
|
price: {
|
|
1162
1198
|
deliveryFee?: string | null | undefined;
|
|
@@ -1701,6 +1737,19 @@ export declare const FdoFoodpandaOrder: z.ZodObject<{
|
|
|
1701
1737
|
mobileOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
1702
1738
|
webOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
1703
1739
|
vouchers: z.ZodArray<z.ZodString, "many">;
|
|
1740
|
+
callbackUrls: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
1741
|
+
orderAcceptedUrl: z.ZodString;
|
|
1742
|
+
orderRejectedUrl: z.ZodString;
|
|
1743
|
+
orderPreparedUrl: z.ZodString;
|
|
1744
|
+
}, "strip", z.ZodTypeAny, {
|
|
1745
|
+
orderAcceptedUrl: string;
|
|
1746
|
+
orderRejectedUrl: string;
|
|
1747
|
+
orderPreparedUrl: string;
|
|
1748
|
+
}, {
|
|
1749
|
+
orderAcceptedUrl: string;
|
|
1750
|
+
orderRejectedUrl: string;
|
|
1751
|
+
orderPreparedUrl: string;
|
|
1752
|
+
}>>>;
|
|
1704
1753
|
}, "strip", z.ZodTypeAny, {
|
|
1705
1754
|
pickup?: {
|
|
1706
1755
|
pickupTime?: string | null | undefined;
|
|
@@ -1747,6 +1796,11 @@ export declare const FdoFoodpandaOrder: z.ZodObject<{
|
|
|
1747
1796
|
integrationInfo?: unknown;
|
|
1748
1797
|
mobileOrder?: boolean | null | undefined;
|
|
1749
1798
|
webOrder?: boolean | null | undefined;
|
|
1799
|
+
callbackUrls?: {
|
|
1800
|
+
orderAcceptedUrl: string;
|
|
1801
|
+
orderRejectedUrl: string;
|
|
1802
|
+
orderPreparedUrl: string;
|
|
1803
|
+
} | null | undefined;
|
|
1750
1804
|
code: string;
|
|
1751
1805
|
price: {
|
|
1752
1806
|
deliveryFee?: string | null | undefined;
|
|
@@ -1888,6 +1942,11 @@ export declare const FdoFoodpandaOrder: z.ZodObject<{
|
|
|
1888
1942
|
integrationInfo?: unknown;
|
|
1889
1943
|
mobileOrder?: boolean | null | undefined;
|
|
1890
1944
|
webOrder?: boolean | null | undefined;
|
|
1945
|
+
callbackUrls?: {
|
|
1946
|
+
orderAcceptedUrl: string;
|
|
1947
|
+
orderRejectedUrl: string;
|
|
1948
|
+
orderPreparedUrl: string;
|
|
1949
|
+
} | null | undefined;
|
|
1891
1950
|
code: string;
|
|
1892
1951
|
price: {
|
|
1893
1952
|
deliveryFee?: string | null | undefined;
|
|
@@ -2036,6 +2095,11 @@ export declare const FdoFoodpandaOrder: z.ZodObject<{
|
|
|
2036
2095
|
integrationInfo?: unknown;
|
|
2037
2096
|
mobileOrder?: boolean | null | undefined;
|
|
2038
2097
|
webOrder?: boolean | null | undefined;
|
|
2098
|
+
callbackUrls?: {
|
|
2099
|
+
orderAcceptedUrl: string;
|
|
2100
|
+
orderRejectedUrl: string;
|
|
2101
|
+
orderPreparedUrl: string;
|
|
2102
|
+
} | null | undefined;
|
|
2039
2103
|
code: string;
|
|
2040
2104
|
price: {
|
|
2041
2105
|
deliveryFee?: string | null | undefined;
|
|
@@ -2185,6 +2249,11 @@ export declare const FdoFoodpandaOrder: z.ZodObject<{
|
|
|
2185
2249
|
integrationInfo?: unknown;
|
|
2186
2250
|
mobileOrder?: boolean | null | undefined;
|
|
2187
2251
|
webOrder?: boolean | null | undefined;
|
|
2252
|
+
callbackUrls?: {
|
|
2253
|
+
orderAcceptedUrl: string;
|
|
2254
|
+
orderRejectedUrl: string;
|
|
2255
|
+
orderPreparedUrl: string;
|
|
2256
|
+
} | null | undefined;
|
|
2188
2257
|
code: string;
|
|
2189
2258
|
price: {
|
|
2190
2259
|
deliveryFee?: string | null | undefined;
|
|
@@ -3335,6 +3404,19 @@ declare const FPOrderDetailRes: z.ZodObject<z.extendShape<{
|
|
|
3335
3404
|
mobileOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
3336
3405
|
webOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
3337
3406
|
vouchers: z.ZodArray<z.ZodString, "many">;
|
|
3407
|
+
callbackUrls: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
3408
|
+
orderAcceptedUrl: z.ZodString;
|
|
3409
|
+
orderRejectedUrl: z.ZodString;
|
|
3410
|
+
orderPreparedUrl: z.ZodString;
|
|
3411
|
+
}, "strip", z.ZodTypeAny, {
|
|
3412
|
+
orderAcceptedUrl: string;
|
|
3413
|
+
orderRejectedUrl: string;
|
|
3414
|
+
orderPreparedUrl: string;
|
|
3415
|
+
}, {
|
|
3416
|
+
orderAcceptedUrl: string;
|
|
3417
|
+
orderRejectedUrl: string;
|
|
3418
|
+
orderPreparedUrl: string;
|
|
3419
|
+
}>>>;
|
|
3338
3420
|
}, {
|
|
3339
3421
|
status: z.ZodEnum<["pending", "accepted", "cancelled"]>;
|
|
3340
3422
|
reason: z.ZodNullable<z.ZodOptional<z.ZodAny>>;
|
|
@@ -3385,6 +3467,11 @@ declare const FPOrderDetailRes: z.ZodObject<z.extendShape<{
|
|
|
3385
3467
|
integrationInfo?: unknown;
|
|
3386
3468
|
mobileOrder?: boolean | null | undefined;
|
|
3387
3469
|
webOrder?: boolean | null | undefined;
|
|
3470
|
+
callbackUrls?: {
|
|
3471
|
+
orderAcceptedUrl: string;
|
|
3472
|
+
orderRejectedUrl: string;
|
|
3473
|
+
orderPreparedUrl: string;
|
|
3474
|
+
} | null | undefined;
|
|
3388
3475
|
code: string;
|
|
3389
3476
|
status: "cancelled" | "pending" | "accepted";
|
|
3390
3477
|
price: {
|
|
@@ -3528,6 +3615,11 @@ declare const FPOrderDetailRes: z.ZodObject<z.extendShape<{
|
|
|
3528
3615
|
integrationInfo?: unknown;
|
|
3529
3616
|
mobileOrder?: boolean | null | undefined;
|
|
3530
3617
|
webOrder?: boolean | null | undefined;
|
|
3618
|
+
callbackUrls?: {
|
|
3619
|
+
orderAcceptedUrl: string;
|
|
3620
|
+
orderRejectedUrl: string;
|
|
3621
|
+
orderPreparedUrl: string;
|
|
3622
|
+
} | null | undefined;
|
|
3531
3623
|
code: string;
|
|
3532
3624
|
status: "cancelled" | "pending" | "accepted";
|
|
3533
3625
|
price: {
|
|
@@ -3775,6 +3867,7 @@ export type FPProductItem = z.infer<typeof FPProductItem>;
|
|
|
3775
3867
|
export type FPProductVariation = z.infer<typeof FPProductVariation>;
|
|
3776
3868
|
export type FPProductVariationToppingTemplates = z.infer<typeof FPProductVariationToppingTemplates>;
|
|
3777
3869
|
export type FPToppingTemplateProducts = z.infer<typeof FPToppingTemplateProducts>;
|
|
3870
|
+
export type FPCallbackUrls = z.infer<typeof FPCallbackUrls>;
|
|
3778
3871
|
export type FPToppingTemplates = z.infer<typeof FPToppingTemplates>;
|
|
3779
3872
|
export type FPMenuProducts = z.infer<typeof FPMenuProducts>;
|
|
3780
3873
|
export type FPMenuCategories = z.infer<typeof FPMenuCategories>;
|
|
@@ -478,6 +478,19 @@ export declare const FdoFoodpandaOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
478
478
|
mobileOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
479
479
|
webOrder: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
|
|
480
480
|
vouchers: z.ZodArray<z.ZodString, "many">;
|
|
481
|
+
callbackUrls: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
482
|
+
orderAcceptedUrl: z.ZodString;
|
|
483
|
+
orderRejectedUrl: z.ZodString;
|
|
484
|
+
orderPreparedUrl: z.ZodString;
|
|
485
|
+
}, "strip", z.ZodTypeAny, {
|
|
486
|
+
orderAcceptedUrl: string;
|
|
487
|
+
orderRejectedUrl: string;
|
|
488
|
+
orderPreparedUrl: string;
|
|
489
|
+
}, {
|
|
490
|
+
orderAcceptedUrl: string;
|
|
491
|
+
orderRejectedUrl: string;
|
|
492
|
+
orderPreparedUrl: string;
|
|
493
|
+
}>>>;
|
|
481
494
|
}, "strip", z.ZodTypeAny, {
|
|
482
495
|
pickup?: {
|
|
483
496
|
pickupTime?: string | null | undefined;
|
|
@@ -524,6 +537,11 @@ export declare const FdoFoodpandaOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
524
537
|
integrationInfo?: unknown;
|
|
525
538
|
mobileOrder?: boolean | null | undefined;
|
|
526
539
|
webOrder?: boolean | null | undefined;
|
|
540
|
+
callbackUrls?: {
|
|
541
|
+
orderAcceptedUrl: string;
|
|
542
|
+
orderRejectedUrl: string;
|
|
543
|
+
orderPreparedUrl: string;
|
|
544
|
+
} | null | undefined;
|
|
527
545
|
code: string;
|
|
528
546
|
price: {
|
|
529
547
|
deliveryFee?: string | null | undefined;
|
|
@@ -665,6 +683,11 @@ export declare const FdoFoodpandaOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
665
683
|
integrationInfo?: unknown;
|
|
666
684
|
mobileOrder?: boolean | null | undefined;
|
|
667
685
|
webOrder?: boolean | null | undefined;
|
|
686
|
+
callbackUrls?: {
|
|
687
|
+
orderAcceptedUrl: string;
|
|
688
|
+
orderRejectedUrl: string;
|
|
689
|
+
orderPreparedUrl: string;
|
|
690
|
+
} | null | undefined;
|
|
668
691
|
code: string;
|
|
669
692
|
price: {
|
|
670
693
|
deliveryFee?: string | null | undefined;
|
|
@@ -3986,6 +4009,11 @@ export declare const FdoFoodpandaOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
3986
4009
|
integrationInfo?: unknown;
|
|
3987
4010
|
mobileOrder?: boolean | null | undefined;
|
|
3988
4011
|
webOrder?: boolean | null | undefined;
|
|
4012
|
+
callbackUrls?: {
|
|
4013
|
+
orderAcceptedUrl: string;
|
|
4014
|
+
orderRejectedUrl: string;
|
|
4015
|
+
orderPreparedUrl: string;
|
|
4016
|
+
} | null | undefined;
|
|
3989
4017
|
code: string;
|
|
3990
4018
|
price: {
|
|
3991
4019
|
deliveryFee?: string | null | undefined;
|
|
@@ -4508,6 +4536,11 @@ export declare const FdoFoodpandaOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
4508
4536
|
integrationInfo?: unknown;
|
|
4509
4537
|
mobileOrder?: boolean | null | undefined;
|
|
4510
4538
|
webOrder?: boolean | null | undefined;
|
|
4539
|
+
callbackUrls?: {
|
|
4540
|
+
orderAcceptedUrl: string;
|
|
4541
|
+
orderRejectedUrl: string;
|
|
4542
|
+
orderPreparedUrl: string;
|
|
4543
|
+
} | null | undefined;
|
|
4511
4544
|
code: string;
|
|
4512
4545
|
price: {
|
|
4513
4546
|
deliveryFee?: string | null | undefined;
|
|
@@ -2629,4 +2629,5 @@ export type GFMenuServiceHoursV2 = z.infer<typeof GFMenuServiceHoursV2>;
|
|
|
2629
2629
|
export type GFMenuServicePeriodsV2 = z.infer<typeof GFMenuServicePeriodsV2>;
|
|
2630
2630
|
export type GFModifierGroupV2 = z.infer<typeof GFModifierGroupV2>;
|
|
2631
2631
|
export type GFModifierV2 = z.infer<typeof GFModifierV2>;
|
|
2632
|
+
export type GFMenuTimeRange = z.infer<typeof GFMenuTimeRange>;
|
|
2632
2633
|
export {};
|
|
@@ -411,6 +411,22 @@ export declare const GFOrderReceiver: z.ZodObject<{
|
|
|
411
411
|
} | null | undefined;
|
|
412
412
|
phones?: string | null | undefined;
|
|
413
413
|
}>;
|
|
414
|
+
export declare const GFOrderReadyEstimation: z.ZodObject<{
|
|
415
|
+
allowChange: z.ZodBoolean;
|
|
416
|
+
estimatedOrderReadyTime: z.ZodString;
|
|
417
|
+
maxOrderReadyTime: z.ZodString;
|
|
418
|
+
newOrderReadyTime: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
419
|
+
}, "strip", z.ZodTypeAny, {
|
|
420
|
+
newOrderReadyTime?: string | null | undefined;
|
|
421
|
+
allowChange: boolean;
|
|
422
|
+
estimatedOrderReadyTime: string;
|
|
423
|
+
maxOrderReadyTime: string;
|
|
424
|
+
}, {
|
|
425
|
+
newOrderReadyTime?: string | null | undefined;
|
|
426
|
+
allowChange: boolean;
|
|
427
|
+
estimatedOrderReadyTime: string;
|
|
428
|
+
maxOrderReadyTime: string;
|
|
429
|
+
}>;
|
|
414
430
|
export declare const GFOrder: z.ZodObject<{
|
|
415
431
|
paymentType: z.ZodEnum<["CASH", "CASHLESS"]>;
|
|
416
432
|
orderID: z.ZodString;
|
|
@@ -745,6 +761,22 @@ export declare const GFOrder: z.ZodObject<{
|
|
|
745
761
|
} | null | undefined;
|
|
746
762
|
phones?: string | null | undefined;
|
|
747
763
|
}>>>;
|
|
764
|
+
orderReadyEstimation: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
765
|
+
allowChange: z.ZodBoolean;
|
|
766
|
+
estimatedOrderReadyTime: z.ZodString;
|
|
767
|
+
maxOrderReadyTime: z.ZodString;
|
|
768
|
+
newOrderReadyTime: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
769
|
+
}, "strip", z.ZodTypeAny, {
|
|
770
|
+
newOrderReadyTime?: string | null | undefined;
|
|
771
|
+
allowChange: boolean;
|
|
772
|
+
estimatedOrderReadyTime: string;
|
|
773
|
+
maxOrderReadyTime: string;
|
|
774
|
+
}, {
|
|
775
|
+
newOrderReadyTime?: string | null | undefined;
|
|
776
|
+
allowChange: boolean;
|
|
777
|
+
estimatedOrderReadyTime: string;
|
|
778
|
+
maxOrderReadyTime: string;
|
|
779
|
+
}>>>;
|
|
748
780
|
}, "strip", z.ZodTypeAny, {
|
|
749
781
|
receiver?: {
|
|
750
782
|
name?: string | null | undefined;
|
|
@@ -787,6 +819,12 @@ export declare const GFOrder: z.ZodObject<{
|
|
|
787
819
|
submitTime?: string | null | undefined;
|
|
788
820
|
completeTime?: string | null | undefined;
|
|
789
821
|
scheduledTime?: string | null | undefined;
|
|
822
|
+
orderReadyEstimation?: {
|
|
823
|
+
newOrderReadyTime?: string | null | undefined;
|
|
824
|
+
allowChange: boolean;
|
|
825
|
+
estimatedOrderReadyTime: string;
|
|
826
|
+
maxOrderReadyTime: string;
|
|
827
|
+
} | null | undefined;
|
|
790
828
|
price: {
|
|
791
829
|
deliveryFee?: number | null | undefined;
|
|
792
830
|
tax?: number | null | undefined;
|
|
@@ -881,6 +919,12 @@ export declare const GFOrder: z.ZodObject<{
|
|
|
881
919
|
submitTime?: string | null | undefined;
|
|
882
920
|
completeTime?: string | null | undefined;
|
|
883
921
|
scheduledTime?: string | null | undefined;
|
|
922
|
+
orderReadyEstimation?: {
|
|
923
|
+
newOrderReadyTime?: string | null | undefined;
|
|
924
|
+
allowChange: boolean;
|
|
925
|
+
estimatedOrderReadyTime: string;
|
|
926
|
+
maxOrderReadyTime: string;
|
|
927
|
+
} | null | undefined;
|
|
884
928
|
price: {
|
|
885
929
|
deliveryFee?: number | null | undefined;
|
|
886
930
|
tax?: number | null | undefined;
|
|
@@ -1280,6 +1324,22 @@ export declare const FdoGrabfoodOrder: z.ZodObject<{
|
|
|
1280
1324
|
} | null | undefined;
|
|
1281
1325
|
phones?: string | null | undefined;
|
|
1282
1326
|
}>>>;
|
|
1327
|
+
orderReadyEstimation: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
1328
|
+
allowChange: z.ZodBoolean;
|
|
1329
|
+
estimatedOrderReadyTime: z.ZodString;
|
|
1330
|
+
maxOrderReadyTime: z.ZodString;
|
|
1331
|
+
newOrderReadyTime: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
1332
|
+
}, "strip", z.ZodTypeAny, {
|
|
1333
|
+
newOrderReadyTime?: string | null | undefined;
|
|
1334
|
+
allowChange: boolean;
|
|
1335
|
+
estimatedOrderReadyTime: string;
|
|
1336
|
+
maxOrderReadyTime: string;
|
|
1337
|
+
}, {
|
|
1338
|
+
newOrderReadyTime?: string | null | undefined;
|
|
1339
|
+
allowChange: boolean;
|
|
1340
|
+
estimatedOrderReadyTime: string;
|
|
1341
|
+
maxOrderReadyTime: string;
|
|
1342
|
+
}>>>;
|
|
1283
1343
|
}, "strip", z.ZodTypeAny, {
|
|
1284
1344
|
receiver?: {
|
|
1285
1345
|
name?: string | null | undefined;
|
|
@@ -1322,6 +1382,12 @@ export declare const FdoGrabfoodOrder: z.ZodObject<{
|
|
|
1322
1382
|
submitTime?: string | null | undefined;
|
|
1323
1383
|
completeTime?: string | null | undefined;
|
|
1324
1384
|
scheduledTime?: string | null | undefined;
|
|
1385
|
+
orderReadyEstimation?: {
|
|
1386
|
+
newOrderReadyTime?: string | null | undefined;
|
|
1387
|
+
allowChange: boolean;
|
|
1388
|
+
estimatedOrderReadyTime: string;
|
|
1389
|
+
maxOrderReadyTime: string;
|
|
1390
|
+
} | null | undefined;
|
|
1325
1391
|
price: {
|
|
1326
1392
|
deliveryFee?: number | null | undefined;
|
|
1327
1393
|
tax?: number | null | undefined;
|
|
@@ -1416,6 +1482,12 @@ export declare const FdoGrabfoodOrder: z.ZodObject<{
|
|
|
1416
1482
|
submitTime?: string | null | undefined;
|
|
1417
1483
|
completeTime?: string | null | undefined;
|
|
1418
1484
|
scheduledTime?: string | null | undefined;
|
|
1485
|
+
orderReadyEstimation?: {
|
|
1486
|
+
newOrderReadyTime?: string | null | undefined;
|
|
1487
|
+
allowChange: boolean;
|
|
1488
|
+
estimatedOrderReadyTime: string;
|
|
1489
|
+
maxOrderReadyTime: string;
|
|
1490
|
+
} | null | undefined;
|
|
1419
1491
|
price: {
|
|
1420
1492
|
deliveryFee?: number | null | undefined;
|
|
1421
1493
|
tax?: number | null | undefined;
|
|
@@ -1517,6 +1589,12 @@ export declare const FdoGrabfoodOrder: z.ZodObject<{
|
|
|
1517
1589
|
submitTime?: string | null | undefined;
|
|
1518
1590
|
completeTime?: string | null | undefined;
|
|
1519
1591
|
scheduledTime?: string | null | undefined;
|
|
1592
|
+
orderReadyEstimation?: {
|
|
1593
|
+
newOrderReadyTime?: string | null | undefined;
|
|
1594
|
+
allowChange: boolean;
|
|
1595
|
+
estimatedOrderReadyTime: string;
|
|
1596
|
+
maxOrderReadyTime: string;
|
|
1597
|
+
} | null | undefined;
|
|
1520
1598
|
price: {
|
|
1521
1599
|
deliveryFee?: number | null | undefined;
|
|
1522
1600
|
tax?: number | null | undefined;
|
|
@@ -1618,6 +1696,12 @@ export declare const FdoGrabfoodOrder: z.ZodObject<{
|
|
|
1618
1696
|
submitTime?: string | null | undefined;
|
|
1619
1697
|
completeTime?: string | null | undefined;
|
|
1620
1698
|
scheduledTime?: string | null | undefined;
|
|
1699
|
+
orderReadyEstimation?: {
|
|
1700
|
+
newOrderReadyTime?: string | null | undefined;
|
|
1701
|
+
allowChange: boolean;
|
|
1702
|
+
estimatedOrderReadyTime: string;
|
|
1703
|
+
maxOrderReadyTime: string;
|
|
1704
|
+
} | null | undefined;
|
|
1621
1705
|
price: {
|
|
1622
1706
|
deliveryFee?: number | null | undefined;
|
|
1623
1707
|
tax?: number | null | undefined;
|
|
@@ -2018,6 +2102,22 @@ export declare const FdoGrabfoodOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
2018
2102
|
} | null | undefined;
|
|
2019
2103
|
phones?: string | null | undefined;
|
|
2020
2104
|
}>>>;
|
|
2105
|
+
orderReadyEstimation: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
2106
|
+
allowChange: z.ZodBoolean;
|
|
2107
|
+
estimatedOrderReadyTime: z.ZodString;
|
|
2108
|
+
maxOrderReadyTime: z.ZodString;
|
|
2109
|
+
newOrderReadyTime: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
2110
|
+
}, "strip", z.ZodTypeAny, {
|
|
2111
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2112
|
+
allowChange: boolean;
|
|
2113
|
+
estimatedOrderReadyTime: string;
|
|
2114
|
+
maxOrderReadyTime: string;
|
|
2115
|
+
}, {
|
|
2116
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2117
|
+
allowChange: boolean;
|
|
2118
|
+
estimatedOrderReadyTime: string;
|
|
2119
|
+
maxOrderReadyTime: string;
|
|
2120
|
+
}>>>;
|
|
2021
2121
|
}, "strip", z.ZodTypeAny, {
|
|
2022
2122
|
receiver?: {
|
|
2023
2123
|
name?: string | null | undefined;
|
|
@@ -2060,6 +2160,12 @@ export declare const FdoGrabfoodOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
2060
2160
|
submitTime?: string | null | undefined;
|
|
2061
2161
|
completeTime?: string | null | undefined;
|
|
2062
2162
|
scheduledTime?: string | null | undefined;
|
|
2163
|
+
orderReadyEstimation?: {
|
|
2164
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2165
|
+
allowChange: boolean;
|
|
2166
|
+
estimatedOrderReadyTime: string;
|
|
2167
|
+
maxOrderReadyTime: string;
|
|
2168
|
+
} | null | undefined;
|
|
2063
2169
|
price: {
|
|
2064
2170
|
deliveryFee?: number | null | undefined;
|
|
2065
2171
|
tax?: number | null | undefined;
|
|
@@ -2154,6 +2260,12 @@ export declare const FdoGrabfoodOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
2154
2260
|
submitTime?: string | null | undefined;
|
|
2155
2261
|
completeTime?: string | null | undefined;
|
|
2156
2262
|
scheduledTime?: string | null | undefined;
|
|
2263
|
+
orderReadyEstimation?: {
|
|
2264
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2265
|
+
allowChange: boolean;
|
|
2266
|
+
estimatedOrderReadyTime: string;
|
|
2267
|
+
maxOrderReadyTime: string;
|
|
2268
|
+
} | null | undefined;
|
|
2157
2269
|
price: {
|
|
2158
2270
|
deliveryFee?: number | null | undefined;
|
|
2159
2271
|
tax?: number | null | undefined;
|
|
@@ -5428,6 +5540,12 @@ export declare const FdoGrabfoodOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
5428
5540
|
submitTime?: string | null | undefined;
|
|
5429
5541
|
completeTime?: string | null | undefined;
|
|
5430
5542
|
scheduledTime?: string | null | undefined;
|
|
5543
|
+
orderReadyEstimation?: {
|
|
5544
|
+
newOrderReadyTime?: string | null | undefined;
|
|
5545
|
+
allowChange: boolean;
|
|
5546
|
+
estimatedOrderReadyTime: string;
|
|
5547
|
+
maxOrderReadyTime: string;
|
|
5548
|
+
} | null | undefined;
|
|
5431
5549
|
price: {
|
|
5432
5550
|
deliveryFee?: number | null | undefined;
|
|
5433
5551
|
tax?: number | null | undefined;
|
|
@@ -5902,6 +6020,12 @@ export declare const FdoGrabfoodOrderOutput: z.ZodObject<z.extendShape<{
|
|
|
5902
6020
|
submitTime?: string | null | undefined;
|
|
5903
6021
|
completeTime?: string | null | undefined;
|
|
5904
6022
|
scheduledTime?: string | null | undefined;
|
|
6023
|
+
orderReadyEstimation?: {
|
|
6024
|
+
newOrderReadyTime?: string | null | undefined;
|
|
6025
|
+
allowChange: boolean;
|
|
6026
|
+
estimatedOrderReadyTime: string;
|
|
6027
|
+
maxOrderReadyTime: string;
|
|
6028
|
+
} | null | undefined;
|
|
5905
6029
|
price: {
|
|
5906
6030
|
deliveryFee?: number | null | undefined;
|
|
5907
6031
|
tax?: number | null | undefined;
|
|
@@ -2182,6 +2182,22 @@ export declare const GFListOrdersRes: z.ZodObject<{
|
|
|
2182
2182
|
} | null | undefined;
|
|
2183
2183
|
phones?: string | null | undefined;
|
|
2184
2184
|
}>>>;
|
|
2185
|
+
orderReadyEstimation: z.ZodNullable<z.ZodOptional<z.ZodObject<{
|
|
2186
|
+
allowChange: z.ZodBoolean;
|
|
2187
|
+
estimatedOrderReadyTime: z.ZodString;
|
|
2188
|
+
maxOrderReadyTime: z.ZodString;
|
|
2189
|
+
newOrderReadyTime: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
2190
|
+
}, "strip", z.ZodTypeAny, {
|
|
2191
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2192
|
+
allowChange: boolean;
|
|
2193
|
+
estimatedOrderReadyTime: string;
|
|
2194
|
+
maxOrderReadyTime: string;
|
|
2195
|
+
}, {
|
|
2196
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2197
|
+
allowChange: boolean;
|
|
2198
|
+
estimatedOrderReadyTime: string;
|
|
2199
|
+
maxOrderReadyTime: string;
|
|
2200
|
+
}>>>;
|
|
2185
2201
|
}, "strip", z.ZodTypeAny, {
|
|
2186
2202
|
receiver?: {
|
|
2187
2203
|
name?: string | null | undefined;
|
|
@@ -2224,6 +2240,12 @@ export declare const GFListOrdersRes: z.ZodObject<{
|
|
|
2224
2240
|
submitTime?: string | null | undefined;
|
|
2225
2241
|
completeTime?: string | null | undefined;
|
|
2226
2242
|
scheduledTime?: string | null | undefined;
|
|
2243
|
+
orderReadyEstimation?: {
|
|
2244
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2245
|
+
allowChange: boolean;
|
|
2246
|
+
estimatedOrderReadyTime: string;
|
|
2247
|
+
maxOrderReadyTime: string;
|
|
2248
|
+
} | null | undefined;
|
|
2227
2249
|
price: {
|
|
2228
2250
|
deliveryFee?: number | null | undefined;
|
|
2229
2251
|
tax?: number | null | undefined;
|
|
@@ -2318,6 +2340,12 @@ export declare const GFListOrdersRes: z.ZodObject<{
|
|
|
2318
2340
|
submitTime?: string | null | undefined;
|
|
2319
2341
|
completeTime?: string | null | undefined;
|
|
2320
2342
|
scheduledTime?: string | null | undefined;
|
|
2343
|
+
orderReadyEstimation?: {
|
|
2344
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2345
|
+
allowChange: boolean;
|
|
2346
|
+
estimatedOrderReadyTime: string;
|
|
2347
|
+
maxOrderReadyTime: string;
|
|
2348
|
+
} | null | undefined;
|
|
2321
2349
|
price: {
|
|
2322
2350
|
deliveryFee?: number | null | undefined;
|
|
2323
2351
|
tax?: number | null | undefined;
|
|
@@ -2414,6 +2442,12 @@ export declare const GFListOrdersRes: z.ZodObject<{
|
|
|
2414
2442
|
submitTime?: string | null | undefined;
|
|
2415
2443
|
completeTime?: string | null | undefined;
|
|
2416
2444
|
scheduledTime?: string | null | undefined;
|
|
2445
|
+
orderReadyEstimation?: {
|
|
2446
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2447
|
+
allowChange: boolean;
|
|
2448
|
+
estimatedOrderReadyTime: string;
|
|
2449
|
+
maxOrderReadyTime: string;
|
|
2450
|
+
} | null | undefined;
|
|
2417
2451
|
price: {
|
|
2418
2452
|
deliveryFee?: number | null | undefined;
|
|
2419
2453
|
tax?: number | null | undefined;
|
|
@@ -2511,6 +2545,12 @@ export declare const GFListOrdersRes: z.ZodObject<{
|
|
|
2511
2545
|
submitTime?: string | null | undefined;
|
|
2512
2546
|
completeTime?: string | null | undefined;
|
|
2513
2547
|
scheduledTime?: string | null | undefined;
|
|
2548
|
+
orderReadyEstimation?: {
|
|
2549
|
+
newOrderReadyTime?: string | null | undefined;
|
|
2550
|
+
allowChange: boolean;
|
|
2551
|
+
estimatedOrderReadyTime: string;
|
|
2552
|
+
maxOrderReadyTime: string;
|
|
2553
|
+
} | null | undefined;
|
|
2514
2554
|
price: {
|
|
2515
2555
|
deliveryFee?: number | null | undefined;
|
|
2516
2556
|
tax?: number | null | undefined;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="p-[1.5rem] border fm-corner-radius-lg flex flex-col gap-5">
|
|
3
|
-
<span class="fm-typo-en-title-sm-600">{{ t('order.kioskSummary') }}</span>
|
|
4
|
-
<hr class="my-[0.25rem]" />
|
|
2
|
+
<div :class="dialogType ? '' : ['p-[1.5rem] border fm-corner-radius-lg flex flex-col gap-5 fixed ml-40 w-[320px]']">
|
|
3
|
+
<span v-if="!dialogType" class="fm-typo-en-title-sm-600">{{ t('order.kioskSummary') }}</span>
|
|
4
|
+
<hr v-if="!dialogType" class="my-[0.25rem]" />
|
|
5
5
|
<div class="flex flex-col gap-1">
|
|
6
6
|
<div class="flex flex-col gap-1">
|
|
7
7
|
<span class="fm-typo-en-body-lg-400 text-fm-color-typo-secondary">{{ t('order.kioskDisplay') }}</span>
|
|
@@ -59,6 +59,7 @@ interface Props {
|
|
|
59
59
|
restaurantId: string,
|
|
60
60
|
devices: MfKioskDevice[],
|
|
61
61
|
kioskOrderSetting: MfKioskOrderSetting | undefined,
|
|
62
|
+
dialogType: boolean
|
|
62
63
|
// getOrderSetting : () => MfKioskOrderSetting | undefined,
|
|
63
64
|
}
|
|
64
65
|
const props = defineProps<Props>();
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="py-[1.5rem]">
|
|
3
|
-
<FmPageHead :title="t('order.kiosk')"
|
|
3
|
+
<FmPageHead :title="t('order.kiosk')">
|
|
4
|
+
<template #append>
|
|
5
|
+
<FmButton
|
|
6
|
+
v-show="isMobile"
|
|
7
|
+
icon="info"
|
|
8
|
+
variant="tertiary"
|
|
9
|
+
@click="openKioskSummaryDialog"
|
|
10
|
+
/>
|
|
11
|
+
</template>
|
|
12
|
+
</FmPageHead>
|
|
4
13
|
<div class="flex px-[1.5rem]">
|
|
5
14
|
<div class="flex-[2_2_0%]">
|
|
6
15
|
<FmTabs v-model:model-value="selectedMenuItem" :items="menuItems"></FmTabs>
|
|
@@ -32,20 +41,28 @@
|
|
|
32
41
|
</div>
|
|
33
42
|
</div>
|
|
34
43
|
</div>
|
|
35
|
-
<div class="flex-[1_1_0%]">
|
|
44
|
+
<div v-if="!isMobile" class="flex-[1_1_0%]">
|
|
36
45
|
<KioskSummary
|
|
37
46
|
:restaurant-id="currentRestaurantId"
|
|
38
47
|
:devices="devices"
|
|
39
48
|
:kiosk-order-setting="OrderSettingStore.state.kiosk"
|
|
49
|
+
:dialogType="false"
|
|
40
50
|
/>
|
|
41
51
|
</div>
|
|
42
52
|
</div>
|
|
43
53
|
</div>
|
|
44
54
|
</template>
|
|
55
|
+
|
|
45
56
|
<script setup lang="ts">
|
|
46
57
|
import KioskDevicesView from '@/views/kiosk/devices/KioskDevicesView.vue'
|
|
47
58
|
import KioskSummary from '@/views/kiosk/KioskSummary.vue'
|
|
48
|
-
import {
|
|
59
|
+
import {
|
|
60
|
+
useDialog,
|
|
61
|
+
useSnackbar,
|
|
62
|
+
type FmTabProps,
|
|
63
|
+
type ISelectItem,
|
|
64
|
+
useBreakpoints
|
|
65
|
+
} from '@feedmepos/ui-library'
|
|
49
66
|
import { ref, computed, defineAsyncComponent, watch } from 'vue'
|
|
50
67
|
import { useKioskStore } from '@/stores/kiosk'
|
|
51
68
|
import type { MfKioskDevice } from '@/modules/kiosk/interface'
|
|
@@ -71,6 +88,9 @@ const Dialog = useDialog()
|
|
|
71
88
|
const { currentRestaurant, restaurants, changeRestaurant } = useCoreStore()
|
|
72
89
|
const SnackBar = useSnackbar()
|
|
73
90
|
|
|
91
|
+
const breakpoint = useBreakpoints()
|
|
92
|
+
const isMobile = computed(() => breakpoint.breakpoints.value.xs)
|
|
93
|
+
|
|
74
94
|
const currentSelect = ref<string | undefined>(currentRestaurant.value?._id ?? undefined)
|
|
75
95
|
|
|
76
96
|
const restaurantItems = computed<ISelectItem[]>(() => {
|
|
@@ -82,6 +102,19 @@ const restaurantItems = computed<ISelectItem[]>(() => {
|
|
|
82
102
|
|
|
83
103
|
const currentRestaurantId = ref<string>(currentRestaurant.value?._id ?? '')
|
|
84
104
|
|
|
105
|
+
function openKioskSummaryDialog() {
|
|
106
|
+
Dialog.open({
|
|
107
|
+
title: capitalCase(t('order.kioskSummary')),
|
|
108
|
+
contentComponent: KioskSummary,
|
|
109
|
+
contentComponentProps: {
|
|
110
|
+
restaurantId: currentRestaurant.value?._id,
|
|
111
|
+
devices: KioskStore.state.devices,
|
|
112
|
+
kioskOrderSetting: OrderSettingStore.state.kiosk,
|
|
113
|
+
dialogType: true
|
|
114
|
+
}
|
|
115
|
+
})
|
|
116
|
+
}
|
|
117
|
+
|
|
85
118
|
async function selectRestaurant(v: string) {
|
|
86
119
|
const restaurant = restaurants.value.find((r) => r._id == v)
|
|
87
120
|
await changeRestaurant(restaurant)
|