adminnistrateur
/
backoffice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Add new variables for Répartition commission envoi wallet-carte pour utilisateur ilink

This commit is contained in:
Djery-Tom 2020-07-01 18:52:21 +01:00
parent b2597d161b
commit 58d3b47dc3
6 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Gestion.php
View File

@ -1732,7 +1732,7 @@ class Gestion extends CI_Controller
$this->user_model->updateConfigWalletIlink($rows['taux_u_w_cart'],$rows['taux_u_c_w'],$rows['taux_u_c_c'],$rows['taux_ag_d_c_c'],$rows['taux_ag_cart_c'],$rows['taux_ag_cash_c'],$rows['taux_ag_s_c'],$rows['taux_sup_s_c'],$rows['taux_hyp_s_c'],$rows['taux_ag_r_c'],$rows['taux_sup_r_c'], $this->user_model->updateConfigWalletIlink($rows['taux_u_w_cart'],$rows['taux_u_c_w'],$rows['taux_u_c_c'],$rows['taux_ag_d_c_c'],$rows['taux_ag_cart_c'],$rows['taux_ag_cash_c'],$rows['taux_ag_s_c'],$rows['taux_sup_s_c'],$rows['taux_hyp_s_c'],$rows['taux_ag_r_c'],$rows['taux_sup_r_c'],
$rows['taux_hyp_r_c'],$rows['taux_ag_d_c'],$rows['taux_sup_d_c'],$rows['taux_hyp_d_c'],$rows['taux_bq_d_c'], $rows['taux_ag_r_cart'],$rows['taux_sup_r_cart'],$rows['taux_hyp_r_cart'],$rows['taux_bq_r_cart'], $rows['taux_hyp_r_c'],$rows['taux_ag_d_c'],$rows['taux_sup_d_c'],$rows['taux_hyp_d_c'],$rows['taux_bq_d_c'], $rows['taux_ag_r_cart'],$rows['taux_sup_r_cart'],$rows['taux_hyp_r_cart'],$rows['taux_bq_r_cart'],
$rows['taux_hyp_r_cart_ilink'],$rows['taux_bq_r_cart_ilink'],$idConfig); $rows['taux_hyp_r_cart_ilink'],$rows['taux_bq_r_cart_ilink'],$rows['taux_hyp_s_wallet_cart_ilink'],$rows['taux_bq_s_wallet_cart_ilink'],$idConfig);
$res = true; $res = true;
} }

8
application/controllers/Hyperviseur_dash.php
View File

@ -406,6 +406,8 @@ class Hyperviseur_dash extends CI_Controller
$data['taux_bq_r_cart'] = $taux->taux_com_banque_retrait_carte_cash; $data['taux_bq_r_cart'] = $taux->taux_com_banque_retrait_carte_cash;
$data['taux_hyp_r_cart_ilink'] = $taux->taux_com_hyp_retrait_carte_cash_ilink; $data['taux_hyp_r_cart_ilink'] = $taux->taux_com_hyp_retrait_carte_cash_ilink;
$data['taux_bq_r_cart_ilink'] = $taux->taux_com_banque_retrait_carte_cash_ilink; $data['taux_bq_r_cart_ilink'] = $taux->taux_com_banque_retrait_carte_cash_ilink;
$data['taux_hyp_s_wallet_cart_ilink'] = $taux->taux_com_hyp_envoi_wallet_carte_ilink;
$data['taux_bq_s_wallet_cart_ilink'] = $taux->taux_com_banque_envoi_wallet_carte_ilink;
$transactions = $this->user_model->getNetworkIlinTransactions($id_network); $transactions = $this->user_model->getNetworkIlinTransactions($id_network);
$data["transactions"] = array(); $data["transactions"] = array();
@ -754,9 +756,9 @@ class Hyperviseur_dash extends CI_Controller
case 2: //Envoi de wallet à carte case 2: //Envoi de wallet à carte
$frais = $montant * $config->taux_com_user_wallet_carte / 100; $frais = $montant * $config->taux_com_user_wallet_carte / 100;
// $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 * $config->taux_com_hyp_envoi_wallet_carte_ilink / 100 ;
$com_hyp += $frais ; $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_hyp',$com_hyp);$this->session->set_userdata('com_bq',$com_bq);
break; break;
case 3: //Envoi de wallet à cash 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); $frais = ($init_country != $final_country) ? $this->calculateFees1($plr_user_wallet_cash, $montant) : $this->calculateFees1($plr_user_wallet_cash_national, $montant);

3
application/language/english/message_lang.php
View File

@ -338,6 +338,8 @@ $lang ['rate_com_agent_cart_cash'] = 'Geolocated agent commission rate on cash c
$lang ['rate_com_agent_cash_cart'] = 'Commission rate of the geolocated agent on cash deposit to card'; $lang ['rate_com_agent_cash_cart'] = 'Commission rate of the geolocated agent on cash deposit to card';
$lang ['rate_com_hyp_remove_cart_ilink'] = 'Hypervisor commission rate on card withdrawal operation for iLink user'; $lang ['rate_com_hyp_remove_cart_ilink'] = 'Hypervisor commission rate on card withdrawal operation for iLink user';
$lang ['rate_com_bq_remove_cart_ilink'] = 'Bank commission rate on card withdrawal operation for iLink user'; $lang ['rate_com_bq_remove_cart_ilink'] = 'Bank commission rate on card withdrawal operation for iLink user';
$lang['rate_com_hyp_send_wallet_cart_ilink'] = 'Hypervisor commission rate on wallet to card sending operation for iLink user';
$lang['rate_com_bq_send_wallet_cart_ilink'] = 'Bank commission rate on wallet to card sending operation for iLink user...';
// Currency management // Currency management
$lang ['currency'] = 'Currency'; $lang ['currency'] = 'Currency';
@ -388,6 +390,7 @@ $lang['ilink_second_rule'] = 'The sum of the commission distributions on the wit
$lang['ilink_third_rule'] = 'The sum of the distribution of commission on cash deposit to card operation must be equal to 100%'; $lang['ilink_third_rule'] = 'The sum of the distribution of commission on cash deposit to card operation must be equal to 100%';
$lang['ilink_fourth_rule'] = 'The sum of the distribution of commission on withdrawal operation in the card must be equal to 100%'; $lang['ilink_fourth_rule'] = 'The sum of the distribution of commission on withdrawal operation in the card must be equal to 100%';
$lang['ilink_fifth_rule'] = 'The sum of the distribution of commission on withdrawal operation in the card for iLink user must be equal to 100%'; $lang['ilink_fifth_rule'] = 'The sum of the distribution of commission on withdrawal operation in the card for iLink user must be equal to 100%';
$lang['ilink_sixth_rule'] = 'The sum of the commission distributions on the operation of sending a wallet to the iLink user card must be equal to 100%';
$lang['edit_paying_networks'] = 'Configuration of paying networks'; $lang['edit_paying_networks'] = 'Configuration of paying networks';
$lang['configure'] = 'Configure'; $lang['configure'] = 'Configure';
$lang['configure_share_rate'] = 'Configure the sharing rate'; $lang['configure_share_rate'] = 'Configure the sharing rate';

4
application/language/french/message_lang.php
View File

@ -350,6 +350,8 @@
$lang['rate_com_agent_cash_cart'] = 'Taux de commission de l\'agent géolocalisé sur depot cash vers carte '; $lang['rate_com_agent_cash_cart'] = 'Taux de commission de l\'agent géolocalisé sur depot cash vers carte ';
$lang['rate_com_hyp_remove_cart_ilink'] = 'Taux de commission hyperviseur sur operation de retrait dans carte pour utilisateur iLink '; $lang['rate_com_hyp_remove_cart_ilink'] = 'Taux de commission hyperviseur sur operation de retrait dans carte pour utilisateur iLink ';
$lang['rate_com_bq_remove_cart_ilink'] = 'Taux de commission banque sur operation de retrait dans carte pour utilisateur iLink '; $lang['rate_com_bq_remove_cart_ilink'] = 'Taux de commission banque sur operation de retrait dans carte pour utilisateur iLink ';
$lang['rate_com_hyp_send_wallet_cart_ilink'] = 'Taux de commission hyperviseur sur operation d\'envoi de wallet vers carte pour utilisateur iLink';
$lang['rate_com_bq_send_wallet_cart_ilink'] = 'Taux de commission banque sur operation d\'envoi de wallet vers carte pour utilisateur iLink';
// Gestion de la monnaie // Gestion de la monnaie
$lang['currency'] = 'Monnaie'; $lang['currency'] = 'Monnaie';
@ -400,6 +402,7 @@ $lang['ilink_second_rule'] = 'La somme des répartitions de commission sur opér
$lang['ilink_third_rule'] = 'La somme des répartitions de commission sur opération de depot cash vers carte doit etre égale à 100 %'; $lang['ilink_third_rule'] = 'La somme des répartitions de commission sur opération de depot cash vers carte doit etre égale à 100 %';
$lang['ilink_fourth_rule'] = 'La somme des répartitions de commission sur opération de retrait dans la carte doit etre égale à 100 %'; $lang['ilink_fourth_rule'] = 'La somme des répartitions de commission sur opération de retrait dans la carte doit etre égale à 100 %';
$lang['ilink_fifth_rule'] = 'La somme des répartitions de commission sur opération de retrait dans la carte pour utilisateur iLink doit etre égale à 100 %'; $lang['ilink_fifth_rule'] = 'La somme des répartitions de commission sur opération de retrait dans la carte pour utilisateur iLink doit etre égale à 100 %';
$lang['ilink_sixth_rule'] = 'La somme des répartitions de commission sur opération d\'envoi de wallet vers la carte pour utilisateur iLink doit etre égale à 100 %';
$lang['edit_paying_networks'] = 'Configuration des réseaux payeurs'; $lang['edit_paying_networks'] = 'Configuration des réseaux payeurs';
$lang['configure'] = 'Configurer'; $lang['configure'] = 'Configurer';
$lang['configure_share_rate'] = 'Configurer le taux de partage'; $lang['configure_share_rate'] = 'Configurer le taux de partage';
@ -417,4 +420,5 @@ $lang['customer_net_amount_final'] = 'Montant net client du pays d\'arrivée';
$lang['issuer_id'] = 'ID émetteur'; $lang['issuer_id'] = 'ID émetteur';
$lang['recipient_id']= 'ID destinataire'; $lang['recipient_id']= 'ID destinataire';
$lang['commission_paying_network'] = 'Commission de l\'hyperviseur payeur'; $lang['commission_paying_network'] = 'Commission de l\'hyperviseur payeur';
?> ?>

7
application/models/User_model.php
View File

@ -2300,11 +2300,12 @@ class User_model extends CI_Model
} }
public function updateConfigWalletIlink($taux_u_w_cart,$taux_u_c_w,$taux_u_c_c,$taux_ag_d_c_c,$taux_ag_cart_c,$taux_ag_cash_c,$taux_ag_s_c,$taux_sup_s_c,$taux_hyp_s_c,$taux_ag_r_c,$taux_sup_r_c,$taux_hyp_r_c, public function updateConfigWalletIlink($taux_u_w_cart,$taux_u_c_w,$taux_u_c_c,$taux_ag_d_c_c,$taux_ag_cart_c,$taux_ag_cash_c,$taux_ag_s_c,$taux_sup_s_c,$taux_hyp_s_c,$taux_ag_r_c,$taux_sup_r_c,$taux_hyp_r_c,
$taux_ag_d_c,$taux_sup_d_c,$taux_hyp_d_c,$taux_bq_d_c ,$taux_ag_r_cart,$taux_sup_r_cart,$taux_hyp_r_cart,$taux_bq_r_cart ,$taux_hyp_r_cart_ilink,$taux_bq_r_cart_ilink ,$idConfig){ $taux_ag_d_c,$taux_sup_d_c,$taux_hyp_d_c,$taux_bq_d_c ,$taux_ag_r_cart,$taux_sup_r_cart,$taux_hyp_r_cart,$taux_bq_r_cart ,$taux_hyp_r_cart_ilink,$taux_bq_r_cart_ilink ,$taux_hyp_s_wallet_cart_ilink,$taux_bq_s_wallet_cart_ilink, $idConfig){
$sql = "UPDATE `configWallet` SET `taux_com_user_wallet_carte` = ?, `taux_com_user_carte_wallet` = ?, `taux_com_user_carte_cash` = ?, `taux_com_wallet_ag_envoi_cash_carte` = ?,`taux_com_wallet_ag_carte_cash` = ?, `taux_com_wallet_ag_depot_carte` = ?, `taux_com_ag_envoi_cash` = ?, `taux_com_sup_envoi_cash` = ?, `taux_com_hyp_envoi_cash` = ?, `taux_com_ag_retrait_cash` = ?, `taux_com_sup_retrait_cash` = ?, `taux_com_hyp_retrait_cash` = ?, $sql = "UPDATE `configWallet` SET `taux_com_user_wallet_carte` = ?, `taux_com_user_carte_wallet` = ?, `taux_com_user_carte_cash` = ?, `taux_com_wallet_ag_envoi_cash_carte` = ?,`taux_com_wallet_ag_carte_cash` = ?, `taux_com_wallet_ag_depot_carte` = ?, `taux_com_ag_envoi_cash` = ?, `taux_com_sup_envoi_cash` = ?, `taux_com_hyp_envoi_cash` = ?, `taux_com_ag_retrait_cash` = ?, `taux_com_sup_retrait_cash` = ?, `taux_com_hyp_retrait_cash` = ?,
`taux_com_ag_depot_cash_carte` = ?, `taux_com_sup_depot_cash_carte` = ?, `taux_com_hyp_depot_cash_carte` = ?, `taux_com_banque_depot_cash_carte` = ?, `taux_com_ag_retrait_carte_cash` = ?, `taux_com_sup_retrait_carte_cash` = ?, `taux_com_hyp_retrait_carte_cash` = ?, `taux_com_banque_retrait_carte_cash` = ?, `taux_com_hyp_retrait_carte_cash_ilink` = ?, `taux_com_banque_retrait_carte_cash_ilink` = ? WHERE (`id` = ?);"; `taux_com_ag_depot_cash_carte` = ?, `taux_com_sup_depot_cash_carte` = ?, `taux_com_hyp_depot_cash_carte` = ?, `taux_com_banque_depot_cash_carte` = ?, `taux_com_ag_retrait_carte_cash` = ?, `taux_com_sup_retrait_carte_cash` = ?, `taux_com_hyp_retrait_carte_cash` = ?, `taux_com_banque_retrait_carte_cash` = ?, `taux_com_hyp_retrait_carte_cash_ilink` = ?, `taux_com_banque_retrait_carte_cash_ilink` = ? ,
`taux_com_hyp_envoi_wallet_carte_ilink` = ?, `taux_com_banque_envoi_wallet_carte_ilink` = ? WHERE (`id` = ?);";
$query = $this->db->query($sql , array($taux_u_w_cart,$taux_u_c_w,$taux_u_c_c, $taux_ag_d_c_c,$taux_ag_cart_c,$taux_ag_cash_c,$taux_ag_s_c,$taux_sup_s_c,$taux_hyp_s_c,$taux_ag_r_c,$taux_sup_r_c,$taux_hyp_r_c, $query = $this->db->query($sql , array($taux_u_w_cart,$taux_u_c_w,$taux_u_c_c, $taux_ag_d_c_c,$taux_ag_cart_c,$taux_ag_cash_c,$taux_ag_s_c,$taux_sup_s_c,$taux_hyp_s_c,$taux_ag_r_c,$taux_sup_r_c,$taux_hyp_r_c,
$taux_ag_d_c,$taux_sup_d_c,$taux_hyp_d_c,$taux_bq_d_c , $taux_ag_r_cart,$taux_sup_r_cart,$taux_hyp_r_cart, $taux_bq_r_cart , $taux_hyp_r_cart_ilink,$taux_bq_r_cart_ilink,$idConfig)); $taux_ag_d_c,$taux_sup_d_c,$taux_hyp_d_c,$taux_bq_d_c , $taux_ag_r_cart,$taux_sup_r_cart,$taux_hyp_r_cart, $taux_bq_r_cart , $taux_hyp_r_cart_ilink,$taux_bq_r_cart_ilink,$taux_hyp_s_wallet_cart_ilink,$taux_bq_s_wallet_cart_ilink,$idConfig));
return $query; return $query;
} }

48
application/views/gestion_wallet_ilink_hyp.php
View File

@ -529,7 +529,7 @@ $context = new \Brick\Money\Context\AutoContext();
</div> </div>
<div class="row"> <div class="row">
<!--Taux commission wallet agent carte client et Taux commission wallet agent carte client--> <!--Taux commission wallet agent carte client et Taux commission wallet agent carte client-->
<div class="col-lg-2 col-xs-6"> <div class="col-lg-2 col-lg-offset-2 col-xs-6">
<div class="small-box bg-orange"> <div class="small-box bg-orange">
<div class="inner"> <div class="inner">
<h3><?php echo $taux_ag_r_cart; ?><sup style="font-size: 20px">%</sup></h3> <h3><?php echo $taux_ag_r_cart; ?><sup style="font-size: 20px">%</sup></h3>
@ -577,6 +577,33 @@ $context = new \Brick\Money\Context\AutoContext();
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<!--Taux commission wallet agent carte client et Taux commission wallet agent carte client-->
<div class="col-lg-2 col-lg-offset-2 col-xs-6">
<div class="small-box bg-light-blue-active">
<div class="inner">
<h3><?php echo $taux_hyp_s_wallet_cart_ilink; ?><sup style="font-size: 20px">%</sup></h3>
<p><?php echo $this->lang->line('rate_com_hyp_send_wallet_cart_ilink') ?> </p>
</div>
<div class="icon">
<i class="ion ion-android-arrow-up"></i>
</div>
</div>
</div>
<div class="col-lg-2 col-xs-6">
<div class="small-box bg-light-blue-active">
<div class="inner">
<h3><?php echo $taux_bq_s_wallet_cart_ilink; ?><sup style="font-size: 20px">%</sup></h3>
<p><?php echo $this->lang->line('rate_com_bq_send_wallet_cart_ilink') ?> </p>
</div>
<div class="icon">
<i class="ion ion-android-arrow-up"></i>
</div>
</div>
</div>
<div class="col-lg-2 col-xs-6"> <div class="col-lg-2 col-xs-6">
<div class="small-box bg-teal-active"> <div class="small-box bg-teal-active">
@ -601,7 +628,6 @@ $context = new \Brick\Money\Context\AutoContext();
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row centered"> <div class="row centered">
<div class="col-lg-3 col-xs-12"> <div class="col-lg-3 col-xs-12">
@ -1605,6 +1631,18 @@ $context = new \Brick\Money\Context\AutoContext();
<input type="number" min="0" step=".01" required class="form-control" <input type="number" min="0" step=".01" required class="form-control"
name="taux_bq_r_cart_ilink" id="taux_bq_r_cart_ilink" value="<?= $taux_bq_r_cart_ilink ?>"> name="taux_bq_r_cart_ilink" id="taux_bq_r_cart_ilink" value="<?= $taux_bq_r_cart_ilink ?>">
</div> </div>
<div class="form-group">
<label for="taux_hyp_s_wallet_cart_ilink"
class="col-form-label"><?php echo $this->lang->line('rate_com_hyp_send_wallet_cart_ilink') . ' (%)'; ?></label>
<input type="number" min="0" step=".01" required class="form-control"
name="taux_hyp_s_wallet_cart_ilink" id="taux_hyp_s_wallet_cart_ilink" value="<?= $taux_hyp_s_wallet_cart_ilink ?>">
</div>
<div class="form-group">
<label for="taux_bq_s_wallet_cart_ilink"
class="col-form-label"><?php echo $this->lang->line('rate_com_bq_send_wallet_cart_ilink') . ' (%)'; ?></label>
<input type="number" min="0" step=".01" required class="form-control"
name="taux_bq_s_wallet_cart_ilink" id="taux_bq_s_wallet_cart_ilink" value="<?= $taux_bq_s_wallet_cart_ilink ?>">
</div>
</div> </div>
</div> </div>
</form> </form>
@ -1896,6 +1934,10 @@ $context = new \Brick\Money\Context\AutoContext();
// total répartition commission réseau retrait carte-cash utilisateur ilink (retrait) // total répartition commission réseau retrait carte-cash utilisateur ilink (retrait)
const total5 = parseFloat($('#taux_hyp_r_cart_ilink').val()) + parseFloat($('#taux_bq_r_cart_ilink').val()); const total5 = parseFloat($('#taux_hyp_r_cart_ilink').val()) + parseFloat($('#taux_bq_r_cart_ilink').val());
// total répartition commission réseau d'envoi de wallet vers carte utilisateur ilink (retrait)
const total6 = parseFloat($('#taux_hyp_s_wallet_cart_ilink').val()) + parseFloat($('#taux_bq_s_wallet_cart_ilink').val());
if(total1 != 100){ if(total1 != 100){
toastr.error("<?php echo $this->lang->line('ilink_first_rule')?>", "<?php echo $this->lang->line('management_rule')?>"); toastr.error("<?php echo $this->lang->line('ilink_first_rule')?>", "<?php echo $this->lang->line('management_rule')?>");
@ -1907,6 +1949,8 @@ $context = new \Brick\Money\Context\AutoContext();
toastr.error("<?php echo $this->lang->line('ilink_fourth_rule')?>", "<?php echo $this->lang->line('management_rule')?>"); toastr.error("<?php echo $this->lang->line('ilink_fourth_rule')?>", "<?php echo $this->lang->line('management_rule')?>");
} else if (total5 != 100) { } else if (total5 != 100) {
toastr.error("<?php echo $this->lang->line('ilink_fifth_rule')?>", "<?php echo $this->lang->line('management_rule')?>"); toastr.error("<?php echo $this->lang->line('ilink_fifth_rule')?>", "<?php echo $this->lang->line('management_rule')?>");
} else if (total6 != 100) {
toastr.error("<?php echo $this->lang->line('ilink_sixth_rule')?>", "<?php echo $this->lang->line('management_rule')?>");
} else { } else {
if ($('#walletForm')[0].checkValidity()) { if ($('#walletForm')[0].checkValidity()) {