meemup-library 1.5.31 → 1.5.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -102,7 +102,7 @@ class LabelPreviewController {
|
|
|
102
102
|
printProductTitle(template, row) {
|
|
103
103
|
let content = this.createDivContainer(template);
|
|
104
104
|
let largeFontSize = template.printer === 5 ? "22px" : parseInt((template.fontSize + 10) + "") + "px";
|
|
105
|
-
if (template.showProductKitchenName)
|
|
105
|
+
if (template.showProductKitchenName && row.kitchenReceiptName !== null)
|
|
106
106
|
content += `<strong style="display:block; font-size: ${largeFontSize};">${row.kitchenReceiptName}</strong>`;
|
|
107
107
|
else
|
|
108
108
|
content += `<strong style="display:block; font-size: ${largeFontSize};">${row.title}</strong>`;
|
|
@@ -294,7 +294,7 @@ export default new class {
|
|
|
294
294
|
|
|
295
295
|
<div style="flex-wrap : wrap; word-wrap : break-word; text-align : left;">
|
|
296
296
|
|
|
297
|
-
${(showCategoryTitle && row.categoryTitle !== "" && row.categoryTitle !== null) ? "[" + row.categoryTitle + "]" : ""} ${showProductKitchenName && row.kitchenReceiptName !==
|
|
297
|
+
${(showCategoryTitle && row.categoryTitle !== "" && row.categoryTitle !== null) ? "[" + row.categoryTitle + "]" : ""} ${showProductKitchenName && row.kitchenReceiptName !== null ? row.kitchenReceiptName : row.title}
|
|
298
298
|
${row.extrasNames ? row.extrasNames.split(" , ").map(i => `<div>+${i}</div>`).join("") : ""}
|
|
299
299
|
${row.note ? `<div><span style="font-size: x-large;">🗨</span>{note}</div>` : ""}
|
|
300
300
|
|
|
@@ -424,7 +424,7 @@ export default new class {
|
|
|
424
424
|
<p style="margin-bottom: 5px; padding-bottom: 5px; border-bottom: 2px solid black;">
|
|
425
425
|
${row.quantity}X
|
|
426
426
|
${showCategoryTitle && row.categoryTitle ? "[" + row.categoryTitle.toUpperCase() + "]" : ""}
|
|
427
|
-
${showProductKitchenName && row.kitchenReceiptName !==
|
|
427
|
+
${showProductKitchenName && row.kitchenReceiptName !== null ? row.kitchenReceiptName : row.title}
|
|
428
428
|
${row.extrasNames !== "" && `<div>${row.extrasNames}</div>`}
|
|
429
429
|
</p>
|
|
430
430
|
|
|
@@ -219,7 +219,7 @@ class SimplePreviewController {
|
|
|
219
219
|
cat = "";
|
|
220
220
|
else
|
|
221
221
|
cat = `[${row.categoryTitle.trim()}] `;
|
|
222
|
-
const productName = cat + ((template.showProductKitchenName && row.kitchenReceiptName
|
|
222
|
+
const productName = cat + ((template.showProductKitchenName && row.kitchenReceiptName !== null) ? row.kitchenReceiptName : row.productName);
|
|
223
223
|
const amount = template.showPrices ? MoneyController.format(row.totalAmount, detail.company.currencySymbol) : "";
|
|
224
224
|
content += `<tr style="height: 28px;">
|
|
225
225
|
<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 {
|
|
|
348
348
|
<tbody>
|
|
349
349
|
`;
|
|
350
350
|
detail.products.forEach((row) => {
|
|
351
|
-
const productName = (template.showCategoryTitle ? `[${row.categoryTitle}] ` : "") + ((template.showProductKitchenName && row.kitchenReceiptName
|
|
351
|
+
const productName = (template.showCategoryTitle ? `[${row.categoryTitle}] ` : "") + ((template.showProductKitchenName && row.kitchenReceiptName !== null) ? row.kitchenReceiptName : row.title);
|
|
352
352
|
const amount = template.showPrices ? MoneyController.format(row.totalAmount, detail.company.currencySymbol) : "";
|
|
353
353
|
content += `<tr>
|
|
354
354
|
<td style="font-size:${largeFontSize}px; min-width:40px; width: 40px; text-align: left;">${row.quantity}X</td>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "meemup-library",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.32",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"remove:one": "rimraf dist",
|
|
12
12
|
"remove:two": "rimraf ./src/dist",
|
|
13
13
|
"test": "echo \"Error: no test specified\" && exit 1",
|
|
14
|
-
"commit": "git add . && git commit -m \"version.1.5.
|
|
14
|
+
"commit": "git add . && git commit -m \"version.1.5.32\" && git push origin "
|
|
15
15
|
},
|
|
16
16
|
"files": [
|
|
17
17
|
"/dist"
|