Changeset 9891 for main/waeup.futminna/trunk/src/waeup

Timestamp:

15 Jan 2013, 15:25:06 (12 years ago)

Author:

Henrik Bettermann

Message:

Improve test and code accordingly.

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

@@ -177 +177 @@
         # Penalty fee is taken into consideration
         self.app['configuration']['2005'].penalty_ug = 9999.0
+        self.app['configuration']['2005'].penalty_pg = 9999.0
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(error, u'School fee payment is disabled.')

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

@@ -149 +149 @@
             p_item = self.getAccommodationDetails(student)['bt']
             amount = academic_session.booking_fee
-        if 9999.0 in (academic_session.penalty_pg, academic_session.penalty_ug):
+        if category == 'schoolfee' and student.is_postgrad and \
+            9999.0 == academic_session.penalty_pg:
+            return _('School fee payment is disabled.'), None
+        elif category == 'schoolfee' and 9999.0 == academic_session.penalty_ug:
             return _('School fee payment is disabled.'), None
         if amount in (0.0, None):