@@ -81,8 +81,7 @@ |
||
| 81 | 81 | |
| 82 | 82 | // Determine if there is a new password expire's date |
| 83 | 83 | $newExpire = config('auth.passwords.settings.expire') != null ? |
| 84 | - Carbon::now()->addDays(config('auth.passwords.settings.expire')) : |
|
| 85 | - null; |
|
| 84 | + Carbon::now()->addDays(config('auth.passwords.settings.expire')) : null; |
|
| 86 | 85 | |
| 87 | 86 | User::find($userID)->update([ |
| 88 | 87 | 'password' => bcrypt($request->newPass), |
@@ -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 | }) |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | { |
| 38 | 38 | $contact = CustomerContacts::where('cont_id', $contID)->with('CustomerContactPhones')->first(); |
| 39 | 39 | $contactName = explode(' ', $contact->name); |
| 40 | - $contactDetails = collect( (object) [ |
|
| 40 | + $contactDetails = collect((object) [ |
|
| 41 | 41 | 'firstName' => $contactName[0], |
| 42 | 42 | 'lastName' => isset($contactName[1]) ? $contactName[1] : '', |
| 43 | 43 | 'email' => $contact->eamil, |