fix: trial users subscription page
This commit is contained in:
parent
d569c8d31f
commit
171f6f4608
2 changed files with 2 additions and 2 deletions
|
|
@ -15,7 +15,7 @@ public function mount()
|
||||||
if (!isCloud()) {
|
if (!isCloud()) {
|
||||||
return redirect(RouteServiceProvider::HOME);
|
return redirect(RouteServiceProvider::HOME);
|
||||||
}
|
}
|
||||||
if (data_get(currentTeam(), 'subscription')) {
|
if (data_get(currentTeam(), 'subscription') && isSubscriptionActive()) {
|
||||||
return redirect()->route('subscription.show');
|
return redirect()->route('subscription.show');
|
||||||
}
|
}
|
||||||
$this->settings = InstanceSettings::get();
|
$this->settings = InstanceSettings::get();
|
||||||
|
|
|
||||||
|
|
@ -282,7 +282,7 @@ function base_url(bool $withPort = true): string
|
||||||
|
|
||||||
function isSubscribed()
|
function isSubscribed()
|
||||||
{
|
{
|
||||||
return auth()->user()->currentTeam()->subscription()->exists() || auth()->user()->isInstanceAdmin();
|
return isSubscriptionActive() || auth()->user()->isInstanceAdmin();
|
||||||
}
|
}
|
||||||
function isDev(): bool
|
function isDev(): bool
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue