Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for company user counter

Browse Source
This commit is contained in:
David Bomba 2024-01-31 18:23:54 +11:00
parent e785094b9e
commit 50cf6dbccb
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/ValidationRules/Ninja/CanAddUserRule.php
View File

@ -31,21 +31,37 @@ class CanAddUserRule implements Rule
*/ */
public function passes($attribute, $value) public function passes($attribute, $value)
{ {
/** @var \App\Models\User $user */
$user = auth()->user();
/* If the user is active then we can add them to the company */ /* If the user is active then we can add them to the company */
if (User::where('email', request()->input('email'))->where('account_id', auth()->user()->account_id)->where('is_deleted', 0)->exists()) { if (User::where('email', request()->input('email'))->where('account_id', $user->account_id)->where('is_deleted', 0)->exists()) {
return true; return true;
} }
/* Check that we have sufficient quota to allow this to happen */ /*
Check that we have sufficient quota to allow this to happen
@ 31-01-2024 - changed query to use email instead of user_id
$count = CompanyUser::query() $count = CompanyUser::query()
->where('company_user.account_id', auth()->user()->account_id) ->where('company_user.account_id', $user->account_id)
->join('users', 'users.id', '=', 'company_user.user_id') ->join('users', 'users.id', '=', 'company_user.user_id')
->whereNull('users.deleted_at') ->whereNull('users.deleted_at')
->whereNull('company_user.deleted_at') ->whereNull('company_user.deleted_at')
->distinct() ->distinct()
->count('company_user.user_id'); ->count('company_user.user_id');
*/
return $count < auth()->user()->company()->account->num_users; $count = CompanyUser::query()
->where("company_user.account_id", $user->account_id)
->join("users", "users.id", "=", "company_user.user_id")
->whereNull("users.deleted_at")
->whereNull("company_user.deleted_at")
->distinct()
->count("users.email");
return $count < $user->company()->account->num_users;
} }
/** /**
@ -53,6 +69,11 @@ class CanAddUserRule implements Rule
*/ */
public function message() public function message()
{ {
return ctrans('texts.limit_users', ['limit' => auth()->user()->company()->account->num_users]);
/** @var \App\Models\User $user */
$user = auth()->user();
return ctrans('texts.limit_users', ['limit' => $user->company()->account->num_users]);
} }
} }