From 7b932b32e5a56d7ef126404f10d83264742db9b0 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 28 Apr 2018 11:12:50 +0800
Subject: [PATCH] Move vendor deletion button to vendor edit form

---
 resources/views/vendors/forms.blade.php      | 8 ++++++++
 resources/views/vendors/index.blade.php      | 6 ------
 tests/Feature/Partners/ManageVendorsTest.php | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/resources/views/vendors/forms.blade.php b/resources/views/vendors/forms.blade.php
index d55bbb6..a7e238c 100644
--- a/resources/views/vendors/forms.blade.php
+++ b/resources/views/vendors/forms.blade.php
@@ -21,6 +21,14 @@
     @endif
     {!! Form::submit(trans('vendor.update'), ['class' => 'btn btn-success']) !!}
     {{ link_to_route('vendors.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }}
+    @can('delete', $editableVendor)
+        {!! link_to_route(
+            'vendors.index',
+            trans('app.delete'),
+            ['action' => 'delete', 'id' => $editableVendor->id] + Request::only('page', 'q'),
+            ['id' => 'del-vendor-' . $editableVendor->id, 'class' => 'btn btn-danger pull-right']
+        ) !!}
+    @endcan
     {!! Form::close() !!}
 @endif
 @if (Request::get('action') == 'delete' && $editableVendor)
diff --git a/resources/views/vendors/index.blade.php b/resources/views/vendors/index.blade.php
index 99aa3ae..c0df43f 100644
--- a/resources/views/vendors/index.blade.php
+++ b/resources/views/vendors/index.blade.php
@@ -41,12 +41,6 @@
                                 trans('app.edit'),
                                 ['action' => 'edit', 'id' => $vendor->id] + Request::only('page', 'q'),
                                 ['id' => 'edit-vendor-' . $vendor->id]
-                            ) !!} |
-                            {!! link_to_route(
-                                'vendors.index',
-                                trans('app.delete'),
-                                ['action' => 'delete', 'id' => $vendor->id] + Request::only('page', 'q'),
-                                ['id' => 'del-vendor-' . $vendor->id]
                             ) !!}
                         </td>
                     </tr>
diff --git a/tests/Feature/Partners/ManageVendorsTest.php b/tests/Feature/Partners/ManageVendorsTest.php
index 0e3b2f0..6a47312 100644
--- a/tests/Feature/Partners/ManageVendorsTest.php
+++ b/tests/Feature/Partners/ManageVendorsTest.php
@@ -78,7 +78,7 @@ class ManageVendorsTest extends TestCase
         $this->adminUserSigningIn();
         $vendor = factory(Vendor::class)->create();
 
-        $this->visit(route('vendors.index', [$vendor->id]));
+        $this->visit(route('vendors.index', ['action' => 'edit', 'id' => $vendor->id]));
         $this->click('del-vendor-'.$vendor->id);
         $this->seePageIs(route('vendors.index', ['action' => 'delete', 'id' => $vendor->id]));