nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-17 11:08:16 -05:00
Code

plan adjustments (#890)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-08-25 14:23:36 -04:00 committed by GitHub
parent 2fb18d8cf2
commit 2cd6d4f61a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1557,8 +1557,11 @@ namespace Bit.Core.Services
public async Task<TaxInfo> GetTaxInfoAsync(ISubscriber subscriber) public async Task<TaxInfo> GetTaxInfoAsync(ISubscriber subscriber)
{ {
if (subscriber != null && !string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId)) if (subscriber == null || string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId))
{ {
return null;
}
var customerService = new CustomerService(); var customerService = new CustomerService();
var customer = await customerService.GetAsync(subscriber.GatewayCustomerId); var customer = await customerService.GetAsync(subscriber.GatewayCustomerId);
@ -1589,9 +1592,6 @@ namespace Bit.Core.Services
}; };
} }
return null;
}
public async Task SaveTaxInfoAsync(ISubscriber subscriber, TaxInfo taxInfo) public async Task SaveTaxInfoAsync(ISubscriber subscriber, TaxInfo taxInfo)
{ {
if (subscriber != null && !string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId)) if (subscriber != null && !string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId))

5
src/Core/Utilities/StaticStore.cs
View File

@ -123,9 +123,9 @@ namespace Bit.Core.Utilities
IsAnnual = true, IsAnnual = true,
NameLocalizationKey = "planNameFamilies", NameLocalizationKey = "planNameFamilies",
DescriptionLocalizationKey = "planDescFamilies", DescriptionLocalizationKey = "planDescFamilies",
BaseSeats = 6, BaseSeats = 5,
BaseStorageGb = 1, BaseStorageGb = 1,
MaxUsers = 6, MaxUsers = 5,
HasAdditionalStorageOption = true, HasAdditionalStorageOption = true,
HasPremiumAccessOption = true, HasPremiumAccessOption = true,
@ -287,6 +287,7 @@ namespace Bit.Core.Utilities
BaseStorageGb = 1, BaseStorageGb = 1,
MaxUsers = 6, MaxUsers = 6,
HasAdditionalStorageOption = true,
TrialPeriodDays = 7, TrialPeriodDays = 7,
HasSelfHost = true, HasSelfHost = true,