From 1dd5faa21dd7079b5a047ea20e6b760536a60f2e Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 24 Jul 2019 17:55:32 +0530 Subject: [PATCH 1/2] change Datatype for code --- packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index 820b4ad03..541232d08 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -38,7 +38,7 @@ class CustomerGroupDataGrid extends DataGrid $this->addColumn([ 'index' => 'code', 'label' => 'Code', - 'type' => 'number', + 'type' => 'string', 'searchable' => false, 'sortable' => true, 'filterable' => true From 29763b902ea424508686460778b49ae3051f19c1 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 24 Jul 2019 18:50:44 +0530 Subject: [PATCH 2/2] issue of image at checkout #1209 --- .../src/Resources/views/checkout/onepage/review.blade.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index d77d27bc9..5cb81774b 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -70,7 +70,10 @@ product; - $productBaseImage = $productImageHelper->getProductBaseImage($product); + if ($product->type == "configurable") + $productBaseImage = $productImageHelper->getProductBaseImage($item->child->product); + else + $productBaseImage = $productImageHelper->getProductBaseImage($item->product); ?>