BTCPrivate
/
btcp-digital-store
mirror of https://github.com/BTCPrivate/btcp-digital-store.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use new `status` field, display expired invoices as such

This commit is contained in:
Nadav Ivgi 2018-01-16 22:55:40 +02:00
parent ae6e72de18
commit 6c38e6a56e
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@ -76,7 +76,7 @@ app.get('/:rpath(*)', pwrap(async (req, res) => {
} }
else if (invoice) { else if (invoice) {
if (invoice.completed) res.redirect(escape(file.name) + '?token=' + tokenr.make(invoice, conf.download_ttl)) if (invoice.status == 'paid') res.redirect(escape(file.name) + '?token=' + tokenr.make(invoice, conf.download_ttl))
else res.render('file', { ...file, invoice }) else res.render('file', { ...file, invoice })
} }

35
views/_checkout.pug
View File

@ -1,21 +1,26 @@
- expiry_str = new Date(invoice.expires_at*1000).toUTCString() - expiry_str = new Date(invoice.expires_at*1000).toUTCString()
.checkout if invoice.status == 'expired'
h3 Pay with Lightning h3 Invoice expired
h4 #[strong= invoice.quoted_amount] #{invoice.quoted_currency } = #[strong= fmsat(invoice.msatoshi)] mBTC p Please go back and try again.
.row
.pay.col-sm-8
pre= invoice.payreq
p.small.text-muted else
noscript Your browser has JavaScript turned off. Please refresh the page manually after making the payment. .checkout
span.yesscript #[img(src='_assets/loader.gif', alt='loading')] Awaiting payment. h3 Pay with Lightning
| The invoice expires #[span(data-countdown-to=invoice.expires_at, title=expiry_str) at #{ expiry_str }]. h4 #[strong= invoice.quoted_amount] #{invoice.quoted_currency } = #[strong= fmsat(invoice.msatoshi)] mBTC
.row
.pay.col-sm-8
pre= invoice.payreq
p: a.btn.btn-lg.btn-primary(href=`lightning:${invoice.payreq}`) Pay now p.small.text-muted
noscript Your browser has JavaScript turned off. Please refresh the page manually after making the payment.
span.yesscript #[img(src='_assets/loader.gif', alt='loading')] Awaiting payment.
| The invoice expires #[span(data-countdown-to=invoice.expires_at, title=expiry_str) at #{ expiry_str }].
.qr.col-sm-4.mb-3: img(src=qruri('lightning:'+invoice.payreq, { mode: 'alphanumeric', margin: 0 })) p: a.btn.btn-lg.btn-primary(href=`lightning:${invoice.payreq}`) Pay now
//- long-pull payment updates via <img> reloading hack. not the prettiest, but extremely terse, and it works .qr.col-sm-4.mb-3: img(src=qruri('lightning:'+invoice.payreq, { mode: 'alphanumeric', margin: 0 }))
img.d-none(src='_invoice/'+invoice.id+'/longpoll.png', onerror='this.src=this.src', onload='location.reload()')
script(src='_assets/countdown.js') //- long-pull payment updates via <img> reloading hack. not the prettiest, but extremely terse, and it works
img.d-none(src='_invoice/'+invoice.id+'/longpoll.png', onerror='this.src=this.src', onload='location.reload()')
script(src='_assets/countdown.js')