meemup-library 1.3.72 → 1.3.74

package/dist/controllers/KitchenController.d.ts

@@ -5,6 +5,7 @@ import IKitchenTimes from "../interfaces/kds/IKitchenTimes";
 import IKitchenZone from "../interfaces/kds/IKitchenZone";
 import IKitchenOrderDetailItems from "../interfaces/kds/IKitchenOrderDetailItems";
 declare const _default: {
+    mergeOrders(list: IKitchenOrderDetail[], list2: IKitchenOrderDetail[]): IKitchenOrderDetail[];
     atLeastOneItemToShowInKitchen(list: IKitchenOrderDetailItems[]): boolean;
     filterOrderDetailReducer(orders: IKitchenOrderDetail[], setting: IKitchenScreenSetting): IKitchenOrderDetail[];
     forToday(desiredDate: string): boolean;
@@ -14,8 +15,7 @@ declare const _default: {
     calculateTravelTime(detail: IKitchenOrderDetail, times: IKitchenTimes, zones: IKitchenZone[]): number;
     calculateTik(detail: IKitchenOrderDetail, times: IKitchenTimes, zones: IKitchenZone[]): number;
     calculateKitchenTime(detail: IKitchenOrderDetail, times: IKitchenTimes): number;
-    idAddvanceOrderOld(detail: IKitchenOrderDetail, times: IKitchenTimes, zones: IKitchenZone[]): boolean;
-    idAddvanceOrder(detail: IKitchenOrderDetail): boolean;
+    isAddvanceOrder(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

@@ -2,8 +2,15 @@ import EnumOrderType from "../enums/EnumOrderType";
 import EnumKitchenScreenSortOrders from "../enums/EnumKitchenScreenSortOrders";
 import { initKitchenOrderDetail } from "../interfaces/kds/IKitchenOrderDetail";
 import ZoneController from "./ZoneController";
-import moment from "moment";
 export default new class KitchenController {
+    // distinctOrders(list : IKitchenOrderDetail[]) {
+    // }
+    mergeOrders(list, list2) {
+        // let IdList = list2.map(i => i.id).filter((value, index, arr) => arr.indexOf(value) === index);
+        // let new_list: IKitchenOrderDetail[] = [...list2, ...list.filter(i => !IdList.includes(i.id))];
+        // return new_list;
+        return [...list, ...list2].filter((value, index, arr) => arr.findIndex(i => i.id === value.id) === index);
+    }
     atLeastOneItemToShowInKitchen(list) {
         let result = false;
         list.forEach(value => {
@@ -113,7 +120,7 @@ export default new class KitchenController {
             kitchenTime = productMaxPreparationTime;
         return kitchenTime + this.convertStrToMinute(detail.estimatedTime);
     }
-    idAddvanceOrderOld(detail, times, zones) {
+    isAddvanceOrder(detail, times, zones) {
         let desiredDateTime = new Date(detail.desiredDateTime);
         let currentDateTime = new Date();
         //-----------------------------------------------------------------------------------------------
@@ -125,10 +132,10 @@ export default new class KitchenController {
         let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
         return tik - ((kitchenTime + travelTime) * 60) > 0;
     }
-    idAddvanceOrder(detail) {
-        let current = moment().format("YYYY-MM-DDTHH:mm:ss");
-        return detail.orderPreparationStartTime > current;
-    }
+    // isAddvanceOrder(detail: IKitchenOrderDetail) {
+    //     let current = moment().format("YYYY-MM-DDTHH:mm:ss")
+    //     return detail.orderPreparationStartTime > current;
+    // }
     sortOrders(orders, setting) {
         if (setting.sortAscending) {
             switch (setting.sortOrders) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meemup-library",
-  "version": "1.3.72",
+  "version": "1.3.74",
   "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.3.72 \" && git push origin "
+    "commit": "git add . && git commit -m \"version.1.3.74 \" && git push origin "
   },
   "files": [
     "/dist"