meemup-library 1.2.18 → 1.2.20

package/dist/controllers/ProductModalController.d.ts

@@ -12,9 +12,9 @@ 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): IOrderItem;
-    productName(product: IProduct | IProduct): string;
-    productImage(product: IProduct | IProduct): string;
-    productPrice(product: IProduct | IProduct, orderType: EnumOrderType): number;
+    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): IOrderItem;

package/dist/controllers/ProductModalController.js

@@ -126,7 +126,8 @@ export default new class ProductModalController {
                     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
+                    extraItemOptionId: extraItem.optionId,
+                    extraItemOptionTitle: extraItem.optionTitle,
                 });
             });
         });
@@ -148,7 +149,8 @@ export default new class ProductModalController {
             relatedItemId: null,
             relatedProductId: null,
             additionalText: "",
-            stampCardBonusItem: false
+            stampCardBonusItem: false,
+            taxable: product.taxable
         };
     }
     productName(product) {
@@ -187,6 +189,7 @@ export default new class ProductModalController {
                 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({
@@ -215,7 +218,8 @@ export default new class ProductModalController {
                                 packagingCost: extraItemModel.packagingCost,
                                 weight: extraItemModel.weight,
                                 options: extraItemModel.options,
-                                optionId: it.extraItemOptionId
+                                optionId: it.extraItemOptionId,
+                                optionTitle: ((_a = extraItemModel.options.find(i => i.id === it.extraItemOptionId)) === null || _a === void 0 ? void 0 : _a.title) + ""
                             });
                         }
                     });
@@ -257,64 +261,6 @@ export default new class ProductModalController {
         }
         return list;
     }
-    // pizzaSelectExtraPrice = (extra: IExtra, base: TBaseExtra, item: IExtraItem, selectedList: ISelectedExtraItem[] = []) => {
-    //
-    //   let _item: ISelectedExtraItem | undefined = selectedList.find(i => i.id === item.id);
-    //
-    //   if (_item !== undefined) {
-    //
-    //     let p: number = +item.price;
-    //
-    //     if (base[1] && base[1]?.increasingOtherExtraItemsPrice) {
-    //       // @ts-ignore
-    //       if (+base[0]?.extraId === +extra.id) return p;
-    //
-    //       // @ts-ignore
-    //       const { increasingPriceType, increasingAmount, increasingPercentage } = base[0]?.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;
-    //
-    //     }
-    //
-    //     return +p;
-    //   }
-    //   return 0;
-    // };
-    // scalePizzaSum(array: ISelectedExtraItem[] = []) {
-    //   let s = 0;
-    //   array.forEach((item) => {
-    //     s += item["quantity"] * item["scale"];
-    //     if (item.pizzaSide === EnumPizzaSide.right || item.pizzaSide === EnumPizzaSide.left)
-    //       s = parseInt((s / 2) + "");
-    //
-    //   });
-    //   return s;
-    // }
     scaleSum(array = []) {
         let s = 0;
         array.forEach((item) => {
@@ -420,16 +366,6 @@ export default new class ProductModalController {
         });
         return s;
     }
-    // createSubtitle(items: ISelectedExtraItem[] = []): string {
-    //   if (items.length === 1) {
-    //     let { title, quantity } = items[0];
-    //     return (quantity > 1 ? quantity + "x " : "") + title;
-    //   } else if (items.length > 1) {
-    //     return this.quantitySum(items) + " Item selected";
-    //   } else {
-    //     return "";
-    //   }
-    // };
     productMinAndMaxOptions(product) {
         let list = [];
         for (let index = product.minOrderQuantity; index <= product.maxOrderQuantity; index++) {

package/dist/interfaces/IProduct.d.ts

@@ -53,6 +53,7 @@ export default interface IProduct {
     packagingCosts: number;
     depositCost: number;
     tags: string[] | null;
+    taxable: boolean;
     thumbnailImage: string;
     weight: number;
     size: number;

package/dist/interfaces/ISelectedExtraItem.d.ts

@@ -4,5 +4,6 @@ interface ISelectedExtraItem extends IExtraItem {
     quantity: number;
     pizzaSide: EnumPizzaSide;
     optionId: number;
+    optionTitle: string;
 }
 export default ISelectedExtraItem;

package/dist/interfaces/order/IOrderExtraItem.d.ts

@@ -10,6 +10,7 @@ interface IOrderExtraItem {
     totalAmount: number;
     pizzaSide: number;
     text: string;
+    extraItemOptionTitle: string;
     extraItemOptionId: number;
 }
 export default IOrderExtraItem;

package/dist/interfaces/order/IOrderItem.d.ts

@@ -18,5 +18,6 @@ interface IOrderItem {
     promotionItem: boolean;
     promotionId: number;
     stampCardBonusItem: boolean;
+    taxable: boolean;
 }
 export default IOrderItem;

package/package.json

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