+ class="u-flex u-flex-vertical u-cross-center u-gap-24 u-width-full-line u-overflow-hidden u-padding-block-8"> {#if !noMedia} - {#if $$slots.alert} - + class:is-fixed-layout={$activeHeaderAlert?.show}> + {#if $activeHeaderAlert?.show} + {/if} { + const path = `/organizations`; + const params = { + queries + }; + const uri = new URL(this.client.config.endpoint + path); + return await this.client.call( + 'GET', + uri, + { + 'content-type': 'application/json' + }, + params + ); + } + async createOrganization( organizationId: string, name: string, diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 22b873828..141b31f93 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -11,9 +11,10 @@ import PaymentAuthRequired from '$lib/components/billing/alerts/paymentAuthRequi import { addNotification, notifications } from './notifications'; import { goto } from '$app/navigation'; import { base } from '$app/paths'; -import { activeHeaderAlert } from '$routes/console/store'; +import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/console/store'; import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte'; import { BillingPlan } from '$lib/constants'; +import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte'; export type Tier = 'tier-0' | 'tier-1' | 'tier-2'; @@ -265,3 +266,20 @@ export function checkForMarkedForDeletion(org: Organization) { }); } } + +export async function checkForMissingPaymentMethod() { + const orgs = await sdk.forConsole.billing.listOrganization([ + Query.notEqual('billingPlan', BillingPlan.STARTER), + Query.isNull('paymentMethodId'), + Query.isNull('backupPaymentMethodId') + ]); + if (orgs?.total) { + orgMissingPaymentMethod.set(orgs.teams[0]); + headerAlert.add({ + id: 'missingPaymentMethod', + component: MissingPaymentMethod, + show: true, + importance: 8 + }); + } +} diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 38914e5b0..2beb13b03 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -22,6 +22,11 @@ export type Organization = Models.Team> & { billingPlanDowngrade?: string; }; +export type OrganizationList = { + teams: Organization[]; + total: number; +}; + export type BillingLimits = { bandwidth: number; documents: number; diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts index 5730a4c86..fd89db004 100644 --- a/src/lib/stores/stripe.ts +++ b/src/lib/stores/stripe.ts @@ -19,7 +19,12 @@ export async function initializeStripe() { isStripeInitialized.set(true); const methods = await sdk.forConsole.billing.listPaymentMethods(); - clientSecret = methods.paymentMethods[0]?.clientSecret; + + // Get the client secret from empty payment method if available + clientSecret = methods.paymentMethods?.filter( + (method) => !!method?.clientSecret && !method?.providerMethodId + )[0]?.clientSecret; + // If there is no payment method, create an empty one and get the client secret if (!clientSecret) { paymentMethod = await sdk.forConsole.billing.createPaymentMethod(); diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index fad67ef9b..b6148d7bd 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -19,7 +19,8 @@ checkPaymentAuthorizationRequired, calculateTrialDay, paymentExpired, - checkForMarkedForDeletion + checkForMarkedForDeletion, + checkForMissingPaymentMethod } from '$lib/stores/billing'; import { goto } from '$app/navigation'; import { CommandCenter, registerCommands, registerSearchers } from '$lib/commandCenter'; @@ -236,6 +237,7 @@ if (isCloud && hasStripePublicKey) { $stripe = await loadStripe(VARS.STRIPE_PUBLIC_KEY); + await checkForMissingPaymentMethod(); } }); @@ -288,11 +290,6 @@ !$page.url.pathname.includes('/console/account') && !$page.url.pathname.includes('/console/card') && !$page.url.pathname.includes('/console/onboarding')}> - - {#if $activeHeaderAlert?.show} - - {/if} - diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts index 79eba27f3..6c201ecf3 100644 --- a/src/routes/console/organization-[organization]/+layout.ts +++ b/src/routes/console/organization-[organization]/+layout.ts @@ -20,7 +20,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { if (isCloud) { await failedInvoice.load(params.organization); - if (!get(failedInvoice)) { + if (get(failedInvoice)) { headerAlert.add({ show: true, component: ProjectsAtRisk, diff --git a/src/routes/console/organization-[organization]/createProject.svelte b/src/routes/console/organization-[organization]/createProject.svelte index 2c4391c5f..0f042d0c5 100644 --- a/src/routes/console/organization-[organization]/createProject.svelte +++ b/src/routes/console/organization-[organization]/createProject.svelte @@ -18,15 +18,18 @@ let name: string; let showCustomId = false; let error: string; + let disabled: boolean = false; async function create() { try { + disabled = true; const project = await sdk.forConsole.projects.create( id ?? ID.unique(), name, teamId, Region.Default ); + show = false; dispatch('created', project); trackEvent(Submit.ProjectCreate, { customId: !!id, @@ -40,6 +43,7 @@ } catch (e) { error = e.message; trackError(e, Submit.ProjectCreate); + disabled = false; } } @@ -61,6 +65,6 @@ (show = false)}>Cancel - Create + Create diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte index 857e64584..1be558a2d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte @@ -58,9 +58,9 @@ {:else} - + {#each [...formValues[attribute.key].keys()] as index} - + { enabled = $project.smtpEnabled ?? false; @@ -44,7 +51,7 @@ port = $project.smtpPort; username = $project.smtpUsername; password = $project.smtpPassword; - secure = $project.smtpSecure === 'tls'; + secure = $project.smtpSecure === 'tls' ? 'tls' : $project.smtpSecure === 'ssl' ? 'ssl' : ''; }); async function updateSmtp() { @@ -98,7 +105,7 @@ port: $project.smtpPort, username: $project.smtpUsername, password: $project.smtpPassword, - secure: $project.smtpSecure === 'tls' + secure: $project.smtpSecure } ); @@ -110,7 +117,7 @@ port = undefined; username = undefined; password = undefined; - secure = false; + secure = undefined; } @@ -190,10 +197,12 @@ label="Password" bind:value={password} placeholder="Enter password" /> - - - Enable if TLS is supported on your SMTP server. - + {/if} {/if} diff --git a/src/routes/console/store.ts b/src/routes/console/store.ts index 3dabf7951..662572c6f 100644 --- a/src/routes/console/store.ts +++ b/src/routes/console/store.ts @@ -1,5 +1,6 @@ import { page } from '$app/stores'; import type { HeaderAlert } from '$lib/stores/headerAlert'; +import type { Organization } from '$lib/stores/organization'; import type { Models } from '@appwrite.io/console'; import { derived, writable } from 'svelte/store'; @@ -10,3 +11,4 @@ export const consoleVariables = derived( ); export const activeHeaderAlert = writable(null); +export const orgMissingPaymentMethod = writable(null); diff --git a/static/logos/appwrite-icon.png b/static/logos/appwrite-icon.png new file mode 100644 index 000000000..cbca9e96a Binary files /dev/null and b/static/logos/appwrite-icon.png differ