diff --git a/BTCPayServer/Controllers/UIInvoiceController.UI.cs b/BTCPayServer/Controllers/UIInvoiceController.UI.cs index 5a258493b..4c1dbd2f9 100644 --- a/BTCPayServer/Controllers/UIInvoiceController.UI.cs +++ b/BTCPayServer/Controllers/UIInvoiceController.UI.cs @@ -93,6 +93,7 @@ namespace BTCPayServer.Controllers IncludeAddresses = true, IncludeEvents = true, IncludeArchived = true, + IncludeRefunds = true, })).FirstOrDefault(); if (invoice == null) return NotFound(); @@ -116,7 +117,9 @@ namespace BTCPayServer.Controllers ExpirationDate = invoice.ExpirationTime, MonitoringDate = invoice.MonitoringExpiration, Fiat = _CurrencyNameTable.DisplayFormatCurrency(invoice.Price, invoice.Currency), - TaxIncluded = _CurrencyNameTable.DisplayFormatCurrency(invoice.Metadata.TaxIncluded ?? 0.0m, invoice.Currency), + TaxIncluded = invoice.Metadata.TaxIncluded is null + ? null + : _CurrencyNameTable.DisplayFormatCurrency(invoice.Metadata.TaxIncluded ?? 0.0m, invoice.Currency), NotificationUrl = invoice.NotificationURL?.AbsoluteUri, RedirectUrl = invoice.RedirectURL?.AbsoluteUri, TypedMetadata = invoice.Metadata, @@ -125,6 +128,7 @@ namespace BTCPayServer.Controllers PosData = PosDataParser.ParsePosData(invoice.Metadata.PosData), Archived = invoice.Archived, CanRefund = CanRefund(invoiceState), + Refunds = invoice.Refunds, ShowCheckout = invoice.Status == InvoiceStatusLegacy.New, Deliveries = (await _InvoiceRepository.GetWebhookDeliveries(invoiceId)) .Select(c => new Models.StoreViewModels.DeliveryViewModel(c)) @@ -412,8 +416,8 @@ namespace BTCPayServer.Controllers { InvoiceId = new[] { invoiceId }, UserId = GetUserId(), - IncludeAddresses = true, - IncludeEvents = true, + IncludeAddresses = false, + IncludeEvents = false, IncludeArchived = true, })).FirstOrDefault(); if (invoice == null) diff --git a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs index c980cfc30..a4337f55c 100644 --- a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs +++ b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using BTCPayServer.Client.Models; +using BTCPayServer.Data; using BTCPayServer.Payments; using BTCPayServer.Payments.Bitcoin; using BTCPayServer.Services.Invoices; @@ -131,5 +132,6 @@ namespace BTCPayServer.Models.InvoicingModels public bool CanMarkSettled { get; set; } public bool CanMarkInvalid { get; set; } public bool CanMarkStatus => CanMarkSettled || CanMarkInvalid; + public List Refunds { get; set; } } } diff --git a/BTCPayServer/Services/Invoices/InvoiceEntity.cs b/BTCPayServer/Services/Invoices/InvoiceEntity.cs index f393afd89..b1c8680cd 100644 --- a/BTCPayServer/Services/Invoices/InvoiceEntity.cs +++ b/BTCPayServer/Services/Invoices/InvoiceEntity.cs @@ -441,6 +441,8 @@ namespace BTCPayServer.Services.Invoices [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public InvoiceType Type { get; set; } + public List Refunds { get; set; } + public bool IsExpired() { return DateTimeOffset.UtcNow > ExpirationTime; diff --git a/BTCPayServer/Services/Invoices/InvoiceRepository.cs b/BTCPayServer/Services/Invoices/InvoiceRepository.cs index 179e4c7d7..c0ec2f0f5 100644 --- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs +++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs @@ -579,6 +579,10 @@ namespace BTCPayServer.Services.Invoices { entity.Events = invoice.Events.OrderBy(c => c.Timestamp).ToList(); } + if (invoice.Refunds != null) + { + entity.Refunds = invoice.Refunds.OrderBy(c => c.PullPaymentData.StartDate).ToList(); + } if (!string.IsNullOrEmpty(entity.RefundMail) && string.IsNullOrEmpty(entity.Metadata.BuyerEmail)) { entity.Metadata.BuyerEmail = entity.RefundMail; @@ -715,6 +719,8 @@ namespace BTCPayServer.Services.Invoices query = query.Include(o => o.AddressInvoices); if (queryObject.IncludeEvents) query = query.Include(o => o.Events); + if (queryObject.IncludeRefunds) + query = query.Include(o => o.Refunds).ThenInclude(refundData => refundData.PullPaymentData); var data = await query.ToArrayAsync().ConfigureAwait(false); return data.Select(ToEntity).ToArray(); } @@ -825,5 +831,6 @@ namespace BTCPayServer.Services.Invoices public bool IncludeEvents { get; set; } public bool IncludeArchived { get; set; } = true; + public bool IncludeRefunds { get; set; } } } diff --git a/BTCPayServer/Views/UIInvoice/Invoice.cshtml b/BTCPayServer/Views/UIInvoice/Invoice.cshtml index 41199bd21..e309c0c78 100644 --- a/BTCPayServer/Views/UIInvoice/Invoice.cshtml +++ b/BTCPayServer/Views/UIInvoice/Invoice.cshtml @@ -75,7 +75,7 @@
@@ -89,359 +89,453 @@ }
-
-
-

@ViewData["Title"]

-
- @if (Model.ShowCheckout) - { - Checkout - } - @if (Model.CanRefund) - { - Issue Refund - } - else - { - - } -
- -
-
+
+
+

@ViewData["Title"]

+
+ @if (Model.ShowCheckout) + { + Checkout + } + @if (Model.CanRefund) + { + Issue Refund + } + else + { + + } +
+ +
+
- + -
-
-

Invoice Information

- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @if (!string.IsNullOrEmpty(Model.RefundEmail)) + { + + + + + } + @if (!string.IsNullOrEmpty(Model.NotificationUrl)) + { + + + + + } + @if (!string.IsNullOrEmpty(Model.RedirectUrl)) + { + + + + + } +
Store@Model.StoreName
Invoice Id@Model.Id
Order Id - @if (string.IsNullOrEmpty(Model.TypedMetadata.OrderUrl)) +
+
+

Invoice Information

+ + + + + + + + + + @if (!string.IsNullOrEmpty(Model.TypedMetadata.OrderUrl)) + { + + + - - - - - - - - + + } + @if (Model.TypedMetadata.PaymentRequestId is not null) + { + + + + + } + + + - - - - - - - - - - - - - - - - - - - - - - @if (!string.IsNullOrEmpty(Model.RefundEmail)) - { - - - - + @if (Model.CanMarkSettled) + { + + Mark as settled + + } + + } - @if (!string.IsNullOrEmpty(Model.NotificationUrl)) + else { - - - - + @Model.State + @if (Model.StatusException != InvoiceExceptionStatus.None) + { + @String.Format(" ({0})", Model.StatusException.ToString()) + ; + } } - @if (!string.IsNullOrEmpty(Model.RedirectUrl)) - { - - - - - } -
Store + @Model.StoreName +
Invoice Id@Model.Id
Order Id + + + @if (string.IsNullOrEmpty(Model.TypedMetadata.OrderId)) + { + View Order + } + else { @Model.TypedMetadata.OrderId } - else - { - - @if (string.IsNullOrEmpty(Model.TypedMetadata.OrderId)) - { - View Order - } - else - { - @Model.TypedMetadata.OrderId - } - - } -
Payment Request Id@Model.TypedMetadata.PaymentRequestId
State - @if (Model.CanMarkStatus) - { -
- -
- @if (Model.CanMarkInvalid) - { - - Mark as invalid - - } - @if (Model.CanMarkSettled) - { - - Mark as settled - - } -
-
- } - else - { + + +
Payment Request Id + @Model.TypedMetadata.PaymentRequestId +
State + @if (Model.CanMarkStatus) + { +
+ +
+ @if (Model.CanMarkInvalid) { - @String.Format(" ({0})", Model.StatusException.ToString()); + + Mark as invalid + } - } -
Created Date@Model.CreatedDate.ToBrowserDate()
Expiration Date@Model.ExpirationDate.ToBrowserDate()
Monitoring Date@Model.MonitoringDate.ToBrowserDate()
Transaction Speed@Model.TransactionSpeed
Total Fiat Due@Model.Fiat
Refund Email@Model.RefundEmail
Notification Url@Model.NotificationUrl
Redirect Url@Model.RedirectUrl
- @if (Model.PosData.Count == 0) +
Created Date@Model.CreatedDate.ToBrowserDate()
Expiration Date@Model.ExpirationDate.ToBrowserDate()
Monitoring Date@Model.MonitoringDate.ToBrowserDate()
Transaction Speed@Model.TransactionSpeed
Total Fiat Due@Model.Fiat
Refund Email + @Model.RefundEmail +
Notification Url@Model.NotificationUrl
Redirect Url + @Model.RedirectUrl +
+ +
+@if (Model.PosData.Count == 0) +{ +
+

Product Information

+ + @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemCode)) { -

Product Information

-
- @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemCode)) - { - - - - - } - @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemDesc)) - { - - - - - } - - - - - - - - -
Item code@Model.TypedMetadata.ItemCode
Item Description@Model.TypedMetadata.ItemDesc
Price@Model.Fiat
Tax Included@Model.TaxIncluded
+ + Item code + @Model.TypedMetadata.ItemCode + } -
-
-

Buyer Information

-
- + @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemDesc)) + { + + + + + } + + + + + @if (Model.TaxIncluded is not null) + { + + + + + } +
Item Description@Model.TypedMetadata.ItemDesc
Price@Model.Fiat
Tax Included@Model.TaxIncluded
+
+} +@if (Model.TypedMetadata.BuyerName is not null || + Model.TypedMetadata.BuyerEmail is not null || + Model.TypedMetadata.BuyerPhone is not null || + Model.TypedMetadata.BuyerAddress1 is not null || + Model.TypedMetadata.BuyerAddress2 is not null || + Model.TypedMetadata.BuyerCity is not null || + Model.TypedMetadata.BuyerState is not null || + Model.TypedMetadata.BuyerCountry is not null || + Model.TypedMetadata.BuyerZip is not null + ) +{ +
+

Buyer Information

+
+ + @if (Model.TypedMetadata.BuyerName is not null) + { + } + @if (Model.TypedMetadata.BuyerEmail is not null) + { - + + } + @if (Model.TypedMetadata.BuyerPhone is not null) + { + } + @if (Model.TypedMetadata.BuyerAddress1 is not null) + { + } + @if (Model.TypedMetadata.BuyerAddress2 is not null) + { + } + @if (Model.TypedMetadata.BuyerCity is not null) + { + } + @if (Model.TypedMetadata.BuyerState is not null) + { + } + @if (Model.TypedMetadata.BuyerCountry is not null) + { + } + @if (Model.TypedMetadata.BuyerZip is not null) + { -
Name @Model.TypedMetadata.BuyerName
Email@Model.TypedMetadata.BuyerEmail + @Model.TypedMetadata.BuyerEmail +
Phone @Model.TypedMetadata.BuyerPhone
Address 1 @Model.TypedMetadata.BuyerAddress1
Address 2 @Model.TypedMetadata.BuyerAddress2
City @Model.TypedMetadata.BuyerCity
State @Model.TypedMetadata.BuyerState
Country @Model.TypedMetadata.BuyerCountry
Zip @Model.TypedMetadata.BuyerZip
-
-
-
- - @if (Model.PosData.Count != 0) - { -
-
-

Product information

- - @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemCode)) - { - - - - - } - @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemDesc)) - { - - - - - } - - - - - - - - -
Item code@Model.TypedMetadata.ItemCode
Item Description@Model.TypedMetadata.ItemDesc
Price@Model.Fiat
Tax included@Model.TaxIncluded
-
-
-

Point of Sale Data

- - -
-
- } - - - - @if (Model.Deliveries.Count != 0) - { -
-

Webhooks

- - - - - - - - - - - - - @foreach (var delivery in Model.Deliveries) - { - - - - - - - - - - - } - + }
StatusIDTypeUrlDateAction
- - @if (delivery.Success) - { - - } - else - { - - } - - - - - @delivery.Id - - - - @delivery.Type - - - @delivery.PayloadUrl - - - - @delivery.Time.ToBrowserDate() - - - -
- } +
+} -

Events

- - - - - - - - - @foreach (var evt in Model.Events) +@if (Model.PosData.Count != 0) +{ +
+

Product information

+
DateMessage
+ @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemCode)) { - - - + + + } - -
@evt.Timestamp.ToBrowserDate()@evt.Message
Item code@Model.TypedMetadata.ItemCode
+ @if (!string.IsNullOrEmpty(Model.TypedMetadata.ItemDesc)) + { + + Item Description + @Model.TypedMetadata.ItemDesc + + } + + Price + @Model.Fiat + + + Tax included + @Model.TaxIncluded + + +
+
+

Point of Sale Data

+ + +
+} +
+ + +@if (Model.Deliveries.Count != 0) +{ +
+

Webhooks

+ + + + + + + + + + + + + @foreach (var delivery in Model.Deliveries) + { + + + + + + + + + + + } + +
StatusIDTypeUrlDateAction
+ + @if (delivery.Success) + { + + } + else + { + + } + + + + + @delivery.Id + + + + @delivery.Type + + + @delivery.PayloadUrl + + + + @delivery.Time.ToBrowserDate() + + + +
+
+} + +@if ((Model.Refunds?.Count ?? 0) > 0) +{ +
+

Refunds

+ + + + + + + + + + @foreach (var refund in Model.Refunds) + { + var blob = refund.PullPaymentData.GetBlob(); + + + + + + + } + +
Pull PaymentAmountDate
+ + + @refund.PullPaymentData.Id + + + + @blob.Limit @blob.Currency + + @refund.PullPaymentData.StartDate.ToBrowserDate() +
+
+} +

Events

+ + + + + + + + + @foreach (var evt in Model.Events) + { + + + + + } + +
DateMessage
@evt.Timestamp.ToBrowserDate()@evt.Message