From: Gael Le Mignot Date: Mon, 18 Oct 2021 09:23:49 +0000 (+0200) Subject: Added support for Annuelle X-Git-Tag: 2.5.0~49 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c7d38e156ef9997414461476d13f5bac96ffbd6a;p=teleforma.git Added support for Annuelle --- diff --git a/app/settings.py b/app/settings.py index b37cf045..84f3e14f 100644 --- a/app/settings.py +++ b/app/settings.py @@ -464,6 +464,8 @@ JAZZMIN_UI_TWEAKS = { PAYMENT_SHERLOCKS_PATH='/srv/sherlocks' PAYMENT_PARAMETERS = { 'merchant_id' : { 'Semestrielle': "014295303911111", + 'Annuelle': "014295303911111", + 'Pré-annuelle': "014295303911111", 'Estivale': "014295303911111", 'Pré-estivale': "014295303911111", }, 'merchant_country': 'fr', diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py index 4f406d43..d1d6f549 100755 --- a/teleforma/models/crfpa.py +++ b/teleforma/models/crfpa.py @@ -323,7 +323,7 @@ class Student(models.Model): payments = None # Full or partial ? if self.payment_schedule == 'split': - if period.name == 'Semestrielle': + if period.name in ('Semestrielle', 'Annuelle'): part = int(total * 0.25) remaining = total - 3 * part payments = ((remaining, tomorrow),)