Merge branch 'master' into 'dev_production'

application/models/Driver_model.php

@@ -6,10 +6,10 @@ class Driver_model extends CI_Model {
 	 function get_driver(){
 
 
-	 	$query = $this->db->where('status',1);
+	 	$query = $this->db->where('booking_approve.status',1);
 	 	$query=$this->db->where('driver_id !=', 'NULL');
 	 	$this->db->join('users','users.id = booking_approve.driver_id');
-	 	$query = $this->db->distinct()->select('booking_approve.driver_id,TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as driver_name,users.email,users.gender,users.date_of_birth'); 
+	 	$query = $this->db->distinct()->select("booking_approve.driver_id,TRIM(concat(users.first_name,' ',IFNULL(users.last_name,''))) as driver_name,users.email,users.gender,users.date_of_birth"); 
 		 $query = $this->db->get('booking_approve');
 	//echo $this->db->last_query();die();
 		 $result = $query->result();