Changeset 9409 for main/waeup.futminna/trunk/src/waeup/futminna/students

Timestamp:

24 Oct 2012, 22:01:59 (12 years ago)

Author:

Henrik Bettermann

Message:

Add payment category 'block_h_payment'.

The interswitch module has still to be configured. Bank details and pay_item_id is missing.

Location:

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

Files:

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

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

@@ -162 +162 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 15000.0)
+        self.assertEqual(payment.amount_auth, 10000.0)
         self.assertEqual(payment.p_item, u'sse_male_fr')
         self.assertEqual(error, None)
@@ -171 +171 @@
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 10000.0)
+        self.assertEqual(payment.p_item, u'regular_male_fr')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('block_h_maintenance',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 15000.0)
         self.assertEqual(payment.p_item, u'regular_male_fr')
         self.assertEqual(error, None)

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

@@ -120 +120 @@
                 'booking_session']:
                 return _(u'Current session does not match accommodation session.'), None
-            if student.faccode == 'SSE':
-                amount = 15000.0
-            elif student.current_level  in ('100','200','300','400','500') and \
+            if 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':