mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 23:54:35 -04:00
Fixes for adding users
This commit is contained in:
parent
ae3edef16c
commit
f05fb9938e
@ -48,7 +48,7 @@ class StoreUserRequest extends Request
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (Ninja::isHosted()) {
|
if (Ninja::isHosted()) {
|
||||||
$rules['hosted_users'] = new CanAddUserRule(auth()->user()->company()->account);
|
$rules['id'] = new CanAddUserRule();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
|
@ -18,11 +18,9 @@ use Illuminate\Contracts\Validation\Rule;
|
|||||||
*/
|
*/
|
||||||
class CanAddUserRule implements 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)
|
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()
|
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]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user