diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index 821f5d050..1a020969e 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -103,17 +103,17 @@ class CustomerReviewDataGrid extends DataGrid public function prepareMassActions() { $this->addMassAction([ 'type' => 'delete', - 'action' => route('admin.catalog.products.massdelete'), + 'action' => route('admin.customer.review.massdelete'), 'method' => 'DELETE' ]); $this->addMassAction([ 'type' => 'update', - 'action' => route('admin.catalog.products.massupdate'), + 'action' => route('admin.customer.review.massupdate'), 'method' => 'PUT', 'options' => [ - 0 => true, - 1 => false, + 'Disapprove' => 0, + 'Approve' => 1 ] ]); } diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php index 6f57dabae..147dac40f 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php @@ -174,16 +174,18 @@ class ReviewController extends Controller $review = $this->productReview->findOneByField('id', $value); try { - if($data['massaction-type'] == 1 && $data['update-options'] == 1 && $data['selected-option-text'] == 'Approve') { - Event::fire('customer.review.update.before', $value); + if($data['massaction-type'] == 'update') { + if($data['update-options'] == 1) { + Event::fire('customer.review.update.before', $value); - $review->update(['status' => 'approved']); + $review->update(['status' => 'approved']); - Event::fire('customer.review.update.after', $review); - } else if($data['massaction-type'] == 1 && $data['update-options'] == 0 && $data['selected-option-text'] == 'Disapprove') { - $review->update(['status' => 'pending']); - } else { - continue; + Event::fire('customer.review.update.after', $review); + } else if($data['update-options'] == 0) { + $review->update(['status' => 'pending']); + } else { + continue; + } } } catch(\Exception $e) { $suppressFlash = true; 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 07f7c2e1d..a3143ade8 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -12,6 +12,7 @@