Changeset 15072 for main

Timestamp:

1 Jul 2018, 09:18:26 (6 years ago)

Author:

Henrik Bettermann

Message:

Extend _requiredPaymentsMade.

Location:

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly

Files:

• interswitch/tests.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/interswitch/tests.py

@@ -62 +62 @@
         self.browser.getControl("Create ticket").click()
         self.assertTrue(
-            'Pay ICT, Logbook and SIWESS fees first.' in self.browser.contents)
+            'Pay ICT, Logbook and SIWESS fee(s) first.' in self.browser.contents)
 
         # Add required payments first.

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

@@ -91 +91 @@
         req_payments_titles = 'ICT, Logbook and SIWESS'
         if len(student['payments']):
+            # All ND and HND of part time do not pay LOGBOOK
             if student.current_mode.endswith('_pt'):
                 req_payments = ('ict_entre', 'siwess_combo')
                 req_payments_titles = 'ICT and SIWESS'
+            # HND2 full time do not pay for SIWES
+            elif student.current_mode == 'hnd_ft' and student.state == RETURNING:
+                req_payments = ('ict_entre', 'logbook_combo')
+                req_payments_titles = 'ICT and Logbook'
+            # HND1 full time do not pay both SIWES and LOGBOOK
+            elif student.current_mode == 'hnd_ft' and student.state == CLEARED:
+                req_payments = ('ict_entre',)
+                req_payments_titles = 'ICT'
+            # ND2 FULL TIME Do not pay LOGBOOK
+            elif student.current_mode == 'nd_ft' and student.state == RETURNING:
+                req_payments = ('ict_entre', 'siwess_combo')
+                req_payments_titles = 'ICT and SIWESS'
+            # ND1 full time do not pay SIWES
+            elif student.current_mode == 'nd_ft' and student.state == CLEARED:
+                req_payments = ('ict_entre', 'logbook_combo')
+                req_payments_titles = 'ICT and Logbook'
             num = 0
             for ticket in student['payments'].values():
@@ -141 +158 @@
             rpm, rpt = self._requiredPaymentsMade(student, p_session)
             if not rpm:
-                return 'Pay %s fees first.' % rpt, None
+                return 'Pay %s fee(s) first.' % rpt, None
             try:
                 certificate = student['studycourse'].certificate