meemup-library 1.0.66 → 1.0.67

package/dist/controllers/KitchenController.d.ts

@@ -11,7 +11,7 @@ declare const _default: {
     forToday(desiredDate: string): boolean;
     convertStrToSecond(str?: string | null): number;
     dateToSecond(date: Date): number;
-    calculateTik(detail: IKitchenOrderDetail, times: IKitchenTimes, emergency: IEmergencyBrake, zones: IKitchenZone[]): number;
+    calculateTik(detail: IKitchenOrderDetail, emergency: IEmergencyBrake, times: IKitchenTimes, zones: IKitchenZone[], setting: IKitchenScreenSetting): number;
     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

@@ -44,41 +44,34 @@ export default new class KitchenController {
     dateToSecond(date) {
         return parseInt((date.getTime() / 1000) + "");
     }
-    calculateTik(detail, times, emergency, zones) {
-        // console.log(`desired date time : ${new Date(detail.desiredDateTime)}`)
-        // console.log(`current date time : ${new Date()}`)
-        const { deliveryMinimumTime, minimumPreparationTime, pickupMinimumTime, diningMinimumTime } = times;
-        const { deliveryDelayTime, pickupDelayTime } = emergency;
-        let des = this.dateToSecond(new Date(detail.desiredDateTime));
-        let cur = this.dateToSecond(new Date());
+    calculateTik(detail, emergency, times, zones, setting) {
+        let kitchenTime = this.convertStrToSecond(detail.estimatedTime) / 60;
+        let desiredDateTime = new Date(detail.desiredDateTime);
+        let currentDateTime = new Date();
         let deliveryTime = 0;
-        let pre = this.convertStrToSecond(detail.preparationTime);
         switch (detail.type) {
             case EnumOrderType.delivery:
-                //append delivery delay time
-                des += (deliveryDelayTime * 60);
-                deliveryTime = (deliveryMinimumTime * 60);
+                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) * 60;
-                des += deliveryTime;
+                    deliveryTime += zone === null || zone === void 0 ? void 0 : zone.additionalDeliveryTime;
                 break;
             case EnumOrderType.pickup:
-                //append delivery delay time
-                des += (pickupDelayTime * 60);
-                des += (pickupMinimumTime * 60);
+                kitchenTime += setting.pickupPreprationTime;
+                desiredDateTime.setMinutes(desiredDateTime.getMinutes() + emergency.pickupDelayTime);
                 break;
             case EnumOrderType.dining:
-                des += (diningMinimumTime * 60);
+                kitchenTime += setting.diningPreprationTime;
                 break;
             default:
                 break;
         }
-        des += (minimumPreparationTime * 60);
-        des += pre;
-        des -= cur;
-        if (des > 0)
-            return des;
+        desiredDateTime.setMinutes(desiredDateTime.getMinutes() - deliveryTime);
+        let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
+        if (tik > 0)
+            return tik;
         return 0;
     }
     sortOrders(orders, setting) {

package/dist/interfaces/IKitchenOrderDetail.d.ts

@@ -4,6 +4,7 @@ export default interface IKitchenOrderDetail {
     number: number;
     type: number;
     state: number;
+    estimatedTime: string | null;
     preparationTime: string;
     registrationDate: string;
     desiredDateTime: string;

package/dist/interfaces/IKitchenOrderDetail.js

@@ -7,6 +7,7 @@ export const initKitchenOrderDetail = {
     number: 0,
     type: EnumOrderType.dining,
     state: EnumOrderState.new,
+    estimatedTime: null,
     preparationTime: "",
     registrationDate: "",
     desiredDateTime: "",

package/package.json

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