diff --git a/.htaccess b/.htaccess index c179f1f0..a97b39ba 100755 --- a/.htaccess +++ b/.htaccess @@ -1,3 +1,9 @@ + + + Allow from all + Header set Access-Control-Allow-Origin "*" + + RewriteEngine On RewriteCond %{REQUEST_FILENAME} !-f diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index fd0521c8..8fbc707f 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -32,10 +32,7 @@ class Hyperviseur_dash extends CI_Controller $data['listdem'] = $this->user_model->getDemandes($this->session->userdata('member_code')); $data['allGeo'] = $this->user_model->getAllUserGeoForHyp($this->session->userdata('member_code')); $data['allDem'] = $this->user_model->getDemandes($this->session->userdata('member_code')); - $data['token'] = $this->session->userdata('token'); $data['member_code'] = $this->session->userdata('member_code'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); @@ -69,10 +66,7 @@ class Hyperviseur_dash extends CI_Controller $data['positions'] = $this->user_model->getUsersGeolocatedPositionByVilleForHyp($this->session->userdata('current_ville'), $this->session->userdata('member_code')); $data['latitude'] = $this->session->userdata('latitude'); $data['longitude'] = $this->session->userdata('longitude'); - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); @@ -111,10 +105,7 @@ class Hyperviseur_dash extends CI_Controller $data['tab'] = $query; $data['latitude'] = $this->session->userdata('latitude'); $data['longitude'] = $this->session->userdata('longitude'); - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); @@ -157,10 +148,7 @@ class Hyperviseur_dash extends CI_Controller $data['type'] = 'incoming'; $data['demand_type'] = 'credit'; $data['alert'] = ""; - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); @@ -196,10 +184,7 @@ class Hyperviseur_dash extends CI_Controller $data['type'] = 'incoming'; $data['demand_type'] = 'credit'; $data['alert'] = ""; - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); @@ -350,10 +335,7 @@ class Hyperviseur_dash extends CI_Controller $data['demand_type'] = 'adhesion'; $data['active'] = "demandesAd"; $data['alert'] = ""; - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['tab_fastDemande'] = $this->user_model->getRangeASCDemandesAd($debut, $fin, $this->session->userdata('member_code')); @@ -429,7 +411,10 @@ class Hyperviseur_dash extends CI_Controller } $data["totalCommissionBanque"] = Money::of(round($totalCommissionBanque,2), $this->session->userdata('currency_code'), $context )->formatTo('fr_FR'); - } elseif ($data['hasWallet']->first_row()->type == 'ilink') { + $data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code')); + $data['agentWalletInfos'] = $this->user_model->getInfosWalletAgentForHyper($id_network); + + } else if ($data['hasWallet']->first_row()->type == 'ilink') { $transactions = $this->wallet_model->getNetworkIlinTransactions($id_network); $data["transactions"] = array(); @@ -442,7 +427,10 @@ class Hyperviseur_dash extends CI_Controller } $data["totalCommissionBanque"] = Money::of(round($totalCommissionBanque,2), $this->session->userdata('currency_code'), $context )->formatTo('fr_FR'); - }elseif($data['hasWallet']->first_row()->type == 'ilink_sante'){ + $data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code')); + $data['agentWalletInfos'] = $this->user_model->getInfosWalletAgentForHyper($id_network); + + }else if($data['hasWallet']->first_row()->type == 'ilink_sante'){ $nh_config = $this->nano_health_model->getConfig($id_network); $data['nh_config'] = $nh_config ? $nh_config->first_row() : null ; $data['config_id'] = $data['nh_config'] ? $data['nh_config']->id : null ; @@ -473,19 +461,13 @@ class Hyperviseur_dash extends CI_Controller $data['walletPassword'] = $res ? $res->first_row() : null; $data['alert'] = ""; $data['active'] = "wallet_wallet"; - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['network_id'] = $id_network; $data['country'] = $this->session->userdata('current_pays'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code')); - $data['pays'] = $this->user_model->getAllGameCountries(); - $data['networks'] = $this->user_model->getActiveNetwork(); - $data['agentWalletInfos'] = $this->user_model->getInfosWalletAgentForHyper($id_network); + $this->load->view('header_hyp', $data); if ($data['hasWallet']->first_row()->type == 'visa') $this->load->view('gestion_wallet_hyp'); @@ -548,8 +530,7 @@ class Hyperviseur_dash extends CI_Controller $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); - + $data['hasWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); $data['country'] = $this->session->userdata('current_pays'); $data['category'] = $this->session->userdata('category'); @@ -737,7 +718,7 @@ class Hyperviseur_dash extends CI_Controller $data['alert'] = ""; $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + $data['hasWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); $data['country'] = $this->session->userdata('current_pays'); @@ -939,7 +920,7 @@ class Hyperviseur_dash extends CI_Controller $data['alert'] = ""; $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + $data['hasWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); $data['idConfig'] = $data['hasWallet']->first_row()->id; @@ -1473,11 +1454,9 @@ class Hyperviseur_dash extends CI_Controller $data['taxes'] = $this->wallet_model->getTaxes($data['idConfig'], 'nano_credit'); $data['active'] = "nano_credit"; $data['alert'] = ""; - $data['game_pays'] = $this->user_model->getGameCountry(); $data['network'] = $this->session->userdata('network'); $data['country'] = $this->session->userdata('current_pays'); $data['currency_code'] = $this->session->userdata('currency_code'); - $data['token'] = $this->session->userdata('token'); $data['configWallet'] = $data['hasWallet']->first_row(); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); $this->load->view('header_hyp', $data); @@ -1543,7 +1522,7 @@ class Hyperviseur_dash extends CI_Controller $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + // $data['hasWallet'] = $data['configWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); $data['country'] = $this->session->userdata('current_pays'); @@ -1646,7 +1625,7 @@ class Hyperviseur_dash extends CI_Controller $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + $data['currency_code'] = $this->session->userdata('currency_code'); $data['hasWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); @@ -1684,7 +1663,7 @@ class Hyperviseur_dash extends CI_Controller $data['alert'] = ""; $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + $data['currency_code'] = $this->session->userdata('currency_code'); $data['category'] = $this->session->userdata('category'); @@ -1751,7 +1730,7 @@ class Hyperviseur_dash extends CI_Controller $data['alert'] = ""; $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + $data['currency_code'] = $this->session->userdata('currency_code'); $data['category'] = $this->session->userdata('category'); $data['hasWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); @@ -1772,8 +1751,7 @@ class Hyperviseur_dash extends CI_Controller $data['default_nom'] = $nom; $data['default_transac'] = $transac; $data['default_code'] = $code; - $data['game_pays'] = $this->user_model->getGameCountry(); - $data['networks'] = $this->user_model->getActiveNetwork(); + $this->load->view('header_hyp', $data); $this->load->view('gestion_recherche'); @@ -1786,8 +1764,6 @@ class Hyperviseur_dash extends CI_Controller $data['default_transac'] = ''; $data['default_code'] = ''; $data['default_nom'] = ''; - $data['game_pays'] = $this->user_model->getGameCountry(); - $data['networks'] = $this->user_model->getActiveNetwork(); $this->load->view('header_hyp', $data); $this->load->view('gestion_recherche'); @@ -1806,7 +1782,7 @@ class Hyperviseur_dash extends CI_Controller $data['alert'] = ""; $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + $data['currency_code'] = $this->session->userdata('currency_code'); $data['category'] = $this->session->userdata('category'); $data['network_id'] = $this->session->userdata('network_id'); @@ -1941,7 +1917,7 @@ class Hyperviseur_dash extends CI_Controller $data['alert'] = ""; $data['network'] = $this->session->userdata('network'); $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['networks'] = $this->user_model->getActiveNetwork(); + $data['currency_code'] = $this->session->userdata('currency_code'); $data['category'] = $this->session->userdata('category'); $data['network_id'] = $this->session->userdata('network_id'); diff --git a/application/controllers/Superviseur_dash.php b/application/controllers/Superviseur_dash.php index d876cf6b..92933e78 100755 --- a/application/controllers/Superviseur_dash.php +++ b/application/controllers/Superviseur_dash.php @@ -37,11 +37,8 @@ class Superviseur_dash extends CI_Controller $data['list_geolocated_users'] = $this->user_model->getUsersGeolocatedForSup($this->session->userdata('member_code')); $data['active'] = "dash"; - $data['token'] = $this->session->userdata('token'); $data['member_code'] = $this->session->userdata('member_code'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['code_parrain'] = $this->session->userdata('parrain'); @@ -90,11 +87,7 @@ class Superviseur_dash extends CI_Controller $data['tab'] = $this->user_model->getUsersGeolocatedForSup($this->session->userdata('member_code')); $data['latitude'] = $this->session->userdata('latitude'); $data['longitude'] = $this->session->userdata('longitude'); - $data['token'] = $this->session->userdata('token'); - $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code')); @@ -132,11 +125,8 @@ class Superviseur_dash extends CI_Controller // $data['type'] = $this->lang->line('crédits'); $data['demand_type'] = 'credit'; $data['alert'] = ""; - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); if ($type == 'incoming') { @@ -184,11 +174,8 @@ class Superviseur_dash extends CI_Controller $data['active'] = "demandesAd"; $data['alert'] = ""; $data['demand_type'] = 'adhesion'; - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['tab_fastDemande'] = $this->user_model->getRangeASCDemandesAd($debut, $fin, $this->session->userdata('member_code')); @@ -274,10 +261,7 @@ class Superviseur_dash extends CI_Controller $data['currency_code'] = $this->session->userdata('currency_code'); $data['alert'] = ""; $data['active'] = "wallet"; - $data['token'] = $this->session->userdata('token'); $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); $data['category'] = $this->session->userdata('category'); $data['network'] = $this->session->userdata('network'); $data['network_id'] = $id_network; @@ -481,8 +465,6 @@ class Superviseur_dash extends CI_Controller $data['default_nom'] = $nom; $data['default_transac'] = $transac; $data['default_code'] = $code; - $data['game_pays'] = $this->user_model->getGameCountry(); - $data['networks'] = $this->user_model->getActiveNetwork(); $this->load->view('header_sup', $data); $this->load->view('gestion_recherche'); @@ -495,8 +477,6 @@ class Superviseur_dash extends CI_Controller $data['default_transac'] = ''; $data['default_code'] = ''; $data['default_nom'] = ''; - $data['game_pays'] = $this->user_model->getGameCountry(); - $data['networks'] = $this->user_model->getActiveNetwork(); $this->load->view('header_sup', $data); $this->load->view('gestion_recherche'); diff --git a/application/views/gestion_recherche.php b/application/views/gestion_recherche.php index ad720a38..d7ec95f4 100755 --- a/application/views/gestion_recherche.php +++ b/application/views/gestion_recherche.php @@ -192,7 +192,7 @@
User profile picture + src="" alt="User profile picture">

lastname ?>

@@ -329,7 +329,7 @@
User profile picture + src="" alt="User profile picture">

lastname ?>

@@ -533,7 +533,7 @@
User profile picture + src="" alt="User profile picture">

lastname ?>

@@ -726,7 +726,7 @@ ?>
- icon search + icon search
diff --git a/application/views/register.php b/application/views/register.php index a314757a..b8fc3796 100755 --- a/application/views/register.php +++ b/application/views/register.php @@ -13,7 +13,7 @@ - +