Changeset 14898

Timestamp:

15 Nov 2017, 13:09:29 (7 years ago)

Author:

Henrik Bettermann

Message:

Remove student union dues from bed allocation fee.

Location:

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

Files:

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

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

@@ -665 +665 @@
         self.assertEqual(error, None)
 
-        self.certificate.study_mode = 'ug_ft'
-        error, payment = utils.setPaymentDetails('bed_allocation',
-            self.student, None, None)
-        self.assertTrue(u'Amount could not be determined.' in error)
-        self.student['studycourse'].current_session = 2004
-        self.student['studycourse'].entry_session = 2004
-        self.student['studycourse'].current_level = 100
-        error, payment = utils.setPaymentDetails('bed_allocation',
-            self.student, None, None)
-        self.assertEqual(payment.p_level, 100)
-        self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 650.0) # plus 500 student union
-        self.assertEqual(payment.p_item, u'regular_male_fr')
-        self.assertEqual(error, None)
+        #self.certificate.study_mode = 'ug_ft'
+        #error, payment = utils.setPaymentDetails('bed_allocation',
+        #    self.student, None, None)
+        #self.assertTrue(u'Amount could not be determined.' in error)
+        #self.student['studycourse'].current_session = 2004
+        #self.student['studycourse'].entry_session = 2004
+        #self.student['studycourse'].current_level = 100
+        #error, payment = utils.setPaymentDetails('bed_allocation',
+        #    self.student, None, None)
+        #self.assertEqual(payment.p_level, 100)
+        #self.assertEqual(payment.p_session, 2004)
+        #self.assertEqual(payment.amount_auth, 650.0) # plus 500 student union
+        #self.assertEqual(payment.p_item, u'regular_male_fr')
+        #self.assertEqual(error, None)
 
         self.certificate.study_mode = 'pg_ft'

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

@@ -222 +222 @@
             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 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
         elif category == 'hostel_maintenance':
             amount = 0.0