Changeset 8322 for main

Timestamp:

2 May 2012, 06:58:29 (13 years ago)

Author:

Henrik Bettermann

Message:

Store individual cost when creating access codes after online payment.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• accesscodes/accesscode.py (modified) (2 diffs)
• students/browser.py (modified) (3 diffs)
• students/tests/test_browser.py (modified) (7 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/accesscode.py

@@ -588 +588 @@
     return fire_transition(access_code, 'reenable', comment=comment)
 
-def create_accesscode(batch_prefix, batch_num, owner):
+def create_accesscode(batch_prefix, batch_num, cost, owner):
     """
     """
@@ -598 +598 @@
     rand_num = list(batch.getNewRandomNum())[0]
     num = len(batch) + 1
-    batch.addAccessCode(num, rand_num, owner)
+    batch.addAccessCode(num, rand_num, cost, owner)
     batch.entry_num += 1
     pin = u'%s-%s-%s' % (batch_prefix,batch_num,rand_num)

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

@@ -1152 +1152 @@
         if self.context.p_category == 'clearance':
             # Create CLR access code
-            pin, error = create_accesscode('CLR',0,student.student_id)
+            pin, error = create_accesscode(
+                'CLR',0,self.context.amount_auth,student.student_id)
             if error:
                 self.flash(_('Valid callback received. ${a}',
@@ -1160 +1161 @@
         elif self.context.p_category == 'schoolfee':
             # Create SFE access code
-            pin, error = create_accesscode('SFE',0,student.student_id)
+            pin, error = create_accesscode(
+                'SFE',0,self.context.amount_auth,student.student_id)
             if error:
                 self.flash(_('Valid callback received. ${a}',
@@ -1168 +1170 @@
         elif self.context.p_category == 'bed_allocation':
             # Create HOS access code
-            pin, error = create_accesscode('HOS',0,student.student_id)
+            pin, error = create_accesscode(
+                'HOS',0,self.context.amount_auth,student.student_id)
             if error:
                 self.flash(_('Valid callback received. ${a}',

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

@@ -175 +175 @@
         configuration = createObject('waeup.SessionConfiguration')
         configuration.academic_session = 2004
+        configuration.clearance_fee = 3456.0
         self.app['configuration'].addSessionConfiguration(configuration)
 
@@ -1294 +1295 @@
                           self.browser.contents)
 
+        # The authorized amount has been stored in the access code
+        self.assertEqual(
+            self.app['accesscodes']['SFE-0'].values()[0].cost,40000.0)
+
         # Callback can't be applied twice
         self.browser.open(payment_url + '/simulate_callback')
@@ -1349 +1354 @@
         pin = self.app['accesscodes']['CLR-0'].keys()[0]
         ac = self.app['accesscodes']['CLR-0'][pin]
-        ac.owner = self.student_id
+        self.assertEqual(ac.owner, self.student_id)
+        self.assertEqual(ac.cost, 3456.0)
         return
 
@@ -1384 +1390 @@
         pin = self.app['accesscodes']['CLR-0'].keys()[0]
         ac = self.app['accesscodes']['CLR-0'][pin]
-        ac.owner = self.student_id
+        self.assertEqual(ac.owner, self.student_id)
+        self.assertEqual(ac.cost, 3456.0)
 
         # Students can open the pdf payment slip
@@ -1493 +1500 @@
         pin = self.app['accesscodes']['HOS-0'].keys()[0]
         ac = self.app['accesscodes']['HOS-0'][pin]
-        ac.owner = self.student_id
+        self.assertEqual(ac.owner, self.student_id)
         parts = pin.split('-')[1:]
         sfeseries, sfenumber = parts
@@ -1622 +1629 @@
         pin = self.app['accesscodes']['HOS-0'].keys()[0]
         ac = self.app['accesscodes']['HOS-0'][pin]
-        ac.owner = u'Anybody'
         parts = pin.split('-')[1:]
         sfeseries, sfenumber = parts
@@ -1640 +1646 @@
         self.assertMatches('...Activation code is invalid...',
                            self.browser.contents)
+        ac.owner = u'Anybody'
         self.browser.getControl(name="ac_series").value = sfeseries
         self.browser.getControl(name="ac_number").value = sfenumber