diff --git a/apps/web/src/app/billing/settings/payment-method.component.html b/apps/web/src/app/billing/settings/payment-method.component.html index 9fde6419e16..16e9d7bfcd6 100644 --- a/apps/web/src/app/billing/settings/payment-method.component.html +++ b/apps/web/src/app/billing/settings/payment-method.component.html @@ -112,6 +112,7 @@ *ngIf="showAdjustPayment" > +
{{ "paymentChargedWithUnpaidSubscription" | i18n }}
{{ "taxInformationDesc" | i18n }}
diff --git a/apps/web/src/app/billing/settings/payment-method.component.ts b/apps/web/src/app/billing/settings/payment-method.component.ts index a5509262629..5a8e598f7b8 100644 --- a/apps/web/src/app/billing/settings/payment-method.component.ts +++ b/apps/web/src/app/billing/settings/payment-method.component.ts @@ -4,9 +4,10 @@ import { ActivatedRoute, Router } from "@angular/router"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationResponse } from "@bitwarden/common/admin-console/models/response/organization.response"; import { PaymentMethodType } from "@bitwarden/common/billing/enums"; import { BillingPaymentResponse } from "@bitwarden/common/billing/models/response/billing-payment.response"; +import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response"; +import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response"; import { VerifyBankRequest } from "@bitwarden/common/models/request/verify-bank.request"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -28,9 +29,11 @@ export class PaymentMethodComponent implements OnInit { showAdjustPayment = false; showAddCredit = false; billing: BillingPaymentResponse; - org: OrganizationResponse; + org: OrganizationSubscriptionResponse; + sub: SubscriptionResponse; paymentMethodType = PaymentMethodType; organizationId: string; + isUnpaid = false; verifyBankPromise: Promise