meemup-library 1.1.63 → 1.1.65

package/dist/controllers/KitchenController.d.ts

@@ -2,7 +2,6 @@ import EnumOrderType from "../enums/EnumOrderType";
 import IKitchenScreenSetting from "../interfaces/IKitchenScreenSetting";
 import IKitchenOrderDetail from "../interfaces/IKitchenOrderDetail";
 import IKitchenTimes from "../interfaces/IKitchenTimes";
-import IEmergencyBrake from "../interfaces/IEmergencyBrake";
 import IKitchenZone from "../interfaces/IKitchenZone";
 import IKitchenOrderDetailItems from "../interfaces/IKitchenOrderDetailItems";
 declare const _default: {
@@ -10,8 +9,12 @@ declare const _default: {
     filterOrderDetailReducer(orders: IKitchenOrderDetail[], setting: IKitchenScreenSetting): IKitchenOrderDetail[];
     forToday(desiredDate: string): boolean;
     convertStrToSecond(str?: string | null): number;
+    convertStrToMinute(str?: string | null): number;
     dateToSecond(date: Date): number;
-    calculateTik(detail: IKitchenOrderDetail, emergency: IEmergencyBrake, times: IKitchenTimes, zones: IKitchenZone[], setting: IKitchenScreenSetting): 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

@@ -1,6 +1,7 @@
 import EnumOrderType from "../enums/EnumOrderType";
 import EnumKitchenScreenSortOrders from "../enums/EnumKitchenScreenSortOrders";
 import { initKitchenOrderDetail } from "../interfaces/IKitchenOrderDetail";
+import ZoneController from "./ZoneController";
 export default new class KitchenController {
     atLeastOneItemToShowInKitchen(list) {
         let result = false;
@@ -41,38 +42,87 @@ export default new class KitchenController {
             hour = +parts[2];
         return (hour * 60 * 60) + (minute * 60) + second;
     }
+    convertStrToMinute(str = "00:00:00") {
+        if (str === null)
+            return 0;
+        let second = 0;
+        let minute = 0;
+        let hour = 0;
+        let parts = str.split(":").reverse();
+        if (parts.length > 0)
+            second = +parts[0];
+        if (parts.length > 1)
+            minute = +parts[1];
+        if (parts.length > 2)
+            hour = +parts[2];
+        return +((hour * 60) + (minute) + (second / 60)).toFixed(2);
+    }
     dateToSecond(date) {
         return parseInt((date.getTime() / 1000) + "");
     }
-    calculateTik(detail, emergency, times, zones, setting) {
-        let kitchenTime = this.convertStrToSecond(detail.estimatedTime) / 60;
+    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);
+        let zone = zones.find(i => i.id === detail.zoneId);
+        if (zone)
+            travelTime += zone === null || zone === void 0 ? void 0 : zone.additionalDeliveryTime;
+        return travelTime;
+    }
+    calculateTik(detail, times, zones) {
         let desiredDateTime = new Date(detail.desiredDateTime);
         let currentDateTime = new Date();
-        let deliveryTime = 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 += setting.deliveryPreprationTime;
-                desiredDateTime.setMinutes(desiredDateTime.getMinutes() + emergency.deliveryDelayTime);
-                deliveryTime += times.deliveryMinimumTime;
-                let zone = zones.find(i => i.id === detail.zoneId);
-                if (zone)
-                    deliveryTime += zone === null || zone === void 0 ? void 0 : zone.additionalDeliveryTime;
+                kitchenTime += times.deliveryMinimumTime;
                 break;
             case EnumOrderType.pickup:
-                kitchenTime += setting.pickupPreprationTime;
-                desiredDateTime.setMinutes(desiredDateTime.getMinutes() + emergency.pickupDelayTime);
+                kitchenTime += times.pickupMinimumTime;
                 break;
             case EnumOrderType.dining:
-                kitchenTime += setting.diningPreprationTime;
+                kitchenTime += times.diningMinimumTime;
                 break;
             default:
+                kitchenTime = times.minimumPreparationTime;
                 break;
         }
-        desiredDateTime.setMinutes(desiredDateTime.getMinutes() - deliveryTime);
+        if (kitchenTime < times.minimumPreparationTime)
+            kitchenTime = times.minimumPreparationTime;
+        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/controllers/ZoneController.d.ts

@@ -1,13 +1,31 @@
 import ILocation from "../interfaces/ILocation";
 declare const _default: {
     /**
-     * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
-     * This runs in O(n) where n is the number of edges of the polygon.
+    * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
+    * This runs in O(n) where n is the number of edges of the polygon.
+    *
+    * @param {ILocation[]} polygon - An array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
+    * @param {ILocation} point - An array representation of the point where point[0] is its x Value and point[1] is its y Value.
+    * @returns {boolean} - Whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that).
+    */
+    pointInPolygon(polygon: ILocation[], point: ILocation): boolean;
+    rad(x: number): number;
+    /**
+     * Calculates the distance between two geographical points using the Haversine formula.
      *
-     * @param {Array} polygon an array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
-     * @param {Array} point   an array representation of the point where point[0] is its x Value and point[1] is its y Value
-     * @return {boolean} whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that)
+     * @param {ILocation} p1 - The geographical coordinates of the first point.
+     * @param {ILocation} p2 - The geographical coordinates of the second point.
+     * @returns {number} - The distance between the two points in meters.
      */
-    pointInPolygon(polygon: ILocation[], point: ILocation): boolean;
+    calculateDistance(p1: ILocation, p2: ILocation): number;
+    /**
+     * Calculates the duration needed to travel from a customer location to a store location, considering the transport type.
+     *
+     * @param {ILocation} customerLocation - The customer's location.
+     * @param {ILocation} storeLocation - The store's location.
+     * @param {number} [transportType=1] - The transport type (1 for walking, 2 for biking, 3 for driving). Defaults to 1.
+     * @returns {number} - The duration of travel in minutes.
+     */
+    calculateDuration(customerLocation: ILocation, storeLocation: ILocation, transportType?: number): number;
 };
 export default _default;

package/dist/controllers/ZoneController.js

@@ -1,12 +1,13 @@
+import MoneyController from "./MoneyController";
 export default new class ZoneController {
     /**
-     * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
-     * This runs in O(n) where n is the number of edges of the polygon.
-     *
-     * @param {Array} polygon an array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
-     * @param {Array} point   an array representation of the point where point[0] is its x Value and point[1] is its y Value
-     * @return {boolean} whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that)
-     */
+    * Performs the even-odd-rule Algorithm (a raycasting algorithm) to find out whether a point is in a given polygon.
+    * This runs in O(n) where n is the number of edges of the polygon.
+    *
+    * @param {ILocation[]} polygon - An array representation of the polygon where polygon[i][0] is the x Value of the i-th point and polygon[i][1] is the y Value.
+    * @param {ILocation} point - An array representation of the point where point[0] is its x Value and point[1] is its y Value.
+    * @returns {boolean} - Whether the point is in the polygon (not on the edge, just turn < into <= and > into >= for that).
+    */
     pointInPolygon(polygon, point) {
         let odd = false;
         for (let i = 0, j = polygon.length - 1; i < polygon.length; i++) {
@@ -19,4 +20,60 @@ export default new class ZoneController {
         return odd;
     }
     ;
+    rad(x) {
+        return x * Math.PI / 180;
+    }
+    /**
+     * Calculates the distance between two geographical points using the Haversine formula.
+     *
+     * @param {ILocation} p1 - The geographical coordinates of the first point.
+     * @param {ILocation} p2 - The geographical coordinates of the second point.
+     * @returns {number} - The distance between the two points in meters.
+     */
+    calculateDistance(p1, p2) {
+        try {
+            let R = 6378137; // Earth’s mean radius in meter
+            let dLat = this.rad(p2.latitude - p1.latitude);
+            let dLong = this.rad(p2.longitude - p1.longitude);
+            let a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                Math.cos(this.rad(p1.latitude)) * Math.cos(this.rad(p2.latitude)) *
+                    Math.sin(dLong / 2) * Math.sin(dLong / 2);
+            let c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+            return R * c; // returns the distance in meter
+        }
+        catch (e) {
+            return 0;
+        }
+    }
+    /**
+     * Calculates the duration needed to travel from a customer location to a store location, considering the transport type.
+     *
+     * @param {ILocation} customerLocation - The customer's location.
+     * @param {ILocation} storeLocation - The store's location.
+     * @param {number} [transportType=1] - The transport type (1 for walking, 2 for biking, 3 for driving). Defaults to 1.
+     * @returns {number} - The duration of travel in minutes.
+     */
+    calculateDuration(customerLocation, storeLocation, transportType = 1) {
+        try {
+            let distance = +MoneyController.round(this.calculateDistance(customerLocation, storeLocation));
+            let duration = 5;
+            switch (transportType) {
+                case 1:
+                    duration += +MoneyController.round((distance / 1000) * (60 / 70));
+                    break;
+                case 2:
+                    duration += +MoneyController.round((distance / 1000) * (6 / 15));
+                    break;
+                case 3:
+                    duration += +MoneyController.round((distance / 1000) * (6 / 2));
+                    break;
+                default:
+                    break;
+            }
+            return duration;
+        }
+        catch (e) {
+            return 0;
+        }
+    }
 }();

package/dist/interfaces/IKitchenOrderDetail.d.ts

@@ -1,4 +1,5 @@
 import IKitchenOrderDetailItems from "./IKitchenOrderDetailItems";
+import ILocation from "./ILocation";
 export default interface IKitchenOrderDetail {
     id: number;
     number: number;
@@ -22,5 +23,7 @@ export default interface IKitchenOrderDetail {
     companyTitle?: any;
     zoneId: number;
     items: IKitchenOrderDetailItems[];
+    deliveryLocation: ILocation | null;
+    storeLocation: ILocation | null;
 }
 export declare const initKitchenOrderDetail: IKitchenOrderDetail;

package/dist/interfaces/IKitchenOrderDetail.js

@@ -24,5 +24,7 @@ export const initKitchenOrderDetail = {
     isCompany: false,
     companyTitle: "",
     zoneId: -1,
-    items: []
+    items: [],
+    deliveryLocation: null,
+    storeLocation: null
 };

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/IKitchenScreenSetting.d.ts

@@ -25,13 +25,9 @@ interface IKitchenScreenSetting {
     headerFontSize: number;
     orderNumberColor: string;
     showOrdersViaStatus: EnumOrderState[];
-    pickupPreprationTime: number;
-    diningPreprationTime: number;
-    deliveryPreprationTime: number;
     alarmWhenOrderComeToKitchen: boolean;
     alarm: number;
     advanceOrderBackgroundColor: string;
-    showOrdersWithPreparationTime: number;
 }
 export default IKitchenScreenSetting;
 export declare const initKitchenScreenSetting: IKitchenScreenSetting;

package/dist/interfaces/IKitchenScreenSetting.js

@@ -25,11 +25,11 @@ export const initKitchenScreenSetting = {
     orderNumberColor: "#000",
     flashWhenExpire: true,
     showOrdersViaStatus: [EnumOrderState.new, EnumOrderState.accepted, EnumOrderState.kitchen],
-    pickupPreprationTime: 15,
-    diningPreprationTime: 15,
-    deliveryPreprationTime: 15,
+    // pickupPreprationTime: 15,
+    // diningPreprationTime: 15,
+    // deliveryPreprationTime: 15,
     alarmWhenOrderComeToKitchen: true,
     alarm: 1,
     advanceOrderBackgroundColor: "#e262ff",
-    showOrdersWithPreparationTime: 60
+    // showOrdersWithPreparationTime : 60
 };

package/dist/interfaces/IKitchenTimes.d.ts

@@ -3,5 +3,6 @@ export default interface IKitchenTimes {
     deliveryMinimumTime: number;
     pickupMinimumTime: number;
     diningMinimumTime: number;
+    transportType: number;
 }
 export declare const initKitchenTimes: IKitchenTimes;

package/dist/interfaces/IKitchenTimes.js

@@ -2,5 +2,6 @@ export const initKitchenTimes = {
     minimumPreparationTime: 0,
     deliveryMinimumTime: 0,
     pickupMinimumTime: 0,
-    diningMinimumTime: 0
+    diningMinimumTime: 0,
+    transportType: 1
 };

package/package.json

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