meemup-library 1.5.34 → 1.5.35
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.
|
@@ -9,7 +9,7 @@ import EnumPizzaSide from "../enums/EnumPizzaSide";
|
|
|
9
9
|
import EnumPaymentState from "../enums/EnumPaymentState";
|
|
10
10
|
import OrderToolController from "./OrderToolController";
|
|
11
11
|
import EnumOrderDateTimePrintModeType from "../enums/EnumOrderDateTimePrintModeType";
|
|
12
|
-
import {
|
|
12
|
+
import { BundleGroupPreName, BundleIdPreName, BundleProductQuantityPreName, Formats, printPoweredBy } from "../statics";
|
|
13
13
|
import dayjs from "../utils/dayjs";
|
|
14
14
|
class SimplePreviewController {
|
|
15
15
|
constructor() {
|
|
@@ -375,7 +375,7 @@ class SimplePreviewController {
|
|
|
375
375
|
${MoneyController.format(detail.order.subtotalAmount, detail.company.currencySymbol)}
|
|
376
376
|
</td>
|
|
377
377
|
</tr>`;
|
|
378
|
-
if (detail.order.hstAmount > 0
|
|
378
|
+
if (detail.order.hstAmount > 0) {
|
|
379
379
|
//hst and service fee and company fee amount
|
|
380
380
|
content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
|
|
381
381
|
<td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
|
|
@@ -399,6 +399,18 @@ class SimplePreviewController {
|
|
|
399
399
|
</td>
|
|
400
400
|
</tr>`;
|
|
401
401
|
}
|
|
402
|
+
if (detail.order.thirdPartyDriverTipAmount > 0) {
|
|
403
|
+
//tip amount
|
|
404
|
+
content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
|
|
405
|
+
<td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
|
|
406
|
+
<td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: right; padding-right: 8px;">
|
|
407
|
+
Driver tip:
|
|
408
|
+
</td>
|
|
409
|
+
<td style="font-size:${template.fontSize}px; width: 90px; text-align: right;">
|
|
410
|
+
${MoneyController.format(detail.order.thirdPartyDriverTipAmount, detail.company.currencySymbol)}
|
|
411
|
+
</td>
|
|
412
|
+
</tr>`;
|
|
413
|
+
}
|
|
402
414
|
}
|
|
403
415
|
content += `</tbody></table>`;
|
|
404
416
|
//total amount
|
|
@@ -577,7 +589,7 @@ class SimplePreviewController {
|
|
|
577
589
|
${MoneyController.format(detail.order.subtotalAmount, detail.company.currencySymbol)}
|
|
578
590
|
</td>
|
|
579
591
|
</tr>`;
|
|
580
|
-
if (detail.order.hstAmount > 0
|
|
592
|
+
if (detail.order.hstAmount > 0) {
|
|
581
593
|
//hst and service fee and company fee amount
|
|
582
594
|
content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
|
|
583
595
|
<td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
|
|
@@ -601,6 +613,18 @@ class SimplePreviewController {
|
|
|
601
613
|
</td>
|
|
602
614
|
</tr>`;
|
|
603
615
|
}
|
|
616
|
+
if (detail.order.thirdPartyDriverTipAmount > 0) {
|
|
617
|
+
//tip amount
|
|
618
|
+
content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
|
|
619
|
+
<td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
|
|
620
|
+
<td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: right; padding-right: 8px;">
|
|
621
|
+
Driver tip:
|
|
622
|
+
</td>
|
|
623
|
+
<td style="font-size:${template.fontSize}px; width: 90px; text-align: right;">
|
|
624
|
+
${MoneyController.format(detail.order.thirdPartyDriverTipAmount, detail.company.currencySymbol)}
|
|
625
|
+
</td>
|
|
626
|
+
</tr>`;
|
|
627
|
+
}
|
|
604
628
|
}
|
|
605
629
|
content += `</tbody></table>`;
|
|
606
630
|
//total amount
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "meemup-library",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.35",
|
|
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.35\" && git push origin "
|
|
15
15
|
},
|
|
16
16
|
"files": [
|
|
17
17
|
"/dist"
|
|
@@ -26,4 +26,4 @@
|
|
|
26
26
|
"dependencies": {
|
|
27
27
|
"dayjs": "^1.11.13"
|
|
28
28
|
}
|
|
29
|
-
}
|
|
29
|
+
}
|