Changeset 9889 for main/waeup.futminna

Timestamp:

15 Jan 2013, 15:14:00 (12 years ago)

Author:

Henrik Bettermann

Message:

Add test for disabling school fee payment and fix method.

Location:

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

Files:

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

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

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

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):
+            return _('School fee payment disabled.'), None
         if amount in (0.0, None):
             return _('Amount could not be determined.'), None
@@ -160 +162 @@
         # Add session specific penalty fee.
         if category == 'schoolfee' and student.is_postgrad:
-            if academic_session.penalty_pg == 9999.0:
-                amount = 0.0
-            else:
-                amount += academic_session.penalty_pg
+            amount += academic_session.penalty_pg
         elif category == 'schoolfee':
-            if academic_session.penalty_ug == 9999.0:
-                amount = 0.0
-            else:
-                amount += academic_session.penalty_ug
+            amount += academic_session.penalty_ug
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]