Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-26 12:55:17 +01:00
Code Issues Projects Releases Wiki Activity

fix cancelled typo in areas

Browse Source
This commit is contained in:
Kyle Spearrin 2018-07-20 17:00:05 -04:00
parent 05b1c1cf9b
commit 0d4ac29bc7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ namespace Bit.Core.Models.Business
PeriodEndDate = sub.CurrentPeriodEnd;
CancelledDate = sub.CanceledAt;
CancelAtEndDate = sub.CancelAtPeriodEnd;
Cancelled = sub.Status == "cancelled";
Cancelled = sub.Status == "canceled" || sub.Status == "unpaid";
if(sub.Items?.Data != null)
{
Items = sub.Items.Data.Select(i => new BillingSubscriptionItem(i));

4
src/Core/Services/Implementations/BraintreePaymentService.cs
View File

@ -164,8 +164,8 @@ namespace Bit.Core.Services
if(sub != null)
{
var cancelAtEndDate = !sub.NeverExpires.GetValueOrDefault();
var cancelled = sub.Status == SubscriptionStatus.CANCELED;
if(!cancelled && !cancelAtEndDate && sub.NextBillingDate.HasValue)
var canceled = sub.Status == SubscriptionStatus.CANCELED;
if(!canceled && !cancelAtEndDate && sub.NextBillingDate.HasValue)
{
return new BillingInfo.BillingInvoice(sub);
}

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

@ -193,9 +193,9 @@ namespace Bit.Core.Services
throw new GatewayException("Subscription was not found.");
}
if(sub.CanceledAt.HasValue || sub.Status == "cancelled")
if(sub.CanceledAt.HasValue || sub.Status == "canceled" || sub.Status == "unpaid")
{
// Already cancelled
// Already canceled
return;
}