Changeset 15015 for main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py

Timestamp:

23 May 2018, 05:45:13 (6 years ago)

Author:

Henrik Bettermann

Message:

Further customize payment components.

File:

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

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

@@ -118 +118 @@
                 return _('Study course data are incomplete.'), None
             if previous_session:
-                # Students can pay for previous sessions in all
-                # workflow states.  Fresh students are excluded by the
-                # update method of the PreviousPaymentAddFormPage.
-                if previous_level == 100:
-                    amount = getattr(certificate, 'school_fee_1', 0.0)
-                else:
-                    amount = getattr(certificate, 'school_fee_2', 0.0)
+                amount = getattr(certificate, 'school_fee_1', 0.0)
             else:
-                if student.state == CLEARED:
-                    amount = getattr(certificate, 'school_fee_1', 0.0)
-                elif student.state == RETURNING:
+                amount = getattr(certificate, 'school_fee_1', 0.0)
+                if student.state == RETURNING:
                     # In case of returning school fee payment the
                     # payment session and level contain the values of
@@ -139 +132 @@
                             u'Session configuration object is not available.'
                             ), None
-                    amount = getattr(certificate, 'school_fee_2', 0.0)
+                    
                 elif student.is_postgrad and student.state == PAID:
                     # Returning postgraduate students also pay for the
@@ -150 +143 @@
                             u'Session configuration object is not available.'
                             ), None
-                    amount = getattr(certificate, 'school_fee_2', 0.0)
         elif category == 'clearance':
             try:
@@ -179 +171 @@
         elif category == 'siwess_combo':
             amount = academic_session.siwess_combo_fee
+        elif category == 'transcript':
+            amount = academic_session.transcript_fee
+        elif category == 'certificate':
+            amount = academic_session.certificate_fee
         if amount in (0.0, None):
             return _('Amount could not be determined.'), None