Changeset 9732 for main/waeup.futminna/trunk/src/waeup/futminna/students

Timestamp:

27 Nov 2012, 15:50:05 (12 years ago)

Author:

Henrik Bettermann

Message:

Add session specific penalty fee.

Location:

main/waeup.futminna/trunk/src/waeup/futminna/students

Files:

• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.futminna/trunk/src/waeup/futminna/students/tests/test_browser.py

@@ -168 +168 @@
         self.assertEqual(payment.amount_auth, 20000.0)
 
+        # Penalty fee is taken into consideration
+        self.app['configuration']['2005'].penalty_ug = 3000.0
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.p_level, 200)
+        self.assertEqual(payment.p_session, 2005)
+        self.assertEqual(payment.amount_auth, 23000.0)
+        self.assertEqual(payment.p_item, u'CERT2')
+        self.assertEqual(error, None)
+
         error, payment = utils.setPaymentDetails('schoolfee',self.student, 2004, 100)
         self.assertEqual(error, u'Previous session payment not yet implemented.')

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

@@ -147 +147 @@
                ticket.p_session == p_session:
                   return _('This type of payment has already been made.'), None
+        # Add session specific penalty fee.
+        if category == 'schoolfee' and student.is_postgrad:
+            amount += academic_session.penalty_pg
+        elif category == 'schoolfee':
+            amount += academic_session.penalty_ug
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]