Merge branch 'jansa'

application/controllers/Patient.php

@@ -143,11 +143,11 @@ public  function cancelBooking()
 	/*------------------------------------------------*/
 
   	$check_waiting_list = $this->Patient_model->check_waiting_list($result);
-  	print_r($check_waiting_list); echo "<br>";
+  //	print_r($check_waiting_list); echo "<br>";
   	//check any user Exist in waiting List on that date if true ;
   	if($check_waiting_list['count']>0)
   	{
-  		echo "yes"; exit();
+  		//echo "yes"; exit();
   		$this->Patient_model->change_waitinglist_to_confirmed($check_waiting_list['booking_id']);
   		$booking_details_waiting = $this->Doctor_model->get_booking_details($check_waiting_list['booking_id']);
 
@@ -204,7 +204,7 @@ public  function cancelBooking()
 
   	}//if no user exist in waiting list on that particular date. check on next date.
   	else{
-  		echo "no";exit();
+  		//echo "no";exit();
   		$nextday = $booking_details['book_date'];
 		$next_day_consult = $this->wait_list_data($booking_details,$nextday,'');
   		//$nextday = strtotime(date('Y-m-d', strtotime('+1 day', $booking_details['book_date'])));
@@ -247,7 +247,8 @@ public  function cancelBooking()
 		if(isset($insertid) && !empty($insertid)){
 			$this->db->where_not_in('id', $insertid);
 		}
-		$next_day_consult = $this->db->get_where('tbl_booking',array('doctor_id'=>$query['doctor_id'],'clinic_id'=>$query['clinic_id'],'booking_status'=>'0','date'=>$nextday,'payment_status'=>'1'))->result_array();
+		$next_day_consult = $this->db->get_where('tbl_booking',array('doctor_id'=>$query['doc_id'],'clinic_id'=>$query['clinic_id'],'booking_status'=>'0','date'=>$nextday,'payment_status'=>'1'))->result_array();
+		//echo $this->db->last_query();exit();
 		if(count($next_day_consult) > 0){
 			return $next_day_consult;
 		}else{