[AC-1599] Fix Secrets Manager cost subtotal when creating an organization (#6044)

* Fix service account cost not included in SM subtotal

* Simplify logic

apps/web/src/app/billing/settings/organization-plans.component.ts

@@ -314,16 +314,11 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       return 0;
     }
 
-    let subTotal = plan.basePrice;
-    if (plan.hasAdditionalSeatsOption && formValues.userSeats) {
-      subTotal += this.seatTotal(plan, formValues.userSeats);
-    }
-
-    if (plan.hasAdditionalStorageOption && formValues.additionalServiceAccounts) {
-      subTotal += this.additionalServiceAccountTotal(this.selectedPlan);
-    }
-
-    return subTotal;
+    return (
+      plan.basePrice +
+      this.seatTotal(plan, formValues.userSeats) +
+      this.additionalServiceAccountTotal(plan)
+    );
   }
 
   get freeTrial() {