Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -1232,7 +1232,15 @@ class Webservice_model extends CI_Model {
 			$promo_name = '';
 		}
 
+		$this->db->select('accept_return,return_timeperiod');
+		$this->db->where('id',$data['doctor_id']);
+		$check_doctor_status = $this->db->get('tbl_doctors')->row();
+		if($check_doctor_status->accept_return == '1'){
 			$check = $this->db->get_where('tbl_booking',array('doctor_id'=>$data['doctor_id'],'clinic_id'=>$data['clinic_id'],'date'=>$data['date'],'time'=>$data['time'],'payment_status'=>'1'));
+		}else{
+			$check == 'noreturn';
+		}
+		
 		$this->db->select('name,profile_pic,specialization');
 		$doctr_data = $this->db->get_where('tbl_doctors',array('id'=>$data['doctor_id']))->row_array();
 		//print_r($doctr_data);exit();
@@ -1242,7 +1250,7 @@ class Webservice_model extends CI_Model {
 		$conslt_time = strtotime($conslt_time);
 		$settngs = $this->db->get('settings')->row();
 		$ipokefees = $settngs->ipok_fee;
-		if($check->num_rows() <= 0){
+		if(($check == 'noreturn') || ($check->num_rows() <= 0)){
 				//$patientid = $query->row_array();
 			//$offset=5.5*60*60;
 			$date_def = date('Y-m-d',$data['date']);