From 1ec1c5d83c2513da57716dfcc7d100ac01dae7ea Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Tue, 9 Apr 2019 13:29:31 +0530
Subject: [PATCH] fixed some bugs

---
 .../Webkul/Core/src/Http/Controllers/CurrencyController.php    | 2 +-
 .../Webkul/Ui/src/Resources/views/datagrid/table.blade.php     | 3 ++-
 packages/Webkul/User/src/Http/Controllers/RoleController.php   | 2 +-
 packages/Webkul/User/src/Http/Controllers/UserController.php   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
index 30908bb01..497da79ee 100755
--- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
@@ -134,7 +134,7 @@ class CurrencyController extends Controller
     {
         $currency = $this->currency->findOrFail($id);
 
-        if ($this->currency()->count == 1) {
+        if ($this->currency->count() == 1) {
             sesssion()->flash('warning', trans( 'admin::app.response.last-delete-error', ['name' => 'Currency']));
         } else {
             try {
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
index c322fa8fd..a7c009679 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -708,7 +708,8 @@
                             _method : element.getAttribute('data-method')
                         }).then(function(response) {
                             this.result = response;
-                            // console.log(this.result);
+                            location.reload();
+                        }).catch(function (error) {
                             location.reload();
                         });
 
diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php
index 3abb2f083..8910a3624 100755
--- a/packages/Webkul/User/src/Http/Controllers/RoleController.php
+++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php
@@ -137,7 +137,7 @@ class RoleController extends Controller
         $role = $this->role->findOrFail($id);
 
         if ($role->admins->count() >= 1) {
-            session()->flash('error', trans('admin::app.response.being-used', ['name' => 'Role', 'source' => 'Admin']));
+            session()->flash('error', trans('admin::app.response.being-used', ['name' => 'Role', 'source' => 'Admin User']));
         } else if($this->role->count() == 1) {
             session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Role']));
         } else {
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index c7ed4a520..68e998f52 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -171,7 +171,7 @@ class UserController extends Controller
             }
 
             try {
-                $this->user->delete($id);
+                $this->admin->delete($id);
 
                 session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Admin']));