diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php
index ddc610b7..cbc9c0f4 100755
--- a/application/controllers/Hyperviseur_dash.php
+++ b/application/controllers/Hyperviseur_dash.php
@@ -457,6 +457,8 @@ class Hyperviseur_dash extends CI_Controller
$data['transactions'] = $this->user_model->getCommissionTransfers($startDate, $endDate, $this->session->userdata('member_code'));
else if ($type == 'balance_statement')
$data['wallets'] = $this->user_model->getInfosWalletAgentForHyper($this->session->userdata('network_id'));
+ else if ($type == 'refund_history')
+ $data['refunds'] = $this->user_model->getRefunds($startDate, $endDate, $network_id);
else
$data['transactions'] = $this->user_model->getRecharges($startDate, $endDate, $network_id);
@@ -482,6 +484,8 @@ class Hyperviseur_dash extends CI_Controller
$this->load->view('historique_transferts_commission');
else if ($type == 'balance_statement')
$this->load->view('config_wallet_ilink_hyp/etat_soldes');
+ else if ($type == 'refund_history')
+ $this->load->view('historique_remboursement');
else
$this->load->view('historique_recharges');
$this->load->view('footer');
@@ -598,7 +602,7 @@ class Hyperviseur_dash extends CI_Controller
$this->email->message($this->lang->line('mot de passe') . ' : ' . $password);
if ($this->email->send()) {
- $this->user_model->updateWalletPassword($wallet_password_id, $encrypted_password, $salt, $email);
+ $this->user_model->updateWalletPassword($wallet_password_id, $encrypted_password, $salt);
$res = true;
} else {
// show_error($this->email->print_debugger());
@@ -640,6 +644,32 @@ class Hyperviseur_dash extends CI_Controller
}
}
+ public function rembourser_compensation()
+ {
+ if ($this->isLogged()) {
+ if (isset($_POST)) {
+ $password = $_POST['password'];
+ $id_config = $_POST['id_config'];
+ $id_network = $_POST['id_network'];
+ $salt = $_POST['salt'];
+ $encrypted_password = $_POST['encrypted_password'];
+ $montant = $_POST['montant'];
+
+ $hash = base64_encode(sha1($password . $salt, true) . $salt);
+
+ if ($encrypted_password == $hash) {
+ $res = $this->user_model->insertRembourssementCompensation($montant, $id_network, $id_config);
+ $code = $res ? '200' : '401';
+ } else {
+ $code = '400';
+ }
+
+ echo json_encode($code);
+
+ }
+ }
+ }
+
public function calculator()
{
if ($this->isLogged()) {
@@ -718,28 +748,29 @@ class Hyperviseur_dash extends CI_Controller
switch ($operation) {
case 1: //Envoi wallet à wallet
$frais = ($init_country != $final_country) ? $this->calculateFees1($plr_user_wallet_wallet, $montant) : $this->calculateFees1($plr_user_wallet_wallet_national, $montant);
- $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
+ $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
- $com_hyp += $frais ;
- $this->session->set_userdata('com_hyp',$com_hyp);
+ $com_hyp = $frais;
+ $this->session->set_userdata('com_hyp', $com_hyp);
break;
case 2: //Envoi de wallet à carte
$frais = $montant * $config->taux_com_user_wallet_carte / 100;
// $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
- $com_hyp += $frais * $config->taux_com_hyp_envoi_wallet_carte_ilink / 100 ;
- $com_bq += $frais * $config->taux_com_banque_envoi_wallet_carte_ilink / 100 ;
- $this->session->set_userdata('com_hyp',$com_hyp);$this->session->set_userdata('com_bq',$com_bq);
+ $com_hyp = $frais * $config->taux_com_hyp_envoi_wallet_carte_ilink / 100;
+ $com_bq = $frais * $config->taux_com_banque_envoi_wallet_carte_ilink / 100;
+ $this->session->set_userdata('com_hyp', $com_hyp);
+ $this->session->set_userdata('com_bq', $com_bq);
break;
case 3: //Envoi de wallet à cash
$frais = ($init_country != $final_country) ? $this->calculateFees1($plr_user_wallet_cash, $montant) : $this->calculateFees1($plr_user_wallet_cash_national, $montant);
- $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
+ $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
- $com_hyp += $frais ;
- $this->session->set_userdata('com_hyp',$com_hyp);
+ $com_hyp = $frais;
+ $this->session->set_userdata('com_hyp', $com_hyp);
// $this->session->set_userdata('frais_retrait',$frais);
$code = $this->random_string();
- $data['message_code'] = ''.$code;
- $this->user_model->insertSimulateur($frais,$montant-$frais-$taxe,$code,$montant);
+ $data['message_code'] = '' . $code;
+// $this->user_model->insertSimulateur($frais,$montant-$frais-$taxe,$code,$montant);
break;
case 4: //Envoi de wallet à banque
// Non disponible
@@ -755,47 +786,50 @@ class Hyperviseur_dash extends CI_Controller
// break;
case 9: // Retrait de wallet en cash
$frais = ($init_country != $final_country) ? $this->calculateFees1($plr_user_wallet_cash, $montant) : $this->calculateFees1($plr_user_wallet_cash_national, $montant);
- $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
+ $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
- $com_hyp += $frais ;
- $this->session->set_userdata('com_hyp',$com_hyp);
+ $com_hyp = $frais;
+ $this->session->set_userdata('com_hyp', $com_hyp);
$code = $this->random_string();
- $data['message_code'] = ''.$code;
- $this->user_model->insertSimulateur($frais,$montant-$frais-$taxe,$code,$montant);
+ $data['message_code'] = '' . $code;
+// $this->user_model->insertSimulateur($frais,$montant-$frais-$taxe,$code,$montant);
break;
case 10: //Retrait de carte vers wallet
$frais = $montant * $config->taux_com_user_carte_wallet / 100;
- $com_hyp += $frais * $config->taux_com_hyp_retrait_carte_cash_ilink / 100 ;
- $com_bq += $frais * $config->taux_com_banque_retrait_carte_cash_ilink / 100 ;
- $this->session->set_userdata('com_hyp',$com_hyp);$this->session->set_userdata('com_bq',$com_bq);
+ $com_hyp = $frais * $config->taux_com_hyp_retrait_carte_cash_ilink / 100;
+ $com_bq = $frais * $config->taux_com_banque_retrait_carte_cash_ilink / 100;
+ $this->session->set_userdata('com_hyp', $com_hyp);
+ $this->session->set_userdata('com_bq', $com_bq);
break;
case 11: // Retrait de carte vers cash
- $frais = $montant * $config->taux_com_user_carte_cash / 100;
+ $frais = $montant * $config->taux_com_user_carte_cash / 100;
- $com_hyp += $frais * $config->taux_com_hyp_retrait_carte_cash_ilink / 100 ;
- $com_bq += $frais * $config->taux_com_banque_retrait_carte_cash_ilink / 100 ;
- $this->session->set_userdata('com_hyp',$com_hyp);$this->session->set_userdata('com_bq',$com_bq);
+ $com_hyp = $frais * $config->taux_com_hyp_retrait_carte_cash_ilink / 100;
+ $com_bq = $frais * $config->taux_com_banque_retrait_carte_cash_ilink / 100;
+ $this->session->set_userdata('com_hyp', $com_hyp);
+ $this->session->set_userdata('com_bq', $com_bq);
$code = $this->random_string();
- $data['message_code'] = ''.$code;
- $this->user_model->insertSimulateur($frais * $config->taux_com_hyp_retrait_carte_cash_ilink / 100,$montant-$frais-$taxe,$code,$montant);
+ $data['message_code'] = '' . $code;
+// $this->user_model->insertSimulateur($frais * $config->taux_com_hyp_retrait_carte_cash_ilink / 100,$montant-$frais-$taxe,$code,$montant);
break;
case 12: // Agent - Retrait en cash
// empty
//Sauvegarder les frais lors de chaque operation d'envoi
if(isset($code)){
$simulateur = $this->user_model->getSimulateur($code);
- if($simulateur){
- $part_ag = $simulateur->first_row()->com_hyp * $config->taux_com_ag_retrait_cash/ 100 ;
- $part_sup = $simulateur->first_row()->com_hyp * $config->taux_com_sup_retrait_cash/ 100;
- $com_ag += $part_ag;
- $com_sup += $part_sup ;
+ if($simulateur) {
+ $part_ag = $simulateur->first_row()->com_hyp * $config->taux_com_ag_retrait_cash / 100;
+ $part_sup = $simulateur->first_row()->com_hyp * $config->taux_com_sup_retrait_cash / 100;
+ $com_ag = $part_ag;
+ $com_sup = $part_sup;
$com_hyp -= ($part_ag + $part_sup);
$data['montant_retrait'] = $simulateur->first_row()->montant_retrait;
$data['frais_retrait'] = $simulateur->first_row()->com_hyp;
$data['montant_init'] = $simulateur->first_row()->montant;
- $this->session->set_userdata('com_ag',$com_ag);$this->session->set_userdata('com_sup',$com_sup);
- $this->session->set_userdata('com_hyp',$com_hyp);
+ $this->session->set_userdata('com_ag', $com_ag);
+ $this->session->set_userdata('com_sup', $com_sup);
+ $this->session->set_userdata('com_hyp', $com_hyp);
}else{
$data['error_simulateur'] = 'Code de retrait incorrect';
}
@@ -808,51 +842,58 @@ class Hyperviseur_dash extends CI_Controller
case 13: // Agent - Retrait de la carte vers cash
$frais = $montant * $config->taux_com_wallet_ag_carte_cash / 100;
- $com_ag += $frais * $config->taux_com_ag_retrait_carte_cash/ 100 ;
- $com_sup += $frais * $config->taux_com_sup_retrait_carte_cash / 100 ;
- $com_hyp += $frais * $config->taux_com_hyp_retrait_carte_cash / 100 ;
- $com_bq += $frais * $config->taux_com_banque_retrait_carte_cash / 100 ;
- $this->session->set_userdata('com_ag',$com_ag);$this->session->set_userdata('com_sup',$com_sup);
- $this->session->set_userdata('com_hyp',$com_hyp);$this->session->set_userdata('com_bq',$com_bq);
+ $com_ag = $frais * $config->taux_com_ag_retrait_carte_cash / 100;
+ $com_sup = $frais * $config->taux_com_sup_retrait_carte_cash / 100;
+ $com_hyp = $frais * $config->taux_com_hyp_retrait_carte_cash / 100;
+ $com_bq = $frais * $config->taux_com_banque_retrait_carte_cash / 100;
+ $this->session->set_userdata('com_ag', $com_ag);
+ $this->session->set_userdata('com_sup', $com_sup);
+ $this->session->set_userdata('com_hyp', $com_hyp);
+ $this->session->set_userdata('com_bq', $com_bq);
break;
case 14: // Agent - Envoi de cash vers wallet iLink
$frais = ($init_country != $final_country) ? $this->calculateFees1($plr_agent_depot_wallet_ilink, $montant) : $this->calculateFees1($plr_agent_depot_wallet_ilink_national, $montant);
- $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
- $com_ag += $frais * $config->taux_com_ag_envoi_cash / 100 ;
- $com_sup += $frais * $config->taux_com_sup_envoi_cash / 100 ;
- $com_hyp += $frais * $config->taux_com_hyp_envoi_cash / 100 ;
- $this->session->set_userdata('com_ag',$com_ag);$this->session->set_userdata('com_sup',$com_sup);
- $this->session->set_userdata('com_hyp',$com_hyp);
+ $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
+ $com_ag = $frais * $config->taux_com_ag_envoi_cash / 100;
+ $com_sup = $frais * $config->taux_com_sup_envoi_cash / 100;
+ $com_hyp = $frais * $config->taux_com_hyp_envoi_cash / 100;
+ $this->session->set_userdata('com_ag', $com_ag);
+ $this->session->set_userdata('com_sup', $com_sup);
+ $this->session->set_userdata('com_hyp', $com_hyp);
break;
case 15: // Agent - Envoi de cash vers autre wallet
$frais = ($init_country != $final_country) ? $this->calculateFees1($plr_agent_depot_autre_wallet, $montant) : $this->calculateFees1($plr_agent_depot_autre_wallet_national, $montant);
- $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
- $com_ag += $frais * $config->taux_com_ag_envoi_cash / 100 ;
- $com_sup += $frais * $config->taux_com_sup_envoi_cash / 100 ;
- $com_hyp += $frais * $config->taux_com_hyp_envoi_cash / 100 ;
- $this->session->set_userdata('com_ag',$com_ag);$this->session->set_userdata('com_sup',$com_sup);
- $this->session->set_userdata('com_hyp',$com_hyp);
+ $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
+ $com_ag = $frais * $config->taux_com_ag_envoi_cash / 100;
+ $com_sup = $frais * $config->taux_com_sup_envoi_cash / 100;
+ $com_hyp = $frais * $config->taux_com_hyp_envoi_cash / 100;
+ $this->session->set_userdata('com_ag', $com_ag);
+ $this->session->set_userdata('com_sup', $com_sup);
+ $this->session->set_userdata('com_hyp', $com_hyp);
break;
case 16: // Agent - Envoi de cash vers une carte visa
$frais = $montant * $config->taux_com_wallet_ag_envoi_cash_carte / 100;
- $com_ag += $frais * $config->taux_com_ag_depot_cash_carte/ 100 ;
- $com_sup += $frais * $config->taux_com_sup_depot_cash_carte / 100 ;
- $com_hyp += $frais * $config->taux_com_hyp_depot_cash_carte / 100 ;
- $com_bq += $frais * $config->taux_com_banque_depot_cash_carte / 100 ;
- $this->session->set_userdata('com_ag',$com_ag);$this->session->set_userdata('com_sup',$com_sup);
- $this->session->set_userdata('com_hyp',$com_hyp);$this->session->set_userdata('com_bq',$com_bq);
+ $com_ag = $frais * $config->taux_com_ag_depot_cash_carte / 100;
+ $com_sup = $frais * $config->taux_com_sup_depot_cash_carte / 100;
+ $com_hyp = $frais * $config->taux_com_hyp_depot_cash_carte / 100;
+ $com_bq = $frais * $config->taux_com_banque_depot_cash_carte / 100;
+ $this->session->set_userdata('com_ag', $com_ag);
+ $this->session->set_userdata('com_sup', $com_sup);
+ $this->session->set_userdata('com_hyp', $com_hyp);
+ $this->session->set_userdata('com_bq', $com_bq);
break;
case 17: // Agent - Envoi de cash vers cash
$frais = ($init_country != $final_country) ? $this->calculateFees1($plr_agent_cash_cash, $montant) : $this->calculateFees1($plr_agent_cash_cash_national, $montant);
- $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales , $frais) : $this->calculateTax($taxesNationales ,$frais);
- $com_ag += $frais * $config->taux_com_ag_envoi_cash / 100 ;
- $com_sup += $frais * $config->taux_com_sup_envoi_cash / 100 ;
- $com_hyp += $frais * $config->taux_com_hyp_envoi_cash / 100 ;
- $this->session->set_userdata('com_ag',$com_ag);$this->session->set_userdata('com_sup',$com_sup);
- $this->session->set_userdata('com_hyp',$com_hyp);
+ $taxe = ($init_country != $final_country) ? $this->calculateTax($taxesInternationales, $frais) : $this->calculateTax($taxesNationales, $frais);
+ $com_ag = $frais * $config->taux_com_ag_envoi_cash / 100;
+ $com_sup = $frais * $config->taux_com_sup_envoi_cash / 100;
+ $com_hyp = $frais * $config->taux_com_hyp_envoi_cash / 100;
+ $this->session->set_userdata('com_ag', $com_ag);
+ $this->session->set_userdata('com_sup', $com_sup);
+ $this->session->set_userdata('com_hyp', $com_hyp);
$code = $this->random_string();
- $data['message_code'] = ''.$code;
- $this->user_model->insertSimulateur($frais,$montant-$frais-$taxe,$code,$montant);
+ $data['message_code'] = '' . $code;
+// $this->user_model->insertSimulateur($frais,$montant-$frais-$taxe,$code,$montant);
break;
case 18: // Agent - Envoi de cash vers banque
// Indisponible
@@ -1125,6 +1166,8 @@ class Hyperviseur_dash extends CI_Controller
$data['country'] = $this->session->userdata('current_pays');
$data['category'] = $this->session->userdata('category');
$data['idConfig'] = $data['hasWallet']->first_row()->id;
+ $res = $this->user_model->getWalletPassword($this->session->userdata('network_id'));
+ $data['walletPassword'] = $res ? $res->first_row() : null;
$data['networks'] = $this->user_model->getPayingNetworksByConfigWallet($data['idConfig']);
$this->load->view('header_hyp', $data);
diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php
index c28928b3..538ef25e 100755
--- a/application/language/english/message_lang.php
+++ b/application/language/english/message_lang.php
@@ -418,4 +418,25 @@ $lang ['config_ilink_agent_send_cash_carte'] = 'Sending cash to a visa card';
$lang ['config_ilink_agent_send_cash_canal'] = 'Sending cash to another channel (Wallet or cash)';
$lang ['config_user'] = 'User configuration';
$lang ['config_agent'] = 'Configuration agent';
+$lang ['config_ilink_note'] = 'The sharing of commissions is done between the hypervisor and the paying network!';
+$lang ['configure_paying_network'] = 'Configure the paying network';
+$lang ['paying_network_updated'] = 'Paying network updated';
+$lang ['commission_transfer_historic'] = 'History of commission transfers';
+$lang ['init_balance_princ'] = 'Initial principal balance';
+$lang ['init_balance_com'] = 'Initial commission balance';
+$lang ['final_balance_princ'] = 'Final principal balance';
+$lang ['final_balance_com'] = 'Final commission balance';
+$lang ['export_commission_transfer_history'] = 'Export the history of commission transfers displayed';
+$lang ['export_transaction_history'] = 'Export the history of displayed transactions';
+$lang ['export_balance_statement'] = 'Export the current state of accounts';
+$lang ['balance_statement'] = 'Statement of accounts';
+$lang ['created_date'] = 'Creation date';
+$lang['compensation_balance'] = 'Compensation balance';
+$lang['refund_compensation'] = 'Refund compensation';
+$lang ['refund'] = 'Refund';
+$lang ['refund_made'] = 'Refund made';
+$lang ['refund_history'] = 'History of refunds';
+$lang ['remaining_amount'] = 'Remaining amount';
+$lang ['amount_greater_than_balance'] = 'Amount greater than the compensation balance';
+$lang['no_refund'] = 'No refund';
?>
diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php
index c24df21b..2a8238a2 100755
--- a/application/language/french/message_lang.php
+++ b/application/language/french/message_lang.php
@@ -442,5 +442,14 @@ $lang['export_commission_transfer_history'] = 'Exporter l\'historique des transf
$lang['export_transaction_history'] = 'Exporter l\'historique des transactions affichées';
$lang['export_balance_statement'] = 'Exporter l\'état actuel des comptes';
$lang['balance_statement'] = 'État des comptes';
-$lang['created_date'] ='Date de creation';
+$lang['created_date'] = 'Date de creation';
+$lang['compensation_balance'] = 'Solde de compensation';
+$lang['refund_compensation'] = 'Rembourser la compensation';
+$lang['refund'] = 'Rembourser';
+$lang['refund_made'] = 'Remboursement effectué';
+$lang['refund_history'] = 'Historique des remboursements';
+$lang['remaining_amount'] = 'Montant restant';
+$lang['amount_greater_than_balance'] = 'Montant supérieur au solde de compensation';
+$lang['no_refund'] = 'Aucun remboursement';
+
?>
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 7277783f..1fe05fd3 100755
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -2201,24 +2201,27 @@ class User_model extends CI_Model
}
}
- public function addWalletPassword($network_id,$encrypted_password,$salt,$email){
+ public function addWalletPassword($network_id, $encrypted_password, $salt, $email)
+ {
$sql = "INSERT INTO `walletsPassword` (`network_id`, `encrypted_password`, `salt`, `email`) VALUES ( ?, ?, ?, ?);";
- $query = $this->db->query($sql , array($network_id,$encrypted_password,$salt,$email));
+ $query = $this->db->query($sql, array($network_id, $encrypted_password, $salt, $email));
return $query;
}
- public function updateWalletPassword($wallet_password_id,$encrypted_password,$salt,$email){
- $sql = "UPDATE `walletsPassword` SET `encrypted_password` = ? , `salt` = ? , `email` = ? WHERE (`id` = ?);";
- $query = $this->db->query($sql , array($encrypted_password,$salt,$email,$wallet_password_id));
+ public function updateWalletPassword($wallet_password_id, $encrypted_password, $salt)
+ {
+ $sql = "UPDATE `walletsPassword` SET `encrypted_password` = ? , `salt` = ? WHERE (`id` = ?);";
+ $query = $this->db->query($sql, array($encrypted_password, $salt, $wallet_password_id));
return $query;
}
- public function getWalletPassword($network_id){
- $sql= "SELECT * FROM walletsPassword WHERE network_id = ?";
- $query = $this->db->query($sql , array($network_id));
- if($query->num_rows()>0){
+ public function getWalletPassword($network_id)
+ {
+ $sql = "SELECT * FROM walletsPassword WHERE network_id = ?";
+ $query = $this->db->query($sql, array($network_id));
+ if ($query->num_rows() > 0) {
return $query;
- }else{
+ } else {
return false;
}
}
@@ -2540,12 +2543,13 @@ class User_model extends CI_Model
}
}
- public function getPayingNetworksByConfigWallet($id_config){
- $query = $this->db->query("SELECT n.name , n.id , cw.type , c.name as country ,c.currency_code, pw.taux_partage as rate , pw.balance_com FROM networks n INNER JOIN countries_currencies c ON n.country_id=c.id
+ public function getPayingNetworksByConfigWallet($id_config)
+ {
+ $query = $this->db->query("SELECT n.name , n.id , cw.type , c.name as country ,c.currency_code, pw.taux_partage as rate , pw.balance_com , pw.balance_compensation, pw.id_configWallet as config_id FROM networks n INNER JOIN countries_currencies c ON n.country_id=c.id
INNER JOIN configWallet cw ON cw.id_network = n.id INNER JOIN paying_networks pw ON pw.id_network = n.id WHERE pw.id_configWallet = $id_config ");
- if($query->num_rows()>0){
+ if ($query->num_rows() > 0) {
return $query;
- }else{
+ } else {
return false;
}
}
@@ -2607,13 +2611,44 @@ class User_model extends CI_Model
}
}
- public function getInfosWalletAgentForSuper($codeMembre){
+ public function getInfosWalletAgentForSuper($codeMembre)
+ {
$query = $this->db->query("SELECT *
FROM wallet_agent
- WHERE `codeParrain`='".$codeMembre."'");
- if($query->num_rows()>0){
+ WHERE `codeParrain`='" . $codeMembre . "'");
+ if ($query->num_rows() > 0) {
return $query;
- }else{
+ } else {
+ return false;
+ }
+ }
+
+ public function insertRembourssementCompensation($montant, $id_network, $id_config)
+ {
+ $sql = "SELECT * FROM `paying_networks` WHERE `id_network` = ? AND id_configWallet = ? ;";
+ $query = $this->db->query($sql, array($id_network, $id_config));
+ if ($query->num_rows() > 0) {
+ $montant_init = $query->first_row()->balance_compensation;
+ if (($montant_init - $montant) < 0)
+ return false;
+ $sql = "UPDATE `paying_networks` SET balance_compensation = ? WHERE `id_network` = ? AND id_configWallet = ?;";
+ $this->db->query($sql, array($montant_init - $montant, $id_network, $id_config));
+ $sql = "INSERT INTO `remboursemment_compensation` (`montant` , `montant_restant`,`id_paying_network` , `id_network`) VALUES ( ?, ?, ? ,?);";
+ $this->db->query($sql, array($montant, $montant_init - $montant, $id_network, $this->session->userdata('network_id')));
+ return true;
+ }
+ return false;
+ }
+
+ public function getRefunds($debut, $fin, $id_network)
+ {
+ $chain = $debut ? " AND date BETWEEN '" . $debut . "' AND '" . $fin . "'" : "";
+ $query = $this->db->query("SELECT rp.* , n.name as network , cc.name as country , cc.currency_code FROM remboursemment_compensation rp
+ INNER JOIN networks n ON n.id = id_paying_network INNER JOIN countries_currencies cc ON cc.id = n.country_id
+ WHERE rp.id_network =" . $id_network . $chain);
+ if ($query->num_rows() > 0) {
+ return $query;
+ } else {
return false;
}
}
diff --git a/application/views/gestion_wallet_ilink_paying_network_account.php b/application/views/gestion_wallet_ilink_paying_network_account.php
index bcddb098..8fb7e215 100755
--- a/application/views/gestion_wallet_ilink_paying_network_account.php
+++ b/application/views/gestion_wallet_ilink_paying_network_account.php
@@ -48,6 +48,11 @@
@@ -57,7 +62,7 @@
$numrows = $networks->num_rows();
$num = 0;
if ($numrows > 0) {
- $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
+ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL);
?>
@@ -66,8 +71,10 @@
lang->line('Nom'); ?> |
lang->line('Pays'); ?> |
Wallet |
- lang->line('share_rate')?> |
- =$this->lang->line('Solde Commission')?> |
+ lang->line('share_rate') ?> |
+ = $this->lang->line('Solde Commission') ?> |
+ = $this->lang->line('compensation_balance') ?> |
+ Action |
@@ -92,13 +99,25 @@
} else {
?>
- lang->line('not_defined'); ?>
+ lang->line('not_defined'); ?>
|
- = Money::of(round($row->balance_com,2 ),$row->currency_code ? $row->currency_code : 'XAF',$context)->formatTo('fr_FR')?>
+ = Money::of(round($row->balance_com, 2), $row->currency_code ? $row->currency_code : 'XAF', $context)->formatTo('fr_FR') ?>
+ |
+
+ = Money::of(round($row->balance_compensation, 2), $row->currency_code ? $row->currency_code : 'XAF', $context)->formatTo('fr_FR') ?>
+ |
+
+
|
-