Skip to content

I
IPok_Web
Commit 677d5742 by Jithin
Options

wallet in progress

parent 7fe9708a
Showing with 555 additions and 43 deletions
application/controllers/Home.php
......@@ -312,7 +312,7 @@ class Home extends CI_Controller {
);
$collaborator_data = $this->Doctor_model->get_all_collaborator_for_doctor($result['userdata']['id']);
if(!empty($collaborator_data)){$this->session->set_userdata('CollaboratorData',$collaborator_data);}
$this->session->set_userdata('CollaboratorData',$collaborator_data);
}
else
{
......@@ -333,7 +333,7 @@ class Home extends CI_Controller {
$res = array(
"status"=> "success",
"data"=>array(
"type"=>"DOCTOR/COLLABORATOR",
"type"=>"COLLABORATOR",
"id"=> $doctor_data['doctorid'],
"name"=> $doctor_data['dr_name'],
"username"=> $doctor_data['dr_username'],
......@@ -707,6 +707,7 @@ class Home extends CI_Controller {
$template['page'] = "error_notauthorized";
$template['page_title'] = "Error";
$this->load->view('template/template', $template);
//$this->load->view('error_notauthorized', $template);
}
......@@ -751,7 +752,115 @@ class Home extends CI_Controller {
$this->email->send();
}
*/
/*FUCNTION TO ADD BANK DETAILS TO CURRENT USER*/
public function addBank()
{
if(!empty($this->session->userdata('UserData')))
{
$userdata = $this->session->userdata('UserData');
$insert_array = array('account_no' => $_POST['account'],'account_holder' => $_POST['name'],'bank_name' => $_POST['bank'],'agency' => $_POST['agency']);
if($userdata['type']=="PATIENT")
{
$insert_array['type']=0;
$insert_array['type_id'] = $userdata['id'];
}
elseif($userdata['type']=="DOCTOR")
{
$insert_array['type']=1;
$insert_array['type_id'] = $userdata['id'];
}
//print_r($insert_array);
$insert = $this->Home_model->insert_bank_account($insert_array);
if($insert)
{
$res = array('status' => 'success','message' => 'Bank Added');
}
else
{
$res = array('status' => 'error','message' => 'Failed.Try Again' );
}
print json_encode($res);
}
}
/*FUNCTION TO RETURN ALL SAVED BANKS FOR CURRENT USER*/
public function getAllBanks()
{
if(!empty($this->session->userdata('UserData')))
{
$userdata = $this->session->userdata('UserData');
$banks = $this->Home_model->get_all_banks($userdata['id'],$userdata['type']);
$template['banks'] = $banks;
$this->load->view('wallet_show_banks',$template);
}
}
/*FUNCTION TO RETURN ALL SAVED BANKS - Wallet display*/
public function refreshBankList()
{
if(!empty($this->session->userdata('UserData')))
{
$userdata = $this->session->userdata('UserData');
$banks = $this->Home_model->get_all_banks($userdata['id'],$userdata['type']);
$template['banks'] = $banks;
$this->load->view('wallet_show_bank_redemption',$template);
}
}
/* FUNCTION TO REMOVE BANK FOR GIVEN BANK ID*/
public function removeBank()
{
if(!empty($_POST['bank_id']) and !empty($this->session->userdata('UserData')))
{
$userdata = $this->session->userdata('UserData');
$this->Home_model->remove_bank($_POST['bank_id']);
$banks = $this->Home_model->get_all_banks($userdata['id'],$userdata['type']);
$template['banks'] = $banks;
$this->load->view('wallet_show_banks',$template);
}
}
/*FUNCTION TO PROCESS REDEMPTION REQUEST*/
public function redemptionrequest()
{
if(!empty($this->session->userdata('UserData')) and !empty($_POST))
{
$userdata = $this->session->userdata('UserData');
$get_account_balance = $this->Home_model->get_redemption_balance($userdata['id']);
$check_valid_bank = $this->Home_model->get_bank_valid($userdata['id'],$_POST['redemption_bank']);
//print_r($check_valid_bank);die();
if($get_account_balance['reedem_earn']>=$_POST['redemption_amount'] and $check_valid_bank['count']==1)
{
$withdrawal_insert = array('bank_id' => $_POST['redemption_bank'], 'amount'=>$_POST['redemption_amount'], 'date'=>time(),'status'=>0,'doctor_id' =>$userdata['id']);
$this->Home_model->add_redemption_request($withdrawal_insert);
$res = array('status' => 'success','message' => 'Redemption Requested' );
}
elseif($get_account_balance['reedem_earn']<=$_POST['redemption_amount'] and $check_valid_bank['count']==1)
{
$withdrawal_insert = array('bank_id' => $_POST['redemption_bank'], 'amount'=>$_POST['redemption_amount'], 'date'=>time(),'status'=>3,'doctor_id' =>$userdata['id']);
$this->Home_model->add_redemption_request($withdrawal_insert);
$res = array('status' => 'error','message' => 'Error, Insufficient Balance' );
}
else
{
$res = array('status' => 'error','message' => 'Invalid Bank Account Credentials' );
}
//print_r($withdrawal_insert);
}
else
{
$res = array('status' => 'error','message' => 'Facing Technical Issues!' );
}
print json_encode($res);
}
......
application/controllers/Patient.php
......@@ -84,6 +84,21 @@ public function cancelBooking()
//print_r($_POST);die();
$userdata = $this->session->userdata('UserData');
$result = $this->Patient_model->cancel_Booking($_POST['booking_id']);
/*CODE FOR WALLET INSERTION*/
/*---------------------------------------------------*/
$booking_details = $this->Doctor_model->get_booking_details($_POST['booking_id']);
if($booking_details['visit_type']==0)
{
$wallet = $this->Doctor_model->get_wallet_for_doctor($booking_details['doc_id']);
$earn = $booking_details['book_price'] - (($booking_details['book_price'] * $ipok_settings['ipok_fee'])/100);
$wallet['future_amount'] = $wallet['future_amount'] - $earn;
$wallet['total_amount'] = $wallet['total_amount'] - $earn;
$this->Doctor_model->update_wallet($booking_details['doc_id'],$wallet);
}
/*---------------------------------------------------*/
$check_waiting_list = $this->Patient_model->check_waiting_list($result);
//print_r($check_waiting_list);die();
if($check_waiting_list['count']>0)
......
application/controllers/Searchdoctor.php
......@@ -375,6 +375,9 @@ class Searchdoctor extends CI_Controller {
}
}
$ipok_settings = $this->Home_model->get_ipok_settings();
$data['ipok_fee'] = $ipok_settings['ipok_fee'];
//print_r($check_return_book);
//print_r($data);
......@@ -430,6 +433,20 @@ class Searchdoctor extends CI_Controller {
/*CODE FOR DOCTOR NOTIFICATION ON CONFIRMED CONSULTATION*/
$booking_details = $this->Search_doctor_model->get_booking_details($_POST['booking_id']);
$patient_data = $this->Patient_model->get_single_patient($booking_details['patient_id']);
$ipok_settings = $this->Home_model->get_ipok_settings();
/*CODE FOR WALLET INSERTION*/
/*------------------------------------------------*/
$wallet = $this->Doctor_model->get_wallet_for_doctor($booking_details['doctor_id']);
if(empty($wallet))
{
$wallet = array('reedem_earn' => 0,'future_earn' => 0 ,'total_earn' => 0 );
}
$earn = $booking_details['total_sum'] - (($booking_details['total_sum'] * $ipok_settings['ipok_fee'])/100);
$wallet['future_earn'] = $wallet['future_earn'] + $earn;
$wallet['total_earn'] = $wallet['total_earn'] + $earn;
$this->Doctor_model->update_wallet($booking_details['doctor_id'],$wallet);
/*------------------------------------------------*/
$text = 'A new appointment was scheduled in the system, on '.date('d.m.Y',$booking_details['time_start']).' at '.date('H:i a',$booking_details['time_start']).', patient '.$patient_data['pt_name'];
$notification = array('doctor_id' => $booking_details['doctor_id'],'type'=>2,'message'=>$text,'read_status'=>0,'time'=>strtotime($nowin_server) );
......
application/helpers/common_helper.php
......@@ -138,6 +138,20 @@ function send_mail($msg,$email,$sub)
->message($msg);
$CI->email->send();
}
function get_clinic_list($doc_id)
{
$CI = & get_instance();
$CI->db->select('tbl_clinic.id as clinic_id,
tbl_clinic.name as clinic_name,
tbl_clinic.profile_photo as clinic_pic');
$CI->db->from('tbl_clinic');
$CI->db->join('tbl_clinic_doctors', 'tbl_clinic_doctors.clinic_id = tbl_clinic.id','inner');
$CI->db->where('tbl_clinic_doctors.doctor_id',$doc_id);
$query = $CI->db->get();
return $query->result_array();
}
//print(cpf_validator('111.444.777-35'));// return 1 if valid else no return
?>
\ No newline at end of file
application/models/Doctor_model.php
......@@ -363,7 +363,7 @@ public function get_booking_details($book_id)
$this->db->select("tbl_booking.id as book_id,
tbl_booking.date as book_date,
tbl_booking.time as book_time,
tbl_booking.amount as book_price,
tbl_booking.total_sum as book_price,
tbl_registration.id as pat_id,
tbl_registration.name as pat_name,
tbl_booking.doctor_id as doc_id");
......@@ -775,6 +775,52 @@ public function get_collaboator_byid_doc_id($id,$docid)
return $query->row_array();
}
public function get_capabilities_of_collaborator($id)
{
$this->db->select('capabilities');
$this->db->from('tbl_doctor_colaborators');
$this->db->where('id',$id);
$query = $this->db->get();
return $query->row_array();
}
public function get_clinic_list($doc_id)
{
$this->db->select('tbl_clinic.id as clinic_id,
tbl_clinic.name as clinic_name,
tbl_clinic.profile_photo as clinic_pic');
$this->db->from('tbl_clinic');
$this->db->join('tbl_clinic_doctors', 'tbl_clinic_doctors.clinic_id = tbl_clinic.id','inner');
$this->db->where('tbl_clinic_doctors.doctor_id',$doc_id);
$query = $this->db->get();
return $query->result_array();
}
public function get_wallet_for_doctor($doc_id)
{
$this->db->select('reedem_earn as reedem_earn,
future_earn as future_earn,
total_earn as total_earn');
$this->db->from('tbl_wallet_details');
$this->db->where('doctor_id',$doc_id);
$query = $this->db->get();
return $query->row_array();
}
public function update_wallet($id,$data)
{
$sql = $this->db->insert_string('tbl_wallet_details', array("doctor_id"=>$id,"reedem_earn"=>$data['reedem_earn'],"future_earn"=>$data['future_earn'],"total_earn"=>$data['total_earn'])) . ' ON DUPLICATE KEY UPDATE doctor_id = ' .$id.',reedem_earn ='.'"' .$data['reedem_earn'].'"'.',future_earn='.$data['future_earn'].',total_earn='.$data['total_earn'];
//print_r($this->db->last_sqlquery());die();
if($this->db->query($sql)){
$return_array = array('status'=>'success');
}
else{
$return_array = array('status'=>'fail');
}
return $return_array;
}
}
?>
\ No newline at end of file
application/models/Home_model.php
......@@ -285,7 +285,7 @@
public function get_all_chat_users($id,$type)
{
if($type=='DOCTOR')
if($type=='DOCTOR' or $type=="COLLABORATOR")
{
$this->db->distinct('tbl_registration.id');
$this->db->select('tbl_registration.id as patient_id,
......@@ -320,7 +320,7 @@
public function get_recent_chat($id,$type)
{
if($type=='DOCTOR' or $type=='DOCTOR/COLLABORATOR')
if($type=='DOCTOR' or $type=='COLLABORATOR')
{
$this->db->select('tbl_recent_chats.*,
tbl_registration.name as pat_name,
......@@ -393,7 +393,117 @@
return false;
}
}
public function removeColaborator($id)
{
$this->db->where('id', $id);
if($this->db->delete('tbl_doctor_colaborators'))
{
return 1;
}
else
{
return 0;
}
}
public function insert_bank_account($data)
{
if($this->db->insert('tbl_bank_accounts', $data))
{
return true;
}
else
{
return false;
}
}
public function get_all_banks($id,$type)
{
$this->db->select('id,
bank_name,
agency,
account_no,
account_holder');
$this->db->from('tbl_bank_accounts');
if($type=="DOCTOR")
{
$this->db->where('type',1);
}
elseif($type=="PATIENT")
{
$this->db->where('type',0);
}
$this->db->where('type_id',$id);
$query = $this->db->get();
return $query->result_array();
}
public function remove_bank($id)
{
$this->db->where('id', $id);
$this->db->delete('tbl_bank_accounts');
}
public function get_redemption_balance($id)
{
$this->db->select('reedem_earn');
$this->db->from('tbl_wallet_details');
$this->db->where('doctor_id',$id);
$query = $this->db->get();
return $query->row_array();
}
public function add_redemption_request($data)
{
$this->db->insert('tbl_withdrawal_history', $data);
}
public function get_bank_valid($id,$bank_id)
{
$this->db->select('count(id) as count');
$this->db->from('tbl_bank_accounts');
$this->db->where('type_id',$id);
$this->db->where('type',1);
$this->db->where('id',$bank_id);
$query = $this->db->get();
return $query->row_array();
}
public function get_ipok_settings()
{
$this->db->select('*');
$this->db->from('settings');
$query = $this->db->get();
return $query->row_array();
}
public function get_last_redemption($id)
{
$this->db->select('*');
$this->db->from('tbl_withdrawal_history');
$this->db->where('date'.'<'.time());
$this->db->where('status',2);
$this->db->where('doctor_id',$id);
$this->db->limit(1);
$query = $this->db->get();
return $query->row_array();
}
public function get_next_release($id)
{
$current_time_in_UTC = strtotime(local_time_in_server(time()));
//print_r($current_time_in_UTC);die();
$this->db->select('*');
$this->db->from('tbl_booking');
$this->db->where('time_start'.'>'.$current_time_in_UTC);
$this->db->where('booking_status',1);
$this->db->where('doctor_id',$id);
$this->db->limit(1);
$query = $this->db->get();
return $query->row_array();
}
......
application/views/chat.php
......@@ -48,7 +48,7 @@
<div class="clear"></div>
</li>
<li ng-if="recentUsers&&session.type=='DOCTOR'" ng-repeat="recent in recentUsers | filter : {pat_name: namefilter}" ng-click="load_chat(recent)">
<li ng-if="recentUsers&&(session.type=='DOCTOR'||session.type=='COLLABORATOR')" ng-repeat="recent in recentUsers | filter : {pat_name: namefilter}" ng-click="load_chat(recent)">
<div class="ip_bio_message_pic">
<img src="<?php echo base_url();?>{{recent.pat_pic}}" ng-if="recent.pat_pic">
</div>
......@@ -72,7 +72,7 @@
<ul>
<h2>All Chats</h2>
<li ng-if="allUsers&&session.type=='DOCTOR'" ng-repeat="users in allUsers | filter : {pat_name: namefilter}" ng-click="load_chat(users)">
<li ng-if="allUsers&&(session.type=='DOCTOR'||session.type=='COLLABORATOR')" ng-repeat="users in allUsers | filter : {pat_name: namefilter}" ng-click="load_chat(users)">
<div class="ip_bio_message_pic">
<img src="<?php echo base_url();?>{{users.pat_pic}}" ng-if="users.pat_pic">
</div>
......@@ -122,7 +122,7 @@
<li ng-repeat="msg in messages">
<div class="ip_month_date" ng-if="msg.show_date"><!-- 02 Mar 2017 -->{{msg.time | date: 'dd MMM yyyy'}}</div>
<div class="ip_receive" ng-if="session.type=='DOCTOR'&&msg.sender_type==0">
<div class="ip_receive" ng-if="(session.type=='DOCTOR'||session.type=='COLLABORATOR')&&msg.sender_type==0">
<div class="ip_message_chat" ng-bind-html="trustAsHtml(msg.message)">
<div class="ip_receive_quote"></div>
<!-- {{msg.message}} -->
......@@ -130,7 +130,7 @@
<span>{{msg.time | date:'hh:mm a'}}</span>
</div>
<div class="ip_send" ng-if="session.type=='DOCTOR'&&msg.sender_type==1">
<div class="ip_send" ng-if="(session.type=='DOCTOR'||session.type=='COLLABORATOR')&&msg.sender_type==1">
<div class="ip_message_chat" ng-bind-html="trustAsHtml(msg.message)">
<div class="ip_send_quote"></div>
<!-- {{msg.message}} -->
......
application/views/doctor_dash_appointments_day.php
<?php
$userdata = $this->session->userdata('UserData');
if(!empty($day_appointment))
{
// print_r($day_appointment);die();
......@@ -27,21 +28,27 @@
</div>
</div>
<div class="col-md-4 p0 height100">
<div class="ip_day_time_schedule_details_data height100">
<a href="<?php echo base_url();?>Doctor/service/<?php echo $value['booking_id']?>">
<button id="doc_service_startbtn" type="button" class="ip_start_service_btn">Start Service</button>
</a>
<?php
if($userdata['type']=="DOCTOR")
{
?>
<div class="col-md-4 p0 height100">
<div class="ip_day_time_schedule_details_data height100">
<a href="<?php echo base_url();?>Doctor/service/<?php echo $value['booking_id']?>">
<button id="doc_service_startbtn" type="button" class="ip_start_service_btn">Start Service</button>
</a>
</div>
</div>
</div>
<?php
}
?>
<div class="col-md-3 p0 height100 textCenter">
<div class="ip_day_time_schedule_details_data height100">
<div id="doc_dash_appoint_cancel" bookid="<?php echo $value['booking_id'];?>">
<span class="ip_canceler"><img src="<?php echo base_url();?>assets/images/ip_cancel.png"></span>
<span class="ip_canceler">Cancel</span>
</div>
</div>
</div>
......
application/views/doctor_dash_edit_colaborator.php
......@@ -71,7 +71,7 @@
<button class="ip_colaborator_btn" type="button" id="edit-colaborator-btn" collabor="<?php echo $collaborator_data['id'];?>">Update & Save</button>
</a>
<a href="javascript:void(0)">
<button class="ip_colaborator_delete_btn" type="button" id="delete-colaborator-btn" collabor="<?php echo $collaborator_data['id'];?>" >Delete Collaborator</button>
<button class="ip_colaborator_delete_btn" type="button" id="delete-colaborator-btn" colabor="<?php echo $collaborator_data['id'];?>" >Delete Collaborator</button>
</a>
</div>
<div class="alert alert-success alert-dismiss textCenter hidden" id="colabor-edit-success">Collaborator Profile Updated!</div>
......@@ -135,6 +135,25 @@
</div>
</div>
<div id="success-collaborator-del" class="modal fade" role="dialog">
<div class="modal-dialog">
<div class="ip_custom_modal" style="min-height:200px !important;">
<div class="ip_custom_modal_content">
<div class="ip_main_tab_content ">
<div class="ip_main_tab_pic">
<img src="<?php echo base_url();?>assets/images/tick.png">
</div>
<div class="success_content">
<h1><strong>Success</strong></h1>
<h5><strong>Collaborator Excluded!</strong></h5>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
var checkbox_appoint = document.getElementById('checkbox-access-appoint');
var checkbox_msg = document.getElementById('checkbox-access-msg');
......
application/views/doctor_dash_start_service.php
......@@ -541,6 +541,7 @@
<div class="ip_edit_record_cover">
<form id="add-letter-form" data-parsley-validate="" role="form">
<div class="ip_edit_record_head" data-toggle="collapse" data-target="#letters">
Attached letters
</div>
......@@ -555,7 +556,7 @@
<label for="checkbox-31" class="ip_custom_checkbox_label1">Standard certificate</label>
</div>
<div class="ip_day_time_schedule_details_data p0 floatLeft">
<input id="checkbox-32" class="ip_custom_checkbox1 certificate-type" name="choose-certificate-type" type="radio" value="standardcid">
<input id="checkbox-32" class="ip_custom_checkbox1 certificate-type" name="choose-certificate-type" type="radio" value="standardcid" data-parsley-required="">
<label for="checkbox-32" class="ip_custom_checkbox_label1">Standard certificate with CID</label>
</div>
<div class="clear"></div>
......@@ -565,7 +566,7 @@
<div class="ip_edit_row">
<p class="ip_row_p">Days of removal</p>
<div class="ip_bank_detail_frame">
<select class="ip_bank_input certificate-type" id="certificate-days">
<select class="ip_bank_input certificate-type" id="certificate-days" data-parsley-required="">
<option value="0" disabled selected>Select Day</option>
<?php
for($i=1;$i<=30;$i++)
......@@ -584,7 +585,7 @@
<div class="ip_edit_row">
<p class="ip_row_p">Diagnostic (CID)</p>
<div class="ip_bank_detail_frame">
<select class="ip_bank_input certificate-type" id="certificate-cid">
<select class="ip_bank_input certificate-type" id="certificate-cid" data-parsley-required="">
<option value="0" selected disabled>Start Dieting</option>
cidnumbers
<?php if(!empty($cidnumbers))
......@@ -627,8 +628,9 @@
</div>
</div>
<div class="alert hidden alert-success textCenter" id="certificate-success"></div>
<div class="alert hidden alert-danger textCenter" id="certificate-error"></div>
<div class="alert hidden alert-danger textCenter" id="certificate-error">Please enter Certificate Data! Minimum 20 Characters</div>
</div>
</form>
</div>
</div>
......
application/views/template/header.php
......@@ -121,7 +121,7 @@
?>
<li class="active"><a href="<?php echo base_url()?>Home/Dashboard">Dashboard</a></li>
<li ><a href="">Agenda</a></li>
<li ><a href="">Wallet</a></li>
<li ><a href="<?php echo base_url();?>Doctor/wallet"">Wallet</a></li>
<li ><a href="<?php echo base_url();?>Doctor/records/">Records</a></li>
<!-- <li ><a href="">About Us</a></li>
<li ><a href="">FAQ</a></li>
......@@ -176,7 +176,7 @@
<input class="ip_nav_search_text" type="text" placeholder="Search">
</div>
</li> -->
<?php if(!empty($userdata) and ($userdata['type']=='DOCTOR') or $userdata['type']=='PATIENT')
<?php if(!empty($this->session->userdata('UserData') ) and ($this->session->userdata('UserData')['type']=='DOCTOR') or $this->session->userdata('UserData')['type']=='PATIENT')
{?>
<li class="dropdown">
<div class="ip_nav_notification dropdown-toggle" data-toggle="dropdown">
......@@ -270,13 +270,42 @@
<div class="ip_nav_account_profile_pic dropdown-toggle" data-toggle="dropdown">
<img src="<?php echo base_url();echo $userdata['profile_photo'];?>">
</div>
<?php } ?>
<?php
}
?>
<?php if(!empty($userdata)&&($userdata['type']=="DOCTOR"))
{?>
{
$clinic_list = get_clinic_list($userdata['id']);
?>
<ul class="dropdown-menu ip_nav_profile_listing">
<div class="ip_arrow_up"></div>
<?php
if(!empty($clinic_list))
{
?>
<li>
<p>Clinics</p>
</li>
<?php
foreach ($clinic_list as $key => $elm)
{
?>
<li>
<div class="ip_drop_pic">
<img src="<?php echo base_url(); echo $elm['clinic_pic']?>">
</div>
<div class="ip_drop_detail"><?php echo $elm['clinic_name']?></div>
<div class="clear"></div>
</li>
<?php
}
}
?>
<!-- CODE FOR SHOWING COLLABORATOR -->
<?php if(!empty($collaboratordata)){
?>
......@@ -314,7 +343,7 @@
<?php } ?>
<?php if(!empty($userdata)&&($userdata['type']=="DOCTOR/COLLABORATOR"))
<?php if(!empty($userdata)&&($userdata['type']=="COLLABORATOR"))
{?>
<ul class="dropdown-menu ip_nav_profile_listing">
<div class="ip_arrow_up"></div>
......@@ -366,7 +395,7 @@
<?php } ?>
<div class="ip_nav_account_profile_name">
<?php if(!empty($userdata)&&($userdata['type']=="DOCTOR" or $userdata['type']=="DOCTOR/COLLABORATOR"))
<?php if(!empty($userdata)&&($userdata['type']=="DOCTOR" or $userdata['type']=="COLLABORATOR"))
{?>Dr.<?php echo $userdata['name'];}
else if(!empty($userdata)&&($userdata['type']=="PATIENT")){echo $userdata['name'];}
......
application/views/wallet_show_bank_redemption.php 0 → 100644
<div class="ip_bank_detail_frame">
<select class="ip_bank_input reset-redemption-form" data-parsley-required="" name="redemption_bank">
<option disabled selected>Select Bank</option>
<?php
if(!empty($banks))
{
foreach ($banks as $key => $value)
{
?>
<option value="<?php echo $value['id'];?>"><?php echo $value['bank_name'];?> - <?php echo $value['account_no'];?></option>
<?php
}
}
?>
</select>
</div>
\ No newline at end of file
application/views/wallet_show_banks.php 0 → 100644
<div class="ip_bank_detail">
<?php
if(!empty($banks))
{
foreach ($banks as $key => $value)
{
?>
<li>
<div class="ip_bank_left">
<h6><?php echo $value['bank_name'];?> <?php echo $value['account_no'];?> <?php echo $value['agency'];?></h6>
<p><?php echo $value['account_holder'];?></p>
</div>
<div class="ip_bank_close delete-bank-btn" bankid="<?php echo $value['id'];?>">
</div>
<div class="clear"></div>
</li>
<?php
}
}
else
{
?>
<li>
<div class="ip_bank_left">
<h6>You have not added any banks!</h6>
</div>
<div class="clear"></div>
</li>
<?php
}
?>
</div>
\ No newline at end of file
assets/css/custom.css
......@@ -30,6 +30,7 @@ body::-webkit-scrollbar {
.pl15{padding-left:20px !important;padding-right:20px !important;}
.p10{padding: 10px !important;}
.p12{padding: 12px !important;}
.p14{padding: 14px !important;}
.p15{padding: 15px !important;}
.m0{margin:0px !important;}
.ml0{margin-left: 0px !important;}
......
assets/js/chat/chat-page.js
......@@ -88,7 +88,7 @@ $scope.load_chat =function(object)
}
$scope.list = [];
if($scope.session.type=="DOCTOR")
if($scope.session.type=="DOCTOR" || $scope.session.type=="COLLABORATOR")
{
$scope.opponent = {'name' : object.pat_name,'id' : object.patient_id,'pic' : object.pat_pic};
$scope.chat_id = 'P'+object.patient_id+'@_@D'+$scope.session.id;
......@@ -142,7 +142,7 @@ $scope.sentmsg = function (msg,opp)
{
//console.log(msg,$scope.session,$scope.opponent)
if($scope.session.type=="DOCTOR")
if($scope.session.type=="DOCTOR" || $scope.session.type=="COLLABORATOR")
{
var object = { 'doctor_id':Number($scope.session.id),
'doctor_name':$scope.session.name,
......@@ -198,10 +198,15 @@ $scope.sentmsg = function (msg,opp)
}
}
firebase.database().ref('chats/'+$scope.chat_id+'/').push(object); //Update msg in firebase
if($scope.session.type=="DOCTOR")
//firebase.database().ref('chats/'+$scope.chat_id+'/').push(object); //Update msg in firebase
var newRef = firebase.database().ref('chats/'+$scope.chat_id+'/').push().then((snap) =>
{
object.id = snap.key;
firebase.database().ref('chats/'+$scope.chat_id+'/'+snap.key).set(object); //Update msg in firebase
//console.log(snap.key );
});
if($scope.session.type=="DOCTOR" || $scope.session.type=="COLLABORATOR")
{recent_obj.sender_type = 1;}
if($scope.session.type=="PATIENT")
{recent_obj.sender_type = 0;}
......
assets/js/custom.js
......@@ -269,7 +269,7 @@ var offset = getTimezoneOffset();
var array_other_obsr_file = [];
function certificate_images_loadthumbnail(file)
{
{
$('#certificate-show-img,#certificate-show-details').empty();
array_other_obsr_file = [];
elem = file.files;
......@@ -288,13 +288,87 @@ function certificate_images_loadthumbnail(file)
$(function(){
$('#request-redemption-btn').click(function()
{
$('#redemption-success-error').addClass('hidden')
if($('#redempetion-req-form').parsley().validate())
{
console.log($('#redempetion-req-form').serialize())
var result = post_ajax(base_url+'Home/redemptionrequest',$('#redempetion-req-form').serialize());
var items = JSON.parse(result);
if(items.status=='success')
{
$('.reset-redemption-form').val('');
$('#redemption-success-error').removeClass('hidden').removeClass('alert-danger').addClass('alert-success').html(items.message);
}
else
{
$('#redemption-success-error').removeClass('hidden').removeClass('alert-success').addClass('alert-danger').html(items.message);
}
}
})
/*WALLET PAGE STARTS*/
$(document).on('click','.delete-bank-btn',function()
{
var elm = this;
var bank_id = this.getAttribute('bankid');
var result = post_ajax(base_url+'Home/removeBank',{'bank_id': bank_id});
$('#show_all_saved_banks').html(result);
var result_new = post_ajax(base_url+'Home/refreshBankList');
$('#show_bank_for_redemption').html(result_new);
})
$('#add-bank-reg-btn').click(function()
{
$('#add-bank-success-error').addClass('hidden');
if($('#add-bank-form').parsley().validate())
{
//console.log($('#add-bank-form').serialize())
var result = post_ajax(base_url+'Home/addBank',$('#add-bank-form').serialize());
var items = JSON.parse(result);
if(items.status=='success')
{
$('#add-bank-success-error').removeClass('alert-danger').addClass('alert-success').removeClass('hidden').html(items.message);
var result_inner = post_ajax(base_url+'Home/getAllBanks');
$('#show_all_saved_banks').html(result_inner);
$('.reset-bank-form').val('');
var result_new = post_ajax(base_url+'Home/refreshBankList');
$('#show_bank_for_redemption').html(result_new);
}
else
{
$('#add-bank-success-error').removeClass('alert-success').addClass('alert-danger').removeClass('hidden').html(items.message);
}
}
})
/*WALLET PAGE ENDS*/
/*DELETE COLLABORATOR PROFILE*/
$('#delete-colaborator-btn').click(function()
{
var elem = this;
var colabor = elem.getAttribute('colabor');
//var result = post_ajax(base_url+'Doctor/removeColaborator',{'collaborator_id':colabor});
//var items = JSON.parse(result);
var result = post_ajax(base_url+'Doctor/removeColaborator',{'collaborator_id':colabor});
var items = JSON.parse(result);
if(items.status=="success")
{
$('#success-collaborator-del').modal('show');
$("#success-collaborator-del").on("hidden.bs.modal", function () {
window.location.href= base_url;
});
}
else
{
$('#colabor-edit-error').removeClass('hidden').html(items.message);
}
})
/*EDIT &UPDATE COLLABORATOR PROFILE SAVE BTN*/
......@@ -644,9 +718,9 @@ $('#certificate-save-btn').click(function(){
var certificate_desc = $("#certificate").val(CKEDITOR.instances.certificate.getData());
console.log(certificate_desc[0].value.length);
if(certificate_desc[0].value.length<20)
if(certificate_desc[0].value.length<20 && $('#add-letter-form').parsley().validate())
{
$('#certificate-error').removeClass('hidden').html('Please enter Certificate Data! Minimum 20 Characters');
$('#certificate-error').removeClass('hidden');
setTimeout(function()
{
$('#certificate-error').addClass('hidden');
......@@ -656,7 +730,19 @@ $('#certificate-save-btn').click(function(){
{
var data = {'certificate' : certificate_desc[0].value,
'booking_id' : this.getAttribute('bookid'),
'section' : this.getAttribute('section')}
'section' : this.getAttribute('section'),
'days' : $('#certificate-days').val(),
'cid' : $('#certificate-cid').val()}
type = $("input[name='choose-certificate-type']:checked").val();
if(type=='standard')
{
data.is_letter_with_cid = false;
}
else if(type=="standardcid")
{
data.is_letter_with_cid = true;
}
var result = post_ajax(base_url+'Doctor/save_medicalrecord_data',data);
var items = JSON.parse(result);
......@@ -1915,7 +2001,7 @@ $("#login_submit").click(function()
$("#login").modal("hide");
window.location.href='Doctor/';
}
else if(items.status=="success"&&items.data.type=="DOCTOR/COLLABORATOR")
else if(items.status=="success"&&items.data.type=="COLLABORATOR")
{
$("#login").modal("hide");
......
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