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 adding users to hosted

Browse Source
This commit is contained in:
David Bomba 2021-11-08 20:53:11 +11:00
parent 7c2170d505
commit 64aa4fe00f
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,10 +34,12 @@ class CanAddUserRule implements Rule
{
$count = CompanyUser::query()
->where('account_id', auth()->user()->account_id)
->whereNull('deleted_at')
->where('company_user.account_id', auth()->user()->account_id)
->join('users', 'users.id', '=', 'company_user.user_id')
->whereNull('users.deleted_at')
->whereNull('company_user.deleted_at')
->distinct()
->count('user_id');
->count('company_user.user_id');
return $count < auth()->user()->company()->account->num_users;

9
app/Http/ValidationRules/Ninja/CanRestoreUserRule.php
View File

@ -34,11 +34,12 @@ class CanRestoreUserRule implements Rule
{
$count = CompanyUser::query()
->where('account_id', auth()->user()->account_id)
->whereNull('deleted_at')
->where('company_user.account_id', auth()->user()->account_id)
->join('users', 'users.id', '=', 'company_user.user_id')
->whereNull('users.deleted_at')
->whereNull('company_user.deleted_at')
->distinct()
->count('user_id');
->count('company_user.user_id');
return $count < auth()->user()->company()->account->num_users;

1
app/Utils/HtmlEngine.php
View File

@ -151,6 +151,7 @@ class HtmlEngine
if($this->entity->project) {
$data['$project.name'] = ['value' => $this->entity->project->name, 'label' => ctrans('texts.project_name')];
$data['$invoice.project'] = &$data['$project.name'];
}
}