diff --git a/application/controllers/pagination/GeolocatedUsers.php b/application/controllers/pagination/GeolocatedUsers.php
index 5989b7d6..1e6d01e1 100755
--- a/application/controllers/pagination/GeolocatedUsers.php
+++ b/application/controllers/pagination/GeolocatedUsers.php
@@ -34,8 +34,8 @@ class GeolocatedUsers extends CI_Controller
$row->lastname,$row->adresse, $row->code_membre , $row->email, $row->phone , $row->provider_class ,$status);
if($_POST['category'] == 'geolocated'){
- if($row->has_qr_code)
- $data[] = "" . $this->lang->line('display') . "";
+ if($row->qr_code)
+ $data[] = "" . $this->lang->line('display') . "";
else
$data[] = "";
}
diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php
index 8af5af26..8b040056 100755
--- a/application/language/english/message_lang.php
+++ b/application/language/english/message_lang.php
@@ -853,4 +853,6 @@ $lang['total_insurance_part'] = "Total Insurance Share";
$lang['invoices_history'] = "Invoice history";
$lang['health_care_sheets_history'] = "History of health care sheets";
$lang['invoice_id'] = "Invoice ID";
+$lang['generate_qr_code'] = "Generate QR code";
+$lang['display_qr_code'] = "Display QR code";
?>
diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php
index 7d06da65..97d7f56d 100755
--- a/application/language/french/message_lang.php
+++ b/application/language/french/message_lang.php
@@ -864,4 +864,6 @@ $lang['total_insurance_part'] = "Total Part de assurance";
$lang['invoices_history'] = "Historique des factures";
$lang['health_care_sheets_history'] = "Historique des feuilles de soins";
$lang['invoice_id'] = "ID de la facture";
+$lang['generate_qr_code'] = "Génerer le QR code";
+$lang['display_qr_code'] = "Afficher le QR code"
?>
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 22a566c5..9f9e6ae3 100755
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -1724,7 +1724,7 @@ class User_model extends CI_Model
*/
public function get_user($where_clause){
$query = $this->db->query("SELECT agents.lastname, agents.adresse,agents.email,agents.date_created,agents.id AS userID,
- codeGenerer.category,
+ codeGenerer.category,agents.id, agents.qr_code,'agent' as type,
networks.name AS network_name,towns.name AS town_name,
codeGenerer.code_parrain AS parrain,codeGenerer.code_membre AS code,
networks_agents.id AS networkAgent_id,networks_agents.phone,networks_agents.transactionNumber AS transac
@@ -1735,7 +1735,7 @@ class User_model extends CI_Model
INNER JOIN towns ON towns.id=agents.town_id
".$where_clause);
$statement = "SELECT agents.lastname, agents.adresse,agents.email,agents.date_created,agents.id AS userID,
- codeGenerer.category,
+ codeGenerer.category,agents.id, agents.qr_code,'agent' as type,
networks.name AS network_name,towns.name AS town_name,
codeGenerer.code_parrain AS parrain,codeGenerer.code_membre AS code,
networks_agents.id AS networkAgent_id,networks_agents.phone,networks_agents.transactionNumber AS transac
@@ -1757,7 +1757,7 @@ class User_model extends CI_Model
*/
public function get_simple_user($phone, $name , $country = null){
$end_query = $country ? "AND countries.name = '".$country."'" : '';
- $query = $this->db->query("SELECT users.id AS id_user,users.active AS etat,users.lastname,users.phone,users.email,users.adresse,users.date_created,
+ $query = $this->db->query("SELECT users.id AS id_user,users.active AS etat,users.lastname,users.phone,users.email,users.adresse,users.date_created,users.id , users.qr_code, 'user' as type,
networks.name AS network,countries.name AS country,i.firstname as id_firstname , i.lastname as id_lastname , i.birth_date , i.gender, i.town as id_town , i.country as id_country,
i.identity_document , i.id_identity_document ,i.expiry_date_document , i.status, i.user_image , i.document_image_back , i.document_image_front
FROM users
diff --git a/application/views/gestion_recherche.php b/application/views/gestion_recherche.php
index 50fa0230..7af3314a 100755
--- a/application/views/gestion_recherche.php
+++ b/application/views/gestion_recherche.php
@@ -217,6 +217,15 @@
+ qr_code) { ?>
+
+ = $this->lang->line('display_qr_code')?>
+
+
+
+
lang->line('Voir plus...'); ?>
@@ -358,6 +367,16 @@
+ qr_code) { ?>
+
+ = $this->lang->line('display_qr_code')?>
+
+
+
+
+
lang->line('Voir plus...'); ?>
@@ -568,6 +587,16 @@
+ qr_code) { ?>
+
+ = $this->lang->line('display_qr_code')?>
+
+
+
+
+
lang->line('Voir plus...'); ?>
@@ -769,6 +798,7 @@
+
diff --git a/application/views/nano_health/hyper/listeadmin.php b/application/views/nano_health/hyper/listeadmin.php
index 8f46081f..388da006 100755
--- a/application/views/nano_health/hyper/listeadmin.php
+++ b/application/views/nano_health/hyper/listeadmin.php
@@ -422,8 +422,6 @@
data: {'user_id': id_agent , 'type' : 'agent'},
dataType: 'json',
success: function (data) {
- console.log('status',data.status)
- console.log('respon',data.response)
if(data.status === 200){
Swal.fire({
icon: 'success',