Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -1400,7 +1400,7 @@ class Webservice_model extends CI_Model {
 							tbl_doctors.online_status as online,
 							tbl_specialization.specialization_name AS specialisation,
 							tbl_clinic.name as clinic_name,
-							ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( case when tbl_clinic_doctors.clinic_id != '0' then `tbl_clinic`.`location_lattitude` else `tbl_doctors`.`default_latitude` end as location_lattitude) ) * cos( radians( case when tbl_clinic_doctors.clinic_id != '0' then `tbl_clinic`.`location_longitude` else `tbl_doctors`.`default_longitude` end as location_longitude) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( case when tbl_clinic_doctors.clinic_id != '0' then `tbl_clinic`.`location_lattitude` else `tbl_doctors`.`default_latitude` end as location_lattitude ) ) ) )) AS distance
+							ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( `tbl_clinic`.`location_lattitude` ) ) * cos( radians( `tbl_clinic`.`location_longitude` ) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( `tbl_clinic`.`location_lattitude` ) ) ) )) AS distance
 						");
 		$this->db->from("tbl_doctors");
 
@@ -1413,7 +1413,7 @@ class Webservice_model extends CI_Model {
  			$query = $data['query'];
  			$where = 'tbl_doctors.name LIKE '."'$query%'";
  			$this->db->where($where);
-			$this->db->having('distance <= 20');
+			//$this->db->having('distance <= 20');
  		}
  		if(isset($data['speciality']) && strlen($data['speciality'])){
 
@@ -1476,7 +1476,7 @@ class Webservice_model extends CI_Model {
  		}
  		
  		$query = $this->db->get();
-		echo $this->db->last_query()."<br><br>"; 
+		//echo $this->db->last_query();exit();
 		//print_r($this->db->last_query());die();
 		if ($query->num_rows() > 0) {
 			$querys = $query->result_array();