aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing sats exchange rate display

Browse Source 
Fixed #1147
This commit is contained in:
Matt Pazar
2019-12-04 14:21:33 -06:00
parent 84d943d6cc
commit eb85b1a7b4
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/Controllers/InvoiceController.UI.cs
View File

@@ -294,6 +294,10 @@ namespace BTCPayServer.Controllers
}; };
paymentMethodHandler.PreparePaymentModel(model, dto, storeBlob); paymentMethodHandler.PreparePaymentModel(model, dto, storeBlob);
if (model.IsLightning && storeBlob.LightningAmountInSatoshi && model.CryptoCode == "Sats")
{
model.Rate = _CurrencyNameTable.DisplayFormatCurrency(paymentMethod.Rate / 100_000_000, paymentMethod.ParentEntity.ProductInformation.Currency);
}
model.UISettings = paymentMethodHandler.GetCheckoutUISettings(); model.UISettings = paymentMethodHandler.GetCheckoutUISettings();
model.PaymentMethodId = paymentMethodId.ToString(); model.PaymentMethodId = paymentMethodId.ToString();
var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds); var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);

1
BTCPayServer/Models/InvoicingModels/PaymentModel.cs
View File

@@ -78,6 +78,5 @@ namespace BTCPayServer.Models.InvoicingModels
public string RootPath { get; set; } public string RootPath { get; set; }
public decimal CoinSwitchAmountMarkupPercentage { get; set; } public decimal CoinSwitchAmountMarkupPercentage { get; set; }
public bool RedirectAutomatically { get; set; } public bool RedirectAutomatically { get; set; }
public string RateBaseAmount { get; set; } = "1";
} }
} }

1
BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs
View File

@@ -185,7 +185,6 @@ namespace BTCPayServer.Payments.Lightning
model.BtcPaid = Money.Parse(model.BtcPaid).ToUnit(MoneyUnit.Satoshi).ToString(CultureInfo.InvariantCulture); model.BtcPaid = Money.Parse(model.BtcPaid).ToUnit(MoneyUnit.Satoshi).ToString(CultureInfo.InvariantCulture);
model.NetworkFee = new Money(model.NetworkFee, MoneyUnit.BTC).ToUnit(MoneyUnit.Satoshi); model.NetworkFee = new Money(model.NetworkFee, MoneyUnit.BTC).ToUnit(MoneyUnit.Satoshi);
model.OrderAmount = Money.Parse(model.OrderAmount).ToUnit(MoneyUnit.Satoshi).ToString(CultureInfo.InvariantCulture); model.OrderAmount = Money.Parse(model.OrderAmount).ToUnit(MoneyUnit.Satoshi).ToString(CultureInfo.InvariantCulture);
model.RateBaseAmount = Money.FromUnit(1, MoneyUnit.BTC).Satoshi.ToString(CultureInfo.InvariantCulture);
} }
} }
public override string GetCryptoImage(PaymentMethodId paymentMethodId) public override string GetCryptoImage(PaymentMethodId paymentMethodId)

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

@@ -100,7 +100,8 @@
<span>{{ srvModel.btcDue }} {{ srvModel.cryptoCode }}</span> <span>{{ srvModel.btcDue }} {{ srvModel.cryptoCode }}</span>
</div> </div>
<div class="single-item-order__right__ex-rate" v-if="srvModel.orderAmountFiat && srvModel.cryptoCode"> <div class="single-item-order__right__ex-rate" v-if="srvModel.orderAmountFiat && srvModel.cryptoCode">
{{srvModel.rateBaseAmount}} {{ srvModel.cryptoCodeSrv }} = {{ srvModel.rate }} <span v-if="srvModel.cryptoCodeSrv === 'Sats'">1 Sat = {{ srvModel.rate }}</span>
<span v-else>1 {{ srvModel.cryptoCodeSrv }} = {{ srvModel.rate }}</span>
</div> </div>
</div> </div>
<span class="fa fa-angle-double-down"></span> <span class="fa fa-angle-double-down"></span>