Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Billing UI changes #1552

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Conversation

ItzNotABug
Copy link
Member

What does this PR do?

This PR updates a few of designs around the Billing areas of the Organization.

Test Plan

Manual.

Related PRs and Issues

N/A.

Have you read the Contributing Guidelines on issues?

Yes.

@ItzNotABug ItzNotABug self-assigned this Dec 12, 2024
@coolify-appwrite-org
Copy link

coolify-appwrite-org bot commented Dec 12, 2024

The preview deployment is ready. 🟢

Open Preview | Open Build Logs

Last updated at: 2025-01-10 09:35:51 CET

@coolify-appwrite-org
Copy link

coolify-appwrite-org bot commented Dec 12, 2024

The preview deployment is ready. 🟢

Open Preview | Open Build Logs

Last updated at: 2025-01-10 09:35:48 CET

@coolify-appwrite-org
Copy link

coolify-appwrite-org bot commented Dec 12, 2024

The preview deployment is ready. 🟢

Open Preview | Open Build Logs

Last updated at: 2025-01-10 09:35:56 CET

@coolify-appwrite-org
Copy link

coolify-appwrite-org bot commented Dec 12, 2024

The preview deployment is ready. 🟢

Open Preview | Open Build Logs

Last updated at: 2025-01-10 09:35:58 CET

@ItzNotABug ItzNotABug requested a review from ernstmul January 8, 2025 14:10
@ItzNotABug ItzNotABug requested a review from ernstmul January 9, 2025 03:49
on:click={addAlert}>
Add alert
</Button>
{#if $organization?.billingPlan === BillingPlan.FREE}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't check for features based on the plan name, but check the currentPlan to see if a feature is there or not. Because does Education have the billing alert feature?

Copy link
Member Author

@ItzNotABug ItzNotABug Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think currentPlan has billingAlerts flag setup on backend and sdk atm. Regarding Education plan, its disabled via Cloud's plans config.

<svelte:fragment slot="title"
>Billing alerts are a Pro plan feature
</svelte:fragment>
Upgrade to a Pro plan to manage when you receive billing alerts for your organization.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we mention Scale here as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scale isn't directly available as an option on upgrade when the current plan is on Free, right?

{/if}
</svelte:fragment>

<svelte:fragment slot="actions">
<Button disabled={isButtonDisabled} submit>Update</Button>
{#if $organization?.billingPlan === BillingPlan.FREE}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should you also be able to upgrade from Education plan?

@@ -64,135 +65,144 @@
}
</script>

<CardGrid>
<Heading tag="h2" size="6">Payment history</Heading>
{#if $organization?.billingPlan === BillingPlan.FREE && invoiceList.total > 0}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Payment history only for the Free plan?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think one can downgrade from a Paid plan to Github Education, right?

<svelte:fragment slot="list">
{#if backupPaymentMethod.userId === $user.$id}
{#if $organization?.billingPlan !== BillingPlan.FREE}
<!-- TODO: Add a simple button if a backup payment doesn't exist. -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Todo for later? Or for now?

Copy link
Member Author

@ItzNotABug ItzNotABug Jan 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already done hehe, forgot to remove comment.
Sample -
image

</Button>
<svelte:fragment slot="list">
{#if backupPaymentMethod.userId === $user.$id}
{#if $organization?.billingPlan !== BillingPlan.FREE}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also for Education plan?

@ItzNotABug ItzNotABug requested a review from ernstmul January 10, 2025 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants