meemup-library 2.0.1 → 2.0.3

package/dist/controllers/PreviewContentController.js

@@ -745,7 +745,7 @@ class _PreviewContentController {
         content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">Reg. date &nbsp;&nbsp; ${dayjs(detail.order.registrationDate).format(Formats.displayDateTime)}</p>`;
         content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">Order &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; REF:${detail.order.id} , #${detail.order.orderNumber}</p>`;
         content += `<div style="display:flex; flex-direction : row; justify-content: space-between; align-items :center; ">
-        <p style="font-size: ${template.fontSize * 2}px; text-align: left;">Total, ${afterTotal}</p>
+        <p style="font-size: ${template.fontSize * 2}px; text-align: left;">Total:${afterTotal}</p>
         <p style="font-size: ${template.fontSize * 2}px; text-align: right;">${total}</p>
         </div>`;
         content += `<div style="display:flex; flex-direction : row; justify-content:center; align-items:center; gap : 8px; margin-top:16px; margin-bottom: 16px;">

package/dist/controllers/PrintToolController.d.ts

@@ -1,12 +1,17 @@
 import IOrderDetailProductsExtra from '../interfaces/print/IOrderDetailProductsExtra';
 import IOrderDetailProduct from '../interfaces/print/IOrderDetailProduct';
 declare class _PrintToolController {
-    extraItemToText(item: IOrderDetailProductsExtra, ignoreWholeText?: boolean, showPrices?: boolean): string;
+    static instance: _PrintToolController;
+    private constructor();
+    static getInstance(): _PrintToolController;
+    extraItemToText(item: IOrderDetailProductsExtra, ignoreWholeText?: boolean, showPrice?: boolean): string;
     productNote(item: IOrderDetailProduct): string;
-    orderItemCountText: (products: IOrderDetailProduct[], catList: number[], onlyListCategory: boolean, productList: number[], onlyListProduct: boolean) => string;
+    createOrderItemCount: (count: number) => string;
+    orderItemCount: (products: IOrderDetailProduct[], catList: number[], onlyListCategory: boolean, productList: number[], onlyListProduct: boolean) => number;
     filterProductsByCategoryList: (products: IOrderDetailProduct[], catList: number[], onlyListCategory: boolean, productList: number[], onlyListProduct: boolean) => IOrderDetailProduct[];
     textWithIndent(text: string, indent?: number, lineWidth?: number): string;
     createBundleLines(bundleTitle: string, price: string, lineWidth?: number): string;
+    orderItemCountText: (products: IOrderDetailProduct[], catList: number[], onlyListCategory: boolean, productList: number[], onlyListProduct: boolean) => string;
 }
 declare const PrintToolController: _PrintToolController;
 export default PrintToolController;

package/dist/controllers/PrintToolController.js

@@ -2,9 +2,15 @@ import EnumPizzaSide from '../enums/EnumPizzaSide';
 import MoneyController from './MoneyController';
 class _PrintToolController {
     constructor() {
-        this.orderItemCountText = (products, catList, onlyListCategory, productList, onlyListProduct) => {
-            const list = this.filterProductsByCategoryList(products, catList, onlyListCategory, productList, onlyListProduct);
-            return `${MoneyController.sum(list.map(row => row.quantity))} ITEM`;
+        this.createOrderItemCount = (count) => {
+            if (count <= 1) {
+                return `${count} ITEM`;
+            }
+            return `${count} ITEMS`;
+        };
+        this.orderItemCount = (products, catList, onlyListCategory, productList, onlyListProduct) => {
+            let list = this.filterProductsByCategoryList(products, catList, onlyListCategory, productList, onlyListProduct);
+            return MoneyController.sum(list.map(row => row.quantity));
         };
         this.filterProductsByCategoryList = (products, catList, onlyListCategory, productList, onlyListProduct) => {
             if (!onlyListCategory && !onlyListProduct) {
@@ -34,9 +40,19 @@ class _PrintToolController {
             }
             return new_product;
         };
+        this.orderItemCountText = (products, catList, onlyListCategory, productList, onlyListProduct) => {
+            const list = this.filterProductsByCategoryList(products, catList, onlyListCategory, productList, onlyListProduct);
+            return `${MoneyController.sum(list.map(row => row.quantity))} ITEM`;
+        };
+    }
+    static getInstance() {
+        if (!_PrintToolController.instance) {
+            _PrintToolController.instance = new _PrintToolController();
+        }
+        return _PrintToolController.instance;
     }
-    extraItemToText(item, ignoreWholeText = false, showPrices = true) {
-        const parts = [];
+    extraItemToText(item, ignoreWholeText = false, showPrice = true) {
+        let parts = [];
         switch (item.pizzaSide) {
             case EnumPizzaSide.all:
                 if (!ignoreWholeText) {
@@ -57,7 +73,7 @@ class _PrintToolController {
         if (item.extraItemOptionId !== null && item.extraItemOptionId !== -1) {
             parts.push(`[${item.extraItemOptionTitle.trim()}] `);
         }
-        if (showPrices && item.totalAmount !== 0) {
+        if (showPrice && item.totalAmount !== 0) {
             parts.push(`(${MoneyController.format(item.totalAmount, '')})`);
         }
         return parts.join(' ').trim();
@@ -72,7 +88,7 @@ class _PrintToolController {
         function splitString(str, chunkSize) {
             return Array.from({ length: Math.ceil(str.length / chunkSize) }, (_, i) => str.slice(i * chunkSize, (i + 1) * chunkSize));
         }
-        const lineCharLength = lineWidth - indent;
+        let lineCharLength = lineWidth - indent;
         let parts = splitString(text, lineCharLength);
         const indentStr = ' '.repeat(indent);
         parts = parts.map(i => indentStr + i);
@@ -82,10 +98,10 @@ class _PrintToolController {
         function splitString(str, chunkSize) {
             return Array.from({ length: Math.ceil(str.length / chunkSize) }, (_, i) => str.slice(i * chunkSize, (i + 1) * chunkSize));
         }
-        const lineCharLength = lineWidth - (price.length) - 1;
-        const parts = splitString(bundleTitle, lineCharLength);
+        let lineCharLength = lineWidth - price.length - 1;
+        let parts = splitString(bundleTitle, lineCharLength);
         if (parts.length >= 1) {
-            while ((parts[0].length + price.length + 1) < lineWidth) {
+            while (parts[0].length + price.length + 1 < lineWidth) {
                 parts[0] = parts[0] + ' ';
             }
             parts[0] = parts[0] + ' ' + price;
@@ -95,5 +111,5 @@ class _PrintToolController {
         return parts.join('\n') + '\n';
     }
 }
-const PrintToolController = new _PrintToolController();
+const PrintToolController = _PrintToolController.getInstance();
 export default PrintToolController;

package/dist/controllers/SimplePreviewController.js

@@ -163,7 +163,7 @@ class SimplePreviewController {
         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));
         return `${this.createDivContainer(template)}
-            <p style="display: block; font-size: ${template.fontSize + 10}px; text-align: left; margin-top : 8px;">${count} ITEM</p>
+            <p style="display: block; font-size: ${template.fontSize + 10}px; text-align: left; margin-top : 8px;">${count <= 1 ? `${count} ITEM` : `${count} ITEMS`}</p>
         </div>`;
     }
     printTextBeforeProducts(template) {
@@ -410,13 +410,14 @@ class SimplePreviewController {
         if ((template.printProductsBySeat && detail.order.orderType === EnumOrderType.dining && detail.order.tableId !== null && seats.length > 0) || (detail.order.orderType === EnumOrderType.dining && detail.order.tableId !== null && seats.length > 0)) {
             return this.printProductInDineIn(template, detail);
         }
+        const count = PrintToolController.orderItemCount(this.sortProduct(detail.products, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);
         let flag = true;
         let content = `${this.createDivContainer(template)}
             <table style="width: 100%; border-collapse: collapse;">
                 <thead style="border-bottom: 1px solid #000000;">
                     <tr style="${isLarge ? '' : 'height: 28px;'}">
                         <th style="font-size:${template.fontSize}px;min-width:40px; width: 40px; text-align: left; font-weight: bold;">#</th>
-                        <th style="font-size:${template.fontSize}px;flex: 1; width: 100%; text-align: left; font-weight: bold; ">Items</th>
+                        <th style="font-size:${template.fontSize}px;flex: 1; width: 100%; text-align: left; font-weight: bold; ">${count <= 1 ? "Item" : "Items"}</th>
                         <th style="font-size:${template.fontSize}px;max-width: 90px; text-align: right; font-weight: bold;">Price</th>
                     </tr>
                 </thead>

package/package.json

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