remove
This commit is contained in:
parent
3957a6c56a
commit
f0413bd90d
|
@ -63,20 +63,5 @@
|
||||||
{{ "paymentChargedWithUnpaidSubscription" | i18n }}
|
{{ "paymentChargedWithUnpaidSubscription" | i18n }}
|
||||||
</p>
|
</p>
|
||||||
</bit-section>
|
</bit-section>
|
||||||
<!-- Tax Information -->
|
|
||||||
<bit-section>
|
|
||||||
<h2 bitTypography="h2">{{ "taxInformation" | i18n }}</h2>
|
|
||||||
<p bitTypography="body1">{{ "taxInformationDesc" | i18n }}</p>
|
|
||||||
<app-tax-info></app-tax-info>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
bitButton
|
|
||||||
bitFormButton
|
|
||||||
buttonType="primary"
|
|
||||||
[bitAction]="updateTaxInformation"
|
|
||||||
>
|
|
||||||
{{ "save" | i18n }}
|
|
||||||
</button>
|
|
||||||
</bit-section>
|
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</bit-container>
|
</bit-container>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { Location } from "@angular/common";
|
import { Location } from "@angular/common";
|
||||||
import { Component, OnDestroy, ViewChild } from "@angular/core";
|
import { Component, OnDestroy } from "@angular/core";
|
||||||
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
|
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
|
||||||
import { ActivatedRoute, Router } from "@angular/router";
|
import { ActivatedRoute, Router } from "@angular/router";
|
||||||
import { from, lastValueFrom, switchMap } from "rxjs";
|
import { from, lastValueFrom, switchMap } from "rxjs";
|
||||||
|
@ -9,7 +9,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
|
||||||
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
||||||
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
|
import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
|
||||||
import { PaymentMethodType } from "@bitwarden/common/billing/enums";
|
import { PaymentMethodType } from "@bitwarden/common/billing/enums";
|
||||||
import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
|
|
||||||
import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
|
import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
|
||||||
import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
|
import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
|
||||||
import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
|
import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
|
||||||
|
@ -20,7 +19,6 @@ import { DialogService, ToastService } from "@bitwarden/components";
|
||||||
|
|
||||||
import { FreeTrial } from "../../../core/types/free-trial";
|
import { FreeTrial } from "../../../core/types/free-trial";
|
||||||
import { TrialFlowService } from "../../services/trial-flow.service";
|
import { TrialFlowService } from "../../services/trial-flow.service";
|
||||||
import { TaxInfoComponent } from "../../shared";
|
|
||||||
import {
|
import {
|
||||||
AddCreditDialogResult,
|
AddCreditDialogResult,
|
||||||
openAddCreditDialog,
|
openAddCreditDialog,
|
||||||
|
@ -34,8 +32,6 @@ import {
|
||||||
templateUrl: "./organization-payment-method.component.html",
|
templateUrl: "./organization-payment-method.component.html",
|
||||||
})
|
})
|
||||||
export class OrganizationPaymentMethodComponent implements OnDestroy {
|
export class OrganizationPaymentMethodComponent implements OnDestroy {
|
||||||
@ViewChild(TaxInfoComponent) taxInfoComponent: TaxInfoComponent;
|
|
||||||
|
|
||||||
organizationId: string;
|
organizationId: string;
|
||||||
isUnpaid = false;
|
isUnpaid = false;
|
||||||
accountCredit: number;
|
accountCredit: number;
|
||||||
|
@ -181,32 +177,6 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
protected updateTaxInformation = async (): Promise<void> => {
|
|
||||||
this.taxInfoComponent.taxFormGroup.updateValueAndValidity();
|
|
||||||
this.taxInfoComponent.taxFormGroup.markAllAsTouched();
|
|
||||||
|
|
||||||
if (this.taxInfoComponent.taxFormGroup.invalid) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const request = new ExpandedTaxInfoUpdateRequest();
|
|
||||||
request.country = this.taxInfoComponent.country;
|
|
||||||
request.postalCode = this.taxInfoComponent.postalCode;
|
|
||||||
request.taxId = this.taxInfoComponent.taxId;
|
|
||||||
request.line1 = this.taxInfoComponent.line1;
|
|
||||||
request.line2 = this.taxInfoComponent.line2;
|
|
||||||
request.city = this.taxInfoComponent.city;
|
|
||||||
request.state = this.taxInfoComponent.state;
|
|
||||||
|
|
||||||
await this.billingApiService.updateOrganizationTaxInformation(this.organizationId, request);
|
|
||||||
|
|
||||||
this.toastService.showToast({
|
|
||||||
variant: "success",
|
|
||||||
title: null,
|
|
||||||
message: this.i18nService.t("taxInfoUpdated"),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
protected verifyBankAccount = async (request: VerifyBankAccountRequest): Promise<void> => {
|
protected verifyBankAccount = async (request: VerifyBankAccountRequest): Promise<void> => {
|
||||||
await this.billingApiService.verifyOrganizationBankAccount(this.organizationId, request);
|
await this.billingApiService.verifyOrganizationBankAccount(this.organizationId, request);
|
||||||
this.toastService.showToast({
|
this.toastService.showToast({
|
||||||
|
|
Loading…
Reference in New Issue