Changeset 15064 for main

Timestamp:

27 Jun 2018, 07:18:05 (6 years ago)

Author:

Henrik Bettermann

Message:

Part-time students do not pay logbbok fee.

File:

• main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py (modified) (2 diffs)

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

@@ -88 +88 @@
 
     def _requiredPaymentsMade(self, student, session):
+        req_payments = ('ict_entre', 'logbook_combo', 'siwess_combo')
+        req_payments_titles = 'ICT, Logbook and SIWESS'
         if len(student['payments']):
+            if student.current_mode.endswith('_pt'):
+                req_payments = ('ict_entre', 'siwess_combo')
+                req_payments_titles = 'ICT and SIWESS'
             num = 0
             for ticket in student['payments'].values():
                 if ticket.p_state == 'paid' and \
-                    ticket.p_category in (
-                        'ict_entre', 'logbook_combo', 'siwess_combo') and \
+                    ticket.p_category in req_payments and \
                     ticket.p_session == session:
                     num += 1
-            if num == 3:
-                return True
-        return False
+            if num == len(req_payments):
+                return True, None
+        return False, req_payments_titles
 
     def setPaymentDetails(self, category, student,
@@ -135 +139 @@
             p_session, p_level = self.getReturningData(student)
         if category == 'schoolfee':
-            if not self._requiredPaymentsMade(student, p_session):
-                return _('Pay SIWES, Logbook and ICT fees first.'), None
+            rpm, rpt = self._requiredPaymentsMade(student, p_session)
+            if not rpm:
+                return 'Pay %s fees first.' % rpt, None
             try:
                 certificate = student['studycourse'].certificate