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

proration adjustments for next bill amount

Browse Source
This commit is contained in:
Kyle Spearrin 2017-07-29 16:59:18 -04:00
parent 89bb0a05e9
commit d6d9ceab87
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,11 @@ namespace Bit.Core.Models.Business
public BillingInvoice(Subscription sub) public BillingInvoice(Subscription sub)
{ {
Amount = sub.NextBillAmount.GetValueOrDefault(); Amount = sub.NextBillAmount.GetValueOrDefault() + sub.Balance.GetValueOrDefault();
if(Amount < 0)
{
Amount = 0;
}
Date = sub.NextBillingDate; Date = sub.NextBillingDate;
} }

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

@ -40,7 +40,8 @@ namespace Bit.Core.Services
AddOns = new AddOnsRequest(), AddOns = new AddOnsRequest(),
Options = new SubscriptionOptionsRequest Options = new SubscriptionOptionsRequest
{ {
ProrateCharges = true ProrateCharges = true,
RevertSubscriptionOnProrationFailure = true
} }
}; };
@ -64,7 +65,8 @@ namespace Bit.Core.Services
new UpdateAddOnRequest new UpdateAddOnRequest
{ {
ExistingId = storageItem.Id, ExistingId = storageItem.Id,
Quantity = additionalStorage Quantity = additionalStorage,
NeverExpires = true
} }
}; };
} }