Changeset 13534 for main/waeup.aaue

Timestamp:

4 Dec 2015, 18:10:26 (9 years ago)

Author:

Henrik Bettermann

Message:

Add non-indigenous fee.

Location:

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

Files:

• tests/test_utils.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -50 +50 @@
         self.app['configuration']['2004'].booking_fee = 150.0
         self.app['configuration']['2004'].maint_fee = 180.0
-        self.app['configuration']['2004'].clearance_fee = 1234.0
+        self.app['configuration']['2004'].clearance_fee_pg = 1234.0
         self.app['configuration']['2004'].clearance_fee_fp = 3456.0
         self.student['studycourse'].certificate.school_fee_1 = 6666.0
         self.student['studycourse'].certificate.school_fee_2 = 7777.0
+        self.student['studycourse'].certificate.study_mode = 'special_pg_ft'
         self.student.nationality = u'NG'
+        self.student.lga = 'ebonyi_ukaba'
         utils = getUtility(IStudentsUtils)
 
@@ -69 +71 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 6666.0)
+        # 20000 Naira non-indigenous fee added
+        self.assertEqual(payment.amount_auth, 26666.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
         # Add penalty fee ...
         # ... for cleared
-        self.app['configuration']['2004'].penalty_ug = 99.0
+        self.app['configuration']['2004'].penalty_pg = 99.0
         # ... for returning
-        self.app['configuration']['2005'].penalty_ug = 88.0
+        self.app['configuration']['2005'].penalty_pg = 88.0
+        self.student.lga = 'edo_afuze'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.amount_auth, 6765.0)

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

@@ -217 +217 @@
                 amount += gateway_net_amt(academic_session.welfare_fee) + \
                     gateway_net_amt(academic_session.union_fee)
+            # Add non-indigenous fee and session specific penalty fees
+            if student.is_postgrad:
+                amount += academic_session.penalty_pg
+                if not student.lga.startswith('edo'):
+                    amount += 20000.0
+            else:
+                amount += academic_session.penalty_ug
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None
-        # Add session specific penalty fee.
-        if category.startswith('schoolfee') and student.is_postgrad:
-            amount += academic_session.penalty_pg
-        elif category.startswith('schoolfee'):
-            amount += academic_session.penalty_ug
+
         # Create ticket.
         for key in student['payments'].keys():