meemup-library 1.5.33 → 1.5.35

package/dist/controllers/PreviewContentController.d.ts

@@ -23,6 +23,7 @@ declare class _PreviewContentController {
     labelLayout(detail: IOrderDetails, template: IPrintTemplate): string;
     paymentFailed(detail: IOrderDetails, currency: string): string;
     packageLabel(detail: IOrderDetails, template: IPrintTemplate): string;
+    preview(account: IAccount, detail: IOrderDetails, template: IPrintTemplate): string;
     previewForPos(account: IAccount, detail: IOrderDetails, template: IPrintTemplate): string;
     createPrintFromTurnoverDetail(data: ITurnover, currency: string, printParts: IPointOfSalePrintParts): Promise<string>;
     createCashDrawerPaidInOutMarkup(device: IPointOfSaleActionFormCashDrawer, setting: IPointOfSaleSetting, member: IPointOfSaleTeamMember): Promise<string>;

package/dist/controllers/PreviewContentController.js

@@ -315,33 +315,24 @@ class _PreviewContentController {
         </div>
     </div>`;
     }
-    // preview(account: IAccount, detail: IOrderDetails, template: IPrintTemplate) {
-    //     switch (template.layout) {
-    //         case EnumPrintLayout.SIMPLE:
-    //             return this.simpleLayout(account, detail, template);
-    //         case EnumPrintLayout.LARGE:
-    //             return this.largeLayout(account, detail, template);
-    //         case EnumPrintLayout.LABEL:
-    //
-    //             const products: IOrderDetailProduct[] =
-    //                 this.filterByCategoryList(
-    //                     this.sortProduct(detail.products, template.sortProducts),
-    //                     template.printOnlyCertainCategoriesList,
-    //                     template.printOnlyCertainCategories,
-    //                     template.printOnlyCertainProductsList,
-    //                     template.printOnlyCertainProducts);
-    //
-    //             if (products.length === 0) {
-    //                 return `<div>no product </div>`;
-    //             }
-    //
-    //             return this.labelLayout(detail, template);
-    //         case EnumPrintLayout.PACKAGE_LABEL:
-    //             return this.packageLabel(detail, template);
-    //         default:
-    //             return `<div> template.layout : ${template.layout}</div>`;
-    //     }
-    // }
+    preview(account, detail, template) {
+        switch (template.layout) {
+            case EnumPrintLayout.SIMPLE:
+                return this.simpleLayout(account, detail, template);
+            case EnumPrintLayout.LARGE:
+                return this.largeLayout(account, detail, template);
+            case EnumPrintLayout.LABEL:
+                const products = this.filterByCategoryList(this.sortProduct(detail.products, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);
+                if (products.length === 0) {
+                    return `<div>no product </div>`;
+                }
+                return this.labelLayout(detail, template);
+            case EnumPrintLayout.PACKAGE_LABEL:
+                return this.packageLabel(detail, template);
+            default:
+                return `<div> template.layout : ${template.layout}</div>`;
+        }
+    }
     previewForPos(account, detail, template) {
         let content;
         switch (template.layout) {

package/dist/controllers/PrintContentController.d.ts

@@ -3,7 +3,7 @@ import IPrintTemplate from "../interfaces/IPrintTemplate";
 import IOrderDetails from "../interfaces/print/IOrderDetails";
 import IOrderDetailCustomer from "../interfaces/print/IOrderDetailCustomer";
 import IOrderDetailProduct from "../interfaces/print/IOrderDetailProduct";
-declare const _default: {
+declare class _PreviewContentController {
     createAddressText: (customer: IOrderDetailCustomer) => null | [string, string];
     ccyFormat: (num: number, pre?: string) => string;
     calculatePaperSize: (paper: number, width: string | number) => string;
@@ -21,5 +21,6 @@ declare const _default: {
     paymentFailed(detail: IOrderDetails, currency: string): string;
     packageLabel(detail: IOrderDetails): string;
     preview(account: IAccount, detail: IOrderDetails, template: IPrintTemplate, symbol?: string): string;
-};
-export default _default;
+}
+declare const PreviewContentController: _PreviewContentController;
+export default PreviewContentController;

package/dist/controllers/PrintContentController.js

@@ -1,5 +1,5 @@
 import PhoneController from "./PhoneController";
-export default new class {
+class _PreviewContentController {
     constructor() {
         this.createAddressText = (customer) => {
             let text = "";
@@ -512,4 +512,6 @@ export default new class {
                 return `<div> template.layout : ${template.layout}</div>`;
         }
     }
-}();
+}
+const PreviewContentController = new _PreviewContentController();
+export default PreviewContentController;

package/dist/controllers/SimplePreviewController.js

@@ -1,3 +1,5 @@
+import PrintToolController from "./PrintToolController.js";
+import EnumFeeType from "../enums/EnumFeeType.js";
 import PhoneController from "./PhoneController";
 import EnumPaymentType from "../enums/EnumPaymentType";
 import MoneyController from "./MoneyController";
@@ -7,7 +9,7 @@ import EnumPizzaSide from "../enums/EnumPizzaSide";
 import EnumPaymentState from "../enums/EnumPaymentState";
 import OrderToolController from "./OrderToolController";
 import EnumOrderDateTimePrintModeType from "../enums/EnumOrderDateTimePrintModeType";
-import { Formats, printPoweredBy } from "../statics";
+import { BundleGroupPreName, BundleIdPreName, BundleProductQuantityPreName, Formats, printPoweredBy } from "../statics";
 import dayjs from "../utils/dayjs";
 class SimplePreviewController {
     constructor() {
@@ -202,6 +204,7 @@ class SimplePreviewController {
         return content;
     }
     printProducts(template, detail) {
+        var _a, _b, _c;
         let content = this.createDivContainer(template);
         content += `<table style="width: 100%; border-collapse: collapse;">
                     <thead style="border-bottom: 1px solid #000000;">
@@ -213,7 +216,84 @@ class SimplePreviewController {
                     </thead>
                     <tbody>
                 `;
-        detail.products.forEach((row) => {
+        const bundledProducts = detail.products.filter(i => Array.isArray(i.tags) && i.tags.findIndex(tag => tag.startsWith(BundleIdPreName)) !== -1);
+        if (bundledProducts.length > 0) {
+            const bundleGroups = [];
+            bundledProducts.forEach(pro => {
+                var _a;
+                const tag = (_a = pro.tags) === null || _a === void 0 ? void 0 : _a.find(i => i.startsWith(BundleGroupPreName));
+                if (tag) {
+                    const bundleGroup = (tag + '').split(BundleGroupPreName)[1];
+                    if (!bundleGroups.includes(bundleGroup)) {
+                        bundleGroups.push(bundleGroup);
+                    }
+                }
+            });
+            const bundles = detail.order.items.filter(i => i.type === EnumFeeType.BundleProduct);
+            for (let ind = 0; ind < bundleGroups.length; ind++) {
+                const group = bundleGroups[ind] + '';
+                const groupTag = BundleGroupPreName + group;
+                const list = bundledProducts.filter(pro => Array.isArray(pro.tags) && pro.tags.includes(groupTag));
+                if (list.length > 0) {
+                    const firstItem = list[0];
+                    // const bundleGroup: string = (firstItem.tags?.find(i => i.startsWith(BundleGroupPreName)) + '').split(BundleGroupPreName)[1];
+                    // const bundleId: number = +(firstItem.tags?.find(i => i.startsWith(BundleIdPreName)) + '').split(BundleIdPreName)[1];
+                    const firstItemRatio = +(((_a = firstItem.tags) === null || _a === void 0 ? void 0 : _a.find(i => i.startsWith(BundleProductQuantityPreName))) + '').split(BundleProductQuantityPreName)[1];
+                    const bundleQuantity = firstItem.quantity / firstItemRatio;
+                    const bundle = bundles.find(i => { var _a; return ((_a = i.metadata.find(j => j.text === "BundleGroup")) === null || _a === void 0 ? void 0 : _a.value) === group; });
+                    if (bundle) {
+                        const sharp = ` ${bundleQuantity}×`;
+                        const sumBundleDiscount = bundle.amount; // bundleQuantity * bundle.discountAmount;
+                        const _total = MoneyController.sumField(list, 'totalAmount');
+                        // let _lastTotal = _total - sumBundleDiscount;
+                        let _lastTotal = _total - sumBundleDiscount;
+                        if (_lastTotal < 0) {
+                            _lastTotal = 0;
+                        }
+                        const price = template.showPrices ? MoneyController.format(_lastTotal, detail.company.currencySymbol) : '';
+                        let bundleText = bundle.text;
+                        bundleText = ((_b = bundleText === null || bundleText === void 0 ? void 0 : bundleText.replace(sharp, '')) === null || _b === void 0 ? void 0 : _b.trim()) + "";
+                        content += `<tr style="height: 28px;">
+                            <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;">${sharp}</td>
+                            <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: left; font-weight: bold;">${bundleText}</td>
+                            <td style="font-size:${template.fontSize}px; max-width: 90px; text-align: right;">${price}</td>
+                        </tr>`;
+                        for (let index = 0; index < list.length; index++) {
+                            const row = list[index];
+                            const sharp = `${row.quantity}× `;
+                            let product = (template.showProductKitchenName && row.kitchenReceiptName !== '' && row.kitchenReceiptName !== null) ? row.kitchenReceiptName : row.title;
+                            product = sharp + ((_c = product === null || product === void 0 ? void 0 : product.replace(sharp, '')) === null || _c === void 0 ? void 0 : _c.trim()) + "";
+                            content += `<tr>
+                            <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
+                            <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: left; column-span: 2;">${product}</td>
+                        </tr>`;
+                            if (row.extrasNames) {
+                                const extList = row.extras
+                                    .filter(item => !item.doNotPrintOnReceipt)
+                                    .map(item => PrintToolController.extraItemToText(item, template.skipWholePizzaToppingText))
+                                    .filter(i => i.length > 0);
+                                for (let ind = 0; ind < extList.length; ind++) {
+                                    content += `<tr>
+                            <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
+                            <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: left; column-span: 2; padding-left: 24px;">${extList[ind]}</td>
+                        </tr>`;
+                                }
+                            }
+                            const note = PrintToolController.productNote(row);
+                            if (note !== '') {
+                                content += `<tr>
+                            <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
+                            <td style="font-size:${template.fontSize}px; font-weight: bold; flex: 1; width: 100%; text-align: left; column-span: 2; padding-left: 24px;">${note}</td>
+                        </tr>`;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        const unBundledProducts = detail.products.filter(i => !(Array.isArray(i.tags) && i.tags.findIndex(tag => tag.startsWith(BundleIdPreName)) !== -1));
+        const list = this.filterByCategoryList(this.sortProduct(unBundledProducts, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);
+        list.forEach((row) => {
             let cat;
             if (!template.showCategoryTitle || !row.categoryTitle || row.categoryTitle.trim().length === 0)
                 cat = "";
@@ -295,7 +375,7 @@ class SimplePreviewController {
                                 ${MoneyController.format(detail.order.subtotalAmount, detail.company.currencySymbol)}
                             </td>
                         </tr>`;
-            if (detail.order.hstAmount > 0 && detail.order.serviceFee < 1) {
+            if (detail.order.hstAmount > 0) {
                 //hst and service fee and company fee amount
                 content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
                             <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
@@ -319,6 +399,18 @@ class SimplePreviewController {
                             </td>
                         </tr>`;
             }
+            if (detail.order.thirdPartyDriverTipAmount > 0) {
+                //tip amount
+                content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
+                            <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
+                            <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: right; padding-right: 8px;">
+                                Driver tip:
+                            </td>
+                            <td style="font-size:${template.fontSize}px; width: 90px; text-align: right;">
+                                ${MoneyController.format(detail.order.thirdPartyDriverTipAmount, detail.company.currencySymbol)}
+                            </td>
+                        </tr>`;
+            }
         }
         content += `</tbody></table>`;
         //total amount
@@ -335,6 +427,7 @@ class SimplePreviewController {
         return content;
     }
     printLargeProducts(template, detail) {
+        var _a, _b, _c;
         let content = this.createDivContainer(template);
         const largeFontSize = template.printer === 5 ? 22 : parseInt((template.fontSize + 10) + "");
         content += `<table style="width: 100%; border-collapse: collapse;">
@@ -347,16 +440,95 @@ class SimplePreviewController {
                     </thead>
                     <tbody>
                 `;
-        detail.products.forEach((row) => {
+        const bundledProducts = detail.products.filter(i => Array.isArray(i.tags) && i.tags.findIndex(tag => tag.startsWith(BundleIdPreName)) !== -1);
+        if (bundledProducts.length > 0) {
+            const bundleGroups = [];
+            bundledProducts.forEach(pro => {
+                var _a;
+                const tag = (_a = pro.tags) === null || _a === void 0 ? void 0 : _a.find(i => i.startsWith(BundleGroupPreName));
+                if (tag) {
+                    const bundleGroup = (tag + '').split(BundleGroupPreName)[1];
+                    if (!bundleGroups.includes(bundleGroup)) {
+                        bundleGroups.push(bundleGroup);
+                    }
+                }
+            });
+            const bundles = detail.order.items.filter(i => i.type === EnumFeeType.BundleProduct);
+            for (let ind = 0; ind < bundleGroups.length; ind++) {
+                const group = bundleGroups[ind] + '';
+                const groupTag = BundleGroupPreName + group;
+                const list = bundledProducts.filter(pro => Array.isArray(pro.tags) && pro.tags.includes(groupTag));
+                if (list.length > 0) {
+                    const firstItem = list[0];
+                    const firstItemRatio = +(((_a = firstItem.tags) === null || _a === void 0 ? void 0 : _a.find(i => i.startsWith(BundleProductQuantityPreName))) + '').split(BundleProductQuantityPreName)[1];
+                    const bundleQuantity = firstItem.quantity / firstItemRatio;
+                    const bundle = bundles.find(i => { var _a; return ((_a = i.metadata.find(j => j.text === "BundleGroup")) === null || _a === void 0 ? void 0 : _a.value) === group; });
+                    if (bundle) {
+                        const sharp = ` ${bundleQuantity}×`;
+                        const sumBundleDiscount = bundle.amount; // bundleQuantity * bundle.discountAmount;
+                        const _total = MoneyController.sumField(list, 'totalAmount');
+                        // let _lastTotal = _total - sumBundleDiscount;
+                        let _lastTotal = _total - sumBundleDiscount;
+                        if (_lastTotal < 0) {
+                            _lastTotal = 0;
+                        }
+                        const price = template.showPrices ? MoneyController.format(_lastTotal, detail.company.currencySymbol) : '';
+                        let bundleText = bundle.text;
+                        bundleText = ((_b = bundleText === null || bundleText === void 0 ? void 0 : bundleText.replace(sharp, '')) === null || _b === void 0 ? void 0 : _b.trim()) + "";
+                        content += `<tr>
+                            <td style="font-size:${largeFontSize}px; min-width:40px; width: 40px; text-align: left;">${sharp}</td>
+                            <td style="font-size:${largeFontSize}px; flex: 1; width: 100%; text-align: left; font-weight: bold;">${bundleText}</td>
+                            <td style="font-size:${largeFontSize}px; max-width: 90px; text-align: right;">${price}</td>
+                        </tr>`;
+                        for (let index = 0; index < list.length; index++) {
+                            const row = list[index];
+                            const sharp = `${row.quantity}× `;
+                            let product = (template.showProductKitchenName && row.kitchenReceiptName !== '' && row.kitchenReceiptName !== null) ? row.kitchenReceiptName : row.title;
+                            product = sharp + ((_c = product === null || product === void 0 ? void 0 : product.replace(sharp, '')) === null || _c === void 0 ? void 0 : _c.trim()) + "";
+                            //     content += `<tr>
+                            //     <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
+                            //     <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: left; column-span: 2;">${product}</td>
+                            // </tr>`;
+                            content += `<tr>
+                            <td style="font-size:${largeFontSize}px; min-width:40px; width: 40px; text-align: left;">&ensp;</td>
+                            <td style="font-size:${largeFontSize}px; flex: 1; width: 100%; text-align: left; column-span: 2;">${product}</td>
+                        </tr>`;
+                            if (row.extrasNames) {
+                                const extList = row.extras
+                                    .filter(item => !item.doNotPrintOnReceipt)
+                                    .map(item => PrintToolController.extraItemToText(item, template.skipWholePizzaToppingText))
+                                    .filter(i => i.length > 0);
+                                for (let ind = 0; ind < extList.length; ind++) {
+                                    content += `<tr>
+                                                <td style=" min-width:40px; width: 40px;">&ensp;</td>
+                                                <td style="font-size:${largeFontSize}px; flex: 1; width: 100%; text-align: left;column-span: 2; padding-left: 24px;">${extList[ind]}</td>
+                                                </tr>`;
+                                }
+                            }
+                            const note = PrintToolController.productNote(row);
+                            if (note !== '') {
+                                content += `<tr>
+                                            <td style=" min-width:40px; width: 40px;">&ensp;</td>
+                                            <td style="font-size:${largeFontSize}px; flex: 1; width: 100%; text-align: left;column-span: 2; padding-left: 24px;">${note}</td>
+                                            </tr>`;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        const unBundledProducts = detail.products.filter(i => !(Array.isArray(i.tags) && i.tags.findIndex(tag => tag.startsWith(BundleIdPreName)) !== -1));
+        const list = this.filterByCategoryList(this.sortProduct(unBundledProducts, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);
+        list.forEach((row) => {
             const productName = (template.showCategoryTitle ? `[${row.categoryTitle}] ` : "") + ((template.showProductKitchenName && row.kitchenReceiptName !== null) ? row.kitchenReceiptName : row.title);
             const amount = template.showPrices ? MoneyController.format(row.totalAmount, detail.company.currencySymbol) : "";
             content += `<tr>
-                            <td style="font-size:${largeFontSize}px; min-width:40px; width: 40px; text-align: left;">${row.quantity}X</td>
+                            <td style="font-size:${largeFontSize}px; min-width:40px; width: 40px; text-align: left;">${row.quantity}×</td>
                             <td style="font-size:${largeFontSize}px; flex: 1; width: 100%; text-align: left; font-weight: bold;">${productName}</td>
                             <td style="font-size:${largeFontSize}px; max-width: 90px; text-align: right;">${amount}</td>
                         </tr>`;
             row.extras.filter(i => !i.doNotPrintOnReceipt).forEach(element => {
-                const extraText = this.pizzaSideText(element.pizzaSide, template.skipWholePizzaToppingText) + element.quantity + "X " + element.extraItemTitle;
+                const extraText = this.pizzaSideText(element.pizzaSide, template.skipWholePizzaToppingText) + element.quantity + "× " + element.extraItemTitle;
                 const extraAmount = template.showPrices ? MoneyController.format(element.totalAmount, detail.company.currencySymbol) : "";
                 content += `<tr>
                             <td style="font-size:${largeFontSize}px; min-width:40px; width: 40px; text-align: left;">&ensp;</td>
@@ -417,7 +589,7 @@ class SimplePreviewController {
                                 ${MoneyController.format(detail.order.subtotalAmount, detail.company.currencySymbol)}
                             </td>
                         </tr>`;
-            if (detail.order.hstAmount > 0 && detail.order.serviceFee < 1) {
+            if (detail.order.hstAmount > 0) {
                 //hst and service fee and company fee amount
                 content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
                             <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
@@ -441,6 +613,18 @@ class SimplePreviewController {
                             </td>
                         </tr>`;
             }
+            if (detail.order.thirdPartyDriverTipAmount > 0) {
+                //tip amount
+                content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
+                            <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
+                            <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: right; padding-right: 8px;">
+                                Driver tip:
+                            </td>
+                            <td style="font-size:${template.fontSize}px; width: 90px; text-align: right;">
+                                ${MoneyController.format(detail.order.thirdPartyDriverTipAmount, detail.company.currencySymbol)}
+                            </td>
+                        </tr>`;
+            }
         }
         content += `</tbody></table>`;
         //total amount

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meemup-library",
-  "version": "1.5.33",
+  "version": "1.5.35",
   "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.33\" && git push origin "
+    "commit": "git add . && git commit -m \"version.1.5.35\" && git push origin "
   },
   "files": [
     "/dist"
@@ -26,4 +26,4 @@
   "dependencies": {
     "dayjs": "^1.11.13"
   }
-}
+}