From 9cf0ebccb80ec4786662588a78610d9980d746ee Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 5 Dec 2023 14:15:18 +0100 Subject: [PATCH] more logs, copy, credit fix, trial days fix --- src/lib/stores/billing.ts | 1 - src/lib/stores/organization.ts | 1 + src/routes/console/+layout.svelte | 17 +++++++++-------- .../console/account/organizations/+page.svelte | 6 +++--- .../billing/+page.svelte | 6 ++++-- .../billing/addCreditModal.svelte | 5 +++-- .../billing/planSummary.svelte | 8 ++++---- .../organization-[organization]/header.svelte | 10 ++-------- .../cloudOrganization/confirmDetails.svelte | 2 +- .../confirmDetails.svelte | 2 +- 10 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index 163859823..a07f8de1d 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -12,7 +12,6 @@ export const paymentMethods = derived(page, ($page) => $page.data.paymentMethods export const addressList = derived(page, ($page) => $page.data.addressList as AddressesList); export const plansInfo = derived(page, ($page) => $page.data.plansInfo as PlansInfo); export const daysLeftInTrial = writable(0); -export const trialEndDate = writable(); export const readOnly = writable(false); // export type ReadOnlyData = { diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts index 67c0fc30b..44fd1dfac 100644 --- a/src/lib/stores/organization.ts +++ b/src/lib/stores/organization.ts @@ -14,6 +14,7 @@ export type Organization = Models.Team> & { billingCurrentInvoiceDate: string; billingNextInvoiceDate: string; billingTrialStartDate?: string; + billingTrialEndDate?: string; billingTrialDays?: number; billingAddressId?: string; amount: number; diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index 7278ec82b..75de9ad02 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -17,7 +17,6 @@ failedInvoice, daysLeftInTrial, tierToPlan, - trialEndDate, readOnly, showUsageRatesModal } from '$lib/stores/billing'; @@ -252,6 +251,10 @@ console.log('Environment is Cloud and Stripe public key deteted'); $stripe = await loadStripe(VARS.STRIPE_PUBLIC_KEY); console.log('Stripe should have been loading', $stripe); + } else { + console.log('Environment is not Cloud or Stripe public key not deteted'); + console.log('isCloud:', isCloud); + console.log('hasStripePublicKey:', hasStripePublicKey); } }); @@ -276,9 +279,8 @@ if (isCloud) { if (org?.billingPlan === 'tier-0') { $daysLeftInTrial = 0; - $trialEndDate = null; } else { - calculateTrialDay(new Date(org?.billingTrialStartDate), org?.billingTrialDays); + calculateTrialDay(new Date(org?.billingTrialEndDate)); } checkForTrialEnding(); @@ -287,11 +289,10 @@ } }); - function calculateTrialDay(startDate: Date, trialDays: number) { + function calculateTrialDay(endDate: Date) { const today = new Date(); - const days = diffDays(startDate, today); - $daysLeftInTrial = trialDays - days; - $trialEndDate = new Date(startDate.getTime() + trialDays * 24 * 60 * 60 * 1000); + const days = diffDays(today, endDate); + $daysLeftInTrial = days; } function checkForTrialEnding() { @@ -304,7 +305,7 @@ tierToPlan($organization.billingPlan).name } plan. You will be billed on a recurring 30 day cycle after your trial period ends on ${toLocaleDate( - $trialEndDate?.toString() + $organization.billingTrialEndDate )}` }); localStorage.setItem('trialEndingNotification', 'true'); diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/console/account/organizations/+page.svelte index cd66fe01c..14a4fd62d 100644 --- a/src/routes/console/account/organizations/+page.svelte +++ b/src/routes/console/account/organizations/+page.svelte @@ -16,8 +16,8 @@ import { isCloud } from '$lib/system'; import { Pill } from '$lib/elements'; import type { Models } from '@appwrite.io/console'; - import type { Organization } from '$lib/stores/organization'; - import { daysLeftInTrial, trialEndDate } from '$lib/stores/billing'; + import { organization, type Organization } from '$lib/stores/organization'; + import { daysLeftInTrial } from '$lib/stores/billing'; import { tooltip } from '$lib/actions/tooltip'; import { toLocaleDate } from '$lib/helpers/date'; import { wizard } from '$lib/stores/wizard'; @@ -86,7 +86,7 @@ class="u-flex u-cross-center" use:tooltip={{ content: `Your trial ends on ${toLocaleDate( - $trialEndDate.toString() + $organization.billingTrialEndDate )}. ${$daysLeftInTrial} days remaining.` }}> FREE TRIAL diff --git a/src/routes/console/organization-[organization]/billing/+page.svelte b/src/routes/console/organization-[organization]/billing/+page.svelte index 0699966b5..2bfbdcf90 100644 --- a/src/routes/console/organization-[organization]/billing/+page.svelte +++ b/src/routes/console/organization-[organization]/billing/+page.svelte @@ -38,13 +38,14 @@ await initializeStripe(); } console.log('test'); - console.log($page.url.searchParams.get('invoice')); try { const invoiceId = $page.url.searchParams.get('invoice'); + console.log(invoiceId); const invoice = await sdk.forConsole.billing.getInvoice( $page.params.organization, invoiceId ); + console.log(invoice); const { setupIntent, error } = await $stripe.confirmCardSetup( invoice.clientSecret, { @@ -52,7 +53,7 @@ return_url: `${base}/console/organization-${$organization.$id}/billing` } ); - console.log(setupIntent); + console.log('error', error); if (error) { console.log('Something went wrong'); } @@ -75,6 +76,7 @@ }); } } catch (error) { + console.log(error); addNotification({ title: 'Error', message: diff --git a/src/routes/console/organization-[organization]/billing/addCreditModal.svelte b/src/routes/console/organization-[organization]/billing/addCreditModal.svelte index db7f60149..50bbcc550 100644 --- a/src/routes/console/organization-[organization]/billing/addCreditModal.svelte +++ b/src/routes/console/organization-[organization]/billing/addCreditModal.svelte @@ -14,12 +14,13 @@ async function redeem() { try { await sdk.forConsole.billing.addCredit($organization.$id, coupon); + show = false; + await invalidate(Dependencies.CREDIT); + await invalidate(Dependencies.ORGANIZATION); addNotification({ type: 'success', message: `Credit has been added to ${$organization.name}` }); - await invalidate(Dependencies.CREDIT); - await invalidate(Dependencies.ORGANIZATION); trackEvent(Submit.CreditRedeem, { coupon }); diff --git a/src/routes/console/organization-[organization]/billing/planSummary.svelte b/src/routes/console/organization-[organization]/billing/planSummary.svelte index 76502539b..6e6a75615 100644 --- a/src/routes/console/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/console/organization-[organization]/billing/planSummary.svelte @@ -14,8 +14,8 @@ $organization?.billingPlan === 'tier-2' ? tierScale : $organization?.billingPlan === 'tier-1' - ? tierPro - : tierFree; + ? tierPro + : tierFree; $: aggregation = $aggregationList.aggregations[0]; @@ -46,8 +46,8 @@

- {#if $organization?.billingPlan !== 'tier-0' && !$daysLeftInTrial} - Esimated total (in USD): + {#if $organization?.billingPlan !== 'tier-0'} + Total to date (in USD): {/if} ${aggregation?.amount}

diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte index ea16eede9..96043fff8 100644 --- a/src/routes/console/organization-[organization]/header.svelte +++ b/src/routes/console/organization-[organization]/header.svelte @@ -8,13 +8,7 @@ import { toLocaleDate } from '$lib/helpers/date'; import { isTabSelected } from '$lib/helpers/load'; import { Cover } from '$lib/layout'; - import { - daysLeftInTrial, - getServiceLimit, - readOnly, - tierToPlan, - trialEndDate - } from '$lib/stores/billing'; + import { daysLeftInTrial, getServiceLimit, readOnly, tierToPlan } from '$lib/stores/billing'; import { members, newMemberModal, @@ -95,7 +89,7 @@ class="u-flex u-cross-center" use:tooltip={{ content: `Your trial ends on ${toLocaleDate( - $trialEndDate.toString() + $organization.billingTrialEndDate )}. ${$daysLeftInTrial} days remaining.` }}> FREE TRIAL diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte index 7cbbca66b..6adc3ad0b 100644 --- a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte +++ b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte @@ -48,7 +48,7 @@ {#if $createOrganization.billingPlan !== 'tier-0'}

Organization members

-

{collaboratorsNumber} members invited

+

{collaboratorsNumber} members

Payment

diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte index 1c02084f7..73a868b56 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/confirmDetails.svelte @@ -80,7 +80,7 @@ {#if $changeOrganizationTier.billingPlan !== 'tier-0'}

Organization members

-

{collaboratorsNumber} members invited

+

{collaboratorsNumber} members

Payment