From 845f9f52453807e676b05c418c8d2b3cd206d051 Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Fri, 18 Sep 2020 14:10:30 -0400 Subject: [PATCH] Fixed storage issue when upgrading from a free plan (#942) --- src/Core/Services/Implementations/OrganizationService.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index 9bff8599c3..dbf102dd56 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -253,8 +253,6 @@ namespace Bit.Core.Services organization.PlanType = newPlan.Type; organization.Seats = (short)(newPlan.BaseSeats + upgrade.AdditionalSeats); organization.MaxCollections = newPlan.MaxCollections; - organization.MaxStorageGb = !newPlan.BaseStorageGb.HasValue ? - (short?)null : (short)(newPlan.BaseStorageGb.Value + upgrade.AdditionalStorageGb); organization.UseGroups = newPlan.HasGroups; organization.UseDirectory = newPlan.HasDirectory; organization.UseEvents = newPlan.HasEvents; @@ -263,8 +261,8 @@ namespace Bit.Core.Services organization.UseApi = newPlan.HasApi; organization.SelfHost = newPlan.HasSelfHost; organization.UsePolicies = newPlan.HasPolicies; - organization.MaxStorageGb = !newPlan.MaxAdditionalStorage.HasValue ? - (short?)null : (short)(newPlan.MaxAdditionalStorage.Value + upgrade.AdditionalStorageGb); + organization.MaxStorageGb = !newPlan.BaseStorageGb.HasValue ? + (short?)null : (short)(newPlan.BaseStorageGb.Value + upgrade.AdditionalStorageGb); organization.UseGroups = newPlan.HasGroups; organization.UseDirectory = newPlan.HasDirectory; organization.UseEvents = newPlan.HasEvents;