Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for company.users.company_user

Browse Source
This commit is contained in:
= 2020-12-26 19:03:24 +11:00
parent bc8c68af18
commit 53ff009d74
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/BaseController.php
View File

@ -65,8 +65,8 @@ class BaseController extends Controller
'company.task_statuses',
'company.expense_categories',
'company.documents',
'company.users',
//'company.users.company_user',
//'company.users',
'company.users.company_user',
'company.clients.contacts.company',
'company.clients.gateway_tokens',
'company.clients.documents',

5
app/Models/User.php
View File

@ -191,6 +191,11 @@ class User extends Authenticatable implements MustVerifyEmail
return $this->hasMany(CompanyUser::class)->withTrashed();
}
public function co_user()
{
return $this->company_user();
}
public function company_user()
{
if (! $this->id && auth()->user()) {

7
app/Transformers/CompanyTransformer.php
View File

@ -211,7 +211,12 @@ class CompanyTransformer extends EntityTransformer
{
$transformer = new UserTransformer($this->serializer);
return $this->includeCollection($company->users, $transformer, User::class);
$users = $company->users->map(function ($user) use ($company){
$user->company_id = $company->id;
return $user;
});
return $this->includeCollection($users, $transformer, User::class);
}
public function includeCompanyGateways(Company $company)