Changeset 7025

Timestamp:

8 Nov 2011, 06:21:19 (13 years ago)

Author:

Henrik Bettermann

Message:

The same payment ticket (with same p_item, p_session and p_category) must not be added twice.

Location:

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

Files:

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

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

@@ -926 +926 @@
                 self.redirect(self.url(self.context))
                 return
+        pay_details  = self.getPaymentDetails(
+            p_category,student)
+        if pay_details['error']:
+            self.flash(pay_details['error'])
+            self.redirect(self.url(self.context))
+            return
+        p_item = pay_details['p_item']
+        p_session = pay_details['p_session']
+        for key in self.context.keys():
+            ticket = self.context[key]
+            if ticket.p_category == p_category and \
+               ticket.p_item == p_item and \
+               ticket.p_session == p_session:
+                  self.flash(
+                      'This payment ticket already exists.')
+                  self.redirect(self.url(self.context))
+                  return
         payment = createObject(u'waeup.StudentOnlinePayment')
         self.applyData(payment, **data)
@@ -931 +948 @@
         #order_id = "%s%s" % (student_id[1:],timestamp)
         payment.p_id = "p%s" % timestamp
-        pay_details  = self.getPaymentDetails(
-            p_category,student)
-        if pay_details['error']:
-            self.flash(pay_details['error'])
-            self.redirect(self.url(self.context))
-            return
+        payment.p_item = p_item
+        payment.p_session = p_session
         payment.amount_auth = pay_details['amount']
-        payment.p_item = pay_details['p_item']
-        payment.p_session = pay_details['p_session']
         payment.surcharge_1 = pay_details['surcharge_1']
         payment.surcharge_2 = pay_details['surcharge_2']

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

@@ -685 +685 @@
     def test_manage_payments(self):
         # Managers can add online school fee payment tickets
+        # if certain requirements are met
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_student_path)
@@ -698 +699 @@
                            self.browser.contents)
         payment_url = self.browser.url
+
+        # The same payment ticket (with same p_item, p_session and p_category)
+        # can't be added twice.
+        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.browser.contents)
+
         # Managers can open the callback view which simulates a valid callback
         self.assertEqual(len(self.app['accesscodes']['SFE-0']),0)