fix: trial users subscription page

This commit is contained in:
Andras Bacsai 2024-03-30 00:23:48 +01:00
parent d569c8d31f
commit 171f6f4608
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@ public function mount()
if (!isCloud()) {
return redirect(RouteServiceProvider::HOME);
}
if (data_get(currentTeam(), 'subscription')) {
if (data_get(currentTeam(), 'subscription') && isSubscriptionActive()) {
return redirect()->route('subscription.show');
}
$this->settings = InstanceSettings::get();

View File

@ -282,7 +282,7 @@ function base_url(bool $withPort = true): string
function isSubscribed()
{
return auth()->user()->currentTeam()->subscription()->exists() || auth()->user()->isInstanceAdmin();
return isSubscriptionActive() || auth()->user()->isInstanceAdmin();
}
function isDev(): bool
{