diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index fe7cb37249..79d1e2925b 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -435,6 +435,10 @@ class UsersController extends Controller if ($request->filled('department_id')) { $update_array['department_id'] = $request->input('department_id'); } + if ($request->filled('city')) { + $update_array['city'] = $request->input('city'); + } + if ($request->filled('company_id')) { $update_array['company_id'] = $request->input('company_id'); } diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index e85767d413..fbcc9fdb23 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -55,6 +55,15 @@ + +
+ +
+ + {!! $errors->first('city', '') !!} +
+
+
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 18d8445559..a3946e1e0e 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -142,6 +142,26 @@ {{ trans('admin/users/table.name') }} {{ $user->present()->fullName() }} + + @if (($user->address) || ($user->city) || ($user->state) || ($user->country)) + + {{ trans('general.address') }} + + @if ($user->address) + {{ $user->address }}
+ @endif + @if ($user->city) + {{ $user->city }} + @endif + @if ($user->state) + {{ $user->state }} + @endif + @if ($user->country) + {{ $user->country }} + @endif + + @endif + {{ trans('admin/users/table.username') }} {{ $user->username }} @@ -304,7 +324,7 @@ {{ trans('admin/users/general.edit') }}
@endcan - + @can('create', $user)
{{ trans('admin/users/general.clone') }}