nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Updated CSV column header, removed invoice PDF URL (#4212)

Browse Source
This commit is contained in:
Alex Morask 2024-06-26 09:30:30 -04:00 committed by GitHub
parent e8e725c389
commit 750321afaa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitwarden_license/src/Commercial.Core/Billing/Models/ProviderClientInvoiceReportRow.cs
View File

@ -1,5 +1,6 @@
using System.Globalization; using System.Globalization;
using Bit.Core.Billing.Entities; using Bit.Core.Billing.Entities;
using CsvHelper.Configuration.Attributes;
namespace Bit.Commercial.Core.Billing.Models; namespace Bit.Commercial.Core.Billing.Models;
@ -10,6 +11,7 @@ public class ProviderClientInvoiceReportRow
public int Used { get; set; } public int Used { get; set; }
public int Remaining { get; set; } public int Remaining { get; set; }
public string Plan { get; set; } public string Plan { get; set; }
[Name("Estimated total")]
public string Total { get; set; } public string Total { get; set; }
public static ProviderClientInvoiceReportRow From(ProviderInvoiceItem providerInvoiceItem) public static ProviderClientInvoiceReportRow From(ProviderInvoiceItem providerInvoiceItem)

6
src/Api/Billing/Models/Responses/InvoicesResponse.cs
View File

@ -19,8 +19,7 @@ public record InvoiceDTO(
decimal Total, decimal Total,
string Status, string Status,
DateTime? DueDate, DateTime? DueDate,
string Url, string Url)
string PdfUrl)
{ {
public static InvoiceDTO From(Invoice invoice) => new( public static InvoiceDTO From(Invoice invoice) => new(
invoice.Id, invoice.Id,
@ -29,6 +28,5 @@ public record InvoiceDTO(
invoice.Total / 100M, invoice.Total / 100M,
invoice.Status, invoice.Status,
invoice.DueDate, invoice.DueDate,
invoice.HostedInvoiceUrl, invoice.HostedInvoiceUrl);
invoice.InvoicePdf);
} }

2
test/Api.Test/Billing/Controllers/ProviderBillingControllerTests.cs
View File

@ -92,7 +92,6 @@ public class ProviderBillingControllerTests
Assert.Equal(1000, openInvoice.Total); Assert.Equal(1000, openInvoice.Total);
Assert.Equal(new DateTime(2024, 7, 1), openInvoice.DueDate); Assert.Equal(new DateTime(2024, 7, 1), openInvoice.DueDate);
Assert.Equal("https://example.com/invoice/2", openInvoice.Url); Assert.Equal("https://example.com/invoice/2", openInvoice.Url);
Assert.Equal("https://example.com/invoice/2/pdf", openInvoice.PdfUrl);
var paidInvoice = response.Invoices.FirstOrDefault(i => i.Status == "paid"); var paidInvoice = response.Invoices.FirstOrDefault(i => i.Status == "paid");
@ -103,7 +102,6 @@ public class ProviderBillingControllerTests
Assert.Equal(1000, paidInvoice.Total); Assert.Equal(1000, paidInvoice.Total);
Assert.Equal(new DateTime(2024, 6, 1), paidInvoice.DueDate); Assert.Equal(new DateTime(2024, 6, 1), paidInvoice.DueDate);
Assert.Equal("https://example.com/invoice/1", paidInvoice.Url); Assert.Equal("https://example.com/invoice/1", paidInvoice.Url);
Assert.Equal("https://example.com/invoice/1/pdf", paidInvoice.PdfUrl);
} }
#endregion #endregion