Changeset 16493 for main/kofacustom.coewarri

Timestamp:

26 May 2021, 21:58:34 (3 years ago)

Author:

Henrik Bettermann

Message:

Change penalty fee conditions.

File:

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

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

@@ -90 +90 @@
         return False
 
-    def _lsfp_penalty_paymentMade(self, student, session):
+    def _lsfp_penalty_payment(self, student, p_session):
+        if p_session >= 2021:
+            return False
+        if p_session == 2020 and student.current_mode != 'nce_ft':
+            return False
         if student.current_mode not in ('ug_ft','de_ft', 'nce_ft', 'nce_pt'):
-            return True
+            return False
         if len(student['payments']):
             for ticket in student['payments'].values():
                 if ticket.p_state == 'paid' and \
                     ticket.p_category == 'lsfp_penalty' and \
-                    ticket.p_session == session:
-                    return True
-        return False
+                    ticket.p_session == student.current_session:
+                    return False
+        return True
 
     def setPaymentDetails(self, category, student,
@@ -143 +147 @@
                     return _(u'Session configuration object '
                               'is not available.'), None
-            penalty = getattr(academic_session, 'lsfp_penalty_fee')
-            if p_session < 2020 and penalty and \
-                not self._lsfp_penalty_paymentMade(
-                student, student.current_session):
+            penalty_set = getattr(academic_session, 'lsfp_penalty_fee')
+            if penalty_set and self._lsfp_penalty_payment(student, p_session):
                 return _('You have to pay late school fee payment penalty first.'), None
             if p_level in PAYMENT_LEVELS: