diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 13b099264..e14b12555 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -128,12 +128,14 @@ class AttributeDataGrid extends DataGrid { $this->addAction([ 'type' => 'Edit', + 'method' => strtoupper('get'), // use get request for only redirect purposes 'route' => 'admin.catalog.attributes.edit', 'icon' => 'icon pencil-lg-icon' ]); $this->addAction([ 'type' => 'Delete', + 'method' => strtoupper('delete'), //upper case string 'route' => 'admin.catalog.attributes.delete', 'icon' => 'icon trash-icon' ]); @@ -148,4 +150,4 @@ class AttributeDataGrid extends DataGrid 'method' => 'DELETE' ]); } -} \ No newline at end of file +} diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 2e8618054..557d36ab2 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -278,7 +278,7 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.catalog.attributes.index' ])->name('admin.catalog.attributes.update'); - Route::get('/attributes/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@destroy')->name('admin.catalog.attributes.delete'); + Route::post('/attributes/delete/{id}', 'Webkul\Attribute\Http\Controllers\AttributeController@destroy')->name('admin.catalog.attributes.delete'); Route::post('/attributes/massdelete', 'Webkul\Attribute\Http\Controllers\AttributeController@massDestroy')->name('admin.catalog.attributes.massdelete'); diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index d990730b0..2ce326f16 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -95,6 +95,7 @@ class AdminServiceProvider extends ServiceProvider } $tree->items = core()->sortItems($tree->items); + $view->with('menu', $tree); }); diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php index c92d6ea8d..0d6438b2f 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php @@ -3,6 +3,7 @@ @if (request()->route()->getName() != 'admin.configuration.index') currentKey); ?> + @if(isset($keys) && strlen($keys[0])) @foreach (array_get($menu->items, current($keys) . '.children') as $item)
  • @@ -14,6 +15,7 @@
  • @endforeach + @endif @else @foreach ($config->items as $key => $item)
  • @@ -32,4 +34,4 @@ {{--
    --}} - \ No newline at end of file + diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php index 968d28746..8e746b803 100755 --- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php +++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php @@ -129,6 +129,8 @@ class AttributeController extends Controller */ public function destroy($id) { + dd(request()->all()); + $attribute = $this->attribute->findOrFail($id); if(!$attribute->is_user_defined) { @@ -187,4 +189,4 @@ class AttributeController extends Controller return redirect()->back(); } } -} \ No newline at end of file +} diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php index 02bbe578c..3c58f1c30 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php @@ -42,8 +42,14 @@
    @foreach ($actions as $action) - - + + @endforeach
    @@ -56,4 +62,4 @@ {{ $norecords }} @endif - \ No newline at end of file + 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 4474c126b..6034db1a8 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -615,18 +615,11 @@ label = 'cannotfindthislabel'; - // for(colIndex in this.columns) { - // if (this.columns[colIndex].alias == this.columnOrAlias) { - // label = this.columns[colIndex].label; - // } - // } - obj.column = col; obj.cond = cond; obj.val = val; if(col == "sort") { - // console.log('sort', obj.cond); label = ''; for(colIndex in this.columns) { @@ -707,6 +700,14 @@ } }, + doAction(e) { + var element = e.currentTarget; + + axios.post(element.getAttribute('data-action'), { '_method': element.getAttribute('data-method'), '_token': data-token }).then(response => (this.info = response)); + + e.preventDefault(); + }, + removeMassActions() { this.dataIds = []; @@ -718,4 +719,4 @@ }); @endpush - \ No newline at end of file + diff --git a/packages/Webkul/User/src/Http/Middleware/Bouncer.php b/packages/Webkul/User/src/Http/Middleware/Bouncer.php index aea2831b8..fc2665c4e 100755 --- a/packages/Webkul/User/src/Http/Middleware/Bouncer.php +++ b/packages/Webkul/User/src/Http/Middleware/Bouncer.php @@ -29,6 +29,11 @@ class Bouncer public function checkIfAuthorized($request) { + $routeCollection = Route::getRoutes(); + + // dd($routeCollection->get()[0]); + //find the current route's aside parent and compare with role of current user + if (! $role = auth()->guard('admin')->user()->role) abort(401, 'This action is unauthorized.'); @@ -36,10 +41,10 @@ class Bouncer return; } else { $acl = app('acl'); - + // dd($acl); if ($acl && isset($acl->roles[Route::currentRouteName()])) { bouncer()->allow($acl->roles[Route::currentRouteName()]); } } } -} \ No newline at end of file +}