@@ -34,7 +34,7 @@ |
||
| 34 | 34 | */ |
| 35 | 35 | public function register() |
| 36 | 36 | { |
| 37 | - $this->reportable(function (Throwable $e) { |
|
| 37 | + $this->reportable(function(Throwable $e) { |
|
| 38 | 38 | // |
| 39 | 39 | }); |
| 40 | 40 | } |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | protected function redirectTo($request) |
| 16 | 16 | { |
| 17 | - if (! $request->expectsJson()) { |
|
| 17 | + if(!$request->expectsJson()) { |
|
| 18 | 18 | return route('login.index'); |
| 19 | 19 | } |
| 20 | 20 | } |
@@ -14,7 +14,8 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | protected function redirectTo($request) |
| 16 | 16 | { |
| 17 | - if (! $request->expectsJson()) { |
|
| 17 | + if (! $request->expectsJson()) |
|
| 18 | + { |
|
| 18 | 19 | return route('login.index'); |
| 19 | 20 | } |
| 20 | 21 | } |
@@ -21,8 +21,8 @@ |
||
| 21 | 21 | { |
| 22 | 22 | $guards = empty($guards) ? [null] : $guards; |
| 23 | 23 | |
| 24 | - foreach ($guards as $guard) { |
|
| 25 | - if (Auth::guard($guard)->check()) { |
|
| 24 | + foreach($guards as $guard) { |
|
| 25 | + if(Auth::guard($guard)->check()) { |
|
| 26 | 26 | return redirect(RouteServiceProvider::HOME); |
| 27 | 27 | } |
| 28 | 28 | } |
@@ -21,8 +21,10 @@ |
||
| 21 | 21 | { |
| 22 | 22 | $guards = empty($guards) ? [null] : $guards; |
| 23 | 23 | |
| 24 | - foreach ($guards as $guard) { |
|
| 25 | - if (Auth::guard($guard)->check()) { |
|
| 24 | + foreach ($guards as $guard) |
|
| 25 | + { |
|
| 26 | + if (Auth::guard($guard)->check()) |
|
| 27 | + { |
|
| 26 | 28 | return redirect(RouteServiceProvider::HOME); |
| 27 | 29 | } |
| 28 | 30 | } |
@@ -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'].'%'); |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | { |
| 26 | 26 | CustomerEquipmentData::create([ |
| 27 | 27 | 'cust_equip_id' => $newEquip->cust_equip_id, |
| 28 | - 'field_id' => DataField::where('equip_id', $request->equip_id)->where('type_id', $field['type_id'])->first()->field_id,// ??? |
|
| 28 | + 'field_id' => DataField::where('equip_id', $request->equip_id)->where('type_id', $field['type_id'])->first()->field_id, // ??? |
|
| 29 | 29 | 'value' => isset($field['value']) ? $field['value'] : null, |
| 30 | 30 | ]); |
| 31 | 31 | } |
@@ -12,8 +12,7 @@ |
||
| 12 | 12 | { |
| 13 | 13 | protected function checkPermission(User $user, $description) |
| 14 | 14 | { |
| 15 | - $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) use ($description) |
|
| 16 | - { |
|
| 15 | + $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) use ($description) { |
|
| 17 | 16 | $q->where('description', $description); |
| 18 | 17 | })->first(); |
| 19 | 18 | |
@@ -20,8 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | $status = Password::reset( |
| 22 | 22 | $request->only('email', 'password', 'password_confirmation', 'token'), |
| 23 | - function($user, $password) |
|
| 24 | - { |
|
| 23 | + function($user, $password) { |
|
| 25 | 24 | // Determine the new expiration date |
| 26 | 25 | $expires = config('auth.passwords.settings.expire') ? Carbon::now()->addDays(config('auth.passwords.settings.expire')) : null; |
| 27 | 26 | |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | { |
| 20 | 20 | $this->configureRateLimiting(); |
| 21 | 21 | |
| 22 | - $this->routes(function () |
|
| 22 | + $this->routes(function() |
|
| 23 | 23 | { |
| 24 | 24 | // Basic Login and Logout Routes |
| 25 | 25 | Route::middleware('web') |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | protected function configureRateLimiting() |
| 40 | 40 | { |
| 41 | - RateLimiter::for('api', function (Request $request) { |
|
| 41 | + RateLimiter::for('api', function(Request $request) { |
|
| 42 | 42 | return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip()); |
| 43 | 43 | }); |
| 44 | 44 | } |
@@ -19,8 +19,7 @@ |
||
| 19 | 19 | { |
| 20 | 20 | $this->configureRateLimiting(); |
| 21 | 21 | |
| 22 | - $this->routes(function () |
|
| 23 | - { |
|
| 22 | + $this->routes(function () { |
|
| 24 | 23 | // Basic Login and Logout Routes |
| 25 | 24 | Route::middleware('web') |
| 26 | 25 | ->namespace($this->namespace) |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $newCust = Customer::create($cust); |
| 51 | 51 | |
| 52 | 52 | event(new NewCustomerCreated($newCust)); |
| 53 | - return redirect(route('customers.show',$newCust->slug))->with(['message' => 'New Customer Created', 'type' => 'success']); |
|
| 53 | + return redirect(route('customers.show', $newCust->slug))->with(['message' => 'New Customer Created', 'type' => 'success']); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | ->with('ParentFile.FileUpload') |
| 81 | 81 | ->firstOrFail(); |
| 82 | 82 | // Determine if the customer is bookmarked by the user |
| 83 | - $isFav = UserCustomerBookmark::where('user_id', Auth::user()->user_id) |
|
| 83 | + $isFav = UserCustomerBookmark::where('user_id', Auth::user()->user_id) |
|
| 84 | 84 | ->where('cust_id', $customer->cust_id) |
| 85 | 85 | ->count(); |
| 86 | 86 | |
@@ -90,14 +90,14 @@ discard block |
||
| 90 | 90 | // 'file_types' => CustomerFileType::all(), |
| 91 | 91 | // User Permissions for customers |
| 92 | 92 | 'user_data' => [ |
| 93 | - 'fav' => $isFav, // Customer is bookmarked by the user |
|
| 94 | - 'edit' => Auth::user()->can('update', $customer), // User is allowed to edit the customers basic details |
|
| 95 | - 'manage' => Auth::user()->can('manage', $customer), // User can recover deleted items |
|
| 96 | - 'deactivate' => Auth::user()->can('delete', $customer), // User can deactivate the customer profile |
|
| 93 | + 'fav' => $isFav, // Customer is bookmarked by the user |
|
| 94 | + 'edit' => Auth::user()->can('update', $customer), // User is allowed to edit the customers basic details |
|
| 95 | + 'manage' => Auth::user()->can('manage', $customer), // User can recover deleted items |
|
| 96 | + 'deactivate' => Auth::user()->can('delete', $customer), // User can deactivate the customer profile |
|
| 97 | 97 | 'equipment' => [ |
| 98 | - 'create' => Auth::user()->can('create', CustomerEquipment::class), // If user can add equipment |
|
| 99 | - 'update' => Auth::user()->can('update', CustomerEquipment::class), // If user can edit equipment |
|
| 100 | - 'delete' => Auth::user()->can('delete', CustomerEquipment::class), // If user can delete eqipment |
|
| 98 | + 'create' => Auth::user()->can('create', CustomerEquipment::class), // If user can add equipment |
|
| 99 | + 'update' => Auth::user()->can('update', CustomerEquipment::class), // If user can edit equipment |
|
| 100 | + 'delete' => Auth::user()->can('delete', CustomerEquipment::class), // If user can delete eqipment |
|
| 101 | 101 | ], |
| 102 | 102 | // 'contacts' => [ |
| 103 | 103 | // 'create' => Auth::user()->can('create', CustomerContact::class), // If user can add contact |