Browse Source

fix cancelled typo in areas

pull/327/head
Kyle Spearrin 8 years ago
parent
commit
0d4ac29bc7
  1. 2
      src/Core/Models/Business/BillingInfo.cs
  2. 4
      src/Core/Services/Implementations/BraintreePaymentService.cs
  3. 4
      src/Core/Services/Implementations/StripePaymentService.cs

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

@ -99,7 +99,7 @@ namespace Bit.Core.Models.Business @@ -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

@ -164,8 +164,8 @@ namespace Bit.Core.Services @@ -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

@ -193,9 +193,9 @@ namespace Bit.Core.Services @@ -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;
}

Loading…
Cancel
Save