diff --git a/Controleur/ControleurAjaxdetailreincorporation.php b/Controleur/ControleurAjaxdetailreincorporation.php
new file mode 100644
index 0000000..d9a27fe
--- /dev/null
+++ b/Controleur/ControleurAjaxdetailreincorporation.php
@@ -0,0 +1,36 @@
+avenant = new Police();
+ $this->beneficiaire_temp = new Beneficiaire_temp();
+ }
+
+ public function index()
+ {
+ $idPolice = $_SESSION['idPolice_C'];
+ $avenant = $this->avenant->getAvenantTemp($idPolice);
+ $beneficiaires_sel = $this->beneficiaire_temp->getListeBeneficiaire_temp_Reinc();
+
+ $this->genererVueAjax(array('beneficiaires_sel' => $beneficiaires_sel, 'avenant' => $avenant));
+ }
+
+ public function recapituler() {
+ $this->beneficiaire_temp->recapitulerreincorporation();
+ $this->executerAction("index");
+ }
+
+ public function appliquertauxristourne()
+ {
+ $tauxRistourne = $this->requete->getParametreFormulaire("tauxRistourne","numerique");
+ $this->beneficiaire_temp->appliquertauxristourne($tauxRistourne);
+ $this->executerAction("index");
+ }
+
+}
\ No newline at end of file
diff --git a/Controleur/ControleurAjaxselectionreincorporation.php b/Controleur/ControleurAjaxselectionreincorporation.php
new file mode 100644
index 0000000..825e448
--- /dev/null
+++ b/Controleur/ControleurAjaxselectionreincorporation.php
@@ -0,0 +1,32 @@
+beneficiaire_temp = new Beneficiaire_temp();
+ }
+
+ public function index()
+ {
+ $beneficiaires = $this->beneficiaire_temp->getListeBeneficiaire_temp_Reinc_Selection();
+
+ $this->genererVueAjax(array('beneficiaires' => $beneficiaires));
+ }
+
+ public function selectionner() {
+ $idBeneficiaire = $this->requete->getParametre("idBeneficiaire");
+ $choix = $this->requete->getParametreFormulaire("choix");
+
+ $this->beneficiaire_temp->selectionretrait($idBeneficiaire, $choix);
+ }
+
+ public function recapituler() {
+ $idBeneficiaire = $this->requete->getParametre("idBeneficiaire");
+ $choix = $this->requete->getParametreFormulaire("choix");
+
+ $this->beneficiaire_temp->recapitulerretrait($idBeneficiaire, $choix);
+ }
+}
\ No newline at end of file
diff --git a/Controleur/ControleurCreeravenant.php b/Controleur/ControleurCreeravenant.php
index ed93544..7c5c226 100644
--- a/Controleur/ControleurCreeravenant.php
+++ b/Controleur/ControleurCreeravenant.php
@@ -46,6 +46,12 @@ class ControleurCreeravenant extends Controleur {
{
$this->rediriger("Ficheretrait");
}
+ // 08/03/2023 => réincorporation ou annulation d'un retrait
+ else
+ if($codeTypeAvenant=="ANR")
+ {
+ $this->rediriger("Fichereincorporation");
+ }
else
if($codeTypeAvenant=="INC")
{
diff --git a/Controleur/ControleurFichereincorporation.php b/Controleur/ControleurFichereincorporation.php
new file mode 100644
index 0000000..c651c11
--- /dev/null
+++ b/Controleur/ControleurFichereincorporation.php
@@ -0,0 +1,39 @@
+menuvue = new Menuvueutilisateur();
+ $this->menuvue->getMenuVue("Fichereincorporation");
+
+ $this->avenant = new Police();
+ $this->beneficiaire_temp = new Beneficiaire_temp();
+ }
+ public function index() {
+ $idPolice = $_SESSION['idPolice_C'];
+ $dateAvenant = $_SESSION['dateAvenant_C'];
+
+ $this->avenant->initreincorporation($idPolice);
+
+ $emission = $this->avenant->getEmissionTemp($idPolice);
+ $avenant = $this->avenant->getAvenantTemp($idPolice);
+ $sppolice = $this->avenant->getRapportSpPolice($idPolice, $dateAvenant);
+
+ $beneficiaires_sel = $this->beneficiaire_temp->getListeBeneficiaire_temp_Reinc();
+
+ $this->genererVue(array('emission' => $emission, 'avenant' => $avenant, 'sppolice' => $sppolice, 'beneficiaires_sel' => $beneficiaires_sel));
+ }
+
+ public function enregistrerreincorporation()
+ {
+ $this->avenant->enregistrerreincorporation();
+
+ $this->rediriger("Fichepolice");
+ }
+}
\ No newline at end of file
diff --git a/Cron/Ebenegmail.php b/Cron/Ebenegmail.php
index e667906..84bf5c6 100644
--- a/Cron/Ebenegmail.php
+++ b/Cron/Ebenegmail.php
@@ -11,13 +11,15 @@ $mail->isSMTP();
// 0 = off (for production use)
// 1 = client messages
// 2 = client and server messages
+
$mail->SMTPDebug = 0;
+// $mail->SMTPDebug = 1;
+// $mail->SMTPDebug = 2;
// $mail->Debugoutput = 'html';
-$mail->Host = 'smtp.gmail.com';
-// $mail->Host = gethostbyname('smtp.gmail.com');
-// if your network does not support SMTP over IPv6
+// $mail->Host = 'smtp.gmail.com';
+$mail->Host = 'smtp.office365.com';
$mail->Port = 587;
@@ -26,15 +28,16 @@ $mail->SMTPSecure = 'tls';
$mail->SMTPAuth = true;
// $mail->Username = "intersanteebene@gmail.com";
-$mail->Username = "radiantinsuranceltd@gmail.com";
+// $mail->Username = "intersante@radiant.rw";
+$mail->Username = "bkwitonda@radiant.rw";
// $mail->Password = "Moritio1973";
// $mail->Password = "radiant@123?";
-
-$mail->Password = "ybad kjir ghck aokr";
+// $mail->Password = "ybad kjir ghck aokr";
+$mail->Password = "office@2650000";
// $mail->setFrom('intersanteebene@gmail.com', 'RADIANT INSURANCE COMPANY');
-$mail->setFrom('radiantinsuranceltd@gmail.com', 'RADIANT INSURANCE COMPANY');
+$mail->setFrom('intersante@radiant.rw', 'RADIANT INSURANCE COMPANY');
$mail->addReplyTo('verification@radiant.rw', 'RADIANT INSURANCE COMPANY');
// à activer en cas de besoin
diff --git a/Js/fonctions.js b/Js/fonctions.js
index 0281669..328b43e 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -6826,8 +6826,71 @@ function enregistrer_remplacement_adherent()
});
}
});
+}
+
+
+function pop_afficher_selection_reincorporation()
+{
+ var div_selection_assure = $('#div_selection_assure');
+ div_selection_assure.html('
' + 'Veuillez patienter... / Please wait...' + ' ');
+ $("#btn_pop").click();
+
+ $.ajax({
+ url: $("#racineWeb").val()+"Ajaxselectionreincorporation/",
+
+ type : 'post',
+ success: function(data) {
+ div_selection_assure.html(data);
+ },
+ complete: function() {
+ }
+ });
+}
+
+function enregistrer_reincorporation()
+{
+ var div_assure_a_retirer = $('#div_assure_a_retirer');
+ $.ajax({
+ url: $("#racineWeb").val()+"Ajaxdetailreincorporation/recapituler/",
+ type: 'POST',
+ success: function(data) {
+ div_assure_a_retirer.html(data);
+ },
+ error: function(data) {
+ },
+ complete: function() {
+ nbAliment=$("#nbAliment").val();
+
+ // alert("enregistrer_reincorporation => nbAliment => "+nbAliment);
+ // return;
+
+ if (nbAliment<"1")
+ {
+ v_msg="Veuillez sélectionner les personnes à retirer!";
+ v_msgEng="Please select the people to remove!";
+ alert_ebene(v_msg, v_msgEng);
+
+ return;
+ }
+
+ v_msg="Confirmez-vous la réincorporation des personnes sélectionnées de cette police?";
+ v_msgEng="Do you confirm the reinstatement of the selected individuals from this police force?";
+
+ if(confirm_ebene(v_msg, v_msgEng))
+ {
+ window.location.assign($("#racineWeb" ).val()+"Fichereincorporation/enregistrerreincorporation/");
+ }
+ }
+ });
+}
+
+function beneficiaire_a_reincorporer(p_choix, p_id_beneficiaire)
+{
+ donnees = 'idBeneficiaire='+p_id_beneficiaire;
+ donnees += '&choix='+p_choix;
+<<<<<<< HEAD
}
@@ -6837,4 +6900,35 @@ function modifier_beneficiaire(id)
{
window.location.assign($("#racineWeb" ).val()+"Modifierbeneficiaire/"+id+"/");
}
+=======
+ $.ajax({
+ url: $("#racineWeb").val()+"Ajaxselectionreincorporation/selectionner/",
+ type: 'POST',
+ data: donnees,
+ success: function(data) {
+ },
+ error: function(data) {
+ },
+ complete: function() {
+ }
+ });
+}
+
+function recapituler_reincorporer()
+{
+ var div_assure_a_retirer = $('#div_assure_a_retirer');
+ div_assure_a_retirer.html('
' + 'Veuillez patienter... / Please wait...' + ' ');
+
+ $.ajax({
+ url: $("#racineWeb").val()+"Ajaxdetailreincorporation/recapituler/",
+ type: 'POST',
+ success: function(data) {
+ div_assure_a_retirer.html(data);
+ },
+ error: function(data) {
+ },
+ complete: function() {
+ }
+ });
+>>>>>>> bed9a5d97d3a3cdba3bd774ed7fa29ac1f4c07ce
}
diff --git a/Modele/Beneficiaire_temp.php b/Modele/Beneficiaire_temp.php
index e5c1abe..8a3b2ab 100755
--- a/Modele/Beneficiaire_temp.php
+++ b/Modele/Beneficiaire_temp.php
@@ -96,4 +96,35 @@ class Beneficiaire_temp extends Modele {
return $ligne['fraisCarte'];
}
+ // 08/03/2026
+ public function getListeBeneficiaire_temp_Reinc()
+ {
+ $user = $_SESSION['login'];
+
+ $sql = 'call sp_afficher_beneficiaire_a_reincorporation(?);';
+
+ $beneficiaires = $this->executerRequete($sql, array($user));
+ return $beneficiaires->fetchAll(PDO::FETCH_ASSOC);
+ }
+
+ public function getListeBeneficiaire_temp_Reinc_Selection()
+ {
+ $user = $_SESSION['login'];
+
+ $sql = 'call sp_afficher_beneficiaire_reincorporation(?);';
+
+ $beneficiaires = $this->executerRequete($sql, array($user));
+ return $beneficiaires->fetchAll(PDO::FETCH_ASSOC);
+ }
+
+ public function recapitulerreincorporation()
+ {
+ $user = $_SESSION['login'];
+
+ $sql = 'call sp_recapituler_reincorporation(?);';
+
+ $this->executerRequete($sql, array($user));
+ }
+
+
}
\ No newline at end of file
diff --git a/Modele/Police.php b/Modele/Police.php
index e5e2f3d..4786bd8 100644
--- a/Modele/Police.php
+++ b/Modele/Police.php
@@ -873,5 +873,27 @@ class Police extends Modele {
return $liste->fetchAll(PDO::FETCH_ASSOC);
}
+
+ public function initreincorporation($idPolice)
+ {
+ $dateAvenant = $_SESSION['dateAvenant_C'];
+ $motifavenant = $_SESSION['motifavenant_C'];
+ $user = $_SESSION['login'];
+ $idSaisie = $_SESSION['idSaisie'];
+ $codeSociete = $_SESSION['codeSociete'];
+
+ $sql = 'call sp_init_reincorporation(?, ?, ?, ?, ?)';
+
+ $this->executerRequete($sql, array($codeSociete, $idPolice, $dateAvenant, $user, $motifavenant));
+ }
+
+ public function enregistrerreincorporation()
+ {
+ $user = $_SESSION['login'];
+ $idPolice = $_SESSION['idPolice_C'];
+
+ $sql = 'call sp_avenant_reincorporation_client(?, ?)';
+ $this->executerRequete($sql, array($idPolice, $user));
+ }
}
\ No newline at end of file
diff --git a/Vue/Ajaxdetailreincorporation/index.php b/Vue/Ajaxdetailreincorporation/index.php
new file mode 100644
index 0000000..538ad26
--- /dev/null
+++ b/Vue/Ajaxdetailreincorporation/index.php
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
diff --git a/Vue/Ajaxselectionreincorporation/index.php b/Vue/Ajaxselectionreincorporation/index.php
new file mode 100644
index 0000000..764e499
--- /dev/null
+++ b/Vue/Ajaxselectionreincorporation/index.php
@@ -0,0 +1,41 @@
+
\ No newline at end of file
diff --git a/Vue/Fichereincorporation/index.php b/Vue/Fichereincorporation/index.php
new file mode 100644
index 0000000..dfbd66d
--- /dev/null
+++ b/Vue/Fichereincorporation/index.php
@@ -0,0 +1,182 @@
+titre = "INTER-SANTE - Récap réincorporation";
+ $nbFactAntiDate = $this->nettoyer($avenant['nbFactAntiDate']);
+?>
+
+
+
+
+
+
+
+
+
+ | = _("Date Effet Police") ?> |
+ = _("Date Echéance Police") ?> |
+ = _("Durée Police") ?> |
+
+ = _("Date Effet Avenant") ?> |
+ = _("Date Echéance Avenant") ?> |
+ = _("Durée Avenant") ?> |
+
+
+
+
+
+
+
+ | = dateLang($this->nettoyer($emission['dateEffet'])) ?> |
+ = dateLang($this->nettoyer($emission['dateEcheance'])) ?> |
+ = $this->nettoyer($emission['dureePolice']) ?> |
+
+ = dateLang($this->nettoyer($avenant['dateEffet'])) ?> |
+ = dateLang($this->nettoyer($avenant['dateEcheance'])) ?> |
+ = $this->nettoyer($avenant['dureeAvenant']) ?> |
+
+
+
+
+
+
+
+
+ | = _("Primes Totales") ?> |
+ = _("Primes Acquises") ?> |
+ = _("Consommations") ?> |
+ = _("Rapport S/P") ?> |
+ TOTAL |
+
+
+
+
+
+ | = format_N($this->nettoyer($sppolice['primestat'])) ?> |
+
+ = format_N($this->nettoyer($sppolice['prime_acquise'])) ?> |
+
+ = format_N($this->nettoyer($sppolice['consommation'])) ?> |
+
+ = $this->nettoyer($sppolice['rapportsp']) ?> |
+
+ = $this->nettoyer($sppolice['tauxRistourne']) ?> |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index c01a1cf..fe34b61 100755
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -712,7 +712,7 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte'];
-
+