highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-10-10 12:32:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: total amount (amount + tip)

Browse Source
This commit is contained in:
Vlad Stan
2022-11-18 12:02:51 +02:00
parent 9ecf6f273b
commit 0039a48e73
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lnbits/extensions/tpos/templates/tpos/tpos.html
View File

@@ -13,7 +13,7 @@
<q-page-sticky v-if="exchangeRate" expand position="top"> <q-page-sticky v-if="exchangeRate" expand position="top">
<div class="row justify-center full-width"> <div class="row justify-center full-width">
<div class="col-12 col-sm-8 col-md-6 col-lg-4 text-center"> <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-center">
<h3 class="q-mb-md">{% raw %}{{ famount }}{% endraw %}</h3> <h3 class="q-mb-md">{% raw %}{{ amountFormatted }}{% endraw %}</h3>
<h5 class="q-mt-none q-mb-sm"> <h5 class="q-mt-none q-mb-sm">
{% raw %}{{ fsat }}{% endraw %} <small>sat</small> {% raw %}{{ fsat }}{% endraw %} <small>sat</small>
</h5> </h5>
@@ -173,12 +173,14 @@
></qrcode> ></qrcode>
</q-responsive> </q-responsive>
<div class="text-center"> <div class="text-center">
<h3 class="q-my-md">{% raw %}{{ famount }}{% endraw %}</h3> <h3 class="q-my-md">
{% raw %}{{ amountWithTipFormatted }}{% endraw %}
</h3>
<h5 class="q-mt-none"> <h5 class="q-mt-none">
{% raw %}{{ fsat }} {% raw %}{{ fsat }}
<small>sat</small> <small>sat</small>
<span v-show="tip_options" style="font-size: 0.75rem" <span v-show="tip_options" style="font-size: 0.75rem"
>( + {{ tipAmountSat }} tip)</span >( + {{ tipAmountFormatted }} tip)</span
> >
{% endraw %} {% endraw %}
</h5> </h5>
@@ -362,12 +364,18 @@
if (!this.stack.length) return 0.0 if (!this.stack.length) return 0.0
return Number(this.stack.join('') / 100) return Number(this.stack.join('') / 100)
}, },
famount: function () { amountFormatted: function () {
return LNbits.utils.formatCurrency( return LNbits.utils.formatCurrency(
this.amount.toFixed(2), this.amount.toFixed(2),
this.currency this.currency
) )
}, },
amountWithTipFormatted: function () {
return LNbits.utils.formatCurrency(
(this.amount + this.tipAmount).toFixed(2),
this.currency
)
},
sat: function () { sat: function () {
if (!this.exchangeRate) return 0 if (!this.exchangeRate) return 0
return Math.ceil((this.amount / this.exchangeRate) * 100000000) return Math.ceil((this.amount / this.exchangeRate) * 100000000)
@@ -376,6 +384,9 @@
if (!this.exchangeRate) return 0 if (!this.exchangeRate) return 0
return Math.ceil((this.tipAmount / this.exchangeRate) * 100000000) return Math.ceil((this.tipAmount / this.exchangeRate) * 100000000)
}, },
tipAmountFormatted: function () {
return LNbits.utils.formatSat(this.tipAmountSat)
},
fsat: function () { fsat: function () {
return LNbits.utils.formatSat(this.sat) return LNbits.utils.formatSat(this.sat)
} }
@@ -393,7 +404,10 @@
processTipSelection: function (selectedTipOption) { processTipSelection: function (selectedTipOption) {
this.tipDialog.show = false this.tipDialog.show = false
if (!selectedTipOption) return this.showInvoice() if (!selectedTipOption) {
this.tipAmount = 0.0
return this.showInvoice()
}
this.tipAmount = (selectedTipOption / 100) * this.amount this.tipAmount = (selectedTipOption / 100) * this.amount
this.showInvoice() this.showInvoice()