meemup-library 1.4.90 → 1.4.91
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.
|
@@ -83,9 +83,9 @@ export default new class KitchenController {
|
|
|
83
83
|
let desiredDateTime = new Date(detail.desiredDateTime);
|
|
84
84
|
let currentDateTime = new Date();
|
|
85
85
|
//-----------------------------------------------------------------------------------------------
|
|
86
|
-
let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute
|
|
86
|
+
let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute 0
|
|
87
87
|
//-----------------------------------------------------------------------------------------------
|
|
88
|
-
let travelTime = this.calculateTravelTime(detail, times, zones); //in minute
|
|
88
|
+
let travelTime = this.calculateTravelTime(detail, times, zones); //in minute 0
|
|
89
89
|
desiredDateTime.setMinutes((desiredDateTime.getMinutes() + estimatedTime) - travelTime);
|
|
90
90
|
let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
|
|
91
91
|
if (tik > 0)
|
|
@@ -124,9 +124,9 @@ export default new class KitchenController {
|
|
|
124
124
|
let desiredDateTime = new Date(detail.desiredDateTime);
|
|
125
125
|
let currentDateTime = new Date();
|
|
126
126
|
//-----------------------------------------------------------------------------------------------
|
|
127
|
-
let kitchenTime = this.calculateKitchenTime(detail, times); //in minute
|
|
128
|
-
let travelTime = this.calculateTravelTime(detail, times, zones); //in minute
|
|
129
|
-
let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute
|
|
127
|
+
let kitchenTime = this.calculateKitchenTime(detail, times); //in minute 45
|
|
128
|
+
let travelTime = this.calculateTravelTime(detail, times, zones); //in minute 0
|
|
129
|
+
let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute 0
|
|
130
130
|
//-----------------------------------------------------------------------------------------------
|
|
131
131
|
desiredDateTime.setMinutes(desiredDateTime.getMinutes() + estimatedTime);
|
|
132
132
|
let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
|
|
@@ -25,6 +25,9 @@ interface IKitchenScreenSetting {
|
|
|
25
25
|
headerFontSize: number;
|
|
26
26
|
orderNumberColor: string;
|
|
27
27
|
showOrdersViaStatus: EnumOrderState[];
|
|
28
|
+
showRegistrationTime: boolean;
|
|
29
|
+
showStartPreprarationtime: boolean;
|
|
30
|
+
showDesiredTime: boolean;
|
|
28
31
|
alarmWhenOrderComeToKitchen: boolean;
|
|
29
32
|
alarm: number;
|
|
30
33
|
advanceOrderBackgroundColor: string;
|
|
@@ -7,7 +7,7 @@ export const initKitchenScreenSetting = {
|
|
|
7
7
|
sortAccordingPizzaMode: true,
|
|
8
8
|
sortOrders: EnumKitchenScreenSortOrders.REGISTRATION_TIME,
|
|
9
9
|
sortAscending: true,
|
|
10
|
-
timer:
|
|
10
|
+
timer: true,
|
|
11
11
|
timerFontSize: 36,
|
|
12
12
|
timerWarningSecond: 180,
|
|
13
13
|
timerWarningColor: "#FF7043",
|
|
@@ -15,14 +15,14 @@ export const initKitchenScreenSetting = {
|
|
|
15
15
|
timerExpireColor: "#D50000",
|
|
16
16
|
extraFontSize: 16,
|
|
17
17
|
productFontSize: 24,
|
|
18
|
-
deliveryColor: "#
|
|
19
|
-
pickupColor: "#
|
|
20
|
-
diningColor: "#
|
|
18
|
+
deliveryColor: "#2196F3",
|
|
19
|
+
pickupColor: "#2196F3",
|
|
20
|
+
diningColor: "#2196F3",
|
|
21
21
|
showCustomer: false,
|
|
22
22
|
customerFontSize: 24,
|
|
23
|
-
customerColor: "#
|
|
23
|
+
customerColor: "#00897B",
|
|
24
24
|
headerFontSize: 24,
|
|
25
|
-
orderNumberColor: "#
|
|
25
|
+
orderNumberColor: "#FF7043",
|
|
26
26
|
flashWhenExpire: true,
|
|
27
27
|
showOrdersViaStatus: [EnumOrderState.New, EnumOrderState.Accepted, EnumOrderState.Kitchen],
|
|
28
28
|
// pickupPreprationTime: 15,
|
|
@@ -32,4 +32,7 @@ export const initKitchenScreenSetting = {
|
|
|
32
32
|
alarm: 1,
|
|
33
33
|
advanceOrderBackgroundColor: "#e262ff",
|
|
34
34
|
// showOrdersWithPreparationTime : 60
|
|
35
|
+
showRegistrationTime: true,
|
|
36
|
+
showStartPreprarationtime: false,
|
|
37
|
+
showDesiredTime: false,
|
|
35
38
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "meemup-library",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.91",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"remove:one": "rimraf dist",
|
|
12
12
|
"remove:two": "rimraf ./src/dist",
|
|
13
13
|
"test": "echo \"Error: no test specified\" && exit 1",
|
|
14
|
-
"commit": "git add . && git commit -m \"version.1.4.
|
|
14
|
+
"commit": "git add . && git commit -m \"version.1.4.91\" && git push origin "
|
|
15
15
|
},
|
|
16
16
|
"files": [
|
|
17
17
|
"/dist"
|