@@ -17,7 +17,8 @@ |
||
17 | 17 | */ |
18 | 18 | public function handle($request, Closure $next, $guard = null) |
19 | 19 | { |
20 | - if(Auth::guard($guard)->check()) { |
|
20 | + if(Auth::guard($guard)->check()) |
|
21 | + { |
|
21 | 22 | return redirect('/dashboard'); |
22 | 23 | } |
23 | 24 |
@@ -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 | }) |
@@ -35,8 +35,7 @@ |
||
35 | 35 | // Update the users table to include the 'user_role' column |
36 | 36 | if(!Schema::hasColumn('users', 'role_id')) |
37 | 37 | { |
38 | - Schema::table('users', function(Blueprint $table) |
|
39 | - { |
|
38 | + Schema::table('users', function(Blueprint $table) { |
|
40 | 39 | $table->integer('role_id')->unsigned()->after('user_id')->default(4); |
41 | 40 | $table->foreign('role_id')->references('role_id')->on('user_role_types')->onUpdate('cascade'); |
42 | 41 | }); |
@@ -131,8 +131,7 @@ discard block |
||
131 | 131 | public function edit($id) |
132 | 132 | { |
133 | 133 | $fields = SystemDataFieldTypes::all(); |
134 | - $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query) |
|
135 | - { |
|
134 | + $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query) { |
|
136 | 135 | $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id'); |
137 | 136 | }])->withCount('SystemDataFields')->first(); |
138 | 137 | |
@@ -212,7 +211,8 @@ discard block |
||
212 | 211 | public function destroy($id) |
213 | 212 | { |
214 | 213 | // |
215 | - try { |
|
214 | + try |
|
215 | + { |
|
216 | 216 | SystemTypes::find($id)->delete(); |
217 | 217 | return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']); |
218 | 218 | } |
@@ -83,7 +83,8 @@ discard block |
||
83 | 83 | // Added the ability to set an expiration date for user passwords - will force them to change after this expires |
84 | 84 | private function addPasswordExpiresColumn() |
85 | 85 | { |
86 | - if(!Schema::hasColumn('users', 'password_expires')) { |
|
86 | + if(!Schema::hasColumn('users', 'password_expires')) |
|
87 | + { |
|
87 | 88 | Schema::table('users', function(Blueprint $table) { |
88 | 89 | $table->timestamp('password_expires') |
89 | 90 | ->nullable() |
@@ -119,7 +120,8 @@ discard block |
||
119 | 120 | // Added a 'hidden' attribute to system customer data types to allow passwords to not be viewed unless clicked or focus |
120 | 121 | private function addHiddenColumn() |
121 | 122 | { |
122 | - if(!Schema::hasColumn('system_data_field_types', 'hidden')) { |
|
123 | + if(!Schema::hasColumn('system_data_field_types', 'hidden')) |
|
124 | + { |
|
123 | 125 | Schema::table('system_cust_data_types', function(Blueprint $table) { |
124 | 126 | $table->boolean('hidden') |
125 | 127 | ->default(0) |
@@ -131,7 +133,8 @@ discard block |
||
131 | 133 | // Update the File links table - add cust_id and note column |
132 | 134 | private function addColumnsToFileLinksTable() |
133 | 135 | { |
134 | - if(!Schema::hasColumn('file_links', 'cust_id')) { |
|
136 | + if(!Schema::hasColumn('file_links', 'cust_id')) |
|
137 | + { |
|
135 | 138 | Schema::table('file_links', function(Blueprint $table) { |
136 | 139 | $table->integer('cust_id') |
137 | 140 | ->unsigned() |
@@ -140,7 +143,8 @@ discard block |
||
140 | 143 | $table->foreign('cust_id')->references('cust_id')->on('customers')->onUpdate('cascade')->onDelete('cascade'); |
141 | 144 | }); |
142 | 145 | } |
143 | - if(!Schema::hasColumn('file_links', 'note')) { |
|
146 | + if(!Schema::hasColumn('file_links', 'note')) |
|
147 | + { |
|
144 | 148 | Schema::table('file_links', function(Blueprint $table) { |
145 | 149 | $table->longText('note') |
146 | 150 | ->nullable() |
@@ -148,7 +152,8 @@ discard block |
||
148 | 152 | }); |
149 | 153 | // Migrate the instructions from the old table to the new column |
150 | 154 | $instructions = DB::select('SELECT * FROM `file_link_instructions`'); |
151 | - foreach($instructions as $ins) { |
|
155 | + foreach($instructions as $ins) |
|
156 | + { |
|
152 | 157 | FileLinks::find($ins->link_id)->update([ |
153 | 158 | 'note' => $ins->instruction |
154 | 159 | ]); |
@@ -159,7 +164,8 @@ discard block |
||
159 | 164 | // Add Notes column to the file links files table |
160 | 165 | private function addNotesColumnToFileLinkFiles() |
161 | 166 | { |
162 | - if(!Schema::hasColumn('file_link_files', 'note')) { |
|
167 | + if(!Schema::hasColumn('file_link_files', 'note')) |
|
168 | + { |
|
163 | 169 | Schema::table('file_link_files', function(Blueprint $table) { |
164 | 170 | $table->longText('note') |
165 | 171 | ->nullable() |
@@ -167,7 +173,8 @@ discard block |
||
167 | 173 | }); |
168 | 174 | // Migrate the existing notes to the new table |
169 | 175 | $notes = DB::select('SELECT * FROM `file_link_notes`'); |
170 | - foreach($notes as $note) { |
|
176 | + foreach($notes as $note) |
|
177 | + { |
|
171 | 178 | FileLinkFiles::where('file_id', $note->file_id)->update([ |
172 | 179 | 'note' => $note->note |
173 | 180 | ]); |
@@ -178,7 +185,8 @@ discard block |
||
178 | 185 | // Add the documentation column to the tech tips table |
179 | 186 | private function migrateSystemDocumentation() |
180 | 187 | { |
181 | - if(!Schema::hasColumn('tech_tips', 'tip_type_id')) { |
|
188 | + if(!Schema::hasColumn('tech_tips', 'tip_type_id')) |
|
189 | + { |
|
182 | 190 | Schema::table('tech_tips', function(Blueprint $table) { |
183 | 191 | $table->bigInteger('tip_type_id')->unsigned()->after('public')->default(1); |
184 | 192 | $table->foreign('tip_type_id')->references('tip_type_id')->on('tech_tip_types')->onUpdate('cascade'); |
@@ -186,7 +194,8 @@ discard block |
||
186 | 194 | |
187 | 195 | // Move all of the system files over to the tech tips table |
188 | 196 | $sysFiles = DB::select('SELECT * FROM `system_files`'); |
189 | - foreach($sysFiles as $sysFile) { |
|
197 | + foreach($sysFiles as $sysFile) |
|
198 | + { |
|
190 | 199 | $newTip = TechTips::create([ |
191 | 200 | 'user_id' => $sysFile->user_id, |
192 | 201 | 'public' => 0, |
@@ -280,7 +289,8 @@ discard block |
||
280 | 289 | // Remove the system files and system file types table |
281 | 290 | private function removeSystemFilesTables() |
282 | 291 | { |
283 | - if(Schema::hasTable('system_files')) { |
|
292 | + if(Schema::hasTable('system_files')) |
|
293 | + { |
|
284 | 294 | Schema::table('system_files', function(Blueprint $table) { |
285 | 295 | $table->dropForeign(['sys_id']); |
286 | 296 | $table->dropForeign(['type_id']); |
@@ -326,7 +336,8 @@ discard block |
||
326 | 336 | // Add soft deletes to tech tips table to prevent accidental deletes |
327 | 337 | private function addSoftDeleteToTechTips() |
328 | 338 | { |
329 | - if (!Schema::hasColumn('tech_tips', 'deleted_at')) { |
|
339 | + if (!Schema::hasColumn('tech_tips', 'deleted_at')) |
|
340 | + { |
|
330 | 341 | Schema::table('tech_tips', function (Blueprint $table) { |
331 | 342 | $table->softDeletes()->after('description'); |
332 | 343 | }); |
@@ -338,8 +349,7 @@ discard block |
||
338 | 349 | { |
339 | 350 | if(!Schema::hasColumn('users', 'deleted_at')) |
340 | 351 | { |
341 | - Schema::table('users', function(Blueprint $table) |
|
342 | - { |
|
352 | + Schema::table('users', function(Blueprint $table) { |
|
343 | 353 | $table->softDeletes()->after('password_expires'); |
344 | 354 | }); |
345 | 355 | // Migrate over all deactivated users |
@@ -356,34 +366,31 @@ discard block |
||
356 | 366 | { |
357 | 367 | if(!Schema::hasColumn('customers', 'parent_id')) |
358 | 368 | { |
359 | - Schema::table('customers', function(Blueprint $table) |
|
360 | - { |
|
369 | + Schema::table('customers', function(Blueprint $table) { |
|
361 | 370 | $table->integer('parent_id')->after('cust_id')->nullable()->unsigned(); |
362 | 371 | $table->foreign('parent_id')->references('cust_id')->on('customers')->onUpdate('cascade'); |
363 | 372 | }); |
364 | 373 | } |
365 | 374 | if(!Schema::hasColumn('customer_systems', 'shared')) |
366 | 375 | { |
367 | - Schema::table('customer_systems', function (Blueprint $table) |
|
368 | - { |
|
376 | + Schema::table('customer_systems', function (Blueprint $table) { |
|
369 | 377 | $table->boolean('shared')->default(0)->after('sys_id'); |
370 | 378 | }); |
371 | 379 | } |
372 | 380 | if (!Schema::hasColumn('customer_contacts', 'shared')) |
373 | 381 | { |
374 | - Schema::table('customer_contacts', function (Blueprint $table) |
|
375 | - { |
|
382 | + Schema::table('customer_contacts', function (Blueprint $table) { |
|
376 | 383 | $table->boolean('shared')->default(0)->after('cust_id'); |
377 | 384 | }); |
378 | 385 | } |
379 | 386 | if (!Schema::hasColumn('customer_notes', 'shared')) |
380 | 387 | { |
381 | - Schema::table('customer_notes', function (Blueprint $table) |
|
382 | - { |
|
388 | + Schema::table('customer_notes', function (Blueprint $table) { |
|
383 | 389 | $table->boolean('shared')->default(0)->after('user_id'); |
384 | 390 | }); |
385 | 391 | } |
386 | - if (!Schema::hasColumn('customer_files', 'shared')) { |
|
392 | + if (!Schema::hasColumn('customer_files', 'shared')) |
|
393 | + { |
|
387 | 394 | Schema::table('customer_files', function (Blueprint $table) { |
388 | 395 | $table->boolean('shared')->default(0)->after('user_id'); |
389 | 396 | }); |
@@ -43,7 +43,8 @@ discard block |
||
43 | 43 | ]; |
44 | 44 | } |
45 | 45 | $mods = Module::allDisabled(); |
46 | - foreach ($mods as $name => $mod) { |
|
46 | + foreach ($mods as $name => $mod) |
|
47 | + { |
|
47 | 48 | $moduleList[] = [ |
48 | 49 | 'name' => $name, |
49 | 50 | 'status' => 'Disabled', |
@@ -80,7 +81,8 @@ discard block |
||
80 | 81 | $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request)); |
81 | 82 | |
82 | 83 | // Verify that the upload is valid and being processed |
83 | - if ($receiver->isUploaded() === false) { |
|
84 | + if ($receiver->isUploaded() === false) |
|
85 | + { |
|
84 | 86 | Log::error('Upload File Missing - ' . |
85 | 87 | /** @scrutinizer ignore-type */ |
86 | 88 | $request->toArray()); |
@@ -91,7 +93,8 @@ discard block |
||
91 | 93 | $save = $receiver->receive(); |
92 | 94 | |
93 | 95 | // See if the uploade has finished |
94 | - if ($save->isFinished()) { |
|
96 | + if ($save->isFinished()) |
|
97 | + { |
|
95 | 98 | $this->saveFile($save->getFile()); |
96 | 99 | |
97 | 100 | return 'uploaded successfully'; |
@@ -42,8 +42,7 @@ discard block |
||
42 | 42 | /* |
43 | 43 | * File Link Routes |
44 | 44 | */ |
45 | -Route::prefix('links')->name('links.')->group(function () |
|
46 | -{ |
|
45 | +Route::prefix('links')->name('links.')->group(function () { |
|
47 | 46 | // Resource controllers for base access |
48 | 47 | Route::resource('data', 'FileLinks\FileLinksController'); |
49 | 48 | Route::get('new', 'FileLinks\FileLinksController@create') ->name('new'); |
@@ -68,8 +67,7 @@ discard block |
||
68 | 67 | /* |
69 | 68 | * Customer Routes |
70 | 69 | */ |
71 | -Route::prefix('customer')->name('customer.')->group(function() |
|
72 | -{ |
|
70 | +Route::prefix('customer')->name('customer.')->group(function() { |
|
73 | 71 | // Customer Files |
74 | 72 | Route::resource('files', 'Customers\CustomerFilesController'); |
75 | 73 | // Custome Notes |
@@ -97,8 +95,7 @@ discard block |
||
97 | 95 | */ |
98 | 96 | Route::resource('tips', 'TechTips\TechTipsController'); |
99 | 97 | Route::post('submit-edit/{id}', 'TechTips\TechTipsController@update') ->name('tips.submit-edit'); |
100 | -Route::prefix('tip')->name('tip.')->group(function() |
|
101 | -{ |
|
98 | +Route::prefix('tip')->name('tip.')->group(function() { |
|
102 | 99 | Route::resource('comments', 'TechTips\TechTipCommentsController'); |
103 | 100 | Route::get('search', 'TechTips\TechTipsController@search') ->name('search'); |
104 | 101 | Route::get('details/{id}/{name}', 'TechTips\TechTipsController@details') ->name('details'); |
@@ -110,11 +107,9 @@ discard block |
||
110 | 107 | /* |
111 | 108 | * Administration Routes |
112 | 109 | */ |
113 | -Route::prefix('admin')->name('admin.')->group(function () |
|
114 | -{ |
|
110 | +Route::prefix('admin')->name('admin.')->group(function () { |
|
115 | 111 | // Routes for Tech Bench Add-ons |
116 | - Route::prefix('modules')->name('module.')->group(function() |
|
117 | - { |
|
112 | + Route::prefix('modules')->name('module.')->group(function() { |
|
118 | 113 | Route::delete('delete-staged/{name}', 'Installer\ModuleController@delStaged') ->name('deleteStaged'); |
119 | 114 | Route::post('upload', 'Installer\ModuleController@upload') ->name('upload'); |
120 | 115 | Route::get('activate/{name}', 'Installer\ModuleController@activate') ->name('activate'); |
@@ -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 |