diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 0259bac..2412b20 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -126,6 +126,7 @@ class UsersController extends Controller 'dod' => 'nullable|date|date_format:Y-m-d', 'yod' => 'nullable|date_format:Y', 'phone' => 'nullable|string|max:255', + 'job' => 'nullable|string|max:255', 'address' => 'nullable|string|max:255', 'city' => 'nullable|string|max:255', 'email' => 'nullable|string|max:255', @@ -145,6 +146,7 @@ class UsersController extends Controller } $user->phone = $request->get('phone'); + $user->job = $request->get('job'); $user->address = $request->get('address'); $user->city = $request->get('city'); $user->email = $request->get('email'); @@ -166,7 +168,8 @@ class UsersController extends Controller */ public function destroy(User $user) { - // + $user->delete('manager_id'); + return redirect()->route('users.search'); } /** diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index a0e407c..b5b0155 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -29,6 +29,7 @@ class CreateUsersTable extends Migration $table->string('address')->nullable(); $table->string('city')->nullable(); $table->string('phone')->nullable(); + $table->string('job')->nullable(); $table->string('photo_path')->nullable(); $table->uuid('manager_id')->nullable(); $table->rememberToken(); diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index 37eeb93..0a3633c 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -21,6 +21,7 @@ return [ 'contact' => 'Contact', 'city' => 'City', 'phone' => 'Phone', + 'job' => 'Job', 'login_account' => 'Login Account', 'childs_were_not_recorded' => 'Childs were not recorded.', diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php index 88de0e6..f77b85f 100644 --- a/resources/lang/en/user.php +++ b/resources/lang/en/user.php @@ -44,6 +44,7 @@ return [ 'address' => 'Address', 'city' => 'City', 'phone' => 'Phone', + 'job' => 'Job', 'manager' => 'Manager', // Photo diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php index 425eeeb..841e93f 100644 --- a/resources/lang/id/app.php +++ b/resources/lang/id/app.php @@ -21,6 +21,7 @@ return [ 'contact' => 'Kontak', 'city' => 'Kota', 'phone' => 'Telp.', + 'job' => 'Pekerjaan', 'login_account' => 'Akun Login', 'childs_were_not_recorded' => 'Anak-anak belum tercatat.', diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php index f417821..9345d39 100644 --- a/resources/lang/id/user.php +++ b/resources/lang/id/user.php @@ -44,6 +44,7 @@ return [ 'address' => 'Alamat', 'city' => 'Kota', 'phone' => 'Telp.', + 'job' => 'Pekerjaan', 'manager' => 'Pengelola', // Photo diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 22f39c9..c15ee64 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -9,6 +9,7 @@
{{ Form::model($user, ['route' => ['users.update', $user->id], 'method' =>'patch', 'autocomplete' => 'off']) }} + {{ Form::model($user, ['route' => ['users.destroy', $user->id], 'method' =>'delete', 'autocomplete' => 'on']) }}

{{ trans('user.edit') }}

@@ -33,6 +34,7 @@ {!! FormField::textarea('address', ['label' => trans('app.address')]) !!} {!! FormField::text('city', ['label' => trans('app.city'), 'placeholder' => trans('app.example').' Jakarta']) !!} {!! FormField::text('phone', ['label' => trans('app.phone'), 'placeholder' => trans('app.example').' 081234567890']) !!} + {!! FormField::text('job', ['label' => trans('app.job'), 'placeholder' => trans('app.example').' Karyawan']) !!}
@@ -44,6 +46,7 @@
{{ Form::submit(trans('app.update'), ['class' => 'btn btn-primary']) }} + {{ Form::submit(trans('app.delete'), ['class' => 'btn btn-danger']) }} {{ link_to_route('users.show', trans('app.cancel'), [$user->id], ['class' => 'btn btn-default']) }}
diff --git a/resources/views/users/search.blade.php b/resources/views/users/search.blade.php index eb139e7..998e3d5 100644 --- a/resources/views/users/search.blade.php +++ b/resources/views/users/search.blade.php @@ -36,6 +36,7 @@
{{ trans('user.father') }} : {{ $user->father_id ? $user->father->name : '' }}
{{ trans('user.mother') }} : {{ $user->mother_id ? $user->mother->name : '' }}
+
{{ trans('user.job') }} : {{ $user->job }}