@@ -20,7 +20,7 @@ |
||
| 20 | 20 | public function rules() |
| 21 | 21 | { |
| 22 | 22 | return [ |
| 23 | - 'email' => 'required|exists:users', // Must be a valid email address |
|
| 23 | + 'email' => 'required|exists:users', // Must be a valid email address |
|
| 24 | 24 | 'password' => 'required|string|min:6|confirmed', |
| 25 | 25 | ]; |
| 26 | 26 | } |
@@ -22,12 +22,12 @@ |
||
| 22 | 22 | public function rules() |
| 23 | 23 | { |
| 24 | 24 | return [ |
| 25 | - 'cat_id' => 'required|exists:equipment_categories,name', // Must contain a valid Category ID |
|
| 25 | + 'cat_id' => 'required|exists:equipment_categories,name', // Must contain a valid Category ID |
|
| 26 | 26 | 'name' => [ |
| 27 | 27 | 'required', |
| 28 | 28 | 'string', |
| 29 | - 'regex:/^[a-zA-Z0-9_ ]*$/', // No special characters are allowed |
|
| 30 | - 'unique:equipment_categories', // Equipment with this name must not already exist |
|
| 29 | + 'regex:/^[a-zA-Z0-9_ ]*$/', // No special characters are allowed |
|
| 30 | + 'unique:equipment_categories', // Equipment with this name must not already exist |
|
| 31 | 31 | ], |
| 32 | 32 | 'data_fields' => 'required|array', |
| 33 | 33 | ]; |
@@ -25,8 +25,8 @@ |
||
| 25 | 25 | 'name' => [ |
| 26 | 26 | 'required', |
| 27 | 27 | 'string', |
| 28 | - 'regex:/^[a-zA-Z0-9_ ]*$/', // No special characters are allowed |
|
| 29 | - 'unique:equipment_categories', // Category name must not already exist |
|
| 28 | + 'regex:/^[a-zA-Z0-9_ ]*$/', // No special characters are allowed |
|
| 29 | + 'unique:equipment_categories', // Category name must not already exist |
|
| 30 | 30 | ] |
| 31 | 31 | ]; |
| 32 | 32 | } |
@@ -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'].'%'); |
@@ -27,6 +27,6 @@ |
||
| 27 | 27 | UserCustomerBookmark::where('user_id', Auth::user()->user_id)->where('cust_id', $request->cust_id)->first()->delete(); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - return response()->noContent(); //->json(['success' => true]); |
|
| 30 | + return response()->noContent(); //->json(['success' => true]); |
|
| 31 | 31 | } |
| 32 | 32 | } |
@@ -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 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | if($field !== null) |
| 61 | 61 | { |
| 62 | 62 | // Determine if this is a new or existing field type |
| 63 | - $fieldID = DataFieldType::where('name', $field)->first(); |
|
| 63 | + $fieldID = DataFieldType::where('name', $field)->first(); |
|
| 64 | 64 | if(!$fieldID) |
| 65 | 65 | { |
| 66 | 66 | $fieldID = DataFieldType::create(['name' => $field]); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | if($field !== null) |
| 115 | 115 | { |
| 116 | 116 | // Determine if this is a new or existing field type |
| 117 | - $fieldID = DataFieldType::where('name', $field)->first(); |
|
| 117 | + $fieldID = DataFieldType::where('name', $field)->first(); |
|
| 118 | 118 | if(!$fieldID) |
| 119 | 119 | { |
| 120 | 120 | $fieldID = DataFieldType::create(['name' => $field]); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | { |
| 22 | 22 | $this->configureRateLimiting(); |
| 23 | 23 | |
| 24 | - $this->routes(function () { |
|
| 24 | + $this->routes(function() { |
|
| 25 | 25 | // Route::prefix('api') |
| 26 | 26 | // ->middleware('api') |
| 27 | 27 | // ->namespace($this->namespace) |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | protected function configureRateLimiting() |
| 42 | 42 | { |
| 43 | - RateLimiter::for('api', function (Request $request) { |
|
| 43 | + RateLimiter::for('api', function(Request $request) { |
|
| 44 | 44 | return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip()); |
| 45 | 45 | }); |
| 46 | 46 | } |
@@ -17,8 +17,7 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | public function before(User $user, $method) |
| 19 | 19 | { |
| 20 | - $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) |
|
| 21 | - { |
|
| 20 | + $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) { |
|
| 22 | 21 | $q->where('description', 'Manage Equipment'); |
| 23 | 22 | })->first(); |
| 24 | 23 | |