Changeset 14396 for main/waeup.aaue/trunk/src/waeup/aaue

Timestamp:

13 Jan 2017, 18:58:20 (8 years ago)

Author:

Henrik Bettermann

Message:

Determine schoolfee_2 properly.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py (modified) (3 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

@@ -269 +269 @@
                     return _("You are not allowed "
                              "to pay by instalments."), None
-            if student.state == CLEARED:
+            if student.state == CLEARED and category != 'schoolfee_2':
                 amount = getattr(certificate, 'school_fee_1', 0.0)
                 # Cut school fee by 50%
@@ -279 +279 @@
                 if amount:
                     amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
-            elif student.state == RETURNING:
+            elif student.state == RETURNING and category != 'schoolfee_2':
                 if not student.father_name:
                     return _("Personal data form is not properly filled."), None
@@ -294 +294 @@
                     amount = getattr(certificate, 'school_fee_2', 0.0)
                     # Cut school fee by 50%
-                    if category in ('schoolfee_1', 'schoolfee_2') and amount:
+                    if category == 'schoolfee_1' and amount:
                         amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
                 else: