Skip to content

I
IPok_Web
Commit 8f3dd291 by Anju M S
Options

Merge branch 'jansa' into anju

parents 92dae594 a3e38c54
Showing with 61 additions and 33 deletions
admin/application/models/Webservice_model.php
...@@ -2710,7 +2710,9 @@ class Webservice_model extends CI_Model { ...@@ -2710,7 +2710,9 @@ class Webservice_model extends CI_Model {
}else{ }else{
$res['domiciliary_status'] = false; $res['domiciliary_status'] = false;
} }
//echo $this->db->last_query();exit();
$return_array = array('status'=>'success','data'=>array('doctor_id'=>$doctor_id,'is_return_consultation_available'=>$res['accept_return'],'is_home_consultation_available'=>$res['domiciliary_status'],'consultation_price'=>decrypt_data($res['price']),'consultation_duration'=>$res['consultation_duration'],'return_consultation_time_period'=>$res['return_timeperiod'])); $return_array = array('status'=>'success','data'=>array('doctor_id'=>$doctor_id,'is_return_consultation_available'=>$res['accept_return'],'is_home_consultation_available'=>$res['domiciliary_status'],'consultation_price'=>decrypt_data($res['price']),'consultation_duration'=>$res['consultation_duration'],'return_consultation_time_period'=>$res['return_timeperiod']));
//print_r($return_array);exit();
}else{ }else{
$return_array = array('status'=>'failed','message'=>'Doctor Id Doesnot Exist'); $return_array = array('status'=>'failed','message'=>'Doctor Id Doesnot Exist');
...@@ -3796,8 +3798,7 @@ class Webservice_model extends CI_Model { ...@@ -3796,8 +3798,7 @@ class Webservice_model extends CI_Model {
} }
public function get_consultation_transaction_list($doctorid,$start,$per_page,$type){ public function get_consultation_transaction_list($doctorid,$start,$per_page,$type){
$this->db->select("tbl_booking.id,tbl_booking.patient_id,tbl_registration.name as patient_name,tbl_doctors.consultation_duration as duration,(tbl_booking.total_sum - ((tbl_booking.total_sum * tbl_booking.ipok_fee) / 100)) as earnings,CASE $this->db->select("tbl_booking.id,tbl_booking.patient_id,tbl_registration.name as patient_name,tbl_doctors.consultation_duration as duration,(tbl_booking.total_sum - ((tbl_booking.total_sum * tbl_booking.ipok_fee) / 100)) as earnings,tbl_doctors.domiciliary_status as type,tbl_booking.date");
WHEN tbl_doctors.domiciliary_status as type,tbl_booking.date");
$this->db->from('tbl_booking'); $this->db->from('tbl_booking');
$this->db->join('tbl_registration','tbl_registration.id = tbl_booking.patient_id'); $this->db->join('tbl_registration','tbl_registration.id = tbl_booking.patient_id');
$this->db->join('tbl_doctors','tbl_doctors.id = tbl_booking.doctor_id'); $this->db->join('tbl_doctors','tbl_doctors.id = tbl_booking.doctor_id');
......
application/controllers/Home.php
...@@ -1163,6 +1163,7 @@ class Home extends CI_Controller { ...@@ -1163,6 +1163,7 @@ class Home extends CI_Controller {
if($_POST['type']=='DOCTOR') if($_POST['type']=='DOCTOR')
{ {
$doc_name = $check_authentic['name'];
$link = $link.'2'; $link = $link.'2';
...@@ -1173,6 +1174,7 @@ class Home extends CI_Controller { ...@@ -1173,6 +1174,7 @@ class Home extends CI_Controller {
else else
{ {
$doc_name = decrypt_data($check_authentic['name']);
$link = $link.'1'; $link = $link.'1';
...@@ -1180,7 +1182,8 @@ class Home extends CI_Controller { ...@@ -1180,7 +1182,8 @@ class Home extends CI_Controller {
} }
$msg = "Hi ".$check_authentic['name'].",<br><br>Your request for resetting password has been accepted. Use the following link to reset password. ".$link.". Please Do not share with anyone<br><br>Ipok Team";
$msg = "Hi ".$doc_name.",<br><br>Your request for resetting password has been accepted. Use the following link to reset password. ".$link.". Please Do not share with anyone<br><br>Ipok Team";
//print_r($msg); //print_r($msg);
...@@ -1405,14 +1408,14 @@ class Home extends CI_Controller { ...@@ -1405,14 +1408,14 @@ class Home extends CI_Controller {
{ {
for($i=0;$i<count($recent);$i++){ for($i=0;$i<count($recent);$i++){
$recent[$i]['pat_name'] = $this->encrypt->decode($recent[$i]['pat_name']); $recent[$i]['pat_name'] = $this->encrypt->decode($recent[$i]['pat_name']);
$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']); $recent[$i]['msg'] = $recent[$i]['msg'];
} }
} }
elseif($userdata['type'] == 'PATIENT') elseif($userdata['type'] == 'PATIENT')
{ {
for($i=0;$i<count($recent);$i++){ for($i=0;$i<count($recent);$i++){
$recent[$i]['doc_name'] = $this->encrypt->decode($recent[$i]['doc_name']); $recent[$i]['doc_name'] = $recent[$i]['doc_name'];
$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']); $recent[$i]['msg'] = $recent[$i]['msg'];
} }
} }
...@@ -1463,7 +1466,7 @@ class Home extends CI_Controller { ...@@ -1463,7 +1466,7 @@ class Home extends CI_Controller {
elseif($userdata['type'] == 'PATIENT') elseif($userdata['type'] == 'PATIENT')
{ {
for($i=0;$i<count($allusers);$i++){ for($i=0;$i<count($allusers);$i++){
$allusers[$i]['doc_name'] = $this->encrypt->decode($allusers[$i]['doc_name']); $allusers[$i]['doc_name'] = $allusers[$i]['doc_name'];
} }
} }
...@@ -1513,14 +1516,14 @@ class Home extends CI_Controller { ...@@ -1513,14 +1516,14 @@ class Home extends CI_Controller {
{ {
for($i=0;$i<count($recent);$i++){ for($i=0;$i<count($recent);$i++){
$recent[$i]['pat_name'] = $this->encrypt->decode($recent[$i]['pat_name']); $recent[$i]['pat_name'] = $this->encrypt->decode($recent[$i]['pat_name']);
$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']); $recent[$i]['msg'] =$recent[$i]['msg'];
} }
} }
elseif($userdata['type'] == 'PATIENT') elseif($userdata['type'] == 'PATIENT')
{ {
for($i=0;$i<count($recent);$i++){ for($i=0;$i<count($recent);$i++){
$recent[$i]['doc_name'] = $this->encrypt->decode($recent[$i]['doc_name']); $recent[$i]['doc_name'] = $recent[$i]['doc_name'];
$recent[$i]['msg'] = $this->encrypt->decode($recent[$i]['msg']); $recent[$i]['msg'] = $recent[$i]['msg'];
} }
} }
......
application/models/Home_model.php
...@@ -72,13 +72,19 @@ ...@@ -72,13 +72,19 @@
$query[$key]['type'] = 'speciality'; $query[$key]['type'] = 'speciality';
} }
//if($querys){ //if($querys){
$this->db->select('name as specialization_name,id'); $this->db->select('name as specialization_name,id,price');
$where = 'name LIKE '."'$search_word%'"; $where = 'name LIKE '."'$search_word%'";
$this->db->where($where); $this->db->where($where);
$doctors = $this->db->get("tbl_doctors")->result_array(); $doctors = $this->db->get("tbl_doctors")->result_array();
if($doctors){ if($doctors){
foreach ($doctors as $key => $value) { foreach ($doctors as $key => $value) {
$doctors[$key]['type'] = 'doctor'; if($value['price'] > 0){
unset($doctors[$key]['price']);
$doctors[$key]['type'] = 'doctor';
}else{
array_splice($doctors,$key, 1);
}
} }
} }
if($query){ if($query){
...@@ -381,7 +387,7 @@ ...@@ -381,7 +387,7 @@
else if($data['login_type']=="DOCTOR") else if($data['login_type']=="DOCTOR")
{ {
$this->db->select("tbl_doctors.*,CAST(AES_DECRYPT(name, 'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as name"); //$this->db->select("tbl_doctors.*,CAST(AES_DECRYPT(name, 'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as name");
$query = $this->db->get_where("tbl_doctors",array("username"=>$data['login-form-username'],"password"=>md5($data['login-form-password']))); $query = $this->db->get_where("tbl_doctors",array("username"=>$data['login-form-username'],"password"=>md5($data['login-form-password'])));
...@@ -413,13 +419,17 @@ ...@@ -413,13 +419,17 @@
{ {
$patient_data = $query->row_array(); $patient_data = $query->row_array();
//print_r($patient_data);exit(); if($type != 'COLLABORATOR'){
$this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob"); $this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob");
$this->db->where('id',$patient_data['id']); $this->db->where('id',$patient_data['id']);
$query_date = $this->db->get('tbl_registration')->row(); if($type == 'DOCTOR'){
//print_r($query_date);exit(); $query_date = $this->db->get('tbl_doctors')->row();
unset($patient_data['dob']); }else if($type == 'PATIENT'){
$patient_data['dob'] = $query_date->dob; $query_date = $this->db->get('tbl_registration')->row();
}
$patient_data['dob'] = $query_date->dob;
}
$return_array = array('status'=>'success','type'=>$type,'userdata'=> $patient_data); $return_array = array('status'=>'success','type'=>$type,'userdata'=> $patient_data);
...@@ -430,11 +440,17 @@ ...@@ -430,11 +440,17 @@
{ {
$patient_email = $query_email->row_array(); $patient_email = $query_email->row_array();
$this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob"); if($type != 'COLLABORATOR'){
$this->db->where('id',$patient_email['id']); $this->db->select("CAST(AES_DECRYPT(`dob`,'Ptf/PWNWrULQT72syxfaaBRTS9JbiKrj9dfuVEvT3rA') as CHAR) as dob");
$query_date = $this->db->get('tbl_registration')->row(); $this->db->where('id',$patient_email['id']);
unset($patient_email['dob']); if($type == 'DOCTOR'){
$patient_email['dob'] = $query_date->dob; $query_date = $this->db->get('tbl_doctors')->row();
}else if($type == 'PATIENT'){
$query_date = $this->db->get('tbl_registration')->row();
}
$patient_email['dob'] = $query_date->dob;
}
$return_array = array('status'=>'success','type'=>$type,'userdata'=>$patient_email); $return_array = array('status'=>'success','type'=>$type,'userdata'=>$patient_email);
......
application/models/Search_doctor_model.php
...@@ -129,8 +129,8 @@ public function get_single_doctor_clinic($dctr_id,$clinic_id) ...@@ -129,8 +129,8 @@ public function get_single_doctor_clinic($dctr_id,$clinic_id)
public function filter_search($post_data) public function filter_search($post_data)
{ {
//print_r($post_data); //print_r($post_data);echo"<br>";echo"<br>";
/*die();*/ //die();
//$limit = 10; //$limit = 10;
$page = 1; $page = 1;
if(isset($post_data['page'])) { if(isset($post_data['page'])) {
...@@ -258,8 +258,8 @@ public function filter_search($post_data) ...@@ -258,8 +258,8 @@ public function filter_search($post_data)
//$this->db->limit($limit); //$this->db->limit($limit);
$this->db->where('account_status','0'); $this->db->where('account_status','0');
$data =$this->db->get()->result_array(); $data =$this->db->get()->result_array();
//echo $this->db->last_query();exit; //echo $this->db->last_query();echo"<br>";
/*var_dump($data); */ //var_dump($data); exit();
return $data; return $data;
} }
function doctor_availability($doctor_id,$clinic_id) function doctor_availability($doctor_id,$clinic_id)
......
application/views/search_doctor_result.php
...@@ -27,7 +27,15 @@ ...@@ -27,7 +27,15 @@
<div class="ip_search_detail"> <div class="ip_search_detail">
<h5><?php echo $value['name']?></h5> <h5><?php echo $value['name']?></h5>
<p><?php echo $value['specialization']?></p> <p><?php echo $value['specialization']?></p>
<h6><?php echo $value['clinic_name']?>,<?php echo $value['clinic_street_address']?>-<?php echo $value['clinic_locality']?></h6> <h6><?php echo $value['clinic_name']?>,
<?php if($value['clinic_name'] == 'Default'){?>
<?php echo decrypt_data($value['clinic_street_address']);?>
-<?php echo decrypt_data($value['clinic_locality']);?>
<?php } else{ ?>
<?php echo $value['clinic_street_address']?>
-<?php echo $value['clinic_locality']?>
<?php } ?>
</h6>
</div> </div>
<div class="ip_search_ratting_price"> <div class="ip_search_ratting_price">
<p><!-- R$ <?php echo $value['price']?> --></p> <p><!-- R$ <?php echo $value['price']?> --></p>
......
application/views/template/header.php
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
<?php if(!empty($userdata)&&($userdata['type']=="DOCTOR" or $userdata['type']=="COLLABORATOR")) <?php if(!empty($userdata)&&($userdata['type']=="DOCTOR" or $userdata['type']=="COLLABORATOR"))
{?>Dr.<?php echo $userdata['name'];} {?>Dr.<?php echo $userdata['name'];}
else if(!empty($userdata)&&($userdata['type']=="PATIENT")){echo $userdata['name'];} else if(!empty($userdata)&&($userdata['type']=="PATIENT")){echo decrypt_data($userdata['name']);}
else{?><a href="<?php echo base_url()?>"><?php load_language('login/register');?></a> <?php } ?> else{?><a href="<?php echo base_url()?>"><?php load_language('login/register');?></a> <?php } ?>
......
assets/js/custom.js
...@@ -1763,11 +1763,11 @@ $('#money_cash').click(function(){ ...@@ -1763,11 +1763,11 @@ $('#money_cash').click(function(){
$('#credit_card_cash').click(function(){ $('#credit_card_cash').click(function(){
var entered_book_id = document.getElementById("book_status").getAttribute("book-id"); var entered_book_id = document.getElementById("book_status").getAttribute("book-id");
console.log(entered_book_id); //console.log(entered_book_id);
var data = {'book_id':entered_book_id,'payment_status':'0','payment_type':'2'}; var data = {'book_id':entered_book_id,'payment_status':'0','payment_type':'2'};
var result = post_ajax(base_url+'Searchdoctor/markpayment_viacredit',data); var result = post_ajax(base_url+'Searchdoctor/markpayment_viacredit',data);
var items = JSON.parse(result); var items = JSON.parse(result);
console.log(items); //console.log(items);
if(items== 'true'){ if(items== 'true'){
$('#select_cash_mode').modal('hide'); $('#select_cash_mode').modal('hide');
$('.confirm-tab-1').removeClass('active'); $('.confirm-tab-1').removeClass('active');
......
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