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

Displaying fiat value of invoice's order amount in details

Browse Source
This commit is contained in:
rockstardev
2018-05-11 12:15:26 -05:00
parent be1128a886
commit 3770adb7d3
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,9 +239,9 @@ namespace BTCPayServer.Controllers
CustomCSSLink = storeBlob.CustomCSS?.AbsoluteUri,
CustomLogoLink = storeBlob.CustomLogo?.AbsoluteUri,
BtcAddress = paymentMethodDetails.GetPaymentDestination(),
OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
BtcDue = accounting.Due.ToString(),
FiatDue = FiatDue(accounting.Due, paymentMethod),
OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ToString(),
OrderAmountFiat = OrderAmountFiat(invoice.ProductInformation),
CustomerEmail = invoice.RefundMail,
RequiresRefundEmail = storeBlob.RequiresRefundEmail,
ExpirationSeconds = Math.Max(0, (int)(invoice.ExpirationTime - DateTimeOffset.UtcNow).TotalSeconds),
@@ -295,10 +295,9 @@ namespace BTCPayServer.Controllers
{
return price.ToString("C", _CurrencyNameTable.GetCurrencyProvider(currency)) + $" ({currency})";
}
private string FiatDue(Money btcDue, PaymentMethod paymentMethod)
private string OrderAmountFiat(ProductInformation productInformation)
{
var currency = paymentMethod.ParentEntity.ProductInformation.Currency;
return FormatCurrency(btcDue.ToUnit(MoneyUnit.BTC) * paymentMethod.Rate, currency);
return FormatCurrency(productInformation.Price, productInformation.Currency);
}
[HttpGet]

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

@@ -36,8 +36,8 @@ namespace BTCPayServer.Models.InvoicingModels
public string ItemDesc { get; set; }
public string TimeLeft { get; set; }
public string Rate { get; set; }
public string FiatDue { get; set; }
public string OrderAmount { get; set; }
public string OrderAmountFiat { get; set; }
public string InvoiceBitcoinUrl { get; set; }
public string InvoiceBitcoinUrlQR { get; set; }
public int TxCount { get; set; }

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

@@ -74,7 +74,7 @@
</div>
<div class="single-item-order__right__ex-rate">
{{srvModel.fiatDue}}
1 {{ srvModel.cryptoCode }} = {{ srvModel.rate }}
</div>
</div>
@@ -85,9 +85,9 @@
<div class="line-items">
<div class="line-items__item">
<div class="line-items__item__label">
<span>{{$t("Exchange Rate")}}</span>
<span>{{$t("Order Amount in Fiat")}}</span>
</div>
<div class="line-items__item__value">1 {{ srvModel.cryptoCode }} = {{ srvModel.rate }}</div>
<div class="line-items__item__value">{{srvModel.orderAmountFiat}}</div>
</div>
<div class="line-items__item">
<div class="line-items__item__label">{{$t("Order Amount")}}</div>