@@ -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 | }) |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | // Search for a customer |
35 | 35 | public function search(Request $request) |
36 | 36 | { |
37 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
37 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray()); |
|
38 | 38 | |
39 | 39 | $request->validate([ |
40 | 40 | 'sortField' => 'required', |
@@ -49,12 +49,12 @@ discard block |
||
49 | 49 | // Search the name, dba name, and cust id columns |
50 | 50 | ->where(function($query) use ($request) |
51 | 51 | { |
52 | - $query->where('name', 'like', '%' . $request->name . '%') |
|
53 | - ->orWhere('cust_id', 'like', '%' . $request->name . '%') |
|
54 | - ->orWhere('dba_name', 'like', '%' . $request->name . '%'); |
|
52 | + $query->where('name', 'like', '%'.$request->name.'%') |
|
53 | + ->orWhere('cust_id', 'like', '%'.$request->name.'%') |
|
54 | + ->orWhere('dba_name', 'like', '%'.$request->name.'%'); |
|
55 | 55 | }) |
56 | 56 | // Search the city column |
57 | - ->where('city', 'like', '%' . $request->city . '%') |
|
57 | + ->where('city', 'like', '%'.$request->city.'%') |
|
58 | 58 | // Include the customers systems |
59 | 59 | ->with('CustomerSystems.SystemTypes') |
60 | 60 | // If the system field is present - search for system type |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | // Check to see if a customer ID already exists |
80 | 80 | public function checkID($id) |
81 | 81 | { |
82 | - Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name); |
|
82 | + Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name); |
|
83 | 83 | $cust = Customers::find($id); |
84 | 84 | |
85 | 85 | if($cust === null) |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use App\CustomerSystemData; |
6 | 6 | use Faker\Generator as Faker; |
7 | 7 | |
8 | -$factory->define(CustomerSystemData::class, function (Faker $faker) { |
|
8 | +$factory->define(CustomerSystemData::class, function(Faker $faker) { |
|
9 | 9 | return [ |
10 | 10 | // |
11 | 11 | 'cust_sys_id' => factory(App\CustomerSystems::class)->create()->cust_sys_id, |
@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | public function up() |
16 | 16 | { |
17 | - Schema::create('tech_tip_types', function (Blueprint $table) { |
|
17 | + Schema::create('tech_tip_types', function(Blueprint $table) { |
|
18 | 18 | $table->bigIncrements('tip_type_id'); |
19 | 19 | $table->text('description'); |
20 | 20 | $table->timestamps(); |
@@ -59,7 +59,7 @@ |
||
59 | 59 | return [ |
60 | 60 | // |
61 | 61 | 'type' => 'warning', |
62 | - 'message' => 'New Tech Tip Created - ' . $this->details->subject, |
|
62 | + 'message' => 'New Tech Tip Created - '.$this->details->subject, |
|
63 | 63 | 'link' => url(route( |
64 | 64 | 'tip.details', |
65 | 65 | [ |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use App\TechTipFiles; |
6 | 6 | |
7 | -$factory->define(TechTipFiles::class, function () { |
|
7 | +$factory->define(TechTipFiles::class, function() { |
|
8 | 8 | return [ |
9 | 9 | 'tip_id' => factory(App\TechTips::class)->create()->tip_id, |
10 | 10 | 'file_id' => factory(App\Files::class)->create()->file_id, |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use App\TechTipSystems; |
6 | 6 | |
7 | -$factory->define(TechTipSystems::class, function () { |
|
7 | +$factory->define(TechTipSystems::class, function() { |
|
8 | 8 | return [ |
9 | 9 | 'tip_id' => factory(App\TechTips::class)->create()->tip_id, |
10 | 10 | 'sys_id' => factory(App\SystemTypes::class)->create()->sys_id, |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use App\TechTips; |
6 | 6 | use Faker\Generator as Faker; |
7 | 7 | |
8 | -$factory->define(TechTips::class, function (Faker $faker) { |
|
8 | +$factory->define(TechTips::class, function(Faker $faker) { |
|
9 | 9 | return [ |
10 | 10 | 'user_id' => factory(App\User::class)->create()->user_id, |
11 | 11 | 'public' => 0, |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use App\CustomerFileTypes; |
6 | 6 | use Faker\Generator as Faker; |
7 | 7 | |
8 | -$factory->define(CustomerFileTypes::class, function (Faker $faker) { |
|
8 | +$factory->define(CustomerFileTypes::class, function(Faker $faker) { |
|
9 | 9 | return [ |
10 | 10 | 'description' => $faker->unique()->name(), |
11 | 11 | ]; |