Skip to content
Snippets Groups Projects
Commit 41df7a8d authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Règle de gestion pour l'envoi du contrat par email : prendre l'email perso du...

Règle de gestion pour l'envoi du contrat par email : prendre l'email perso du dossier intervenant avant l'email de l'intervenant lui même (souvent en unicaen).
parent 8ea6021c
No related branches found
No related tags found
No related merge requests found
......@@ -109,6 +109,11 @@ class ContratController extends AbstractController
}
$contrats = $sContrat->getList($qb);
//Récupération email intervenant (Perso puis unicaen)
$dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);
$emailPerso = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';
$emailIntervenant = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmail();
/* Récupération des services par contrat et par structure (pour les non contractualisés) */
$services = [
'contractualises' => [],
......@@ -128,7 +133,7 @@ class ContratController extends AbstractController
$services['non-contractualises'][$sid][] = $service;
}
return compact('title', 'intervenant', 'contrats', 'services');
return compact('title', 'intervenant', 'contrats', 'services', 'emailIntervenant');
}
......
......@@ -4,6 +4,7 @@ namespace Application\Service;
use Application\Entity\Db\Contrat;
use Application\Entity\Db\ModeleContrat;
use Application\Service\Traits\DossierServiceAwareTrait;
use Unicaen\OpenDocument\Document;
use Zend\Mail\Message as MailMessage;
use Zend\Mime\Message;
......@@ -23,6 +24,8 @@ use Zend\Mime\Part;
class ModeleContratService extends AbstractEntityService
{
use DossierServiceAwareTrait;
/**
* @var array
*/
......@@ -117,7 +120,10 @@ class ModeleContratService extends AbstractEntityService
$content = $document->saveToData();
$subject = "Contrat " . $contrat->getIntervenant()->getCivilite() . " " . $contrat->getIntervenant()->getNomUsuel();
$emailIntervenant = $contrat->getIntervenant()->getEmail();
$intervenant = $contrat->getIntervenant();
$dossierIntervenant = $this->getServiceDossier()->getByIntervenant($intervenant);
$emailPerso = ($dossierIntervenant) ? $dossierIntervenant->getEmailPerso() : '';
$emailIntervenant = (!empty($emailPerso)) ? $emailPerso : $intervenant->getEmail();
$body = new Message();
......
......@@ -96,7 +96,7 @@ if ($services['non-contractualises']) {
<h2>Contrats et avenants</h2>
<?php foreach ($contrats as $contrat): ?>
<?= $this->partial('application/contrat/partial/contrat', ['contrat' => $contrat, 'services' => $services['contractualises'][$contrat->getId()]]) ?>
<?= $this->partial('application/contrat/partial/contrat', ['contrat' => $contrat, 'services' => $services['contractualises'][$contrat->getId()], 'emailIntervenant' => $emailIntervenant]) ?>
<?php endforeach; ?>
</div>
......
......@@ -46,7 +46,7 @@ $urlSuppression = $this->isAllowed($contrat, Privileges::CONTRAT_SUPPRESSION)
? $this->url('contrat/supprimer', ['contrat' => $contrat->getId()])
: null;
$disableEmail = (empty($contrat->getIntervenant()->getEmail()))?true:false;
$disableEmail = (empty($emailIntervenant))?true:false;
if ($urlAjouter) {
$uploader->setUrl($urlAjouter);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment