@@ -49,12 +49,12 @@ |
||
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 |
@@ -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 | }) |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use App\Customers; |
6 | 6 | use Faker\Generator as Faker; |
7 | 7 | |
8 | -$factory->define(Customers::class, function (Faker $faker) { |
|
8 | +$factory->define(Customers::class, function(Faker $faker) { |
|
9 | 9 | return [ |
10 | 10 | // |
11 | 11 | 'cust_id' => $faker->unique()->numberBetween(50, 10000), |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use App\SystemTypes; |
6 | 6 | use Faker\Generator as Faker; |
7 | 7 | |
8 | -$factory->define(SystemTypes::class, function (Faker $faker) { |
|
8 | +$factory->define(SystemTypes::class, function(Faker $faker) { |
|
9 | 9 | return [ |
10 | 10 | // |
11 | 11 | 'cat_id' => factory(App\SystemCategories::class)->create()->cat_id, |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use App\SystemCategories; |
6 | 6 | use Faker\Generator as Faker; |
7 | 7 | |
8 | -$factory->define(SystemCategories::class, function (Faker $faker) { |
|
8 | +$factory->define(SystemCategories::class, function(Faker $faker) { |
|
9 | 9 | return [ |
10 | 10 | // |
11 | 11 | 'name' => $faker->text(15) |