diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php index cdffdde1f474..f9275bd5258f 100644 --- a/app/Http/Requests/User/StoreUserRequest.php +++ b/app/Http/Requests/User/StoreUserRequest.php @@ -48,7 +48,7 @@ class StoreUserRequest extends Request } if (Ninja::isHosted()) { - $rules['hosted_users'] = new CanAddUserRule(auth()->user()->company()->account); + $rules['id'] = new CanAddUserRule(); } return $rules; diff --git a/app/Http/ValidationRules/Ninja/CanAddUserRule.php b/app/Http/ValidationRules/Ninja/CanAddUserRule.php index 51496e609b3b..e568fa13298f 100644 --- a/app/Http/ValidationRules/Ninja/CanAddUserRule.php +++ b/app/Http/ValidationRules/Ninja/CanAddUserRule.php @@ -18,11 +18,9 @@ use Illuminate\Contracts\Validation\Rule; */ class CanAddUserRule implements Rule { - public $account; - public function __construct($account) + public function __construct() { - $this->account = $account; } /** @@ -32,7 +30,7 @@ class CanAddUserRule implements Rule */ public function passes($attribute, $value) { - return $this->account->users->count() < $this->account->num_users; + return auth()->user()->company()->account->users->count() < auth()->user()->company()->account->num_users; } /** @@ -40,6 +38,6 @@ class CanAddUserRule implements Rule */ public function message() { - return ctrans('texts.limit_users', ['limit' => $this->account->num_users]); + return ctrans('texts.limit_users', ['limit' => auth()->user()->company()->account->num_users]); } }