Modify the checkout widget to support subscriptions. Add usage-based billing toggle to sharing settings.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<script>
|
||||
import Tooltip from "layout/Tooltip.svelte";
|
||||
import Euro from "util/Euro.svelte";
|
||||
import OtherPlans from "./SubscriptionPlans.svelte";
|
||||
import OtherPlans from "layout/checkout/SubscriptionPlans.svelte";
|
||||
import { user } from "lib/UserStore";
|
||||
</script>
|
||||
|
||||
@@ -244,12 +244,12 @@ import { user } from "lib/UserStore";
|
||||
{#if $user === null}
|
||||
<!-- User is not logged in -->
|
||||
Account required<br/>
|
||||
<a href="/login?redirect=/user/prepaid/deposit" class="button button_highlight round">
|
||||
<a href="/login?redirect=/user/subscription/manage" class="button button_highlight round">
|
||||
<i class="icon">login</i>
|
||||
Log in
|
||||
</a>
|
||||
or
|
||||
<a href="/register?redirect=/user/prepaid/deposit" class="button button_highlight round">
|
||||
<a href="/register?redirect=/user/subscription/manage" class="button button_highlight round">
|
||||
<i class="icon">how_to_reg</i>
|
||||
Register
|
||||
</a>
|
||||
@@ -259,7 +259,7 @@ import { user } from "lib/UserStore";
|
||||
{:else}
|
||||
<!-- User is logged in -->
|
||||
{#if $user.subscription.type === ""}
|
||||
<a href="/user/prepaid/deposit#deposit" class="button button_highlight round">
|
||||
<a href="/user/subscription/manage#deposit" class="button button_highlight round">
|
||||
Deposit credit
|
||||
</a>
|
||||
to activate Prepaid
|
||||
@@ -269,7 +269,7 @@ import { user } from "lib/UserStore";
|
||||
Prepaid subscription is active<br/>
|
||||
Current balance <Euro amount={$user.balance_micro_eur}/>
|
||||
<br/>
|
||||
<a href="/user/prepaid/deposit#deposit" class="button button_highlight round">
|
||||
<a href="/user/subscription/manage#deposit" class="button button_highlight round">
|
||||
Top up my credit
|
||||
</a>
|
||||
{/if}
|
||||
|
||||
@@ -8,24 +8,21 @@ import Euro from "util/Euro.svelte";
|
||||
{#if $user !== null}
|
||||
<div class="page_content">
|
||||
<section>
|
||||
{#if $user.subscription.type === "patreon"}
|
||||
{#if $user.subscription.id !== ""}
|
||||
<p>
|
||||
You already have a Patreon subscription active. You cannot use
|
||||
Prepaid while that subscription is active.
|
||||
You already have the {$user.subscription.name} plan active.
|
||||
Your account balance is <Euro
|
||||
amount={$user.balance_micro_eur}/>. Subscriptions are
|
||||
charged from this balance every day, use the form below to
|
||||
top it up or to switch to another plan.
|
||||
</p>
|
||||
{:else if $user.subscription.type === "prepaid"}
|
||||
<p>
|
||||
You already have a Prepaid subscription active. Your account
|
||||
balance is <Euro amount={$user.balance_micro_eur}/>. Use
|
||||
the form below to top up your balance.
|
||||
</p>
|
||||
<Checkout/>
|
||||
{:else}
|
||||
<p>
|
||||
Pick one of the subscription plans above to upgrade your
|
||||
account to premium.
|
||||
Pick a subscription plan to upgrade your account. Your
|
||||
account balance is <Euro amount={$user.balance_micro_eur}/>.
|
||||
</p>
|
||||
{/if}
|
||||
<Checkout/>
|
||||
</section>
|
||||
</div>
|
||||
{:else}
|
||||
|
||||
Reference in New Issue
Block a user