Changeset 14239 for main

Timestamp:

28 Oct 2016, 15:11:47 (8 years ago)

Author:

Henrik Bettermann

Message:

Revert changes from r14236
.

Location:

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

Files:

• students/browser.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -237 +237 @@
             matric_gown_fee = gateway_net_amt(academic_session.matric_gown_fee)
             lapel_fee = gateway_net_amt(academic_session.lapel_fee)
-            id_card_fee = gateway_net_amt(academic_session.id_card_fee)
             text += ('Acceptance Fee, '
                      '%s Naira Matriculation Gown Fee, '
-                     '%s Naira Student ID Card Fee, '
                      '%s Naira Lapel/File Fee and '
-                     % (matric_gown_fee, id_card_fee, lapel_fee))
+                     % (matric_gown_fee, lapel_fee))
         return text + '250.0 Naira Transaction Charge.'
 

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

@@ -234 +234 @@
             if amount in (0.0, None):
                 return _(u'Amount could not be determined.'), None
-            # Add Matric Gown, Student Id Card and Lapel Fee
+            # Add Matric Gown Fee and Lapel Fee
             if category == 'clearance_incl':
                 amount += gateway_net_amt(academic_session.matric_gown_fee) + \
-                    gateway_net_amt(academic_session.id_card_fee) + \
                     gateway_net_amt(academic_session.lapel_fee)
         elif category == 'late_registration':

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

@@ -56 +56 @@
         'schoolfee_incl': 'School Fee + Student Union Dues + Welfare Assurance Fee',
         'clearance': 'Acceptance Fee without additional fees',
-        'clearance_incl': 'Acceptance Fee + Matric Gown Fee + Lapel/File Fee + Student ID Card Fee',
+        'clearance_incl': 'Acceptance Fee + Matric Gown Fee + Lapel/File Fee',
         'hostel_maintenance': 'Hostel Accommodation Fee',
         'application': 'Application Fee',