diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 216ad02c4..ca55db876 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -215,7 +215,7 @@ class DashboardController extends Controller ->addSelect(DB::raw('SUM(qty_ordered) as total_qty_ordered')) ->addSelect(DB::raw('COUNT(products.id) as total_products')) ->addSelect('order_items.id', 'categories.id as category_id', 'category_translations.name') - ->groupBy('category_id') + ->groupBy('categories.id') ->orderBy('total_qty_ordered', 'DESC') ->limit(5) ->get(); diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index fbf544a2a..13c6c3975 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -470,7 +470,7 @@ class ProductRepository extends Repository } }); - return $qb; + return $qb->groupBy('product_flat.id'); })->paginate(isset($params['limit']) ? $params['limit'] : 9); return $results; diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php index 4a3632d68..941772b4c 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php @@ -13,7 +13,7 @@ @if ($cart->selected_shipping_rate)
- +
@endif diff --git a/public/installer/install.php b/public/installer/install.php index c763cf083..dc9ce0a90 100755 --- a/public/installer/install.php +++ b/public/installer/install.php @@ -11,12 +11,13 @@ if (file_exists($envFile)) { // reading env content - $str= file_get_contents($envFile); + $str = file_get_contents($envFile); // converting env content to key/value pair $data = explode(PHP_EOL,$str); $databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION']; + $key = $value = []; if ($data) { foreach ($data as $line) { $rowValues = explode('=', $line);