-
{getInitials($user.name)}
+ {getInitials($user.name || $user.email)}
{previousQuestion}
@@ -230,7 +230,7 @@
-
- {$user.name}
+ {$user.name || 'User'}
diff --git a/src/routes/(console)/account/organizations/+page.ts b/src/routes/(console)/account/organizations/+page.ts
index cafa665eb8..159e2a6e2e 100644
--- a/src/routes/(console)/account/organizations/+page.ts
+++ b/src/routes/(console)/account/organizations/+page.ts
@@ -3,19 +3,22 @@ import { sdk } from '$lib/stores/sdk';
import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
import { CARD_LIMIT } from '$lib/constants';
import type { PageLoad } from './$types';
+import { isCloud } from '$lib/system';
export const load: PageLoad = async ({ url, route }) => {
const page = getPage(url);
const limit = getLimit('console', url, route, CARD_LIMIT);
const offset = pageToOffset(page, limit);
+ const queries = [Query.offset(offset), Query.limit(limit), Query.orderDesc('')];
+
+ const organizations = !isCloud
+ ? await sdk.forConsole.teams.list(queries)
+ : await sdk.forConsole.billing.listOrganization(queries);
+
return {
offset,
limit,
- organizations: await sdk.forConsole.teams.list([
- Query.offset(offset),
- Query.limit(limit),
- Query.orderDesc('')
- ])
+ organizations
};
};
diff --git a/src/routes/(console)/account/updateName.svelte b/src/routes/(console)/account/updateName.svelte
index 72c521e6c7..06b42fcf9d 100644
--- a/src/routes/(console)/account/updateName.svelte
+++ b/src/routes/(console)/account/updateName.svelte
@@ -12,7 +12,7 @@
let name: string = null;
onMount(async () => {
- name ??= $user.name;
+ name ??= $user.name ?? '';
});
async function updateName() {
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index 95af6175f5..55c0045dc7 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -3,11 +3,7 @@
import { base } from '$app/paths';
import { page } from '$app/stores';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
- import {
- CreditsApplied,
- EstimatedTotalBox,
- SelectPaymentMethod
- } from '$lib/components/billing';
+ import { CreditsApplied, EstimatedTotal, SelectPaymentMethod } from '$lib/components/billing';
import { BillingPlan, Dependencies } from '$lib/constants';
import { Button, Form, FormList, InputSelect, InputTags, InputText } from '$lib/elements/forms';
import { toLocaleDate } from '$lib/helpers/date';
@@ -16,14 +12,21 @@
WizardSecondaryContent,
WizardSecondaryFooter
} from '$lib/layout';
- import { type PaymentList } from '$lib/sdk/billing';
+ import { type PaymentList, type Plan } from '$lib/sdk/billing';
import { app } from '$lib/stores/app';
+ import { isOrganization } from '$lib/stores/billing.js';
import { addNotification } from '$lib/stores/notifications';
- import { organizationList, type Organization } from '$lib/stores/organization';
+ import {
+ organizationList,
+ type Organization,
+ type OrganizationError
+ } from '$lib/stores/organization';
import { sdk } from '$lib/stores/sdk';
+ import { confirmPayment } from '$lib/stores/stripe.js';
import { ID } from '@appwrite.io/console';
import { onMount } from 'svelte';
import { writable } from 'svelte/store';
+ import { getCampaignImageUrl } from '$routes/(public)/card/helpers';
export let data;
@@ -69,6 +72,12 @@
let couponData = data?.couponData;
let campaign = data?.campaign;
let billingPlan = BillingPlan.PRO;
+ let currentPlan: Plan;
+
+ function isUpgrade() {
+ const newPlan = $page.data.plansInfo.get(billingPlan);
+ return currentPlan && newPlan && currentPlan.order < newPlan.order;
+ }
onMount(async () => {
await loadPaymentMethods();
@@ -82,6 +91,20 @@
if (campaign?.plan) {
billingPlan = campaign.plan;
}
+
+ if ($page.url.searchParams.has('type')) {
+ const type = $page.url.searchParams.get('type');
+ if (type === 'payment_confirmed') {
+ const organizationId = $page.url.searchParams.get('id');
+ collaborators = $page.url.searchParams.get('invites').split(',');
+
+ await sdk.forConsole.billing.validateOrganization(organizationId, collaborators);
+ }
+ }
+
+ if (!selectedOrgId && $organizationList?.total) {
+ selectedOrgId = $organizationList.teams[0].$id;
+ }
});
async function loadPaymentMethods() {
@@ -96,24 +119,33 @@
async function handleSubmit() {
if (!couponForm.checkValidity()) return;
+ isSubmitting.set(true);
try {
- let org: Organization;
+ let org: Organization | OrganizationError;
// Create new org
if (selectedOrgId === newOrgId) {
org = await sdk.forConsole.billing.createOrganization(
newOrgId,
name,
billingPlan,
- paymentMethodId
+ paymentMethodId,
+ null,
+ couponData.code ? couponData.code : null,
+ collaborators,
+ billingBudget,
+ taxId
);
}
+
// Upgrade existing org
- else if (selectedOrg?.billingPlan !== billingPlan) {
+ else if (selectedOrg?.billingPlan !== billingPlan && isUpgrade()) {
org = await sdk.forConsole.billing.updatePlan(
selectedOrg.$id,
billingPlan,
paymentMethodId,
- null
+ null,
+ couponData.code ? couponData.code : null,
+ collaborators
);
}
// Existing pro org
@@ -121,51 +153,47 @@
org = selectedOrg;
}
- // Add coupon
- if (couponData?.code) {
- await sdk.forConsole.billing.addCredit(org.$id, couponData.code);
- }
-
- // Add budget
- if (billingBudget) {
- await sdk.forConsole.billing.updateBudget(org.$id, billingBudget, [75]);
+ if (!isOrganization(org) && org.status === 402) {
+ let clientSecret = org.clientSecret;
+ let params = new URLSearchParams();
+ params.append('type', 'payment_confirmed');
+ params.append('org', org.teamId);
+ for (const [key, value] of $page.url.searchParams.entries()) {
+ if (key !== 'type' && key !== 'id') {
+ params.append(key, value);
+ }
+ }
+ params.append('invites', collaborators.join(','));
+ await confirmPayment(
+ '',
+ clientSecret,
+ paymentMethodId,
+ '/console/apply-credit?' + params.toString()
+ );
+ org = await sdk.forConsole.billing.validateOrganization(org.teamId, collaborators);
}
- // Add collaborators
- if (collaborators?.length) {
- collaborators.forEach(async (collaborator) => {
- await sdk.forConsole.teams.createMembership(
- org.$id,
- ['owner'],
- collaborator,
- undefined,
- undefined,
- `${$page.url.origin}${base}/invite`
- );
+ if (isOrganization(org)) {
+ trackEvent(Submit.CreditRedeem, {
+ coupon: couponData.code,
+ campaign: couponData?.campaign
});
+ await invalidate(Dependencies.ORGANIZATION);
+ await goto(`${base}/organization-${org.$id}`);
+ addNotification({
+ type: 'success',
+ message: 'Credits applied successfully'
+ });
+ await invalidate(Dependencies.ACCOUNT);
}
-
- // Add tax ID
- if (taxId) {
- await sdk.forConsole.billing.updateTaxId(org.$id, taxId);
- }
- trackEvent(Submit.CreditRedeem, {
- coupon: couponData.code,
- campaign: couponData?.campaign
- });
- await invalidate(Dependencies.ORGANIZATION);
- await goto(`${base}/organization-${org.$id}`);
- addNotification({
- type: 'success',
- message: 'Credits applied successfully'
- });
- await invalidate(Dependencies.ACCOUNT);
} catch (e) {
trackError(e, Submit.CreditRedeem);
addNotification({
type: 'error',
message: e.message
});
+ } finally {
+ isSubmitting.set(false);
}
}
@@ -194,6 +222,14 @@
selectedOrg?.billingPlan === BillingPlan.SCALE
? BillingPlan.SCALE
: (campaign?.plan ?? BillingPlan.PRO);
+
+ $: {
+ if (selectedOrgId) {
+ (async () => {
+ currentPlan = await sdk.forConsole.billing.getOrganizationPlan(selectedOrgId);
+ })();
+ }
+ }
@@ -214,7 +250,7 @@
placeholder="Select organization"
id="organization" />
{/if}
- {#if selectedOrgId && (selectedOrg?.billingPlan !== BillingPlan.PRO || !selectedOrg?.paymentMethodId)}
+ {#if selectedOrgId && (selectedOrg?.billingPlan === BillingPlan.FREE || !selectedOrg?.paymentMethodId)}
{#if selectedOrgId === newOrgId}
{runtimeDetail.name}
- {#if runtimeDetail.name.toLowerCase() === 'deno'}
- New
- {/if}
+
+
+
diff --git a/src/routes/(console)/account/deleteAccount.svelte b/src/routes/(console)/account/deleteAccount.svelte
index 168d289e4d..863839c663 100644
--- a/src/routes/(console)/account/deleteAccount.svelte
+++ b/src/routes/(console)/account/deleteAccount.svelte
@@ -18,10 +18,10 @@
@@ -290,12 +326,12 @@ {:else if selectedOrgId}
-
+ {couponData}>
{#if campaign?.template === 'review' && (campaign?.cta || campaign?.claimed || campaign?.unclaimed)}
{/if}
-
+
{/if}
@@ -330,7 +366,7 @@
{#if selectedOrgId === newOrgId}
Create Organization
{:else}
- Apply Credits
+ Apply credits
{/if}
diff --git a/src/routes/(console)/apply-credit/+page.ts b/src/routes/(console)/apply-credit/+page.ts
index 138e59ee3a..362a3adff7 100644
--- a/src/routes/(console)/apply-credit/+page.ts
+++ b/src/routes/(console)/apply-credit/+page.ts
@@ -3,16 +3,15 @@ import type { Coupon } from '$lib/sdk/billing.js';
import type { Campaign } from '$lib/stores/campaigns.js';
import { sdk } from '$lib/stores/sdk.js';
import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-export const load: PageLoad = async ({ url }) => {
+export const load = async ({ url }) => {
// Has promo code
if (url.searchParams.has('code')) {
let couponData: Coupon;
let campaign: Campaign;
const code = url.searchParams.get('code');
try {
- couponData = await sdk.forConsole.billing.getCoupon(code);
+ couponData = await sdk.forConsole.billing.getCouponAccount(code);
if (couponData.campaign) {
campaign = await sdk.forConsole.billing.getCampaign(couponData.campaign);
}
diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
index 63cc1f2100..a9a92035ee 100644
--- a/src/routes/(console)/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -3,12 +3,8 @@
import { base } from '$app/paths';
import { page } from '$app/stores';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
- import {
- EstimatedTotalBox,
- PlanComparisonBox,
- PlanSelection,
- SelectPaymentMethod
- } from '$lib/components/billing';
+ import { PlanComparisonBox, SelectPaymentMethod, SelectPlan } from '$lib/components/billing';
+ import EstimatedTotal from '$lib/components/billing/estimatedTotal.svelte';
import ValidateCreditModal from '$lib/components/billing/validateCreditModal.svelte';
import Default from '$lib/components/roles/default.svelte';
import { BillingPlan, Dependencies } from '$lib/constants';
@@ -19,10 +15,15 @@
WizardSecondaryFooter
} from '$lib/layout';
import type { Coupon, PaymentList } from '$lib/sdk/billing';
- import { tierToPlan } from '$lib/stores/billing';
+ import { isOrganization, tierToPlan } from '$lib/stores/billing';
import { addNotification } from '$lib/stores/notifications';
- import { organizationList, type Organization } from '$lib/stores/organization';
+ import {
+ organizationList,
+ type OrganizationError,
+ type Organization
+ } from '$lib/stores/organization';
import { sdk } from '$lib/stores/sdk';
+ import { confirmPayment } from '$lib/stores/stripe';
import { ID } from '@appwrite.io/console';
import { onMount } from 'svelte';
import { writable } from 'svelte/store';
@@ -60,7 +61,7 @@
if ($page.url.searchParams.has('coupon')) {
const coupon = $page.url.searchParams.get('coupon');
try {
- const response = await sdk.forConsole.billing.getCoupon(coupon);
+ const response = await sdk.forConsole.billing.getCouponAccount(coupon);
couponData = response;
} catch (e) {
couponData = {
@@ -86,6 +87,14 @@
) {
billingPlan = BillingPlan.PRO;
}
+ if ($page.url.searchParams.has('type')) {
+ const type = $page.url.searchParams.get('type');
+ if (type === 'payment_confirmed') {
+ const organizationId = $page.url.searchParams.get('id');
+ const invites = $page.url.searchParams.get('invites').split(',');
+ await validate(organizationId, invites);
+ }
+ }
});
async function loadPaymentMethods() {
@@ -93,9 +102,29 @@
paymentMethodId = methods.paymentMethods.find((method) => !!method?.last4)?.$id ?? null;
}
+ async function validate(organizationId: string, invites: string[]) {
+ try {
+ const org = await sdk.forConsole.billing.validateOrganization(organizationId, invites);
+ if (isOrganization(org)) {
+ await preloadData(`${base}/console/organization-${org.$id}`);
+ await goto(`${base}/console/organization-${org.$id}`);
+ addNotification({
+ type: 'success',
+ message: `${org.name ?? 'Organization'} has been created`
+ });
+ }
+ } catch (e) {
+ addNotification({
+ type: 'error',
+ message: e.message
+ });
+ trackError(e, Submit.OrganizationCreate);
+ }
+ }
+
async function create() {
try {
- let org: Organization;
+ let org: Organization | OrganizationError;
if (billingPlan === BillingPlan.FREE) {
org = await sdk.forConsole.billing.createOrganization(
@@ -111,53 +140,49 @@
name,
billingPlan,
paymentMethodId,
- null
+ null,
+ couponData.code ? couponData.code : null,
+ collaborators,
+ billingBudget,
+ taxId
);
- //Add budget
- if (billingBudget) {
- await sdk.forConsole.billing.updateBudget(org.$id, billingBudget, [75]);
- }
-
- //Add coupon
- if (couponData?.code) {
- await sdk.forConsole.billing.addCredit(org.$id, couponData.code);
- trackEvent(Submit.CreditRedeem);
- }
-
- //Add collaborators
- if (collaborators?.length) {
- collaborators.forEach(async (collaborator) => {
- await sdk.forConsole.teams.createMembership(
- org.$id,
- ['developer'],
- collaborator,
- undefined,
- undefined,
- `${$page.url.origin}${base}/invite`
- );
- });
- }
-
- // Add tax ID
- if (taxId) {
- await sdk.forConsole.billing.updateTaxId(org.$id, taxId);
+ if (!isOrganization(org) && org.status === 402) {
+ let clientSecret = org.clientSecret;
+ let params = new URLSearchParams();
+ params.append('type', 'payment_confirmed');
+ params.append('id', org.teamId);
+ for (const [key, value] of $page.url.searchParams.entries()) {
+ if (key !== 'type' && key !== 'id') {
+ params.append(key, value);
+ }
+ }
+ params.append('invites', collaborators.join(','));
+ await confirmPayment(
+ '',
+ clientSecret,
+ paymentMethodId,
+ '/console/create-organization?' + params.toString()
+ );
+ await validate(org.teamId, collaborators);
}
}
trackEvent(Submit.OrganizationCreate, {
plan: tierToPlan(billingPlan)?.name,
- budget_cap_enabled: !!billingBudget,
+ budget_cap_enabled: billingBudget !== null,
members_invited: collaborators?.length
});
- await invalidate(Dependencies.ACCOUNT);
- await preloadData(`${base}/organization-${org.$id}`);
- await goto(`${base}/organization-${org.$id}`);
- addNotification({
- type: 'success',
- message: `${name ?? 'Organization'} has been created`
- });
+ if (isOrganization(org)) {
+ await invalidate(Dependencies.ACCOUNT);
+ await preloadData(`${base}/organization-${org.$id}`);
+ await goto(`${base}/organization-${org.$id}`);
+ addNotification({
+ type: 'success',
+ message: `${org.name ?? 'Organization'} has been created`
+ });
+ }
} catch (e) {
addNotification({
type: 'error',
@@ -193,7 +218,7 @@
For more details on our plans, visit our
.
- {campaign?.cta}
@@ -308,7 +344,7 @@