diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 6163101e..65f5847e 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -1291,6 +1291,7 @@ class Hyperviseur_dash extends CI_Controller $data['hasWallet'] = $data['configWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); $data['country'] = $this->session->userdata('current_pays'); $data['category'] = $this->session->userdata('category'); + $data['id_network'] = $this->session->userdata('network_id'); $this->load->view('header_hyp', $data); if ($type == 'savings') diff --git a/application/controllers/Superviseur_dash.php b/application/controllers/Superviseur_dash.php index 4f0f19bd..d297ec45 100755 --- a/application/controllers/Superviseur_dash.php +++ b/application/controllers/Superviseur_dash.php @@ -337,6 +337,8 @@ class Superviseur_dash extends CI_Controller $data['country'] = $this->session->userdata('current_pays'); $data['category'] = $this->session->userdata('category'); $data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code')); + $data['id_network'] = $this->session->userdata('network_id'); + $this->load->view('header_sup', $data); if ($type == 'transaction') @@ -378,6 +380,7 @@ class Superviseur_dash extends CI_Controller $data['hasWallet'] = $this->wallet_model->getConfigWallet($this->session->userdata('network_id')); $data['country'] = $this->session->userdata('current_pays'); $data['category'] = $this->session->userdata('category'); + $data['id_network'] = $this->session->userdata('network_id'); // $data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code')); $this->load->view('header_sup', $data); diff --git a/application/controllers/pagination/WalletIlinkTransaction.php b/application/controllers/pagination/WalletIlinkTransaction.php index e464d820..fa4637df 100755 --- a/application/controllers/pagination/WalletIlinkTransaction.php +++ b/application/controllers/pagination/WalletIlinkTransaction.php @@ -79,7 +79,7 @@ class WalletIlinkTransaction extends CI_Controller $data[] = array($row->id_transaction, $operation, $numero_carte, $moneyNetInit->formatTo('fr_FR'), $moneyNetFinal->formatTo('fr_FR'), Money::of(round($row->part_reseau_payeur_final_country ? $row->part_reseau_payeur_final_country : 0, 2), $row->final_currency ? $row->final_currency : 'XAF', $this->context)->formatTo('fr_FR'), - str_replace('_', ' ', $row->status_reseau_payeur), $row->final_currency, $row->pays_init,$row->pays_final, Money::of(round($row->frais,2), $row->init_currency,$this->context)->formatTo('fr_FR'), + $this->lang->line($row->status_reseau_payeur), $row->final_currency, $row->pays_init,$row->pays_final, Money::of(round($row->frais,2), $row->init_currency,$this->context)->formatTo('fr_FR'), Money::of(round($row->taxe, 2),$row->init_currency,$this->context)->formatTo('fr_FR'),Money::of(round($row->commission_banque ? $row->commission_banque : 0, 2),$row->init_currency,$this->context)->formatTo('fr_FR'), Money::of(round($row->commission_hyp ? $row->commission_hyp : 0, 2),$row->init_currency,$this->context)->formatTo('fr_FR'),Money::of(round($row->commission_sup ? $row->commission_sup : 0 , 2),$row->init_currency,$this->context)->formatTo('fr_FR'), Money::of(round($row->commission_ag ? $row->commission_ag : 0, 2),$row->init_currency,$this->context)->formatTo('fr_FR'), $agent , $emetteur, $destinataire, $created); diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index 609bb7ee..82be1cf6 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -55,8 +55,8 @@ $lang['Délai de traitement'] = 'Processing time'; $lang['Emetteur'] = 'Transmitter'; $lang['Montant'] = 'Amount'; $lang['Sortantes'] = 'outcoming'; -$lang['traitée'] = 'treated'; -$lang['Non traitée'] = 'not treated'; +$lang['traitée'] = 'Treated'; +$lang['Non traitée'] = 'Not treated'; $lang['les plus rapidement traitées'] = 'processed the fastest'; $lang['les plus tardivement traitées'] = 'the most recently processed'; $lang['demandes de credit entrantes'] = 'incoming loan requests'; @@ -555,4 +555,22 @@ $lang['operator_type'] = "Operator type"; $lang['no_type'] = "No type"; $lang['accepted_demands'] = "Requests accepted"; $lang['canceled_demands'] = "Canceled requests"; +$lang['phone_number'] = $lang['Telephone'] = "Phone number"; +$lang['since'] = "Since"; +$lang['seconds'] = "seconds"; +$lang['days'] = "days"; +$lang['hours'] = "hours"; +$lang['minutes'] = "minutes"; +$lang['EN_COURS'] = "IN PROGRESS"; +$lang['CASSE'] = "BROKEN"; +$lang['EN_ATTENTE_DE_VALIDATION'] = "PENDING FOR VALIDATION"; +$lang['REMBOURSE'] = "REFUND"; +$lang['NON_VALIDE'] = "INVALID"; +$lang['VALIDE'] = "VALID"; +$lang['SIMPLE'] = "SIMPLE"; +$lang['BLOQUE'] = "BLOCKED"; +$lang['NON_TRAITEE'] = "NON_TRAITEE"; +$lang['TRAITEE'] = "TREATED"; +$lang['individuel'] = "INDIVIDUAL"; +$lang['groupe'] = "GROUP"; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 688a7254..4c67182c 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -13,8 +13,8 @@ $lang['Utilisateurs géolocalisés'] = 'Utilisateurs géolocalisés'; $lang["Plus d'informations"] = "Plus d'informations"; $lang['Demandes de crédits'] = 'Demandes de crédits'; - $lang['traitée'] = 'traitée'; - $lang['Non traitée'] = 'non traitée'; + $lang['traitée'] = 'Traitée'; + $lang['Non traitée'] = 'Non traitée'; $lang['Demandes traitées'] = 'Demandes traitées'; $lang['Demandes non traitées'] = 'Demandes non traitées'; $lang['demandes'] = 'Demandes'; @@ -567,4 +567,22 @@ $lang['operator_type'] = "Type d'opérateur"; $lang['no_type'] = "Aucun type"; $lang['accepted_demands'] = "Demandes acceptées"; $lang['canceled_demands'] = "Demandes annulées"; +$lang['phone_number'] = "Numéro de téléphone"; +$lang['since'] = "Depuis"; +$lang['seconds'] = "secondes"; +$lang['days'] = "jours"; +$lang['hours'] = "heures"; +$lang['minutes'] = "minutes"; +$lang['EN_COURS'] = "EN COURS"; +$lang['CASSE'] = "CASSÉE"; +$lang['EN_ATTENTE_DE_VALIDATION'] = "EN ATTENTE DE VALIDATION"; +$lang['REMBOURSE'] = "REMBOURSE"; +$lang['NON_VALIDE'] = "NON VALIDE"; +$lang['VALIDE'] = "VALIDE"; +$lang['SIMPLE'] = "SIMPLE"; +$lang['BLOQUE'] = "BLOQUÉE"; +$lang['NON_TRAITEE'] = "NON_TRAITÉE"; +$lang['TRAITEE'] = "TRAITÉE"; +$lang['individuel'] = "INDIVIDUEL"; +$lang['groupe'] = "GROUPE"; ?> diff --git a/application/views/demande_adhesion.php b/application/views/demande_adhesion.php index d27829c8..bb8fcde7 100755 --- a/application/views/demande_adhesion.php +++ b/application/views/demande_adhesion.php @@ -28,7 +28,7 @@ } - function dateDiff($date1, $date2){ + function dateDiff($date1, $date2,$class = null){ $diff = abs($date1 - $date2); // abs pour avoir la valeur absolute, ainsi éviter d'avoir une différence négative $retour = array(); @@ -44,15 +44,16 @@ $tmp = floor( ($tmp - $heure) /24 ); $jour = $tmp; - return 'Depuis '.$jour.' jours '.$heure.' heures '.$minute.' minutes '.$second.' secondes'; + return $class->lang->line('since').' ' . $jour . ' '.$class->lang->line('days').' ' . $heure . ' '.$class->lang->line('hours').' ' . $minute . ' '.$class->lang->line('minutes').' ' . $second . ' '.$class->lang->line('seconds'); + } - function traitementTemps($time,$dateAjout){ + function traitementTemps($time,$dateAjout , $class = null){ if($time==null){ $now = time(); $date2 = strtotime($dateAjout); - return dateDiff($now, $date2); + return dateDiff($now, $date2, $class); } else{ return duree($time); @@ -165,7 +166,7 @@ ".$row->date_creation." ".$row->date_modified." $etat - ".traitementTemps($row->temps,$row->date_creation)." + ".traitementTemps($row->temps,$row->date_creation,$this)." "; diff --git a/application/views/demande_credit.php b/application/views/demande_credit.php index f94c1e97..bc5e7c85 100755 --- a/application/views/demande_credit.php +++ b/application/views/demande_credit.php @@ -33,7 +33,7 @@ } - function dateDiff($date1, $date2) + function dateDiff($date1, $date2,$class = null) { $diff = abs($date1 - $date2); // abs pour avoir la valeur absolute, ainsi éviter d'avoir une différence négative $retour = array(); @@ -50,16 +50,16 @@ $tmp = floor(($tmp - $heure) / 24); $jour = $tmp; - return 'Depuis ' . $jour . ' jours ' . $heure . ' heures ' . $minute . ' minutes ' . $second . ' secondes'; + return $class->lang->line('since').' ' . $jour . ' '.$class->lang->line('days').' ' . $heure . ' '.$class->lang->line('hours').' ' . $minute . ' '.$class->lang->line('minutes').' ' . $second . ' '.$class->lang->line('seconds'); } - function traitementTemps($time, $dateAjout) + function traitementTemps($time, $dateAjout , $class = null) { if ($time == null) { $now = time(); $date2 = strtotime($dateAjout); - return dateDiff($now, $date2); + return dateDiff($now, $date2,$class); } else { return duree($time); } @@ -261,7 +261,7 @@ " . $row->dateAjout . " " . $row->dateModif . " $etat - " . traitementTemps($row->temps, $row->dateAjout) . " + " . traitementTemps($row->temps, $row->dateAjout,$this) . " " . getDelayOfTreatmentInSeconds($row->temps, $row->dateAjout)/60 . " "; @@ -351,7 +351,7 @@ " . $row->dateAjout . " " . $row->dateModif . " $etat - " . traitementTemps($row->temps, $row->dateAjout) . " + " . traitementTemps($row->temps, $row->dateAjout,$this) . " " . getDelayOfTreatmentInSeconds($row->temps, $row->dateAjout)/60 . " "; @@ -777,7 +777,7 @@ " . $row->dateAjout . " " . $row->dateModif . " $etat - " . traitementTemps($row->temps, $row->dateAjout) . " + " . traitementTemps($row->temps, $row->dateAjout,$this) . " " . getDelayOfTreatmentInSeconds($row->temps, $row->dateAjout)/60 . " "; diff --git a/application/views/gestion_recherche.php b/application/views/gestion_recherche.php index 93c2d2e2..cfa18abf 100755 --- a/application/views/gestion_recherche.php +++ b/application/views/gestion_recherche.php @@ -116,7 +116,7 @@
- +
@@ -128,7 +128,7 @@
- +
@@ -140,7 +140,7 @@
- +
@@ -152,7 +152,7 @@
- +
diff --git a/application/views/header_hyp.php b/application/views/header_hyp.php index 9666187e..d2db688c 100755 --- a/application/views/header_hyp.php +++ b/application/views/header_hyp.php @@ -179,16 +179,16 @@ lang->line('menu_wallet_password'); ?> - first_row()->type == 'ilink') { ?> -
  • "> - - - lang->line('calculator'); ?> - -
    • - +first_row()->type == 'ilink') { ?> + + + +lang->line('calculator'); ?> + + + diff --git a/application/views/nano_credit/historique_nano_credit.php b/application/views/nano_credit/historique_nano_credit.php index 3b4427e6..1d5b59e1 100755 --- a/application/views/nano_credit/historique_nano_credit.php +++ b/application/views/nano_credit/historique_nano_credit.php @@ -143,13 +143,13 @@ } $moneyNet = Money::of(round($row->montant, 2), $currency_code, $context); if ($row->type_caution == 'individuel') - $retrait = $row->retrait_cash ? 'OUI' : 'NON'; + $retrait = $this->lang->line($row->retrait_cash ? 'Oui' : 'Non'); else $retrait = ""; echo " $row->id_demande - " . str_replace('_',' ',$row->etat) . " - " . strtoupper($row->type_caution) . " + " . $this->lang->line($row->etat) . " + " . $this->lang->line($row->type_caution) . " " . strtoupper($row->duree_mois) . " " . Money::of(round($row->montant_rembourse, 2), $currency_code, $context)->formatTo('fr_FR') . " " . $moneyNet->formatTo('fr_FR') . " diff --git a/application/views/nano_credit/historique_savings.php b/application/views/nano_credit/historique_savings.php index f45e2673..a2658706 100644 --- a/application/views/nano_credit/historique_savings.php +++ b/application/views/nano_credit/historique_savings.php @@ -140,7 +140,7 @@ $moneyNet = Money::of(round($row->montant, 2), $currency_code, $context); echo " $row->id_epargne - " . str_replace('_',' ',$row->etat) . " + " . $this->lang->line($row->etat) . " " . strtoupper($row->duree_mois) . " " . $moneyNet->formatTo('fr_FR') . " " . Money::of(round($row->interet, 2), $currency_code, $context)->formatTo('fr_FR') . "