Merge branch 'master' into 'dev_production'

application/helpers/general_helper.php

@@ -4,10 +4,9 @@
 function get_total_customers(){
 	$CI = & get_instance();
 	$CI->db->select("COUNT(*) AS tot_customers");
-	$CI->db->where('status','1');
+	$CI->db->where('users.status',1);
+    $CI->db->join('verification','verification.user_id=users.id','left');
 	$rs = $CI->db->get('users');
-	 // echo $CI->db->last_query();
-	 // die();
 	return $rs->row()->tot_customers;
 	
 }
@@ -79,11 +78,16 @@ function get_total_amount(){
 
 function get_total_drivers(){
 	$CI = & get_instance();
-	$rs = $CI->db->select('COUNT(*) AS tot_drivers')->where('status',1)->get('booking_approve');
-	//$rs = $CI->db->select('type')->where('id',$id)->get('verification')->row();
-	 // echo $CI->db->last_query();
-	 // die();
-	return $rs->row()->tot_drivers;
+	//$rs = $CI->db->select('COUNT(*) AS tot_drivers')->where('status',1)->get('booking_approve');
+
+
+ 	$CI->db->select("DISTINCT(COUNT(booking_approve.id)) AS tot_drivers"); 
+ 	$CI->db->join('users','users.id = booking_approve.driver_id');
+ 	$CI->db->where('booking_approve.status',1);
+ 	$CI->db->where('driver_id !=', 'NULL');
+ 	$CI->db->where('users.status', '1');
+	$query = $CI->db->get('booking_approve');
+	return $query->row()->tot_drivers;
 	
 }
 

application/views/Home/Dashboard.php

@@ -40,7 +40,7 @@
                             <p>Total Bookings</p>
                         </div>
                         <div class="icon">
-                            <i class="ion ion-stats-bars"></i>
+                            <i class="ion ion-bag"></i>
                         </div>
                         <a href="<?php echo base_url(); ?>Booking/view_allbooking" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
                     </div>
@@ -55,7 +55,7 @@
                             <p>Completed Bookings</p>
                         </div>
                         <div class="icon">
-                            <i class="ion ion-stats-bars"></i>
+                            <i class="ion ion-bag"></i>
                         </div>
                         <a href="<?php echo base_url(); ?>Booking/view_completedbooking" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
                     </div>

application/views/Managebanner/addbanner.php

@@ -29,7 +29,6 @@
 
 
         <!--  form -->
-
          <div class="col-md-12">
               <!-- general form elements -->
               <div class="box">