@@ -2,9 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | -use App\Http\Requests; |
|
6 | -use Illuminate\Http\Request; |
|
7 | - |
|
8 | 5 | class HomeController extends Controller |
9 | 6 | { |
10 | 7 | /** |
@@ -26,19 +26,19 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function index() |
28 | 28 | { |
29 | - $user = auth()->user(); |
|
29 | + $user = auth()->user(); |
|
30 | 30 | |
31 | - if(Bouncer::is($user)->a('Administrator', 'Manager')) { |
|
32 | - return redirect()->route('dashboard.administration'); |
|
33 | - } |
|
31 | + if(Bouncer::is($user)->a('Administrator', 'Manager')) { |
|
32 | + return redirect()->route('dashboard.administration'); |
|
33 | + } |
|
34 | 34 | |
35 | - elseif(Bouncer::is($user)->an('Agent')) { |
|
35 | + elseif(Bouncer::is($user)->an('Agent')) { |
|
36 | 36 | return redirect()->route('dashboard.agent'); |
37 | - } |
|
37 | + } |
|
38 | 38 | |
39 | - elseif(Bouncer::is($user)->an('Customer')) { |
|
40 | - return redirect('/'); |
|
41 | - } |
|
39 | + elseif(Bouncer::is($user)->an('Customer')) { |
|
40 | + return redirect('/'); |
|
41 | + } |
|
42 | 42 | return redirect('/'); |
43 | 43 | } |
44 | 44 | |
@@ -50,25 +50,25 @@ discard block |
||
50 | 50 | public function administration() |
51 | 51 | { |
52 | 52 | |
53 | - if (\Auth::check()) { |
|
53 | + if (\Auth::check()) { |
|
54 | 54 | // The user is logged in... |
55 | 55 | |
56 | - $data["chart"] = Charts::create('percentage', 'justgage') |
|
57 | - ->setTitle('') |
|
58 | - ->setElementLabel('Open requests') |
|
59 | - ->setValues([1,0,2]) |
|
60 | - ->setResponsive(false) |
|
61 | - ->setHeight(250) |
|
62 | - ->setWidth(0); |
|
63 | - |
|
64 | - $data["overdue"] = Charts::create('percentage', 'justgage') |
|
65 | - ->setElementLabel('Overdue requests') |
|
66 | - ->setValues([65,0,100]) |
|
67 | - ->setResponsive(false) |
|
68 | - ->setHeight(300) |
|
69 | - ->setWidth(0); |
|
70 | - |
|
71 | - $data["assigned"] = Charts::create('percentage', 'justgage') |
|
56 | + $data["chart"] = Charts::create('percentage', 'justgage') |
|
57 | + ->setTitle('') |
|
58 | + ->setElementLabel('Open requests') |
|
59 | + ->setValues([1,0,2]) |
|
60 | + ->setResponsive(false) |
|
61 | + ->setHeight(250) |
|
62 | + ->setWidth(0); |
|
63 | + |
|
64 | + $data["overdue"] = Charts::create('percentage', 'justgage') |
|
65 | + ->setElementLabel('Overdue requests') |
|
66 | + ->setValues([65,0,100]) |
|
67 | + ->setResponsive(false) |
|
68 | + ->setHeight(300) |
|
69 | + ->setWidth(0); |
|
70 | + |
|
71 | + $data["assigned"] = Charts::create('percentage', 'justgage') |
|
72 | 72 | ->setTitle('') |
73 | 73 | ->setElementLabel('Tasks assigned') |
74 | 74 | ->setValues([10, 0, 2]) |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | public function agent() |
90 | 90 | { |
91 | 91 | |
92 | - if (\Auth::check()) { |
|
92 | + if (\Auth::check()) { |
|
93 | 93 | // The user is logged in... |
94 | 94 | |
95 | 95 |
@@ -28,15 +28,15 @@ discard block |
||
28 | 28 | { |
29 | 29 | $user = auth()->user(); |
30 | 30 | |
31 | - if(Bouncer::is($user)->a('Administrator', 'Manager')) { |
|
31 | + if (Bouncer::is($user)->a('Administrator', 'Manager')) { |
|
32 | 32 | return redirect()->route('dashboard.administration'); |
33 | 33 | } |
34 | 34 | |
35 | - elseif(Bouncer::is($user)->an('Agent')) { |
|
35 | + elseif (Bouncer::is($user)->an('Agent')) { |
|
36 | 36 | return redirect()->route('dashboard.agent'); |
37 | 37 | } |
38 | 38 | |
39 | - elseif(Bouncer::is($user)->an('Customer')) { |
|
39 | + elseif (Bouncer::is($user)->an('Customer')) { |
|
40 | 40 | return redirect('/'); |
41 | 41 | } |
42 | 42 | return redirect('/'); |
@@ -53,25 +53,25 @@ discard block |
||
53 | 53 | if (\Auth::check()) { |
54 | 54 | // The user is logged in... |
55 | 55 | |
56 | - $data["chart"] = Charts::create('percentage', 'justgage') |
|
56 | + $data[ "chart" ] = Charts::create('percentage', 'justgage') |
|
57 | 57 | ->setTitle('') |
58 | 58 | ->setElementLabel('Open requests') |
59 | - ->setValues([1,0,2]) |
|
59 | + ->setValues([ 1, 0, 2 ]) |
|
60 | 60 | ->setResponsive(false) |
61 | 61 | ->setHeight(250) |
62 | 62 | ->setWidth(0); |
63 | 63 | |
64 | - $data["overdue"] = Charts::create('percentage', 'justgage') |
|
64 | + $data[ "overdue" ] = Charts::create('percentage', 'justgage') |
|
65 | 65 | ->setElementLabel('Overdue requests') |
66 | - ->setValues([65,0,100]) |
|
66 | + ->setValues([ 65, 0, 100 ]) |
|
67 | 67 | ->setResponsive(false) |
68 | 68 | ->setHeight(300) |
69 | 69 | ->setWidth(0); |
70 | 70 | |
71 | - $data["assigned"] = Charts::create('percentage', 'justgage') |
|
71 | + $data[ "assigned" ] = Charts::create('percentage', 'justgage') |
|
72 | 72 | ->setTitle('') |
73 | 73 | ->setElementLabel('Tasks assigned') |
74 | -->setValues([10, 0, 2]) |
|
74 | +->setValues([ 10, 0, 2 ]) |
|
75 | 75 | ->setResponsive(false) |
76 | 76 | ->setHeight(250) |
77 | 77 | ->setWidth(0); |
@@ -30,13 +30,9 @@ |
||
30 | 30 | |
31 | 31 | if(Bouncer::is($user)->a('Administrator', 'Manager')) { |
32 | 32 | return redirect()->route('dashboard.administration'); |
33 | - } |
|
34 | - |
|
35 | - elseif(Bouncer::is($user)->an('Agent')) { |
|
33 | + } elseif(Bouncer::is($user)->an('Agent')) { |
|
36 | 34 | return redirect()->route('dashboard.agent'); |
37 | - } |
|
38 | - |
|
39 | - elseif(Bouncer::is($user)->an('Customer')) { |
|
35 | + } elseif(Bouncer::is($user)->an('Customer')) { |
|
40 | 36 | return redirect('/'); |
41 | 37 | } |
42 | 38 | return redirect('/'); |
@@ -50,7 +50,7 @@ |
||
50 | 50 | /** |
51 | 51 | * Save the customer. |
52 | 52 | * |
53 | - * @return \Illuminate\Http\Response |
|
53 | + * @return \Illuminate\Http\RedirectResponse |
|
54 | 54 | */ |
55 | 55 | public function registerCustomer(Request $request) |
56 | 56 | { |
@@ -50,7 +50,7 @@ |
||
50 | 50 | /** |
51 | 51 | * Save the customer. |
52 | 52 | * |
53 | - * @return \Illuminate\Http\Response |
|
53 | + * @return \Illuminate\Http\RedirectResponse |
|
54 | 54 | */ |
55 | 55 | public function registerCustomer(Request $request) |
56 | 56 | { |
@@ -4,8 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | 6 | |
7 | -use App\Http\Requests; |
|
8 | - |
|
9 | 7 | class DepartmentController extends Controller |
10 | 8 | { |
11 | 9 | /** |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function signup() |
43 | 43 | { |
44 | - $data["segments"] = Segments::all(); |
|
45 | - $data['category'] = ProductsCategories::with('products')->paginate(10)->sortBy("name")->all(); |
|
44 | + $data["segments"] = Segments::all(); |
|
45 | + $data['category'] = ProductsCategories::with('products')->paginate(10)->sortBy("name")->all(); |
|
46 | 46 | |
47 | - return view('auth.register', $data); |
|
47 | + return view('auth.register', $data); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
@@ -54,23 +54,23 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function registerCustomer(Request $request) |
56 | 56 | { |
57 | - $customer = new Customer; |
|
58 | - $customer->fname = $request->fname; |
|
59 | - $customer->name = $request->name; |
|
60 | - $customer->address = $request->address; |
|
61 | - $customer->zipcode = $request->zipcode; |
|
62 | - $customer->city = $request->city; |
|
63 | - $customer->country = $request->country; |
|
64 | - $customer->email = $request->email; |
|
65 | - $customer->phone = $request->phone; |
|
66 | - $customer->mobile = $request->mobile; |
|
67 | - $customer->status = 'new'; |
|
57 | + $customer = new Customer; |
|
58 | + $customer->fname = $request->fname; |
|
59 | + $customer->name = $request->name; |
|
60 | + $customer->address = $request->address; |
|
61 | + $customer->zipcode = $request->zipcode; |
|
62 | + $customer->city = $request->city; |
|
63 | + $customer->country = $request->country; |
|
64 | + $customer->email = $request->email; |
|
65 | + $customer->phone = $request->phone; |
|
66 | + $customer->mobile = $request->mobile; |
|
67 | + $customer->status = 'new'; |
|
68 | 68 | |
69 | - $customer->save(); |
|
69 | + $customer->save(); |
|
70 | 70 | |
71 | - session()->flash('message', trans('customers.registered')); |
|
71 | + session()->flash('message', trans('customers.registered')); |
|
72 | 72 | |
73 | - return redirect()->to('/'); |
|
73 | + return redirect()->to('/'); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | |
47 | 47 | protected function authenticated() |
48 | 48 | { |
49 | - $user = auth()->user(); |
|
49 | + $user = auth()->user(); |
|
50 | 50 | |
51 | 51 | if(Bouncer::is($user)->a('Administrator', 'Manager')) { |
52 | 52 | return redirect()->route('dashboard.administration'); |
53 | 53 | } |
54 | 54 | |
55 | 55 | elseif(Bouncer::is($user)->an('Agents')) { |
56 | - return redirect()->route('dashboard.agent'); |
|
56 | + return redirect()->route('dashboard.agent'); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | elseif(Bouncer::is($user)->an('Customer')) { |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | return redirect('/'); |
64 | - } |
|
64 | + } |
|
65 | 65 | |
66 | 66 | /** |
67 | 67 | * Get a validator for an incoming registration request. |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function __construct() |
40 | 40 | { |
41 | - $this->middleware($this->guestMiddleware(), ['except' => 'logout']); |
|
41 | + $this->middleware($this->guestMiddleware(), [ 'except' => 'logout' ]); |
|
42 | 42 | $this->middleware('lang'); |
43 | 43 | |
44 | 44 | } |
@@ -48,15 +48,15 @@ discard block |
||
48 | 48 | { |
49 | 49 | $user = auth()->user(); |
50 | 50 | |
51 | - if(Bouncer::is($user)->a('Administrator', 'Manager')) { |
|
51 | + if (Bouncer::is($user)->a('Administrator', 'Manager')) { |
|
52 | 52 | return redirect()->route('dashboard.administration'); |
53 | 53 | } |
54 | 54 | |
55 | - elseif(Bouncer::is($user)->an('Agents')) { |
|
55 | + elseif (Bouncer::is($user)->an('Agents')) { |
|
56 | 56 | return redirect()->route('dashboard.agent'); |
57 | 57 | } |
58 | 58 | |
59 | - elseif(Bouncer::is($user)->an('Customer')) { |
|
59 | + elseif (Bouncer::is($user)->an('Customer')) { |
|
60 | 60 | return redirect('/'); |
61 | 61 | } |
62 | 62 | |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | protected function create(array $data) |
89 | 89 | { |
90 | 90 | $newUser = User::create([ |
91 | - 'fname' => $data['fname'], |
|
92 | - 'name' => $data['name'], |
|
93 | - 'email' => $data['email'], |
|
94 | - 'password' => bcrypt($data['password']), |
|
91 | + 'fname' => $data[ 'fname' ], |
|
92 | + 'name' => $data[ 'name' ], |
|
93 | + 'email' => $data[ 'email' ], |
|
94 | + 'password' => bcrypt($data[ 'password' ]), |
|
95 | 95 | ]); |
96 | 96 | |
97 | 97 | Bouncer::assign('Guest')->to($newUser); |
@@ -50,13 +50,9 @@ |
||
50 | 50 | |
51 | 51 | if(Bouncer::is($user)->a('Administrator', 'Manager')) { |
52 | 52 | return redirect()->route('dashboard.administration'); |
53 | - } |
|
54 | - |
|
55 | - elseif(Bouncer::is($user)->an('Agents')) { |
|
53 | + } elseif(Bouncer::is($user)->an('Agents')) { |
|
56 | 54 | return redirect()->route('dashboard.agent'); |
57 | - } |
|
58 | - |
|
59 | - elseif(Bouncer::is($user)->an('Customer')) { |
|
55 | + } elseif(Bouncer::is($user)->an('Customer')) { |
|
60 | 56 | return redirect('/'); |
61 | 57 | } |
62 | 58 |