Changeset 15002 for main

Timestamp:

9 May 2018, 07:49:16 (7 years ago)

Author:

Henrik Bettermann

Message:

PG students pay higher booking fee.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

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

main/waeup.uniben/trunk/src/waeup/uniben/interfaces.py

@@ -45 +45 @@
 
     booking_fee = schema.Float(
-        title = _(u'Booking Fee'),
+        title = _(u'UG Booking Fee (+ N500 PG)'),
         default = 0.0,
         required = False,

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

@@ -685 +685 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 150.0) 
+        self.assertEqual(payment.amount_auth, 650.0)
         self.assertEqual(payment.p_item, u'pg_male_all')
         self.assertEqual(error, None)

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

@@ -234 +234 @@
             p_item = self.getAccommodationDetails(student)['bt']
             amount = academic_session.booking_fee
-            # Add student union dues
-            #if not student.is_postgrad:
-            #    stage = self.getAccommodationDetails(student)['bt']
-            #    stage = stage.split('_')[2]
-            #    if stage == 'fr':
-            #        amount += 500.0
-            #    elif stage in ('fi', 're') and student[
-            #        'studycourse'].previous_verdict in (
-            #            'A', 'B', 'F', 'J', 'M', 'C', 'Z'):
-            #        amount += 300.0
-            #    else:
-            #        amount = 0.0
+            if student.is_postgrad:
+                amount += 500
         elif category == 'hostel_maintenance':
             amount = 0.0