diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index ec0acb72..1933b32a 100755 --- a/application/controllers/Gestion.php +++ b/application/controllers/Gestion.php @@ -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'], $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; } diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index d8df25bc..2464b821 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -406,6 +406,8 @@ class Hyperviseur_dash extends CI_Controller $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_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); $data["transactions"] = array(); @@ -754,9 +756,9 @@ class Hyperviseur_dash extends CI_Controller 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 ; - $this->session->set_userdata('com_hyp',$com_hyp); + $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); diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index d72bc9c3..87539571 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -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_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_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 $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_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_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['configure'] = 'Configure'; $lang['configure_share_rate'] = 'Configure the sharing rate'; diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index f6226eea..b77586c3 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -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_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_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 $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_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_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['configure'] = 'Configurer'; $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['recipient_id']= 'ID destinataire'; $lang['commission_paying_network'] = 'Commission de l\'hyperviseur payeur'; + ?> diff --git a/application/models/User_model.php b/application/models/User_model.php index bc4cdd99..982d4e35 100755 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -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, - $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` = ?, - `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, - $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; } diff --git a/application/views/gestion_wallet_ilink_hyp.php b/application/views/gestion_wallet_ilink_hyp.php index 60330389..eb67f50b 100755 --- a/application/views/gestion_wallet_ilink_hyp.php +++ b/application/views/gestion_wallet_ilink_hyp.php @@ -529,7 +529,7 @@ $context = new \Brick\Money\Context\AutoContext();
-
+

%

@@ -577,6 +577,33 @@ $context = new \Brick\Money\Context\AutoContext();
+
+
+ +
+
+
+

%

+

lang->line('rate_com_hyp_send_wallet_cart_ilink') ?>

+
+
+ +
+
+
+ +
+
+
+

%

+

lang->line('rate_com_bq_send_wallet_cart_ilink') ?>

+
+
+ +
+
+
+
@@ -601,7 +628,6 @@ $context = new \Brick\Money\Context\AutoContext();
-
@@ -1605,6 +1631,18 @@ $context = new \Brick\Money\Context\AutoContext();
+
+ + +
+
+ + +
@@ -1896,6 +1934,10 @@ $context = new \Brick\Money\Context\AutoContext(); // 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()); + // 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){ toastr.error("lang->line('ilink_first_rule')?>", "lang->line('management_rule')?>"); @@ -1907,6 +1949,8 @@ $context = new \Brick\Money\Context\AutoContext(); toastr.error("lang->line('ilink_fourth_rule')?>", "lang->line('management_rule')?>"); } else if (total5 != 100) { toastr.error("lang->line('ilink_fifth_rule')?>", "lang->line('management_rule')?>"); + } else if (total6 != 100) { + toastr.error("lang->line('ilink_sixth_rule')?>", "lang->line('management_rule')?>"); } else { if ($('#walletForm')[0].checkValidity()) {