Merge pull request #561 from jitendra-webkul/jitendra

Jitendra

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();

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;

packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php

@@ -13,7 +13,7 @@
     @if ($cart->selected_shipping_rate)
         <div class="item-detail">
             <label>{{ __('shop::app.checkout.total.delivery-charges') }}</label>
-            <label class="right">{{ core()->currency($cart->selected_shipping_rate->price) }}</label>
+            <label class="right">{{ core()->currency($cart->selected_shipping_rate->base_price) }}</label>
         </div>
     @endif
 

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);