Merge branch 'jansa'

admin/application/models/Webservice_model.php

@@ -2009,12 +2009,13 @@ class Webservice_model extends CI_Model {
 	function get_upcoming_consultation($id){
 		$date = strtotime(date('y-m-d h:i:s'));
 
-		$this->db->select("tbl_doctors.id,tbl_doctors.name as doctor_name,tbl_doctors.online_status as doctor_online,tbl_doctors.consultation_duration,tbl_doctors.profile_pic as doctor_profile_photo,tbl_specialization.specialization_name as doctor_speciality,tbl_doctors.street_address,tbl_doctors.locality,tbl_doctors.number,tbl_doctors.complement,tbl_doctors.price as consultation_fee,tbl_clinic.location_lattitude as clinic_latitude,tbl_clinic.location_longitude as clinic_longitude,tbl_booking.date,tbl_booking.total_sum as total,tbl_booking.doctor_id,tbl_booking.clinic_id,tbl_booking.id as booking_id");
+		$this->db->select("tbl_doctors.id,tbl_doctors.name as doctor_name,tbl_doctors.online_status as doctor_online,tbl_doctors.consultation_duration,tbl_doctors.profile_pic as doctor_profile_photo,tbl_specialization.specialization_name as doctor_speciality,tbl_doctors.street_address,tbl_doctors.locality,tbl_doctors.number,tbl_doctors.complement,tbl_doctors.price as consultation_fee,case when tbl_clinic.id != '0' then tbl_clinic.location_lattitude else tbl_doctors.default_latitude end AS clinic_latitude,case when tbl_clinic.id != '0' then tbl_clinic.location_longitude else tbl_doctors.default_longitude end AS clinic_longitude,tbl_booking.date,tbl_booking.total_sum as total,tbl_booking.doctor_id,tbl_booking.clinic_id,tbl_booking.id as booking_id");
 		$this->db->from("tbl_booking");
 		$this->db->join("tbl_doctors","tbl_doctors.id = tbl_booking.doctor_id");
 		$this->db->join("tbl_clinic","tbl_clinic.id = tbl_booking.clinic_id");
 		$this->db->join("tbl_specialization","tbl_specialization.id = tbl_doctors.	specialization");
 		$this->db->where("tbl_booking.id",$id);
+
 		//$this->db->where("tbl_booking.date >= '".$date."'");
 		$result = $this->db->get()->row();
 			//$result[$key]->consultation_fee = decrypt_data($value->consultation_fee);