From ce3d1c25f2074107102ae660337a9bc368849ccc Mon Sep 17 00:00:00 2001
From: Antony Le Courtes <antony.lecourtes@unicaen.fr>
Date: Thu, 12 Nov 2020 12:46:08 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20getEmailPro()=20=C3=A0=20la=20plac?=
=?UTF-8?q?e=20de=20getEmail()=20suite=20V15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/Application/Controller/ContratController.php | 4 ++--
.../src/Application/Service/ModeleContratService.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/module/Application/src/Application/Controller/ContratController.php b/module/Application/src/Application/Controller/ContratController.php
index 018ca88e5e..9f88d97a38 100755
--- a/module/Application/src/Application/Controller/ContratController.php
+++ b/module/Application/src/Application/Controller/ContratController.php
@@ -113,7 +113,7 @@ class ContratController extends AbstractController
//Récupération email intervenant (Perso puis unicaen)
$dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);
$emailPerso = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';
- $emailIntervenant = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmail();
+ $emailIntervenant = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmailPro();
/* Récupération des services par contrat et par structure (pour les non contractualisés) */
$services = [
@@ -355,7 +355,7 @@ class ContratController extends AbstractController
$intervenant = $contrat->getIntervenant();
$dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);
$emailDossierPerso = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';
- $emailIntervenant = (!empty($emailDossierPerso)) ? $emailDossierPerso : $intervenant->getEmail();
+ $emailIntervenant = (!empty($emailDossierPerso)) ? $emailDossierPerso : $intervenant->getEmailPro();
if (!empty($emailIntervenant)) {
try {
//Utilisation ici du parametre email
diff --git a/module/Application/src/Application/Service/ModeleContratService.php b/module/Application/src/Application/Service/ModeleContratService.php
index 59a38e5e59..af74b94a33 100755
--- a/module/Application/src/Application/Service/ModeleContratService.php
+++ b/module/Application/src/Application/Service/ModeleContratService.php
@@ -128,7 +128,7 @@ class ModeleContratService extends AbstractEntityService
$intervenant = $contrat->getIntervenant();
$dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);
$emailPerso = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';
- $emailIntervenant = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmail();
+ $emailIntervenant = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmailPro();
if (empty($emailIntervenant)) {
throw new \Exception("Aucun email disponible / Envoi du contrat impossible");
}
--
GitLab