[PM-31780] Add exempt from billing automation toggle (#7438)

* feat(admin): add exempt from billing automation toggle for organizations

* style: apply file-scoped namespaces to EF migration files

* chore: rename migration to avoid sequence collision with 2026-04-10_00

* fix(sql): refresh Organization-dependent views after column addition

* fix(sql): rename migration to resolve ordering conflict

Author: amorask-bitwarden

src/Admin/AdminConsole/Controllers/OrganizationsController.cs

@@ -591,6 +591,7 @@ private void UpdateOrganization(Organization organization, OrganizationEditModel
             organization.Gateway = model.Gateway;
             organization.GatewayCustomerId = model.GatewayCustomerId;
             organization.GatewaySubscriptionId = model.GatewaySubscriptionId;
+            organization.ExemptFromBillingAutomation = model.ExemptFromBillingAutomation;
         }
     }
 

src/Admin/AdminConsole/Models/OrganizationEditModel.cs

@@ -110,6 +110,7 @@ public OrganizationEditModel(
         UseDisableSmAdsForUsers = org.UseDisableSmAdsForUsers;
         UsePhishingBlocker = org.UsePhishingBlocker;
         UseMyItems = org.UseMyItems;
+        ExemptFromBillingAutomation = org.ExemptFromBillingAutomation;
 
         _plans = plans;
     }
@@ -205,6 +206,8 @@ public OrganizationEditModel(
     public bool UseAutomaticUserConfirmation { get; set; }
     [Display(Name = "Create My Items for organization ownership")]
     public bool UseMyItems { get; set; }
+    [Display(Name = "Exempt From Billing Automation")]
+    public bool ExemptFromBillingAutomation { get; set; }
     /**
      * Creates a Plan[] object for use in Javascript
      * This is mapped manually below to provide some type safety in case the plan objects change
@@ -340,6 +343,7 @@ public Organization ToOrganization(Organization existingOrganization)
         existingOrganization.UseDisableSmAdsForUsers = UseDisableSmAdsForUsers;
         existingOrganization.UsePhishingBlocker = UsePhishingBlocker;
         existingOrganization.UseMyItems = UseMyItems;
+        existingOrganization.ExemptFromBillingAutomation = ExemptFromBillingAutomation;
         return existingOrganization;
     }
 

src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml

@@ -338,5 +338,13 @@
                 </div>
             </div>
         </div>
+        <div class="row">
+            <div class="col-sm">
+                <div class="form-check mb-3">
+                    <input type="checkbox" class="form-check-input" asp-for="ExemptFromBillingAutomation" disabled="@(!canEditBilling)">
+                    <label class="form-check-label" asp-for="ExemptFromBillingAutomation"></label>
+                </div>
+            </div>
+        </div>
     }
 </form>

src/Core/AdminConsole/Entities/Organization.cs

@@ -150,6 +150,12 @@ public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable
     /// </summary>
     public bool UseMyItems { get; set; }
 
+    /// <summary>
+    /// When set to <see langword="true"/>, the organization is excluded from automated billing
+    /// lifecycle operations such as subscription cancellation and disabling for non-payment.
+    /// </summary>
+    public bool ExemptFromBillingAutomation { get; set; }
+
     public void SetNewId()
     {
         if (Id == default(Guid))

src/Sql/dbo/Stored Procedures/Organization_Create.sql

@@ -62,7 +62,8 @@ CREATE PROCEDURE [dbo].[Organization_Create]
     @UseAutomaticUserConfirmation BIT = 0,
     @UsePhishingBlocker BIT = 0,
     @UseDisableSmAdsForUsers BIT = 0,
-    @UseMyItems BIT = 0
+    @UseMyItems BIT = 0,
+    @ExemptFromBillingAutomation BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -133,7 +134,8 @@ BEGIN
         [UsePhishingBlocker],
         [MaxStorageGbIncreased],
         [UseDisableSmAdsForUsers],
-        [UseMyItems]
+        [UseMyItems],
+        [ExemptFromBillingAutomation]
     )
     VALUES
         (
@@ -201,6 +203,7 @@ BEGIN
             @UsePhishingBlocker,
             @MaxStorageGb,
             @UseDisableSmAdsForUsers,
-            @UseMyItems
+            @UseMyItems,
+            @ExemptFromBillingAutomation
         );
 END

src/Sql/dbo/Stored Procedures/Organization_Update.sql

@@ -62,7 +62,8 @@ CREATE PROCEDURE [dbo].[Organization_Update]
     @UseAutomaticUserConfirmation BIT = 0,
     @UsePhishingBlocker BIT = 0,
     @UseDisableSmAdsForUsers BIT = 0,
-    @UseMyItems BIT = 0
+    @UseMyItems BIT = 0,
+    @ExemptFromBillingAutomation BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -133,7 +134,8 @@ BEGIN
         [UsePhishingBlocker] = @UsePhishingBlocker,
         [MaxStorageGbIncreased] = @MaxStorageGb,
         [UseDisableSmAdsForUsers] = @UseDisableSmAdsForUsers,
-        [UseMyItems] = @UseMyItems
+        [UseMyItems] = @UseMyItems,
+        [ExemptFromBillingAutomation] = @ExemptFromBillingAutomation
     WHERE
         [Id] = @Id;
 END

src/Sql/dbo/Tables/Organization.sql

@@ -64,6 +64,7 @@ CREATE TABLE [dbo].[Organization] (
     [UsePhishingBlocker]            BIT              NOT NULL CONSTRAINT [DF_Organization_UsePhishingBlocker] DEFAULT (0),
     [UseDisableSmAdsForUsers]       BIT              NOT NULL CONSTRAINT [DF_Organization_UseDisableSmAdsForUsers] DEFAULT (0),
     [UseMyItems]                    BIT              NOT NULL CONSTRAINT [DF_Organization_UseMyItems] DEFAULT (0),
+    [ExemptFromBillingAutomation]   BIT              NOT NULL CONSTRAINT [DF_Organization_ExemptFromBillingAutomation] DEFAULT (0),
     CONSTRAINT [PK_Organization] PRIMARY KEY CLUSTERED ([Id] ASC)
 );
 

src/Sql/dbo/Views/OrganizationView.sql

@@ -64,6 +64,7 @@ SELECT
     [UseAutomaticUserConfirmation],
     [UsePhishingBlocker],
     [UseDisableSmAdsForUsers],
-    [UseMyItems]
+    [UseMyItems],
+    [ExemptFromBillingAutomation]
 FROM
     [dbo].[Organization]