diff --git a/config/sentry.php b/config/sentry.php index d7469ecfc..00613c115 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.242', + 'release' => '4.0.0-beta.243', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index f67327b64..a16c004bf 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ -
-
+ +
+

Verification Email Sent


To activate your account, please open the email and follow the @@ -8,5 +8,5 @@
-
- + + diff --git a/resources/views/layouts/boarding.blade.php b/resources/views/layouts/boarding.blade.php index f65e14a00..4a897ff2f 100644 --- a/resources/views/layouts/boarding.blade.php +++ b/resources/views/layouts/boarding.blade.php @@ -1,7 +1,7 @@ @extends('layouts.base') @section('body')
- {{ $slot }} + {{ $slot }}
@parent @endsection diff --git a/resources/views/livewire/subscription/index.blade.php b/resources/views/livewire/subscription/index.blade.php index 227b94ef7..4c2a03374 100644 --- a/resources/views/livewire/subscription/index.blade.php +++ b/resources/views/livewire/subscription/index.blade.php @@ -1,38 +1,40 @@ -@if ($settings->is_resale_license_active) - @if (auth()->user()->isAdminFromSession()) -
-
-

Choose a Plan

- @if (subscriptionProvider() === 'stripe' && $alreadySubscribed) - Manage My Subscription +
+ @if ($settings->is_resale_license_active) + @if (auth()->user()->isAdminFromSession()) +
+
+

Choose a Plan

+ @if (subscriptionProvider() === 'stripe' && $alreadySubscribed) + Manage My Subscription + @endif +
+ @if (request()->query->get('cancelled')) +
+ + + + Something went wrong with your subscription. Please try again or contact + support. +
+ @endif + + @if (config('subscription.provider') !== null) + @endif
- @if (request()->query->get('cancelled')) -
- - - - Something went wrong with your subscription. Please try again or contact - support. + @else +
+
+

Subscription

- @endif - - @if (config('subscription.provider') !== null) - - @endif -
- @else -
-
-

Subscription

+
You are not an admin or have been removed from this team. If this does not make sense, please contact + us.
-
You are not an admin or have been removed from this team. If this does not make sense, please contact - us.
-
+ @endif + @else +
Resale license is not active. Please contact your instance admin.
@endif -@else -
Resale license is not active. Please contact your instance admin.
-@endif +
diff --git a/versions.json b/versions.json index bcc5d1414..fda35b876 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.36" }, "v4": { - "version": "4.0.0-beta.242" + "version": "4.0.0-beta.243" } } }