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

Decimal precision and filter valid transaction (#1538)

Browse Source 
The liquid transactions list was showing all transactions to the wallet, even when it had nothing to do with the specific crypto code (e.g sending LBTC txs in USDT, LCAD in USDT, etc). This PR fixes that.

It also uses the previously introduced checkout decimal precision fix to the Wallets screen, specifically the balance amount on wallet llist and balance change on transaction list.
This commit is contained in:
Andrew Camilleri
2020-05-03 18:04:34 +02:00
committed by GitHub
parent 9c9c102e74
commit 67da6ee379
7 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,14 +227,6 @@ namespace BTCPayServer.Controllers
var divisibility = _CurrencyNameTable.GetNumberFormatInfo(paymentMethod.GetId().CryptoCode, false)?.CurrencyDecimalDigits;
string ShowMoney(Money money)
{
if (!divisibility.HasValue) return money.ToString();
var res = $"0{(divisibility.Value > 0 ? "." : string.Empty)}";
var format = res.PadRight(divisibility.Value + res.Length, '0');
return money.ToDecimal(MoneyUnit.BTC).ToString(format, CultureInfo.InvariantCulture);
}
var model = new PaymentModel()
{
CryptoCode = network.CryptoCode,
@@ -247,8 +239,8 @@ namespace BTCPayServer.Controllers
HtmlTitle = storeBlob.HtmlTitle ?? "BTCPay Invoice",
CryptoImage = Request.GetRelativePathOrAbsolute(paymentMethodHandler.GetCryptoImage(paymentMethodId)),
BtcAddress = paymentMethodDetails.GetPaymentDestination(),
BtcDue = ShowMoney(accounting.Due),
OrderAmount = ShowMoney(accounting.TotalDue - accounting.NetworkFee),
BtcDue = accounting.Due.ShowMoney(divisibility),
OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ShowMoney(divisibility),
OrderAmountFiat = OrderAmountFromInvoice(network.CryptoCode, invoice.ProductInformation),
CustomerEmail = invoice.RefundMail,
RequiresRefundEmail = storeBlob.RequiresRefundEmail,
@@ -264,7 +256,7 @@ namespace BTCPayServer.Controllers
StoreName = store.StoreName,
PeerInfo = (paymentMethodDetails as LightningLikePaymentMethodDetails)?.NodeInfo,
TxCount = accounting.TxRequired,
BtcPaid = ShowMoney(accounting.Paid),
BtcPaid = accounting.Paid.ShowMoney(divisibility),
#pragma warning disable CS0618 // Type or member is obsolete
Status = invoice.StatusString,
#pragma warning restore CS0618 // Type or member is obsolete