diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 3fb0b1419..f4766aad9 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -84,5 +84,11 @@ class UserDataGrid extends DataGrid 'route' => 'admin.users.edit', 'icon' => 'icon pencil-lg-icon' ]); + + $this->addAction([ + 'type' => 'Delete', + 'route' => 'admin.users.delete', + 'icon' => 'icon trash-icon' + ]); } } \ No newline at end of file diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php index 73b531547..4acd77335 100755 --- a/packages/Webkul/User/src/Http/Controllers/UserController.php +++ b/packages/Webkul/User/src/Http/Controllers/UserController.php @@ -159,10 +159,7 @@ class UserController extends Controller */ public function destroy($id) { - if ($this->admin->count() == 1) { - session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Admin'])); - } else { - Event::fire('user.admin.delete.before', $id); + Event::fire('user.admin.delete.before', $id); if (auth()->guard('admin')->user()->id == $id) { return view('admin::customers.confirm-password'); @@ -173,7 +170,21 @@ class UserController extends Controller Event::fire('user.admin.delete.after', $id); session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Admin source'])); - } + // if ($this->admin->count() == 1) { + // session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Admin'])); + // } else { + // Event::fire('user.admin.delete.before', $id); + + // if (auth()->guard('admin')->user()->id == $id) { + // return view('admin::customers.confirm-password'); + // } + + // $this->admin->delete($id); + + // Event::fire('user.admin.delete.after', $id); + + // session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Admin source'])); + // } return redirect()->back(); } @@ -208,5 +219,7 @@ class UserController extends Controller return redirect()->route($this->_config['redirect']); } + + return redirect()->route($this->_config['redirect']); } } \ No newline at end of file