meemup-library 1.3.71 → 1.3.74

package/dist/controllers/KitchenController.d.ts

@@ -1,10 +1,11 @@
 import EnumOrderType from "../enums/EnumOrderType";
-import IKitchenScreenSetting from "../interfaces/IKitchenScreenSetting";
-import IKitchenOrderDetail from "../interfaces/IKitchenOrderDetail";
-import IKitchenTimes from "../interfaces/IKitchenTimes";
-import IKitchenZone from "../interfaces/IKitchenZone";
-import IKitchenOrderDetailItems from "../interfaces/IKitchenOrderDetailItems";
+import IKitchenScreenSetting from "../interfaces/kds/IKitchenScreenSetting";
+import IKitchenOrderDetail from "../interfaces/kds/IKitchenOrderDetail";
+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,7 +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;
-    idAddvanceOrder(detail: IKitchenOrderDetail, times: IKitchenTimes, zones: IKitchenZone[]): 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

@@ -1,8 +1,16 @@
 import EnumOrderType from "../enums/EnumOrderType";
 import EnumKitchenScreenSortOrders from "../enums/EnumKitchenScreenSortOrders";
-import { initKitchenOrderDetail } from "../interfaces/IKitchenOrderDetail";
+import { initKitchenOrderDetail } from "../interfaces/kds/IKitchenOrderDetail";
 import ZoneController from "./ZoneController";
 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 => {
@@ -112,7 +120,7 @@ export default new class KitchenController {
             kitchenTime = productMaxPreparationTime;
         return kitchenTime + this.convertStrToMinute(detail.estimatedTime);
     }
-    idAddvanceOrder(detail, times, zones) {
+    isAddvanceOrder(detail, times, zones) {
         let desiredDateTime = new Date(detail.desiredDateTime);
         let currentDateTime = new Date();
         //-----------------------------------------------------------------------------------------------
@@ -124,6 +132,10 @@ export default new class KitchenController {
         let tik = this.dateToSecond(desiredDateTime) - this.dateToSecond(currentDateTime);
         return tik - ((kitchenTime + travelTime) * 60) > 0;
     }
+    // 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/dist/index.d.ts

@@ -59,7 +59,7 @@ export * from "./interfaces/IExtra";
 export * from "./interfaces/IExtraItem";
 export * from "./interfaces/IGeneralInformation";
 export * from "./interfaces/IGeneralItems";
-export * from "./interfaces/IKitchenScreenSetting";
+export * from "./interfaces/kds/IKitchenScreenSetting";
 export * from "./interfaces/pos/IPointOfSaleLocalSetting";
 export * from "./interfaces/ILocation";
 export * from "./interfaces/ILog";

package/dist/index.js

@@ -59,7 +59,7 @@ export * from "./interfaces/IExtra";
 export * from "./interfaces/IExtraItem";
 export * from "./interfaces/IGeneralInformation";
 export * from "./interfaces/IGeneralItems";
-export * from "./interfaces/IKitchenScreenSetting";
+export * from "./interfaces/kds/IKitchenScreenSetting";
 export * from "./interfaces/pos/IPointOfSaleLocalSetting";
 export * from "./interfaces/ILocation";
 export * from "./interfaces/ILog";

package/dist/interfaces/{IKitchenOrderDetail.d.ts → kds/IKitchenOrderDetail.d.ts}

@@ -1,5 +1,5 @@
 import IKitchenOrderDetailItems from "./IKitchenOrderDetailItems";
-import ILocation from "./ILocation";
+import ILocation from "../ILocation";
 export default interface IKitchenOrderDetail {
     id: number;
     number: number;
@@ -25,5 +25,7 @@ export default interface IKitchenOrderDetail {
     items: IKitchenOrderDetailItems[];
     deliveryLocation: ILocation | null;
     storeLocation: ILocation | null;
+    orderPreparationStartTime: string;
+    orderReadyTime: string;
 }
 export declare const initKitchenOrderDetail: IKitchenOrderDetail;

package/dist/interfaces/{IKitchenOrderDetail.js → kds/IKitchenOrderDetail.js}

@@ -1,7 +1,7 @@
-import EnumOrderState from "../enums/EnumOrderState";
-import EnumGender from "../enums/EnumGender";
-import EnumOrderType from "../enums/EnumOrderType";
-import { initOrder } from "./pos/IPointOfSaleOrder";
+import EnumOrderState from "../../enums/EnumOrderState";
+import EnumGender from "../../enums/EnumGender";
+import EnumOrderType from "../../enums/EnumOrderType";
+import { initOrder } from "../pos/IPointOfSaleOrder";
 export const initKitchenOrderDetail = {
     id: initOrder.id,
     number: 0,
@@ -11,6 +11,8 @@ export const initKitchenOrderDetail = {
     preparationTime: "",
     registrationDate: "",
     desiredDateTime: "",
+    orderPreparationStartTime: "",
+    orderReadyTime: "",
     totalAmount: 0,
     asSoonAsPossible: true,
     remarks: "",

package/dist/interfaces/{IKitchenScreenSetting.d.ts → kds/IKitchenScreenSetting.d.ts}

@@ -1,5 +1,5 @@
-import EnumKitchenScreenSortOrders from "../enums/EnumKitchenScreenSortOrders";
-import EnumOrderState from "../enums/EnumOrderState";
+import EnumKitchenScreenSortOrders from "../../enums/EnumKitchenScreenSortOrders";
+import EnumOrderState from "../../enums/EnumOrderState";
 interface IKitchenScreenSetting {
     row: number;
     column: number;

package/dist/interfaces/{IKitchenScreenSetting.js → kds/IKitchenScreenSetting.js}

@@ -1,5 +1,5 @@
-import EnumKitchenScreenSortOrders from "../enums/EnumKitchenScreenSortOrders";
-import EnumOrderState from "../enums/EnumOrderState";
+import EnumKitchenScreenSortOrders from "../../enums/EnumKitchenScreenSortOrders";
+import EnumOrderState from "../../enums/EnumOrderState";
 export const initKitchenScreenSetting = {
     row: 1,
     column: 4,

package/package.json

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