Use Member::getTable() instead of string "panichd_members"

Author: xaviqv

src/Controllers/MembersController.php

@@ -30,16 +30,18 @@ public function index(Request $request)
      */
 	public function store(Request $request)
     {
+		$member = new \PanicHDMember;
+		
 		$rules = [
 			'name' => 'required',
-			'email' => 'bail|required|unique:panichd_members|email',
+			'email' => 'bail|required|unique:' . $member->getTable() . '|email',
 			'password' => 'required|confirmed',
 			'password_confirmation' => 'required'
 		];
 
         $this->validate($request, $rules);
 
-        $member = new \PanicHDMember;
+        
 		$member->name = $request->name;
 		$member->email = $request->email;
 		$member->password = bcrypt($request->password);

src/Controllers/TicketsController.php

@@ -45,6 +45,8 @@ public function __construct(Ticket $tickets, \PanicHDMember $member)
 	// This is loaded via AJAX at file Views\index.blade.php
     public function data($ticketList = 'active')
     {
+		$members_table = (new \PanicHDMember)->getTable();
+		
 		$datatables = app(\Yajra\Datatables\Datatables::class);
 
         $agent = $this->member->find(auth()->user()->id);
@@ -55,14 +57,14 @@ public function data($ticketList = 'active')
             ->leftJoin('users', function ($join1){
 				$join1->on('users.id', '=', 'panichd_tickets.user_id');
 			})
-			->leftJoin('panichd_members', function ($join2) {
-				$join2->on('panichd_members.id', '=', 'panichd_tickets.user_id');
+			->leftJoin($members_table . ' as members', function ($join2) {
+				$join2->on('members.id', '=', 'panichd_tickets.user_id');
 			})
-			->leftJoin('panichd_members as creator', function ($join3){
+			->leftJoin($members_table . ' as creator', function ($join3){
 				$join3->on('creator.id', '=', 'panichd_tickets.creator_id');
 			})
 			->join('panichd_statuses', 'panichd_statuses.id', '=', 'panichd_tickets.status_id')
-            ->leftJoin('panichd_members as agent', function ($join4){
+            ->leftJoin($members_table . ' as agent', function ($join4){
 				$join4->on('agent.id', '=', 'panichd_tickets.agent_id');
 			})
 			->join('panichd_priorities', 'panichd_priorities.id', '=', 'panichd_tickets.priority_id')
@@ -108,7 +110,7 @@ public function data($ticketList = 'active')
 			'agent.name as agent_name',
 			'panichd_priorities.name AS priority',
 			'panichd_priorities.magnitude AS priority_magnitude',
-			'panichd_members.name AS owner_name',
+			$members_table . '.name AS owner_name',
 			'creator.name as creator_name',
 			'panichd_tickets.user_id',
 			'panichd_tickets.creator_id',		
@@ -123,7 +125,7 @@ public function data($ticketList = 'active')
 		];
 
 		if (Setting::grab('departments_feature')){			
-			$collection->leftJoin('panichd_departments', 'panichd_departments.id', '=', 'panichd_members.department_id')
+			$collection->leftJoin('panichd_departments', 'panichd_departments.id', '=', $members_table . '.department_id')
 				->leftJoin('panichd_departments as dep_ancestor', 'panichd_departments.department_id', '=', 'dep_ancestor.id');
 
 			// Department columns
@@ -772,7 +774,7 @@ protected function validation_common($request, $new_ticket = true)
 
 		$fields = [
             'subject'     => 'required|min:3',
-			'owner_id'    => 'required|exists:panichd_members,id',
+			'owner_id'    => 'required|exists:' . $this->member->getTable() . ',id',
 			'category_id' => 'required|in:'.$allowed_categories,
             'content'     => 'required|min:6',            
         ];
@@ -1044,20 +1046,21 @@ public function viewAttachment($attachment_id)
     public function show($id)
     {
 		$user = $this->member->find(auth()->user()->id);
+		$members_table = $this->member->getTable();
 
 		$ticket = $this->tickets
 			->with('owner')
 			->with('creator')
 			->with('agent')
 			->with('category.closingReasons')
 			->with('tags')
-			->leftJoin('panichd_members', function($join1){
-				$join1->on('panichd_members.id', '=', 'panichd_tickets.user_id');
+			->leftJoin($members_table, function($join1) use($members_table){
+				$join1->on($members_table . '.id', '=', 'panichd_tickets.user_id');
 			})
-			->leftJoin('panichd_members as creator', function($join2){
+			->leftJoin($members_table . ' as creator', function($join2){
 				$join2->on('creator.id', '=', 'panichd_tickets.creator_id');
 			})
-			->leftJoin('panichd_members as agent', function($join3){
+			->leftJoin($members_table . ' as agent', function($join3){
 				$join3->on('agent.id', '=', 'panichd_tickets.agent_id');
 			});
 
@@ -1067,10 +1070,10 @@ public function show($id)
 
 		$a_select = [
 			'panichd_tickets.*',
-			'panichd_members.name as owner_name',
+			$members_table . '.name as owner_name',
 			'creator.name as creator_name',
 			'agent.name as agent_name',
-			'panichd_members.email as owner_email'
+			$members_table . '.email as owner_email'
 		];
 
 		// Select Ticket and properties

src/Translations/ca/admin.php

@@ -175,7 +175,7 @@
 // $admin_route_path/member/____
   'member-index-title'            => 'Gestió d\'usuaris Membres',
   'member-index-help'             => 'Els membres son tots els usuaris registrats a la base de dades. L\'administrador d\'aquest lloc web pot haver filtrat la llista',
-  'member-index-empty'            => 'No s\'ha trobat usuaris registrats. Si us plau, revisa si hi ha algun error a la vista de la base de dades "panichd_members"',
+  'member-index-empty'            => 'No s\'ha trobat usuaris registrats',
   'member-table-own-tickets'      => 'Tiquets propis',
   'member-table-assigned-tickets' => 'Tiquets assignats',
   'member-modal-update-title'     => 'Actualitzar membre',

src/Translations/en/admin.php

@@ -176,7 +176,7 @@
 // $admin_route_path/member/____
   'member-index-title'            => 'Members management',
   'member-index-help'             => 'Members are all registered users in database. This website administrator may have filtered the list',
-  'member-index-empty'            => 'No registered members were found. Please, check if there is any error in database "panichd_members" view',
+  'member-index-empty'            => 'No registered members were found',
   'member-table-own-tickets'      => 'Own tickets',
   'member-table-assigned-tickets' => 'Assigned tickets',
   'member-modal-update-title'     => 'Update member',

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

@@ -56,7 +56,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: 'panichd_members.name' },
+					{ data: 'owner_name', name: '{{ $u->getTable() }}.name' },
 					@if ($setting::grab('departments_feature'))
 						{ data: 'dept_full_name', name: 'panichd_departments.name' },
 					@endif