meemup-library 1.5.30 → 1.5.32

package/dist/controllers/LabelPreviewController.js

@@ -102,7 +102,7 @@ class LabelPreviewController {
     printProductTitle(template, row) {
         let content = this.createDivContainer(template);
         let largeFontSize = template.printer === 5 ? "22px" : parseInt((template.fontSize + 10) + "") + "px";
-        if (template.showProductKitchenName)
+        if (template.showProductKitchenName && row.kitchenReceiptName !== null)
             content += `<strong style="display:block; font-size: ${largeFontSize};">${row.kitchenReceiptName}</strong>`;
         else
             content += `<strong style="display:block; font-size: ${largeFontSize};">${row.title}</strong>`;

package/dist/controllers/PreviewContentController.js

@@ -771,29 +771,36 @@ class _PreviewContentController {
         });
     }
     createPaymentInfoReceipt(detail, template) {
-        var _a;
+        var _a, _b, _c, _d;
         const { font, width, paper, paddingTop, paddingBottom, } = 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)};"> `;
-        content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: center;">${detail.company.title}</p>`;
+        let content = `<div style="font-family : ${fontFamily}; font-weight : normal; line-height:1.6rem; padding : ${paddingTop}px 0 ${paddingBottom}px 0; width: ${this.calculatePaperSize(paper, width)};"> `;
+        content += `<p style="display:block; font-size: ${template.fontSize * 2}px; text-align: center;">${detail.company.title}</p>`;
         content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: center;">${detail.company.address}</p>`;
         content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: center;">${PhoneController.toDisplay(detail.company.phone)}</p>`;
         content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left; margin-top:24px;">Payment type and status:</p>`;
         const total = MoneyController.format(detail.order.totalAmount, detail.company.currencySymbol);
         const afterTotal = detail.order.paymentState === EnumPaymentState.Paid ? "PAID" : "NOT PAID";
-        content += `<p style="display:block; font-size: ${template.fontSize * 2}px; text-align: left; margin-bottom:24px;">${total + ", " + afterTotal}</p>`;
-        content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">Reg. date ${dayjs(detail.order.registrationDate).format(Formats.displayDateTime)}</p>`;
-        content += `<p style="display:block; font-size: ${template.fontSize}px; text-align: left;">Order     REF:${detail.order.id} , #${detail.order.orderNumber}</p>`;
+        content += `<p style="display:block; font-size: ${template.fontSize * 2}px; text-align: left; margin-bottom:16px;">${total + ", " + afterTotal}</p>`;
+        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: right;">${total}</p>
         </div>`;
-        content += `<div style="display:flex; flex-direction : row; justify-content:center; align-items:center; gap : 8px; margin-top:24px; margin-bottom: 24px;">
+        content += `<div style="display:flex; flex-direction : row; justify-content:center; align-items:center; gap : 8px; margin-top:16px; margin-bottom: 16px;">
                     <div style="border-top:1px solid black; flex:1;"></div>
-                    <p style="font-size: ${template.fontSize * 2}px; text-align: right;">${(_a = detail.paymentInfo) === null || _a === void 0 ? void 0 : _a.state}</p>
+                    <p style="font-size: ${template.fontSize}px; text-align: right;">${(_a = detail.paymentInfo) === null || _a === void 0 ? void 0 : _a.state}</p>
                     <div style="border-top:1px solid black; flex:1;"></div>
                 </div>`;
-        content += SimplePreviewController.printMetaData(template, detail);
+        if (detail.paymentInfo !== null && Array.isArray((_b = detail.paymentInfo) === null || _b === void 0 ? void 0 : _b.metadata) && ((_d = (_c = detail.paymentInfo) === null || _c === void 0 ? void 0 : _c.metadata) === null || _d === void 0 ? void 0 : _d.length) > 0) {
+            content += `<div style="margin-bottom:16px;">`;
+            detail.paymentInfo.metadata.forEach(item => {
+                content += `<p style="display: block; text-align: left; font-size: ${template.fontSize}px;">${item.text}: ${item.value}</p>`;
+            });
+            content += `</div>`;
+        }
+        // content += SimplePreviewController.printMetaData(template, detail);
         content += SimplePreviewController.printFooter(template, detail);
         content += `</div>`;
         return (`<div style="display: flex;"><div style="width : auto;">${content}</div></div>`);

package/dist/controllers/PrintContentController.js

@@ -294,7 +294,7 @@ export default new class {
               
               <div style="flex-wrap : wrap; word-wrap : break-word; text-align : left;">
                                          
-                ${(showCategoryTitle && row.categoryTitle !== "" && row.categoryTitle !== null) ? "[" + row.categoryTitle + "]" : ""} ${showProductKitchenName && row.kitchenReceiptName !== "" ? row.kitchenReceiptName : row.title}
+                ${(showCategoryTitle && row.categoryTitle !== "" && row.categoryTitle !== null) ? "[" + row.categoryTitle + "]" : ""} ${showProductKitchenName && row.kitchenReceiptName !== null ? row.kitchenReceiptName : row.title}
                 ${row.extrasNames ? row.extrasNames.split(" , ").map(i => `<div>+${i}</div>`).join("") : ""}
                 ${row.note ? `<div><span style="font-size: x-large;">&#128488;</span>{note}</div>` : ""}
   
@@ -424,7 +424,7 @@ export default new class {
                                 <p style="margin-bottom: 5px; padding-bottom: 5px; border-bottom: 2px solid black;">
                                     ${row.quantity}X &nbsp;
                                     ${showCategoryTitle && row.categoryTitle ? "[" + row.categoryTitle.toUpperCase() + "]" : ""}
-                                    ${showProductKitchenName && row.kitchenReceiptName !== "" ? row.kitchenReceiptName : row.title}
+                                    ${showProductKitchenName && row.kitchenReceiptName !== null ? row.kitchenReceiptName : row.title}
                                     ${row.extrasNames !== "" && `<div>${row.extrasNames}</div>`}
                                 </p>
                 

package/dist/controllers/SimplePreviewController.js

@@ -219,7 +219,7 @@ class SimplePreviewController {
                 cat = "";
             else
                 cat = `[${row.categoryTitle.trim()}] `;
-            const productName = cat + ((template.showProductKitchenName && row.kitchenReceiptName.trim().length > 0) ? row.kitchenReceiptName : row.productName);
+            const productName = cat + ((template.showProductKitchenName && row.kitchenReceiptName !== null) ? row.kitchenReceiptName : row.productName);
             const amount = template.showPrices ? MoneyController.format(row.totalAmount, detail.company.currencySymbol) : "";
             content += `<tr style="height: 28px;">
                             <td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;">${row.quantity}X</td>
@@ -348,7 +348,7 @@ class SimplePreviewController {
                     <tbody>
                 `;
         detail.products.forEach((row) => {
-            const productName = (template.showCategoryTitle ? `[${row.categoryTitle}] ` : "") + ((template.showProductKitchenName && row.kitchenReceiptName.trim().length > 0) ? row.kitchenReceiptName : row.title);
+            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>

package/package.json

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