From 5f4e40162b58ccf1955b28942f2a082e657cd6d5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 5 Nov 2021 20:43:25 +1100 Subject: [PATCH] working on users --- app/Http/Controllers/UserController.php | 1 + app/Http/ValidationRules/Ninja/CanAddUserRule.php | 2 +- app/Jobs/Account/CreateAccount.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 2b790cf3709f..a43eab22f60a 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -536,6 +536,7 @@ class UserController extends BaseController */ public function bulk() { + /* Validate restore() here and check if restoring the user will exceed their user quote (hosted only)*/ $action = request()->input('action'); $ids = request()->input('ids'); diff --git a/app/Http/ValidationRules/Ninja/CanAddUserRule.php b/app/Http/ValidationRules/Ninja/CanAddUserRule.php index d8955f4629a0..11b159fb6c6b 100644 --- a/app/Http/ValidationRules/Ninja/CanAddUserRule.php +++ b/app/Http/ValidationRules/Ninja/CanAddUserRule.php @@ -37,7 +37,7 @@ class CanAddUserRule implements Rule // ->count(); // return $count < auth()->user()->company()->account->num_users; - return auth()->user()->company()->account->users->count() < auth()->user()->company()->account->num_users; + //return auth()->user()->company()->account->users->count() < auth()->user()->company()->account->num_users; } /** diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php index 246b323b7b47..a34f266c764d 100644 --- a/app/Jobs/Account/CreateAccount.php +++ b/app/Jobs/Account/CreateAccount.php @@ -116,7 +116,7 @@ class CreateAccount $spaa9f78->fresh(); if(Ninja::isHosted()){ -nlog("welcome"); + App::forgetInstance('translator'); $t = app('translator'); $t->replace(Ninja::transformTranslations($sp035a66->settings));