From 6fe8ce449db3b3092e25acb6a0774df0764816a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20L=C3=A9cluse?= <laurent.lecluse@unicaen.fr>
Date: Mon, 3 Jul 2023 10:48:47 +0200
Subject: [PATCH] =?UTF-8?q?Bug=20de=20r=C3=A9cup=20de=20mises=20en=20paiem?=
=?UTF-8?q?ent=20=C3=A0=200=20heures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/Entity/Db/FormuleResultatTypesHeuresTrait.php | 4 ++++
module/Paiement/src/Service/ServiceAPayerService.php | 8 +++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/module/Application/src/Entity/Db/FormuleResultatTypesHeuresTrait.php b/module/Application/src/Entity/Db/FormuleResultatTypesHeuresTrait.php
index c4f637a1a2..c7c75e5b8e 100755
--- a/module/Application/src/Entity/Db/FormuleResultatTypesHeuresTrait.php
+++ b/module/Application/src/Entity/Db/FormuleResultatTypesHeuresTrait.php
@@ -116,6 +116,8 @@ trait FormuleResultatTypesHeuresTrait
return $this->getHeuresServiceFc();
case TypeHeures::REFERENTIEL:
return $this->getHeuresServiceReferentiel();
+ case TypeHeures::MISSION:
+ return 0;
}
throw new \RuntimeException('Type d\'heures inconnu ou non pris en charge');
}
@@ -135,6 +137,8 @@ trait FormuleResultatTypesHeuresTrait
return $this->getHeuresComplFcMajorees();
case TypeHeures::REFERENTIEL:
return $this->getHeuresComplReferentiel();
+ case TypeHeures::MISSION:
+ return $this->getHeuresMission();
}
throw new \RuntimeException('Type d\'heures inconnu ou non pris en charge');
}
diff --git a/module/Paiement/src/Service/ServiceAPayerService.php b/module/Paiement/src/Service/ServiceAPayerService.php
index 8f06d9a227..3ffff1f1b5 100755
--- a/module/Paiement/src/Service/ServiceAPayerService.php
+++ b/module/Paiement/src/Service/ServiceAPayerService.php
@@ -45,9 +45,11 @@ class ServiceAPayerService extends AbstractService
$saps = [];
foreach( $meps as $mep ){
- $sap = $mep->getServiceAPayer();
- $sapId = get_class($sap).'@'.$sap->getId();
- $saps[$sapId] = $sap;
+ if ($mep->getHeuresAPayer() > 0 || $mep->getMiseEnPaiement()) {
+ $sap = $mep->getServiceAPayer();
+ $sapId = get_class($sap) . '@' . $sap->getId();
+ $saps[$sapId] = $sap;
+ }
}
return $saps;
--
GitLab