patch: users table joins replaced with panichd_members

Author: xaviqv

src/Controllers/TicketsController.php

@@ -52,8 +52,9 @@ public function data($ticketList = 'active')
 
         $collection
             ->join('users', 'users.id', '=', 'panichd_tickets.user_id')
+			->join('panichd_members', 'panichd_members.id', '=', 'panichd_tickets.user_id')
 			->join('panichd_statuses', 'panichd_statuses.id', '=', 'panichd_tickets.status_id')
-            ->join('users as agent', 'agent.id', '=', 'panichd_tickets.agent_id')
+            ->join('panichd_members as agent', 'agent.id', '=', 'panichd_tickets.agent_id')
 			->join('panichd_priorities', 'panichd_priorities.id', '=', 'panichd_tickets.priority_id')
             ->join('panichd_categories', 'panichd_categories.id', '=', 'panichd_tickets.category_id')			
 
@@ -97,7 +98,7 @@ public function data($ticketList = 'active')
 			\DB::raw('group_concat(agent.name) AS agent_name'),
 			'panichd_priorities.name AS priority',
 			'panichd_priorities.magnitude AS priority_magnitude',
-			'users.name AS owner_name',
+			'panichd_members.name AS owner_name',
 			'panichd_tickets.user_id',
 			'panichd_tickets.creator_id',		
 			'panichd_tickets.category_id',
@@ -114,7 +115,7 @@ public function data($ticketList = 'active')
 			// Department joins
 			$collection				
 				->leftJoin('panichd_departments_persons', function ($join1) {
-					$join1->on('users.person_id','=','panichd_departments_persons.person_id');
+					$join1->on('panichd_members.person_id','=','panichd_departments_persons.person_id');
 				})	
 				->leftJoin('panichd_departments','panichd_departments_persons.department_id','=','panichd_departments.id');
 
@@ -728,7 +729,7 @@ protected function validation_common($request, $new_ticket = true)
 
 		$fields = [
             'subject'     => 'required|min:3',
-			'owner_id'    => 'required|exists:users,id',
+			'owner_id'    => 'required|exists:panichd_members,id',
 			'category_id' => 'required|in:'.$allowed_categories,
             'content'     => 'required|min:6',            
         ];
@@ -998,20 +999,25 @@ public function viewAttachment($attachment_id)
      */
     public function show($id)
     {
-		$ticket = $this->tickets->with('category.closingReasons')->with('tags');
 		$user = $this->member->find(auth()->user()->id);
 
+		$ticket = $this->tickets
+			->with('category.closingReasons')
+			->with('tags')
+			->join('panichd_members', 'panichd_members.id', '=', 'panichd_tickets.user_id');
+		
 		if ($user->currentLevel()>1 and Setting::grab('departments_feature')){
 			// Departments related
-			$ticket = $ticket->join('users', 'users.id', '=', 'panichd_tickets.user_id')
-			->leftJoin('panichd_departments_persons', function ($join1) {
-				$join1->on('users.person_id','=','panichd_departments_persons.person_id');
+			$ticket = $ticket->leftJoin('panichd_departments_persons', function ($join1) {
+				$join1->on('panichd_members.person_id','=','panichd_departments_persons.person_id');
 			})
 			->leftJoin('panichd_departments','panichd_departments_persons.department_id','=','panichd_departments.id')
 			->select('panichd_tickets.*', 'panichd_departments.department', 'panichd_departments.sub1');
 		}
 
-		$ticket = $ticket->findOrFail($id);
+		$ticket = $ticket
+			->select(['panichd_tickets.*', 'panichd_members.name as owner_name', 'panichd_members.email as owner_email'])
+			->findOrFail($id);
 
 		if ($ticket->hidden and $user->currentLevel() == 1){
 			return redirect()->route(Setting::grab('main_route').'.index')->with('warning', trans('panichd::lang.you-are-not-permitted-to-access'));

src/Views/tickets/datatable/loader.blade.php

@@ -55,7 +55,7 @@
 			@if( $u->currentLevel() > 1 )
 				{ data: 'priority', name: 'panichd_priorities.name', "orderData": [1, 3, 4, 5], "orderSequence": ['desc', 'asc']},
 				@if (session('panichd_filter_owner')=="")
-					{ data: 'owner_name', name: 'users.name' },
+					{ data: 'owner_name', name: 'panichd_members.name' },
 					@if ($setting::grab('departments_feature'))
 						{ data: 'dept_info', name: 'dept_full', searchable: false },
 					@endif

src/Views/tickets/show/body.blade.php

@@ -73,17 +73,17 @@ class="btn btn-default"
 					<br /><strong>{{ trans('panichd::lang.owner') }}</strong>{{ trans('panichd::lang.colon') }} 
 					<?php
 						if ($setting->grab('user_route') != 'disabled'){
-							$owner_name = '<a href="' . route($setting->grab('user_route'), ['id'=> $ticket->user_id]) . '">' . $ticket->owner->name . '</a>';
+							$owner_name = '<a href="' . route($setting->grab('user_route'), ['id'=> $ticket->user_id]) . '">' . $ticket->owner_name . '</a>';
 						}else{
-							$owner_name = $ticket->owner->name; 
+							$owner_name = $ticket->owner_name; 
 						}
 					?>
 
-					@if ($ticket->owner->email == "")
+					@if ($ticket->owner_email == "")
 						<span class="text-warning">{!! $owner_name . ' ' . trans('panichd::lang.ticket-owner-no-email') !!}
 						<br /><span class="glyphicon glyphicon-warning-sign"></span> {{ trans('panichd::lang.ticket-owner-no-email-warning') }}</span>
 					@else
-						<span class="tooltip-info" data-toggle="tooltip" data-placement="auto bottom" title="{{ $ticket->owner->email }}">{!! $owner_name !!} <span class="glyphicon glyphicon-question-sign"></span></span>
+						<span class="tooltip-info" data-toggle="tooltip" data-placement="auto bottom" title="{{ $ticket->owner_email }}">{!! $owner_name !!} <span class="glyphicon glyphicon-question-sign"></span></span>
 					@endif
 
 					@if ($setting->grab('departments_feature'))