merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed some bugs

This commit is contained in:
Prashant Singh 2019-04-09 13:29:31 +05:30
parent 1ca1ae5b61
commit 1ec1c5d83c
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
View File

@ -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 {

3
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

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

2
packages/Webkul/User/src/Http/Controllers/RoleController.php
View File

@ -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 {

2
packages/Webkul/User/src/Http/Controllers/UserController.php
View File

@ -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']));