From 3f2d7ca7c4b3ba2f50c21aa763e2202533c16da2 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Fri, 30 Oct 2020 12:20:54 +0100 Subject: [PATCH] + Update management of transmitting networks --- application/controllers/Hyperviseur_dash.php | 27 ++- application/language/english/message_lang.php | 3 + application/language/french/message_lang.php | 9 +- application/models/Wallet_model.php | 13 +- ...ion_wallet_ilink_config_paying_network.php | 211 +++++++++++++----- .../views/gestion_wallet_ilink_hyp.php | 2 +- ...on_wallet_ilink_paying_network_account.php | 91 +++++++- 7 files changed, 281 insertions(+), 75 deletions(-) diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index c00bf478..f107ceb5 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -1039,6 +1039,9 @@ class Hyperviseur_dash extends CI_Controller $network->url = null; } $network->is_transmitting_network = $res2 ? true : false; + $network->rate_transmitting = $res2 ? $res2->first_row()->taux_partage : null; + $network->url_transmitting = $res2 ? $res2->first_row()->url : null; + $data['networks'][] = $network; } } @@ -1161,6 +1164,7 @@ class Hyperviseur_dash extends CI_Controller $res = $this->wallet_model->getWalletPassword($this->session->userdata('network_id')); $data['walletPassword'] = $res ? $res->first_row() : null; $data['networks'] = $this->wallet_model->getPayingNetworksByConfigWallet($data['idConfig']); + $data['transmitting_networks'] = $this->wallet_model->getTransmittingNetworksByConfigWallet($data['idConfig']); $this->load->view('header_hyp', $data); $this->load->view('gestion_wallet_ilink_paying_network_account'); @@ -1612,12 +1616,25 @@ class Hyperviseur_dash extends CI_Controller { if ($this->isLogged()) { if (isset($_POST)) { - $data = array( - 'id_configWallet' => $this->input->post('config_id'), - 'id_network' => $this->input->post('network_id') - ); - $query = $this->db->insert('transmitting_networks', $data); + if($this->input->post('is_enabled')){ + $data = array( + 'url' => $this->input->post('url'), + 'taux_partage' => $this->input->post('rate') + ); + + $this->db->where('id_configWallet', $this->input->post('config_id')); + $this->db->where('id_network', $this->input->post('network_id')); + $query = $this->db->update('transmitting_networks', $data); + }else{ + $data = array( + 'id_configWallet' => $this->input->post('config_id'), + 'id_network' => $this->input->post('network_id'), + 'url' => $this->input->post('url'), + 'taux_partage' => $this->input->post('rate') + ); + $query = $this->db->insert('transmitting_networks', $data); + } if ($query) { echo json_encode("200"); diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index 6b088b58..5dea6000 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -534,4 +534,7 @@ $lang['transmitting_networks'] = "Transmitting networks"; $lang['transmitter_network_activated'] = "Transmitter network activated"; $lang['transmitter_network_deactivated'] = "Transmitter network deactivated"; $lang['paying_networks'] = 'Paying networks'; +$lang['configure_transmitter_network'] = 'Configure the sending network'; +$lang['paying_and_transmitting_networks_accounts'] = "Accounts of paying and issuing networks"; +$lang['transmitting_networks_accounts'] = 'Accounts of transmitting networks'; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index c7d9349e..7af8d917 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -403,7 +403,7 @@ $lang['ilink_third_rule'] = 'La somme des répartitions de commission sur opéra $lang['ilink_fourth_rule'] = 'La somme des répartitions de commission sur opération de retrait dans la carte doit etre égale à 100 %'; $lang['ilink_fifth_rule'] = 'La somme des répartitions de commission sur opération de retrait dans la carte pour utilisateur iLink doit etre égale à 100 %'; $lang['ilink_sixth_rule'] = 'La somme des répartitions de commission sur opération d\'envoi de wallet vers la carte pour utilisateur iLink doit etre égale à 100 %'; -$lang['edit_paying_and_transmitting_networks'] = 'Configuration des réseaux payeurs et emetteurs'; +$lang['edit_paying_and_transmitting_networks'] = 'Configuration des réseaux payeurs et émetteurs'; $lang['configure'] = 'Configurer'; $lang['configure_share_rate'] = 'Configurer le taux de partage'; $lang['share_rate'] = 'Taux de partage'; @@ -543,8 +543,11 @@ $lang['bank_deactivation'] = "Désactivation de la banque"; $lang['modify_bank'] = "Modifier la banque"; $lang['assign_bank_to_country'] = "Assigner une banque à un pays"; $lang['transmitting_networks'] = "Réseaux émetteurs"; -$lang['transmitter_network_activated'] = "Réseau emetteur activé"; -$lang['transmitter_network_deactivated'] = "Réseau emetteur desactivé"; +$lang['transmitter_network_activated'] = "Réseau émetteur activé"; +$lang['transmitter_network_deactivated'] = "Réseau émetteur desactivé"; $lang['paying_networks'] = 'Réseaux payeurs'; +$lang['configure_transmitter_network'] = 'Configurer le réseau émetteur'; +$lang['paying_and_transmitting_networks_accounts'] = "Comptes des reseaux payeurs et émetteurs"; +$lang['transmitting_networks_accounts'] = 'Comptes des reseaux émetteurs'; ?> diff --git a/application/models/Wallet_model.php b/application/models/Wallet_model.php index 985fc669..95cda339 100644 --- a/application/models/Wallet_model.php +++ b/application/models/Wallet_model.php @@ -917,10 +917,13 @@ LEFT JOIn networks_banks nb ON nb.id_bank_country = bc.id AND nb.id_network = n. networks n ON n.country_id = c.id WHERE n.status = 1 AND c.id = ? ) AND id_configWallet = ? ;"; $query = $this->db->query($sql , array($id_country, $idConfig)); - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } + return $query->num_rows() > 0 ? $query : false ; + } + + public function getTransmittingNetworksByConfigWallet($id_config) + { + $query = $this->db->query("SELECT n.name , n.id , cw.type , c.name as country ,c.currency_code, pw.taux_partage as rate , pw.balance_com , pw.balance_compensation, pw.id_configWallet as config_id FROM networks n INNER JOIN countries_currencies c ON n.country_id=c.id + INNER JOIN configWallet cw ON cw.id_network = n.id INNER JOIN transmitting_networks pw ON pw.id_network = n.id WHERE pw.id_configWallet = $id_config "); + return $query->num_rows() > 0 ? $query : false ; } } diff --git a/application/views/gestion_wallet_ilink_config_paying_network.php b/application/views/gestion_wallet_ilink_config_paying_network.php index 30b23810..e15d460e 100755 --- a/application/views/gestion_wallet_ilink_config_paying_network.php +++ b/application/views/gestion_wallet_ilink_config_paying_network.php @@ -96,31 +96,35 @@ url ?> -