diff --git a/module/Application/src/Application/Form/Paiement/MiseEnPaiementForm.php b/module/Application/src/Application/Form/Paiement/MiseEnPaiementForm.php index 2bfc3a286d35bff1d82dae26f62f6caab3a9aced..b9a21862600d66948e5d112cd7ab838c278dd3ba 100755 --- a/module/Application/src/Application/Form/Paiement/MiseEnPaiementForm.php +++ b/module/Application/src/Application/Form/Paiement/MiseEnPaiementForm.php @@ -18,7 +18,6 @@ class MiseEnPaiementForm extends AbstractForm use PeriodeServiceAwareTrait; - /** * */ @@ -32,11 +31,11 @@ class MiseEnPaiementForm extends AbstractForm $datesMiseEnPaiement[$periode->getId()] = $periode->getDatePaiement($annee)->format('d/m/Y'); } - + $paiementTardif = $this->getServicePeriode()->getPaiementTardif(); $this->setAttribute('method', 'post') ->setAttribute('class', 'paiement-mise-en-paiement-form') ->setAttribute('data-dates-mise-en-paiement', json_encode($datesMiseEnPaiement)) - ->setAttribute('data-periode-paiement-tardif-id', $this->getServicePeriode()->getPaiementTardif()->getId()); + ->setAttribute('data-periode-paiement-tardif-id', ($paiementTardif ? $paiementTardif->getId() : null)); $defaultPeriode = $this->getServicePeriode()->getPeriodePaiement(); diff --git a/module/Application/src/Application/Service/PeriodeService.php b/module/Application/src/Application/Service/PeriodeService.php index e3a850e7b2dbcd9a003a3c1ae29b852a144e11e7..f99bd23cff89f99a21e212a01712bb80a3952679 100755 --- a/module/Application/src/Application/Service/PeriodeService.php +++ b/module/Application/src/Application/Service/PeriodeService.php @@ -110,7 +110,7 @@ class PeriodeService extends AbstractEntityService */ public function finderByEnseignement(QueryBuilder $qb = null, $alias = null) { - list($qb, $alias) = $this->initQuery($qb, $alias); + [$qb, $alias] = $this->initQuery($qb, $alias); $qb->andWhere("$alias.enseignement = 1"); return $qb; @@ -122,7 +122,7 @@ class PeriodeService extends AbstractEntityService { $serviceMIS = $this->getServiceMiseEnPaiementIntervenantStructure(); - list($qb, $alias) = $this->initQuery($qb, $alias); + [$qb, $alias] = $this->initQuery($qb, $alias); $this->join($serviceMIS, $qb, 'miseEnPaiementIntervenantStructure', false, $alias); $serviceMIS->join($this->getServiceMiseEnPaiement(), $qb, 'miseEnPaiement'); @@ -146,7 +146,7 @@ class PeriodeService extends AbstractEntityService */ public function orderBy(QueryBuilder $qb = null, $alias = null) { - list($qb, $alias) = $this->initQuery($qb, $alias); + [$qb, $alias] = $this->initQuery($qb, $alias); $qb->orderBy("$alias.ordre"); @@ -198,9 +198,9 @@ class PeriodeService extends AbstractEntityService /** * Retourne le paiement tardif * - * @return Periode + * @return Periode|null */ - public function getPaiementTardif() + public function getPaiementTardif(): ?Periode { return $this->getRepo()->findOneBy(['code' => Periode::PAIEMENT_TARDIF]); }