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

#523 and #519

This commit is contained in:
rahul shukla 2019-02-04 12:02:59 +05:30
parent 4c7f516313
commit 08fe30ac61
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ class CustomerReviewDataGrid extends DataGrid
'wrapper' => function ($value) {
if ($value->product_review_status == 'approved')
return '<span class="badge badge-md badge-success">Approved</span>';
else if ($value == "pending")
else if ($value->product_review_status == "pending")
return '<span class="badge badge-md badge-warning">Pending</span>';
},
]);

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=0076f480705e7ce1f8e0",
"/css/shop.css": "/css/shop.css?id=9a82ebb8ac9c222409b3"
"/css/shop.css": "/css/shop.css?id=69d51d46b4e6507c42ab"
}

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

6
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=8f9e12057b68b45d7046",
"/css/ui.css": "/css/ui.css?id=9c0761cd0d861f30a0dc"
}
"/js/ui.js": "/js/ui.js?id=d984bc35663c0fd9cf3f",
"/css/ui.css": "/css/ui.css?id=54c156da88929b5a04ea"
}

1
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -292,6 +292,7 @@ h2 {
.control-group {
width: 100%;
margin-bottom: 0;
min-width: 140px;
.control {
width: 100%;