Changeset 7248

Timestamp:

1 Dec 2011, 13:01:24 (13 years ago)

Author:

Henrik Bettermann

Message:

Allow more than one ticket of same type if former tickets are not paid. The tickets might have been processed by the payment gateway and received an unsuccessful callback.

Location:

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

Files:

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

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

@@ -1080 +1080 @@
         for key in self.context.keys():
             ticket = self.context[key]
-            if ticket.p_category == p_category and \
+            if ticket.p_state == 'paid' and\
+               ticket.p_category == p_category and \
                ticket.p_item == p_item and \
                ticket.p_session == p_session:
                   self.flash(
-                      'This payment ticket already exists.')
+                      'This type of payment ticket exists and ticket has been paid.')
                   self.redirect(self.url(self.context))
                   return

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

@@ -987 +987 @@
                            self.browser.contents)
 
-        # The same payment ticket (with same p_item, p_session and p_category)
-        # can't be added twice.
+        # The same payment (with same p_item, p_session and p_category)
+        # can be initialized a second time if the former ticket is not yet paid.
         self.browser.open(self.payments_student_path)
         self.browser.getControl("Add online payment ticket").click()
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...This payment ticket already exists...',
+        self.assertMatches('...Payment ticket created...',
                            self.browser.contents)
 
@@ -1008 +1008 @@
                           self.browser.contents)
 
+        # Now the first ticket is paid and no more ticket of same type
+        # (with same p_item, p_session and p_category) can be added
+        self.browser.open(self.payments_student_path)
+        self.browser.getControl("Add online payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches(
+            '...This type of payment ticket exists and ticket has been paid...',
+            self.browser.contents)
+
         # Managers can open the pdf payment receipt
+        self.browser.open(payment_url)
         self.browser.getLink("Download payment receipt").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
@@ -1033 +1044 @@
         self.assertEqual(len(self.app['accesscodes']['CLR-0']),0)
         ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[0]
+        value = ctrl.options[1] # The clearance payment is the second in the table
         self.browser.getLink(value).click()
         self.browser.open(self.browser.url + '/callback')
@@ -1042 +1053 @@
           Paid
         </td>...'''
+        #import pdb; pdb.set_trace()
         self.assertMatches(expected,self.browser.contents)
         # The new CLR-0 pin has been created