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

Bugfixing redirect link when invoice expires

Browse Source 
Refactoring logic so that it's same for paid and expired
This commit is contained in:
lepipele
2018-04-13 14:39:45 -05:00
parent 203c28df3d
commit 7b1b2a0f68
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BTCPayServer/Views/Invoice/Checkout-Body.cshtml
View File

@@ -256,11 +256,9 @@
</div>
</div>
<div class="success-message">{{$t("This invoice has been paid")}}</div>
<button class="action-button">
<bp-done-text>
<span>{{$t("Return to StoreName", srvModel)}}</span>
</bp-done-text>
</button>
<a class="action-button" :href="srvModel.merchantRefLink" v-show="srvModel.merchantRefLink">
<span>{{$t("Return to StoreName", srvModel)}}</span>
</a>
</div>
</div>
<div class="button-wrapper refund-address-form-container" id="refund-overpayment-button">
@@ -302,10 +300,9 @@
{{srvModel.orderId}}
</div>
</div>
<a class="action-button" style="margin-top: 20px;">
<bp-done-text>
<span>{{$t("Return to StoreName", srvModel)}}</span>
</bp-done-text>
<a class="action-button" :href="srvModel.merchantRefLink" v-show="srvModel.merchantRefLink"
style="margin-top: 20px;">
<span>{{$t("Return to StoreName", srvModel)}}</span>
</a>
</div>
</div>

9
BTCPayServer/wwwroot/checkout/js/core.js
View File

@@ -32,15 +32,6 @@ function onDataCallback(jsonData) {
$(".modal-dialog").removeClass("expired");
}
if (srvModel.merchantRefLink !== "") {
$(".action-button").click(function () {
window.location.href = srvModel.merchantRefLink;
});
}
else {
$(".action-button").hide();
}
$(".modal-dialog").addClass("paid");
resetTabsSlider();