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

Merge pull request #1210 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-07-25 10:04:14 +05:30 committed by GitHub
parent 871bc8c190 13a982f480
commit 9fa5e2396b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ class CustomerGroupDataGrid extends DataGrid
$this->addColumn([
'index' => 'code',
'label' => 'Code',
'type' => 'number',
'type' => 'string',
'searchable' => false,
'sortable' => true,
'filterable' => true

5
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -70,7 +70,10 @@
<?php
$product = $item->product;
$productBaseImage = $productImageHelper->getProductBaseImage($product);
if ($product->type == "configurable")
$productBaseImage = $productImageHelper->getProductBaseImage($item->child->product);
else
$productBaseImage = $productImageHelper->getProductBaseImage($item->product);
?>
<div class="item mb-5" style="margin-bottom: 5px;">