meemup-library 1.5.18 → 1.5.20

package/dist/controllers/OrderToolController.js

@@ -501,7 +501,8 @@ class OrderToolController {
             text: text,
             amount: 0,
             type: type,
-            tax: 0
+            tax: 0,
+            metadata: []
         };
         if (!enabled)
             return result;

package/dist/index.d.ts

@@ -7,7 +7,6 @@ export * from "./controllers/MoneyController";
 export * from "./controllers/OrderScreenController";
 export * from "./controllers/PhoneController";
 export * from "./controllers/PrintContentController";
-export * from "./controllers/ProductModalController";
 export * from "./controllers/ToolController";
 export * from "./controllers/ZoneController";
 export * from "./controllers/KitchenController";

package/dist/index.js

@@ -7,7 +7,6 @@ export * from "./controllers/MoneyController";
 export * from "./controllers/OrderScreenController";
 export * from "./controllers/PhoneController";
 export * from "./controllers/PrintContentController";
-export * from "./controllers/ProductModalController";
 export * from "./controllers/ToolController";
 export * from "./controllers/ZoneController";
 export * from "./controllers/KitchenController";

package/dist/interfaces/ICalculateFeeResult.d.ts

@@ -1,7 +1,9 @@
+import ITextValue from "./ITextValue";
 interface ICalculateFeeResult {
     type: number;
     text: string;
     amount: number;
     tax: number;
+    metadata: ITextValue[];
 }
 export default ICalculateFeeResult;

package/dist/interfaces/management/bundle-product/bundle-product.d.ts

@@ -1,7 +1,6 @@
 import IBundleProductItem from "./bundle-product-item";
 export default interface IBundleProduct {
     id: number | null;
-    productId: number;
     title: string;
     discountAmount: number;
     items: IBundleProductItem[];

package/dist/interfaces/management/bundle-product/bundle-product.js

@@ -1,6 +1,6 @@
 export const initBundleProduct = {
     id: 0,
-    productId: -1,
+    // productId: -1,
     title: "",
     items: [],
     discountAmount: 0,

package/dist/interfaces/pos/IPointOfSaleOrderItem.d.ts

@@ -5,7 +5,7 @@ interface IPointOfSaleOrderItem {
     productId: number | null;
     bundleId: number | null;
     bundleGroup: string;
-    bundleMainItem: boolean;
+    bundleRatio: number;
     title: string;
     quantity: number;
     price: number;
@@ -29,3 +29,4 @@ interface IPointOfSaleOrderItem {
     discount?: number;
 }
 export default IPointOfSaleOrderItem;
+export declare const initPointOfSaleOrderItem: IPointOfSaleOrderItem;

package/dist/interfaces/pos/IPointOfSaleOrderItem.js

@@ -1 +1,27 @@
-export {};
+export const initPointOfSaleOrderItem = {
+    id: -1,
+    categoryId: -1,
+    productId: -1,
+    bundleId: null,
+    bundleGroup: "",
+    bundleRatio: 1,
+    title: "",
+    quantity: 1,
+    price: 0,
+    note: "",
+    extras: [],
+    extrasNames: "",
+    totalAmount: 0,
+    minOrderQuantity: 1,
+    maxOrderQuantity: 99,
+    imageUrl: "",
+    relatedItemId: null,
+    relatedProductId: null,
+    additionalText: "",
+    promotionItem: false,
+    promotionId: -1,
+    stampCardBonusItem: false,
+    taxable: false,
+    productName: "",
+    tags: []
+};

package/dist/interfaces/pos/IPointOfSaleSaveOrder.d.ts

@@ -27,6 +27,7 @@ export default interface IPointOfSaleSaveOrder {
     deliveryCost: number;
     companyFee: number;
     serviceFee: number;
+    bundleDiscount: number;
     additionalItems: ICalculateFeeResult[];
     city: string;
     buzzer: string;

package/package.json

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

package/dist/controllers/ProductModalController.d.ts

@@ -1,34 +0,0 @@
-import EnumOrderType from "../enums/EnumOrderType";
-import IExtra from "../interfaces/IExtra";
-import ISelectedExtraItem from "../interfaces/ISelectedExtraItem";
-import ISelectedProductExtra from "../interfaces/ISelectedProductExtra";
-import ITextValue from "../interfaces/ITextValue";
-import TBaseExtra from "../types/TBaseExtra";
-import IPointOfSaleOrderItem from "../interfaces/pos/IPointOfSaleOrderItem";
-import IProduct from "../interfaces/IProduct";
-import IDProductExtra from "../interfaces/database/IDProductExtra";
-import IExtraItem from "../interfaces/IExtraItem";
-declare const _default: {
-    getExtraSelectedItems(list: ISelectedProductExtra[], extraId: number): ISelectedExtraItem[];
-    canAddToBasket(product: IProduct, selected: ISelectedProductExtra[], extras: IExtra[]): boolean;
-    productModalToBasketItem(product: IProduct, selectedExtraList: ISelectedProductExtra[], extras: IExtra[], count: number, price: number, note: string): IPointOfSaleOrderItem;
-    productName(product: IProduct): string;
-    productImage(product: IProduct): string;
-    productPrice(product: IProduct, orderType: EnumOrderType): number;
-    baseItem(list: ISelectedProductExtra[], extraList: IExtra[]): TBaseExtra;
-    defaultExtraOfProductToSelectedExtras(product: IProduct, extras: IExtra[]): ISelectedProductExtra[];
-    defaultExtraOfProductToBasketItem(product: IProduct, extras: IExtra[], orderType: EnumOrderType): IPointOfSaleOrderItem;
-    singleSelectExtraItemPrice: (extra: IExtra, base: TBaseExtra, item: IExtraItem) => number;
-    multiSelectExtraPrice: (extra: IExtra, base: TBaseExtra, item: IExtraItem, selectedList?: ISelectedExtraItem[]) => number;
-    multiSelectExtraItemOptions(item: IExtraItem, max: number, selectedList: ISelectedExtraItem[]): ITextValue[];
-    scaleSum(array?: ISelectedExtraItem[]): number;
-    calculatePrice(orderType: EnumOrderType, product: any, list: ISelectedProductExtra[], base: TBaseExtra, extraList: IExtra[]): number;
-    plusString(first: string, second: string): string;
-    getValidateExtras(extras: IDProductExtra[], extraSelected: ISelectedProductExtra[]): IDProductExtra[];
-    getProductExtras(pExtras: IDProductExtra[], sExtras: ISelectedProductExtra[], extras: IExtra[]): IExtra[];
-    quantitySum(array?: ISelectedExtraItem[]): number;
-    productMinAndMaxOptions(product: IProduct): ITextValue[];
-    sortByKey(array: any[], key: string, conditionForSort?: boolean): any[];
-    extraItemsSortAction: (a: IExtraItem, b: IExtraItem) => 0 | 1 | -1;
-};
-export default _default;

package/dist/controllers/ProductModalController.js

@@ -1,399 +0,0 @@
-import EnumOrderType from "../enums/EnumOrderType";
-import EnumSortMode from "../enums/EnumSortMode";
-import EnumPizzaSide from "../enums/EnumPizzaSide";
-import MoneyController from "./MoneyController";
-export default new class ProductModalController {
-    constructor() {
-        this.singleSelectExtraItemPrice = (extra, base, item) => {
-            var _a, _b, _c;
-            let p = item.price;
-            if (extra.numberOfFreeItems > 0)
-                return 0;
-            if (base[1] && ((_a = base[1]) === null || _a === void 0 ? void 0 : _a.increasingOtherExtraItemsPrice)) {
-                // @ts-ignore
-                if (+((_b = base[0]) === null || _b === void 0 ? void 0 : _b.extraId) === +extra.id)
-                    return item.price;
-                // @ts-ignore
-                const { increasingPriceType, increasingAmount, increasingPercentage } = (_c = base[0]) === null || _c === void 0 ? void 0 : _c.selected[0];
-                switch (increasingPriceType) {
-                    case 1:
-                        p += (item.price * increasingPercentage) / 100;
-                        break;
-                    case 2:
-                        p += increasingAmount;
-                        if (p < 0)
-                            p = 0;
-                        break;
-                    default:
-                        break;
-                }
-            }
-            return p;
-        };
-        this.multiSelectExtraPrice = (extra, base, item, selectedList = []) => {
-            var _a, _b, _c;
-            let _item = selectedList.find(i => i.id === item.id);
-            if (_item !== undefined) {
-                let p = +item.price;
-                if (base[1] && ((_a = base[1]) === null || _a === void 0 ? void 0 : _a.increasingOtherExtraItemsPrice)) {
-                    // @ts-ignore
-                    if (+((_b = base[0]) === null || _b === void 0 ? void 0 : _b.extraId) === +extra.id)
-                        return p;
-                    // @ts-ignore
-                    const { increasingPriceType, increasingAmount, increasingPercentage } = (_c = base[0]) === null || _c === void 0 ? void 0 : _c.selected[0];
-                    switch (increasingPriceType) {
-                        case 1:
-                            p += (item.price * increasingPercentage) / 100;
-                            break;
-                        case 2:
-                            p += increasingAmount;
-                            if (p < 0)
-                                p = 0;
-                            break;
-                        default:
-                            break;
-                    }
-                }
-                if (extra.choosablePizzaToppingsSides) {
-                    if (this.scaleSum(selectedList) <= extra.numberOfFreeItems)
-                        return 0;
-                    let index = selectedList.findIndex((element) => +element.id === +item.id);
-                    if (index === -1)
-                        return p;
-                    let sliceArray = selectedList.slice(0, index + 1);
-                    if (this.scaleSum(sliceArray) <= extra.numberOfFreeItems)
-                        return 0;
-                }
-                p = (+p) * _item.quantity;
-                if (_item.pizzaSide === EnumPizzaSide.left || _item.pizzaSide === EnumPizzaSide.right)
-                    return MoneyController.round(p / 2);
-                return p;
-            }
-            return 0;
-        };
-        this.extraItemsSortAction = (a, b) => {
-            if (a.priority == b.priority)
-                return 0;
-            else if (a.priority > b.priority)
-                return 1;
-            else
-                return -1;
-        };
-    }
-    getExtraSelectedItems(list, extraId) {
-        let item = list.find(i => +i.extraId === extraId);
-        if (item)
-            return item.selected;
-        return [];
-    }
-    canAddToBasket(product, selected, extras) {
-        let flag = true;
-        product.extras.forEach((item) => {
-            let extra = extras.find(i => i.id === item.extraId);
-            if (extra && extra.required && (item.secondExtraId === null || selected.find(i => i.extraId === item.secondExtraId))) {
-                if (item.secondExtraId === null ||
-                    selected.find((i) => i.extraId === item.secondExtraId &&
-                        i.selected.find((j) => j.id === item.secondExtraItemId))) {
-                    if (selected.find((i) => i.extraId === item.extraId) === undefined) {
-                        flag = false;
-                    }
-                }
-            }
-        });
-        return flag;
-    }
-    productModalToBasketItem(product, selectedExtraList, extras, count, price, note) {
-        let list = this.sortByKey(selectedExtraList, "priority", product.chosenExtraItemsMode === EnumSortMode.BASED_ON_EXTRA_ITEMS_LIST)
-            .map((item) => {
-            if (product.chosenExtraItemsMode === EnumSortMode.BASED_ON_EXTRA_ITEMS_LIST)
-                item.selected = this.sortByKey(item.selected, "priority");
-            return item;
-        });
-        let extraItemList = [];
-        let itemIndex = 0;
-        list.forEach((extra) => {
-            extra.selected.forEach((extraItem) => {
-                var _a;
-                extraItemList.push({
-                    id: itemIndex++,
-                    extraId: extra.extraId,
-                    extraItemId: extraItem.id,
-                    totalAmount: extraItem.quantity * extraItem.price,
-                    quantity: extraItem.quantity,
-                    price: extraItem.price,
-                    pizzaSide: extraItem.pizzaSide,
-                    text: `${extraItem.quantity}x ${extraItem.title}`,
-                    cartItemId: -1,
-                    extraItemTitle: extraItem.title,
-                    extraTitle: ((_a = extras.find(i => i.id === extra.extraId)) === null || _a === void 0 ? void 0 : _a.title) + "",
-                    extraItemOptionId: extraItem.optionId,
-                    extraItemOptionTitle: extraItem.optionTitle,
-                    doNotPrintOnReceipt: extraItem.doNotPrintOnReceipt,
-                });
-            });
-        });
-        return {
-            id: -1,
-            categoryId: -1,
-            productId: product.id,
-            title: this.productName(product),
-            imageUrl: this.productImage(product),
-            price: MoneyController.round(price), //OrderScreenController.productPrice(product, orderType),
-            extras: extraItemList,
-            quantity: count,
-            totalAmount: MoneyController.round(count * price),
-            note: note,
-            maxOrderQuantity: product.maxOrderQuantity,
-            minOrderQuantity: product.minOrderQuantity,
-            extrasNames: extraItemList.map(i => i.text).join(", "),
-            promotionId: -1,
-            promotionItem: false,
-            relatedItemId: null,
-            relatedProductId: null,
-            additionalText: "",
-            stampCardBonusItem: false,
-            taxable: product.taxable,
-            productName: product.name,
-            tags: product.tags,
-            bundleGroup: "",
-            bundleId: null,
-            bundleMainItem: false,
-            discount: 0,
-            _id: ""
-        };
-    }
-    productName(product) {
-        return product.posName === "" ? product.name : product.posName;
-    }
-    productImage(product) {
-        return product.imageFullPath === null ? "" : product.imageFullPath;
-    }
-    productPrice(product, orderType) {
-        switch (orderType) {
-            case EnumOrderType.delivery:
-                return product.deliveryPrice;
-            case EnumOrderType.pickup:
-                return product.pickupPrice;
-            case EnumOrderType.dining:
-                return product.diningPrice;
-            default:
-                return 0;
-        }
-    }
-    baseItem(list, extraList) {
-        let idList = list.map(i => i.extraId);
-        let productExtraList = extraList.filter(i => idList.includes(i.id) && i.increasingOtherExtraItemsPrice);
-        if (productExtraList.length > 0)
-            return [list.find(i => { var _a; return i.extraId === ((_a = productExtraList[0]) === null || _a === void 0 ? void 0 : _a.id); }), productExtraList[0]];
-        return [undefined, undefined];
-    }
-    defaultExtraOfProductToSelectedExtras(product, extras) {
-        let list = [];
-        let productDefaultExtraModel = product.defaultExtraItems;
-        let productExtraModelList = product.extras;
-        productDefaultExtraModel.forEach((value) => {
-            let item = productExtraModelList.find(i => i.extraId === value.extraId);
-            if (item) {
-                let extraModel = extras.find(i => i.id === (item === null || item === void 0 ? void 0 : item.extraId));
-                let selectedList = [];
-                if (extraModel !== undefined) {
-                    value.items.forEach(it => {
-                        var _a;
-                        let extraItemModel = extraModel.items.find((i) => i.id === it.extraItemId);
-                        if (extraItemModel !== undefined) {
-                            selectedList.push({
-                                priority: it.priority,
-                                quantity: it.quantity,
-                                pizzaSide: it.side,
-                                id: it.extraItemId,
-                                min: extraItemModel.min,
-                                increasingPriceType: extraItemModel.increasingPriceType,
-                                scale: extraItemModel.scale,
-                                isDefaultSelected: extraItemModel.isDefaultSelected,
-                                title: extraItemModel.title,
-                                max: extraItemModel.max,
-                                calories: extraItemModel.calories,
-                                price: extraItemModel.price,
-                                available: extraItemModel.available,
-                                receiptTitle: extraItemModel.receiptTitle,
-                                increasingAmount: extraItemModel.increasingAmount,
-                                increasingPercentage: extraItemModel.increasingPercentage,
-                                tags: extraItemModel.tags,
-                                extraId: extraItemModel.extraId,
-                                increasingValue: extraItemModel.increasingValue,
-                                thumbnailImage: extraItemModel.thumbnailImage,
-                                color: extraItemModel.color,
-                                oldId: extraItemModel.oldId,
-                                packagingCost: extraItemModel.packagingCost,
-                                weight: extraItemModel.weight,
-                                options: extraItemModel.options,
-                                optionId: it.extraItemOptionId,
-                                doNotPrintOnReceipt: extraItemModel.doNotPrintOnReceipt,
-                                optionTitle: ((_a = extraItemModel.options.find(i => i.id === it.extraItemOptionId)) === null || _a === void 0 ? void 0 : _a.title) + ""
-                            });
-                        }
-                    });
-                }
-                let newItem = {
-                    extraId: item.extraId,
-                    selected: selectedList,
-                    showTypeText: item.showTypeText,
-                    secondExtraId: item.secondExtraId,
-                    priority: item.priority,
-                    showType: item.showType,
-                    availableTypeText: item.availableTypeText,
-                    secondExtraItemId: item.secondExtraItemId,
-                    availableType: item.availableType,
-                    relatedExtraDisplayMode: item.relatedExtraDisplayMode,
-                    expandedState: item.expandedState,
-                };
-                list.push(newItem);
-            }
-        });
-        return list;
-    }
-    defaultExtraOfProductToBasketItem(product, extras, orderType) {
-        let list = this.defaultExtraOfProductToSelectedExtras(product, extras);
-        let base = [undefined, undefined];
-        let count = product.minOrderQuantity;
-        let price = this.calculatePrice(orderType, product, list, base, extras);
-        return this.productModalToBasketItem(product, list, extras, count, price, "");
-    }
-    multiSelectExtraItemOptions(item, max, selectedList) {
-        let currentCount = this.quantitySum(selectedList.filter(i => i.id !== item.id));
-        let remind = max - currentCount;
-        let maxOption = remind < item.max ? remind : item.max;
-        let list = [];
-        for (let index = item.min; index <= maxOption; index++) {
-            list.push({
-                text: index + "X",
-                value: index
-            });
-        }
-        return list;
-    }
-    scaleSum(array = []) {
-        let s = 0;
-        array.forEach((item) => {
-            let weight = item["quantity"] * item["scale"];
-            if (item.pizzaSide === EnumPizzaSide.right || item.pizzaSide === EnumPizzaSide.left)
-                weight = parseInt((weight / 2) + "");
-            s += weight;
-        });
-        return s;
-    }
-    calculatePrice(orderType, product, list, base, extraList) {
-        var _a, _b;
-        let p = 0;
-        for (let i = 0; i < list.length; i++) {
-            const { selected, extraId } = list[i];
-            let _extra = extraList.find(i => i.id === extraId);
-            let free = 0;
-            for (let j = 0; j < selected.length; j++) {
-                const { price, quantity, scale, pizzaSide } = selected[j];
-                let pep = 0;
-                for (let k = 0; k < quantity; k++) {
-                    // @ts-ignore
-                    if (free < (_extra === null || _extra === void 0 ? void 0 : _extra.numberOfFreeItems)) {
-                        free += scale;
-                    }
-                    else {
-                        let ep = 0;
-                        switch (pizzaSide) {
-                            case EnumPizzaSide.left:
-                                //left
-                                ep = price / 2;
-                                break;
-                            case EnumPizzaSide.right:
-                                //right
-                                ep = price / 2;
-                                break;
-                            case EnumPizzaSide.all:
-                                //all
-                                ep = price;
-                                break;
-                            default:
-                                //unknown
-                                ep = price;
-                                break;
-                        }
-                        if (base[0] && +((_a = base[0]) === null || _a === void 0 ? void 0 : _a.extraId) !== +extraId) {
-                            const { increasingPriceType, increasingAmount, increasingPercentage } = (_b = base[0]) === null || _b === void 0 ? void 0 : _b.selected[0];
-                            switch (increasingPriceType) {
-                                case 1:
-                                    ep += ep * (increasingPercentage / 100);
-                                    break;
-                                case 2:
-                                    ep += increasingAmount;
-                                    if (ep < 0)
-                                        ep = 0;
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
-                        pep += ep;
-                    }
-                }
-                p += MoneyController.round(pep);
-                // console.log(selected[j].title, " : ", pep, " ==> ", MoneyController.round(pep));
-            }
-        }
-        return MoneyController.round(p + this.productPrice(product, +orderType));
-    }
-    plusString(first, second) {
-        return `${first} ${second}`;
-    }
-    getValidateExtras(extras, extraSelected) {
-        let result = [];
-        extras.forEach(item => {
-            if (item.secondExtraId === null ||
-                (extraSelected.filter((i) => i.extraId === item.secondExtraId).length === 1 &&
-                    extraSelected
-                        .filter((i) => i.extraId === item.secondExtraId)[0]
-                        .selected.filter((i) => i.id === item.secondExtraItemId).length === 1)) {
-                result.push(item);
-            }
-        });
-        return result;
-    }
-    getProductExtras(pExtras, sExtras, extras) {
-        let se = this.sortByKey(sExtras, "priority", true);
-        let pe = this.sortByKey(pExtras, "priority", true);
-        let itemsIdList = this.getValidateExtras(pe, se).map(i => i.extraId);
-        // let list: IExtra[] = extras.filter(i => itemsIdList.includes(+i.id));
-        let result = [];
-        itemsIdList.forEach((id) => {
-            let ext = extras.find(i => i.id === id);
-            if (ext)
-                result.push(ext);
-        });
-        return result;
-    }
-    quantitySum(array = []) {
-        let s = 0;
-        array.forEach((item) => {
-            s += item.quantity;
-        });
-        return s;
-    }
-    productMinAndMaxOptions(product) {
-        let list = [];
-        for (let index = product.minOrderQuantity; index <= product.maxOrderQuantity; index++) {
-            list.push({
-                text: index + "X",
-                value: index
-            });
-        }
-        return list;
-    }
-    sortByKey(array, key, conditionForSort = true) {
-        if (conditionForSort && Array.isArray(array))
-            return array.sort((a, b) => {
-                let x = a[key];
-                let y = b[key];
-                return ((x < y) ? -1 : ((x > y) ? 1 : 0));
-            });
-        return array;
-    }
-}();