Compare commits

...
6 Commits
Author SHA1 Message Date
dni ⚡andGitHub 05a244d8fd fix: refresh payments on payment success (#2502)
* fix: refresh payments on payment
2024-05-14 19:22:14 +03:00
dni ⚡andGitHub 019995078c fix: init wallet balance (#2501) 2024-05-14 18:56:57 +03:00
Vlad StanandGitHub f37cb6481c fix: copy invoice (#2500)
* fix: copy invoice
* chore: add mixins
* chore: make bundle
2024-05-14 17:55:45 +02:00
dni ⚡andGitHub 365f9a3923 fix: mobileSimple in paymentlist (#2498) 2024-05-14 13:57:04 +02:00
dni ⚡andGitHub bb4dd4fe35 fix: payment list currency (#2496)
* fix: payment list currency
2024-05-14 13:49:00 +02:00
Vlad StanandGitHub d1ae531750 fix: add methods back (#2495) 2024-05-14 13:48:33 +02:00
6 changed files with 42 additions and 13 deletions
+1 -1
View File
@@ -105,7 +105,7 @@
<payment-list
:update="updatePayments"
:wallet="this.g.wallet"
:mobileSimple="mobileSimple"
:mobile-simple="mobileSimple"
/>
</div>
{% if HIDE_API %}
+1 -1
View File
File diff suppressed because one or more lines are too long
+24
View File
@@ -77,6 +77,30 @@ new Vue({
}
},
methods: {
addAdminUser() {
let addUser = this.formAddAdmin
let admin_users = this.formData.lnbits_admin_users
if (addUser && addUser.length && !admin_users.includes(addUser)) {
this.formData.lnbits_admin_users = [...admin_users, addUser]
this.formAddAdmin = ''
}
},
removeAdminUser(user) {
let admin_users = this.formData.lnbits_admin_users
this.formData.lnbits_admin_users = admin_users.filter(u => u !== user)
},
addAllowedUser() {
let addUser = this.formAddUser
let allowed_users = this.formData.lnbits_allowed_users
if (addUser && addUser.length && !allowed_users.includes(addUser)) {
this.formData.lnbits_allowed_users = [...allowed_users, addUser]
this.formAddUser = ''
}
},
removeAllowedUser(user) {
let allowed_users = this.formData.lnbits_allowed_users
this.formData.lnbits_allowed_users = allowed_users.filter(u => u !== user)
},
addExtensionsManifest() {
const addManifest = this.formAddExtensionsManifest.trim()
const manifests = this.formData.lnbits_extensions_manifests
@@ -83,6 +83,7 @@ function generateChart(canvas, rawData) {
Vue.component('payment-chart', {
name: 'payment-chart',
props: ['wallet'],
mixins: [windowMixin],
data: function () {
return {
paymentsChart: {
+9 -8
View File
@@ -1,6 +1,7 @@
Vue.component('payment-list', {
name: 'payment-list',
props: ['update', 'wallet', 'mobileSimple', 'lazy'],
mixins: [windowMixin],
data: function () {
return {
denomination: LNBITS_DENOMINATION,
@@ -164,11 +165,11 @@ Vue.component('payment-list', {
)
})
},
formatCurrency: function (currency, amount) {
formatCurrency: function (amount, currency) {
try {
return LNbits.utils.formatCurrency(currency, amount)
} catch (error) {
console.warn(error)
return LNbits.utils.formatCurrency(amount, currency)
} catch (e) {
console.error(e)
return `${amount} ???`
}
}
@@ -295,22 +296,22 @@ Vue.component('payment-list', {
key="amount"
v-if="denomination != 'sats'"
:props="props"
class="lol1"
class="col1"
v-text="parseFloat(String(props.row.fsat).replaceAll(',', '')) / 100"
>
</q-td>
<q-td class="lol2" auto-width key="amount" v-else :props="props">
<q-td class="col2" auto-width key="amount" v-else :props="props">
<span v-text="props.row.fsat"></span>
<br />
<i v-if="props.row.extra.wallet_fiat_currency">
<span
v-text="formatCurrency(props.row.extra.wallet_fiat_currency, props.row.extra.wallet_fiat_amount)"
v-text="formatCurrency(props.row.extra.wallet_fiat_amount, props.row.extra.wallet_fiat_currency)"
></span>
<br />
</i>
<i v-if="props.row.extra.fiat_currency">
<span
v-text="formatCurrency(props.row.extra.fiat_currency, props.row.extra.fiat_amount)"
v-text="formatCurrency(props.row.extra.fiat_amount, props.row.extra.fiat_currency)"
></span>
</i>
</q-td>
+6 -3
View File
@@ -49,7 +49,7 @@ new Vue({
show: false,
location: window.location
},
balance: 0,
balance: parseInt(wallet.balance_msat / 1000),
fiatBalance: 0,
mobileSimple: false,
credit: 0,
@@ -349,9 +349,10 @@ new Vue({
.getPayment(this.g.wallet, response.data.payment_hash)
.then(res => {
if (res.data.paid) {
this.parse.show = false
clearInterval(this.parse.paymentChecker)
dismissPaymentMsg()
clearInterval(this.parse.paymentChecker)
this.updatePayments = !this.updatePayments
this.parse.show = false
}
})
}, 2000)
@@ -359,6 +360,8 @@ new Vue({
.catch(err => {
dismissPaymentMsg()
LNbits.utils.notifyApiError(err)
this.updatePayments = !this.updatePayments
this.parse.show = false
})
},
payLnurl: function () {