From b2cebea7ebf409e63be4dec50643173b3cdd5cc2 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 28 Nov 2024 20:24:05 +0100 Subject: [PATCH] Fix: Various billing fixes (#3569) --- .../frontend-2/components/billing/Alert.vue | 16 +- .../components/dashboard/Sidebar.vue | 2 +- .../components/global/icon/Account.vue | 4 - .../components/global/icon/Check.vue | 16 ++ .../frontend-2/components/settings/Dialog.vue | 2 +- .../settings/workspaces/Billing.vue | 96 ++++++++-- .../billing/PricingTable/Desktop.vue | 16 +- .../billing/PricingTable/Header.vue | 82 ++++++++- .../billing/PricingTable/Mobile.vue | 18 +- .../billing/PricingTable/PricingTable.vue | 24 ++- .../components/workspace/header/Header.vue | 4 +- .../lib/billing/composables/actions.ts | 72 +++++++- .../lib/billing/graphql/mutations.ts | 14 +- .../lib/common/generated/gql/gql.ts | 17 +- .../lib/common/generated/gql/graphql.ts | 47 +++-- .../gatekeeper/typedefs/gatekeeper.graphql | 3 +- .../modules/core/graph/generated/graphql.ts | 3 +- .../graph/generated/graphql.ts | 3 +- .../modules/gatekeeper/clients/stripe.ts | 2 +- .../gatekeeper/graph/resolvers/index.ts | 15 +- .../gatekeeper/services/subscriptions.ts | 68 ++++++- .../tests/unit/subscriptions.spec.ts | 173 ++++++++++++++++-- .../server/test/graphql/generated/graphql.ts | 3 +- 23 files changed, 575 insertions(+), 125 deletions(-) create mode 100644 packages/frontend-2/components/global/icon/Check.vue diff --git a/packages/frontend-2/components/billing/Alert.vue b/packages/frontend-2/components/billing/Alert.vue index 4dd04815c..9cefc98aa 100644 --- a/packages/frontend-2/components/billing/Alert.vue +++ b/packages/frontend-2/components/billing/Alert.vue @@ -23,6 +23,7 @@ diff --git a/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Desktop.vue b/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Desktop.vue index 061d3a796..28676104c 100644 --- a/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Desktop.vue +++ b/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Desktop.vue @@ -16,13 +16,7 @@ ]" scope="col" > - + @@ -51,9 +45,9 @@ ]" >
-
@@ -63,11 +57,10 @@ diff --git a/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Mobile.vue b/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Mobile.vue index 9a7b46da8..422c1accc 100644 --- a/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Mobile.vue +++ b/packages/frontend-2/components/settings/workspaces/billing/PricingTable/Mobile.vue @@ -5,13 +5,7 @@ :key="`mobile-${plan.name}`" class="border border-outline-3 bg-foundation rounded-lg p-4 pb-2" > - +
  • {{ feature.name }} - +
@@ -30,10 +25,10 @@ diff --git a/packages/frontend-2/components/workspace/header/Header.vue b/packages/frontend-2/components/workspace/header/Header.vue index b42df6363..62c0b5721 100644 --- a/packages/frontend-2/components/workspace/header/Header.vue +++ b/packages/frontend-2/components/workspace/header/Header.vue @@ -1,9 +1,9 @@