meemup-library 1.4.58 → 1.4.60

package/dist/controllers/PreviewContentController.js

@@ -566,9 +566,9 @@ export default new class PreviewContentController {
                     if (member.id > initPointOfSaleTeamMember.id) {
                         content += SimplePreviewController.createSubTitle(`Member ID: #${member.id}`);
                         content += SimplePreviewController.createSubTitle(`Member: ${member.firstName} ${member.lastName}`);
-                        content += SimplePreviewController.printSpace(16);
+                        content += SimplePreviewController.printSpace(8);
                     }
-                    content += SimplePreviewController.createHeader(`${title}: ${MoneyController.format(device.money, setting.currencySymbol)}`, 'left');
+                    content += SimplePreviewController.createText(`${title}: ${MoneyController.format(device.money, setting.currencySymbol)}`);
                     content += SimplePreviewController.createText(`Reason: ${device.reason}`);
                     // content += SimplePreviewController.printSolidLine();
                     // content += SimplePreviewController.createText(`Reason: ${device.reason}`);
@@ -718,21 +718,26 @@ export default new class PreviewContentController {
                 const sum = MoneyController.sumField(records, 'amount');
                 content += SimplePreviewController.createHeader('Cash drawer report', 'center');
                 content += SimplePreviewController.createText(company, 'center', true);
+                content += SimplePreviewController.printSpace(20);
                 content += SimplePreviewController.createTextValueSpaceBetween('Cash drawer:', `#${form.cashDrawerId} - ${device.name}`);
-                content += SimplePreviewController.createTextValueSpaceBetween('Since:', `#${form.cashDrawerId} - ${device.name}`);
-                content += SimplePreviewController.createTextValueSpaceBetween('Until:', `#${form.cashDrawerId} - ${device.name}`);
+                content += SimplePreviewController.createTextValueSpaceBetween('Since:', form.since);
+                content += SimplePreviewController.createTextValueSpaceBetween('Until:', form.until);
                 if (member.id > initPointOfSaleTeamMember.id) {
                     content += SimplePreviewController.createTextValueSpaceBetween('Member ID:', `#${member.id}`);
                     content += SimplePreviewController.createTextValueSpaceBetween('Member:', `${member.firstName} ${member.lastName}`);
                 }
                 content += SimplePreviewController.printSolidLine();
+                content += SimplePreviewController.printSpace(8);
                 records.map(record => {
                     //moment(record.dateTime).format(Formats.printedAt)
                     content += SimplePreviewController.createTextValueSpaceBetween(formatDate(record.dateTime), MoneyController.format(record.amount, currency));
-                    content += SimplePreviewController.createText(record.reason);
-                    content += SimplePreviewController.printSolidLine();
+                    content += SimplePreviewController.createText(record.reason, 'left', false);
+                    content += SimplePreviewController.printSpace(16);
                 });
-                content += SimplePreviewController.createTextValueSpaceBetween('Total:', MoneyController.format(sum, currency));
+                content += SimplePreviewController.printSolidLine();
+                content += SimplePreviewController.printSpace(4);
+                content += SimplePreviewController.createTextValueSpaceBetween('Total:', MoneyController.format(sum, currency), 18);
+                content += SimplePreviewController.printSpace(20);
                 content += SimplePreviewController.footer();
                 return this.standardHtmlContainer(content);
             }

package/dist/controllers/SimplePreviewController.js

@@ -214,7 +214,12 @@ class SimplePreviewController {
                     <tbody>
                 `;
         detail.products.forEach((row) => {
-            let productName = (template.showCategoryTitle ? `[${row.categoryTitle}] ` : "") + ((template.showProductKitchenName && row.kitchenReceiptName.trim().length > 0) ? row.kitchenReceiptName : row.productName);
+            let cat = "";
+            if (!template.showCategoryTitle || !row.categoryTitle || row.categoryTitle.trim().length === 0)
+                cat = "";
+            else
+                cat = `[${row.categoryTitle.trim()}] `;
+            let productName = cat + ((template.showProductKitchenName && row.kitchenReceiptName.trim().length > 0) ? row.kitchenReceiptName : row.productName);
             let 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>

package/package.json

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