Skip to content

Commit abf85ae

Browse files
xaviqvxaviqv
committed
Merge branch 'custom-member' into dev
2 parents 394707d + b010488 commit abf85ae

34 files changed

Lines changed: 133 additions & 156 deletions

‎src/Console/DemoRollback.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function handle()
7979
Models\Tag::truncate();
8080

8181
// Active agents deletion
82-
foreach (Models\Member::agents()->get() as $member){
82+
foreach ( \PanicHDMember::agents()->get() as $member){
8383
$member->panichd_agent = 0;
8484
$member->save();
8585
}
@@ -93,16 +93,16 @@ public function handle()
9393
}
9494

9595
// Delete demo users
96-
$o_members = Models\Member::where('email', 'like', '%@demodataseeder.com');
96+
$o_members = \PanicHDMember::where('email', 'like', '%@demodataseeder.com');
9797
if ($o_members->count() == 0){
9898
$this->info(trans('panichd::console.demo-users-not-found'));
9999
}else{
100100
foreach ($o_members->get() as $member){
101101
$member->delete();
102102
}
103103

104-
if (Models\Member::count() == 0){
105-
Models\Member::truncate();
104+
if ( \PanicHDMember::count() == 0){
105+
PanicHDMember::truncate();
106106
}
107107
}
108108

‎src/Console/WipeOffLists.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function handle()
7575
Models\Tag::truncate();
7676

7777
// Active agents deletion
78-
foreach (Models\Member::agents()->get() as $member){
78+
foreach ( \PanicHDMember::agents()->get() as $member){
7979
$member->panichd_agent = 0;
8080
$member->save();
8181
}

‎src/Controllers/AdministratorsController.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55
use App\Http\Controllers\Controller;
66
use Illuminate\Http\Request;
77
use Illuminate\Support\Facades\Session;
8-
use PanicHD\PanicHD\Models\Member;
98
use PanicHD\PanicHD\Models\Setting;
109

1110
class AdministratorsController extends Controller
1211
{
1312
public function index()
1413
{
15-
$administrators = Member::admins();
14+
$administrators = \PanicHDMember::admins();
1615

1716
return view('panichd::admin.administrator.index', compact('administrators'));
1817
}
1918

2019
public function create()
2120
{
22-
$users = Member::paginate(Setting::grab('paginate_items'));
21+
$users = \PanicHDMember::paginate(Setting::grab('paginate_items'));
2322

2423
return view('panichd::admin.administrator.create', compact('users'));
2524
}
@@ -61,7 +60,7 @@ public function destroy($id)
6160
*/
6261
public function addAdministrators($user_ids)
6362
{
64-
$users = Member::find($user_ids);
63+
$users = \PanicHDMember::find($user_ids);
6564
foreach ($users as $user) {
6665
$user->panichd_admin = true;
6766
$user->save();
@@ -80,7 +79,7 @@ public function addAdministrators($user_ids)
8079
*/
8180
public function removeAdministrator($id)
8281
{
83-
$administrator = Member::find($id);
82+
$administrator = \PanicHDMember::find($id);
8483
$administrator->panichd_admin = false;
8584
$administrator->save();
8685

@@ -105,7 +104,7 @@ public function removeAdministrator($id)
105104
public function syncAdministratorCategories($id, Request $request)
106105
{
107106
$form_cats = ($request->input('administrator_cats') == null) ? [] : $request->input('administrator_cats');
108-
$administrator = Member::find($id);
107+
$administrator = \PanicHDMember::find($id);
109108
$administrator->categories()->sync($form_cats);
110109
}
111110
}

‎src/Controllers/AgentsController.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
use Illuminate\Http\Request;
88
use Illuminate\Support\Facades\Session;
99
use PanicHD\PanicHD\Models\Category;
10-
use PanicHD\PanicHD\Models\Member;
1110
use PanicHD\PanicHD\Models\Setting;
1211

1312
class AgentsController extends Controller
1413
{
1514
public function index()
1615
{
17-
$agents = Member::agents()->with('categories')->get();
18-
$not_agents = Member::where('panichd_agent', '0')->get();
16+
$agents = \PanicHDMember::agents()->with('categories')->get();
17+
$not_agents = \PanicHDMember::where('panichd_agent', '0')->get();
1918
$categories = Category::get();
2019

2120
return view('panichd::admin.agent.index', compact('agents', 'not_agents', 'categories'));
@@ -34,7 +33,7 @@ public function store(Request $request)
3433

3534
DB::beginTransaction();
3635

37-
$user = Member::findOrFail($request->agent_id);
36+
$user = \PanicHDMember::findOrFail($request->agent_id);
3837
$user->panichd_agent = true;
3938
$user->save();
4039

@@ -54,7 +53,7 @@ public function update($id, Request $request)
5453
}else{
5554
$this->syncAgentCategories($request, $id);
5655

57-
$user = Member::findOrFail($id);
56+
$user = \PanicHDMember::findOrFail($id);
5857

5958
Session::flash('status', trans('panichd::admin.agent-updated-ok', ['name' => $user->name]));
6059

@@ -64,7 +63,7 @@ public function update($id, Request $request)
6463

6564
public function destroy($id)
6665
{
67-
$agent = Member::findOrFail($id);
66+
$agent = \PanicHDMember::findOrFail($id);
6867

6968
$agent->categories()->detach();
7069

@@ -84,7 +83,7 @@ public function destroy($id)
8483
*/
8584
public function syncAgentCategories(Request $request, $id, $agent = false)
8685
{
87-
if (!$agent) $agent = Member::findOrFail($id);
86+
if (!$agent) $agent = \PanicHDMember::findOrFail($id);
8887

8988
$form_cats = $fc = ($request->input('agent_cats') == null) ? [] : $request->input('agent_cats');
9089
$form_auto = ($request->input('agent_cats_autoassign') == null) ? [] : $request->input('agent_cats_autoassign');

‎src/Controllers/CommentsController.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use PanicHD\PanicHD\Events\CommentCreated;
1212
use PanicHD\PanicHD\Events\CommentUpdated;
1313
use PanicHD\PanicHD\Models;
14-
use PanicHD\PanicHD\Models\Member;
1514
use PanicHD\PanicHD\Models\Setting;
1615
use PanicHD\PanicHD\Models\Status;
1716
use PanicHD\PanicHD\Traits\Attachments;
@@ -91,7 +90,7 @@ protected function validation_common($request, $new_comment = true)
9190

9291
$common_data = [
9392
'request' => $request,
94-
'member' => Member::findOrFail(\Auth::user()->id),
93+
'member' => \PanicHDMember::findOrFail(auth()->user()->id),
9594
'a_content' => $a_content,
9695
'a_result_errors' => $a_result_errors
9796
];

‎src/Controllers/ConfigurationsController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function index()
2121
{
2222
$configurations = Configuration::all();
2323
$configurations_by_sections = ['init' => [], 'email' => [], 'tickets' => [], 'perms' => [], 'editor' => [], 'other' => []];
24-
$init_section = ['main_route', 'main_route_path', 'admin_route', 'admin_route_path', 'master_template', 'routes'];
24+
$init_section = ['main_route', 'main_route_path', 'admin_route', 'admin_route_path', 'master_template', 'member_model_class', 'routes'];
2525
$email_section = ['status_notification', 'comment_notification', 'queue_emails', 'assigned_notification',
2626
'list_owner_notification', 'status_owner_notification',
2727
'email.template', 'email.owner.newticket.template', 'email.header', 'email.signoff', 'email.signature', 'email.dashboard',
@@ -118,7 +118,7 @@ public function update(Request $request, $id)
118118
$value = $request->value;
119119

120120
if ($request->serialize) {
121-
//if(!Hash::check($request->password, Auth::user()->password)){
121+
//if(!Hash::check($request->password, auth()->user()->password)){
122122
if (!Auth::attempt($request->only('password'), false, false)) {
123123
return back()->withErrors([trans('panichd::admin.config-edit-auth-failed')]);
124124
}

‎src/Controllers/DashboardController.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
use App\Http\Controllers\Controller;
66
use PanicHD\PanicHD\Models;
77
use PanicHD\PanicHD\Models\Category;
8-
use PanicHD\PanicHD\Models\Member;
98
use PanicHD\PanicHD\Models\Ticket;
109

1110
class DashboardController extends Controller
1211
{
1312

1413
public function index($indicator_period = 2)
1514
{
16-
if(Member::count() == 0
15+
if( \PanicHDMember::count() == 0
1716
or Category::count() == 0
1817
or Models\Priority::count() == 0
1918
or Models\Status::count() == 0){
@@ -41,7 +40,7 @@ public function index($indicator_period = 2)
4140
}
4241

4342
// Total tickets counter per agent for google pie chart
44-
$agents_share_obj = Member::agents()->with(['agentTotalTickets' => function ($query) {
43+
$agents_share_obj = \PanicHDMember::agents()->with(['agentTotalTickets' => function ($query) {
4544
$query->addSelect(['id', 'agent_id']);
4645
}])->get();
4746

@@ -51,13 +50,13 @@ public function index($indicator_period = 2)
5150
}
5251

5352
// Per Agent
54-
$agents = Member::agents(10);
53+
$agents = \PanicHDMember::agents(10);
5554

5655
// Per User
57-
$users = Member::users(10);
56+
$users = \PanicHDMember::users(10);
5857

5958
// Per Category performance data
60-
$ticketController = new TicketsController(new Ticket(), new Member());
59+
$ticketController = new TicketsController(new Ticket(), new \PanicHDMember());
6160
$monthly_performance = $ticketController->monthlyPerfomance($indicator_period);
6261

6362
if (request()->has('cat_page')) {

‎src/Controllers/InstallController.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
namespace PanicHD\PanicHD\Controllers;
44

55
use App\Http\Controllers\Controller;
6-
use App\User;
76
use Illuminate\Http\Request;
87
use Illuminate\Support\Facades\Artisan;
98
use Illuminate\Support\Facades\DB;
109
use Illuminate\Support\Facades\File;
1110
use Illuminate\Support\Facades\Schema;
1211
use PanicHD\PanicHD\Models;
1312
use PanicHD\PanicHD\Models\Category;
14-
use PanicHD\PanicHD\Models\Member;
1513
use PanicHD\PanicHD\Models\Setting;
1614
use PanicHD\PanicHD\Seeds\SettingsTableSeeder;
1715
use PanicHD\PanicHD\Seeds\DemoDataSeeder;
@@ -82,7 +80,7 @@ public function index()
8280
return view('panichd::install.index', compact('inactive_migrations', 'previous_ticketit', 'quickstart'));
8381
}elseif(!$this->isUpdated()){
8482
// Panic Help Desk requires an upgrade
85-
if (Member::isAdmin()){
83+
if ( \PanicHDMember::isAdmin()){
8684
return view('panichd::install.upgrade', [
8785
'inactive_migrations' => $inactive_migrations,
8886
'inactive_settings' => $this->inactiveSettings(),
@@ -106,7 +104,7 @@ public function index()
106104
*/
107105
public function upgrade_menu()
108106
{
109-
if (!$this->isInstalled() or !Member::isAdmin()){
107+
if (!$this->isInstalled() or !PanicHDMember::isAdmin()){
110108
return redirect()->route('panichd.install.setup');
111109
}
112110

@@ -178,7 +176,7 @@ public function setup(Request $request)
178176
]);
179177

180178
// Add current user to panichd_admin
181-
$admin_user = User::find(auth()->user()->id);
179+
$admin_user = \PanicHDMember::find(auth()->user()->id);
182180
$admin_user->panichd_admin = true;
183181

184182
if ($request->has('quickstart')){
@@ -191,7 +189,7 @@ public function setup(Request $request)
191189
$admin_user->panichd_agent = true;
192190

193191
// App\User doesn't have categories()
194-
$admin_member = Member::find(auth()->user()->id);
192+
$admin_member = \PanicHDMember::find(auth()->user()->id);
195193
$admin_member->categories()->sync([Category::first()->id]);
196194
}
197195

@@ -207,7 +205,7 @@ public function setup(Request $request)
207205
*/
208206
public function upgrade(Request $request)
209207
{
210-
if (Member::isAdmin()){
208+
if ( \PanicHDMember::isAdmin()){
211209
// Migrations and Settings
212210
$this->initialSettings();
213211

‎src/Controllers/MembersController.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace PanicHD\PanicHD\Controllers;
44

55
use App\Http\Controllers\Controller;
6-
use App\User;
76
use Illuminate\Http\Request;
87
use Illuminate\Validation\Rule;
98
use PanicHD\PanicHD\Models;
@@ -17,7 +16,7 @@ class MembersController extends Controller
1716
*/
1817
public function index(Request $request)
1918
{
20-
$a_members = Models\Member::withCount(['userTickets', 'agentTotalTickets'])->orderBy('name')->get();
19+
$a_members = \PanicHDMember::withCount(['userTickets', 'agentTotalTickets'])->orderBy('name')->get();
2120

2221
return view('panichd::admin.member.index', compact('a_members'));
2322
}
@@ -31,16 +30,18 @@ public function index(Request $request)
3130
*/
3231
public function store(Request $request)
3332
{
33+
$member = new \PanicHDMember;
34+
3435
$rules = [
3536
'name' => 'required',
36-
'email' => 'bail|required|unique:panichd_members|email',
37+
'email' => 'bail|required|unique:' . $member->getTable() . '|email',
3738
'password' => 'required|confirmed',
3839
'password_confirmation' => 'required'
3940
];
4041

4142
$this->validate($request, $rules);
4243

43-
$member = new User;
44+
4445
$member->name = $request->name;
4546
$member->email = $request->email;
4647
$member->password = bcrypt($request->password);
@@ -53,7 +54,7 @@ public function store(Request $request)
5354

5455
public function update(Request $request, $id)
5556
{
56-
$member = User::findOrFail($id);
57+
$member = \PanicHDMember::findOrFail($id);
5758

5859
$rules = [
5960
'id' => 'exists:users',
@@ -86,8 +87,8 @@ public function update(Request $request, $id)
8687

8788
public function destroy(Request $request, $id)
8889
{
89-
$user = User::findOrFail($id);
90-
$member = Models\Member::findOrFail($id);
90+
$user = \PanicHDMember::findOrFail($id);
91+
$member = \PanicHDMember::findOrFail($id);
9192
if (auth()->user()->id == $id){
9293
\Session::flash('warning', trans('panichd::admin.member-delete-own-user-error'));
9394
return redirect()->back();

‎src/Controllers/NoticesController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function __construct()
2222
public function index()
2323
{
2424
// All users
25-
$a_users = Models\Member::whereNotNull('ticketit_department')->orderBy('name')->get();
25+
$a_users = \PanicHDMember::whereNotNull('ticketit_department')->orderBy('name')->get();
2626

2727
// All departments
2828
$departments = Models\Department::doesntHave('ancestor')->with(['descendants' => function($query){
@@ -49,7 +49,7 @@ public function store(Request $request)
4949

5050
$this->validate($request, $rules);
5151

52-
$user = \App\User::findOrFail($request->input('user_id'));
52+
$user = \PanicHDMember::findOrFail($request->input('user_id'));
5353

5454
$user->ticketit_department = $request->input('department_id');
5555
$user->save();
@@ -65,7 +65,7 @@ public function update(Request $request)
6565
}
6666

6767
public function destroy($id){
68-
$user = \App\User::findOrFail($id);
68+
$user = \PanicHDMember::findOrFail($id);
6969
$user->ticketit_department = null;
7070
$user->save();
7171

0 commit comments

Comments
 (0)