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

The Big Cleanup: Refactor BTCPay internals (#5809)

Browse Source
This commit is contained in:
Nicolas Dorier
2024-04-04 16:31:04 +09:00
committed by GitHub
parent 69b589a401
commit 6cc1751924
265 changed files with 8289 additions and 7673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
View File

@@ -213,20 +213,23 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
GetViewModels(
InvoiceEntity invoice,
DisplayFormatter displayFormatter,
TransactionLinkProviders txLinkProvider)
TransactionLinkProviders txLinkProvider,
PaymentMethodHandlerDictionary handlers)
{
return invoice
.GetPayments(true)
.Select(paymentEntity =>
{
var paymentData = paymentEntity.GetCryptoPaymentData();
var paymentMethodId = paymentEntity.GetPaymentMethodId();
if (paymentData is null || paymentMethodId is null)
var paymentMethodId = paymentEntity.PaymentMethodId;
if (paymentMethodId is null)
{
return null;
}
string txId = paymentData.GetPaymentId();
string link = txLinkProvider.GetTransactionLink(paymentMethodId, txId);
string txId = paymentEntity.Id;
// TODO: Move that in an extension
var cryptoCode = handlers.TryGetNetwork(paymentMethodId)?.CryptoCode;
string link = cryptoCode is null ? null : txLinkProvider.GetTransactionLink(cryptoCode, txId);
return new ViewPaymentRequestViewModel.PaymentRequestInvoicePayment
{
@@ -236,12 +239,11 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
AmountFormatted = displayFormatter.Currency(paymentEntity.PaidAmount.Gross, paymentEntity.PaidAmount.Currency),
PaidFormatted = displayFormatter.Currency(paymentEntity.InvoicePaidAmount.Net, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol),
RateFormatted = displayFormatter.Currency(paymentEntity.Rate, invoice.Currency, DisplayFormatter.CurrencyFormat.Symbol),
PaymentMethod = paymentMethodId.ToPrettyString(),
PaymentMethod = paymentMethodId.ToString(),
Link = link,
Id = txId,
Destination = paymentData.GetDestination(),
PaymentProof = paymentData.GetPaymentProof(),
PaymentType = paymentData.GetPaymentType()
Destination = paymentEntity.Destination,
//PaymentProof = paymentData.GetPaymentProof()
};
})
.Where(payment => payment != null)
@@ -258,7 +260,6 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
public string Id { get; set; }
public string Destination { get; set; }
public string PaymentProof { get; set; }
public PaymentType PaymentType { get; set; }
}
}
}