Merge branch 'jansa'

admin/application/controllers/Webservice.php

@@ -6709,6 +6709,9 @@ print_r(date('H:i',$ms));exit();*/
 			$check_authToken = $this->Webservice_model->check_auth_token($headers['Auth']);
 			if ($check_authToken) {
 				if(isset($data['date']) && strlen($data['date']) && isset($data['time']) && strlen($data['time'])&& isset($data['doctor_id']) && strlen($data['doctor_id']) && isset($data['clinic_id']) && strlen($data['clinic_id'])){
+					$authtoken = $this->Webservice_model->get_userid_frm_authtoken($headers['Auth']);
+					$data['user_id'] = $authtoken->userid;
+
 					$result = $this->Webservice_model->check_wait_listed($data);
 					if($result['status'] == 'success'){
 						$res = array('status'=>'success','data'=>array('is_booked'=>$result['booked']),'is_return_avail'=>$result['is_return_avail']);

admin/application/models/Webservice_model.php

@@ -3430,7 +3430,7 @@ class Webservice_model extends CI_Model {
 
 			$this->db->where('doctor_id',$data['doctor_id']);
 			$this->db->where('clinic_id',$data['clinic_id']);
-			$this->db->where('patient_id',$patientid['userid']);
+			$this->db->where('patient_id',$data['user_id']);
 			$this->db->where('free_visit_status',0);
 			$this->db->where('visit_type',0);
 			$this->db->where('date >=',$new_date);