@@ -41,14 +41,14 @@ discard block |
||
41 | 41 | |
42 | 42 | Settings::firstOrCreate( |
43 | 43 | ['key' => 'app.logo'], |
44 | - ['key' => 'app.logo', 'value' => '/storage/img/' . $fileName] |
|
45 | - )->update(['value' => '/storage/img/' . $fileName]); |
|
44 | + ['key' => 'app.logo', 'value' => '/storage/img/'.$fileName] |
|
45 | + )->update(['value' => '/storage/img/'.$fileName]); |
|
46 | 46 | |
47 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id); |
|
47 | + Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id); |
|
48 | 48 | Log::debug('Submitted Data - ', $request->toArray()); |
49 | - Log::notice('A new company logo has been uploaded by User ID-' . Auth::user()->user_id); |
|
49 | + Log::notice('A new company logo has been uploaded by User ID-'.Auth::user()->user_id); |
|
50 | 50 | |
51 | - return response()->json(['url' => '/storage/img/' . $fileName]); |
|
51 | + return response()->json(['url' => '/storage/img/'.$fileName]); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | public function configuration() |
@@ -74,14 +74,14 @@ discard block |
||
74 | 74 | ]); |
75 | 75 | |
76 | 76 | // Update the site timezone |
77 | - if (config('app.timezone') !== $request->timezone) { |
|
77 | + if(config('app.timezone') !== $request->timezone) { |
|
78 | 78 | Settings::firstOrCreate( |
79 | 79 | ['key' => 'app.timezone'], |
80 | 80 | ['key' => 'app.timezone', 'value' => $request->timezone] |
81 | 81 | )->update(['value' => $request->timezone]); |
82 | 82 | } |
83 | 83 | // Update the maximum file upload size |
84 | - if (config('filesystems.paths.max_size') !== $request->filesize) { |
|
84 | + if(config('filesystems.paths.max_size') !== $request->filesize) { |
|
85 | 85 | Settings::firstOrCreate( |
86 | 86 | ['key' => 'filesystems.paths.max_size'], |
87 | 87 | ['key' => 'filesystems.paths.max_size', 'value' => $request->filesize] |
@@ -74,14 +74,16 @@ |
||
74 | 74 | ]); |
75 | 75 | |
76 | 76 | // Update the site timezone |
77 | - if (config('app.timezone') !== $request->timezone) { |
|
77 | + if (config('app.timezone') !== $request->timezone) |
|
78 | + { |
|
78 | 79 | Settings::firstOrCreate( |
79 | 80 | ['key' => 'app.timezone'], |
80 | 81 | ['key' => 'app.timezone', 'value' => $request->timezone] |
81 | 82 | )->update(['value' => $request->timezone]); |
82 | 83 | } |
83 | 84 | // Update the maximum file upload size |
84 | - if (config('filesystems.paths.max_size') !== $request->filesize) { |
|
85 | + if (config('filesystems.paths.max_size') !== $request->filesize) |
|
86 | + { |
|
85 | 87 | Settings::firstOrCreate( |
86 | 88 | ['key' => 'filesystems.paths.max_size'], |
87 | 89 | ['key' => 'filesystems.paths.max_size', 'value' => $request->filesize] |
@@ -128,7 +128,8 @@ |
||
128 | 128 | |
129 | 129 | // Update the primary contact information |
130 | 130 | $details = Customers::find($request->cust_id); |
131 | - if ($details->parent_id && $request->shared == 'true') { |
|
131 | + if ($details->parent_id && $request->shared == 'true') |
|
132 | + { |
|
132 | 133 | $request->cust_id = $details->parent_id; |
133 | 134 | } |
134 | 135 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | // Store a new customer contact |
24 | 24 | public function store(Request $request) |
25 | 25 | { |
26 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
26 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
27 | 27 | |
28 | 28 | $request->validate([ |
29 | 29 | 'cust_id' => 'required', |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | // Determine if there is a parent site with shared contacts |
72 | 72 | $parent = Customers::find($id)->parent_id; |
73 | - if ($parent) |
|
73 | + if($parent) |
|
74 | 74 | { |
75 | 75 | $parentList = CustomerContacts::where('cust_id', $parent) |
76 | 76 | ->where('shared', 1) |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | // Update an existing Customer Contact |
122 | 122 | public function update(Request $request, $id) |
123 | 123 | { |
124 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
124 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
125 | 125 | |
126 | 126 | $request->validate([ |
127 | 127 | 'cust_id' => 'required', |
@@ -130,7 +130,7 @@ discard block |
||
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 | $request->cust_id = $details->parent_id; |
135 | 135 | } |
136 | 136 |
@@ -111,7 +111,8 @@ discard block |
||
111 | 111 | |
112 | 112 | // Determine if there is a parent site with shared files |
113 | 113 | $parent = Customers::find($id)->parent_id; |
114 | - if ($parent) { |
|
114 | + if ($parent) |
|
115 | + { |
|
115 | 116 | $parentList = Customerfiles::where('cust_id', $parent) |
116 | 117 | ->where('shared', 1) |
117 | 118 | ->with('Files') |
@@ -135,7 +136,8 @@ discard block |
||
135 | 136 | ]); |
136 | 137 | |
137 | 138 | $details = Customers::find($request->cust_id); |
138 | - if ($details->parent_id && $request->shared == 1) { |
|
139 | + if ($details->parent_id && $request->shared == 1) |
|
140 | + { |
|
139 | 141 | $request->cust_id = $details->parent_id; |
140 | 142 | } |
141 | 143 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | // Store a new customer file |
24 | 24 | public function store(Request $request) |
25 | 25 | { |
26 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
26 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
27 | 27 | // Validate the form |
28 | 28 | $request->validate([ |
29 | 29 | 'cust_id' => 'required', |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | { |
42 | 42 | // Determine if the note should go to the customer, or its parent |
43 | 43 | $details = Customers::find($request->cust_id); |
44 | - if ($details->parent_id && $request->shared == 'true') |
|
44 | + if($details->parent_id && $request->shared == 'true') |
|
45 | 45 | { |
46 | 46 | $request->cust_id = $details->parent_id; |
47 | 47 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | // Get the files for the customer |
91 | 91 | public function show($id) |
92 | 92 | { |
93 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
93 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
94 | 94 | |
95 | 95 | $files = CustomerFiles::where('cust_id', $id) |
96 | 96 | ->with('Files') |
@@ -100,7 +100,7 @@ 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 | $parentList = Customerfiles::where('cust_id', $parent) |
105 | 105 | ->where('shared', 1) |
106 | 106 | ->with('Files') |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | // Update the information of the file, but not the file itself |
118 | 118 | public function update(Request $request, $id) |
119 | 119 | { |
120 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
120 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
121 | 121 | |
122 | 122 | $request->validate([ |
123 | 123 | 'cust_id' => 'required', |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | ]); |
127 | 127 | |
128 | 128 | $details = Customers::find($request->cust_id); |
129 | - if ($details->parent_id && $request->shared == 1) { |
|
129 | + if($details->parent_id && $request->shared == 1) { |
|
130 | 130 | $request->cust_id = $details->parent_id; |
131 | 131 | } |
132 | 132 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $fileID = $data->file_id; |
150 | 150 | $data->delete(); |
151 | 151 | |
152 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
152 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
153 | 153 | Log::info('File Deleted For Customer ID-'.$data->custID.' by '.Auth::user()->full_name.'. File ID - '.$id); |
154 | 154 | |
155 | 155 | // Delete from system if no longer in use |
@@ -33,12 +33,12 @@ |
||
33 | 33 | ], |
34 | 34 | 'paths' => [ |
35 | 35 | 'default' => env('DFLT_FOLDER', DIRECTORY_SEPARATOR.'default'), |
36 | - 'systems' => env('SYS_FOLDER', DIRECTORY_SEPARATOR.'systems'), |
|
36 | + 'systems' => env('SYS_FOLDER', DIRECTORY_SEPARATOR.'systems'), |
|
37 | 37 | 'customers' => env('CUST_FOLDER', DIRECTORY_SEPARATOR.'customers'), |
38 | 38 | 'users' => env('USER_FOLDER', DIRECTORY_SEPARATOR.'users'), |
39 | - 'tips' => env('TIP_FOLDER', DIRECTORY_SEPARATOR.'tips'), |
|
39 | + 'tips' => env('TIP_FOLDER', DIRECTORY_SEPARATOR.'tips'), |
|
40 | 40 | 'links' => env('LINK_FOLDER', DIRECTORY_SEPARATOR.'links'), |
41 | 41 | 'company' => env('COMP_FOLDER', DIRECTORY_SEPARATOR.'company'), |
42 | - 'max_size' => env('MAX_UPLOAD', 1600), // Megabytes = Default = 1600 - 2GB |
|
42 | + 'max_size' => env('MAX_UPLOAD', 1600), // Megabytes = Default = 1600 - 2GB |
|
43 | 43 | ], |
44 | 44 | ]; |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | use SoftDeletes; |
11 | 11 | |
12 | 12 | protected $primaryKey = 'tip_id'; |
13 | - protected $fillable = ['user_id', 'subject', 'tip_type_id', 'description', 'created_at']; // ToDo: Remove Created_at - future build |
|
13 | + protected $fillable = ['user_id', 'subject', 'tip_type_id', 'description', 'created_at']; // ToDo: Remove Created_at - future build |
|
14 | 14 | protected $hidden = ['public', 'user_id', 'tip_type_id']; |
15 | 15 | protected $casts = [ |
16 | 16 | 'created_at' => 'datetime:M d, Y', |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | public function systemTypes() |
21 | 21 | { |
22 | - return $this->hasManyThrough('App\SystemTypes', 'App\TechTipSystems', 'tip_id', 'sys_id', 'tip_id', 'sys_id'); |
|
22 | + return $this->hasManyThrough('App\SystemTypes', 'App\TechTipSystems', 'tip_id', 'sys_id', 'tip_id', 'sys_id'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function user() |
@@ -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 |
@@ -8,7 +8,7 @@ |
||
8 | 8 | { |
9 | 9 | protected $primaryKey = 'comment_id'; |
10 | 10 | protected $fillable = ['tip_id', 'user_id', 'comment']; |
11 | - protected $hidden = [ 'user_id' ]; |
|
11 | + protected $hidden = ['user_id']; |
|
12 | 12 | protected $casts = [ |
13 | 13 | 'created_at' => 'datetime:M d, Y', |
14 | 14 | 'updated_at' => 'datetime:M d, Y', |
@@ -25,7 +25,7 @@ |
||
25 | 25 | if(Auth::user()->password_expires !== null) |
26 | 26 | { |
27 | 27 | $passExp = new Carbon((Auth::user()->password_expires)); |
28 | - if(Carbon::now() > $passExp ) |
|
28 | + if(Carbon::now() > $passExp) |
|
29 | 29 | { |
30 | 30 | Log::notice('User '.Auth::user()->full_name.' is being forced to change their password.'); |
31 | 31 | $request->session()->flash('change_password', 'change_password'); |
@@ -35,12 +35,12 @@ |
||
35 | 35 | Log::debug('Tech Tip Favorites for ' . Auth::user()->full_name . ': ', $tipFavs->toArray()); |
36 | 36 | |
37 | 37 | return view('dashboard', [ |
38 | - 'custFavs' => $custFavs, |
|
39 | - 'tipFavs' => $tipFavs, |
|
40 | - 'tips30' => $tips30Days, |
|
41 | - 'tipsAll' => $tipsTotal, |
|
42 | - 'activeLinks' => $activeLinks, |
|
43 | - 'totalLinks' => $totalLinks, |
|
38 | + 'custFavs' => $custFavs, |
|
39 | + 'tipFavs' => $tipFavs, |
|
40 | + 'tips30' => $tips30Days, |
|
41 | + 'tipsAll' => $tipsTotal, |
|
42 | + 'activeLinks' => $activeLinks, |
|
43 | + 'totalLinks' => $totalLinks, |
|
44 | 44 | ]); |
45 | 45 | } |
46 | 46 |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | $totalLinks = FileLinks::where('user_id', Auth::user()->user_id)->count(); |
31 | 31 | |
32 | 32 | // Debug Data |
33 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
33 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
34 | 34 | Log::debug('Customer Favorites for '.Auth::user()->full_name.': ', $custFavs->toArray()); |
35 | - Log::debug('Tech Tip Favorites for ' . Auth::user()->full_name . ': ', $tipFavs->toArray()); |
|
35 | + Log::debug('Tech Tip Favorites for '.Auth::user()->full_name.': ', $tipFavs->toArray()); |
|
36 | 36 | |
37 | 37 | return view('dashboard', [ |
38 | 38 | 'custFavs' => $custFavs, |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | // About page |
48 | 48 | public function about() |
49 | 49 | { |
50 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
50 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
51 | 51 | |
52 | 52 | return view('about', [ |
53 | 53 | 'branch' => 'latest' |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | public function getNotifications() |
59 | 59 | { |
60 | 60 | // Debug Data |
61 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
61 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
62 | 62 | Log::debug('Notifications for '.Auth::user()->full_name.':', Auth::user()->notifications->toArray()); |
63 | 63 | |
64 | 64 | return Auth::user()->notifications; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | // Mark a notification as read |
68 | 68 | public function markNotification($id) |
69 | 69 | { |
70 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
70 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
71 | 71 | |
72 | 72 | $notification = Auth::user()->notifications()->where('id', $id)->where('notifiable_id', Auth::user()->user_id)->first(); |
73 | 73 | if(!$notification) |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } |
94 | 94 | else |
95 | 95 | { |
96 | - Log::error('User ' . Auth::user()->full_name . ' tried to delete an invalid notification as read. Notification ID: ' . $id); |
|
96 | + Log::error('User '.Auth::user()->full_name.' tried to delete an invalid notification as read. Notification ID: '.$id); |
|
97 | 97 | return abort(404); |
98 | 98 | } |
99 | 99 |