diff --git a/config/constants.php b/config/constants.php index 091c60996..53f43ae5a 100644 --- a/config/constants.php +++ b/config/constants.php @@ -32,6 +32,7 @@ return [ 'basic' => env('LIMIT_SERVER_BASIC', 2), 'pro' => env('LIMIT_SERVER_PRO', 10), 'ultimate' => env('LIMIT_SERVER_ULTIMATE', 25), + 'dynamic' => env('LIMIT_SERVER_DYNAMIC', 2), ], 'email' => [ 'zero' => true, @@ -39,6 +40,7 @@ return [ 'basic' => true, 'pro' => true, 'ultimate' => true, + 'dynamic' => true, ], ], ]; diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index 55177d4b7..28850d5e9 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -5,14 +5,14 @@

Dashboard

Your self-hosted infrastructure.
@if (request()->query->get('success')) -
+
+ d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" /> - Your subscription has been activated! Welcome onboard!
It could take a few seconds before your - subscription is activated.
Please be patient.
+ Your subscription has been activated! Welcome onboard!
It could take a few seconds before your + subscription is activated.
Please be patient.
@endif

Projects

diff --git a/resources/views/livewire/subscription/actions.blade.php b/resources/views/livewire/subscription/actions.blade.php index 013889969..5f9d3789a 100644 --- a/resources/views/livewire/subscription/actions.blade.php +++ b/resources/views/livewire/subscription/actions.blade.php @@ -3,34 +3,50 @@

Your current plan

Tier: {{ data_get(currentTeam(), 'subscription')->type() }}
+ class="dark:text-warning"> + @if (data_get(currentTeam(), 'subscription')->type() == 'dynamic') + Pay-as-you-go + @else + {{ data_get(currentTeam(), 'subscription')->type() }} + @endif + +
@if (currentTeam()->subscription->stripe_cancel_at_period_end) -
Subscription is active but on cancel period.
+
Subscription is active but on cancel period.
@else -
Subscription is active. Last invoice is +
Subscription is active. Last invoice is {{ currentTeam()->subscription->stripe_invoice_paid ? 'paid' : 'not paid' }}.
@endif -
Number of paid servers: {{ $server_limits }}
-
Currently active servers: {{ currentTeam()->servers->count() }}
+
+
Number of paid servers:
+
{{ $server_limits }}
+
+
+
Currently active servers:
+
{{ currentTeam()->servers->count() }}
+
@if (currentTeam()->serverOverflow())
WARNING: You must delete {{ currentTeam()->servers->count() - $server_limits }} servers, or upgrade your subscription. {{ currentTeam()->servers->count() - $server_limits }} servers will be deactivated.
@endif + Change Server Quantity +

Manage your subscription

Cancel, upgrade or downgrade your subscription.
- Go to + Go to - + +
- If you have any problem, please contact us.
@endif @@ -40,7 +56,7 @@ @if (currentTeam()->subscription->lemon_status === 'cancelled')
Subscriptions ends at: {{ getRenewDate() }}
If you would like to change the subscription to a lower/higher plan, please + class="underline dark:text-white" href="{{ config('coolify.contact') }}" target="_blank">please contact us.
@else diff --git a/resources/views/livewire/subscription/index.blade.php b/resources/views/livewire/subscription/index.blade.php index 4c2a03374..d4525fd32 100644 --- a/resources/views/livewire/subscription/index.blade.php +++ b/resources/views/livewire/subscription/index.blade.php @@ -20,7 +20,7 @@
@endif - @if (config('subscription.provider') !== null) + @if (config('subscription.provider') === 'stripe') @endif diff --git a/resources/views/livewire/subscription/pricing-plans-new.blade.php b/resources/views/livewire/subscription/pricing-plans-new.blade.php deleted file mode 100644 index e1a9dbfbf..000000000 --- a/resources/views/livewire/subscription/pricing-plans-new.blade.php +++ /dev/null @@ -1,120 +0,0 @@ -
-
-
-
- Payment frequency - - -
-
-
-
Save 10% annually with the yearly plans. -
-
-
-
-
-
-
-
For the detailed list of features, please visit our landing page: coolify.io
-
-
-

Dynamic

-

- - $5 - for the first 2 servers - - - - $4 - /month + VAT - -

-

- - $3 - for any additional - - - - $4 - /month + VAT - -

- - billed monthly (+VAT) - - - billed annually - - - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - - - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - -

Begin hosting your own services in the - cloud. -

-
    -
  • - - Connect 2 servers -
  • -
  • - - Included Email System -
  • -
  • - - Email Support -
  • -
  • - - - - - - - + All upcoming features -
  • -
-
-
-
-
-
diff --git a/resources/views/livewire/subscription/pricing-plans-old.blade.php b/resources/views/livewire/subscription/pricing-plans-old.blade.php new file mode 100644 index 000000000..e4a3cc762 --- /dev/null +++ b/resources/views/livewire/subscription/pricing-plans-old.blade.php @@ -0,0 +1,67 @@ + + @if (config('subscription.provider') === 'stripe') + + + {{ $isTrial ? 'Start Trial' : 'Subscribe' }} + + + + {{ $isTrial ? 'Start Trial' : 'Subscribe' }} + + + + + {{ $isTrial ? 'Start Trial' : 'Subscribe' }} + + + {{ $isTrial ? 'Start Trial' : 'Subscribe' }} + + + + + {{ $isTrial ? 'Start Trial' : 'Subscribe' }} + + + {{ $isTrial ? 'Start Trial' : 'Subscribe' }} + + + @endif + @if (config('subscription.provider') === 'paddle') + + @endif + @if (config('subscription.provider') === 'lemon') + + Subscribe + + + Subscribe + + + + Subscribe + + + Subscribe + + + + Subscribe + + + Subscribe + + + @endif + diff --git a/resources/views/livewire/subscription/pricing-plans.blade.php b/resources/views/livewire/subscription/pricing-plans.blade.php index e4a3cc762..200568159 100644 --- a/resources/views/livewire/subscription/pricing-plans.blade.php +++ b/resources/views/livewire/subscription/pricing-plans.blade.php @@ -1,67 +1,117 @@ - - @if (config('subscription.provider') === 'stripe') - - - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - +
+
+
+
+ Payment frequency + + +
+
+
+
Save 10% annually with the yearly plans. +
+
+
+
+
+
+
+ {{--
For the detailed list of features, please visit our landing page: coolify.io
--}} +
+
+

Pay-as-you-go

+

+ + $5 + for the first 2 + - - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - - - - - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - + + $4 + /month + VAT + +

+

+ + $3 + for any additional servers + - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - - - - - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - - - {{ $isTrial ? 'Start Trial' : 'Subscribe' }} - - - @endif - @if (config('subscription.provider') === 'paddle') - - @endif - @if (config('subscription.provider') === 'lemon') - - Subscribe - - - Subscribe - - - - Subscribe - - - Subscribe - - - - Subscribe - - - Subscribe - - - @endif - + + $4 + /month + VAT + +

+ + billed monthly (+VAT) + + + billed annually + + + Subscribe + + + Subscribe + +
    +
  • + + Connect unlimited servers +
  • +
  • + + Free Email Notifications +
  • +
  • + + Support by Email +
  • +
  • + + + + + + + + All upcoming features +
  • +
+
+
+
+
+