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

Round currency up to significant decimal

Browse Source
This commit is contained in:
nicolas.dorier
2019-02-22 22:15:25 +09:00
parent fbcb69f447
commit b4b4523193
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BTCPayServer/Controllers/InvoiceController.cs
View File

@@ -108,8 +108,10 @@ namespace BTCPayServer.Controllers
var currencyInfo = _CurrencyNameTable.GetNumberFormatInfo(invoice.Currency, false); var currencyInfo = _CurrencyNameTable.GetNumberFormatInfo(invoice.Currency, false);
if (currencyInfo != null) if (currencyInfo != null)
{ {
invoice.Price = Math.Round(invoice.Price, currencyInfo.CurrencyDecimalDigits); int divisibility = currencyInfo.CurrencyDecimalDigits;
invoice.TaxIncluded = Math.Round(taxIncluded, currencyInfo.CurrencyDecimalDigits); invoice.Price = invoice.Price.RoundToSignificant(ref divisibility);
divisibility = currencyInfo.CurrencyDecimalDigits;
invoice.TaxIncluded = taxIncluded.RoundToSignificant(ref divisibility);
} }
invoice.Price = Math.Max(0.0m, invoice.Price); invoice.Price = Math.Max(0.0m, invoice.Price);
invoice.TaxIncluded = Math.Max(0.0m, taxIncluded); invoice.TaxIncluded = Math.Max(0.0m, taxIncluded);

17
BTCPayServer/Extensions.cs
View File

@@ -61,6 +61,23 @@ namespace BTCPayServer
} }
return value; return value;
} }
public static decimal RoundToSignificant(this decimal value, ref int divisibility)
{
if (value != 0m)
{
while (true)
{
var rounded = decimal.Round(value, divisibility, MidpointRounding.AwayFromZero);
if ((Math.Abs(rounded - value) / value) < 0.001m)
{
value = rounded;
break;
}
divisibility++;
}
}
return value;
}
public static PaymentMethodId GetpaymentMethodId(this InvoiceCryptoInfo info) public static PaymentMethodId GetpaymentMethodId(this InvoiceCryptoInfo info)
{ {
return new PaymentMethodId(info.CryptoCode, Enum.Parse<PaymentTypes>(info.PaymentType)); return new PaymentMethodId(info.CryptoCode, Enum.Parse<PaymentTypes>(info.PaymentType));

14
BTCPayServer/Services/Rates/CurrencyNameTable.cs
View File

@@ -130,19 +130,7 @@ namespace BTCPayServer.Services.Rates
var provider = GetNumberFormatInfo(currency, true); var provider = GetNumberFormatInfo(currency, true);
var currencyData = GetCurrencyData(currency, true); var currencyData = GetCurrencyData(currency, true);
var divisibility = currencyData.Divisibility; var divisibility = currencyData.Divisibility;
if (value != 0m) value = value.RoundToSignificant(ref divisibility);
{
while (true)
{
var rounded = decimal.Round(value, divisibility, MidpointRounding.AwayFromZero);
if ((Math.Abs(rounded - value) / value) < 0.001m)
{
value = rounded;
break;
}
divisibility++;
}
}
if (divisibility != provider.CurrencyDecimalDigits) if (divisibility != provider.CurrencyDecimalDigits)
{ {
provider = (NumberFormatInfo)provider.Clone(); provider = (NumberFormatInfo)provider.Clone();