- Your are limited to {limit}
+ You are limited to {limit}
{title.toLocaleLowerCase()} per project on the {tier} plan.
{#if $organization?.billingPlan === BillingPlan.STARTER}
- for addtional {title.toLocaleLowerCase()}.
+ for additional {title.toLocaleLowerCase()}.
{/if}
{:else if hasUsageFees}
diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index f21ea5ec6..9bfb2ef45 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -18,6 +18,7 @@ export type PaymentMethodData = {
clientSecret: string;
failed: boolean;
name: string;
+ mandateId?: string;
};
export type PaymentList = {
@@ -865,6 +866,26 @@ export class Billing {
);
}
+ async setupPaymentMandate(
+ organizationId: string,
+ paymentMethodId: string
+ ): Promise {
+ const path = `/account/payment-methods/${paymentMethodId}/setup`;
+ const params = {
+ organizationId,
+ paymentMethodId
+ };
+ const uri = new URL(this.client.config.endpoint + path);
+ return await this.client.call(
+ 'post',
+ uri,
+ {
+ 'content-type': 'application/json'
+ },
+ params
+ );
+ }
+
async listAddresses(queries: string[] = []): Promise {
const path = `/account/billing-addresses`;
const params = {
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 141b31f93..b2f00db39 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -2,7 +2,14 @@ import { page } from '$app/stores';
import { derived, get, writable } from 'svelte/store';
import { sdk } from './sdk';
import { organization, type Organization } from './organization';
-import type { InvoiceList, AddressesList, Invoice, PaymentList, PlansMap } from '$lib/sdk/billing';
+import type {
+ InvoiceList,
+ AddressesList,
+ Invoice,
+ PaymentList,
+ PlansMap,
+ PaymentMethodData
+} from '$lib/sdk/billing';
import { isCloud } from '$lib/system';
import { cachedStore } from '$lib/helpers/cache';
import { Query } from '@appwrite.io/console';
@@ -14,6 +21,7 @@ import { base } from '$app/paths';
import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/console/store';
import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte';
import { BillingPlan } from '$lib/constants';
+import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte';
import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte';
export type Tier = 'tier-0' | 'tier-1' | 'tier-2';
@@ -262,11 +270,28 @@ export function checkForMarkedForDeletion(org: Organization) {
id: 'markedForDeletion',
component: MarkedForDeletion,
show: true,
- importance: 5
+ importance: 10
});
}
}
+export const paymentMissingMandate = writable(null);
+
+export async function checkForMandate(org: Organization) {
+ const paymentId = org.paymentMethodId ?? org.backupPaymentMethodId;
+ const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentId);
+ if (paymentMethod.mandateId === null && paymentMethod.country === 'in') {
+ headerAlert.add({
+ id: 'paymentMandate',
+ component: PaymentMandate,
+ show: true,
+ importance: 8
+ });
+ activeHeaderAlert.set(headerAlert.get());
+ paymentMissingMandate.set(paymentMethod);
+ }
+}
+
export async function checkForMissingPaymentMethod() {
const orgs = await sdk.forConsole.billing.listOrganization([
Query.notEqual('billingPlan', BillingPlan.STARTER),
diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index 88fb64aa9..8d08dffdb 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -1,15 +1,15 @@
import type { Models } from '@appwrite.io/console';
import type { SvelteComponent } from 'svelte';
import { writable } from 'svelte/store';
-import Apple from '../../routes/console/project-[project]/auth/appleOAuth.svelte';
-import Auth0 from '../../routes/console/project-[project]/auth/auth0OAuth.svelte';
-import Authentik from '../../routes/console/project-[project]/auth/authentikOAuth.svelte';
-import GitLab from '../../routes/console/project-[project]/auth/gitlabOAuth.svelte';
-import Google from '../../routes/console/project-[project]/auth/googleOAuth.svelte';
-import Main from '../../routes/console/project-[project]/auth/mainOAuth.svelte';
-import Microsoft from '../../routes/console/project-[project]/auth/microsoftOAuth.svelte';
-import Oidc from '../../routes/console/project-[project]/auth/oidcOAuth.svelte';
-import Okta from '../../routes/console/project-[project]/auth/oktaOAuth.svelte';
+import Apple from '../../routes/console/project-[project]/auth/(providers)/appleOAuth.svelte';
+import Auth0 from '../../routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte';
+import Authentik from '../../routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte';
+import GitLab from '../../routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte';
+import Google from '../../routes/console/project-[project]/auth/(providers)/googleOAuth.svelte';
+import Main from '../../routes/console/project-[project]/auth/(providers)/mainOAuth.svelte';
+import Microsoft from '../../routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte';
+import Oidc from '../../routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte';
+import Okta from '../../routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte';
export type Provider = Models.AuthProvider & {
icon: string;
diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts
index fd89db004..959b46ffc 100644
--- a/src/lib/stores/stripe.ts
+++ b/src/lib/stores/stripe.ts
@@ -5,6 +5,7 @@ import { get, writable } from 'svelte/store';
import type { PaymentMethodData } from '$lib/sdk/billing';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { addNotification } from './notifications';
+import { organization } from './organization';
export const stripe = writable();
let paymentMethod: PaymentMethodData;
@@ -68,7 +69,8 @@ export async function submitStripeCard(name: string, urlRoute?: string) {
clientSecret,
confirmParams: {
return_url: `${baseUrl}${
- urlRoute ?? `organization/billing?clientSecret=${clientSecret}`
+ urlRoute ??
+ `organization-${get(organization).$id}/billing?clientSecret=${clientSecret}`
}`,
payment_method_data: {
billing_details: {
@@ -138,6 +140,45 @@ export async function confirmPayment(
}
}
+export async function confirmSetup(
+ clientSecret: string,
+ paymentMethodId: string,
+ urlRoute?: string
+) {
+ const baseUrl = 'https://cloud.appwrite.io/console/';
+
+ const { setupIntent, error } = await get(stripe).confirmCardSetup(clientSecret, {
+ payment_method: paymentMethodId,
+ return_url: `${baseUrl}${
+ urlRoute ?? `organization-${get(organization).$id}/billing?clientSecret=${clientSecret}`
+ }`
+ });
+
+ if (error) {
+ const e = new Error(error.message);
+ trackError(e, Submit.VerifyPayment);
+ addNotification({
+ message: error.message,
+ type: 'error'
+ });
+ }
+
+ if (setupIntent && setupIntent.status === 'succeeded') {
+ trackEvent(Submit.VerifyPayment);
+ addNotification({
+ message: 'Payment method verified successfully',
+ type: 'success'
+ });
+ } else {
+ const e = new Error('Something went wrong. Please try again later.');
+ trackError(e, Submit.VerifyPayment);
+ addNotification({
+ message: e.message,
+ type: 'error'
+ });
+ }
+}
+
const apperanceLight = {
variables: {
colorPrimary: '#606a7b',
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index b6148d7bd..3cb22443e 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -20,6 +20,7 @@
calculateTrialDay,
paymentExpired,
checkForMarkedForDeletion,
+ checkForMandate,
checkForMissingPaymentMethod
} from '$lib/stores/billing';
import { goto } from '$app/navigation';
@@ -262,6 +263,7 @@
await checkForUsageLimit(org);
checkForMarkedForDeletion(org);
await checkPaymentAuthorizationRequired(org);
+ await checkForMandate(org);
}
});
diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte
index a82d76a58..0216b5621 100644
--- a/src/routes/console/account/organizations/+page.svelte
+++ b/src/routes/console/account/organizations/+page.svelte
@@ -82,7 +82,7 @@
FREE
{/if}
- {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0}
+ {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.STARTER}