bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-23 03:33:35 +00:00
Code Issues Releases Wiki Activity

Add is sponsored item to subscription response

Browse Source
This commit is contained in:
Matt Gibson
2021-11-10 18:05:31 -05:00
committed by Justin Baur
parent 3d28ae1547
commit be6ab1883c
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Api/Response/SubscriptionResponseModel.cs
View File

@@ -82,12 +82,14 @@ namespace Bit.Core.Models.Api
Amount = item.Amount;
Interval = item.Interval;
Quantity = item.Quantity;
SponsoredSubscriptionItem = item.SponsoredSubscriptionItem;
}
public string Name { get; set; }
public decimal Amount { get; set; }
public int Quantity { get; set; }
public string Interval { get; set; }
public bool SponsoredSubscriptionItem { get; set; }
}
}

2
src/Core/Models/Business/SubscriptionInfo.cs
View File

@@ -52,12 +52,14 @@ namespace Bit.Core.Models.Business
}
Quantity = (int)item.Quantity;
SponsoredSubscriptionItem = Utilities.StaticStore.SponsoredPlans.Any(p => p.StripePlanId == item.Plan.Id);
}
public string Name { get; set; }
public decimal Amount { get; set; }
public int Quantity { get; set; }
public string Interval { get; set; }
public bool SponsoredSubscriptionItem { get; set; }
}
}

3
src/Core/Services/Implementations/StripePaymentService.cs
View File

@@ -198,8 +198,7 @@ namespace Bit.Core.Services
var sponsoredPlan = Utilities.StaticStore.GetSponsoredPlan(sponsorship.PlanSponsorshipType.Value);
var subscriptionUpdate = new SponsorOrganizationSubscriptionUpdate(existingPlan, sponsoredPlan, applySponsorship);
var prorationTime = DateTime.UtcNow;
await FinalizeSubscriptionChangeAsync(org, subscriptionUpdate, prorationTime);
await FinalizeSubscriptionChangeAsync(org, subscriptionUpdate, DateTime.UtcNow);
var sub = await _stripeAdapter.SubscriptionGetAsync(org.GatewaySubscriptionId);
org.ExpirationDate = sub.CurrentPeriodEnd;