Commit 54971787 by Jansa Jose

Merge branch 'jansa'

parents fe8bc798 dd7ef95c
...@@ -935,11 +935,11 @@ class Webservice_model extends CI_Model { ...@@ -935,11 +935,11 @@ class Webservice_model extends CI_Model {
$futures = $diff - (($diff * $ipkfee->ipok_fee)/100); $futures = $diff - (($diff * $ipkfee->ipok_fee)/100);
if($doctor_wallet){ if($doctor_wallet){
$future = $futures + ($doctor_wallet->future_earn); $future = $futures + (decrypt_data($doctor_wallet->future_earn));
$total = $future + ($doctor_wallet->reedem_earn); $total = $future + (decrypt_data($doctor_wallet->reedem_earn));
$this->db->update('tbl_wallet_details',array('future_earn'=>$future,'total_earn'=>$total),array('doctor_id'=>$data['doctor_id'])); $this->db->update('tbl_wallet_details',array('future_earn'=>encrypt_data($future),'total_earn'=>encrypt_data($total)),array('doctor_id'=>$data['doctor_id']));
}else{ }else{
$this->db->insert('tbl_wallet_details',array('future_earn'=>$future,'total_earn'=>$future,'doctor_id'=>$data['doctor_id'],'reedem_earn'=>'0')); $this->db->insert('tbl_wallet_details',array('future_earn'=>encrypt_data($futures),'total_earn'=>encrypt_data($futures),'doctor_id'=>$data['doctor_id'],'reedem_earn'=>encrypt_data('0')));
} }
} }
...@@ -1840,9 +1840,9 @@ class Webservice_model extends CI_Model { ...@@ -1840,9 +1840,9 @@ class Webservice_model extends CI_Model {
$earn = $query['total_sum'] - (($query['total_sum'] * $query['ipok_fee'])/100); $earn = $query['total_sum'] - (($query['total_sum'] * $query['ipok_fee'])/100);
if($doctor_wallet){ if($doctor_wallet){
$future_earn = $doctor_wallet->future_earn - $earn; $future_earn = decrypt_data($doctor_wallet->future_earn) - $earn;
$total = $doctor_wallet->total_earn - $earn; $total = decrypt_data($doctor_wallet->total_earn) - $earn;
$this->db->update('tbl_wallet_details',array('future_earn'=>$future_earn,'total_earn'=>$total),array('doctor_id'=>$query['doctor_id'])); $this->db->update('tbl_wallet_details',array('future_earn'=>encrypt_data($future_earn),'total_earn'=>encrypt_data($total)),array('doctor_id'=>$query['doctor_id']));
} }
} }
$res = array("status"=>"success"); $res = array("status"=>"success");
...@@ -2876,9 +2876,9 @@ class Webservice_model extends CI_Model { ...@@ -2876,9 +2876,9 @@ class Webservice_model extends CI_Model {
$earn = $query->total_sum - (($query->total_sum * $query->ipok_fee)/100); $earn = $query->total_sum - (($query->total_sum * $query->ipok_fee)/100);
if($doctor_wallet){ if($doctor_wallet){
$future_earn = $doctor_wallet->future_earn - $earn; $future_earn = decrypt_data($doctor_wallet->future_earn) - $earn;
$total = $doctor_wallet->total_earn - $earn; $total = decrypt_data($doctor_wallet->total_earn) - $earn;
$this->db->update('tbl_wallet_details',array('future_earn'=>$future_earn,'total_earn'=>$total),array('doctor_id'=>$id)); $this->db->update('tbl_wallet_details',array('future_earn'=>encrypt_data($future_earn),'total_earn'=>encrypt_data($total)),array('doctor_id'=>$id));
} }
} }
$result = array('status'=>'success'); $result = array('status'=>'success');
...@@ -3310,10 +3310,10 @@ class Webservice_model extends CI_Model { ...@@ -3310,10 +3310,10 @@ class Webservice_model extends CI_Model {
$earn = $res->total_sum - (($res->total_sum * $res->ipok_fee)/100); $earn = $res->total_sum - (($res->total_sum * $res->ipok_fee)/100);
if($res->visit_type == '0'){ if($res->visit_type == '0'){
if($doctor_wallet){ if($doctor_wallet){
$redem_earn = $doctor_wallet->reedem_earn + $earn; $redem_earn = decrypt_data($doctor_wallet->reedem_earn) + $earn;
$future_earn = $doctor_wallet->future_earn - $earn; $future_earn = decrypt_data($doctor_wallet->future_earn) - $earn;
$total = $redem_earn + $future_earn; $total = $redem_earn + $future_earn;
$this->db->update('tbl_wallet_details',array('future_earn'=>$future_earn,'reedem_earn'=>$redem_earn,'total_earn'=>$total),array('doctor_id'=>$doctor_id)); $this->db->update('tbl_wallet_details',array('future_earn'=>encrypt_data($future_earn),'reedem_earn'=>encrypt_data($redem_earn),'total_earn'=>encrypt_data($total)),array('doctor_id'=>$doctor_id));
} }
} }
if($this->db->update('tbl_booking',array('booking_status'=>'3'),array('id'=>$data['booking_id']))){ if($this->db->update('tbl_booking',array('booking_status'=>'3'),array('id'=>$data['booking_id']))){
...@@ -3361,7 +3361,7 @@ class Webservice_model extends CI_Model { ...@@ -3361,7 +3361,7 @@ class Webservice_model extends CI_Model {
public function get_wallet_details($doctor_id){ public function get_wallet_details($doctor_id){
$result = $this->db->get_where('tbl_wallet_details',array('doctor_id'=>$doctor_id))->row(); $result = $this->db->get_where('tbl_wallet_details',array('doctor_id'=>$doctor_id))->row();
if($result){ if($result){
$res = array('status'=>'success','data'=>array('doctor_id'=>$doctor_id,'redeemable_earnings'=>$result->reedem_earn,'future_earnings'=>$result->future_earn,'total_earnings'=>$result->total_earn)); $res = array('status'=>'success','data'=>array('doctor_id'=>$doctor_id,'redeemable_earnings'=>decrypt_data($result->reedem_earn),'future_earnings'=>decrypt_data($result->future_earn),'total_earnings'=>decrypt_data($result->total_earn)));
}else{ }else{
$res = array('status'=>'failed','data'=>array('doctor_id'=>$doctor_id,'redeemable_earnings'=>'0','future_earnings'=>'0','total_earnings'=>'0')); $res = array('status'=>'failed','data'=>array('doctor_id'=>$doctor_id,'redeemable_earnings'=>'0','future_earnings'=>'0','total_earnings'=>'0'));
} }
...@@ -3456,8 +3456,8 @@ class Webservice_model extends CI_Model { ...@@ -3456,8 +3456,8 @@ class Webservice_model extends CI_Model {
if($bank){ if($bank){
$query = $this->db->get_where('tbl_wallet_details',array('doctor_id'=>$data['doctor_id']))->row(); $query = $this->db->get_where('tbl_wallet_details',array('doctor_id'=>$data['doctor_id']))->row();
$data['date'] = strtotime(date('Y-m-d h:i:s')); $data['date'] = strtotime(date('Y-m-d h:i:s'));
$data['previous_reedem_earn'] = $query->reedem_earn; $data['previous_reedem_earn'] = decrypt_data($query->reedem_earn);
if($query->reedem_earn >= $data['amount']){ if(decrypt_data($query->reedem_earn) >= $data['amount']){
$data['status'] = '0'; $data['status'] = '0';
if($this->db->insert('tbl_withdrawal_history',$data)){ if($this->db->insert('tbl_withdrawal_history',$data)){
$last = $this->db->insert_id(); $last = $this->db->insert_id();
...@@ -3650,7 +3650,7 @@ class Webservice_model extends CI_Model { ...@@ -3650,7 +3650,7 @@ class Webservice_model extends CI_Model {
public function update_wallet($id,$data) 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']; $sql = $this->db->insert_string('tbl_wallet_details', array("doctor_id"=>$id,"reedem_earn"=>encrypt_data($data['reedem_earn']),"future_earn"=>encrypt_data($data['future_earn']),"total_earn"=>encrypt_data($data['total_earn']))) . ' ON DUPLICATE KEY UPDATE doctor_id = ' .$id.',reedem_earn ='.'"' .encrypt_data($data['reedem_earn']).'"'.',future_earn='.encrypt_data($data['future_earn']).',total_earn='.encrypt_data($data['total_earn']);
if($this->db->query($sql)){ if($this->db->query($sql)){
$return_array = array('status'=>'success'); $return_array = array('status'=>'success');
} }
......
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