Changeset 9431 for main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py

Timestamp:

26 Oct 2012, 20:59:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Link maintenance payment with bedticket. This way we can forgo a secon maint. payment category. The amount depends now on the bed really booked.

File:

• main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py (modified) (1 diff)

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

@@ -116 +116 @@
                 amount = 20000.0
         elif category == 'hostel_maintenance':
+            current_session = student['studycourse'].current_session
+            bedticket = student['accommodation'].get(str(current_session), None)
+            if bedticket:
+                p_item = bedticket.bed_coordinates
+            else:
+                return _(u'You have not yet booked accommodation.'), None
             acc_details = self.getAccommodationDetails(student)
-            if student['studycourse'].current_session != acc_details[
-                'booking_session']:
+            if current_session != acc_details['booking_session']:
                 return _(u'Current session does not match accommodation session.'), None
-            if student.current_level  in ('100','200','300','400','500') and \
+            if bedticket.bed.bed_id.startswith('block-h'):
+                amount = 15000.0
+            elif student.current_level  in (100,200,300,400,500) and \
                 student.faccode in ('EET','SET','AAT','ICT','EMT'):
                 amount = 12000.0
             else:
                 amount = 10000.0
-            p_item = acc_details['bt']
-        elif category == 'block_h_maintenance':
-            acc_details = self.getAccommodationDetails(student)
-            if student['studycourse'].current_session != acc_details[
-                'booking_session']:
-                return _(u'Current session does not match accommodation session.'), None
-            amount = 15000.0
-            p_item = acc_details['bt']
         elif category == 'bed_allocation':
             p_item = self.getAccommodationDetails(student)['bt']