diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php index b06ac982..1ee6d02b 100755 --- a/application/controllers/Gestion.php +++ b/application/controllers/Gestion.php @@ -684,7 +684,11 @@ class Gestion extends CI_Controller if ($this->input->is_ajax_request()) { $ajaxhyp = $this->user_model->getVillesByPays($this->input->post('pays')); - echo json_encode($ajaxhyp->result_array()); + if ($ajaxhyp && $ajaxhyp->num_rows() > 0) { + echo json_encode($ajaxhyp->result_array()); + } else { + echo json_encode("no_agent"); + } } } @@ -705,7 +709,11 @@ class Gestion extends CI_Controller if ($this->input->is_ajax_request()) { $ajaxhyp = $this->user_model->getAgentsFromCountry($this->input->post('id_country')); - echo json_encode($ajaxhyp->result_array()); + if ($ajaxhyp && $ajaxhyp->num_rows() > 0) { + echo json_encode($ajaxhyp->result_array()); + } else { + echo json_encode("no_agent"); + } } } diff --git a/application/controllers/Users.php b/application/controllers/Users.php index 0fa7e021..39a22d39 100755 --- a/application/controllers/Users.php +++ b/application/controllers/Users.php @@ -66,109 +66,143 @@ } - public function login() - { - $user_login = array( - 'user_email' => $this->input->post('user_mail'), - 'user_password' => $this->input->post('user_password'), - 'user_role' => $this->input->post('user_role') - ); + public function login() + { + $user_login = [ + 'user_email' => $this->input->post('user_mail'), + 'user_password' => $this->input->post('user_password'), + 'user_role' => $this->input->post('user_role') + ]; + + $email = $user_login['user_email']; + $password = $user_login['user_password']; + $role = $user_login['user_role']; + + // CAS 1 : Agents valideurs – iLink Santé / World (role = 2) + if ($role == 2 && filter_var($email, FILTER_VALIDATE_EMAIL)) { + + $sql = " + SELECT nhd.*, n.name AS network, n.id AS network_id, + cc.name AS country, cc.currency_code + FROM nh_validating_agents nhd + INNER JOIN networks n ON n.id = nhd.network_id + INNER JOIN countries_currencies cc ON cc.id = n.country_id + WHERE nhd.email = ? + "; + + $agentQuery = $this->db->query($sql, [$email]); + + if ($agentQuery->num_rows() > 0) { + + $agent = $agentQuery->first_row(); - // Pour les agents valideurs de iLink Santé et iLink World - if($user_login['user_role'] == 2 && filter_var($user_login['user_email'], FILTER_VALIDATE_EMAIL)){ - $sql = "SELECT nhd.* , n.name as network , n.id as network_id, cc.name as country, cc.currency_code - FROM nh_validating_agents nhd INNER JOIN networks n ON n.id = nhd.network_id INNER JOIN countries_currencies cc ON cc.id = n.country_id WHERE nhd.email = ?"; - $agent = $this->db->query($sql,[$user_login['user_email']]); - if($agent->num_rows()>0) { - $agent = $agent->first_row(); $encrypted_password = $agent->password; - $hash = checkhashSSHA($agent->salt,$user_login['user_password']); - if ($encrypted_password == $hash) { - $this->session->set_userdata('agent_id', $agent->id); - $this->session->set_userdata('email', $agent->email); - $this->session->set_userdata('firstname', $agent->firstname); - $this->session->set_userdata('lastname', $agent->lastname); - $this->session->set_userdata('phone', $agent->email); - $this->session->set_userdata('role', $agent->role); - $this->session->set_userdata('currency_code', $agent->currency_code); - $this->session->set_userdata('network', $agent->network); - $this->session->set_userdata('network_id', $agent->network_id); - $this->session->set_userdata('current_pays', $agent->country); - if($agent->role == 'DOCTOR'){ - redirect('ValidatingDoctor'); - }else if($agent->role == 'CONTROLLER'){ - redirect('ControllerDoctor'); - }else if($agent->role == 'OPENING_ACCOUNT_AGENT'){ - redirect('OpeningAccountAgent'); - }else{ - redirect('ValidatingAgent'); + $hash = checkhashSSHA($agent->salt, $password); + + if ($encrypted_password === $hash) { + $this->session->set_userdata([ + 'agent_id' => $agent->id, + 'email' => $agent->email, + 'firstname' => $agent->firstname, + 'lastname' => $agent->lastname, + 'phone' => $agent->email, + 'role' => $agent->role, + 'currency_code' => $agent->currency_code, + 'network' => $agent->network, + 'network_id' => $agent->network_id, + 'current_pays' => $agent->country + ]); + + switch ($agent->role) { + case 'DOCTOR': redirect('ValidatingDoctor'); break; + case 'CONTROLLER': redirect('ControllerDoctor'); break; + case 'OPENING_ACCOUNT_AGENT': redirect('OpeningAccountAgent'); break; + default: redirect('ValidatingAgent'); } } - } - }else{ - $data = $this->user_model->login_user($user_login['user_email'], $user_login['user_password'], $user_login['user_role']); - - if ($data) { - - $hyper = "hyper"; - $super = "super"; - - $this->session->set_userdata('token', $data->token); - $this->session->set_userdata('email', $data->email); - $this->session->set_userdata('firstname', $data->firstname); - $this->session->set_userdata('lastname', $data->lastname); - $this->session->set_userdata('adresse', $data->adresse); - $this->session->set_userdata('agent_id', $data->agent_id); - $this->session->set_userdata('currency_code', $data->currency_code); - - if($user_login['user_role']==1){ - $this->session->set_userdata('country', $data->country); - - $pays = $this->user_model->getAllCountries(); - $this->session->set_userdata('current_pays', $pays->first_row()->name); - - $hyper = $this->user_model->getAllHyper($this->session->userdata('current_pays')); - $this->session->set_userdata('current_hyper', $hyper->first_row()->code_membre); - - $ville = $this->user_model->getVilleNetworkByHyper($this->session->userdata('current_hyper')); - $this->session->set_userdata('current_ville', $ville->first_row()->ville); - - $this->session->set_userdata('category', $data->category); - - redirect('Admin_dash/filter'); - - }else{ - $this->session->set_userdata('member_code', $data->code_membre); - $this->session->set_userdata('longitude', $data->longitude); - $this->session->set_userdata('latitude', $data->latitude); - $this->session->set_userdata('phone', $data->phone); - $this->session->set_userdata('category', $data->category); - $this->session->set_userdata('network', $data->network); - $this->session->set_userdata('network_id', $data->network_id); - $this->session->set_userdata('current_pays', $data->country); - - if($data->category == $hyper) { - redirect('Hyperviseur_dash'); - } else if ($data->category == $super) { - $this->session->set_userdata('code_parrain', $data->code_parrain); - redirect('Superviseur_dash'); - }else if($data->category == 'geolocated') { - $this->session->set_userdata('code_parrain', $data->code_parrain); - $this->session->set_userdata('network_agent_id', $data->network_agent_id); - redirect('Agent'); - } - } - - } } - $this->session->set_flashdata('error_msg', 'Error occured,Try again.'); - $data['alert'] = "ok"; - $data['message'] = "L'identifiant " . $user_login['user_email'] . " ou le mot de passe sont incorrectes ou vérifiez votre grade!"; - $this->load->view('login', $data); + // CAS 2 : Login standard via user_model + $data = $this->user_model->login_user($email, $password, $role); - } + if ($data) { + + $hyper = 'hyper'; + $super = 'super'; + + $this->session->set_userdata([ + 'token' => $data->token ?? null, + 'email' => $data->email ?? null, + 'firstname' => $data->firstname ?? null, + 'lastname' => $data->lastname ?? null, + 'adresse' => $data->adresse ?? null, + 'agent_id' => $data->agent_id ?? null, + 'currency_code' => $data->currency_code ?? null + ]); + + // CAS ADMIN (role = 1) + if ($role == 1) { + + $this->session->set_userdata('country', $data->country ?? null); + + // Pays + $pays = $this->user_model->getAllCountries(); + if ($pays && $pays->first_row()) { + $this->session->set_userdata('current_pays', $pays->first_row()->name); + } + + // Hyperviseur + $hyperRes = $this->user_model->getAllHyper($this->session->userdata('current_pays')); + if ($hyperRes && $hyperRes->first_row()) { + $this->session->set_userdata('current_hyper', $hyperRes->first_row()->code_membre); + } + + // Ville + $villeRes = $this->user_model->getVilleNetworkByHyper($this->session->userdata('current_hyper')); + if ($villeRes && $villeRes->first_row()) { + $this->session->set_userdata('current_ville', $villeRes->first_row()->ville); + } + + $this->session->set_userdata('category', $data->category ?? null); + + redirect('Admin_dash/filter'); + } + + // CAS NON ADMIN (agents / hyper / super / geolocated) + $this->session->set_userdata([ + 'member_code' => $data->code_membre ?? null, + 'longitude' => $data->longitude ?? null, + 'latitude' => $data->latitude ?? null, + 'phone' => $data->phone ?? null, + 'category' => $data->category ?? null, + 'network' => $data->network ?? null, + 'network_id' => $data->network_id ?? null, + 'current_pays' => $data->country ?? null + ]); + if ($data->category === $hyper) { + redirect('Hyperviseur_dash'); + } + + if ($data->category === $super) { + $this->session->set_userdata('code_parrain', $data->code_parrain ?? null); + redirect('Superviseur_dash'); + } + + if ($data->category === 'geolocated') { + $this->session->set_userdata('code_parrain', $data->code_parrain ?? null); + $this->session->set_userdata('network_agent_id', $data->network_agent_id ?? null); + redirect('Agent'); + } + } + + $this->session->set_flashdata('error_msg', 'Error occured, try again.'); + + $data['alert'] = "ok"; + $data['message'] = "L'identifiant $email ou le mot de passe sont incorrects ou vérifiez votre grade!"; + + $this->load->view('login', $data); + } public function create_auth(){ diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index 6a11b0bf..a4cd8b86 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -1081,4 +1081,5 @@ $lang['fixed_fees'] = "Fixed expenses"; $lang['fixed_fees_currency'] = "Fixed fee currency"; $lang['add_rate'] = "Add a rate"; $lang['channel'] = "Channel/Réseau"; +$lang["select_country"] = "Select a country"; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 40c79f21..3a8823a5 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -1089,4 +1089,5 @@ $lang['fixed_fees'] = "Frais fixes"; $lang['fixed_fees_currency'] = "Monnaie des frais fixes"; $lang['add_rate'] = "Ajouter un taux"; $lang['channel'] = "Cannal/Réseau"; +$lang["select_country"] = "Sélectionner un pays"; ?> diff --git a/application/models/User_model.php b/application/models/User_model.php index a2999a7a..fd9146ed 100755 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -1234,55 +1234,104 @@ class User_model extends CI_Model return $query->num_rows() > 0 ? $query : false; } - public function getPointGeolocalised($id_network,$lastname){ - $query = $this->db->query("SELECT COUNT(`id`) AS c FROM `codeGenerer` - WHERE `code_parrain`= - (SELECT code_membre FROM codeGenerer WHERE category='super' AND - id=(SELECT codeGenerer_id FROM networks_agents WHERE network_id='".$id_network."' AND - agent_id IN (SELECT id FROM agents WHERE lastname='".$lastname."') - ) - ) - "); - if($query->num_rows()>0){ + public function getPointGeolocalised($id_network, $lastname) + { + $sql = " + SELECT COUNT(id) AS c + FROM codeGenerer + WHERE code_parrain IN ( + SELECT code_membre + FROM codeGenerer + WHERE category = 'super' + AND id IN ( + SELECT codeGenerer_id + FROM networks_agents + WHERE network_id = ? + AND agent_id IN ( + SELECT id FROM agents WHERE lastname = ? + ) + ) + ) + "; + + $query = $this->db->query($sql, [$id_network, $lastname]); + + return ($query->num_rows() > 0) ? $query->row()->c : 0; + } + + + public function getPointGeolocalisedByDate($id_network, $lastname, $debut, $fin) + { + $sql = " + SELECT COUNT(id) AS c + FROM codeGenerer + WHERE date_creation >= ? + AND date_creation <= ? + AND code_parrain IN ( + SELECT code_membre + FROM codeGenerer + WHERE category = 'super' + AND id IN ( + SELECT codeGenerer_id + FROM networks_agents + WHERE network_id = ? + AND agent_id IN ( + SELECT id + FROM agents + WHERE lastname = ? + ) + ) + ) + "; + + $query = $this->db->query($sql, [$debut, $fin, $id_network, $lastname]); + + if ($query->num_rows() > 0) { return $query->row()->c; - }else{ - return 0; } + + return 0; } - public function getPointGeolocalisedByDate($id_network,$lastname,$debut,$fin){ - $query = $this->db->query("SELECT COUNT(`id`) AS c FROM `codeGenerer` - WHERE date_creation>= '".$debut."' AND date_creation<='".$fin."' AND `code_parrain`= - (SELECT code_membre FROM codeGenerer WHERE category='super' AND - id=(SELECT codeGenerer_id FROM networks_agents WHERE network_id='".$id_network."' AND - agent_id IN (SELECT id FROM agents WHERE lastname='".$lastname."') - ) - ) - "); - if($query->num_rows()>0){ - return $query->row()->c; - }else{ - return 0; - } - } + public function getCorrectPointGeolocalisedByDate($id_network, $lastname, $debut, $fin) + { + $sql = " + SELECT COUNT(*) AS c + FROM codeGenerer + INNER JOIN networks_agents ON codeGenerer.id = networks_agents.codeGenerer_id + WHERE codeGenerer.date_creation >= ? + AND codeGenerer.date_creation <= ? + AND networks_agents.phone NOT LIKE ? + AND networks_agents.phone NOT LIKE ? + AND codeGenerer.code_parrain IN ( + SELECT code_membre + FROM codeGenerer + WHERE category = 'super' + AND id IN ( + SELECT codeGenerer_id + FROM networks_agents + WHERE network_id = ? + AND agent_id IN ( + SELECT id FROM agents WHERE lastname = ? + ) + ) + ) + "; + + $params = [ + $debut, + $fin, + '+241+241%', + '+2410000%', + $id_network, + $lastname + ]; + + $query = $this->db->query($sql, $params); + + return ($query->num_rows() > 0) ? $query->row()->c : 0; + } - public function getCorrectPointGeolocalisedByDate($id_network,$lastname,$debut,$fin){ - $query = $this->db->query("SELECT COUNT(*) AS c FROM `codeGenerer` - INNER JOIN `networks_agents` ON codeGenerer.id=networks_agents.codeGenerer_id - WHERE codeGenerer.date_creation>= '".$debut."' AND codeGenerer.date_creation<='".$fin."' - AND networks_agents.phone NOT LIKE '+241+241%' AND networks_agents.phone NOT LIKE '+2410000%' AND codeGenerer.code_parrain IN - (SELECT code_membre FROM codeGenerer WHERE category='super' AND - id IN (SELECT codeGenerer_id FROM networks_agents WHERE network_id='".$id_network."' AND - agent_id IN (SELECT id FROM agents WHERE lastname='".$lastname."') - ) - ) - "); - if($query->num_rows()>0){ - return $query->row()->c; - }else{ - return 0; - } - } public function getNetworks($country_id){ $query = $this->db->query("SELECT id,name FROM networks WHERE country_id ='".$country_id."'"); diff --git a/application/views/account_opening_agent/dashboard.php b/application/views/account_opening_agent/dashboard.php index df953899..0cf5c8b0 100755 --- a/application/views/account_opening_agent/dashboard.php +++ b/application/views/account_opening_agent/dashboard.php @@ -211,8 +211,9 @@ - - + + + diff --git a/application/views/account_opening_agent/infos_opening_account_request.php b/application/views/account_opening_agent/infos_opening_account_request.php index 8d80620b..22a3ed01 100755 --- a/application/views/account_opening_agent/infos_opening_account_request.php +++ b/application/views/account_opening_agent/infos_opening_account_request.php @@ -1,7 +1,8 @@ + href="') ?>"> @@ -917,13 +918,14 @@ - - + + + - - + + @@ -969,19 +971,19 @@ dataType: 'json', data: { - "nh_validating_agent_id": "session->userdata('agent_id') ?>", + "nh_validating_agent_id": "session->userdata('agent_i ?>d') ?>", "agent_id": "session->userdata('agent_id') ?>", - "type" : "ACCEPT" + " ?>type" : "ACCEPT" }, success: function (data) { // console.log('data',data); if(data.status === 200){ Swal.fire({ icon: 'success', - title: "lang->line('opening_account_request_accepted')?>", - text:"lang->line('informations_updated')?>", + title: "s->lang->line('opening_account_request_accepted')?>", + text:"s->lang->line('informations_updated')?>", timer: 3000 }).then(()=>{ location.reload(); @@ -994,7 +996,7 @@ error: function (resultat, statut, error) { console.log(resultat + " " + error); - toastr.error("lang->line('error_message')?>" , "lang->line('request_error')?>"); + toastr.error("s->lang->line('error_message')?>" , "s->lang->line('request_error')?>"); } }); }); diff --git a/application/views/account_opening_agent/opening_account_requests.php b/application/views/account_opening_agent/opening_account_requests.php index ae0e8abb..52b54add 100755 --- a/application/views/account_opening_agent/opening_account_requests.php +++ b/application/views/account_opening_agent/opening_account_requests.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -70,13 +71,14 @@ - - + + + - - + + diff --git a/application/views/admin_dash.php b/application/views/admin_dash.php index 519bdc1d..f7874ea9 100755 --- a/application/views/admin_dash.php +++ b/application/views/admin_dash.php @@ -235,8 +235,9 @@ - - + + + diff --git a/application/views/admin_forgot_password.php b/application/views/admin_forgot_password.php index 8e0fb0c9..8426eb4f 100755 --- a/application/views/admin_forgot_password.php +++ b/application/views/admin_forgot_password.php @@ -57,8 +57,9 @@ - - + + + diff --git a/application/views/admin_hypervisor.php b/application/views/admin_hypervisor.php index 3996c44c..11b121d4 100755 --- a/application/views/admin_hypervisor.php +++ b/application/views/admin_hypervisor.php @@ -304,8 +304,9 @@ if ($users_geolocated > 0) { - - + + + diff --git a/application/views/admin_update_password.php b/application/views/admin_update_password.php index c59aaf0d..23620628 100755 --- a/application/views/admin_update_password.php +++ b/application/views/admin_update_password.php @@ -59,8 +59,9 @@ - - + + + diff --git a/application/views/calculator.php b/application/views/calculator.php index 7f5e05a8..92a64c92 100755 --- a/application/views/calculator.php +++ b/application/views/calculator.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -514,13 +515,14 @@ $converter = new CurrencyConverter($provider); - - + + + - - + + diff --git a/application/views/codeg.php b/application/views/codeg.php index b05287eb..c12a2436 100755 --- a/application/views/codeg.php +++ b/application/views/codeg.php @@ -1,5 +1,6 @@ - +">
- - + + + - - + + diff --git a/application/views/confidentialite.php b/application/views/confidentialite.php index 7e1e9f18..de8a4409 100755 --- a/application/views/confidentialite.php +++ b/application/views/confidentialite.php @@ -97,8 +97,9 @@ Vos commentaires - - + + + diff --git a/application/views/config_wallet_ilink_hyp/agent_remove_carte_cash.php b/application/views/config_wallet_ilink_hyp/agent_remove_carte_cash.php index 443946b2..f3d9c814 100755 --- a/application/views/config_wallet_ilink_hyp/agent_remove_carte_cash.php +++ b/application/views/config_wallet_ilink_hyp/agent_remove_carte_cash.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -500,13 +501,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL);
- - + + + - - + + 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 3d37df8b..424b990b 100755 --- a/application/views/config_wallet_ilink_hyp/agent_remove_cash.php +++ b/application/views/config_wallet_ilink_hyp/agent_remove_cash.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -408,13 +409,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php b/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php index faddb6b7..c949aa8d 100755 --- a/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php +++ b/application/views/config_wallet_ilink_hyp/agent_send_cash_canal.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -885,13 +886,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/agent_send_cash_carte.php b/application/views/config_wallet_ilink_hyp/agent_send_cash_carte.php index 14392c43..4e913561 100755 --- a/application/views/config_wallet_ilink_hyp/agent_send_cash_carte.php +++ b/application/views/config_wallet_ilink_hyp/agent_send_cash_carte.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -503,13 +504,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/customers_accounts.php b/application/views/config_wallet_ilink_hyp/customers_accounts.php index 9896f50a..aece4736 100755 --- a/application/views/config_wallet_ilink_hyp/customers_accounts.php +++ b/application/views/config_wallet_ilink_hyp/customers_accounts.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -177,13 +178,14 @@ - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/etat_soldes.php b/application/views/config_wallet_ilink_hyp/etat_soldes.php index a0ca11ea..df51bb7a 100755 --- a/application/views/config_wallet_ilink_hyp/etat_soldes.php +++ b/application/views/config_wallet_ilink_hyp/etat_soldes.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -216,13 +217,14 @@ - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/historique_commission_payements.php b/application/views/config_wallet_ilink_hyp/historique_commission_payements.php index d57edf8d..dbef47c5 100755 --- a/application/views/config_wallet_ilink_hyp/historique_commission_payements.php +++ b/application/views/config_wallet_ilink_hyp/historique_commission_payements.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -159,13 +160,14 @@ - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/taxes.php b/application/views/config_wallet_ilink_hyp/taxes.php index a07f1d24..edd5c78a 100755 --- a/application/views/config_wallet_ilink_hyp/taxes.php +++ b/application/views/config_wallet_ilink_hyp/taxes.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -166,13 +167,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/user_carte_autre_wallet.php b/application/views/config_wallet_ilink_hyp/user_carte_autre_wallet.php index e6ef94e2..3ab5e055 100755 --- a/application/views/config_wallet_ilink_hyp/user_carte_autre_wallet.php +++ b/application/views/config_wallet_ilink_hyp/user_carte_autre_wallet.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -408,13 +409,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/user_carte_wallet.php b/application/views/config_wallet_ilink_hyp/user_carte_wallet.php index aea75bcf..212c6186 100755 --- a/application/views/config_wallet_ilink_hyp/user_carte_wallet.php +++ b/application/views/config_wallet_ilink_hyp/user_carte_wallet.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -745,13 +746,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/user_wallet_carte.php b/application/views/config_wallet_ilink_hyp/user_wallet_carte.php index cbff7b55..035519da 100755 --- a/application/views/config_wallet_ilink_hyp/user_wallet_carte.php +++ b/application/views/config_wallet_ilink_hyp/user_wallet_carte.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -336,13 +337,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/user_wallet_cash.php b/application/views/config_wallet_ilink_hyp/user_wallet_cash.php index cbbfc4e9..0e37547f 100755 --- a/application/views/config_wallet_ilink_hyp/user_wallet_cash.php +++ b/application/views/config_wallet_ilink_hyp/user_wallet_cash.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -257,13 +258,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/config_wallet_ilink_hyp/user_wallet_wallet.php b/application/views/config_wallet_ilink_hyp/user_wallet_wallet.php index 200af07b..eaf9e73e 100755 --- a/application/views/config_wallet_ilink_hyp/user_wallet_wallet.php +++ b/application/views/config_wallet_ilink_hyp/user_wallet_wallet.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -253,13 +254,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/demande.php b/application/views/demande.php index 7d468002..ee245b00 100755 --- a/application/views/demande.php +++ b/application/views/demande.php @@ -1,6 +1,7 @@ - +') ?>">
@@ -1312,13 +1313,14 @@
- - + + + - - + + diff --git a/application/views/demande_adhesion.php b/application/views/demande_adhesion.php index ff43b3ce..4528d7bf 100755 --- a/application/views/demande_adhesion.php +++ b/application/views/demande_adhesion.php @@ -1,6 +1,7 @@ - +') ?>">
@@ -284,13 +285,14 @@
- - + + + - - + + diff --git a/application/views/demande_credit.php b/application/views/demande_credit.php index 56baa9dc..25890fc5 100755 --- a/application/views/demande_credit.php +++ b/application/views/demande_credit.php @@ -1,6 +1,7 @@ + href="') ?>">
@@ -891,13 +892,14 @@
- - + + + - - + + diff --git a/application/views/demande_credit_annulation.php b/application/views/demande_credit_annulation.php index 0ea8810d..80a2c26e 100755 --- a/application/views/demande_credit_annulation.php +++ b/application/views/demande_credit_annulation.php @@ -1,6 +1,7 @@ + href="') ?>">
@@ -124,13 +125,14 @@
- - + + + - - + + diff --git a/application/views/firstfilter.php b/application/views/firstfilter.php index 050edd45..bfd3cf2d 100755 --- a/application/views/firstfilter.php +++ b/application/views/firstfilter.php @@ -109,8 +109,9 @@ - - + + + diff --git a/application/views/game.php b/application/views/game.php index 9817e478..1717fc72 100755 --- a/application/views/game.php +++ b/application/views/game.php @@ -1,4 +1,5 @@ - +') ?>">
@@ -251,13 +252,14 @@
- - + + + - - + + diff --git a/application/views/generer_super.php b/application/views/generer_super.php index 695160bb..b9ffc254 100755 --- a/application/views/generer_super.php +++ b/application/views/generer_super.php @@ -63,8 +63,9 @@ - - + + + diff --git a/application/views/gestion_admin.php b/application/views/gestion_admin.php index 0c3296ed..f93664b0 100755 --- a/application/views/gestion_admin.php +++ b/application/views/gestion_admin.php @@ -1,4 +1,5 @@ - +') ?>">
@@ -281,13 +282,14 @@
- - + + + - - + + diff --git a/application/views/gestion_aggregators.php b/application/views/gestion_aggregators.php index e0a5c727..858df2c3 100755 --- a/application/views/gestion_aggregators.php +++ b/application/views/gestion_aggregators.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -172,13 +173,14 @@ - - + + + - - + + diff --git a/application/views/gestion_campagne.php b/application/views/gestion_campagne.php index 5c52b3c6..ae08c14d 100755 --- a/application/views/gestion_campagne.php +++ b/application/views/gestion_campagne.php @@ -1,6 +1,7 @@ - +') ?>">
@@ -186,13 +187,14 @@
- - + + + - - + + diff --git a/application/views/gestion_geolocalisation.php b/application/views/gestion_geolocalisation.php index 2c86914e..b598ded9 100755 --- a/application/views/gestion_geolocalisation.php +++ b/application/views/gestion_geolocalisation.php @@ -1,4 +1,5 @@ - +') ?>">
@@ -147,13 +148,14 @@
- - + + + - - + + diff --git a/application/views/gestion_map.php b/application/views/gestion_map.php index fbfdd39f..797fa21a 100755 --- a/application/views/gestion_map.php +++ b/application/views/gestion_map.php @@ -23,7 +23,8 @@ - +') ?>">
@@ -99,13 +100,14 @@
- - + + + - - + + diff --git a/application/views/gestion_monnaie.php b/application/views/gestion_monnaie.php index 828ebe57..2b63b671 100755 --- a/application/views/gestion_monnaie.php +++ b/application/views/gestion_monnaie.php @@ -2,7 +2,8 @@ href=""> - +') ?>"> - +') ?>">
@@ -318,13 +319,14 @@
- - + + + - - + + diff --git a/application/views/listemembers.php b/application/views/listemembers.php index 00eedad9..84ccd23f 100755 --- a/application/views/listemembers.php +++ b/application/views/listemembers.php @@ -1,6 +1,7 @@ - + ">
@@ -239,8 +240,9 @@ echo "1 results";
- - + + + diff --git a/application/views/login.php b/application/views/login.php index 5036a0c3..cd27922c 100755 --- a/application/views/login.php +++ b/application/views/login.php @@ -161,8 +161,9 @@ - - + + + diff --git a/application/views/login_register.php b/application/views/login_register.php index 04743a6e..26ba466e 100755 --- a/application/views/login_register.php +++ b/application/views/login_register.php @@ -74,8 +74,9 @@ - - + + + diff --git a/application/views/membreCodeAdmin.php b/application/views/membreCodeAdmin.php index a194d3b7..81246645 100755 --- a/application/views/membreCodeAdmin.php +++ b/application/views/membreCodeAdmin.php @@ -1,4 +1,5 @@ - +') ?>">
@@ -262,13 +263,14 @@
- - + + + - - + + diff --git a/application/views/nano_credit/config_nano_credit.php b/application/views/nano_credit/config_nano_credit.php index 8e755fdf..642c3314 100755 --- a/application/views/nano_credit/config_nano_credit.php +++ b/application/views/nano_credit/config_nano_credit.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -455,13 +456,14 @@ $context = new \Brick\Money\Context\AutoContext(); - - + + + - - + + diff --git a/application/views/nano_credit/config_savings.php b/application/views/nano_credit/config_savings.php index f0b32223..6053059f 100755 --- a/application/views/nano_credit/config_savings.php +++ b/application/views/nano_credit/config_savings.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -265,13 +266,14 @@ $context = new \Brick\Money\Context\AutoContext(); - - + + + - - + + diff --git a/application/views/nano_credit/gestion_nano_credit_admin.php b/application/views/nano_credit/gestion_nano_credit_admin.php index f4cdbeeb..756d926b 100755 --- a/application/views/nano_credit/gestion_nano_credit_admin.php +++ b/application/views/nano_credit/gestion_nano_credit_admin.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> - - + + + - - + + diff --git a/application/views/nano_credit/gestion_nano_credit_hyp.php b/application/views/nano_credit/gestion_nano_credit_hyp.php index 62ff6afc..cf164b94 100755 --- a/application/views/nano_credit/gestion_nano_credit_hyp.php +++ b/application/views/nano_credit/gestion_nano_credit_hyp.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -222,13 +223,14 @@ $context = new \Brick\Money\Context\AutoContext(); - - + + + - - + + diff --git a/application/views/nano_credit/gestion_nano_credits.php b/application/views/nano_credit/gestion_nano_credits.php index 1bcd484a..af0c450e 100755 --- a/application/views/nano_credit/gestion_nano_credits.php +++ b/application/views/nano_credit/gestion_nano_credits.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -165,13 +166,14 @@ - - + + + - - + + diff --git a/application/views/nano_credit/historique_nano_credit.php b/application/views/nano_credit/historique_nano_credit.php index 69f01b02..419b5d51 100755 --- a/application/views/nano_credit/historique_nano_credit.php +++ b/application/views/nano_credit/historique_nano_credit.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -188,13 +189,14 @@ - - + + + - - + + diff --git a/application/views/nano_credit/historique_savings.php b/application/views/nano_credit/historique_savings.php index f922a3fb..e27599ae 100755 --- a/application/views/nano_credit/historique_savings.php +++ b/application/views/nano_credit/historique_savings.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -176,13 +177,14 @@ - - + + + - - + + diff --git a/application/views/nano_credit/users_group_detail.php b/application/views/nano_credit/users_group_detail.php index 18f14324..a5dda01d 100755 --- a/application/views/nano_credit/users_group_detail.php +++ b/application/views/nano_credit/users_group_detail.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -206,13 +207,14 @@ $context = new \Brick\Money\Context\AutoContext(); - - + + + - - + + diff --git a/application/views/nano_health/admin/gestion_wallet.php b/application/views/nano_health/admin/gestion_wallet.php index 2f9d8f8e..fd59dee9 100755 --- a/application/views/nano_health/admin/gestion_wallet.php +++ b/application/views/nano_health/admin/gestion_wallet.php @@ -4,7 +4,8 @@ + href="') ?>"> - - + + + - - + + diff --git a/application/views/nano_health/agent/health_care_sheet_consultation_form.php b/application/views/nano_health/agent/health_care_sheet_consultation_form.php index 42df3fb1..163eabb9 100755 --- a/application/views/nano_health/agent/health_care_sheet_consultation_form.php +++ b/application/views/nano_health/agent/health_care_sheet_consultation_form.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -236,13 +237,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/nano_health/agent/health_care_sheet_execution_form.php b/application/views/nano_health/agent/health_care_sheet_execution_form.php index 3438a809..eab793a0 100755 --- a/application/views/nano_health/agent/health_care_sheet_execution_form.php +++ b/application/views/nano_health/agent/health_care_sheet_execution_form.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -180,13 +181,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/nano_health/agent/health_care_sheet_update_consultation_form.php b/application/views/nano_health/agent/health_care_sheet_update_consultation_form.php index b4304a0e..b8ae70ef 100755 --- a/application/views/nano_health/agent/health_care_sheet_update_consultation_form.php +++ b/application/views/nano_health/agent/health_care_sheet_update_consultation_form.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -249,13 +250,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/nano_health/agent/health_care_sheet_update_execution_form.php b/application/views/nano_health/agent/health_care_sheet_update_execution_form.php index b5d478d7..ed635ed6 100755 --- a/application/views/nano_health/agent/health_care_sheet_update_execution_form.php +++ b/application/views/nano_health/agent/health_care_sheet_update_execution_form.php @@ -2,7 +2,8 @@ href=""> + href="') ?>"> @@ -157,13 +158,14 @@ $fmt = new NumberFormatter('fr_FR', NumberFormatter::DECIMAL); - - + + + - - + + diff --git a/application/views/nano_health/config_nano_health.php b/application/views/nano_health/config_nano_health.php index c9a86f2a..42eb2839 100755 --- a/application/views/nano_health/config_nano_health.php +++ b/application/views/nano_health/config_nano_health.php @@ -4,7 +4,8 @@ + href="') ?>"> - - + + + - - + + diff --git a/application/views/nano_health/controller_doctor/dashboard.php b/application/views/nano_health/controller_doctor/dashboard.php index 74d8c38e..0b26fbd6 100755 --- a/application/views/nano_health/controller_doctor/dashboard.php +++ b/application/views/nano_health/controller_doctor/dashboard.php @@ -126,8 +126,9 @@ - - + + + diff --git a/application/views/nano_health/controller_doctor/infos_invoice.php b/application/views/nano_health/controller_doctor/infos_invoice.php index a1ac0a37..fd34f8c6 100755 --- a/application/views/nano_health/controller_doctor/infos_invoice.php +++ b/application/views/nano_health/controller_doctor/infos_invoice.php @@ -1,7 +1,8 @@ + href="') ?>"> @@ -623,13 +624,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/controller_doctor/invoices.php b/application/views/nano_health/controller_doctor/invoices.php index 9e35454e..05f93be3 100755 --- a/application/views/nano_health/controller_doctor/invoices.php +++ b/application/views/nano_health/controller_doctor/invoices.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -71,13 +72,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/gestion_nano_health.php b/application/views/nano_health/gestion_nano_health.php index c69f14cc..3d6a41d2 100755 --- a/application/views/nano_health/gestion_nano_health.php +++ b/application/views/nano_health/gestion_nano_health.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -150,13 +151,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/drugs_and_devices.php b/application/views/nano_health/hyper/drugs_and_devices.php index 1e6fcf1a..1d6c9904 100755 --- a/application/views/nano_health/hyper/drugs_and_devices.php +++ b/application/views/nano_health/hyper/drugs_and_devices.php @@ -1,5 +1,6 @@ + href="') ?>">
@@ -119,13 +120,14 @@
- - + + + - - + + diff --git a/application/views/nano_health/hyper/exclusions.php b/application/views/nano_health/hyper/exclusions.php index fac1c6f2..aa862fdd 100755 --- a/application/views/nano_health/hyper/exclusions.php +++ b/application/views/nano_health/hyper/exclusions.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -44,13 +45,13 @@ - + - - + + diff --git a/application/views/nano_health/hyper/gestion_wallet.php b/application/views/nano_health/hyper/gestion_wallet.php index e0707b35..7ecdf654 100755 --- a/application/views/nano_health/hyper/gestion_wallet.php +++ b/application/views/nano_health/hyper/gestion_wallet.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -826,13 +827,14 @@ $careRequests = []; load->view('include/recharge_account_modal',['walletPassword' => $walletPassword, 'network' => $network, 'country' => $country, 'wallet_id' => $wallet_id]) ?> - - + + + - - + + diff --git a/application/views/nano_health/hyper/infos_health_care_sheet.php b/application/views/nano_health/hyper/infos_health_care_sheet.php index 5e0943d5..535770c1 100755 --- a/application/views/nano_health/hyper/infos_health_care_sheet.php +++ b/application/views/nano_health/hyper/infos_health_care_sheet.php @@ -1,7 +1,8 @@ + href="') ?>"> @@ -407,13 +408,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/infos_insurance.php b/application/views/nano_health/hyper/infos_insurance.php index b811b33a..c9767841 100755 --- a/application/views/nano_health/hyper/infos_insurance.php +++ b/application/views/nano_health/hyper/infos_insurance.php @@ -1,7 +1,8 @@ + href="') ?>"> @@ -387,13 +388,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/infos_insurance_subscription.php b/application/views/nano_health/hyper/infos_insurance_subscription.php index 184f979f..162230eb 100755 --- a/application/views/nano_health/hyper/infos_insurance_subscription.php +++ b/application/views/nano_health/hyper/infos_insurance_subscription.php @@ -1,7 +1,8 @@ + href="') ?>"> @@ -325,13 +326,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/insurances_expired_insured.php b/application/views/nano_health/hyper/insurances_expired_insured.php index 0334702c..2128fdfe 100755 --- a/application/views/nano_health/hyper/insurances_expired_insured.php +++ b/application/views/nano_health/hyper/insurances_expired_insured.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -73,13 +74,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/insurances_health_care_sheets.php b/application/views/nano_health/hyper/insurances_health_care_sheets.php index 4e183188..267cebc6 100755 --- a/application/views/nano_health/hyper/insurances_health_care_sheets.php +++ b/application/views/nano_health/hyper/insurances_health_care_sheets.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -124,13 +125,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/insurances_insured.php b/application/views/nano_health/hyper/insurances_insured.php index 9592d86d..35c4f9c2 100755 --- a/application/views/nano_health/hyper/insurances_insured.php +++ b/application/views/nano_health/hyper/insurances_insured.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -76,13 +77,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/insurances_invoices.php b/application/views/nano_health/hyper/insurances_invoices.php index 497748da..b017e271 100755 --- a/application/views/nano_health/hyper/insurances_invoices.php +++ b/application/views/nano_health/hyper/insurances_invoices.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -71,13 +72,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/insurances_subscriptions.php b/application/views/nano_health/hyper/insurances_subscriptions.php index 9ca4c222..af42138a 100755 --- a/application/views/nano_health/hyper/insurances_subscriptions.php +++ b/application/views/nano_health/hyper/insurances_subscriptions.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -72,13 +73,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/hyper/listeadmin.php b/application/views/nano_health/hyper/listeadmin.php index 388da006..43f4f8e6 100755 --- a/application/views/nano_health/hyper/listeadmin.php +++ b/application/views/nano_health/hyper/listeadmin.php @@ -25,7 +25,8 @@ + href="') ?>">
@@ -253,13 +254,14 @@
- - + + + - - + + diff --git a/application/views/nano_health/hyper/validating_agents.php b/application/views/nano_health/hyper/validating_agents.php index 16fb93bc..8a9f5bff 100755 --- a/application/views/nano_health/hyper/validating_agents.php +++ b/application/views/nano_health/hyper/validating_agents.php @@ -1,5 +1,6 @@ + href="') ?>">
@@ -187,13 +188,14 @@
- - + + + - - + + diff --git a/application/views/nano_health/super/gestion_wallet.php b/application/views/nano_health/super/gestion_wallet.php index 0f124ba0..d46b9e1a 100755 --- a/application/views/nano_health/super/gestion_wallet.php +++ b/application/views/nano_health/super/gestion_wallet.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -395,13 +396,14 @@ $careRequests = []; load->view('include/loader') ?> - - + + + - - + + diff --git a/application/views/nano_health/validating_agent/dashboard.php b/application/views/nano_health/validating_agent/dashboard.php index 4f14a37a..1c19d538 100755 --- a/application/views/nano_health/validating_agent/dashboard.php +++ b/application/views/nano_health/validating_agent/dashboard.php @@ -211,8 +211,9 @@ - - + + + diff --git a/application/views/nano_health/validating_doctor/care_requests.php b/application/views/nano_health/validating_doctor/care_requests.php index c45b727a..0fd19256 100755 --- a/application/views/nano_health/validating_doctor/care_requests.php +++ b/application/views/nano_health/validating_doctor/care_requests.php @@ -1,6 +1,7 @@ + href="') ?>"> @@ -72,13 +73,14 @@ - - + + + - - + + diff --git a/application/views/nano_health/validating_doctor/dashboard.php b/application/views/nano_health/validating_doctor/dashboard.php index afcdff8f..58c9c757 100755 --- a/application/views/nano_health/validating_doctor/dashboard.php +++ b/application/views/nano_health/validating_doctor/dashboard.php @@ -125,8 +125,9 @@ - - + + + diff --git a/application/views/register.php b/application/views/register.php index b8fc3796..a9b4a947 100755 --- a/application/views/register.php +++ b/application/views/register.php @@ -83,7 +83,7 @@ - + diff --git a/application/views/select_tuto.php b/application/views/select_tuto.php index 2e406a8a..1c3d01c1 100755 --- a/application/views/select_tuto.php +++ b/application/views/select_tuto.php @@ -574,8 +574,9 @@ - - + + + diff --git a/application/views/superviseur_dash.php b/application/views/superviseur_dash.php index 5ad3571e..841801b9 100755 --- a/application/views/superviseur_dash.php +++ b/application/views/superviseur_dash.php @@ -243,8 +243,9 @@ - - + + + diff --git a/application/views/test.php b/application/views/test.php index 916cd9bd..92acf88f 100755 --- a/application/views/test.php +++ b/application/views/test.php @@ -44,13 +44,14 @@ - - + + + - - + + diff --git a/application/views/wallet_password.php b/application/views/wallet_password.php index 332cda7c..db056af7 100755 --- a/application/views/wallet_password.php +++ b/application/views/wallet_password.php @@ -1,5 +1,6 @@ + href="') ?>"> @@ -117,13 +118,14 @@ - - + + + - - + + diff --git a/bower.json b/bower.json index 9e519d17..38071d15 100755 --- a/bower.json +++ b/bower.json @@ -36,7 +36,7 @@ "ckeditor": "^4.7.0", "bootstrap-colorpicker": "^2.5.1", "bootstrap": "^3.3.7", - "jquery": "^3.2.1", + "jquery": "^2.2.4", "datatables.net": "^1.10.15", "datatables.net-bs": "^2.1.1", "bootstrap-datepicker": "^1.7.0",