Completed
Pull Request — master (#124)
by Glenn
03:18
created
app/Permissions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,5 +19,5 @@
 block discarded – undo
19 19
      *
20 20
      * @var array
21 21
      */
22
-    protected $fillable = ['name'];
22
+    protected $fillable = [ 'name' ];
23 23
 }
Please login to merge, or discard this patch.
app/Http/Controllers/RolesController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
      */
17 17
     public function index()
18 18
     {
19
-    	$data['roles'] = Roles::all();
19
+    	$data[ 'roles' ] = Roles::all();
20 20
     	return view('roles.index', $data);
21 21
     }
22 22
 
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
     public function search(Request $request)
30 30
     {
31 31
         $term = $request->get('term');
32
-        $data['roles'] = Roles::where('name', 'LIKE', "$term")->get();
32
+        $data[ 'roles' ] = Roles::where('name', 'LIKE', "$term")->get();
33 33
         return view('roles.index', $data);
34 34
     }
35 35
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public function show($id)
43 43
     {
44
-        $data['query'] = Roles::find($id);
44
+        $data[ 'query' ] = Roles::find($id);
45 45
         return view('roles.specific', $data);
46 46
     }
47 47
 
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
      */
76 76
     public function edit($id)
77 77
     {
78
-        $data['query'] = Roles::find($id);
79
-        $data['permissions'] = Permissions::orderBy('name', 'asc')->get();
78
+        $data[ 'query' ] = Roles::find($id);
79
+        $data[ 'permissions' ] = Permissions::orderBy('name', 'asc')->get();
80 80
 
81 81
         return view('roles.edit', $data);
82 82
     }
Please login to merge, or discard this patch.
app/Http/Controllers/StaffController.php 3 patches
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -64,36 +64,36 @@  discard block
 block discarded – undo
64 64
 
65 65
         if ($user->is('Manager') || $user->is('Administrator'))
66 66
         {
67
-          $password = $faker->password;
68
-          // Save the user to the database.
69
-          $NewUser = User::create(
67
+            $password = $faker->password;
68
+            // Save the user to the database.
69
+            $NewUser = User::create(
70 70
             [
71
-              'fname'     => $input->fname,
72
-              'name'      => $input->name,
73
-              'email'     => $input->email,
74
-              'password'  => \Hash::make($password),
75
-              'biography' => nl2br($input->biography),
71
+                'fname'     => $input->fname,
72
+                'name'      => $input->name,
73
+                'email'     => $input->email,
74
+                'password'  => \Hash::make($password),
75
+                'biography' => nl2br($input->biography),
76 76
             ]
77
-          )->id;
78
-          // Assign the user to the selected department
77
+            )->id;
78
+            // Assign the user to the selected department
79 79
             User::find($NewUser)->departments()->attach($input->department);
80
-          // Assign the user to the selected role.
80
+            // Assign the user to the selected role.
81 81
             Bouncer::assign($input->role)->to($user);
82
-         // Send a confirmation mail to the user.
82
+            // Send a confirmation mail to the user.
83 83
             Mail::send('emails.welcome', ['user' => $NewUser, 'password' => $password], function ($message) use ($user)
84 84
             {
85
-              $message->from(env('MAIL_USERNAME'));
86
-              $message->to('[email protected]', 'John Smith')->subject('Welcome to Ring Me!');
85
+                $message->from(env('MAIL_USERNAME'));
86
+                $message->to('[email protected]', 'John Smith')->subject('Welcome to Ring Me!');
87 87
             }
88
-          );
89
-          session()->flash('message', 'The new user has been created and is assigned to his department and role.');
90
-          return redirect("staff");
91
-         }
92
-         else
93
-         {
94
-          return redirect()->back(302);
95
-         }
96
-       }
88
+            );
89
+            session()->flash('message', 'The new user has been created and is assigned to his department and role.');
90
+            return redirect("staff");
91
+            }
92
+            else
93
+            {
94
+            return redirect()->back(302);
95
+            }
96
+        }
97 97
 
98 98
     /**
99 99
      * Update the staff member.
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
128 128
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
129 129
      */
130 130
     public function index()
131
-	{
131
+    {
132 132
         $data["departments"] = Departments::all();
133
-		$data['users'] = User::paginate(15);
134
-    	return view('users/index', $data);
133
+        $data['users'] = User::paginate(15);
134
+        return view('users/index', $data);
135 135
     }
136 136
 
137 137
     /**
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
     {
172 172
         $id = auth()->user()->id;
173 173
         $data['tokens'] = ApiKey::where('user_id', $id)->get();
174
-    	return view('users/profile', $data);
174
+        return view('users/profile', $data);
175 175
     }
176 176
 
177 177
     /**
@@ -193,11 +193,11 @@  discard block
 block discarded – undo
193 193
         session()->flash('message', 'The user has been removed.');
194 194
 
195 195
         return redirect()->to('/staff');
196
-      }
197
-      else
198
-      {
196
+        }
197
+        else
198
+        {
199 199
         return redirect()->back();
200
-      }
200
+        }
201 201
     }
202 202
 
203 203
     public function get_roles()
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
         $data2 = [];
207 207
         foreach($items as $role)
208 208
         {
209
-         $data2[] = [
209
+            $data2[] = [
210 210
         'value' => $role["id"],
211 211
         'text'  => $role["name"]
212 212
         ];
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
         $user = auth()->user();
42 42
 
43 43
         if ($user->is('Manager') || $user->is('Administrator')) {
44
-            $data['departments'] = Departments::all();
45
-            $data['roles'] = Roles::all();
44
+            $data[ 'departments' ] = Departments::all();
45
+            $data[ 'roles' ] = Roles::all();
46 46
 
47 47
             return view('staff.create', $data);
48 48
         }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
           // Assign the user to the selected role.
81 81
             Bouncer::assign($input->role)->to($user);
82 82
          // Send a confirmation mail to the user.
83
-            Mail::send('emails.welcome', ['user' => $NewUser, 'password' => $password], function ($message) use ($user)
83
+            Mail::send('emails.welcome', [ 'user' => $NewUser, 'password' => $password ], function($message) use ($user)
84 84
             {
85 85
               $message->from(env('MAIL_USERNAME'));
86 86
               $message->to('[email protected]', 'John Smith')->subject('Welcome to Ring Me!');
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
      */
106 106
     public function update(Requests\NewStaffValidator $input, $id)
107 107
     {
108
-        User::find($id)-update($input->except('_token'));
108
+        User::find($id) - update($input->except('_token'));
109 109
         //session()->flash('message', 'Staff member has been updated');
110 110
 
111 111
     }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
      */
119 119
     public function edit($id)
120 120
     {
121
-        $data['query'] = User::find($id);
121
+        $data[ 'query' ] = User::find($id);
122 122
         return view('staff.edit', $data);
123 123
     }
124 124
 
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
      */
130 130
     public function index()
131 131
 	{
132
-        $data["departments"] = Departments::all();
133
-		$data['users'] = User::paginate(15);
132
+        $data[ "departments" ] = Departments::all();
133
+		$data[ 'users' ] = User::paginate(15);
134 134
     	return view('users/index', $data);
135 135
     }
136 136
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
     public function profile()
171 171
     {
172 172
         $id = auth()->user()->id;
173
-        $data['tokens'] = ApiKey::where('user_id', $id)->get();
173
+        $data[ 'tokens' ] = ApiKey::where('user_id', $id)->get();
174 174
     	return view('users/profile', $data);
175 175
     }
176 176
 
@@ -184,10 +184,10 @@  discard block
 block discarded – undo
184 184
     {
185 185
         $user = auth()->user();
186 186
 
187
-        if (! $user->is('Manager') || ! $user->is('Administrator')) {
187
+        if (!$user->is('Manager') || !$user->is('Administrator')) {
188 188
 
189 189
         $user = User::find($id);
190
-        $user->roles()->sync([]);
190
+        $user->roles()->sync([ ]);
191 191
 
192 192
         User::destroy($id);
193 193
         session()->flash('message', 'The user has been removed.');
@@ -203,12 +203,12 @@  discard block
 block discarded – undo
203 203
     public function get_roles()
204 204
     {
205 205
         $items = Roles::all();
206
-        $data2 = [];
207
-        foreach($items as $role)
206
+        $data2 = [ ];
207
+        foreach ($items as $role)
208 208
         {
209
-         $data2[] = [
210
-        'value' => $role["id"],
211
-        'text'  => $role["name"]
209
+         $data2[ ] = [
210
+        'value' => $role[ "id" ],
211
+        'text'  => $role[ "name" ]
212 212
         ];
213 213
 
214 214
         }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -88,8 +88,7 @@  discard block
 block discarded – undo
88 88
           );
89 89
           session()->flash('message', 'The new user has been created and is assigned to his department and role.');
90 90
           return redirect("staff");
91
-         }
92
-         else
91
+         } else
93 92
          {
94 93
           return redirect()->back(302);
95 94
          }
@@ -193,8 +192,7 @@  discard block
 block discarded – undo
193 192
         session()->flash('message', 'The user has been removed.');
194 193
 
195 194
         return redirect()->to('/staff');
196
-      }
197
-      else
195
+      } else
198 196
       {
199 197
         return redirect()->back();
200 198
       }
Please login to merge, or discard this patch.
app/Http/Controllers/CallbackController.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
     {
36 36
         $data['callback'] = Callback::with('users', 'customers', 'departments')->get();
37 37
         $data['users'] = User::all();
38
-    	return view('callbacks/list', $data);
38
+        return view('callbacks/list', $data);
39 39
     }
40 40
 
41 41
 
@@ -64,31 +64,31 @@  discard block
 block discarded – undo
64 64
     {
65 65
         $user = auth()->user();
66 66
 
67
-      //  Callback::create($input->except('_token', 'product', 'description'));
68
-      $faker = \Faker\Factory::create();
69
-      $Callback = new Callback;
67
+        //  Callback::create($input->except('_token', 'product', 'description'));
68
+        $faker = \Faker\Factory::create();
69
+        $Callback = new Callback;
70 70
 
71
-      $Callback->type = $faker->numberBetween($min = 1, $max = 3);
72
-      $Callback->customer = $faker->numberBetween($min = 1, $max = 9);
73
-      $Callback->agent_id = '1';
74
-      $Callback->description = $request->description;
75
-      $Callback->status = 'Open';
71
+        $Callback->type = $faker->numberBetween($min = 1, $max = 3);
72
+        $Callback->customer = $faker->numberBetween($min = 1, $max = 9);
73
+        $Callback->agent_id = '1';
74
+        $Callback->description = $request->description;
75
+        $Callback->status = 'Open';
76 76
 
77
-      $Callback->save();
77
+        $Callback->save();
78 78
 
79
-      // Send confirmation email to the customer.
79
+        // Send confirmation email to the customer.
80 80
         Mail::send('emails.request', ['user' => $user, 'callback' => $Callback], function ($m) use ($user) {
81
-           $m->from('[email protected]', 'Ring Me');
81
+            $m->from('[email protected]', 'Ring Me');
82 82
 
83
-           $m->to($user->email, $user->fname)->subject('Call back requested');
84
-       });
83
+            $m->to($user->email, $user->fname)->subject('Call back requested');
84
+        });
85 85
 
86
-     // Send request email to the agent.
87
-       Mail::send('emails.request', ['user' => $user, 'callback' => $Callback], function ($m) use ($user) {
88
-          $m->from('[email protected]', 'Ring Me');
86
+        // Send request email to the agent.
87
+        Mail::send('emails.request', ['user' => $user, 'callback' => $Callback], function ($m) use ($user) {
88
+            $m->from('[email protected]', 'Ring Me');
89 89
 
90
-          $m->to("[email protected]")->subject('Call back request!');
91
-      });
90
+            $m->to("[email protected]")->subject('Call back request!');
91
+        });
92 92
         return back();
93 93
     }
94 94
 
@@ -122,9 +122,9 @@  discard block
 block discarded – undo
122 122
 
123 123
         if (! $user->is('Agent') || ! $user->is('Manager') || ! $user->is('Administrator')) {
124 124
 
125
-          $callback = Callback::find($id);
126
-          $callback->delete();
127
-          return redirect('callbacks');
125
+            $callback = Callback::find($id);
126
+            $callback->delete();
127
+            return redirect('callbacks');
128 128
         }
129 129
 
130 130
         return redirect()->back(302);
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
      */
34 34
     public function index()
35 35
     {
36
-        $data['callback'] = Callback::with('users', 'customers', 'departments')->get();
37
-        $data['users'] = User::all();
36
+        $data[ 'callback' ] = Callback::with('users', 'customers', 'departments')->get();
37
+        $data[ 'users' ] = User::all();
38 38
     	return view('callbacks/list', $data);
39 39
     }
40 40
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     {
49 49
         $user = auth()->user();
50 50
 
51
-        if (! $user->is('Agent') || ! $user->is('Manager') || ! $user->is('Administrator')) {
51
+        if (!$user->is('Agent') || !$user->is('Manager') || !$user->is('Administrator')) {
52 52
             return redirect()->back();
53 53
         }
54 54
 
@@ -77,14 +77,14 @@  discard block
 block discarded – undo
77 77
       $Callback->save();
78 78
 
79 79
       // Send confirmation email to the customer.
80
-        Mail::send('emails.request', ['user' => $user, 'callback' => $Callback], function ($m) use ($user) {
80
+        Mail::send('emails.request', [ 'user' => $user, 'callback' => $Callback ], function($m) use ($user) {
81 81
            $m->from('[email protected]', 'Ring Me');
82 82
 
83 83
            $m->to($user->email, $user->fname)->subject('Call back requested');
84 84
        });
85 85
 
86 86
      // Send request email to the agent.
87
-       Mail::send('emails.request', ['user' => $user, 'callback' => $Callback], function ($m) use ($user) {
87
+       Mail::send('emails.request', [ 'user' => $user, 'callback' => $Callback ], function($m) use ($user) {
88 88
           $m->from('[email protected]', 'Ring Me');
89 89
 
90 90
           $m->to("[email protected]")->subject('Call back request!');
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     public function edit($id)
102 102
     {
103 103
         $user = auth()->user();
104
-        $data['item'] = Callback::find($id);
104
+        $data[ 'item' ] = Callback::find($id);
105 105
 
106 106
         if ($user->is('Agent') || $user->is('Manager') || $user->is('Administrator')) {
107 107
             return view('callbacks/details', $data);
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
     {
121 121
         $user = auth()->user();
122 122
 
123
-        if (! $user->is('Agent') || ! $user->is('Manager') || ! $user->is('Administrator')) {
123
+        if (!$user->is('Agent') || !$user->is('Manager') || !$user->is('Administrator')) {
124 124
 
125 125
           $callback = Callback::find($id);
126 126
           $callback->delete();
Please login to merge, or discard this patch.
app/Http/Controllers/CustomersController.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
      */
28 28
     public function index()
29 29
     {
30
-      $user = auth()->user();
30
+        $user = auth()->user();
31 31
 
32
-      if ($user->is('Agent') || $user->is('Manager') || $user->is('Administrator')) {
32
+        if ($user->is('Agent') || $user->is('Manager') || $user->is('Administrator')) {
33 33
         $data['customers'] = Customer::orderBy('status' , 'asc')->paginate(15);
34 34
         return view('customers/index', $data);
35
-      }
35
+        }
36 36
         return redirect()->back();
37 37
     }
38 38
 
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
 
66 66
         if (! $user->is('Guest') || ! $user->is('Agent') || ! $user->is('Manager') || ! $user->is('Administrator'))
67 67
         {
68
-          Customer::create($input->except('_token'));
69
-          session()->flash('message', 'Customer created');
70
-          return redirect()->to('/customers');
68
+            Customer::create($input->except('_token'));
69
+            session()->flash('message', 'Customer created');
70
+            return redirect()->to('/customers');
71 71
         }
72 72
 
73 73
         return redirect()->back();
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
         $user = auth()->user();
85 85
 
86 86
         if(! $user->is('Customer') || ! $user->is('Agent') || ! $user->is('Manager') || ! $user->is('Administrator')) {
87
-          $data['customer'] = Customer::where('id', $id)->get();
88
-          return view('customers/edit', $data);
87
+            $data['customer'] = Customer::where('id', $id)->get();
88
+            return view('customers/edit', $data);
89 89
 
90
-      }
90
+        }
91 91
 
92 92
         return redirect()->back();
93 93
     }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
       $user = auth()->user();
31 31
 
32 32
       if ($user->is('Agent') || $user->is('Manager') || $user->is('Administrator')) {
33
-        $data['customers'] = Customer::orderBy('status' , 'asc')->paginate(15);
33
+        $data[ 'customers' ] = Customer::orderBy('status', 'asc')->paginate(15);
34 34
         return view('customers/index', $data);
35 35
       }
36 36
         return redirect()->back();
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         $user = auth()->user();
47 47
 
48 48
         if ($user->is('Guest') || $user->is('Agent') || $user->is('Manager') || $user->is('Administrator')) {
49
-            $data['countries'] = Countries::all();
49
+            $data[ 'countries' ] = Countries::all();
50 50
             return view('customers/register', $data);
51 51
         }
52 52
 
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     {
64 64
         $user = auth()->user();
65 65
 
66
-        if (! $user->is('Guest') || ! $user->is('Agent') || ! $user->is('Manager') || ! $user->is('Administrator'))
66
+        if (!$user->is('Guest') || !$user->is('Agent') || !$user->is('Manager') || !$user->is('Administrator'))
67 67
         {
68 68
           Customer::create($input->except('_token'));
69 69
           session()->flash('message', 'Customer created');
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
     {
84 84
         $user = auth()->user();
85 85
 
86
-        if(! $user->is('Customer') || ! $user->is('Agent') || ! $user->is('Manager') || ! $user->is('Administrator')) {
87
-          $data['customer'] = Customer::where('id', $id)->get();
86
+        if (!$user->is('Customer') || !$user->is('Agent') || !$user->is('Manager') || !$user->is('Administrator')) {
87
+          $data[ 'customer' ] = Customer::where('id', $id)->get();
88 88
           return view('customers/edit', $data);
89 89
 
90 90
       }
Please login to merge, or discard this patch.