Feat: invoice cycle changes #1331
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <script lang="ts"> | ||
| import { tooltip } from '$lib/actions/tooltip'; | ||
| import { formatCurrency } from '$lib/helpers/numbers'; | ||
|
|
||
| export let label: string; | ||
| export let value: number; | ||
| </script> | ||
|
|
||
| {#if value > 0} | ||
| <span class="u-flex u-main-space-between"> | ||
| <div class="u-flex u-cross-center u-gap-4"> | ||
| <p class="text"> | ||
| <span class="icon-tag u-color-text-success" aria-hidden="true" /> | ||
| <span use:tooltip={{ content: label }}> | ||
| {label} | ||
| </span> | ||
| </p> | ||
| </div> | ||
| {#if value >= 100} | ||
| <p class="inline-tag">Credits applied</p> | ||
| {:else} | ||
| <span class="u-color-text-success">-{formatCurrency(value)}</span> | ||
| {/if} | ||
| </span> | ||
| {/if} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| <script lang="ts"> | ||
| import { FormList, InputChoice, InputNumber } from '$lib/elements/forms'; | ||
| import { formatCurrency } from '$lib/helpers/numbers'; | ||
| import type { Estimation } from '$lib/sdk/billing'; | ||
| import { sdk } from '$lib/stores/sdk'; | ||
| import Alert from '../alert.svelte'; | ||
| import DiscountsApplied from './discountsApplied.svelte'; | ||
|
|
||
| export let organizationId: string | undefined = undefined; | ||
| export let billingPlan: string; | ||
| export let collaborators: string[]; | ||
| export let couponId: string; | ||
| export let fixedCoupon = false; | ||
| export let error: string = ''; | ||
|
|
||
| export let billingBudget: number; | ||
|
|
||
| let budgetEnabled = false; | ||
| var estimation: Estimation; | ||
|
|
||
|
|
||
| let getEstimate = async (billingPlan, collaborators, couponId) => { | ||
| try { | ||
| error = ''; | ||
| estimation = await sdk.forConsole.billing.estimationCreateOrganization( | ||
| billingPlan, | ||
| couponId == '' ? null : couponId, | ||
|
There was a problem hiding this comment. We are using |
||
| collaborators ?? [] | ||
| ); | ||
| } catch (e) { | ||
| // | ||
| error = e.message; | ||
| console.log(e); | ||
|
Comment on lines
+30
to
+32
There was a problem hiding this comment. Let's remove the empty comment and the console log |
||
| } | ||
| }; | ||
|
|
||
| let getUpdatePlanEstimate = async (organizationId, billingPlan, collaborators, couponId) => { | ||
| try { | ||
| error = ''; | ||
| estimation = await sdk.forConsole.billing.estimationUpdatePlan( | ||
| organizationId, | ||
| billingPlan, | ||
| couponId && couponId.length > 0 ? couponId : null, | ||
| collaborators ?? [] | ||
| ); | ||
| } catch (e) { | ||
| error = e.message; | ||
| console.log(e); | ||
|
|
||
| } | ||
| }; | ||
|
Comment on lines
+21
to
+49
There was a problem hiding this comment. We usually use "normal functions" instead of "arrow functions" unless needed. If arrow functions are necessary in this case we can use |
||
|
|
||
| $: organizationId && organizationId.length > 0 | ||
|
There was a problem hiding this comment. I don't think we need to check the length of |
||
| ? getUpdatePlanEstimate(organizationId, billingPlan, collaborators, couponId) | ||
| : getEstimate(billingPlan, collaborators, couponId); | ||
| </script> | ||
|
|
||
| {#if error.length} | ||
| <Alert type="error" dismissible> | ||
| <span slot="title"> | ||
| {error} | ||
| </span> | ||
| </Alert> | ||
| {:else if estimation} | ||
| <section | ||
| class="card u-flex u-flex-vertical u-gap-8" | ||
| style:--p-card-padding="1.5rem" | ||
| style:--p-card-border-radius="var(--border-radius-small)"> | ||
|
Comment on lines
+63
to
+66
There was a problem hiding this comment. Let's use the |
||
| <slot /> | ||
| {#each estimation.items ?? [] as item} | ||
| <span class="u-flex u-main-space-between"> | ||
| <p class="text">{item.label}</p> | ||
| <p class="text">{formatCurrency(item.value)}</p> | ||
| </span> | ||
| {/each} | ||
| {#each estimation.discounts ?? [] as item} | ||
| <DiscountsApplied {...item} /> | ||
| {/each} | ||
| <div class="u-sep-block-start" /> | ||
| <span class="u-flex u-main-space-between"> | ||
| <p class="text"> | ||
| Total due<br /> | ||
|
There was a problem hiding this comment. I don't think we need the |
||
| </p> | ||
| <p class="text"> | ||
| {formatCurrency(estimation.grossAmount)} | ||
| </p> | ||
| </span> | ||
|
|
||
| <p class="text u-margin-block-start-16"> | ||
| You'll pay <span class="u-bold">{formatCurrency(estimation.amount)}</span> now. Once | ||
| your credits run out, you'll be charged | ||
| <span class="u-bold">{formatCurrency(estimation.amount)}</span> every 30 days. | ||
| </p> | ||
|
|
||
| <FormList class="u-margin-block-start-24"> | ||
| <InputChoice | ||
| type="switchbox" | ||
| id="budget" | ||
| label="Enable budget cap" | ||
| tooltip="If enabled, you will be notified when your spending reaches 75% of the set cap. Update cap alerts in your organization settings." | ||
| fullWidth | ||
| bind:value={budgetEnabled}> | ||
| {#if budgetEnabled} | ||
| <div class="u-margin-block-start-16"> | ||
| <InputNumber | ||
| id="budget" | ||
| label="Budget cap (USD)" | ||
| placeholder="0" | ||
| min={0} | ||
| bind:value={billingBudget} /> | ||
| </div> | ||
| {/if} | ||
| </InputChoice> | ||
| </FormList> | ||
| </section> | ||
| {/if} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <script lang="ts"> | ||
| import { BillingPlan } from '$lib/constants'; | ||
| import { formatCurrency } from '$lib/helpers/numbers'; | ||
| import { plansInfo } from '$lib/stores/billing'; | ||
| import { organization } from '$lib/stores/organization'; | ||
| import { LabelCard } from '..'; | ||
|
|
||
| export let billingPlan: string; | ||
| export let anyOrgFree = false; | ||
| export let isNewOrg = false; | ||
| let classes: string = ''; | ||
| export { classes as class }; | ||
| </script> | ||
|
|
||
| {#if billingPlan} | ||
| <ul class="u-flex u-flex-vertical u-gap-16 u-margin-block-start-8 {classes}"> | ||
| {#each $plansInfo.values() as plan} | ||
| <li> | ||
| <LabelCard | ||
| name="plan" | ||
| bind:group={billingPlan} | ||
| disabled={ (plan.$id === BillingPlan.FREE && anyOrgFree) || !plan.selfService} | ||
| value={plan.$id} | ||
| tooltipShow={plan.$id === BillingPlan.FREE && anyOrgFree} | ||
| tooltipText={plan.$id === BillingPlan.FREE | ||
| ? 'You are limited to 1 Free organization per account.' | ||
| : ''} | ||
| padding={1.5}> | ||
| <svelte:fragment slot="custom" let:disabled> | ||
| <div | ||
| class="u-flex u-flex-vertical u-gap-4 u-width-full-line" | ||
| class:u-opacity-50={disabled}> | ||
| <h4 class="body-text-2 u-bold"> | ||
| {plan.name} | ||
| {#if $organization?.billingPlan === plan.$id && !isNewOrg} | ||
| <span class="inline-tag">Current plan</span> | ||
| {/if} | ||
| </h4> | ||
| <p class="u-color-text-offline u-small"> | ||
| {plan.desc} | ||
| </p> | ||
| <p> | ||
| {formatCurrency(plan?.price ?? 0)} | ||
| </p> | ||
| </div> | ||
| </svelte:fragment> | ||
| </LabelCard> | ||
| </li> | ||
| {/each} | ||
| </ul> | ||
| {/if} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Let's remove the type
stringit's implicitly assigned by''