Changeset 9611 for main/waeup.fceokene/trunk

Timestamp:

10 Nov 2012, 21:02:02 (12 years ago)

Author:

Henrik Bettermann

Message:

Check if bed has been booked and save bed coordinates in payment ticket.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

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

@@ -253 +253 @@
         self.assertEqual(error, None)
 
+        self.student['studycourse'].current_session = 2005
         error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
+        self.assertEqual(payment, None)
+        self.assertEqual(error, 'You have not yet booked accommodation.')
+        self.student['studycourse'].current_session = 2004
+
+        error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 180.0)
-        self.assertEqual(payment.p_item, u'')
+        self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)
 

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

@@ -82 +82 @@
             amount = academic_session.booking_fee
         elif category == 'hostel_maintenance':
+            current_session = student['studycourse'].current_session
+            bedticket = student['accommodation'].get(str(current_session), None)
+            if bedticket is not None and bedticket.bed is not None:
+                p_item = bedticket.bed_coordinates
+            else:
+                return _(u'You have not yet booked accommodation.'), None
+            acc_details = self.getAccommodationDetails(student)
+            if current_session != acc_details['booking_session']:
+                return _(u'Current session does not match accommodation session.'), None
             amount = academic_session.maint_fee
         elif category == 'clearance':