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 #504 from Kukks/bugfix/general

Browse Source 
Fix Coinswitch Issues, Fix LN Node Info Clipboard, Fix Vue-Cloak Styles
This commit is contained in:
Nicolas Dorier
2019-01-08 23:02:34 +09:00
committed by GitHub
parent b15267be4d 8b686f0b12
commit 1667f9b2ef
4 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs
View File

@@ -11,7 +11,7 @@ namespace BTCPayServer.Models.StoreViewModels
public bool Enabled { get; set; }
[Display(Name = "Integration Mode")]
public string Mode { get; set; } = "popup";
public string Mode { get; set; } = "inline";
public List<SelectListItem> Modes { get; } = new List<SelectListItem>
{

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

@@ -299,9 +299,16 @@
:autoload="selectedThirdPartyProcessor === 'coinswitch'"
:to-currency-address="srvModel.btcAddress">
<div>
<a v-on:click="openDialog($event)" :href="url" class="action-button" v-show="url && !opened">
{{$t("Pay with CoinSwitch")}}
</a>
<a v-on:click="openDialog($event)" :href="url" class="action-button" v-show="url && !opened">
{{$t("Pay with CoinSwitch")}}
</a>
@if (Model.ChangellyEnabled)
{
<button v-show="!opened" v-on:click="$parent.selectedThirdPartyProcessor = 'changelly'" class="btn-link mt-2">
{{$t("Pay with Changelly")}}
</button>
}
<iframe
v-if="showInlineIFrame"
@@ -342,6 +349,12 @@
<a v-on:click="openDialog($event)" :href="url" class="action-button" v-show="url">
{{$t("Pay with Changelly")}}
</a>
@if (Model.CoinSwitchEnabled)
{
<button v-on:click="$parent.selectedThirdPartyProcessor = 'coinswitch'" class="btn-link mt-2">
{{$t("Pay with CoinSwitch")}}
</button>
}
<button class="retry-button" v-if="calculateError" v-on:click="retry('calculateAmount')">
{{$t("ConversionTab_CalculateAmount_Error")}}
</button>

32
BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml
View File

@@ -37,22 +37,20 @@
srvModel: srvModel
},
mounted: function() {
setTimeout(function() {
var copyInput = new Clipboard('.copy',
{
target: function(trigger) {
Vue.toasted.show('Copied',
{
iconPack: "fontawesome",
icon: "copy",
duration: 5000
});
return trigger;
}
});
},
500);
this.$nextTick(function() {
var copyInput = new Clipboard('.copy');
copyInput.on("success",
function(e) {
Vue.toasted.show('Copied',
{
iconPack: "fontawesome",
icon: "copy",
duration: 5000
});
});
});
}
});
@@ -127,8 +125,8 @@
<qrcode v-bind:val="srvModel.nodeInfo" v-bind:size="256" bg-color="#f5f5f7" fg-color="#000">
</qrcode>
</div>
<div class="input-group copy" data-clipboard-target="#peer-info">
<input type="text" class=" form-control " readonly="readonly" :value="srvModel.nodeInfo" id="peer-info"/>
<div class="input-group copy" data-clipboard-target="#vue-peer-info">
<input type="text" class=" form-control " readonly="readonly" :value="srvModel.nodeInfo" id="vue-peer-info"/>
<div class="input-group-append">
<span class="input-group-text fa fa-copy"> </span>
</div>

12
BTCPayServer/wwwroot/checkout/css/normalizer.css
View File

@@ -11504,3 +11504,15 @@ low-fee-timeline {
#prettydropdown-DefaultLang ul li{
width:100% !important;
}
[v-cloak] > * { display:none }
[v-cloak]::before { content: "loading…" }
.btn-link {
color: #329F80;
}
.btn-link:hover {
color: #24725B;
}