meemup-library 1.8.7 → 1.8.9

package/dist/controllers/PreviewContentController.d.ts

@@ -12,6 +12,7 @@ import IPointOfSaleSetting from "../interfaces/pos/IPointOfSaleSetting";
 import IPointOfSaleActionFormCashDrawer from "../interfaces/pos/IPointOfSaleActionFormCashDrawer";
 import IPointOfSaleApiClosingWorkDay from "../interfaces/pos/IPointOfSaleApiClosingWorkDay";
 import IReservationTableRow from "../interfaces/reservation/IReservationTableRow";
+import IPointOfSalePrintAction from "../interfaces/pos/IPointOfSalePrintAction";
 declare class _PreviewContentController {
     createReservationMarkup(reservation: IReservationTableRow | undefined, template: IPrintTemplate): string;
     calculatePaperSize: (paper: number, width: string | number) => string;
@@ -20,13 +21,14 @@ declare class _PreviewContentController {
     convertTimeStringToDateByT(data?: Date | string | null): Date | string | null;
     formatAMPMDate(date: Date | string | null): string;
     formatDateTime(dateTime: string, mode?: string): string;
-    simpleLayout(account: IAccount, detail: IOrderDetails, template: IPrintTemplate): string;
-    largeLayout(account: IAccount, detail: IOrderDetails, template: IPrintTemplate): string;
+    private buildLayout;
+    simpleLayout(account: IAccount, detail: IOrderDetails, template: IPrintTemplate, task: IPointOfSalePrintAction): string;
+    largeLayout(account: IAccount, detail: IOrderDetails, template: IPrintTemplate, task: IPointOfSalePrintAction): string;
     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;
+    preview(account: IAccount, detail: IOrderDetails, template: IPrintTemplate, task: IPointOfSalePrintAction): string;
+    previewForPos(account: IAccount, detail: IOrderDetails, template: IPrintTemplate, task: IPointOfSalePrintAction): string;
     createPrintFromTurnoverDetail(data: ITurnover, currency: string, printParts: IPointOfSalePrintParts): Promise<string>;
     createCashDrawerPaidInOutMarkup(device: IPointOfSaleActionFormCashDrawer, setting: IPointOfSaleSetting, member: IPointOfSaleTeamMember): Promise<string>;
     openCashDrawerMarkup(label?: string): Promise<string>;

package/dist/controllers/PreviewContentController.js

@@ -195,81 +195,55 @@ class _PreviewContentController {
             return dateTime;
         }
     }
-    simpleLayout(account, detail, template) {
-        const { order, } = detail;
+    buildLayout(account, detail, template, task, isLargeLayout = false) {
+        const { order } = detail;
         const { font, width, paper, paddingTop, paddingBottom, orderSummaryPrintPlacement } = template;
-        const fontFamily = (font === "Font A" || font === "Font B") ? "arial" : font;
-        let content = `<div style="font-family : ${fontFamily}; font-weight : normal; padding : ${paddingTop}px 0 ${paddingBottom}px 0; width: ${this.calculatePaperSize(paper, width)};"> `;
+        const fontFamily = (font === "Font A" || font === "Font B")
+            ? "arial"
+            : font;
+        let content = `
+        <div
+            style="
+                font-family:${fontFamily};
+                font-weight:normal;
+                padding:${paddingTop}px 0 ${paddingBottom}px 0;
+                width:${this.calculatePaperSize(paper, width)};
+            "
+        >
+    `;
         if (!order.asSoonAsPossible) {
             content += SimplePreviewController.printPreOrderText(template);
         }
-        if (orderSummaryPrintPlacement === EnumOrderSummaryPrintPlacementType.BeforePageHeader) {
+        if (orderSummaryPrintPlacement ===
+            EnumOrderSummaryPrintPlacementType.BeforePageHeader) {
             content += SimplePreviewController.printSummary(template, order);
         }
         content += SimplePreviewController.printTitle(template);
-        if (orderSummaryPrintPlacement === EnumOrderSummaryPrintPlacementType.AfterPageHeader) {
+        if (orderSummaryPrintPlacement ===
+            EnumOrderSummaryPrintPlacementType.AfterPageHeader) {
             content += SimplePreviewController.printSummary(template, order);
         }
         content += SimplePreviewController.printLogo(template, detail, account);
         content += SimplePreviewController.printCompanyNameAndAddress(template, detail);
-        if (orderSummaryPrintPlacement === EnumOrderSummaryPrintPlacementType.AfterCompanyInformation) {
+        if (orderSummaryPrintPlacement ===
+            EnumOrderSummaryPrintPlacementType.AfterCompanyInformation) {
             content += SimplePreviewController.printSummary(template, order);
         }
         content += SimplePreviewController.printTextAfterCompanyAddress(template);
-        // content += SimplePreviewController.printDash();
         content += SimplePreviewController.printShowPayment(template, detail);
         content += SimplePreviewController.printOrderInformation(template, detail);
         content += SimplePreviewController.printCustomerInformation(template, detail);
-        content += SimplePreviewController.printProductCount(template, detail);
+        content += SimplePreviewController.printProductCount(template, detail, task);
         content += SimplePreviewController.printTextBeforeProducts(template);
-        let value = SimplePreviewController.printProducts(template, detail);
-        if (value !== "")
-            content += value;
-        else
-            return "";
-        content += SimplePreviewController.printCustomerRemark(template, detail);
-        content += SimplePreviewController.printDeliveryInstructionsRemarks(template, detail);
-        content += SimplePreviewController.printCustomerSignature(template, detail);
-        content += SimplePreviewController.printPromotionNote(template);
-        content += SimplePreviewController.printMetaData(template, detail);
-        content += SimplePreviewController.printSplitPayments(template, detail);
-        content += SimplePreviewController.printQrCode(template, detail);
-        content += SimplePreviewController.printTextEnd(template);
-        content += SimplePreviewController.printFooter(template, detail);
-        content += `</div>`;
-        return (`<div style="display: flex;"><div style="width : auto;">${content}</div></div>`);
-    }
-    largeLayout(account, detail, template) {
-        const { order, } = detail;
-        const { font, width, paper, paddingTop, paddingBottom, orderSummaryPrintPlacement } = template;
-        const fontFamily = (font === "Font A" || font === "Font B") ? "arial" : font;
-        let content = `<div style="font-family : ${fontFamily}; font-weight : normal; padding : ${paddingTop}px 0 ${paddingBottom}px 0; width: ${this.calculatePaperSize(paper, width)};"> `;
-        if (!order.asSoonAsPossible) {
-            content += SimplePreviewController.printPreOrderText(template);
-        }
-        if (orderSummaryPrintPlacement === EnumOrderSummaryPrintPlacementType.BeforePageHeader) {
-            content += SimplePreviewController.printSummary(template, order);
-        }
-        content += SimplePreviewController.printTitle(template);
-        if (orderSummaryPrintPlacement === EnumOrderSummaryPrintPlacementType.AfterPageHeader) {
-            content += SimplePreviewController.printSummary(template, order);
-        }
-        content += SimplePreviewController.printLogo(template, detail, account);
-        content += SimplePreviewController.printCompanyNameAndAddress(template, detail);
-        if (orderSummaryPrintPlacement === EnumOrderSummaryPrintPlacementType.AfterCompanyInformation) {
-            content += SimplePreviewController.printSummary(template, order);
+        const productsContent = isLargeLayout
+            ? SimplePreviewController.printLargeProducts(template, detail)
+            : SimplePreviewController.printProducts(template, detail);
+        if (productsContent !== "") {
+            content += productsContent;
         }
-        content += SimplePreviewController.printTextAfterCompanyAddress(template);
-        content += SimplePreviewController.printShowPayment(template, detail);
-        content += SimplePreviewController.printOrderInformation(template, detail);
-        content += SimplePreviewController.printCustomerInformation(template, detail);
-        content += SimplePreviewController.printProductCount(template, detail);
-        content += SimplePreviewController.printTextBeforeProducts(template);
-        let value = SimplePreviewController.printLargeProducts(template, detail);
-        if (value !== "")
-            content += value;
-        else
+        else {
             return "";
+        }
         content += SimplePreviewController.printCustomerRemark(template, detail);
         content += SimplePreviewController.printDeliveryInstructionsRemarks(template, detail);
         content += SimplePreviewController.printCustomerSignature(template, detail);
@@ -280,7 +254,19 @@ class _PreviewContentController {
         content += SimplePreviewController.printTextEnd(template);
         content += SimplePreviewController.printFooter(template, detail);
         content += `</div>`;
-        return (`<div style="display: flex;"><div style="width : auto;">${content}</div></div>`);
+        return `
+        <div style="display:flex;">
+            <div style="width:auto;">
+                ${content}
+            </div>
+        </div>
+    `;
+    }
+    simpleLayout(account, detail, template, task) {
+        return this.buildLayout(account, detail, template, task, false);
+    }
+    largeLayout(account, detail, template, task) {
+        return this.buildLayout(account, detail, template, task, true);
     }
     labelLayout(detail, template) {
         const { products } = detail;
@@ -363,12 +349,12 @@ class _PreviewContentController {
         </div>
     </div>`;
     }
-    preview(account, detail, template) {
+    preview(account, detail, template, task) {
         switch (template.layout) {
             case EnumPrintLayout.SIMPLE:
-                return this.simpleLayout(account, detail, template);
+                return this.simpleLayout(account, detail, template, task);
             case EnumPrintLayout.LARGE:
-                return this.largeLayout(account, detail, template);
+                return this.largeLayout(account, detail, template, task);
             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) {
@@ -381,14 +367,14 @@ class _PreviewContentController {
                 return `<div> template.layout : ${template.layout}</div>`;
         }
     }
-    previewForPos(account, detail, template) {
+    previewForPos(account, detail, template, task) {
         let content;
         switch (template.layout) {
             case EnumPrintLayout.SIMPLE:
-                content = this.simpleLayout(account, detail, template);
+                content = this.simpleLayout(account, detail, template, task);
                 break;
             case EnumPrintLayout.LARGE:
-                content = this.largeLayout(account, detail, template);
+                content = this.largeLayout(account, detail, template, task);
                 break;
             case EnumPrintLayout.LABEL:
                 const products = this.filterByCategoryList(this.sortProduct(detail.products, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);

package/dist/controllers/SimplePreviewController.d.ts

@@ -1,5 +1,6 @@
 import IAccount from "../interfaces/IAccount";
 import IPrintTemplate from "../interfaces/IPrintTemplate";
+import IPointOfSalePrintAction from "../interfaces/pos/IPointOfSalePrintAction.js";
 import IOrderDetailOrder from "../interfaces/print/IOrderDetailOrder";
 import IOrderDetails from "../interfaces/print/IOrderDetails";
 declare class SimplePreviewController {
@@ -12,7 +13,7 @@ declare class SimplePreviewController {
     printShowPayment(template: IPrintTemplate, detail: IOrderDetails): string;
     printOrderInformation(template: IPrintTemplate, detail: IOrderDetails): string;
     printCustomerInformation(template: IPrintTemplate, detail: IOrderDetails): string;
-    printProductCount(template: IPrintTemplate, detail: IOrderDetails): string;
+    printProductCount(template: IPrintTemplate, detail: IOrderDetails, task: IPointOfSalePrintAction): string;
     printTextBeforeProducts(template: IPrintTemplate): string;
     printProductInDineIn(template: IPrintTemplate, detail: IOrderDetails): string;
     printProducts(template: IPrintTemplate, detail: IOrderDetails): string;

package/dist/controllers/SimplePreviewController.js

@@ -210,13 +210,16 @@ class SimplePreviewController {
         content += `</div>`;
         return content;
     }
-    printProductCount(template, detail) {
-        const list = this.filterByCategoryList(this.sortProduct(detail.products, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);
-        const count = MoneyController.sum(list.map(i => i.quantity));
-        let content = this.createDivContainer(template);
-        content += `<p style="display: block; font-size: ${template.fontSize + 10}px; text-align: left; margin-top : 8px;">${count} ITEM</p>`;
-        content += `</div>`;
-        return content;
+    printProductCount(template, detail, task) {
+        if (!Array.isArray(task.seats) || task.seats.length === 0) {
+            const list = this.filterByCategoryList(this.sortProduct(detail.products, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);
+            const count = MoneyController.sum(list.map(i => i.quantity));
+            let content = this.createDivContainer(template);
+            content += `<p style="display: block; font-size: ${template.fontSize + 10}px; text-align: left; margin-top : 8px;">${count} ITEM</p>`;
+            content += `</div>`;
+            return content;
+        }
+        return "";
     }
     printTextBeforeProducts(template) {
         if (template.textBeforeProducts === "")

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

@@ -34,4 +34,5 @@ export default interface IPointOfSaleOrderSummary {
     tableNo?: string | number;
     tableId: number | null;
     deliveryMode?: number;
+    address?: string | null;
 }

package/package.json

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