Changeset 15077 for main/kofacustom.coewarri/trunk/src/kofacustom/coewarri

Timestamp:

3 Jul 2018, 06:14:21 (6 years ago)

Author:

Henrik Bettermann

Message:

Enable previous session payments.

Location:

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students

Files:

• utils.py (modified) (1 diff)
• viewlets.py (modified) (1 diff)

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/utils.py

@@ -80 +80 @@
         p_item = u''
         amount = 0.0
-        p_session = student['studycourse'].current_session
-        p_level = student['studycourse'].current_level
-        p_current = True
+        if previous_session:
+            if previous_session < student['studycourse'].entry_session:
+                return _('The previous session must not fall below '
+                         'your entry session.'), None
+            if category == 'schoolfee':
+                # School fee is always paid for the following session
+                if previous_session > student['studycourse'].current_session:
+                    return _('This is not a previous session.'), None
+            else:
+                if previous_session > student['studycourse'].current_session - 1:
+                    return _('This is not a previous session.'), None
+            p_session = previous_session
+            p_level = previous_level
+            p_current = False
+        else:
+            p_session = student['studycourse'].current_session
+            p_level = student['studycourse'].current_level
+            p_current = True
         academic_session = self._getSessionConfiguration(p_session)
-        if previous_session:
-            return _('Previous session payment not yet implemented.'), None
         if academic_session == None:
             return _(u'Session configuration object is not available.'), None

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/viewlets.py

@@ -31 +31 @@
 from kofacustom.nigeria.interfaces import MessageFactory as _
 
-class AddPreviousPaymentActionButton(AddPreviousPaymentActionButton):
-
-    @property
-    def target_url(self):
-        return ''