Skip to content

I
IPok_Web
Commit 93e2cd3c by Jansa Jose
Options

Merge branch 'jansa'

parents 9697aaae c12fd6a4
Showing with 18 additions and 11 deletions
admin/application/models/Webservice_model.php
...@@ -2933,7 +2933,7 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F ...@@ -2933,7 +2933,7 @@ CASE when tbl_doctors.gender='0' then 'MALE' when tbl_doctors.gender='1' then 'F
array_splice($query, 0, 1); array_splice($query, 0, 1);
}else{ }else{
$get_row = $this->db->get_where('tbl_clinic',array('id'=>'0'))->row(); $get_row = $this->db->get_where('tbl_clinic',array('id'=>'0'))->row();
if($get_row == ''){ if(!empty($get_row)){
$this->db->insert('tbl_clinic',array('name'=>'Default','username'=>'default','password'=>md5('default'))); $this->db->insert('tbl_clinic',array('name'=>'Default','username'=>'default','password'=>md5('default')));
$last = $this->db->insert_id(); $last = $this->db->insert_id();
if($last != '0'){ if($last != '0'){
......
application/controllers/Doctor.php
...@@ -1225,6 +1225,7 @@ public function editProfile() ...@@ -1225,6 +1225,7 @@ public function editProfile()
$template['page_title'] = "Edit Profile"; $template['page_title'] = "Edit Profile";
$template['data'] = "Doctor page"; $template['data'] = "Doctor page";
$doctor_data = $this->Doctor_model->get_single_doctor($userdata['id']); $doctor_data = $this->Doctor_model->get_single_doctor($userdata['id']);
//print_r($doctor_data);exit();
$speciality_list = $this->Home_model->get_speciality(); $speciality_list = $this->Home_model->get_speciality();
$template['speciality_list'] = $speciality_list; $template['speciality_list'] = $speciality_list;
$template['doctor_data'] = $doctor_data; $template['doctor_data'] = $doctor_data;
......
application/models/Doctor_model.php
...@@ -842,11 +842,14 @@ public function get_wallet_for_doctor($doc_id) ...@@ -842,11 +842,14 @@ public function get_wallet_for_doctor($doc_id)
total_earn as total_earn'); total_earn as total_earn');
$this->db->from('tbl_wallet_details'); $this->db->from('tbl_wallet_details');
$this->db->where('doctor_id',$doc_id); $this->db->where('doctor_id',$doc_id);
$query = $this->db->get(); $query = $this->db->get()->row_array();
$query['reedem_earn'] = decrypt_data($query['reedem_earn']); if($query){
$query['future_earn'] = decrypt_data($query['future_earn']); $query['reedem_earn'] = decrypt_data($query['reedem_earn']);
$query['total_earn'] = decrypt_data($query['total_earn']); $query['future_earn'] = decrypt_data($query['future_earn']);
return $query->row_array(); $query['total_earn'] = decrypt_data($query['total_earn']);
}
return $query;
} }
public function update_wallet($id,$data) public function update_wallet($id,$data)
......
application/models/Search_doctor_model.php
...@@ -209,7 +209,9 @@ public function filter_search($post_data) ...@@ -209,7 +209,9 @@ public function filter_search($post_data)
if( !empty($post_data['doctor-search-location']) && empty($post_data['filter_dr_srch_distance_end']) && empty($post_data['filter_dr_srch_distance_start'])) if( !empty($post_data['doctor-search-location']) && empty($post_data['filter_dr_srch_distance_end']) && empty($post_data['filter_dr_srch_distance_start']))
{ {
$where = "ROUND(( 6371 * acos( cos( radians($lat) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( `location_lattitude` ) ) ) ))"; //$where = "ROUND(( 6371 * acos( cos( radians($lat) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( `location_lattitude` ) ) ) ))";
$where = "IF (tbl_clinic_doctors.clinic_id != 0, ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( `location_lattitude` ) ) ) )), ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( `tbl_doctors`.`default_latitude` ) ) * cos( radians( `tbl_doctors`.`default_longitude` ) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( `tbl_doctors`.`default_latitude` ) ) ) )) )";
$this->db->where($where."<= 15" ); $this->db->where($where."<= 15" );
} }
...@@ -221,7 +223,8 @@ public function filter_search($post_data) ...@@ -221,7 +223,8 @@ public function filter_search($post_data)
$post_data['filter_dr_srch_distance_start'] = preg_replace("/[^0-9,.]/", "", $post_data['filter_dr_srch_distance_start'] ); $post_data['filter_dr_srch_distance_start'] = preg_replace("/[^0-9,.]/", "", $post_data['filter_dr_srch_distance_start'] );
$where = "ROUND(( 6371 * acos( cos( radians($lat) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( `location_lattitude` ) ) ) ))"; //$where = "ROUND(( 6371 * acos( cos( radians($lat) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( `location_lattitude` ) ) ) ))";
$where = "IF (tbl_clinic_doctors.clinic_id != 0, ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( `location_lattitude` ) ) ) )), ROUND(( 6371 * acos( cos( radians({$lat}) ) * cos( radians( `tbl_doctors`.`default_latitude` ) ) * cos( radians( `tbl_doctors`.`default_longitude` ) - radians({$lng}) ) + sin( radians({$lat}) ) * sin( radians( `tbl_doctors`.`default_latitude` ) ) ) )) )";
$this->db->where($where.">= {$post_data['filter_dr_srch_distance_start']}" ); $this->db->where($where.">= {$post_data['filter_dr_srch_distance_start']}" );
$this->db->where($where."<= {$post_data['filter_dr_srch_distance_end']}" ); $this->db->where($where."<= {$post_data['filter_dr_srch_distance_end']}" );
...@@ -230,11 +233,11 @@ public function filter_search($post_data) ...@@ -230,11 +233,11 @@ public function filter_search($post_data)
if(isset($post_data['filter_dr_gender']) && !empty($post_data['filter_dr_gender'])) if(isset($post_data['filter_dr_gender']) && !empty($post_data['filter_dr_gender']))
{ {
if($post_data['filter_dr_gender'] == 'male' || $post_data['filter_dr_gender'] == 'MALE'){ if($post_data['filter_dr_gender'] == 'MALE' || $post_data['filter_dr_gender'] == 'male'){
$post_data['filter_dr_gender'] = '0'; $post_data['filter_dr_gender'] = '0';
}elseif($post_data['filter_dr_gender'] == 'female' || $post_data['filter_dr_gender'] == 'FEMALE'){ }elseif($post_data['filter_dr_gender'] == 'FEMALE' || $post_data['filter_dr_gender'] == 'female'){
$post_data['filter_dr_gender'] = '1'; $post_data['filter_dr_gender'] = '1';
}elseif($post_data['filter_dr_gender'] == 'others' || $post_data['filter_dr_gender'] == 'OTHERS'){ }elseif($post_data['filter_dr_gender'] == 'OTHERS' || $post_data['filter_dr_gender'] == 'others'){
$post_data['filter_dr_gender'] = '2'; $post_data['filter_dr_gender'] = '2';
} }
$this->db->where('tbl_doctors.gender',$post_data['filter_dr_gender']); $this->db->where('tbl_doctors.gender',$post_data['filter_dr_gender']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment