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

Revert "Remove the next address to pay to from Invoice details page (Fix #1056) (#1283)"

Browse Source 
This reverts commit 6848482999.
This commit is contained in:
rockstardev
2020-02-28 16:30:57 -06:00
parent 18aaa1a0c4
commit fca6b39681
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,6 +103,7 @@ namespace BTCPayServer.Controllers
cryptoPayment.Paid = _CurrencyNameTable.DisplayFormatCurrency(accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode); cryptoPayment.Paid = _CurrencyNameTable.DisplayFormatCurrency(accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
cryptoPayment.Overpaid = _CurrencyNameTable.DisplayFormatCurrency(accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode); cryptoPayment.Overpaid = _CurrencyNameTable.DisplayFormatCurrency(accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode);
var paymentMethodDetails = data.GetPaymentMethodDetails(); var paymentMethodDetails = data.GetPaymentMethodDetails();
cryptoPayment.Address = paymentMethodDetails.GetPaymentDestination();
cryptoPayment.Rate = ExchangeRate(data); cryptoPayment.Rate = ExchangeRate(data);
model.CryptoPayments.Add(cryptoPayment); model.CryptoPayments.Add(cryptoPayment);
} }

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

@@ -38,6 +38,7 @@ namespace BTCPayServer.Models.InvoicingModels
public string PaymentMethod { get; set; } public string PaymentMethod { get; set; }
public string Due { get; set; } public string Due { get; set; }
public string Paid { get; set; } public string Paid { get; set; }
public string Address { get; internal set; }
public string Rate { get; internal set; } public string Rate { get; internal set; }
public string PaymentUrl { get; internal set; } public string PaymentUrl { get; internal set; }
public string Overpaid { get; set; } public string Overpaid { get; set; }

6
BTCPayServer/Views/Invoice/InvoicePaymentsPartial.cshtml
View File

@@ -3,11 +3,12 @@
<div class="row"> <div class="row">
<div class="col-md-12 invoice-payments"> <div class="col-md-12 invoice-payments">
<h3>Current status</h3> <h3>Paid summary</h3>
<table class="table table-sm table-responsive-md"> <table class="table table-sm table-responsive-md">
<thead class="thead-inverse"> <thead class="thead-inverse">
<tr> <tr>
<th>Payment method</th> <th>Payment method</th>
<th>Address</th>
<th class="text-right">Rate</th> <th class="text-right">Rate</th>
<th class="text-right">Paid</th> <th class="text-right">Paid</th>
<th class="text-right">Due</th> <th class="text-right">Due</th>
@@ -22,6 +23,9 @@
{ {
<tr> <tr>
<td>@payment.PaymentMethod</td> <td>@payment.PaymentMethod</td>
<td title="@payment.Address">
<span class="text-truncate d-block" style="max-width: 400px">@payment.Address</span>
</td>
<td class="text-right">@payment.Rate</td> <td class="text-right">@payment.Rate</td>
<td class="text-right">@payment.Paid</td> <td class="text-right">@payment.Paid</td>
<td class="text-right">@payment.Due</td> <td class="text-right">@payment.Due</td>