@@ -29,8 +29,7 @@ discard block |
||
| 29 | 29 | ($request->city == null && |
| 30 | 30 | $request->name == null && |
| 31 | 31 | $request->equipment == null) |
| 32 | - ) |
|
| 33 | - { |
|
| 32 | + ) { |
|
| 34 | 33 | return $this->getAllCustomers(); |
| 35 | 34 | } |
| 36 | 35 | |
@@ -45,25 +44,20 @@ discard block |
||
| 45 | 44 | { |
| 46 | 45 | return Customer::orderBy($this->sortField, $this->sortType) |
| 47 | 46 | // Search by equipment |
| 48 | - ->when(isset($params['equipment']), function($q) use ($params) |
|
| 49 | - { |
|
| 50 | - $q->whereHas('ParentEquipment', function($q2) use ($params) |
|
| 51 | - { |
|
| 47 | + ->when(isset($params['equipment']), function($q) use ($params) { |
|
| 48 | + $q->whereHas('ParentEquipment', function($q2) use ($params) { |
|
| 52 | 49 | $q2->where('name', $params['equipment']); |
| 53 | 50 | }) |
| 54 | - ->orWhereHas('EquipmentType', function($q2) use ($params) |
|
| 55 | - { |
|
| 51 | + ->orWhereHas('EquipmentType', function($q2) use ($params) { |
|
| 56 | 52 | $q2->where('name', $params['equipment']); |
| 57 | 53 | }); |
| 58 | 54 | }) |
| 59 | 55 | // Search by City |
| 60 | - ->when(isset($params['city']), function($q) use ($params) |
|
| 61 | - { |
|
| 56 | + ->when(isset($params['city']), function($q) use ($params) { |
|
| 62 | 57 | $q->where('city', 'like', '%'.$params['city'].'%'); |
| 63 | 58 | }) |
| 64 | 59 | // Search by Name or ID |
| 65 | - ->when(isset($params['name']), function($q) use ($params) |
|
| 66 | - { |
|
| 60 | + ->when(isset($params['name']), function($q) use ($params) { |
|
| 67 | 61 | $q->where('name', 'like', '%'.$params['name'].'%') |
| 68 | 62 | ->orWhere('cust_id', 'like', '%'.$params['name'].'%') |
| 69 | 63 | ->orWhere('dba_name', 'like', '%'.$params['name'].'%'); |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | // Log::channel('cust')->info('New Customer - '.$request->name.' created by '.Auth::user()->full_name); |
| 46 | 46 | |
| 47 | 47 | event(new NewCustomerCreated($newCust)); |
| 48 | - return redirect(route('customers.show',$newCust->slug))->with(['message' => 'New Customer Created', 'type' => 'success']); |
|
| 48 | + return redirect(route('customers.show', $newCust->slug))->with(['message' => 'New Customer Created', 'type' => 'success']); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | /** |