Changeset 15314 for main/waeup.uniben/trunk/src/waeup/uniben

Timestamp:

29 Jan 2019, 21:47:26 (6 years ago)

Author:

Henrik Bettermann

Message:

Do only allow adding bed_allocation payments if desired_hostel is set.

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

@@ -682 +682 @@
 
         self.certificate.study_mode = 'pg_ft'
+        error, payment = utils.setPaymentDetails('bed_allocation',
+            self.student, None, None)
+        self.assertEqual(error, u'Select your favoured hostel first.')
+        self.student['accommodation'].desired_hostel = u'no'
         error, payment = utils.setPaymentDetails('bed_allocation',
             self.student, None, None)

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

@@ -238 +238 @@
             p_item = self.getAccommodationDetails(student)['bt']
             desired_hostel = student['accommodation'].desired_hostel
-            if desired_hostel:
+            if not desired_hostel:
+                return _(u'Select your favoured hostel first.'), None
+            if desired_hostel and desired_hostel != 'no':
                 p_item = u'%s (%s)' % (p_item, desired_hostel)
             amount = academic_session.booking_fee