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

Timestamp:

8 Nov 2015, 06:18:44 (9 years ago)

Author:

Henrik Bettermann

Message:

Remove duplicate payment category.

Location:

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

Files:

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

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

@@ -151 +151 @@
             text += (', %s Naira Student Welfare Assurance Fee and %s Naira Students\' Union Dues'
                      % (welfare_fee, union_fee))
-        elif self.context.p_category == 'clearance_incl' and academic_session:
+        elif self.context.p_category in (
+            'clearance_incl', 'clearance_medical_incl') and academic_session:
             matric_gown_fee = academic_session.matric_gown_fee - dynamic_gateway_amt(
                 academic_session.matric_gown_fee)

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

@@ -132 +132 @@
         elif category == 'concessional':
             amount = academic_session.concession_fee
-        elif category == 'medical':
-            amount = academic_session.medical_fee
         elif category.startswith('clearance'):
             if student.faccode == 'FP':
@@ -145 +143 @@
             p_item = student['studycourse'].certificate.code
             # Add Matric Gown Fee and Lapel Fee
-            if category == 'clearance_incl':
+            if category.endswith('_incl'):
                 if amount is None:
                     # Otherwise we can't add somtehing
                     amount = 0.0
                 amount += academic_session.matric_gown_fee + \
-                          academic_session.lapel_fee - \
-                          2*(dynamic_gateway_amt(amount))
+                    academic_session.lapel_fee - \
+                    dynamic_gateway_amt(academic_session.matric_gown_fee) -\
+                    dynamic_gateway_amt(academic_session.lapel_fee)
         elif category == 'late_registration':
             amount = academic_session.late_registration_fee
@@ -187 +186 @@
                     amount = 0.0
                 amount += academic_session.welfare_fee + \
-                          academic_session.union_fee - \
-                          2*(dynamic_gateway_amt(amount))
+                    academic_session.union_fee - \
+                    dynamic_gateway_amt(academic_session.welfare_fee) -\
+                    dynamic_gateway_amt(academic_session.union_fee)
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None