mirror of
https://github.com/appwrite/console.git
synced 2026-06-06 19:27:48 +00:00
fix: QA issues and some last minute changes
This commit is contained in:
Arman
@@ -83,10 +83,10 @@
|
||||
<Alert type={alertType} isStandalone>
|
||||
<span class="text">
|
||||
You've reached the {title.toLowerCase()} limit for the {tier} plan.
|
||||
{#if tier !== 'Scale'}<button
|
||||
class="link"
|
||||
type="button"
|
||||
on:click|preventDefault={upgradeMethod}>Upgrade</button>
|
||||
|
||||
{#if $organization?.billingPlan === 'tier-0'}
|
||||
<button class="link" type="button" on:click|preventDefault={upgradeMethod}
|
||||
>Upgrade</button>
|
||||
for additional {title.toLocaleLowerCase()}.
|
||||
{/if}
|
||||
</span>
|
||||
@@ -120,7 +120,7 @@
|
||||
<p class="text">
|
||||
Your are limited to {limit}
|
||||
{title.toLocaleLowerCase()} per project on the {tier} plan.
|
||||
{#if tier !== 'Scale'}<button
|
||||
{#if $organization?.billingPlan === 'tier-0'}<button
|
||||
class="link"
|
||||
type="button"
|
||||
on:click|preventDefault={upgradeMethod}>Upgrade</button>
|
||||
@@ -138,7 +138,10 @@
|
||||
{#if buttonText}
|
||||
<div
|
||||
use:tooltip={{
|
||||
content: `Upgrade to add more ${title.toLocaleLowerCase()}`,
|
||||
content:
|
||||
$organization.billingPlan === 'tier-0'
|
||||
? `Upgrade to add more ${title.toLocaleLowerCase()}`
|
||||
: `You've reached the ${title.toLocaleLowerCase()} limit for the ${tier} plan`,
|
||||
disabled: !isButtonDisabled
|
||||
}}>
|
||||
<Button on:click={buttonMethod} event={buttonEvent} disabled={isButtonDisabled}>
|
||||
|
||||
@@ -53,6 +53,9 @@
|
||||
<TableCell>
|
||||
<div class="u-line-height-1-5">
|
||||
<p class="text">{address.streetAddress}</p>
|
||||
{#if address?.addressLine2}
|
||||
<p class="text">{address.addressLine2}</p>
|
||||
{/if}
|
||||
<p class="text">{address.city}</p>
|
||||
<p class="text">{address.state}</p>
|
||||
<p class="text">{address.postalCode}</p>
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
<p class="text">Appwrite credit will automatically be applied to your next invoice.</p>
|
||||
<svelte:fragment slot="aside">
|
||||
<h4 class="body-text-1 u-bold">
|
||||
Credit balance: <span class="inline-tag">${balance}</span>
|
||||
Credit balance <span class="inline-tag">${balance}</span>
|
||||
</h4>
|
||||
<Form onSubmit={redeem} noMargin>
|
||||
<FormList>
|
||||
|
||||
@@ -59,11 +59,15 @@
|
||||
<div class="u-flex u-main-space-between u-cross-start">
|
||||
<div class="u-line-height-1-5 u-flex u-flex-vertical u-gap-2">
|
||||
<p class="text">{billingAddress.streetAddress}</p>
|
||||
{#if billingAddress?.addressLine2}
|
||||
<p class="text">{billingAddress.addressLine2}</p>
|
||||
{/if}
|
||||
<p class="text">{billingAddress.city}</p>
|
||||
<p class="text">{billingAddress.state}</p>
|
||||
<p class="text">{billingAddress.postalCode}</p>
|
||||
<p class="text">{billingAddress.country}</p>
|
||||
</div>
|
||||
|
||||
<DropList
|
||||
bind:show={showBillingAddressDropdown}
|
||||
placement="bottom-start"
|
||||
@@ -121,6 +125,9 @@
|
||||
<DropListItem on:click={() => addAddress(address?.$id)}>
|
||||
<p class="text">
|
||||
<span>{address.streetAddress}</span>,
|
||||
{#if address?.addressLine2}
|
||||
<span>{address.addressLine2}</span>,
|
||||
{/if}
|
||||
<span>{address.city}</span>,
|
||||
<span>{address.state}</span>,
|
||||
<span>{address.postalCode}</span>,
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
addNotification({
|
||||
type: 'success',
|
||||
isHtml: true,
|
||||
message: `<span>Budget cap enabled for <b>${$organization.name}</b></span>`
|
||||
message: `<span>Budget alert condition added to <b>${$organization.name}</b></span>`
|
||||
});
|
||||
trackEvent(Submit.BudgetAlertsUpdate, {
|
||||
alerts
|
||||
|
||||
@@ -28,7 +28,9 @@
|
||||
Your current project plan. For more information on Appwrite plans, <a
|
||||
type="button"
|
||||
class="link"
|
||||
href="https://appwrite.io/pricing">
|
||||
href="https://appwrite.io/pricing"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer">
|
||||
view our pricing guide.
|
||||
</a>
|
||||
</p>
|
||||
|
||||
@@ -112,9 +112,13 @@
|
||||
<Alert type="warning" isStandalone>
|
||||
<span class="text">
|
||||
You've reached the storage limit for the {tier} plan.
|
||||
<button class="link" type="button" on:click|preventDefault={upgradeMethod}
|
||||
>Upgrade</button>
|
||||
for additional storage.
|
||||
{#if tier === 'Starter'}
|
||||
<button
|
||||
class="link"
|
||||
type="button"
|
||||
on:click|preventDefault={upgradeMethod}>Upgrade</button>
|
||||
for additional storage.
|
||||
{/if}
|
||||
</span>
|
||||
</Alert>
|
||||
{/if}
|
||||
|
||||
+4
-3
@@ -4,7 +4,7 @@
|
||||
import { Button, Form, FormItem, InputNumber, InputSelect } from '$lib/elements/forms';
|
||||
import { humanFileSize, sizeToBytes } from '$lib/helpers/sizeConvertion';
|
||||
import { createByteUnitPair } from '$lib/helpers/unit';
|
||||
import { getServiceLimit, readOnly } from '$lib/stores/billing';
|
||||
import { getServiceLimit, readOnly, tierToPlan } from '$lib/stores/billing';
|
||||
import { organization } from '$lib/stores/organization';
|
||||
import { wizard } from '$lib/stores/wizard';
|
||||
import { isCloud } from '$lib/system';
|
||||
@@ -35,11 +35,12 @@
|
||||
<Heading tag="h2" size="7">Maximum file size</Heading>
|
||||
<p class="text">Set the maximum file size allowed in the bucket.</p>
|
||||
<svelte:fragment slot="aside">
|
||||
{#if isCloud && $organization?.billingPlan === 'tier-0'}
|
||||
{#if isCloud}
|
||||
{@const size = humanFileSize(sizeToBytes(service, 'MB', 1000))}
|
||||
{@const plan = tierToPlan($organization?.billingPlan)}
|
||||
<Alert type="info">
|
||||
<p class="text">
|
||||
The Starter plan has a maximum upload file size limit of {size.value}{size.unit}.
|
||||
The {plan.name} plan has a maximum upload file size limit of {size.value}{size.unit}.
|
||||
Upgrade to allow files of a larger size.
|
||||
</p>
|
||||
<svelte:fragment slot="action">
|
||||
|
||||
@@ -57,10 +57,15 @@
|
||||
Usage on the Starter plan is limited for the following resources. Next billing period: {toLocaleDate(
|
||||
nextDate
|
||||
)}.
|
||||
{:else}
|
||||
{:else if tier === 'tier-1'}
|
||||
<p>
|
||||
Usage on the Pro plan and Scale plan will be charged at the end of each billing period
|
||||
at the following rates. Next billing period: {toLocaleDate(nextDate)}.
|
||||
Usage on the Pro plan will be charged at the end of each billing period at the following
|
||||
rates. Next billing period: {toLocaleDate(nextDate)}.
|
||||
</p>
|
||||
{:else if tier === 'tier-2'}
|
||||
<p>
|
||||
Usage on the Scale plan will be charged at the end of each billing period at the
|
||||
following rates. Next billing period: {toLocaleDate(nextDate)}.
|
||||
</p>
|
||||
{/if}
|
||||
<Table noStyles>
|
||||
|
||||
Reference in New Issue
Block a user