meemup-library 1.4.90 → 1.4.92

package/dist/controllers/KitchenController.js

@@ -83,9 +83,9 @@ export default new class KitchenController {
         let desiredDateTime = new Date(detail.desiredDateTime);
         let currentDateTime = new Date();
         //-----------------------------------------------------------------------------------------------
-        let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute
+        let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute 0
         //-----------------------------------------------------------------------------------------------
-        let travelTime = this.calculateTravelTime(detail, times, zones); //in minute
+        let travelTime = this.calculateTravelTime(detail, times, zones); //in minute 0
         desiredDateTime.setMinutes((desiredDateTime.getMinutes() + estimatedTime) - travelTime);
         let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
         if (tik > 0)
@@ -124,9 +124,9 @@ export default new class KitchenController {
         let desiredDateTime = new Date(detail.desiredDateTime);
         let currentDateTime = new Date();
         //-----------------------------------------------------------------------------------------------
-        let kitchenTime = this.calculateKitchenTime(detail, times); //in minute
-        let travelTime = this.calculateTravelTime(detail, times, zones); //in minute
-        let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute
+        let kitchenTime = this.calculateKitchenTime(detail, times); //in minute 45
+        let travelTime = this.calculateTravelTime(detail, times, zones); //in minute 0
+        let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute 0
         //-----------------------------------------------------------------------------------------------
         desiredDateTime.setMinutes(desiredDateTime.getMinutes() + estimatedTime);
         let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);

package/dist/interfaces/kds/IKitchenScreenSetting.d.ts

@@ -25,6 +25,9 @@ interface IKitchenScreenSetting {
     headerFontSize: number;
     orderNumberColor: string;
     showOrdersViaStatus: EnumOrderState[];
+    showRegistrationTime: boolean;
+    showStartPreprarationTime: boolean;
+    showDesiredTime: boolean;
     alarmWhenOrderComeToKitchen: boolean;
     alarm: number;
     advanceOrderBackgroundColor: string;

package/dist/interfaces/kds/IKitchenScreenSetting.js

@@ -7,7 +7,7 @@ export const initKitchenScreenSetting = {
     sortAccordingPizzaMode: true,
     sortOrders: EnumKitchenScreenSortOrders.REGISTRATION_TIME,
     sortAscending: true,
-    timer: false,
+    timer: true,
     timerFontSize: 36,
     timerWarningSecond: 180,
     timerWarningColor: "#FF7043",
@@ -15,14 +15,14 @@ export const initKitchenScreenSetting = {
     timerExpireColor: "#D50000",
     extraFontSize: 16,
     productFontSize: 24,
-    deliveryColor: "#000",
-    pickupColor: "#000",
-    diningColor: "#000",
+    deliveryColor: "#2196F3",
+    pickupColor: "#2196F3",
+    diningColor: "#2196F3",
     showCustomer: false,
     customerFontSize: 24,
-    customerColor: "#000",
+    customerColor: "#00897B",
     headerFontSize: 24,
-    orderNumberColor: "#000",
+    orderNumberColor: "#FF7043",
     flashWhenExpire: true,
     showOrdersViaStatus: [EnumOrderState.New, EnumOrderState.Accepted, EnumOrderState.Kitchen],
     // pickupPreprationTime: 15,
@@ -32,4 +32,7 @@ export const initKitchenScreenSetting = {
     alarm: 1,
     advanceOrderBackgroundColor: "#e262ff",
     // showOrdersWithPreparationTime : 60
+    showRegistrationTime: true,
+    showStartPreprarationTime: false,
+    showDesiredTime: false,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meemup-library",
-  "version": "1.4.90",
+  "version": "1.4.92",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,7 +11,7 @@
     "remove:one": "rimraf dist",
     "remove:two": "rimraf ./src/dist",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "commit": "git add . && git commit -m \"version.1.4.90\" && git push origin "
+    "commit": "git add . && git commit -m \"version.1.4.92\" && git push origin "
   },
   "files": [
     "/dist"