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

Merge pull request #1099 from Kukks/modal-close-fix

Browse Source 
Fix: Close button for modal is broken
This commit is contained in:
Nicolas Dorier
2019-10-28 14:26:20 +09:00
committed by GitHub
parent cd5b334a00 3e5ab70583
commit ad8d8c31ab
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,10 +203,10 @@
</div>
</div>
<div class="success-message">{{$t("This invoice has been paid")}}</div>
<a class="action-button" :href="srvModel.merchantRefLink" v-show="!srvModel.isModal">
<a class="action-button" :href="srvModel.merchantRefLink" v-show="!isModal">
<span v-html="$t('Return to StoreName', srvModel)"></span>
</a>
<button class="action-button close-action" v-show="srvModel.isModal" v-on:click="close">
<button class="action-button close-action" v-show="isModal" v-on:click="close">
<span v-html="$t('Close')">{{$t("Return to StoreName", srvModel)}}</span>
</button>
</div>
@@ -236,10 +236,10 @@
{{srvModel.orderId}}
</div>
</div>
<a class="action-button" :href="srvModel.merchantRefLink" v-show="!srvModel.isModal">
<a class="action-button" :href="srvModel.merchantRefLink" v-show="!isModal">
<span>{{$t("Return to StoreName", srvModel)}}</span>
</a>
<button class="action-button close-action" v-show="srvModel.isModal" v-on:click="close">
<button class="action-button close-action" v-show="isModal" v-on:click="close">
<span>{{$t("Return to StoreName", srvModel)}}</span>
</button>
</div>

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

@@ -173,7 +173,8 @@
emailAddressFormSubmitting: false,
lineItemsExpanded: false,
changingCurrencies: false,
loading: true
loading: true,
isModal: initialSrvModel.isModal
},
computed: {
expiringSoon: function(){