-
Notifications
You must be signed in to change notification settings - Fork 147
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
base: main
Are you sure you want to change the base?
Billing UI changes #1552
Conversation
The preview deployment is ready. 🟢 Open Preview | Open Build Logs Last updated at: 2025-01-10 09:35:51 CET |
The preview deployment is ready. 🟢 Open Preview | Open Build Logs Last updated at: 2025-01-10 09:35:48 CET |
The preview deployment is ready. 🟢 Open Preview | Open Build Logs Last updated at: 2025-01-10 09:35:56 CET |
The preview deployment is ready. 🟢 Open Preview | Open Build Logs Last updated at: 2025-01-10 09:35:58 CET |
…pwrite-console into billing-ui-changes
src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
Outdated
Show resolved
Hide resolved
on:click={addAlert}> | ||
Add alert | ||
</Button> | ||
{#if $organization?.billingPlan === BillingPlan.FREE} |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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. |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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} |
There was a problem hiding this comment.
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} |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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. --> |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
</Button> | ||
<svelte:fragment slot="list"> | ||
{#if backupPaymentMethod.userId === $user.$id} | ||
{#if $organization?.billingPlan !== BillingPlan.FREE} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also for Education plan?
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.