Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -2483,7 +2483,7 @@ class Webservice_model extends CI_Model {
 		$query = $this->db->get_where('tbl_booking',array('id'=>$id))->row_array();
 		if($query){
 			if($query['medical_record_id'] != '0'){
-				$this->db->select('tbl_doctors.id as doctor_id,tbl_doctors.name as doctor_name,tbl_doctors.profile_pic as doctor_profile_photo,tbl_doctors.price as consultation_fee,tbl_doctors.consultation_duration,tbl_specialization.specialization_name as doctor_speciality,tbl_booking.date,tbl_booking.total_sum as total,tbl_medical_records.*,tbl_registration.profile_photo');
+				$this->db->select('tbl_doctors.id as doctor_id,tbl_doctors.name as doctor_name,tbl_doctors.profile_pic as doctor_profile_photo,tbl_doctors.price as consultation_fee,tbl_doctors.consultation_duration,tbl_specialization.specialization_name as doctor_speciality,tbl_booking.date,tbl_booking.total_sum as total,tbl_medical_records.*,tbl_registration.profile_photo,tbl_booking.time_start');
 				$this->db->join('tbl_doctors','tbl_doctors.id = tbl_booking.doctor_id');
 				$this->db->join('tbl_specialization','tbl_specialization.id = tbl_doctors.specialization');
 				$this->db->join('tbl_medical_records','tbl_medical_records.id = tbl_booking.medical_record_id');
@@ -2494,7 +2494,12 @@ class Webservice_model extends CI_Model {
 				if($result){
 					//$result['consultation_fee'] = decrypt_data($result['consultation_fee']);
 					$fee = $this->db->get('settings')->row();
+					if(isset($result['patient_review'])){
 						$result['review'] = decrypt_data($result['patient_review']);
+					}else{
+						$result['review'] = '';
+					}
+ 					
  					unset($result['patient_review']);
 
                     $actual = ($result['consultation_fee'] * $fee->ipok_fee)/100 ;