Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 06:04:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4577 from turbo124/v5-develop

Browse Source 
Fix for company.users.company_user
This commit is contained in:
David Bomba 2020-12-26 19:04:03 +11:00 committed by GitHub
commit b3962986fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.task_statuses',
'company.expense_categories', 'company.expense_categories',
'company.documents', 'company.documents',
'company.users', //'company.users',
//'company.users.company_user', 'company.users.company_user',
'company.clients.contacts.company', 'company.clients.contacts.company',
'company.clients.gateway_tokens', 'company.clients.gateway_tokens',
'company.clients.documents', '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(); return $this->hasMany(CompanyUser::class)->withTrashed();
} }
public function co_user()
{
return $this->company_user();
}
public function company_user() public function company_user()
{ {
if (! $this->id && auth()->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); $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) public function includeCompanyGateways(Company $company)