Changeset 7024 for main/waeup.sirp/trunk/src

Timestamp:

7 Nov 2011, 18:21:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Students are only allowed to create bed allocation payment tickets if their current session matches the accommodation session.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

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

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -917 +917 @@
     @grok.action('Create ticket')
     def createTicket(self, **data):
+        p_category = data['p_category']
+        student = self.context.__parent__
+        if p_category == 'bed_allocation' and student[
+            'studycourse'].current_session != grok.getSite()[
+            'configuration'].accommodation_session:
+                self.flash(
+                    'Your current session does not match accommodation session.')
+                self.redirect(self.url(self.context))
+                return
         payment = createObject(u'waeup.StudentOnlinePayment')
         self.applyData(payment, **data)
@@ -923 +932 @@
         payment.p_id = "p%s" % timestamp
         pay_details  = self.getPaymentDetails(
-            data['p_category'],self.context.__parent__)
+            p_category,student)
         if pay_details['error']:
             self.flash(pay_details['error'])

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

@@ -863 +863 @@
         self.browser.getControl("Add online payment ticket").click()
         self.browser.getControl(name="form.p_category").value = ['bed_allocation']
+        # If student is not in accommodation session, payment cannot be processed
+        self.app['configuration'].accommodation_session = 2011
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Your current session does not match...',
+                           self.browser.contents)
+        self.app['configuration'].accommodation_session = 2004
+        self.browser.getControl("Add online payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['bed_allocation']
         self.browser.getControl("Create ticket").click()
         ctrl = self.browser.getControl(name='val_id')