@@ -25,14 +25,14 @@ |
||
25 | 25 | public function boot() |
26 | 26 | { |
27 | 27 | // Service provider to customize form inputs |
28 | - Form::component('bsText', 'components.form.text', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
28 | + Form::component('bsText', 'components.form.text', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
29 | 29 | Form::component('bsPassword', 'components.form.password', ['name', 'label', 'value' => null, 'attributes' => []]); |
30 | - Form::component('bsNumber', 'components.form.number', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
31 | - Form::component('bsEmail', 'components.form.email', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
32 | - Form::component('bsDate', 'components.form.date', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
30 | + Form::component('bsNumber', 'components.form.number', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
31 | + Form::component('bsEmail', 'components.form.email', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
32 | + Form::component('bsDate', 'components.form.date', ['name', 'label', 'value' => null, 'attributes' => []]); |
|
33 | 33 | Form::component('bsTextarea', 'components.form.textarea', ['name', 'label', 'value' => null, 'attributes' => []]); |
34 | 34 | Form::component('bsCheckbox', 'components.form.checkbox', ['name', 'label', 'value' => 'on', 'checked' => false, 'attributes' => []]); |
35 | - Form::component('bsSelect', 'components.form.select', ['name', 'label', 'list', 'selected' => null, 'attributes' => []]); |
|
35 | + Form::component('bsSelect', 'components.form.select', ['name', 'label', 'list', 'selected' => null, 'attributes' => []]); |
|
36 | 36 | // Custom Submit button |
37 | 37 | Form::component('bsSubmit', 'components.form.submit', ['name']); |
38 | 38 | // List of all states in a dropdown box |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | // Get the possible system types that can be assigned to the customer |
25 | 25 | public function index() |
26 | 26 | { |
27 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
27 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
28 | 28 | $sysList = new CategoriesCollection(SystemCategories::with('SystemTypes')->with('SystemTypes.SystemDataFields.SystemDataFieldTypes')->get()); |
29 | 29 | |
30 | 30 | return $sysList; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | // Store a new system for the customer |
34 | 34 | public function store(Request $request) |
35 | 35 | { |
36 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
36 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
37 | 37 | |
38 | 38 | $request->validate([ |
39 | 39 | 'cust_id' => 'required', |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | // Get the list of systems attached to the customer |
77 | 77 | public function show($id) |
78 | 78 | { |
79 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
79 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
80 | 80 | |
81 | 81 | $sysList = CustomerSystems::where('cust_id', $id) |
82 | 82 | ->with('SystemTypes') |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | // Update the customers system data |
106 | 106 | public function update(Request $request, $id) |
107 | 107 | { |
108 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
108 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
109 | 109 | |
110 | 110 | $request->validate([ |
111 | 111 | 'cust_id' => 'required', |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | foreach($fields as $data) |
126 | 126 | { |
127 | - $fieldName = 'field_' . $data->field_id; |
|
127 | + $fieldName = 'field_'.$data->field_id; |
|
128 | 128 | if(isset($request->$fieldName)) |
129 | 129 | { |
130 | 130 | Log::debug($request->$fieldName); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | // Delete a system attached to a customer |
143 | 143 | public function destroy($id) |
144 | 144 | { |
145 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
145 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
146 | 146 | |
147 | 147 | // return response('deleted '.$id); |
148 | 148 | $system = CustomerSystems::find($id); |
@@ -37,13 +37,13 @@ discard block |
||
37 | 37 | // Determine if a user can see the Administration Nav Link |
38 | 38 | public function seeAdminLink(User $user) |
39 | 39 | { |
40 | - if ($this->isInstaller($user)) |
|
40 | + if($this->isInstaller($user)) |
|
41 | 41 | { |
42 | 42 | return true; |
43 | 43 | } |
44 | 44 | |
45 | 45 | $data = UserRolePermissions::with('UserRolePermissionTypes') |
46 | - ->whereHas('UserRolePermissionTypes', function ($query) { |
|
46 | + ->whereHas('UserRolePermissionTypes', function($query) { |
|
47 | 47 | $query->where('description', 'Manage Users') |
48 | 48 | ->orWhere('description', 'Manage User Roles') |
49 | 49 | ->orWhere('description', 'Manage Customers') |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | ->get(); |
55 | 55 | |
56 | 56 | $allow = $data->isEmpty() ? 'Denied' : 'Allowed'; |
57 | - Log::debug('User ' . $user->full_name . ' is trying to see admin link. Result - ' . $allow); |
|
57 | + Log::debug('User '.$user->full_name.' is trying to see admin link. Result - '.$allow); |
|
58 | 58 | |
59 | 59 | return $data->isEmpty() ? false : true; |
60 | 60 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | $data = UserRolePermissions::with('UserRolePermissionTypes') |
72 | - ->whereHas('UserRolePermissionTypes', function ($query) use ($task) { |
|
72 | + ->whereHas('UserRolePermissionTypes', function($query) use ($task) { |
|
73 | 73 | $query->where('description', $task); |
74 | 74 | }) |
75 | 75 | ->where('role_id', $user->role_id) |
@@ -77,10 +77,10 @@ discard block |
||
77 | 77 | ->get(); |
78 | 78 | |
79 | 79 | $allow = $data->isEmpty() ? 'false' : 'true'; |
80 | - Log::debug('User '.$user->full_name.' is trying to access '.$task.'. Result - ' . $allow); |
|
81 | - if ($allow === 'Denied') |
|
80 | + Log::debug('User '.$user->full_name.' is trying to access '.$task.'. Result - '.$allow); |
|
81 | + if($allow === 'Denied') |
|
82 | 82 | { |
83 | - Log::alert('User ' . $user->full_name . ' was denied from accessing '.$task.' link.'); |
|
83 | + Log::alert('User '.$user->full_name.' was denied from accessing '.$task.' link.'); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return $data->isEmpty() ? false : true; |
@@ -22,7 +22,8 @@ discard block |
||
22 | 22 | $this->line(''); |
23 | 23 | // Select which update file to use |
24 | 24 | $updateFile = $this->checkForUpdate(); |
25 | - if($updateFile) { |
|
25 | + if($updateFile) |
|
26 | + { |
|
26 | 27 | // Open up the file and verify it is at least the same version as the current setup |
27 | 28 | $valid = $this->openUpdate($updateFile); |
28 | 29 | |
@@ -80,7 +81,8 @@ discard block |
||
80 | 81 | $this->line(''); |
81 | 82 | |
82 | 83 | $anticipate = []; |
83 | - foreach($updateList as $key => $up) { |
|
84 | + foreach($updateList as $key => $up) |
|
85 | + { |
|
84 | 86 | $opt = $key + 1; |
85 | 87 | $anticipate[$opt] = $up; |
86 | 88 | $this->line('['.$opt.'] '.$up); |
@@ -25,7 +25,8 @@ discard block |
||
25 | 25 | // Validate the hash token |
26 | 26 | $user = UserInitialize::where('token', $hash)->get(); |
27 | 27 | |
28 | - if($user->isEmpty()) { |
|
28 | + if($user->isEmpty()) |
|
29 | + { |
|
29 | 30 | Log::warning('Visitor at IP Address '.\Request::ip().' tried to access invalid initialize hash - '.$hash); |
30 | 31 | return abort(404); |
31 | 32 | } |
@@ -43,7 +44,8 @@ discard block |
||
43 | 44 | |
44 | 45 | // Verify that the link matches the assigned email address |
45 | 46 | $valid = UserInitialize::where('token', $hash)->first(); |
46 | - if(empty($valid)) { |
|
47 | + if(empty($valid)) |
|
48 | + { |
|
47 | 49 | Log::warning('Visitor at IP Address '.\Request::ip().' tried to submit an invalid User Initialization link - '.$hash); |
48 | 50 | return abort(404); |
49 | 51 | } |
@@ -47,8 +47,7 @@ discard block |
||
47 | 47 | $searchResults = new CustomersCollection( |
48 | 48 | Customers::orderBy($request->sortField, $request->sortType) |
49 | 49 | // Search the name, dba name, and cust id columns |
50 | - ->where(function($query) use ($request) |
|
51 | - { |
|
50 | + ->where(function($query) use ($request) { |
|
52 | 51 | $query->where('name', 'like', '%'.$request->name.'%') |
53 | 52 | ->orWhere('cust_id', 'like', '%'.$request->name.'%') |
54 | 53 | ->orWhere('dba_name', 'like', '%'.$request->name.'%'); |
@@ -58,10 +57,8 @@ discard block |
||
58 | 57 | // Include the customers systems |
59 | 58 | ->with('CustomerSystems.SystemTypes') |
60 | 59 | // If the system field is present - search for system type |
61 | - ->when($request->system, function($query) use ($request) |
|
62 | - { |
|
63 | - $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) |
|
64 | - { |
|
60 | + ->when($request->system, function($query) use ($request) { |
|
61 | + $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) { |
|
65 | 62 | $query->where('sys_id', $request->system); |
66 | 63 | }); |
67 | 64 | }) |
@@ -130,7 +130,7 @@ |
||
130 | 130 | |
131 | 131 | // Update the primary contact information |
132 | 132 | $details = Customers::find($request->cust_id); |
133 | - if ($details->parent_id && $request->shared == 'true') |
|
133 | + if($details->parent_id && $request->shared == 'true') |
|
134 | 134 | { |
135 | 135 | $request->cust_id = $details->parent_id; |
136 | 136 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | // Determine if the note should go to the customer, or its parent |
33 | 33 | $details = Customers::find($request->cust_id); |
34 | - if ($details->parent_id && $request->shared == 'true') |
|
34 | + if($details->parent_id && $request->shared == 'true') |
|
35 | 35 | { |
36 | 36 | $request->cust_id = $details->parent_id; |
37 | 37 | } |
@@ -56,21 +56,21 @@ discard block |
||
56 | 56 | |
57 | 57 | // Determine if there is a parent site with shared notes |
58 | 58 | $parent = Customers::find($id)->parent_id; |
59 | - if ($parent) |
|
59 | + if($parent) |
|
60 | 60 | { |
61 | 61 | $parentList = CustomerNotes::where('cust_id', $parent)->where('shared', 1)->orderBy('urgent', 'desc')->get(); |
62 | 62 | |
63 | 63 | $notes = $notes->merge($parentList); |
64 | 64 | } |
65 | 65 | |
66 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
66 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
67 | 67 | return $notes; |
68 | 68 | } |
69 | 69 | |
70 | 70 | // Update a customer note |
71 | 71 | public function update(Request $request, $id) |
72 | 72 | { |
73 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
73 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
74 | 74 | |
75 | 75 | $request->validate([ |
76 | 76 | 'cust_id' => 'required', |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | ]); |
80 | 80 | |
81 | 81 | $details = Customers::find($request->cust_id); |
82 | - if ($details->parent_id && $request->shared == 'true') |
|
82 | + if($details->parent_id && $request->shared == 'true') |
|
83 | 83 | { |
84 | 84 | $request->cust_id = $details->parent_id; |
85 | 85 | } |
@@ -100,7 +100,8 @@ discard block |
||
100 | 100 | |
101 | 101 | // Determine if there is a parent site with shared files |
102 | 102 | $parent = Customers::find($id)->parent_id; |
103 | - if($parent) { |
|
103 | + if($parent) |
|
104 | + { |
|
104 | 105 | $parentList = Customerfiles::where('cust_id', $parent) |
105 | 106 | ->where('shared', 1) |
106 | 107 | ->with('Files') |
@@ -126,7 +127,8 @@ discard block |
||
126 | 127 | ]); |
127 | 128 | |
128 | 129 | $details = Customers::find($request->cust_id); |
129 | - if($details->parent_id && $request->shared == 1) { |
|
130 | + if($details->parent_id && $request->shared == 1) |
|
131 | + { |
|
130 | 132 | $request->cust_id = $details->parent_id; |
131 | 133 | } |
132 | 134 |