Merge 307981f1e0 into e46b40a8b7

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');
     }
 
     /**

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();

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.',
 

resources/lang/en/user.php

@@ -44,6 +44,7 @@ return [
     'address'  => 'Address',
     'city'     => 'City',
     'phone'    => 'Phone',
+    'job'      => 'Job',
     'manager'  => 'Manager',
 
     // Photo

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.',
 

resources/lang/id/user.php

@@ -44,6 +44,7 @@ return [
     'address'  => 'Alamat',
     'city'     => 'Kota',
     'phone'    => 'Telp.',
+    'job'      => 'Pekerjaan',
     'manager'  => 'Pengelola',
 
     // Photo

resources/views/users/edit.blade.php

@@ -9,6 +9,7 @@
     </h2>
     <div class="row">
         {{ Form::model($user, ['route' => ['users.update', $user->id], 'method' =>'patch', 'autocomplete' => 'off']) }}
+        {{ Form::model($user, ['route' => ['users.destroy', $user->id], 'method' =>'delete', 'autocomplete' => 'on']) }}
         <div class="col-md-4">
             <div class="panel panel-default">
                 <div class="panel-heading"><h3 class="panel-title">{{ trans('user.edit') }}</h3></div>
@@ -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']) !!}
                 </div>
             </div>
             <div class="panel panel-default">
@@ -44,6 +46,7 @@
             </div>
             <div class="text-right">
                 {{ 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']) }}
             </div>
         </div>

resources/views/users/search.blade.php

@@ -36,6 +36,7 @@
                 <hr style="margin: 5px 0;">
                 <div>{{ trans('user.father') }} : {{ $user->father_id ? $user->father->name : '' }}</div>
                 <div>{{ trans('user.mother') }} : {{ $user->mother_id ? $user->mother->name : '' }}</div>
+                <div>{{ trans('user.job') }} : {{ $user->job }}</div>
             </div>
             <div class="panel-footer">
                 {{ link_to_route('users.show', trans('app.show_profile'), [$user->id], ['class' => 'btn btn-default btn-xs']) }}

routes/web.php

@@ -27,6 +27,7 @@ Route::post('family-actions/{user}/set-parent', 'FamilyActionsController@setPare
 Route::get('profile-search', 'UsersController@search')->name('users.search');
 Route::get('users/{user}', 'UsersController@show')->name('users.show');
 Route::get('users/{user}/edit', 'UsersController@edit')->name('users.edit');
+Route::delete('users/{user}', 'UsersController@destroy')->name('users.destroy');
 Route::patch('users/{user}', 'UsersController@update')->name('users.update');
 Route::get('users/{user}/chart', 'UsersController@chart')->name('users.chart');
 Route::get('users/{user}/tree', 'UsersController@tree')->name('users.tree');