diff --git a/application/config/database.php b/application/config/database.php
index b7f94224..71db97d3 100755
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -78,7 +78,8 @@ $db['default'] = array(
'hostname' => 'localhost',
'username' => 'root',
'password' => 'vps@2017GA',
- 'database' => 'iLink_test2',
+ 'database' => 'iLink_preprod',
+ 'wallet_service_url' => 'http://localhost:8081',
'dbdriver' => 'mysqli',
'dbprefix' => '',
'pconnect' => FALSE,
diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php
index acbc8995..19630c42 100755
--- a/application/controllers/Gestion.php
+++ b/application/controllers/Gestion.php
@@ -1555,27 +1555,24 @@ class Gestion extends CI_Controller
$data['taux_bq_r'] = $taux->part_banque_retrait;
$data['frais_d'] = $taux->frais_min_banque_depot;
} elseif ($taux->type == 'ilink'){
- $data['plr_user_wallet_wallet'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet" , $data['idConfig']);
- $data['plr_user_wallet_cash'] = $this->user_model->getPalierConfigWallet("user_wallet_cash" , $data['idConfig']);
- $data['plr_agent_depot_wallet'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet" , $data['idConfig']);
- $data['plr_agent_cash_cash'] = $this->user_model->getPalierConfigWallet("agent_cash_cash" , $data['idConfig']);
+ $data['plr_user_wallet_wallet'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet_international", $data['idConfig']);
+ $data['plr_user_wallet_cash'] = $this->user_model->getPalierConfigWallet("user_wallet_cash_international", $data['idConfig']);
+ $data['plr_agent_depot_wallet_ilink'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet_ilink_international" , $data['idConfig']);
+ $data['plr_agent_depot_autre_wallet'] = $this->user_model->getPalierConfigWallet("agent_depot_autre_wallet_international" , $data['idConfig']);
+ $data['plr_agent_cash_cash'] = $this->user_model->getPalierConfigWallet("agent_cash_cash_international", $data['idConfig']);
+
+ $data['plr_user_wallet_wallet_national'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet_national", $data['idConfig']);
+ $data['plr_user_wallet_cash_national'] = $this->user_model->getPalierConfigWallet("user_wallet_cash_national", $data['idConfig']);
+ $data['plr_agent_depot_wallet_ilink_national'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet_ilink_national" , $data['idConfig']);
+ $data['plr_agent_depot_autre_wallet_national'] = $this->user_model->getPalierConfigWallet("agent_depot_autre_wallet_national" , $data['idConfig']);
+ $data['plr_agent_cash_cash_national'] = $this->user_model->getPalierConfigWallet("agent_cash_cash_national", $data['idConfig']);
+
$data['taxes'] = $this->user_model->getTaxes($data['idConfig']);
- $data['u_w_w_min'] = $taux->taux_com_user_wallet_wallet_min;
- $data['u_w_w_max'] = $taux->taux_com_user_wallet_wallet_max;
- $data['taux_u_w_w'] = $taux->taux_com_user_wallet_wallet;
- $data['u_w_c_min'] = $taux->taux_com_user_wallet_cash_min;
- $data['u_w_c_max'] = $taux->taux_com_user_wallet_cash_max;
- $data['taux_u_w_c'] = $taux->taux_com_user_wallet_cash;
+
$data['taux_u_w_cart'] = $taux->taux_com_user_wallet_carte;
$data['taux_u_c_w'] = $taux->taux_com_user_carte_wallet;
$data['taux_u_c_c'] = $taux->taux_com_user_carte_cash;
- $data['ag_d_w_min'] = $taux->taux_com_wallet_ag_envoi_cash_wallet_min;
- $data['ag_d_w_max'] = $taux->taux_com_wallet_ag_envoi_cash_wallet_max;
- $data['taux_ag_d_w'] = $taux->taux_com_wallet_ag_envoi_cash_wallet;
$data['taux_ag_d_c_c'] = $taux->taux_com_wallet_ag_envoi_cash_carte;
- $data['ag_c_c_min'] = $taux->taux_com_wallet_ag_envoi_cash_cash_min;
- $data['ag_c_c_max'] = $taux->taux_com_wallet_ag_envoi_cash_cash_max;
- $data['taux_ag_c_c'] = $taux->taux_com_wallet_ag_envoi_cash_cash;
$data['taux_ag_cart_c'] = $taux->taux_com_wallet_ag_carte_cash;
$data['taux_ag_cash_c'] = $taux->taux_com_wallet_ag_depot_carte;
$data['taux_ag_s_c'] = $taux->taux_com_ag_envoi_cash;
@@ -1674,9 +1671,16 @@ class Gestion extends CI_Controller
$idConfig = $_POST['id_config'];
$plr_user_wallet_wallet = isset($_POST['plr_user_wallet_wallet']) ? $_POST['plr_user_wallet_wallet'] : null ;
$plr_user_wallet_cash = isset($_POST['plr_user_wallet_cash']) ? $_POST['plr_user_wallet_cash'] : null ;
- $plr_agent_depot_wallet = isset($_POST['plr_agent_depot_wallet']) ? $_POST['plr_agent_depot_wallet'] : null;
+ $plr_agent_depot_wallet_ilink = isset($_POST['plr_agent_depot_wallet_ilink']) ? $_POST['plr_agent_depot_wallet_ilink'] : null;
+ $plr_agent_depot_autre_wallet = isset($_POST['plr_agent_depot_autre_wallet']) ? $_POST['plr_agent_depot_autre_wallet'] : null;
$plr_agent_cash_cash = isset($_POST['plr_agent_cash_cash']) ? $_POST['plr_agent_cash_cash'] : null ;
+ $plr_user_wallet_wallet_national = isset($_POST['plr_user_wallet_wallet_national']) ? $_POST['plr_user_wallet_wallet_national'] : null ;
+ $plr_user_wallet_cash_national = isset($_POST['plr_user_wallet_cash_national']) ? $_POST['plr_user_wallet_cash_national'] : null ;
+ $plr_agent_depot_wallet_ilink_national = isset($_POST['plr_agent_depot_wallet_ilink_national']) ? $_POST['plr_agent_depot_wallet_ilink_national'] : null;
+ $plr_agent_depot_autre_wallet_national = isset($_POST['plr_agent_depot_autre_wallet_national']) ? $_POST['plr_agent_depot_autre_wallet_national'] : null;
+ $plr_agent_cash_cash_national = isset($_POST['plr_agent_cash_cash_national']) ? $_POST['plr_agent_cash_cash_national'] : null ;
+
$fields = $_POST['fields'];
$rows = [];
//Convert fields to simple array
@@ -1693,13 +1697,19 @@ class Gestion extends CI_Controller
}
}
- $this->insertPalier($plr_user_wallet_wallet,"user_wallet_wallet", $idConfig);
- $this->insertPalier($plr_user_wallet_cash,"user_wallet_cash", $idConfig);
- $this->insertPalier($plr_agent_depot_wallet,"agent_depot_wallet", $idConfig);
- $this->insertPalier($plr_agent_cash_cash,"agent_cash_cash", $idConfig);
+ $this->insertPalier($plr_user_wallet_wallet,"user_wallet_wallet_international", $idConfig);
+ $this->insertPalier($plr_user_wallet_cash,"user_wallet_cash_international", $idConfig);
+ $this->insertPalier($plr_agent_depot_wallet_ilink,"agent_depot_wallet_ilink_international", $idConfig);
+ $this->insertPalier($plr_agent_depot_autre_wallet,"agent_depot_autre_wallet_international", $idConfig);
+ $this->insertPalier($plr_agent_cash_cash,"agent_cash_cash_international", $idConfig);
- $this->user_model->updateConfigWalletIlink($rows['u_w_w_min'],$rows['u_w_w_max'],$rows['taux_u_w_w'],$rows['u_w_c_min'],$rows['u_w_c_max'],$rows['taux_u_w_c'],$rows['taux_u_w_cart'],$rows['taux_u_c_w'],$rows['taux_u_c_c'],$rows['ag_d_w_min'],$rows['ag_d_w_max'],
- $rows['taux_ag_d_w'],$rows['taux_ag_d_c_c'],$rows['ag_c_c_min'],$rows['ag_c_c_max'],$rows['taux_ag_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->insertPalier($plr_user_wallet_wallet_national,"user_wallet_wallet_national", $idConfig);
+ $this->insertPalier($plr_user_wallet_cash_national,"user_wallet_cash_national", $idConfig);
+ $this->insertPalier($plr_agent_depot_wallet_ilink_national,"agent_depot_wallet_ilink_national", $idConfig);
+ $this->insertPalier($plr_agent_depot_autre_wallet_national,"agent_depot_autre_wallet_national", $idConfig);
+ $this->insertPalier($plr_agent_cash_cash_national,"agent_cash_cash_national", $idConfig);
+
+ $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'],$idConfig);
$res = true;
@@ -1923,7 +1933,7 @@ class Gestion extends CI_Controller
$id_transacton = $_POST['id_transaction'];
/* API URL */
- $url = 'http://localhost:8081/transactions/'.$id_transacton;
+ $url = $this->db->wallet_service_url.'/transactions/'.$id_transacton;
/* Init cURL resource */
$ch = curl_init($url);
diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php
index 3efbe37f..9776d74f 100755
--- a/application/controllers/Hyperviseur_dash.php
+++ b/application/controllers/Hyperviseur_dash.php
@@ -334,27 +334,24 @@ class Hyperviseur_dash extends CI_Controller
$data['taux_bq_r'] = $taux->part_banque_retrait;
$data['frais_d'] = $taux->frais_min_banque_depot;
} elseif ($data['hasWallet']->first_row()->type == 'ilink') {
- $data['plr_user_wallet_wallet'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet", $data['idConfig']);
- $data['plr_user_wallet_cash'] = $this->user_model->getPalierConfigWallet("user_wallet_cash", $data['idConfig']);
- $data['plr_agent_depot_wallet'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet", $data['idConfig']);
- $data['plr_agent_cash_cash'] = $this->user_model->getPalierConfigWallet("agent_cash_cash", $data['idConfig']);
+ $data['plr_user_wallet_wallet'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet_international", $data['idConfig']);
+ $data['plr_user_wallet_cash'] = $this->user_model->getPalierConfigWallet("user_wallet_cash_international", $data['idConfig']);
+ $data['plr_agent_depot_wallet_ilink'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet_ilink_international" , $data['idConfig']);
+ $data['plr_agent_depot_autre_wallet'] = $this->user_model->getPalierConfigWallet("agent_depot_autre_wallet_international" , $data['idConfig']);
+ $data['plr_agent_cash_cash'] = $this->user_model->getPalierConfigWallet("agent_cash_cash_international", $data['idConfig']);
+
+ $data['plr_user_wallet_wallet_national'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet_national", $data['idConfig']);
+ $data['plr_user_wallet_cash_national'] = $this->user_model->getPalierConfigWallet("user_wallet_cash_national", $data['idConfig']);
+ $data['plr_agent_depot_wallet_ilink_national'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet_ilink_national" , $data['idConfig']);
+ $data['plr_agent_depot_autre_wallet_national'] = $this->user_model->getPalierConfigWallet("agent_depot_autre_wallet_national" , $data['idConfig']);
+ $data['plr_agent_cash_cash_national'] = $this->user_model->getPalierConfigWallet("agent_cash_cash_national", $data['idConfig']);
+
$data['taxes'] = $this->user_model->getTaxes($data['idConfig']);
- $data['u_w_w_min'] = $taux->taux_com_user_wallet_wallet_min;
- $data['u_w_w_max'] = $taux->taux_com_user_wallet_wallet_max;
- $data['taux_u_w_w'] = $taux->taux_com_user_wallet_wallet;
- $data['u_w_c_min'] = $taux->taux_com_user_wallet_cash_min;
- $data['u_w_c_max'] = $taux->taux_com_user_wallet_cash_max;
- $data['taux_u_w_c'] = $taux->taux_com_user_wallet_cash;
+
$data['taux_u_w_cart'] = $taux->taux_com_user_wallet_carte;
$data['taux_u_c_w'] = $taux->taux_com_user_carte_wallet;
$data['taux_u_c_c'] = $taux->taux_com_user_carte_cash;
- $data['ag_d_w_min'] = $taux->taux_com_wallet_ag_envoi_cash_wallet_min;
- $data['ag_d_w_max'] = $taux->taux_com_wallet_ag_envoi_cash_wallet_max;
- $data['taux_ag_d_w'] = $taux->taux_com_wallet_ag_envoi_cash_wallet;
$data['taux_ag_d_c_c'] = $taux->taux_com_wallet_ag_envoi_cash_carte;
- $data['ag_c_c_min'] = $taux->taux_com_wallet_ag_envoi_cash_cash_min;
- $data['ag_c_c_max'] = $taux->taux_com_wallet_ag_envoi_cash_cash_max;
- $data['taux_ag_c_c'] = $taux->taux_com_wallet_ag_envoi_cash_cash;
$data['taux_ag_cart_c'] = $taux->taux_com_wallet_ag_carte_cash;
$data['taux_ag_cash_c'] = $taux->taux_com_wallet_ag_depot_carte;
$data['taux_ag_s_c'] = $taux->taux_com_ag_envoi_cash;
@@ -653,23 +650,38 @@ class Hyperviseur_dash extends CI_Controller
$data['country'] = $this->session->userdata('current_pays');
$data['network_id'] = $this->session->userdata('network_id');
$data['countries'] = $this->user_model->getWalletsCountries();
- $data['plr_user_wallet_wallet'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet", $data['idConfig']);
- $data['plr_user_wallet_cash'] = $this->user_model->getPalierConfigWallet("user_wallet_cash", $data['idConfig']);
- $data['plr_agent_depot_wallet'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet", $data['idConfig']);
- $data['plr_agent_cash_cash'] = $this->user_model->getPalierConfigWallet("agent_cash_cash", $data['idConfig']);
+ $data['plr_user_wallet_wallet'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet_international", $data['idConfig']);
+ $data['plr_user_wallet_cash'] = $this->user_model->getPalierConfigWallet("user_wallet_cash_international", $data['idConfig']);
+ $data['plr_agent_depot_wallet_ilink'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet_ilink_international" , $data['idConfig']);
+ $data['plr_agent_depot_autre_wallet'] = $this->user_model->getPalierConfigWallet("agent_depot_autre_wallet_international" , $data['idConfig']);
+ $data['plr_agent_cash_cash'] = $this->user_model->getPalierConfigWallet("agent_cash_cash_international", $data['idConfig']);
+
+ $data['plr_user_wallet_wallet_national'] = $this->user_model->getPalierConfigWallet("user_wallet_wallet_national", $data['idConfig']);
+ $data['plr_user_wallet_cash_national'] = $this->user_model->getPalierConfigWallet("user_wallet_cash_national", $data['idConfig']);
+ $data['plr_agent_depot_wallet_ilink_national'] = $this->user_model->getPalierConfigWallet("agent_depot_wallet_ilink_national" , $data['idConfig']);
+ $data['plr_agent_depot_autre_wallet_national'] = $this->user_model->getPalierConfigWallet("agent_depot_autre_wallet_national" , $data['idConfig']);
+ $data['plr_agent_cash_cash_national'] = $this->user_model->getPalierConfigWallet("agent_cash_cash_national", $data['idConfig']);
+
$data['taxes'] = $this->user_model->getTaxes($data['idConfig']);
$operations = [
new Operation(1, $this->lang->line('op1')),
new Operation(2, $this->lang->line('op2')),
new Operation(3, $this->lang->line('op3')),
-// new Operation(4, $this->lang->line('op4')),
- new Operation(5, $this->lang->line('op5')),
- new Operation(6, $this->lang->line('op6')),
+ new Operation(4, $this->lang->line('op4')),
+// new Operation(5, $this->lang->line('op5')),
+// new Operation(6, $this->lang->line('op6')),
// new Operation(7, $this->lang->line('op7')),
// new Operation(8, $this->lang->line('op8')),
new Operation(9, $this->lang->line('op9')),
new Operation(10, $this->lang->line('op10')),
new Operation(11, $this->lang->line('op11')),
+ new Operation(12, $this->lang->line('op12')),
+ new Operation(13, $this->lang->line('op13')),
+ new Operation(14, $this->lang->line('op14')),
+ new Operation(15, $this->lang->line('op15')),
+ new Operation(16, $this->lang->line('op16')),
+ new Operation(17, $this->lang->line('op17')),
+ new Operation(18, $this->lang->line('op18')),
];
$data['operations'] = $operations;
// if (isset($_POST)) {
diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php
index b7f039f5..ed86ff45 100755
--- a/application/language/english/message_lang.php
+++ b/application/language/english/message_lang.php
@@ -313,8 +313,10 @@ $lang ['rate_com_user_wallet_cash_national'] = 'Wallet user commission rate with
$lang ['rate_com_user_wallet_cart'] = 'Wallet to card user commission rate';
$lang ['rate_com_user_cart_wallet'] = 'User commission rate card to wallet';
$lang ['rate_com_user_cart_cash'] = 'User card to cash commission rate';
-$lang ['rate_com_agent_depot_wallet_national'] = 'Agent depot commission rate to national wallet';
-$lang ['rate_com_agent_depot_wallet_international'] = 'Commission rate agent deposit to foreign wallet';
+$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_cash_cart'] = 'Agent commission rate deposit cash to card';
$lang ['rate_com_agent_cash_cash_national'] = 'Agent commission rate sending cash to national cash';
$lang ['rate_com_agent_cash_cash_international'] = 'Agent commission rate sending cash to cash in foreign countries';
@@ -343,6 +345,41 @@ $lang ['show_currency_rate_conversion'] = 'Show conversion rates';
$lang ['conversion_rate'] = 'Conversion rate';
$lang ['new_rate'] = 'New rate';
$lang ['save'] = 'Save';
-$lang['agent_name'] = 'Agent name';
+$lang ['update_rate'] = 'Update rates';
+$lang ['rates_update'] = 'Conversion rate updated';
+$lang ['calculator'] = 'Calculator';
+$lang ['calculate'] = 'Calculate';
+$lang ['no_country'] = 'No country';
+$lang ['departure_country'] = 'Country of departure';
+$lang ['country_of_destination'] = 'Country of destination';
+$lang ['amount_departure_country'] = 'Amount from the country of departure';
+$lang ['amount_country_of_destination'] = 'Amount from the destination country';
+$lang ['no_operation'] = 'No operation';
+$lang ['agent_name'] = 'Agent name';
+$lang ['cancel'] = 'Cancel';
+$lang ['canceled_transaction'] = 'Transaction canceled';
+$lang ['canceled_credit_request'] = 'Credit request canceled';
+$lang ['edit_tax'] = 'Edit taxes';
+$lang ['configuration_of_tax'] = 'Configuration of wallet taxes';
+$lang ['transaction_taxes'] = 'Taxes on transactions';
+$lang ['op1'] = 'User - Send from wallet to wallet';
+$lang ['op2'] = 'User - Send wallet to card';
+$lang ['op3'] = 'User - Sending wallet to cash';
+$lang ['op4'] = 'User - Sending wallet to bank';
+$lang ['op5'] = 'User - Send card to wallet';
+$lang ['op6'] = 'User - Send card to cash';
+$lang ['op7'] = 'User - Send from card to card';
+$lang ['op8'] = 'User - Send card to bank';
+$lang ['op9'] = 'User - Wallet withdrawal in cash';
+$lang ['op10'] = 'User - Card withdrawal to wallet';
+$lang ['op11'] = 'User - Card withdrawal to cash';
+$lang ['op12'] = 'Agent - Cash withdrawal';
+$lang ['op13'] = 'Agent - Card withdrawal to cash';
+$lang ['op14'] = 'Agent - Sending cash to iLink wallet';
+$lang ['op15'] = 'Agent - Sending cash to another wallet';
+$lang ['op16'] = 'Agent - Sending cash to a visa card';
+$lang ['op17'] = 'Agent - Sending cash to cash';
+$lang ['op18'] = 'Agent - Sending cash to bank';
+$lang ['new_tax'] = 'New tax'
?>
diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php
index dee2906c..7aded7aa 100755
--- a/application/language/french/message_lang.php
+++ b/application/language/french/message_lang.php
@@ -325,8 +325,10 @@
$lang['rate_com_user_wallet_cart'] = 'Taux de commission utilisateur wallet à carte';
$lang['rate_com_user_cart_wallet'] = 'Taux de commission utilisateur carte à wallet';
$lang['rate_com_user_cart_cash'] = 'Taux de commission utilisateur carte à cash';
- $lang['rate_com_agent_depot_wallet_national'] = 'Taux de commission agent depot vers wallet national';
- $lang['rate_com_agent_depot_wallet_international'] = 'Taux de commission agent depot vers wallet etranger';
+ $lang['rate_com_agent_depot_wallet_national'] = 'Taux de commission agent depot vers wallet iLink national';
+ $lang['rate_com_agent_depot_wallet_international'] = 'Taux de commission agent depot vers wallet iLink etranger';
+ $lang['rate_com_agent_depot_autre_wallet_national'] = 'Taux de commission agent depot vers autre wallet national';
+ $lang['rate_com_agent_depot_autre_wallet_international'] = 'Taux de commission agent depot vers autre wallet etranger';
$lang['rate_com_agent_depot_cash_cart'] = 'Taux de commission agent depot cash vers carte';
$lang['rate_com_agent_cash_cash_national'] = 'Taux de commission agent envoi cash vers cash national';
$lang['rate_com_agent_cash_cash_international'] = 'Taux de commission agent envoi cash vers cash pays etranger';
@@ -372,15 +374,23 @@ $lang['canceled_credit_request'] = 'Demande de crédit annulée';
$lang['edit_tax'] = 'Modifier les taxes';
$lang['configuration_of_tax'] = 'Configuration des taxes du wallet';
$lang['transaction_taxes'] = 'Taxes sur les transactions';
-$lang['op1'] = 'Envoi de wallet à wallet';
-$lang['op2'] = 'Envoi de wallet à carte';
-$lang['op3'] = 'Envoi de wallet à cash';
-$lang['op4'] = 'Envoi de wallet à Banque';
-$lang['op5'] = 'Envoi de carte à wallet';
-$lang['op6'] = 'Envoi de carte à cash';
-$lang['op7'] = 'Envoi de carte à carte';
-$lang['op8'] = 'Envoi de carte à banque';
-$lang['op9'] = 'Retrait de wallet en cash';
-$lang['op10'] = 'Retrait de carte vers wallet';
-$lang['op11'] = 'Retrait de carte vers cash';
+$lang['op1'] = 'User - Envoi de wallet à wallet';
+$lang['op2'] = 'User - Envoi de wallet à carte';
+$lang['op3'] = 'User - Envoi de wallet à cash';
+$lang['op4'] = 'User - Envoi de wallet à banque';
+$lang['op5'] = 'User - Envoi de carte à wallet';
+$lang['op6'] = 'User - Envoi de carte à cash';
+$lang['op7'] = 'User - Envoi de carte à carte';
+$lang['op8'] = 'User - Envoi de carte à banque';
+$lang['op9'] = 'User - Retrait de wallet en cash';
+$lang['op10'] = 'User - Retrait de carte vers wallet';
+$lang['op11'] = 'User - Retrait de carte vers cash';
+$lang['op12'] = 'Agent - Retrait en cash';
+$lang['op13'] = 'Agent - Retrait de la carte vers cash';
+$lang['op14'] = 'Agent - Envoi de cash vers wallet iLink';
+$lang['op15'] = 'Agent - Envoi de cash vers autre wallet';
+$lang['op16'] = 'Agent - Envoi de cash vers une carte visa';
+$lang['op17'] = 'Agent - Envoi de cash vers cash';
+$lang['op18'] = 'Agent - Envoi de cash vers banque';
+$lang['new_tax'] = 'Nouvelle taxe'
?>
diff --git a/application/models/User_model.php b/application/models/User_model.php
index f3c5d640..c2e2bec2 100755
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -2290,15 +2290,11 @@ class User_model extends CI_Model
}
- public function updateConfigWalletIlink($u_w_w_min,$u_w_w_max,$taux_u_w_w,$u_w_c_min,$u_w_c_max,$taux_u_w_c,$taux_u_w_cart,$taux_u_c_w,$taux_u_c_c,$ag_d_w_min,$ag_d_w_max,$taux_ag_d_w,
- $taux_ag_d_c_c,$ag_c_c_min,$ag_c_c_max,$taux_ag_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 ,$idConfig){
- $sql = "UPDATE `configWallet` SET `taux_com_user_wallet_wallet_min` = ? , `taux_com_user_wallet_wallet_max` = ?, `taux_com_user_wallet_wallet` = ?, `taux_com_user_wallet_cash_min` = ?, `taux_com_user_wallet_cash_max` = ?, `taux_com_user_wallet_cash` = ?, `taux_com_user_wallet_carte` = ?,
- `taux_com_user_carte_wallet` = ?, `taux_com_user_carte_cash` = ?, `taux_com_wallet_ag_envoi_cash_wallet_min` = ?, `taux_com_wallet_ag_envoi_cash_wallet_max` = ?, `taux_com_wallet_ag_envoi_cash_wallet` = ?, `taux_com_wallet_ag_envoi_cash_carte` = ?, `taux_com_wallet_ag_envoi_cash_cash_min` = ?,
- `taux_com_wallet_ag_envoi_cash_cash_max` = ?, `taux_com_wallet_ag_envoi_cash_cash` = ?,`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` = ? WHERE (`id` = ?);";
- $query = $this->db->query($sql , array($u_w_w_min,$u_w_w_max,$taux_u_w_w,$u_w_c_min,$u_w_c_max,$taux_u_w_c,$taux_u_w_cart,$taux_u_c_w,$taux_u_c_c,$ag_d_w_min,$ag_d_w_max,$taux_ag_d_w,
- $taux_ag_d_c_c,$ag_c_c_min,$ag_c_c_max,$taux_ag_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 , $idConfig));
return $query;
}
diff --git a/application/views/calculator.php b/application/views/calculator.php
index 72be597e..5e2b0c7d 100755
--- a/application/views/calculator.php
+++ b/application/views/calculator.php
@@ -18,10 +18,19 @@ $showResult = false;
$frais = 0;
$taxe = 0;
$config = $hasWallet->first_row();
+
$plr_user_wallet_wallet = $plr_user_wallet_wallet ? $plr_user_wallet_wallet->result() : [];
$plr_user_wallet_cash = $plr_user_wallet_cash ? $plr_user_wallet_cash->result() : [];
-$plr_agent_depot_wallet = $plr_agent_depot_wallet ? $plr_agent_depot_wallet->result() : [];
+$plr_agent_depot_wallet_ilink = $plr_agent_depot_wallet_ilink ? $plr_agent_depot_wallet_ilink->result() : [];
+$plr_agent_depot_autre_wallet = $plr_agent_depot_autre_wallet ? $plr_agent_depot_autre_wallet->result() : [];
$plr_agent_cash_cash = $plr_agent_cash_cash ? $plr_agent_cash_cash->result() : [];
+
+$plr_user_wallet_wallet_national = $plr_user_wallet_wallet_national ? $plr_user_wallet_wallet_national->result() : [];
+$plr_user_wallet_cash_national = $plr_user_wallet_cash_national ? $plr_user_wallet_cash_national->result() : [];
+$plr_agent_depot_wallet_ilink_national = $plr_agent_depot_wallet_ilink_national ? $plr_agent_depot_wallet_ilink_national->result() : [];
+$plr_agent_depot_autre_wallet_national = $plr_agent_depot_autre_wallet_national ? $plr_agent_depot_autre_wallet_national->result() : [];
+$plr_agent_cash_cash_national = $plr_agent_cash_cash_national ? $plr_agent_cash_cash_national->result() : [];
+
$taxes = $taxes ? $taxes->result() : [];
$taxesNationales = array_filter($taxes, function ($tax) {
return $tax->destination == 'national';
@@ -35,30 +44,32 @@ if (isset($save)) {
$showResult = true;
switch ($operation) {
case 1: //Envoi wallet à wallet
- $frais = ($init_country != $final_country) ? calculateFees1($plr_user_wallet_wallet, $montant) : calculateFees2($config->taux_com_user_wallet_wallet_min, $config->taux_com_user_wallet_wallet_max, $config->taux_com_user_wallet_wallet, $montant);
+ $frais = ($init_country != $final_country) ? calculateFees1($plr_user_wallet_wallet, $montant) : calculateFees1($plr_user_wallet_wallet_national, $montant);
$taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
break;
case 2: //Envoi de wallet à carte
$frais = $montant * $config->taux_com_user_wallet_carte / 100;
- $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
+// $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
break;
case 3: //Envoi de wallet à cash
- $frais = ($init_country != $final_country) ? calculateFees1($plr_user_wallet_cash, $montant) : calculateFees2($config->taux_com_user_wallet_cash_min, $config->taux_com_user_wallet_cash_max, $config->taux_com_user_wallet_cash, $montant);
+ $frais = ($init_country != $final_country) ? calculateFees1($plr_user_wallet_cash, $montant) : calculateFees1($plr_user_wallet_cash_national, $montant);
$taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
break;
case 4: //Envoi de wallet à banque
// Non disponible
+ //Pas de taxes
break;
- case 5: //Envoi de carte à wallet
- $frais =$montant * $config->taux_com_user_carte_wallet / 100;
- $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
- break;
- case 6: //Envoi de carte à cash
- $frais =$montant * $config->taux_com_user_carte_cash / 100;
- $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
- break;
+// case 5: //Envoi de carte à wallet
+// $frais =$montant * $config->taux_com_user_carte_wallet / 100;
+//// $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
+// break;
+// case 6: //Envoi de carte à cash
+// $frais =$montant * $config->taux_com_user_carte_cash / 100;
+//// $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
+// break;
case 9: // Retrait de wallet en cash
- $frais = calculateFees2($config->taux_com_user_wallet_cash_min, $config->taux_com_user_wallet_cash_max, $config->taux_com_user_wallet_cash, $montant);
+ $frais = ($init_country != $final_country) ? calculateFees1($plr_user_wallet_cash, $montant) : calculateFees1($plr_user_wallet_cash_national, $montant);
+ $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
break;
case 10: //Retrait de carte vers wallet
$frais = $montant * $config->taux_com_user_carte_wallet / 100;
@@ -66,6 +77,30 @@ if (isset($save)) {
case 11: // Retrait de wallet en cash
$frais = $montant * $config->taux_com_user_carte_cash / 100;
break;
+ case 12: // Agent - Retrait en cash
+// empty
+ break;
+ case 13: // Agent - Retrait de la carte vers cash
+ $frais = $montant * $config->taux_com_wallet_ag_carte_cash / 100;
+ break;
+ case 14: // Agent - Envoi de cash vers wallet iLink
+ $frais = ($init_country != $final_country) ? calculateFees1($plr_agent_depot_wallet_ilink, $montant) : calculateFees1($plr_agent_depot_wallet_ilink_national, $montant);
+ $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
+ break;
+ case 15: // Agent - Envoi de cash vers autre wallet
+ $frais = ($init_country != $final_country) ? calculateFees1($plr_agent_depot_autre_wallet, $montant) : calculateFees1($plr_agent_depot_autre_wallet_national, $montant);
+ $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
+ break;
+ case 16: // Agent - Envoi de cash vers une carte visa
+ $frais = $montant * $config->taux_com_wallet_ag_envoi_cash_carte / 100;
+ break;
+ case 17: // Agent - Envoi de cash vers cash
+ $frais = ($init_country != $final_country) ? calculateFees1($plr_agent_cash_cash, $montant) : calculateFees1($plr_agent_cash_cash_national, $montant);
+ $taxe = ($init_country != $final_country) ? calculateTax($taxesInternationales , $frais) : calculateTax($taxesNationales ,$frais);
+ break;
+ case 18: // Agent - Envoi de cash vers banque
+ // Indisponible
+ break;
}
}
@@ -293,6 +328,7 @@ $converter = new CurrencyConverter($provider);
$money2 = $converter->convert($money2, @$f->currency_code, RoundingMode::DOWN);
$money3 = $converter->convert($money3, @$d->currency_code, RoundingMode::DOWN);
$moneyFrais = Money::of(round(@$frais, 0), @$d->currency_code);
+ $moneyTotalTaxe = Money::of(round(@$frais + @$taxe, 0), @$d->currency_code);
?>
@@ -307,6 +343,10 @@ $converter = new CurrencyConverter($provider);
= $moneyTaxe->formatTo('fr-FR') ?>
+
+
+
= $moneyTotalTaxe->formatTo('fr-FR') ?>
+
diff --git a/application/views/gestion_wallet_ilink.php b/application/views/gestion_wallet_ilink.php
index 51e23f82..ecc1b288 100755
--- a/application/views/gestion_wallet_ilink.php
+++ b/application/views/gestion_wallet_ilink.php
@@ -473,13 +473,15 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
Taux (%) |
- ".$fmt->format($u_w_w_min)." |
- ".$fmt->format($u_w_w_max)." |
- ".$taux_u_w_w." | ".'
+ if($plr_user_wallet_wallet_national!=false){
+ foreach($plr_user_wallet_wallet_national->result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
';
-
-
+ }
+ }
?>
@@ -531,13 +533,15 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
Taux (%) |
- ".$fmt->format($u_w_c_min)." |
- ".$fmt->format($u_w_c_max)." |
- ".$taux_u_w_c." | ".'
- ';
-
-
+ if($plr_user_wallet_cash_national!=false){
+ foreach($plr_user_wallet_cash_national->result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
?>
@@ -560,8 +564,8 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
Taux (%) |
result() as $row) {
+ if($plr_agent_depot_wallet_ilink!=false){
+ foreach($plr_agent_depot_wallet_ilink->result() as $row) {
echo "
".$fmt->format($row->min)." |
".$fmt->format($row->max)." |
@@ -589,13 +593,15 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
Taux (%) |
- ".$fmt->format($ag_d_w_min)." |
- ".$fmt->format($ag_d_w_max)." |
- ".$taux_ag_d_w." | ".'
- ';
-
-
+ if($plr_agent_depot_wallet_ilink_national!=false){
+ foreach($plr_agent_depot_wallet_ilink_national->result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
?>
@@ -604,6 +610,68 @@ $fmt = new NumberFormatter( 'fr_FR', NumberFormatter::DECIMAL );
+
+
+
+
+
+
+
+ Min (FCFA) |
+ Max (FCFA) |
+ Taux (%) |
+
+ result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ Min (FCFA) |
+ Max (FCFA) |
+ Taux (%) |
+
+ result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ lang->line('Nom') ; ?> |
+ Type |
+ Valeur |
+ Destination |
+
+
+
+ result() as $row) {
+ echo "
+ ".$row->nom." |
+ ".$row->type." |
+ ".$row->valeur." |
+ ".$row->destination." | ".'
+
';
+ }
+ }
+ ?>
+
+
+
+
+
diff --git a/application/views/gestion_wallet_ilink_hyp.php b/application/views/gestion_wallet_ilink_hyp.php
index 1f003d7e..c314fdc1 100755
--- a/application/views/gestion_wallet_ilink_hyp.php
+++ b/application/views/gestion_wallet_ilink_hyp.php
@@ -614,13 +614,15 @@
Taux (%) |
result() as $row) {
echo "
- ".$fmt->format($u_w_w_min)." |
- ".$fmt->format($u_w_w_max)." |
- ".$taux_u_w_w." | ".'
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
';
-
-
+ }
+ }
?>
@@ -672,13 +674,15 @@
Taux (%) |
- ".$fmt->format($u_w_c_min)." |
- ".$fmt->format($u_w_c_max)." |
- ".$taux_u_w_c." | ".'
- ';
-
-
+ if($plr_user_wallet_cash_national!=false){
+ foreach($plr_user_wallet_cash_national->result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
?>
@@ -701,8 +705,8 @@
Taux (%) |
result() as $row) {
+ if($plr_agent_depot_wallet_ilink!=false){
+ foreach($plr_agent_depot_wallet_ilink->result() as $row) {
echo "
".$fmt->format($row->min)." |
".$fmt->format($row->max)." |
@@ -730,13 +734,15 @@
Taux (%) |
- ".$fmt->format($ag_d_w_min)." |
- ".$fmt->format($ag_d_w_max)." |
- ".$taux_ag_d_w." | ".'
- ';
-
-
+ if($plr_agent_depot_wallet_ilink_national!=false){
+ foreach($plr_agent_depot_wallet_ilink_national->result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
?>
@@ -745,6 +751,68 @@
+
+
+
+
+
+
+
+ Min (FCFA) |
+ Max (FCFA) |
+ Taux (%) |
+
+ result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ Min (FCFA) |
+ Max (FCFA) |
+ Taux (%) |
+
+ result() as $row) {
+ echo "
+ ".$fmt->format($row->min)." |
+ ".$fmt->format($row->max)." |
+ ".$row->taux." | ".'
+
';
+ }
+ }
+ ?>
+
+
+
+
+
+
+
+