From ae43d57fc76378969987447e1d7ccfd8d30db377 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Tue, 6 Sep 2022 19:07:33 +0530 Subject: [PATCH] updates --- packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php | 2 +- packages/Webkul/Admin/src/Routes/catalog-routes.php | 4 ++-- .../Category/src/Http/Controllers/CategoryController.php | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index 99d23b40e..09d6f176f 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -178,7 +178,7 @@ class CategoryDataGrid extends DataGrid $this->addMassAction([ 'type' => 'update', 'label' => trans('admin::app.datagrid.update-status'), - 'action' => route('admin.catalog.categories.massupdate'), + 'action' => route('admin.catalog.categories.mass-update'), 'method' => 'POST', 'options' => [ trans('admin::app.datagrid.active') => 1, diff --git a/packages/Webkul/Admin/src/Routes/catalog-routes.php b/packages/Webkul/Admin/src/Routes/catalog-routes.php index 8f944ef53..c1128f8cd 100644 --- a/packages/Webkul/Admin/src/Routes/catalog-routes.php +++ b/packages/Webkul/Admin/src/Routes/catalog-routes.php @@ -104,9 +104,9 @@ Route::group(['middleware' => ['web', 'admin'], 'prefix' => config('app.admin_ur 'redirect' => 'admin.catalog.categories.index', ])->name('admin.catalog.categories.massdelete'); - Route::post('categories/massupdate', [CategoryController::class, 'massUpdate'])->defaults('_config', [ + Route::post('categories/mass-update', [CategoryController::class, 'massUpdate'])->defaults('_config', [ 'redirect' => 'admin.catalog.categories.index', - ])->name('admin.catalog.categories.massupdate'); + ])->name('admin.catalog.categories.mass-update'); Route::post('/categories/product/count', [CategoryController::class, 'categoryProductCount'])->name('admin.catalog.categories.product.count'); diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 481175543..b406e7214 100755 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -214,11 +214,7 @@ class CategoryController extends Controller { $data = request()->all(); - if (! isset($data['massaction-type'])) { - return redirect()->back(); - } - - if (! $data['massaction-type'] == 'update') { + if (! isset($data['massaction-type']) || ! ($data['massaction-type'] == 'update')) { return redirect()->back(); }