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

mass actions enhanced and one bug remvoed causing value havoc

This commit is contained in:
Prashant Singh 2019-01-11 17:23:36 +05:30
parent 6d203fd8f6
commit 7785475eb9
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
View File

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

18
packages/Webkul/Product/src/Http/Controllers/ReviewController.php
View File

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

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

@ -12,6 +12,7 @@
<div class="filter-row-one" id="testgrid-filters">
<div class="search-filter">
<input type="search" id="search-field" class="control" placeholder="Search Here..." v-model="searchValue" />
<div class="icon-wrapper">
<span class="icon search-icon search-btn" v-on:click="searchCollection(searchValue)"></span>
</div>
@ -171,7 +172,7 @@
<div class="control-group" style="margin-left: 10px;" v-if="massActionType == 'update'">
<select class="control" v-model="massActionUpdateValue" name="update-options">
<option v-for="(massActionValue, id) in massActionValues" :value="massActionValue">@{{ massActionValue }}</option>
<option v-for="(massActionValue, id) in massActionValues" :value="massActionValue">@{{ id }}</option>
</select>
</div>