From 53ff009d7497a32e5ed986829240a2c95176e693 Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Sat, 26 Dec 2020 19:03:24 +1100
Subject: [PATCH] fix for company.users.company_user

---
 app/Http/Controllers/BaseController.php | 4 ++--
 app/Models/User.php                     | 5 +++++
 app/Transformers/CompanyTransformer.php | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index f3723805e656..2220b4864735 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -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',
diff --git a/app/Models/User.php b/app/Models/User.php
index 66e53b69a427..44baa88178ce 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -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()) {
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 715f71dd99ae..b805aae2561f 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -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)