Added support for Annuelle

diff --git a/app/settings.py b/app/settings.py
index b37cf04588c18d1521134d9f5e0660911e3903af..84f3e14f00bf78b3ab3628e712de09236cd880c1 100644 (file)
--- 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 4f406d437881333b5fa7ee9cf51e99bacff50f39..d1d6f549481aeb6cb04195bf60127b4e6fd73b20 100755 (executable)
--- 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),)