butcherman / Tech_Bench

app/Policies/CustomerPolicy.php

Braces +2 added lines, -4 removed lines

@@ -42,8 +42,7 @@ 
      */
     public function create(User $user)
     {
-        $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q)
-        {
+        $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) {
             $q->where('description', 'Add Customer');
         })->first();
 
@@ -64,8 +63,7 @@ 
      */
     public function update(User $user, Customer $customer)
     {
-        $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q)
-        {
+        $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) {
             $q->where('description', 'Update Customer');
         })->first();
 

app/Policies/UserPolicy.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
     */
     public function before(User $user, $method)
     {
-        $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q)
-        {
+        $allowed = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) {
             $q->where('description', 'Manage Users');
         })->first();
 

app/Http/Requests/User/InitializeUserRequest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public function rules()
     {
         return [
-            'email'    => 'required|exists:users',              //  Must be a valid email address
+            'email'    => 'required|exists:users', //  Must be a valid email address
             'password' => 'required|string|min:6|confirmed',
         ];
     }

app/Http/Requests/Equipment/EquipmentTypeRequest.php

Spacing +3 added lines, -3 removed lines

@@ -22,12 +22,12 @@
     public function rules()
     {
         return [
-            'cat_id' => 'required|exists:equipment_categories,name',        //  Must contain a valid Category ID
+            'cat_id' => 'required|exists:equipment_categories,name', //  Must contain a valid Category ID
             'name'   => [
                 'required',
                 'string',
-                'regex:/^[a-zA-Z0-9_ ]*$/',                                 //  No special characters are allowed
-                'unique:equipment_categories',                              //  Equipment with this name must not already exist
+                'regex:/^[a-zA-Z0-9_ ]*$/', //  No special characters are allowed
+                'unique:equipment_categories', //  Equipment with this name must not already exist
             ],
             'data_fields' => 'required|array',
         ];

app/Http/Requests/Equipment/EquipmentCategoryRequest.php

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
             'name' => [
                 'required',
                 'string',
-                'regex:/^[a-zA-Z0-9_ ]*$/',     //  No special characters are allowed
-                'unique:equipment_categories',  //  Category name must not already exist
+                'regex:/^[a-zA-Z0-9_ ]*$/', //  No special characters are allowed
+                'unique:equipment_categories', //  Category name must not already exist
             ]
         ];
     }

app/Http/Controllers/Customers/CustomerSearchController.php

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
             ($request->city == null &&
              $request->name == null &&
              $request->equipment == null)
-            )
-        {
+            ) {
             return $this->getAllCustomers();
         }
 
@@ -45,25 +44,20 @@ 
     {
         return Customer::orderBy($this->sortField, $this->sortType)
             //  Search by equipment
-            ->when(isset($params['equipment']), function($q) use ($params)
-            {
-                $q->whereHas('ParentEquipment', function($q2) use ($params)
-                {
+            ->when(isset($params['equipment']), function($q) use ($params) {
+                $q->whereHas('ParentEquipment', function($q2) use ($params) {
                     $q2->where('name', $params['equipment']);
                 })
-                ->orWhereHas('EquipmentType', function($q2) use ($params)
-                {
+                ->orWhereHas('EquipmentType', function($q2) use ($params) {
                     $q2->where('name', $params['equipment']);
                 });
             })
             //  Search by City
-            ->when(isset($params['city']), function($q) use ($params)
-            {
+            ->when(isset($params['city']), function($q) use ($params) {
                 $q->where('city', 'like', '%'.$params['city'].'%');
             })
             //  Search by Name or ID
-            ->when(isset($params['name']), function($q) use ($params)
-            {
+            ->when(isset($params['name']), function($q) use ($params) {
                 $q->where('name', 'like', '%'.$params['name'].'%')
                     ->orWhere('cust_id', 'like', '%'.$params['name'].'%')
                     ->orWhere('dba_name', 'like', '%'.$params['name'].'%');

app/Http/Controllers/Customers/CustomerBookmarksController.php

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
             UserCustomerBookmark::where('user_id', Auth::user()->user_id)->where('cust_id', $request->cust_id)->first()->delete();
         }
 
-        return response()->noContent();              //->json(['success' => true]);
+        return response()->noContent(); //->json(['success' => true]);
     }
 }

app/Http/Controllers/Customers/CustomerEquipmentController.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         {
             CustomerEquipmentData::create([
                 'cust_equip_id' => $newEquip->cust_equip_id,
-                'field_id'      => DataField::where('equip_id', $request->equip_id)->where('type_id', $field['type_id'])->first()->field_id,//  ???
+                'field_id'      => DataField::where('equip_id', $request->equip_id)->where('type_id', $field['type_id'])->first()->field_id, //  ???
                 'value'         => isset($field['value']) ? $field['value'] : null,
             ]);
         }

app/Http/Controllers/Equip/EquipmentTypesController.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
             if($field !== null)
             {
                 //  Determine if this is a new or existing field type
-                $fieldID  = DataFieldType::where('name', $field)->first();
+                $fieldID = DataFieldType::where('name', $field)->first();
                 if(!$fieldID)
                 {
                     $fieldID = DataFieldType::create(['name' => $field]);
@@ -114,7 +114,7 @@ 
             if($field !== null)
             {
                 //  Determine if this is a new or existing field type
-                $fieldID  = DataFieldType::where('name', $field)->first();
+                $fieldID = DataFieldType::where('name', $field)->first();
                 if(!$fieldID)
                 {
                     $fieldID = DataFieldType::create(['name' => $field]);