aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-23 07:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix copy/paste BTC amount, add redirect store link to invoice

Browse Source
This commit is contained in:
nicolas.dorier
2017-10-19 16:37:07 +09:00
parent db1cf5c2ce
commit a14b94c96f
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
BTCPayServer/Views/Invoice/Checkout.cshtml
View File

@@ -130,8 +130,6 @@
<div class="single-item-order__right">
<div class="single-item-order__right__btc-price clickable" id="buyerTotalBtcAmount">
<span>@Model.BTCTotalDue</span>
<!---->
<img class="single-item-order__right__btc-price__chevron" src="~/img/chevron.svg">
</div>
<!---->
<div class="single-item-order__right__ex-rate">
@@ -181,20 +179,20 @@
<div class="bp-view payment scan" id="scan" style="opacity: 1;">
<div class="payment__scan">
@*<div class="payment__details__instruction__open-wallet hidden-sm-up">
<!---->
<a class="payment__details__instruction__open-wallet__btn action-button action-button--secondary">
<span i18n="">Show QR code</span>
<img class="m-qr-code-icon" src="~/img/qr-code.svg">
</a>
<div class="m-qr-code-container hidden-sm-up hide">
<p class="m-qr-code-header" i18n="">
Hide QR code
<img class="m-qr-code-expand" src="~/img/chevron.svg">
</p>
<!---->
<div class="qr-codes"></div>
</div>
</div>*@
<a class="payment__details__instruction__open-wallet__btn action-button action-button--secondary">
<span i18n="">Show QR code</span>
<img class="m-qr-code-icon" src="~/img/qr-code.svg">
</a>
<div class="m-qr-code-container hidden-sm-up hide">
<p class="m-qr-code-header" i18n="">
Hide QR code
<img class="m-qr-code-expand" src="~/img/chevron.svg">
</p>
<!---->
<div class="qr-codes"></div>
</div>
</div>*@
<!---->
<div class="qr-codes"></div>
</div>
@@ -381,7 +379,7 @@
<div class="manual-box__amount__label label" i18n="">Amount</div>
<!---->
<div class="manual-box__amount__value copy-cursor" ngxclipboard="">
<span>@Model.BTCDue BTC</span>
<span>@Model.BTCDue</span> BTC
<div class="copied-label">
<span i18n="">Copied</span>
</div>
@@ -428,6 +426,11 @@
<!---->
<div class="success-message" i18n="">This invoice has been paid.</div>
<!---->
<button class="action-button" style="margin-top: 0px;">
<bp-done-text>
<span i18n="" class="i18n-return-to-merchant">Return to @Model.StoreName</span>
</bp-done-text>
</button>
</div>
</div>
<!---->

1
BTCPayServer/wwwroot/css/normalizer.css
View File

@@ -8461,7 +8461,6 @@ strong {
.single-item-order__right__ex-rate {
font-style: italic;
font-size: 11px;
margin-right: 16px;
}
.single-item-order__right__btc-price {

16
BTCPayServer/wwwroot/js/core.js
View File

@@ -171,6 +171,17 @@ function updateState(status) {
if ($(".modal-dialog").hasClass("expired")) {
$(".modal-dialog").removeClass("expired");
}
if (merchantRefLink != "") {
$(".action-button").click(function () {
window.location.href = merchantRefLink;
});
}
else
{
$(".action-button").hide();
}
$(".modal-dialog").addClass("paid");
if ($("#scan").hasClass("active")) {
@@ -213,11 +224,6 @@ $(".menu__item").click(function () {
// function to load contents in different language should go there
});
// Redirect
$("#expired .action-button").click(function () {
window.location.href = merchantRefLink;
});
// Validate Email address
function validateEmail(email) {
var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;