From 17d4868ebc7e93113c115300e38b66837aaa3c89 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 20 Feb 2021 22:11:21 +0800
Subject: [PATCH] Move user deletion button

---
 resources/views/users/edit.blade.php               | 48 +---------------------
 .../users/partials/delete_confirmation.blade.php   | 42 +++++++++++++++++++
 .../views/users/partials/edit_nav_tabs.blade.php   |  3 ++
 3 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 resources/views/users/partials/delete_confirmation.blade.php

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 56a6bd7..0ebc548 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -5,48 +5,7 @@
     @can('delete', $user)
         <div class="row">
             <div class="col-md-6 col-md-offset-3">
-                <div class="panel panel-default">
-                    <div class="panel-heading"><h3 class="panel-title">{{ __('user.delete') }} : {{ $user->name }}</h3></div>
-                    <div class="panel-body">
-                        <table class="table table-condensed">
-                            <tr><td>{{ __('user.name') }}</td><td>{{ $user->name }}</td></tr>
-                            <tr><td>{{ __('user.nickname') }}</td><td>{{ $user->nickname }}</td></tr>
-                            <tr><td>{{ __('user.gender') }}</td><td>{{ $user->gender }}</td></tr>
-                            <tr><td>{{ __('user.father') }}</td><td>{{ $user->father_id ? $user->father->name : '' }}</td></tr>
-                            <tr><td>{{ __('user.mother') }}</td><td>{{ $user->mother_id ? $user->mother->name : '' }}</td></tr>
-                            <tr><td>{{ __('user.childs_count') }}</td><td>{{ $childsCount = $user->childs()->count() }}</td></tr>
-                            <tr><td>{{ __('user.spouses_count') }}</td><td>{{ $spousesCount = $user->marriages()->count() }}</td></tr>
-                            <tr><td>{{ __('user.managed_user') }}</td><td>{{ $managedUserCount = $user->managedUsers()->count() }}</td></tr>
-                            <tr><td>{{ __('user.managed_couple') }}</td><td>{{ $managedCoupleCount = $user->managedCouples()->count() }}</td></tr>
-                        </table>
-                        @if ($childsCount + $spousesCount + $managedUserCount + $managedCoupleCount)
-                            {{ __('user.replace_delete_text') }}
-                            {{ Form::open([
-                                'route' => ['users.destroy', $user],
-                                'method' => 'delete',
-                                'onsubmit' => 'return confirm("'.__('user.replace_confirm').'")',
-                            ]) }}
-                            {!! FormField::select('replacement_user_id', $replacementUsers, [
-                                'label' => false,
-                                'placeholder' => __('user.replacement'),
-                            ]) !!}
-                            {{ Form::submit(__('user.replace_delete_button'), [
-                                'name' => 'replace_delete_button',
-                                'class' => 'btn btn-danger',
-                            ]) }}
-                            {{ link_to_route('users.edit', __('app.cancel'), [$user], ['class' => 'btn btn-default pull-right']) }}
-                            {{ Form::close() }}
-                        @else
-                            {!! FormField::delete(
-                                ['route' => ['users.destroy', $user]],
-                                __('user.delete_confirm_button'),
-                                ['class' => 'btn btn-danger'],
-                                ['user_id' => $user->id]
-                            ) !!}
-                            {{ link_to_route('users.edit', __('app.cancel'), [$user], ['class' => 'btn btn-default']) }}
-                        @endif
-                    </div>
-                </div>
+                    @include('users.partials.delete_confirmation')
             </div>
         </div>
     @endcan
@@ -75,11 +34,6 @@
                 {{ Form::close() }}
                 <div class="col-md-6">
                     @includeWhen(request('tab') == null, 'users.partials.update_photo')
-                    @if (request('tab') == null)
-                        @can('delete', $user)
-                            {{ link_to_route('users.edit', __('user.delete'), [$user, 'action' => 'delete'], ['class' => 'btn btn-danger pull-right', 'id' => 'del-user-'.$user->id]) }}
-                        @endcan
-                    @endif
                 </div>
             </div>
         </div>
diff --git a/resources/views/users/partials/delete_confirmation.blade.php b/resources/views/users/partials/delete_confirmation.blade.php
new file mode 100644
index 0000000..4d7e5e8
--- /dev/null
+++ b/resources/views/users/partials/delete_confirmation.blade.php
@@ -0,0 +1,42 @@
+<div class="panel panel-default">
+    <div class="panel-heading"><h3 class="panel-title">{{ __('user.delete') }} : {{ $user->name }}</h3></div>
+    <div class="panel-body">
+        <table class="table table-condensed">
+            <tr><td>{{ __('user.name') }}</td><td>{{ $user->name }}</td></tr>
+            <tr><td>{{ __('user.nickname') }}</td><td>{{ $user->nickname }}</td></tr>
+            <tr><td>{{ __('user.gender') }}</td><td>{{ $user->gender }}</td></tr>
+            <tr><td>{{ __('user.father') }}</td><td>{{ $user->father_id ? $user->father->name : '' }}</td></tr>
+            <tr><td>{{ __('user.mother') }}</td><td>{{ $user->mother_id ? $user->mother->name : '' }}</td></tr>
+            <tr><td>{{ __('user.childs_count') }}</td><td>{{ $childsCount = $user->childs()->count() }}</td></tr>
+            <tr><td>{{ __('user.spouses_count') }}</td><td>{{ $spousesCount = $user->marriages()->count() }}</td></tr>
+            <tr><td>{{ __('user.managed_user') }}</td><td>{{ $managedUserCount = $user->managedUsers()->count() }}</td></tr>
+            <tr><td>{{ __('user.managed_couple') }}</td><td>{{ $managedCoupleCount = $user->managedCouples()->count() }}</td></tr>
+        </table>
+        @if ($childsCount + $spousesCount + $managedUserCount + $managedCoupleCount)
+            {{ __('user.replace_delete_text') }}
+            {{ Form::open([
+                'route' => ['users.destroy', $user],
+                'method' => 'delete',
+                'onsubmit' => 'return confirm("'.__('user.replace_confirm').'")',
+            ]) }}
+            {!! FormField::select('replacement_user_id', $replacementUsers, [
+                'label' => false,
+                'placeholder' => __('user.replacement'),
+            ]) !!}
+            {{ Form::submit(__('user.replace_delete_button'), [
+                'name' => 'replace_delete_button',
+                'class' => 'btn btn-danger',
+            ]) }}
+            {{ link_to_route('users.edit', __('app.cancel'), [$user], ['class' => 'btn btn-default pull-right']) }}
+            {{ Form::close() }}
+        @else
+            {!! FormField::delete(
+                ['route' => ['users.destroy', $user]],
+                __('user.delete_confirm_button'),
+                ['class' => 'btn btn-danger'],
+                ['user_id' => $user->id]
+            ) !!}
+            {{ link_to_route('users.edit', __('app.cancel'), [$user], ['class' => 'btn btn-default']) }}
+        @endif
+    </div>
+</div>
diff --git a/resources/views/users/partials/edit_nav_tabs.blade.php b/resources/views/users/partials/edit_nav_tabs.blade.php
index bd38b19..9ada6aa 100644
--- a/resources/views/users/partials/edit_nav_tabs.blade.php
+++ b/resources/views/users/partials/edit_nav_tabs.blade.php
@@ -14,3 +14,6 @@
     </li>
 </ul>
 <br>
+@can('delete', $user)
+{{ link_to_route('users.edit', __('user.delete'), [$user, 'action' => 'delete'], ['class' => 'btn btn-danger', 'id' => 'del-user-'.$user->id]) }}
+@endcan