mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 06:21:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add link to the order id if there is a orderUrl

Browse source
This commit is contained in:
nicolas.dorier 2022-07-07 21:55:00 +09:00
parent b8d509eb12
commit 35f97a6013
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BTCPayServer/Controllers/UIInvoiceController.UI.cs
View file

@ -170,6 +170,7 @@ namespace BTCPayServer.Controllers
{ {
InvoiceId = i.Id, InvoiceId = i.Id,
OrderId = i.Metadata?.OrderId, OrderId = i.Metadata?.OrderId,
OrderUrl = i.Metadata?.OrderUrl,
StoreName = store.StoreName, StoreName = store.StoreName,
Status = i.Status.ToModernStatus() Status = i.Status.ToModernStatus()
}); });
@ -186,6 +187,7 @@ namespace BTCPayServer.Controllers
Timestamp = i.InvoiceTime, Timestamp = i.InvoiceTime,
InvoiceId = i.Id, InvoiceId = i.Id,
OrderId = i.Metadata?.OrderId, OrderId = i.Metadata?.OrderId,
OrderUrl = i.Metadata?.OrderUrl,
Payments = receipt.ShowPayments is false ? null : i.GetPayments(true).Select(paymentEntity => Payments = receipt.ShowPayments is false ? null : i.GetPayments(true).Select(paymentEntity =>
{ {
var paymentData = paymentEntity.GetCryptoPaymentData(); var paymentData = paymentEntity.GetCryptoPaymentData();

1
BTCPayServer/Models/InvoicingModels/InvoiceReceiptViewModel.cs
View file

@ -18,5 +18,6 @@ namespace BTCPayServer.Models.InvoicingModels
public Dictionary<string, object> AdditionalData { get; set; } public Dictionary<string, object> AdditionalData { get; set; }
public ReceiptOptions ReceiptOptions { get; set; } public ReceiptOptions ReceiptOptions { get; set; }
public List<ViewPaymentRequestViewModel.PaymentRequestInvoicePayment> Payments { get; set; } public List<ViewPaymentRequestViewModel.PaymentRequestInvoicePayment> Payments { get; set; }
public string OrderUrl { get; set; }
} }
} }

20
BTCPayServer/Views/UIInvoice/InvoiceReceipt.cshtml
View file

@ -79,7 +79,25 @@
{ {
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<dd class="text-muted mb-0 fw-semibold">Order ID</dd> <dd class="text-muted mb-0 fw-semibold">Order ID</dd>
<dt class="fs-5 mb-0 text-break fw-semibold">@Model.OrderId</dt> <dt class="fs-5 mb-0 text-break fw-semibold">
@if (!string.IsNullOrEmpty(Model.OrderUrl))
{
<a href="@Model.OrderUrl" rel="noreferrer noopener" target="_blank">
@if (string.IsNullOrEmpty(Model.OrderId))
{
<span>View Order</span>
}
else
{
@Model.OrderId
}
</a>
}
else
{
<span>@Model.OrderId</span>
}
</dt>
</div> </div>
} }
</dl> </dl>