mirror of
https://github.com/bitwarden/server
synced 2025-12-19 09:43:25 +00:00
* Upgrade Stripe.net to v48.4.0 * Update PreviewTaxAmountCommand * Remove unused UpcomingInvoiceOptionExtensions * Added SubscriptionExtensions with GetCurrentPeriodEnd * Update PremiumUserBillingService * Update OrganizationBillingService * Update GetOrganizationWarningsQuery * Update BillingHistoryInfo * Update SubscriptionInfo * Remove unused Sql Billing folder * Update StripeAdapter * Update StripePaymentService * Update InvoiceCreatedHandler * Update PaymentFailedHandler * Update PaymentSucceededHandler * Update ProviderEventService * Update StripeEventUtilityService * Update SubscriptionDeletedHandler * Update SubscriptionUpdatedHandler * Update UpcomingInvoiceHandler * Update ProviderSubscriptionResponse * Remove unused Stripe Subscriptions Admin Tool * Update RemoveOrganizationFromProviderCommand * Update ProviderBillingService * Update RemoveOrganizatinoFromProviderCommandTests * Update PreviewTaxAmountCommandTests * Update GetCloudOrganizationLicenseQueryTests * Update GetOrganizationWarningsQueryTests * Update StripePaymentServiceTests * Update ProviderBillingControllerTests * Update ProviderEventServiceTests * Update SubscriptionDeletedHandlerTests * Update SubscriptionUpdatedHandlerTests * Resolve Billing test failures I completely removed tests for the StripeEventService as they were using a system I setup a while back that read JSON files of the Stripe event structure. I did not anticipate how frequently these structures would change with each API version and the cost of trying to update these specific JSON files to test a very static data retrieval service far outweigh the benefit. * Resolve Core test failures * Run dotnet format * Remove unused provider migration * Fixed failing tests * Run dotnet format * Replace the old webhook secret key with new one (#6223) * Fix compilation failures in additions * Run dotnet format * Bump Stripe API version * Fix recent addition: CreatePremiumCloudHostedSubscriptionCommand * Fix new code in main according to Stripe update * Fix InvoiceExtensions * Bump SDK version to match API Version * Fix provider invoice generation validation * More QA fixes * Fix tests * QA defect resolutions * QA defect resolutions * Run dotnet format * Fix tests --------- Co-authored-by: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
64 lines
2.1 KiB
C#
64 lines
2.1 KiB
C#
// FIXME: Update this file to be null safe and then delete the line below
|
|
#nullable disable
|
|
|
|
using Bit.Core.Billing.Constants;
|
|
using Bit.Core.Entities;
|
|
using Bit.Core.Enums;
|
|
using Stripe;
|
|
|
|
namespace Bit.Core.Billing.Models;
|
|
|
|
public class BillingHistoryInfo
|
|
{
|
|
public IEnumerable<BillingInvoice> Invoices { get; set; } = new List<BillingInvoice>();
|
|
public IEnumerable<BillingTransaction> Transactions { get; set; } = new List<BillingTransaction>();
|
|
|
|
public class BillingTransaction
|
|
{
|
|
public BillingTransaction(Transaction transaction)
|
|
{
|
|
Id = transaction.Id;
|
|
CreatedDate = transaction.CreationDate;
|
|
Refunded = transaction.Refunded;
|
|
Type = transaction.Type;
|
|
PaymentMethodType = transaction.PaymentMethodType;
|
|
Details = transaction.Details;
|
|
Amount = transaction.Amount;
|
|
RefundedAmount = transaction.RefundedAmount;
|
|
}
|
|
|
|
public Guid Id { get; set; }
|
|
public DateTime CreatedDate { get; set; }
|
|
public decimal Amount { get; set; }
|
|
public bool? Refunded { get; set; }
|
|
public bool? PartiallyRefunded => !Refunded.GetValueOrDefault() && RefundedAmount.GetValueOrDefault() > 0;
|
|
public decimal? RefundedAmount { get; set; }
|
|
public TransactionType Type { get; set; }
|
|
public PaymentMethodType? PaymentMethodType { get; set; }
|
|
public string Details { get; set; }
|
|
}
|
|
|
|
public class BillingInvoice
|
|
{
|
|
public BillingInvoice(Invoice inv)
|
|
{
|
|
Id = inv.Id;
|
|
Date = inv.Created;
|
|
Url = inv.HostedInvoiceUrl;
|
|
PdfUrl = inv.InvoicePdf;
|
|
Number = inv.Number;
|
|
Paid = inv.Status == StripeConstants.InvoiceStatus.Paid;
|
|
Amount = inv.Total / 100M;
|
|
}
|
|
|
|
public string Id { get; set; }
|
|
public decimal Amount { get; set; }
|
|
public DateTime? Date { get; set; }
|
|
public string Url { get; set; }
|
|
public string PdfUrl { get; set; }
|
|
public string Number { get; set; }
|
|
public bool Paid { get; set; }
|
|
}
|
|
|
|
}
|