From a6aff403640baeae8c27ceaf46a388ba710c9d9f Mon Sep 17 00:00:00 2001
From: Djery-Tom <dietchidjery@gmail.com>
Date: Wed, 2 Dec 2020 18:22:18 +0100
Subject: [PATCH] + Update of the borrowing capacity calculation method

---
 application/controllers/Gestion.php                  |  3 ++-
 application/controllers/Hyperviseur_dash.php         |  3 ++-
 application/language/english/message_lang.php        |  3 ++-
 application/language/french/message_lang.php         |  3 ++-
 application/models/Nano_credit_model.php             | 12 +++++++++++-
 application/views/nano_credit/users_group_detail.php |  2 +-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Gestion.php b/application/controllers/Gestion.php
index 27f7f496..720c3b06 100755
--- a/application/controllers/Gestion.php
+++ b/application/controllers/Gestion.php
@@ -2171,7 +2171,8 @@ class Gestion extends CI_Controller
 			$sommeCredits = 0;
 			$sommeEpargnes = 0;
 			foreach ($data['members']->result() as $user){
-				$sommeCredits += $user->balance_credit;
+				$sum_credit = $this->nano_credit_model->sumGroupCredit($user->id_user) ? $this->nano_credit_model->sumGroupCredit($user->id_user)->credit : 0;
+				$sommeCredits += $sum_credit;
 				$sommeEpargnes += $user->balance_epargne;
 			}
 			$CE = $sommeEpargnes - $sommeCredits;
diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php
index be576a2b..70ba4a09 100755
--- a/application/controllers/Hyperviseur_dash.php
+++ b/application/controllers/Hyperviseur_dash.php
@@ -1406,7 +1406,8 @@ class Hyperviseur_dash extends CI_Controller
 			$sommeCredits = 0;
 			$sommeEpargnes = 0;
 			foreach ($data['members']->result() as $user){
-				$sommeCredits += $user->balance_credit;
+				$sum_credit = $this->nano_credit_model->sumGroupCredit($user->id_user) ? $this->nano_credit_model->sumGroupCredit($user->id_user)->credit : 0;
+				$sommeCredits += $sum_credit;
 				$sommeEpargnes += $user->balance_epargne;
 			}
 			$CE = $sommeEpargnes - $sommeCredits;
diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php
index b37db677..d19bfdf1 100755
--- a/application/language/english/message_lang.php
+++ b/application/language/english/message_lang.php
@@ -588,5 +588,6 @@ $lang['description_fr'] = "French description";
 $lang['operator_type_code_exists'] = "This operator type code already exists";
 $lang['unexpected_error'] = "An unexpected error has occurred";
 $lang['operators_enabled_disabled'] = "Operator(s) enabled / disabled";
-$lang['backoffice_management'] = "Backoffice management"
+$lang['backoffice_management'] = "Backoffice management";
+$lang['number_of_members'] = "Number of members";
 ?>
diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php
index bdf2095e..6ef244d3 100755
--- a/application/language/french/message_lang.php
+++ b/application/language/french/message_lang.php
@@ -600,5 +600,6 @@ $lang['description_fr'] = "Description francaise";
 $lang['operator_type_code_exists'] = "Ce code de type d'opérateur existe déjà";
 $lang['unexpected_error'] = "Une erreur innatendue s'est produite";
 $lang['operators_enabled_disabled'] = "Opérateur(s) activée(s)/désactivée(s)";
-$lang['backoffice_management'] = "Gestion du backoffice"
+$lang['backoffice_management'] = "Gestion du backoffice";
+$lang['number_of_members'] = "Nombre de membres";
 ?>
diff --git a/application/models/Nano_credit_model.php b/application/models/Nano_credit_model.php
index f14eb10b..1d09a196 100644
--- a/application/models/Nano_credit_model.php
+++ b/application/models/Nano_credit_model.php
@@ -117,7 +117,7 @@ class Nano_Credit_model extends CI_Model
 									WHEN u.id = id_sponsor1 or u.id = id_sponsor2 or u.id = id_sponsor3  THEN 'sponsor'
 									ELSE 'member'
 								   END as role,
-								    u.* ,  wu.balance , ug.* FROM users u inner JOIN users_groups ug on u.group_id = ug.id INNER JOIN wallets_users wu ON wu.idUser = u.id where ug.code_groupe = '" . $group_code . "'");
+								    u.* ,  wu.balance , ug.* , u.id as id_user FROM users u inner JOIN users_groups ug on u.group_id = ug.id INNER JOIN wallets_users wu ON wu.idUser = u.id where ug.code_groupe = '" . $group_code . "'");
 		if ($query->num_rows() > 0) {
 			return $query;
 		} else {
@@ -133,4 +133,14 @@ class Nano_Credit_model extends CI_Model
 			return false;
 		}
 	}
+
+	// Somme des credits de groupes pour un utilisateur donné
+	public function sumGroupCredit($id_user){
+		$query = $this->db->query("SELECT (SUM(montant + montant_rembourse +interet + taxe)) AS credit FROM users_demandes_credits WHERE etat='VALIDE' AND type_caution='groupe' AND id_user = '" . $id_user . "'");
+		if ($query->num_rows() > 0) {
+			return $query->first_row();
+		} else {
+			return false;
+		}
+	}
 }
diff --git a/application/views/nano_credit/users_group_detail.php b/application/views/nano_credit/users_group_detail.php
index 77b8f124..0ac95aa8 100755
--- a/application/views/nano_credit/users_group_detail.php
+++ b/application/views/nano_credit/users_group_detail.php
@@ -78,7 +78,7 @@ $context = new \Brick\Money\Context\AutoContext();
 				<div class="small-box bg-blue-active">
 					<div class="inner">
 						<h3><?php echo $group->nombre_utilisateurs ?></h3>
-						<p><?php echo $this->lang->line('number_of_users') ?></p>
+						<p><?php echo $this->lang->line('number_of_members') ?></p>
 					</div>
 					<div class="icon">
 						<i class="fa fa-group"></i>