meemup-library 1.4.77 → 1.4.79
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.
|
@@ -332,6 +332,11 @@ export default new class {
|
|
|
332
332
|
<div style="min-width : 150px; flex-grow : 1; text-align: end;">Tip : </div>
|
|
333
333
|
<div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.tipAmount, symbol)}</div>
|
|
334
334
|
</div>
|
|
335
|
+
|
|
336
|
+
<div style="display : ${order.thirdPartyDriverTipAmount > 0 ? "flex" : "none"}; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px dotted black;">
|
|
337
|
+
<div style="min-width : 150px; flex-grow : 1; text-align: end;">Driver Tip : </div>
|
|
338
|
+
<div style="min-width : 100px; text-align: end;">${this.ccyFormat(order.thirdPartyDriverTipAmount, symbol)}</div>
|
|
339
|
+
</div>
|
|
335
340
|
|
|
336
341
|
<div style="display : flex; padding : 1px; flex-direction : row; justify-content : flex-end; border-bottom: 1px solid black;">
|
|
337
342
|
<strong style="min-width : 150px; flex-grow : 1; font-size: larger; text-align: end;">${order.paymentType === 1 ? "Total" : "Total & Still to pay"} : </strong>
|
|
@@ -240,7 +240,7 @@ class SimplePreviewController {
|
|
|
240
240
|
content += `<tr>
|
|
241
241
|
<td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
|
|
242
242
|
<td colspan="2" style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: left;">
|
|
243
|
-
${extraText} (${extraAmount})
|
|
243
|
+
${extraText} ${(element.price !== 0) ? `(${extraAmount})` : ""}
|
|
244
244
|
</td>
|
|
245
245
|
</tr>`;
|
|
246
246
|
// content += `<tr>
|
|
@@ -325,6 +325,18 @@ class SimplePreviewController {
|
|
|
325
325
|
</td>
|
|
326
326
|
</tr>`;
|
|
327
327
|
}
|
|
328
|
+
if (detail.order.thirdPartyDriverTipAmount > 0) {
|
|
329
|
+
//tip amount
|
|
330
|
+
content += `<tr style=" border-top: 1px dashed #000000; margin: 4px 0;">
|
|
331
|
+
<td style="font-size:${template.fontSize}px; min-width:40px; width: 40px; text-align: left;"></td>
|
|
332
|
+
<td style="font-size:${template.fontSize}px; flex: 1; width: 100%; text-align: right; padding-right: 8px;">
|
|
333
|
+
Driver Tip:
|
|
334
|
+
</td>
|
|
335
|
+
<td style="font-size:${template.fontSize}px; width: 90px; text-align: right;">
|
|
336
|
+
${MoneyController.format(detail.order.thirdPartyDriverTipAmount, detail.company.currencySymbol)}
|
|
337
|
+
</td>
|
|
338
|
+
</tr>`;
|
|
339
|
+
}
|
|
328
340
|
}
|
|
329
341
|
content += `</tbody></table>`;
|
|
330
342
|
//total amount
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "meemup-library",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.79",
|
|
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.4.
|
|
14
|
+
"commit": "git add . && git commit -m \"version.1.4.79\" && git push origin "
|
|
15
15
|
},
|
|
16
16
|
"files": [
|
|
17
17
|
"/dist"
|