From 7efb17f053c2753b5a1f55a9d1a7ce5294372550 Mon Sep 17 00:00:00 2001 From: Shane Melton Date: Thu, 27 Oct 2022 13:50:28 -0700 Subject: [PATCH] [EC-646] Move missing billing components Some billing components were in the org settings module and needed to be moved the org billing module (cherry picked from commit 1c11695f4621a38a7429f0005e2a0ce81d3bb130) --- .../adjust-subscription.component.html | 0 .../adjust-subscription.component.ts | 0 .../{settings => billing}/change-plan.component.html | 0 .../{settings => billing}/change-plan.component.ts | 0 .../download-license.component.html | 0 .../{settings => billing}/download-license.component.ts | 0 .../organizations/billing/organization-billing.module.ts | 9 +++++++-- .../settings/organization-settings.module.ts | 6 ------ 8 files changed, 7 insertions(+), 8 deletions(-) rename apps/web/src/app/organizations/{settings => billing}/adjust-subscription.component.html (100%) rename apps/web/src/app/organizations/{settings => billing}/adjust-subscription.component.ts (100%) rename apps/web/src/app/organizations/{settings => billing}/change-plan.component.html (100%) rename apps/web/src/app/organizations/{settings => billing}/change-plan.component.ts (100%) rename apps/web/src/app/organizations/{settings => billing}/download-license.component.html (100%) rename apps/web/src/app/organizations/{settings => billing}/download-license.component.ts (100%) diff --git a/apps/web/src/app/organizations/settings/adjust-subscription.component.html b/apps/web/src/app/organizations/billing/adjust-subscription.component.html similarity index 100% rename from apps/web/src/app/organizations/settings/adjust-subscription.component.html rename to apps/web/src/app/organizations/billing/adjust-subscription.component.html diff --git a/apps/web/src/app/organizations/settings/adjust-subscription.component.ts b/apps/web/src/app/organizations/billing/adjust-subscription.component.ts similarity index 100% rename from apps/web/src/app/organizations/settings/adjust-subscription.component.ts rename to apps/web/src/app/organizations/billing/adjust-subscription.component.ts diff --git a/apps/web/src/app/organizations/settings/change-plan.component.html b/apps/web/src/app/organizations/billing/change-plan.component.html similarity index 100% rename from apps/web/src/app/organizations/settings/change-plan.component.html rename to apps/web/src/app/organizations/billing/change-plan.component.html diff --git a/apps/web/src/app/organizations/settings/change-plan.component.ts b/apps/web/src/app/organizations/billing/change-plan.component.ts similarity index 100% rename from apps/web/src/app/organizations/settings/change-plan.component.ts rename to apps/web/src/app/organizations/billing/change-plan.component.ts diff --git a/apps/web/src/app/organizations/settings/download-license.component.html b/apps/web/src/app/organizations/billing/download-license.component.html similarity index 100% rename from apps/web/src/app/organizations/settings/download-license.component.html rename to apps/web/src/app/organizations/billing/download-license.component.html diff --git a/apps/web/src/app/organizations/settings/download-license.component.ts b/apps/web/src/app/organizations/billing/download-license.component.ts similarity index 100% rename from apps/web/src/app/organizations/settings/download-license.component.ts rename to apps/web/src/app/organizations/billing/download-license.component.ts diff --git a/apps/web/src/app/organizations/billing/organization-billing.module.ts b/apps/web/src/app/organizations/billing/organization-billing.module.ts index 7e2dcf534e92..513b7ba766fd 100644 --- a/apps/web/src/app/organizations/billing/organization-billing.module.ts +++ b/apps/web/src/app/organizations/billing/organization-billing.module.ts @@ -1,9 +1,11 @@ import { NgModule } from "@angular/core"; -import { LooseComponentsModule } from "../../shared/loose-components.module"; -import { SharedModule } from "../../shared/shared.module"; +import { LooseComponentsModule, SharedModule } from "../../shared"; +import { AdjustSubscription } from "./adjust-subscription.component"; import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component"; +import { ChangePlanComponent } from "./change-plan.component"; +import { DownloadLicenseComponent } from "./download-license.component"; import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component"; import { OrganizationBillingRoutingModule } from "./organization-billing-routing.module"; import { OrganizationBillingTabComponent } from "./organization-billing-tab.component"; @@ -12,7 +14,10 @@ import { OrganizationSubscriptionComponent } from "./organization-subscription.c @NgModule({ imports: [SharedModule, LooseComponentsModule, OrganizationBillingRoutingModule], declarations: [ + AdjustSubscription, BillingSyncApiKeyComponent, + ChangePlanComponent, + DownloadLicenseComponent, OrganizationBillingTabComponent, OrganizationSubscriptionComponent, OrgBillingHistoryViewComponent, diff --git a/apps/web/src/app/organizations/settings/organization-settings.module.ts b/apps/web/src/app/organizations/settings/organization-settings.module.ts index f121bfbc7aa5..1c5b72552c44 100644 --- a/apps/web/src/app/organizations/settings/organization-settings.module.ts +++ b/apps/web/src/app/organizations/settings/organization-settings.module.ts @@ -4,10 +4,7 @@ import { LooseComponentsModule, SharedModule } from "../../shared"; import { PoliciesModule } from "../policies"; import { AccountComponent } from "./account.component"; -import { AdjustSubscription } from "./adjust-subscription.component"; -import { ChangePlanComponent } from "./change-plan.component"; import { DeleteOrganizationComponent } from "./delete-organization.component"; -import { DownloadLicenseComponent } from "./download-license.component"; import { OrganizationSettingsRoutingModule } from "./organization-settings-routing.module"; import { SettingsComponent } from "./settings.component"; import { TwoFactorSetupComponent } from "./two-factor-setup.component"; @@ -17,10 +14,7 @@ import { TwoFactorSetupComponent } from "./two-factor-setup.component"; declarations: [ SettingsComponent, AccountComponent, - AdjustSubscription, - ChangePlanComponent, DeleteOrganizationComponent, - DownloadLicenseComponent, TwoFactorSetupComponent, ], })