diff --git a/VERSIONS_HOTLINE/173813 b/VERSIONS_HOTLINE/173813 new file mode 100644 index 0000000000000000000000000000000000000000..6ef78d983c51030a2901d928e659afa1e447fb7d --- /dev/null +++ b/VERSIONS_HOTLINE/173813 @@ -0,0 +1 @@ + - correctif #173813 : Abonne : Le contenu du mail de confirmation peut afficher les horaires de l'activité. \ No newline at end of file diff --git a/library/Class/Activity/RegistrationMail.php b/library/Class/Activity/RegistrationMail.php index 9d35bdcfd2cf8f21c75bd24fe75440244052cb14..c64837cb67786f20e21aefdec2c80f07cdb3552e 100644 --- a/library/Class/Activity/RegistrationMail.php +++ b/library/Class/Activity/RegistrationMail.php @@ -109,4 +109,9 @@ class Class_Activity_RegistrationMail_SessionActivity { public function getContentOrActivityDescription() { return $this->_training_session->getContentOrActivityDescription(); } + + + public function getHoraires() : string { + return $this->_training_session->getHoraires(); + } } diff --git a/tests/scenarios/Activities/AbonneControllerActivitiesTest.php b/tests/scenarios/Activities/AbonneControllerActivitiesTest.php index a262a430f766594775f35987a9a9d84102c06bd5..d37f44c7e752e692d5016b622a3e532ad04449fb 100644 --- a/tests/scenarios/Activities/AbonneControllerActivitiesTest.php +++ b/tests/scenarios/Activities/AbonneControllerActivitiesTest.php @@ -994,7 +994,44 @@ class AbonneControllerActivitiesAmadouInscritSessionFebruaryJavaOpenTest -class AbonneControllerActivitiesAmadouWithoutMailInscritSessionFebruaryJavaOpenTest extends AbstractAbonneControllerActivitiesTestCase { +/* hotline : https://forge.afi-sa.net/issues/173813 */ +class AbonneControllerActivitiesWithHorairesInMailRegistrationTest + extends AbstractAbonneControllerActivitiesTestCase { + + protected $_mails; + + public function setUp() { + parent::setUp(); + + Class_SessionActivity::find(31)->setHoraires('10h00'); + $this->_session_java_fevrier + ->setIntervenants($this->_session_python_juillet + ->getIntervenants())->save(); + + Class_AdminVar::set('ACTIVITY_REGISTRATION_BODY', + 'inscription pour : {session.horaires}'); + + $this->dispatch('/opac/abonne/inscrire-session/id/31'); + + Class_SessionActivity::clearCache(); + Class_Article::clearCache(); + + $this->_mails = $this->_mail_transport->getSentMails(); + } + + + /** @test */ + public function firstMailBodyShouldContainsSessionHoraires() { + $this->assertEquals('inscription pour : 10h00', $this->_mails[0]->getBodyHtml(true)); + } +} + + + + +class AbonneControllerActivitiesAmadouWithoutMailInscritSessionFebruaryJavaOpenTest + extends AbstractAbonneControllerActivitiesTestCase { + protected $_mails;