mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 14:22:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix CI

Browse source
This commit is contained in:
Kukks 2020-09-15 16:18:42 +02:00
parent 25dd38af5c
commit 2711f2cb2f
3 changed files with 6 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BTCPayServer.Common/BTCPayNetworkProvider.cs
View file

@ -57,7 +57,7 @@ namespace BTCPayServer
InitMonero(); InitMonero();
InitPolis(); InitPolis();
InitChaincoin(); InitChaincoin();
InitArgoneum(); // InitArgoneum();//their rate source is down 9/15/20.
InitEthereum(); InitEthereum();
InitERC20(); InitERC20();

2
BTCPayServer.Rating/Services/RateProviderFactory.cs
View file

@ -101,7 +101,7 @@ namespace BTCPayServer.Services.Rates
Providers.Add("bitpay", new BitpayRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITPAY"))); Providers.Add("bitpay", new BitpayRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITPAY")));
Providers.Add("bitflyer", new BitflyerRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITFLYER"))); Providers.Add("bitflyer", new BitflyerRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_BITFLYER")));
Providers.Add("polispay", new PolisRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_POLIS"))); Providers.Add("polispay", new PolisRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_POLIS")));
Providers.Add("argoneum", new ArgoneumRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_ARGONEUM"))); // Providers.Add("argoneum", new ArgoneumRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_ARGONEUM")));
// Backward compatibility: coinaverage should be using coingecko to prevent stores from breaking // Backward compatibility: coinaverage should be using coingecko to prevent stores from breaking

53
BTCPayServer/Views/Shared/Ethereum/EthereumLikeMethodCheckout.cshtml
View file

@ -50,7 +50,7 @@
</div> </div>
</nav> </nav>
</div> </div>
@if (Model.ChangellyEnabled || Model.CoinSwitchEnabled) @if (Model.CoinSwitchEnabled)
{ {
<div id="altcoins" class="bp-view payment manual-flow" v-bind:class="{ 'active': currentTab == 'altcoins'}"> <div id="altcoins" class="bp-view payment manual-flow" v-bind:class="{ 'active': currentTab == 'altcoins'}">
<nav > <nav >
@ -62,17 +62,16 @@
</span> </span>
</div> </div>
<center> <center>
@if (Model.CoinSwitchEnabled && Model.ChangellyEnabled) @if (Model.CoinSwitchEnabled)
{ {
<template v-if="!selectedThirdPartyProcessor"> <template v-if="!selectedThirdPartyProcessor">
<button v-on:click="selectedThirdPartyProcessor = 'coinswitch'" class="action-button">{{$t("Pay with CoinSwitch")}}</button> <button v-on:click="selectedThirdPartyProcessor = 'coinswitch'" class="action-button">{{$t("Pay with CoinSwitch")}}</button>
<button v-on:click="selectedThirdPartyProcessor = 'changelly'" class="action-button">{{$t("Pay with Changelly")}}</button>
</template> </template>
} }
@if (Model.CoinSwitchEnabled) @if (Model.CoinSwitchEnabled)
{ {
<coinswitch inline-template <coinswitch inline-template
v-if="!srvModel.changellyEnabled || selectedThirdPartyProcessor === 'coinswitch'" v-if="selectedThirdPartyProcessor === 'coinswitch'"
:mode="srvModel.coinSwitchMode" :mode="srvModel.coinSwitchMode"
:merchant-id="srvModel.coinSwitchMerchantId" :merchant-id="srvModel.coinSwitchMerchantId"
:to-currency="srvModel.paymentMethodId" :to-currency="srvModel.paymentMethodId"
@ -81,10 +80,6 @@
:to-currency-address="srvModel.btcAddress"> :to-currency-address="srvModel.btcAddress">
<div> <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 <iframe
v-if="showInlineIFrame" v-if="showInlineIFrame"
v-on:load="onLoadIframe" v-on:load="onLoadIframe"
@ -95,45 +90,6 @@
</div> </div>
</coinswitch> </coinswitch>
} }
@if (Model.ChangellyEnabled)
{
<changelly inline-template
v-if="!srvModel.coinSwitchEnabled || selectedThirdPartyProcessor === 'changelly'"
:merchant-id="srvModel.changellyMerchantId"
:store-id="srvModel.storeId"
:to-currency="srvModel.paymentMethodId"
:to-currency-due="srvModel.changellyAmountDue"
:to-currency-address="srvModel.btcAddress">
<div class="changelly-component">
<div class="changelly-component-dropdown-holder" v-show="prettyDropdownInstance">
<select
v-model="selectedFromCurrency"
:disabled="isLoading"
v-on:change="onCurrencyChange($event)"
ref="changellyCurrenciesDropdown">
<option value="">{{$t("ConversionTab_CurrencyList_Select_Option")}}</option>
<option v-for="currency of currencies"
:data-prefix="'<img src=\''+currency.image+'\'/>'"
:value="currency.name">{{currency.fullName}}</option>
</select>
</div>
<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>
<button class="retry-button" v-if="currenciesError" v-on:click="retry('loadCurrencies')">
{{$t("ConversionTab_LoadCurrencies_Error")}}
</button>
<div v-show="isLoading" class="general__spinner">
<partial name="Checkout-Spinner"/>
</div>
</div>
</changelly>
}
</center> </center>
</nav> </nav>
</div> </div>
@ -149,7 +105,7 @@
<div class="payment-tabs__tab" id="copy-tab" v-on:click="switchTab('copy')" v-bind:class="{ 'active': currentTab == 'copy'}" > <div class="payment-tabs__tab" id="copy-tab" v-on:click="switchTab('copy')" v-bind:class="{ 'active': currentTab == 'copy'}" >
<span>{{$t("Copy")}}</span> <span>{{$t("Copy")}}</span>
</div> </div>
@if (Model.ChangellyEnabled || Model.CoinSwitchEnabled) @if (Model.CoinSwitchEnabled)
{ {
<div class="payment-tabs__tab" id="altcoins-tab" v-on:click="switchTab('altcoins')" v-bind:class="{ 'active': currentTab == 'altcoins'}" > <div class="payment-tabs__tab" id="altcoins-tab" v-on:click="switchTab('altcoins')" v-bind:class="{ 'active': currentTab == 'altcoins'}" >
<span>{{$t("Conversion")}}</span> <span>{{$t("Conversion")}}</span>
@ -170,7 +126,6 @@
template: "#ethereum-method-checkout-template", template: "#ethereum-method-checkout-template",
components: { components: {
qrcode: VueQrcode, qrcode: VueQrcode,
changelly: ChangellyComponent,
coinswitch: CoinSwitchComponent coinswitch: CoinSwitchComponent
}, },
data: function() { data: function() {