meemup-library 1.4.49 → 1.4.50

package/dist/controllers/PreviewContentController.js

@@ -339,20 +339,30 @@ export default new class PreviewContentController {
                             <meta name="viewport" content="width=device-width, initial-scale=1.0">
                             <style>
 
-                                html {
+                                     html {
                                     font-size: 14px;
                                 }
 
                                 * {
                                     padding: 0;
                                     margin: 0;
-                                    background-color: #ffffff;
                                 }
-
+                                
+                                p,strong {
+                                 line-height: 1.5rem;
+                                }
+                                
+                                td{
+                                padding-top: 2px;
+                                padding-bottom: 2px;
+                                line-height: 1.6rem;
+                                }
+                     
                                 body {
                                     width : 100%;
                                     margin: 0;
                                     padding: 0;
+                                    background-color: #ffffff;
                                     font-family: -apple-system, BlinkMacSystemFont, 'Arial', "Arial Black", "Comic Sans MS", "Georgia", "Impact", "Lucida Console", "Lucida Sans Unicode", 'Segoe UI', 'Roboto', 'Oxygen',
                                     'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
                                     sans-serif;

package/dist/controllers/SimplePreviewController.d.ts

@@ -24,12 +24,14 @@ declare class SimplePreviewController {
     printQrCode(template: IPrintTemplate, detail: IOrderDetails): string;
     printTextEnd(template: IPrintTemplate): string;
     printFooter(template: IPrintTemplate, detail: IOrderDetails): string;
-    printDashLine(): string;
+    printDashLine(my?: number): string;
+    printSimpleDashLine(): string;
     printSolidLine(): string;
     private createDivContainer;
     private filterByCategoryList;
     private sortProduct;
     private pizzaSideText;
+    private createTextValue;
 }
 declare const controller: SimplePreviewController;
 export default controller;

package/dist/controllers/SimplePreviewController.js

@@ -8,6 +8,7 @@ import EnumPizzaSide from "../enums/EnumPizzaSide";
 import EnumPaymentState from "../enums/EnumPaymentState";
 import OrderToolController from "./OrderToolController";
 import EnumOrderDateTimePrintModeType from "../enums/EnumOrderDateTimePrintModeType";
+import { Formats } from "../statics";
 class SimplePreviewController {
     constructor() {
         this.filterByCategoryList = (products, catList, onlyListCategory, productList, onlyListProduct) => {
@@ -49,7 +50,7 @@ class SimplePreviewController {
         // let largeFontSize = parseInt((template.fontSize + 10) + "") + "px";
         let largeFontSize = template.printer === 5 ? "22px" : parseInt((template.fontSize + 10) + "") + "px";
         let content = this.createDivContainer(template);
-        content += `<div style="display:grid; grid-template-columns: repeat(1 , 1fr);">`;
+        content += `<div style="display:grid; grid-template-columns: repeat(1 , 1fr); gap : 8px;">`;
         let summary = `<strong style="font-size: ${largeFontSize}; text-align: center;">#${order.orderNumber}&emsp;${order.orderTypeString}</strong>`;
         content += summary;
         if (order.orderType === EnumOrderType.dining && order.tableId !== null) {
@@ -123,9 +124,11 @@ class SimplePreviewController {
         if (!template.showPrices)
             return "";
         let content = this.createDivContainer(template);
-        content += this.printDashLine();
-        content += `<p style="display : block; font-size: ${template.fontSize}px; text-align: left;">Payment information</p>`;
-        content += `<strong style="font-size: ${template.fontSize * 1.6};">${detail.order.paymentTypeString + (detail.order.paymentType === EnumPaymentType.Cash ? `: ${MoneyController.format(detail.order.totalAmount, detail.company.currencySymbol)} ` : " ") + " - " + detail.order.paymentStateString}</strong>`;
+        // content += this.printDashLine();
+        // content += `<p style="display : block; font-size: ${template.fontSize}px; text-align: left;">Payment information</p>`;
+        content += `<div style="font-size: ${template.fontSize}px; font-weight: bold; padding: 4px; background-color: black; color: white; text-align: center;">
+                    ${detail.order.paymentTypeString + (detail.order.paymentType === EnumPaymentType.Cash ? `: ${MoneyController.format(detail.order.totalAmount, detail.company.currencySymbol)} ` : " ") + " - " + detail.order.paymentStateString}
+                    </div>`;
         if (detail.order.paymentType === EnumPaymentType.Online)
             content += `<p style="display:block;">Credit Card: **** **** **** ${detail.order.lastFourDigits}</p>`;
         content += `</div>`;
@@ -135,13 +138,23 @@ class SimplePreviewController {
         var _a;
         if (!template.orderInfo)
             return "";
-        let content = this.createDivContainer(template);
-        content += this.printDashLine();
-        content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">Order number:&emsp;${detail.order.orderNumber}</p>`;
-        content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">${detail.order.orderTypeString}:&emsp;on ${moment(detail.order.desiredDate).format("hh:mm A")}</p>`;
-        if (typeof detail.order.estimatedTime === "string" && detail.order.estimatedTime.length > 0)
-            content += `<p style="display: block; font-size: ${template.fontSize}px; text-align:left;">Est. Time:&nbsp;&ensp;&emsp;${(_a = detail.order.estimatedTime) === null || _a === void 0 ? void 0 : _a.substring(0, 5)}</p>`;
-        content += `<p style="display: block; font-size: ${template.fontSize}px; text-align:left;">Reg. Time:&nbsp;&ensp;&emsp;${moment(detail.order.registrationDate).format("YYYY-MM-DD    hh:mm A")}</p>`;
+        let content = this.createDivContainer(template, 8, 8);
+        // content += this.printSimpleDashLine();
+        // content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">Order number:&emsp;${detail.order.orderNumber}</p>`;
+        // content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">
+        //                 Reference:&emsp;${detail.order.via}, #${detail.order.id}
+        //             </p>`;
+        // content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">${detail.order.orderTypeString}:&emsp;on ${moment(detail.order.desiredDate).format(Formats.displayTime)}</p>`;
+        // if (typeof detail.order.estimatedTime === "string" && detail.order.estimatedTime.length > 0)
+        //     content += `<p style="display: block; font-size: ${template.fontSize}px; text-align:left;">Est. Time:&nbsp;&ensp;&emsp;${detail.order.estimatedTime?.substring(0, 5)}</p>`;
+        content += this.createTextValue('Order number:', detail.order.orderNumber.toString(), 110, template);
+        content += this.createTextValue('Reference:', `${detail.order.via},  #${detail.order.id}`, 110, template);
+        content += this.createTextValue(`${detail.order.orderTypeString}:`, moment(detail.order.desiredDate).format(Formats.displayDateTime), 110, template);
+        if (typeof detail.order.estimatedTime === "string" && detail.order.estimatedTime.length > 0) {
+            content += this.createTextValue('Est. Time:', (_a = detail.order.estimatedTime) === null || _a === void 0 ? void 0 : _a.substring(0, 5), 110, template);
+        }
+        content += this.createTextValue('Reg. Time:', moment(detail.order.registrationDate).format(Formats.displayDateTime), 110, template);
+        content += `<!--<p style="display: block; font-size: ${template.fontSize}px; text-align:left;">Reg. Time:&nbsp;&ensp;&emsp;${moment(detail.order.registrationDate).format(Formats.displayDateTime)}</p>-->`;
         content += `</div>`;
         return content;
     }
@@ -150,21 +163,19 @@ class SimplePreviewController {
             return "";
         if (template.showCustomerInfo === EnumShowCustomer.YES_WHEN_DELIVERY_ORDER && detail.order.orderType !== EnumOrderType.delivery)
             return "";
-        let content = this.createDivContainer(template);
-        content += this.printDashLine();
+        let content = this.createDivContainer(template, 4, 8);
+        // content += this.printDashLine(4);
         if (template.printCustomerDetailsInLarge) {
             let largeFontSize = template.printer === 5 ? 22 : parseInt((template.fontSize + 10) + "");
-            content += `<p style="display : block; font-size: ${largeFontSize}px; text-align: left;">Customer information</p>`;
+            content += `<!--<p style="display : block; font-size: ${largeFontSize}px; text-align: left;">Customer information</p>-->`;
             content += `<strong style="display:block; font-size: ${largeFontSize}px;">${detail.customer.fullName}</strong>`;
             content += `<strong style="display:block; font-size: ${largeFontSize}px;">${PhoneController.toDisplay(detail.customer.phoneNumber)}</strong>`;
-            // content += `<p style="display:block; font-size: ${template.fontSize}px;">${detail.customer.email}</p>`;
             content += `<strong style="display:block; font-size: ${largeFontSize}px;">${detail.customer.address}</strong>`;
         }
         else {
-            content += `<p style="display : block; font-size: ${template.fontSize}px; text-align: left;">Customer information</p>`;
+            // content += `<p style="display : block; font-size: ${template.fontSize}px; text-align: left;">Customer information</p>`;
             content += `<strong style="display:block; font-size: ${template.fontSize}px;">${detail.customer.fullName}</strong>`;
             content += `<strong style="display:block; font-size: ${template.fontSize}px;">${PhoneController.toDisplay(detail.customer.phoneNumber)}</strong>`;
-            // content += `<p style="display:block; font-size: ${template.fontSize}px;">${detail.customer.email}</p>`;
             content += `<strong style="display:block; font-size: ${template.fontSize}px;">${detail.customer.address}</strong>`;
         }
         content += `</div>`;
@@ -174,7 +185,7 @@ class SimplePreviewController {
         let list = this.filterByCategoryList(this.sortProduct(detail.products, template.sortProducts), template.printOnlyCertainCategoriesList, template.printOnlyCertainCategories, template.printOnlyCertainProductsList, template.printOnlyCertainProducts);
         let 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;">${count} ITEM</p>`;
+        content += `<p style="display: block; font-size: ${template.fontSize + 10}px; text-align: left; margin-top : 8px;">${count} ITEM</p>`;
         content += `</div>`;
         return content;
     }
@@ -194,24 +205,32 @@ class SimplePreviewController {
         let content = this.createDivContainer(template);
         content += `<table style="width: 100%; border-collapse: collapse;">
                     <thead style="border-bottom: 1px solid #000000;">
-                        <tr>
+                        <tr style="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;">Product</th>
+                            <th style="font-size:${template.fontSize}px;flex: 1; width: 100%; text-align: left; font-weight: bold; ">Product</th>
                             <th style="font-size:${template.fontSize}px;max-width: 90px; text-align: right; font-weight: bold;">Price</th>
                         </tr>
                     </thead>
                     <tbody>
                 `;
         detail.products.forEach((row) => {
-            let productName = (template.showCategoryTitle ? `[${row.categoryTitle}] ` : "") + ((template.showProductKitchenName && row.kitchenReceiptName.trim().length > 0) ? row.kitchenReceiptName : row.title);
+            let productName = (template.showCategoryTitle ? `[${row.categoryTitle}] ` : "") + ((template.showProductKitchenName && row.kitchenReceiptName.trim().length > 0) ? row.kitchenReceiptName : row.productName);
             let amount = template.showPrices ? MoneyController.format(row.totalAmount, detail.company.currencySymbol) : "";
-            content += `<tr>
+            content += `<tr style="height: 28px;">
                             <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;">${row.quantity}X</td>
                             <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: left; font-weight: bold;">${productName}</td>
                             <td style="font-size:${template.fontSize}px; max-width: 90px; text-align: right;">${amount}</td>
                         </tr>`;
             row.extras.forEach(element => {
-                let extraText = this.pizzaSideText(element.pizzaSide) + element.quantity + "X " + element.extraItemTitle;
+                // let extraText = this.pizzaSideText(element.pizzaSide) + element.quantity + "X " + element.extraItemTitle;
+                let side = this.pizzaSideText(element.pizzaSide);
+                let extraText = "";
+                if (side !== "")
+                    extraText += side;
+                if (element.quantity > 1)
+                    extraText += element.quantity + "x ";
+                extraText += element.extraItemTitle;
+                extraText = extraText.trim();
                 let extraAmount = template.showPrices ? MoneyController.format(element.totalAmount, detail.company.currencySymbol) : "";
                 content += `<tr>
                             <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
@@ -229,7 +248,7 @@ class SimplePreviewController {
         });
         if (template.showPrices) {
             //order amount
-            content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
+            content += `<tr style=" border-top: 1px dashed #000000; padding: 4px 0;">
                             <td style="font-size:${template.fontSize}px; width: 40px; text-align: left;"></td>
                             <td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: right;padding-right: 8px;">
                                 Order Amount:
@@ -299,15 +318,15 @@ class SimplePreviewController {
         }
         content += `</tbody></table>`;
         //total amount
-        content += `<div style="display: flex; flex-direction: row; align-items: center; border-top: 1px dashed #000000; margin: 4px 0;">
-                            <div style="font-size:${template.fontSize + 6}px; flex: 1; text-align: right; padding-right: 8px;">
-                                ${detail.order.paymentState !== EnumPaymentState.Paid ? "Total & Still to pay" : "Total"}:
+        content += `<div style="display: flex; flex-direction: row; align-items: center; background-color: black; padding: 4px;">
+                            <div style="font-size:${template.fontSize + 6}px; flex: 1; text-align: right; padding-right: 8px; background-color: transparent; color: white;">
+                                ${detail.order.paymentState !== EnumPaymentState.Paid ? "Total & NOT PAID" : "Total"}:
                             </div>
-                            <div style="font-size:${(template.fontSize + 10) + "px"}; width: 90px; text-align: right;">
+                            <div style="font-size:${(template.fontSize + 10) + "px"}; width: 90px; text-align: right; background-color: transparent; color: white;">
                                 ${MoneyController.format(detail.order.totalAmount, detail.company.currencySymbol)}
                             </div>
                         </div>`;
-        content += this.printSolidLine();
+        // content += this.printSolidLine();
         content += `</div>`;
         return content;
     }
@@ -520,21 +539,25 @@ class SimplePreviewController {
         return content;
     }
     printFooter(template, detail) {
+        const fs = template.fontSize - 4 <= 0 ? template.fontSize : template.fontSize - 4;
         let content = this.createDivContainer(template);
-        content += `<p style="display: block; font-size: ${template.fontSize}px; text-align: center;">FS.${detail.company.id}.${detail.order.id}.${template.id}</p>`;
-        content += `<p style="display: block; font-size: ${template.fontSize}px; text-align: center;">Printed on ${new Date().toDateString()} ${new Date().toTimeString().substring(0, 8)}</p>`;
-        content += `<strong style="display: block; font-size: ${template.fontSize}px; text-align: center;">Powered by Meemup.com</strong>`;
+        content += `<p style="display: block; font-size: ${fs}px; text-align: center; line-height: 1rem; margin-top: 8px;">FS.${detail.company.id}.${detail.order.id}.${template.id}</p>`;
+        content += `<p style="display: block; font-size: ${fs}px; text-align: center; line-height: 1rem;">Printed on ${new Date().toDateString()} ${new Date().toTimeString().substring(0, 8)}</p>`;
+        content += `<strong style="display: block; font-size: ${fs}px; text-align: center; line-height: 1rem;">Powered by Meemup.com</strong>`;
         content += `</div>`;
         return content;
     }
-    printDashLine() {
-        return `<div style="display: block; border-top: 1px dashed #000000; margin: 4px 0;"></div>`;
+    printDashLine(my = 4) {
+        return `<div style="display: block; border-top: 1px dashed #000000; margin: ${my}px 0;"></div>`;
+    }
+    printSimpleDashLine() {
+        return `<div style="display: block; border-top: 1px solid #000000; margin:0;"></div>`;
     }
     printSolidLine() {
         return `<div style="display: block; border-top: 1px solid #000000; margin: 4px 0;"></div>`;
     }
-    createDivContainer(template) {
-        return `<div style="display: block; padding-left: ${template.paddingLeft}mm; padding-right: ${template.paddingRight}mm;" >`;
+    createDivContainer(template, pt = 0, pb = 0) {
+        return `<div style="display: block; padding-left: ${template.paddingLeft}mm; padding-right: ${template.paddingRight}mm; padding-top: ${pt + "px"}; padding-bottom: ${pb + "px"};" >`;
     }
     sortProduct(products, sortType) {
         const new_product = [];
@@ -590,6 +613,12 @@ class SimplePreviewController {
                 return "";
         }
     }
+    createTextValue(text, value, textLength, template) {
+        return `<div style="display: grid; grid-template-columns: ${textLength}px auto;">
+                    <div style=" font-size: ${template.fontSize}px; text-align: left; font-family: ${template.font}; color: black;">${text}</div>
+                    <div style=" font-size: ${template.fontSize}px; text-align: left; font-family: ${template.font}; color: black;">${value}</div>
+                </div>`;
+    }
 }
 const controller = new SimplePreviewController();
 export default controller;

package/dist/statics.d.ts

@@ -40,3 +40,12 @@ export declare const FIND_STAR_MICRONIC_PRINTER_TIMEOUT_POST_NAME = " Sec";
 export declare const DASHBOARD_ITEM_MINIMUM_WITH = 300;
 export declare const TOKEN_REFRESH_AFTER_THIS_AMOUNT_OF_MINUTE = 60;
 export declare const SIGNALR_AUTO_RECONNECT_TIMES_ARRAY: number[];
+export declare const Formats: {
+    date: string;
+    time: string;
+    displayTime: string;
+    displayDate: string;
+    displayDateTime: string;
+    standard: string;
+    printedAt: string;
+};

package/dist/statics.js

@@ -42,3 +42,12 @@ export const FIND_STAR_MICRONIC_PRINTER_TIMEOUT_POST_NAME = " Sec";
 export const DASHBOARD_ITEM_MINIMUM_WITH = 300;
 export const TOKEN_REFRESH_AFTER_THIS_AMOUNT_OF_MINUTE = 60;
 export const SIGNALR_AUTO_RECONNECT_TIMES_ARRAY = [180000, 240000, 300000, 360000, 420000];
+export const Formats = {
+    date: 'YYYY-MM-DD',
+    time: 'HH:mm:ss',
+    displayTime: 'hh:mm A',
+    displayDate: 'ddd, DD MMM',
+    displayDateTime: 'ddd, DD MMM, hh:mm A',
+    standard: 'YYYY-MM-DDTHH:mm:ss',
+    printedAt: 'YYYY-MM-DD HH:mm A',
+};

package/package.json

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