Pm 11525 estimated tax shown to customers potentially incorrect

apps/web/src/app/billing/individual/premium/premium-v2.component.ts

@@ -158,7 +158,7 @@ export class PremiumV2Component {
 
   protected get estimatedTax(): number {
     return this.taxInfoComponent?.taxRate != null
-      ? (this.taxInfoComponent.taxRate / 100) * this.subtotal
+      ? this.taxInfoComponent.taxRate * this.subtotal
       : 0;
   }
 

apps/web/src/app/billing/individual/premium/premium.component.ts

@@ -153,7 +153,7 @@ export class PremiumComponent implements OnInit {
 
   get taxCharges(): number {
     return this.taxInfoComponent != null && this.taxInfoComponent.taxRate != null
-      ? (this.taxInfoComponent.taxRate / 100) * this.subtotal
+      ? this.taxInfoComponent.taxRate * this.subtotal
       : 0;
   }
 

apps/web/src/app/billing/organizations/change-plan-dialog.component.ts

@@ -562,7 +562,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
   get taxCharges() {
     return this.taxComponent != null && this.taxComponent.taxRate != null
-      ? (this.taxComponent.taxRate / 100) * this.passwordManagerSubtotal
+      ? this.taxComponent.taxRate * this.passwordManagerSubtotal
       : 0;
   }
 

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

@@ -438,8 +438,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   get taxCharges() {
     return this.taxComponent != null && this.taxComponent.taxRate != null
-      ? (this.taxComponent.taxRate / 100) *
-          (this.passwordManagerSubtotal + this.secretsManagerSubtotal)
+      ? this.taxComponent.taxRate * (this.passwordManagerSubtotal + this.secretsManagerSubtotal)
       : 0;
   }
 

libs/angular/src/services/jslib-services.module.ts

@@ -130,11 +130,13 @@
 import { AccountBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/account/account-billing-api.service.abstraction";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import { AccountBillingApiService } from "@bitwarden/common/billing/services/account/account-billing-api.service";
 import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
 import { BillingApiService } from "@bitwarden/common/billing/services/billing-api.service";
 import { OrganizationBillingApiService } from "@bitwarden/common/billing/services/organization/organization-billing-api.service";
 import { OrganizationBillingService } from "@bitwarden/common/billing/services/organization-billing.service";
+import { TaxService } from "@bitwarden/common/billing/services/tax.service";
 import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
@@ -1245,6 +1247,11 @@
     useClass: DefaultBillingAccountProfileStateService,
     deps: [StateProvider],
   }),
+  safeProvider({
+    provide: TaxServiceAbstraction,
+    useClass: TaxService,
+    deps: [],
+  }),
   safeProvider({
     provide: OrganizationManagementPreferencesService,
     useClass: DefaultOrganizationManagementPreferencesService,

libs/common/src/billing/abstractions/billing-api.service.abstraction.ts

@@ -1,8 +1,10 @@
 import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+import { CalculateTaxRequest } from "@bitwarden/common/billing/models/request/calculate-tax.request";
 import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
 import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
+import { CalculateTaxResponse } from "@bitwarden/common/billing/models/response/calculate-tax.response";
 import { InvoicesResponse } from "@bitwarden/common/billing/models/response/invoices.response";
 import { PaymentMethodResponse } from "@bitwarden/common/billing/models/response/payment-method.response";
 
@@ -15,6 +17,8 @@ import { UpdateClientOrganizationRequest } from "../models/request/update-client
 import { ProviderSubscriptionResponse } from "../models/response/provider-subscription-response";
 
 export abstract class BillingApiServiceAbstraction {
+  calculateTax: (request: CalculateTaxRequest) => Promise<CalculateTaxResponse>;
+
   cancelOrganizationSubscription: (
     organizationId: string,
     request: SubscriptionCancellationRequest,

libs/common/src/billing/abstractions/tax.service.abstraction.ts

@@ -0,0 +1,6 @@
+import { TaxableCountry } from "@bitwarden/common/billing/models/domain/taxable-country";
+
+export abstract class TaxServiceAbstraction {
+  getSelectableCountries: () => TaxableCountry[];
+  isSupportedCountry: (country: string) => boolean;
+}

libs/common/src/billing/models/domain/taxable-country.ts

@@ -0,0 +1,5 @@
+export class TaxableCountry {
+  name: string;
+  value: string;
+  disabled: boolean;
+}

libs/common/src/billing/models/request/calculate-tax.request.ts

@@ -0,0 +1,5 @@
+export class CalculateTaxRequest {
+  amount: number;
+  country: string;
+  postalCode: string;
+}

libs/common/src/billing/models/response/calculate-tax.response.ts

@@ -0,0 +1,6 @@
+export class CalculateTaxResponse {
+  salesTaxRate: number;
+  salesTaxAmount: number;
+  taxableAmount: number;
+  totalAmount: number;
+}

libs/common/src/billing/services/billing-api.service.ts

@@ -1,6 +1,8 @@
 import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
+import { CalculateTaxRequest } from "@bitwarden/common/billing/models/request/calculate-tax.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
 import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
+import { CalculateTaxResponse } from "@bitwarden/common/billing/models/response/calculate-tax.response";
 import { InvoicesResponse } from "@bitwarden/common/billing/models/response/invoices.response";
 import { PaymentMethodResponse } from "@bitwarden/common/billing/models/response/payment-method.response";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@@ -26,6 +28,10 @@
     private toastService: ToastService,
   ) {}
 
+  calculateTax(request: CalculateTaxRequest): Promise<CalculateTaxResponse> {
+    return this.apiService.send("POST", "/tax/calculate", request, true, true);
+  }
+
   cancelOrganizationSubscription(
     organizationId: string,
     request: SubscriptionCancellationRequest,