Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -1647,7 +1647,7 @@ class Webservice extends CI_Controller {
 								}
 							}
 						}		
-						echo "<pre>";print_r($res['data']['time_interval']);exit();				
+						//echo "<pre>";print_r($res['data']['time_interval']);exit();				
 						$res['data']['time_interval'] = array_values(array_unique($res['data']['time_interval'],SORT_REGULAR));
 					}else{
 						$res =  array(

admin/application/models/Webservice_model.php

@@ -1879,7 +1879,7 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
 	
 	function is_waiting_list_used($data,$time){
 		$query = $this->db->get_where('tbl_booking',array('doctor_id'=>$data['doctor_id'],'clinic_id'=>$data['clinic_id'],'date'=>$data['date'],'time'=>$time))->result();
-		echo $this->db->last_query();echo"<br>";
+	//	echo $this->db->last_query();echo"<br>";
 		if(count($query) > 0){
 			return $query;
 		}else{