meemup-library 1.1.64 → 1.1.66

package/dist/controllers/KitchenController.d.ts

@@ -13,6 +13,8 @@ declare const _default: {
     dateToSecond(date: Date): number;
     calculateTravelTime(detail: IKitchenOrderDetail, times: IKitchenTimes, zones: IKitchenZone[]): number;
     calculateTik(detail: IKitchenOrderDetail, times: IKitchenTimes, zones: IKitchenZone[]): number;
+    calculateKitchenTime(detail: IKitchenOrderDetail, times: IKitchenTimes): number;
+    idAddvanceOrder(detail: IKitchenOrderDetail, times: IKitchenTimes, zones: IKitchenZone[]): boolean;
     sortOrders(orders: IKitchenOrderDetail[], setting: IKitchenScreenSetting): IKitchenOrderDetail[];
     listToMatrix(setting: IKitchenScreenSetting, orders: IKitchenOrderDetail[], page: number): IKitchenOrderDetail[][];
     calculateTotalPage(listLength: number, pageSize: number): number;

package/dist/controllers/KitchenController.js

@@ -61,6 +61,8 @@ export default new class KitchenController {
         return parseInt((date.getTime() / 1000) + "");
     }
     calculateTravelTime(detail, times, zones) {
+        if (detail.type !== EnumOrderType.delivery)
+            return 0;
         let travelTime = 0;
         if ((detail === null || detail === void 0 ? void 0 : detail.deliveryLocation) && (detail === null || detail === void 0 ? void 0 : detail.storeLocation))
             travelTime = ZoneController.calculateDuration(detail === null || detail === void 0 ? void 0 : detail.deliveryLocation, detail === null || detail === void 0 ? void 0 : detail.storeLocation, times.transportType);
@@ -70,14 +72,24 @@ export default new class KitchenController {
         return travelTime;
     }
     calculateTik(detail, times, zones) {
-        let kitchenTime = 0;
         let desiredDateTime = new Date(detail.desiredDateTime);
         let currentDateTime = new Date();
-        let travelTime = 0;
+        //-----------------------------------------------------------------------------------------------
+        let estimatedTime = this.convertStrToMinute(detail.estimatedTime); //in minute
+        //-----------------------------------------------------------------------------------------------
+        let travelTime = this.calculateTravelTime(detail, times, zones); //in minute
+        desiredDateTime.setMinutes((desiredDateTime.getMinutes() + estimatedTime) - travelTime);
+        let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
+        if (tik > 0)
+            return tik;
+        return 0;
+    }
+    calculateKitchenTime(detail, times) {
+        let kitchenTime = 0; //in minute
+        let productMaxPreparationTime = 0;
         switch (detail.type) {
             case EnumOrderType.delivery:
                 kitchenTime += times.deliveryMinimumTime;
-                travelTime = this.calculateTravelTime(detail, times, zones);
                 break;
             case EnumOrderType.pickup:
                 kitchenTime += times.pickupMinimumTime;
@@ -91,12 +103,26 @@ export default new class KitchenController {
         }
         if (kitchenTime < times.minimumPreparationTime)
             kitchenTime = times.minimumPreparationTime;
-        kitchenTime += this.convertStrToMinute(detail.estimatedTime);
-        desiredDateTime.setMinutes(desiredDateTime.getMinutes() - travelTime);
+        const list = detail.items.map(i => this.convertStrToMinute(i.preparationTime));
+        if (list.length > 1)
+            productMaxPreparationTime = Math.max(...list);
+        else if (list.length === 1)
+            productMaxPreparationTime = list[0];
+        if (kitchenTime < productMaxPreparationTime)
+            kitchenTime = productMaxPreparationTime;
+        return kitchenTime + this.convertStrToMinute(detail.estimatedTime);
+    }
+    idAddvanceOrder(detail, times, zones) {
+        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
+        //-----------------------------------------------------------------------------------------------
+        desiredDateTime.setMinutes(desiredDateTime.getMinutes() + estimatedTime);
         let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
-        if (tik > 0)
-            return tik;
-        return 0;
+        return tik - ((kitchenTime + travelTime) * 60) > 0;
     }
     sortOrders(orders, setting) {
         if (setting.sortAscending) {

package/dist/interfaces/IKitchenOrderDetailItems.d.ts

@@ -13,4 +13,5 @@ export default interface IKitchenOrderDetailItems {
     text: string;
     extrasNames: string;
     extras: IKitchenOrderDetailItemsExtras[];
+    preparationTime: string;
 }

package/dist/interfaces/management/notification/INotification.d.ts

@@ -0,0 +1,6 @@
+export default interface INotification {
+    id: string;
+    type: "success" | "error" | "info" | "default" | "warning";
+    title: string;
+    message: string;
+}

package/dist/interfaces/management/notification/INotification.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meemup-library",
-  "version": "1.1.64",
+  "version": "1.1.66",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",