diff --git a/application/controllers/Admin_dash.php b/application/controllers/Admin_dash.php index cb003cb9..3c9b4d0e 100755 --- a/application/controllers/Admin_dash.php +++ b/application/controllers/Admin_dash.php @@ -446,8 +446,8 @@ class Admin_dash extends CI_Controller $data['plr_sup_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("sup_wallet_cash_national", $data['idConfig']); $data['plr_sup_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("sup_wallet_cash_international", $data['idConfig']); - $data['plr_hyp_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("hyp_wallet_cash_national", $data['idConfig']); - $data['plr_hyp_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("hyp_wallet_cash_international", $data['idConfig']); + $data['plr_customer_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("customer_wallet_cash_national", $data['idConfig']); + $data['plr_customer_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("customer_wallet_cash_international", $data['idConfig']); $this->load->view('header', $data); $this->load->view('config_wallet_ilink_hyp/agent_remove_cash'); @@ -495,8 +495,8 @@ class Admin_dash extends CI_Controller $data['plr_agent_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("agent_cash_wallet_or_cash_international", $data['idConfig']); $data['plr_sup_cash_wallet_or_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("sup_cash_wallet_or_cash_national", $data['idConfig']); $data['plr_sup_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("sup_cash_wallet_or_cash_international", $data['idConfig']); - $data['plr_hyp_cash_wallet_or_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_national", $data['idConfig']); - $data['plr_hyp_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_international", $data['idConfig']); +// $data['plr_hyp_cash_wallet_or_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_national", $data['idConfig']); +// $data['plr_hyp_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_international", $data['idConfig']); $data['plr_agent_depot_wallet_ilink'] = $this->wallet_model->getPalierConfigWallet("agent_depot_wallet_ilink_international" , $data['idConfig']); $data['plr_agent_depot_autre_wallet'] = $this->wallet_model->getPalierConfigWallet("agent_depot_autre_wallet_international" , $data['idConfig']); diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index 069fa4e4..21c98038 100755 --- a/application/controllers/Gestion.php +++ b/application/controllers/Gestion.php @@ -1592,16 +1592,16 @@ class Gestion extends CI_Controller case 'agent_remove_cash': $plr_agent_wallet_cash_national = $_POST['plr_agent_wallet_cash_national'] ?? null; $plr_sup_wallet_cash_national = $_POST['plr_sup_wallet_cash_national'] ?? null; - $plr_hyp_wallet_cash_national = $_POST['plr_hyp_wallet_cash_national'] ?? null; + $plr_customer_wallet_cash_national = $_POST['plr_customer_wallet_cash_national'] ?? null; $plr_agent_wallet_cash_international = $_POST['plr_agent_wallet_cash_international'] ?? null; $plr_sup_wallet_cash_international = $_POST['plr_sup_wallet_cash_international'] ?? null; - $plr_hyp_wallet_cash_international = $_POST['plr_hyp_wallet_cash_international'] ?? null; + $plr_customer_wallet_cash_international = $_POST['plr_customer_wallet_cash_international'] ?? null; $this->insertPalier($plr_agent_wallet_cash_national, "agent_wallet_cash_national", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_sup_wallet_cash_national, "sup_wallet_cash_national", $idConfig ,'paliers_commissions_wallet'); - $this->insertPalier($plr_hyp_wallet_cash_national, "hyp_wallet_cash_national", $idConfig,'paliers_commissions_wallet'); + $this->insertPalier($plr_customer_wallet_cash_national, "customer_wallet_cash_national", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_agent_wallet_cash_international, "agent_wallet_cash_international", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_sup_wallet_cash_international, "sup_wallet_cash_international", $idConfig ,'paliers_commissions_wallet'); - $this->insertPalier($plr_hyp_wallet_cash_international, "hyp_wallet_cash_international", $idConfig,'paliers_commissions_wallet'); + $this->insertPalier($plr_customer_wallet_cash_international, "customer_wallet_cash_international", $idConfig,'paliers_commissions_wallet'); break; case 'agent_remove_carte_cash': $plr_customer_cart_cash_international = $_POST['plr_customer_cart_cash_international'] ?? null; @@ -1672,15 +1672,15 @@ class Gestion extends CI_Controller $plr_agent_cash_wallet_or_cash_national = $_POST['plr_agent_cash_wallet_or_cash_national'] ?? null; $plr_sup_cash_wallet_or_cash_international = $_POST['plr_sup_cash_wallet_or_cash_international'] ?? null; $plr_sup_cash_wallet_or_cash_national = $_POST['plr_sup_cash_wallet_or_cash_national'] ?? null; - $plr_hyp_cash_wallet_or_cash_international = $_POST['plr_hyp_cash_wallet_or_cash_international'] ?? null; - $plr_hyp_cash_wallet_or_cash_national = $_POST['plr_hyp_cash_wallet_or_cash_national'] ?? null; +// $plr_hyp_cash_wallet_or_cash_international = $_POST['plr_hyp_cash_wallet_or_cash_international'] ?? null; +// $plr_hyp_cash_wallet_or_cash_national = $_POST['plr_hyp_cash_wallet_or_cash_national'] ?? null; $this->insertPalier($plr_agent_cash_wallet_or_cash_international, "agent_cash_wallet_or_cash_international", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_agent_cash_wallet_or_cash_national, "agent_cash_wallet_or_cash_national", $idConfig ,'paliers_commissions_wallet'); $this->insertPalier($plr_sup_cash_wallet_or_cash_international, "sup_cash_wallet_or_cash_international", $idConfig,'paliers_commissions_wallet'); $this->insertPalier($plr_sup_cash_wallet_or_cash_national, "sup_cash_wallet_or_cash_national", $idConfig,'paliers_commissions_wallet'); - $this->insertPalier($plr_hyp_cash_wallet_or_cash_international, "hyp_cash_wallet_or_cash_international", $idConfig ,'paliers_commissions_wallet'); - $this->insertPalier($plr_hyp_cash_wallet_or_cash_national, "hyp_cash_wallet_or_cash_national", $idConfig,'paliers_commissions_wallet'); +// $this->insertPalier($plr_hyp_cash_wallet_or_cash_international, "hyp_cash_wallet_or_cash_international", $idConfig ,'paliers_commissions_wallet'); +// $this->insertPalier($plr_hyp_cash_wallet_or_cash_national, "hyp_cash_wallet_or_cash_national", $idConfig,'paliers_commissions_wallet'); break; } diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 88eab668..2c71ce11 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -1450,8 +1450,8 @@ class Hyperviseur_dash extends CI_Controller $data['plr_sup_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("sup_wallet_cash_national", $data['idConfig']); $data['plr_sup_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("sup_wallet_cash_international", $data['idConfig']); - $data['plr_hyp_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("hyp_wallet_cash_national", $data['idConfig']); - $data['plr_hyp_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("hyp_wallet_cash_international", $data['idConfig']); + $data['plr_customer_wallet_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("customer_wallet_cash_national", $data['idConfig']); + $data['plr_customer_wallet_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("customer_wallet_cash_international", $data['idConfig']); $this->load->view('header_hyp', $data); $this->load->view('config_wallet_ilink_hyp/agent_remove_cash'); @@ -1499,8 +1499,8 @@ class Hyperviseur_dash extends CI_Controller $data['plr_agent_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("agent_cash_wallet_or_cash_international", $data['idConfig']); $data['plr_sup_cash_wallet_or_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("sup_cash_wallet_or_cash_national", $data['idConfig']); $data['plr_sup_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("sup_cash_wallet_or_cash_international", $data['idConfig']); - $data['plr_hyp_cash_wallet_or_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_national", $data['idConfig']); - $data['plr_hyp_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_international", $data['idConfig']); +// $data['plr_hyp_cash_wallet_or_cash_national'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_national", $data['idConfig']); +// $data['plr_hyp_cash_wallet_or_cash_international'] = $this->wallet_model->getPalierCommissionsWallet("hyp_cash_wallet_or_cash_international", $data['idConfig']); $data['plr_agent_depot_wallet_ilink'] = $this->wallet_model->getPalierConfigWallet("agent_depot_wallet_ilink_international" , $data['idConfig']); $data['plr_agent_depot_autre_wallet'] = $this->wallet_model->getPalierConfigWallet("agent_depot_autre_wallet_international" , $data['idConfig']); diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index aa43da32..dc00f367 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -308,18 +308,18 @@ $lang['rate'] = 'Rate'; $lang ['rate_com_user_wallet_wallet_international'] = 'Wallet user commission rate to foreign country wallet'; $lang ['rate_com_user_wallet_wallet_national'] = 'Wallet user commission rate to national wallet'; $lang ['new_level'] = 'New level'; -$lang ['rate_com_user_wallet_cash_international'] = 'Wallet user commission rate for foreign country cash'; -$lang ['rate_com_user_wallet_cash_national'] = 'Wallet user commission rate with national cash'; +$lang['rate_com_user_wallet_cash_international'] = "Customer commission rate on wallet send and cash withdrawal transaction to foreign country"; +$lang['rate_com_user_wallet_cash_national'] = "Customer commission rate on domestic wallet cash sending and withdrawal"; $lang['rate_com_user_wallet_cart_national'] = 'Customer commission rate on domestic wallet-to-card transactions'; $lang['rate_com_user_wallet_cart_international'] = 'Customer commission rate on foreign wallet card transaction'; $lang['rate_com_user_cart_wallet_international'] = "Customer commission rate on international wallet card transaction"; $lang['rate_com_user_cart_wallet_national'] = "Customer commission rate on domestic wallet card transaction"; $lang['rate_com_user_cart_cash_international'] = 'International cash card user commission rate'; $lang['rate_com_user_cart_cash_national'] = 'National cash card user commission rate'; -$lang ['rate_com_agent_depot_wallet_national'] = 'Agent depot commission rate to national iLink wallet'; -$lang ['rate_com_agent_depot_wallet_international'] = 'Commission rate agent deposit to foreign iLink wallet'; -$lang ['rate_com_agent_depot_autre_wallet_national'] = 'Agent depot commission rate to national other wallet'; -$lang ['rate_com_agent_depot_autre_wallet_international'] = 'Commission rate agent deposit to foreign other wallet'; +$lang['rate_com_agent_depot_wallet_national'] = "Customer commission rate for sending cash to domestic iLink wallet"; +$lang['rate_com_agent_depot_wallet_international'] = "Customer commission rate for sending cash to foreign iLink wallet"; +$lang['rate_com_agent_depot_other_wallet_national'] = "Customer commission rate for sending cash to other domestic wallet"; +$lang['rate_com_agent_depot_other_wallet_international'] = "Customer's commission rate for sending cash to other foreign wallet"; $lang['rate_com_agent_depot_cash_cart_international'] = "Customer commission rate for sending cash to international card"; $lang['rate_com_agent_depot_cash_cart_national'] = "Customer commission rate on cash-to-card transactions"; $lang ['rate_com_agent_cash_cash_national'] = 'Agent commission rate sending cash to national cash'; @@ -334,8 +334,8 @@ $lang['rate_com_agent_wallet_cash_international'] = "Geolocated agent's commissi $lang['rate_com_agent_wallet_cash_national'] = "Geolocated agent's commission rate on national cash withdrawal operation"; $lang['rate_com_sup_wallet_cash_international'] = "Supervisor's commission rate on international cash withdrawal operation"; $lang['rate_com_sup_wallet_cash_national'] = "Supervisor's commission rate on national cash withdrawal operation"; -$lang['rate_com_hyp_wallet_cash_international'] = "Hypervisor commission rate on international cash withdrawal operation"; -$lang['rate_com_hyp_wallet_cash_national'] = "Hypervisor commission rate on national cash withdrawal operation"; +$lang['rate_com_customer_remove_cash_international'] = "Customer commission rate on international cash withdrawal operation"; +$lang['rate_com_customer_remove_cash_national'] = "Customer commission rate on national cash withdrawal operation"; $lang['rate_com_agent_depot_cart_international'] = "Geolocated agent's commission rate on international card deposit"; $lang['rate_com_agent_depot_cart_national'] = "Geolocated agent's commission rate on national card deposit operation"; $lang['rate_com_sup_depot_cart_international'] = "Supervisor commission rate on international card deposit transactions"; diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 9012ae17..696fc6d0 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -320,21 +320,21 @@ $lang['rate_com_user_wallet_wallet_international'] = 'Taux de commission du client sur opération d\'envoi de wallet à wallet pays étranger'; $lang['rate_com_user_wallet_wallet_national'] = 'Taux de commission du client sur opération d\'envoi de wallet à wallet national'; $lang['new_level'] = 'Nouveau palier'; - $lang['rate_com_user_wallet_cash_international'] = 'Taux de commission du client sur opération d\'envoi de wallet à cash pays étranger'; - $lang['rate_com_user_wallet_cash_national'] = 'Taux de commission du client sur opération d\'envoi de wallet à cash national'; + $lang['rate_com_user_wallet_cash_international'] = "Taux de commission du client sur opération d'envoi et retrait de wallet à cash pays étranger"; + $lang['rate_com_user_wallet_cash_national'] = "Taux de commission du client sur opération d'envoi et retrait de wallet à cash national"; $lang['rate_com_user_wallet_cart_national'] = 'Taux de commission du client sur opération d\'envoi de wallet à carte national'; $lang['rate_com_user_wallet_cart_international'] = 'Taux de commission du client sur opération d\'envoi de wallet à carte étranger'; $lang['rate_com_user_cart_wallet_international'] = "Taux de commission du client sur opération d'envoi de carte à wallet international"; $lang['rate_com_user_cart_wallet_national'] = "Taux de commission du client sur opération d'envoi de carte à wallet national"; $lang['rate_com_user_cart_cash_international'] = 'Taux de commission utilisateur carte à cash international'; $lang['rate_com_user_cart_cash_national'] = 'Taux de commission utilisateur carte à cash national'; - $lang['rate_com_agent_depot_wallet_national'] = 'Taux de commission du client sur opération d\'envoi vers wallet iLink national'; - $lang['rate_com_agent_depot_wallet_international'] = 'Taux de commission du client sur opération d\'envoi vers wallet iLink étranger'; - $lang['rate_com_agent_depot_autre_wallet_national'] = 'Taux de commission du client sur opération d\'envoi vers autre wallet national'; - $lang['rate_com_agent_depot_autre_wallet_international'] = 'Taux de commission du client sur opération d\'envoi vers autre wallet étranger'; + $lang['rate_com_agent_depot_wallet_national'] = "Taux de commission du client sur opération d'envoi de cash vers wallet iLink national"; + $lang['rate_com_agent_depot_wallet_international'] = "Taux de commission du client sur opération d'envoi de cash vers wallet iLink étranger"; + $lang['rate_com_agent_depot_autre_wallet_national'] = "Taux de commission du client sur opération d'envoi de cash vers autre wallet national"; + $lang['rate_com_agent_depot_autre_wallet_international'] = "Taux de commission du client sur opération d'envoi de cash vers autre wallet étranger"; $lang['rate_com_agent_depot_cash_cart_international'] = "Taux de commission du client sur opération d'envoi de cash vers carte international"; $lang['rate_com_agent_depot_cash_cart_national'] = "Taux de commission du client sur opération d'envoi de cash vers carte national"; - $lang['rate_com_agent_cash_cash_national'] = 'Taux de commission du client sur opération d\'envoi de cash vers cash national'; + $lang['rate_com_agent_cash_cash_national'] = "Taux de commission du client sur opération d'envoi cash vers cash national"; $lang['rate_com_agent_cash_cash_international'] = 'Taux de commission du client sur opération d\'envoi cash vers cash pays étranger'; $lang['rate_com_agent_send_cash_international'] = "Taux de commission de l'agent géolocalisé sur operation d'envoi d'argent international"; $lang['rate_com_agent_send_cash_national'] = "Taux de commission de l'agent géolocalisé sur operation d'envoi d'argent national"; @@ -346,8 +346,8 @@ $lang['rate_com_agent_wallet_cash_national'] = "Taux de commission de l'agent géolocalisé sur operation de retrait d'argent national"; $lang['rate_com_sup_wallet_cash_international'] = "Taux de commission du superviseur sur operation de retrait d'argent international"; $lang['rate_com_sup_wallet_cash_national'] = "Taux de commission du superviseur sur operation de retrait d'argent national"; - $lang['rate_com_hyp_wallet_cash_international'] = "Taux de commission de l'hyperviseur sur operation de retrait d'argent international"; - $lang['rate_com_hyp_wallet_cash_national'] = "Taux de commission de l'hyperviseur sur operation de retrait d'argent national"; + $lang['rate_com_customer_remove_cash_international'] = "Taux de commission du client sur operation de retrait d'argent international"; + $lang['rate_com_customer_remove_cash_national'] = "Taux de commission du client sur operation de retrait d'argent national"; $lang['rate_com_agent_depot_cart_international'] = "Taux de commission de l'agent géolocalisé sur operation de depot vers carte international"; $lang['rate_com_agent_depot_cart_national'] = "Taux de commission de l'agent géolocalisé sur operation de depot vers carte national"; $lang['rate_com_sup_depot_cart_international'] = "Taux de commission superviseur sur operation de depot vers carte international"; diff --git a/application/views/config_wallet_ilink_hyp/agent_remove_cash.php b/application/views/config_wallet_ilink_hyp/agent_remove_cash.php index b0892e0f..61db7e66 100755 --- a/application/views/config_wallet_ilink_hyp/agent_remove_cash.php +++ b/application/views/config_wallet_ilink_hyp/agent_remove_cash.php @@ -64,6 +64,72 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL);
+
+
+
+

lang->line('rate_com_customer_remove_cash_international'); ?>

+
+ +
+ + + + + + + + + result() as $row) { + echo " + + + + " . ' + '; + } + } + ?> + +
MinMaxTaux (%)lang->line('ceiling')?>
" . $fmt->format($row->min) . "" . $fmt->format($row->max) . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . "
+
+ +
+
+
+

lang->line('rate_com_customer_remove_cash_national'); ?>

+
+ +
+ + + + + + + + + result() as $row) { + echo " + + + + " . ' + '; + } + } + ?> + +
MinMaxTaux (%)lang->line('ceiling')?>
" . $fmt->format($row->min) . "" . $fmt->format($row->max) . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . "
+
+ +
+
+
+
@@ -128,8 +194,6 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL);
-
-
@@ -194,70 +258,6 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL);
-
-
-
-

lang->line('rate_com_hyp_wallet_cash_international'); ?>

-
- -
- - - - - - - - - result() as $row) { - echo " - - - - " . ' - '; - } - } - ?> - -
MinMaxTaux (%)lang->line('ceiling')?>
" . $fmt->format($row->min) . "" . $fmt->format($row->max) . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . "
-
- -
-
-
-

lang->line('rate_com_hyp_wallet_cash_national'); ?>

-
- -
- - - - - - - - - result() as $row) { - echo " - - - - " . ' - '; - } - } - ?> - -
MinMaxTaux (%)lang->line('ceiling')?>
" . $fmt->format($row->min) . "" . $fmt->format($row->max) . "" . $row->taux . "" . (isset($row->plafond) ? floatval($row->plafond) : '') . "
-
- -
-