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

Merge pull request #606 from rahulshukla-webkul/development 

Development
This commit is contained in:
JItendra Singh 2019-02-20 14:48:49 +05:30 committed by GitHub
parent 7cae7a28b6 be1de2d1ab
commit db95ef5f53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=da5ebef9c25a064e7ed6",
"/js/admin.js": "/js/admin.js?id=7683c8f127f6ad2ac3ce",
"/css/admin.css": "/css/admin.css?id=ccc39419fee98ed8ac7b"
}
}

2
packages/Webkul/Product/src/Helpers/View.php
View File

@ -22,7 +22,7 @@ class View extends AbstractProduct
if ($attribute->is_visible_on_front && $product->{$attribute->code}) {
$value = $product->{$attribute->code};
if ($attribute->type == 'select') {
if (($attribute->type == 'select') || ($attribute->type == 'multiselect')) {
$attributeOption = $attributeOptionReposotory->find($value);
if ($attributeOption) {

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

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=391400bc9a994e60b97f",
"/js/shop.js": "/js/shop.js?id=e019a3a0b0cbcc981fd8",
"/css/shop.css": "/css/shop.css?id=f55c895c4bc57f6cd61b"
}
}

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=790533c7b1929cfa97ea"
}
"/js/ui.js": "/js/ui.js?id=d984bc35663c0fd9cf3f",
"/css/ui.css": "/css/ui.css?id=2ac413cc34214026f3ce"
}

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

@ -242,10 +242,12 @@ h2 {
.table {
width: 100%;
overflow-x: auto !important;
table {
border-collapse: collapse;
text-align: left;
width: 100%;
thead th {
font-weight: 700;