Changeset 13400 for main/waeup.aaue/trunk/src/waeup/aaue/students

Timestamp:

6 Nov 2015, 18:29:20 (9 years ago)

Author:

Henrik Bettermann

Message:

Reconfigure payments according to ticket #129. Some tests are still missing. Do not upgrade!

Location:

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

Files:

• payments.py (modified) (1 diff)
• utils.py (modified) (3 diffs)

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

@@ -49 +49 @@
     def redeemTicket(self):
         student = self.student
-        if self.p_category in ('schoolfee', 'schoolfee_1'):
+        if self.p_category.startswith('schoolfee'):
             # Bypass activation code creation if next session
             # can be started directly.

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

@@ -133 +133 @@
         elif category == 'medical':
             amount = academic_session.medical_fee
-        elif category == 'clearance':
+        elif category.startswith('clearance'):
             if student.faccode == 'FP':
                 amount = academic_session.clearance_fee_fp
@@ -143 +143 @@
                 amount = academic_session.clearance_fee
             p_item = student['studycourse'].certificate.code
+            # Add Matric Gown Fee and Lapel Fee
+            if category == 'clearance_incl':
+                if amount is None:
+                    # Otherwise we can't add somtehing
+                    amount = 0.0
+                amount += academic_session.matric_gown_fee + academic_session.lapel_fee
         elif category == 'late_registration':
             amount = academic_session.late_registration_fee
-        elif category == 'schoolfee':
+        elif category.startswith('schoolfee'):
             try:
                 certificate = student['studycourse'].certificate
@@ -172 +178 @@
             else:
                 return _('Wrong state.'), None
+            # Add Student Union Fee and Welfare Assurance
+            if category == 'schoolfee_incl':
+                if amount is None:
+                    # Otherwise we can't add somtehing
+                    amount = 0.0
+                amount += academic_session.welfare_fee + academic_session.union_fee
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None