Changeset 16627 for main/kofacustom.iuokada/trunk

Timestamp:

20 Sep 2021, 07:02:50 (3 years ago)

Author:

Henrik Bettermann

Message:

Acceptance must not be added to school fee.

File:

• main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser.py (modified) (2 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser.py

@@ -269 +269 @@
         cs = self.context.student.current_session
         SF_PAYMENTS = ('schoolfee', 'schoolfee40', 'secondinstal', 'clearance')
-        sf_paid = {cs-1: 0, cs: 0, cs+1: 0}
+        if cs > self.context.student.entry_session:
+            sf_paid = {cs-1: 0, cs: 0, cs+1: 0}
+            sessions = (cs-1, cs, cs+1)
+        else:
+            sf_paid = {cs: 0, cs+1: 0}
+            sessions = (cs, cs+1)
         try:
             certificate = self.context.student['studycourse'].certificate
         except (AttributeError, TypeError):
-            return sf_paid, 0
-        try:
-            academic_session = grok.getSite()['configuration'][str(cs)]
-        except KeyError:
             return sf_paid, 0
         if self.context.student in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
@@ -282 +283 @@
         else:
             total_sf = getattr(certificate, 'school_fee_2', 0.0)
-        cfee = academic_session.clearance_fee
-        if self.context.student.is_postgrad:
-            cfee *= 0.5
-        total_sf += cfee
         for ticket in self.context.student['payments'].values():
             if ticket.p_category in SF_PAYMENTS and \
                 ticket.p_state == 'paid' and \
-                ticket.p_session in (cs-1, cs, cs+1):
+                ticket.p_session in sessions:
                 sf_paid[ticket.p_session] += ticket.amount_auth
         return sf_paid, total_sf