diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 51b7fe28..d8df25bc 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -1020,7 +1020,7 @@ class Hyperviseur_dash extends CI_Controller if (isset($country)) { $data['country_id'] = $country; $data['country'] = $this->user_model->getCountry($country)->first_row(); - $res = $this->user_model->getActiveNetworksByCountry($country); + $res = $this->user_model->getActiveNetworksByCountry($country,$this->session->userdata('network_id')); $data['networks'] = []; if($res){ $result = $res->result(); diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 34b58107..f6226eea 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -414,4 +414,7 @@ $lang['fees'] = 'Frais'; $lang['tax'] = 'Taxe'; $lang['customer_net_amount_init'] = 'Montant net client du pays de départ'; $lang['customer_net_amount_final'] = 'Montant net client du pays d\'arrivée'; +$lang['issuer_id'] = 'ID émetteur'; +$lang['recipient_id']= 'ID destinataire'; +$lang['commission_paying_network'] = 'Commission de l\'hyperviseur payeur'; ?> diff --git a/application/models/User_model.php b/application/models/User_model.php index f3d723fa..bc4cdd99 100755 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -2487,9 +2487,9 @@ class User_model extends CI_Model } } - public function getActiveNetworksByCountry($country_id){ + public function getActiveNetworksByCountry($country_id , $network_id){ $query = $this->db->query("SELECT networks.name , networks.id , configWallet.type FROM `networks` INNER JOIN countries ON networks.country_id=countries.id - INNER JOIN configWallet ON configWallet.id_network = networks.id WHERE status = 1 AND countries.id = $country_id"); + INNER JOIN configWallet ON configWallet.id_network = networks.id WHERE status = 1 AND networks.id <> $network_id AND countries.id = $country_id"); if($query->num_rows()>0){ return $query; }else{ diff --git a/application/views/historique_transactions_ilink.php b/application/views/historique_transactions_ilink.php index eaf3c60d..70373352 100755 --- a/application/views/historique_transactions_ilink.php +++ b/application/views/historique_transactions_ilink.php @@ -126,17 +126,18 @@ use Brick\Money\Money;