fixed #118

Bottelet · Jul 3, 2019 · 4e08be7 · 4e08be7
1 parent 406ad2b
commit 4e08be7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/app/Http/Controllers/ClientsController.php b/app/Http/Controllers/ClientsController.php
@@ -11,6 +11,7 @@
 use Datatables;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
 class ClientsController extends Controller
 {
@@ -53,17 +54,16 @@ public function my()
      */
     public function anyData()
     {
-        $clients = Client::with('user')->select('clients.*');
+        $clients = Client::select(['clients.*', DB::raw('users.name AS salesperson')])->join('users', 'clients.user_id', '=', 'users.id');
+
+        // $clients = Client::with('user')->select('clients.*');
 
         $dt = Datatables::of($clients)
             ->addColumn('namelink', function ($clients) {
                 return '<a href="clients/'.$clients->id.'">'.$clients->name.'</a>';
             })
             ->addColumn('emaillink', function ($clients) {
                 return '<a href="mailto:'.$clients->primary_email.'">'.$clients->primary_email.'</a>';
-            })
-            ->addColumn('salesperson', function ($clients) {
-                return $clients->user->name;
             });
 
         // this looks wierd, but in order to keep the two buttons on the same line

diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
@@ -12,6 +12,7 @@
 use Datatables;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
 class ContactsController extends Controller
 {
@@ -57,15 +58,13 @@ public function my()
      */
     public function anyData()
     {
-        $contacts = Contact::with('client')->select('contacts.*');
+        $contacts = Contact::select(['contacts.*', DB::raw('clients.name AS client_name')])->join('clients', 'contacts.client_id', '=', 'clients.id');
+        // $contacts = Contact::with('client')->select('contacts.*');
 
         $dt = Datatables::of($contacts)
             ->addColumn('namelink', function ($contacts) {
                 return '<a href="'.route('contacts.show', $contacts->id).'">'.$contacts->name.'</a>';
             })
-            ->addColumn('client_name', function ($contacts) {
-                return $contacts->client->name;
-            })
             ->addColumn('emaillink', function ($contacts) {
                 return '<a href="mailto:'.$contacts->email.'">'.$contacts->email.'</a>';
             });
@@ -99,15 +98,12 @@ public function anyData()
      */
     public function myData()
     {
-        $contacts = Contact::with('client')->select('contacts.*')->my();
+        $contacts = Contact::select(['contacts.*', DB::raw('clients.name AS client_name')])->join('clients', 'contacts.client_id', '=', 'clients.id')->my();
 
         $dt = Datatables::of($contacts)
             ->addColumn('namelink', function ($contacts) {
                 return '<a href="contacts/'.$contacts->id.'">'.$contacts->name.'</a>';
             })
-            ->addColumn('client_name', function ($contacts) {
-                return $contacts->client->name;
-            })
             ->addColumn('emaillink', function ($contacts) {
                 return '<a href="mailto:'.$contacts->email.'">'.$contacts->email.'</a>';
             });