Changeset 8677

Timestamp:

11 Jun 2012, 11:18:27 (12 years ago)

Author:

Henrik Bettermann

Message:

See waeup.uniben.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

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

main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

@@ -139 +139 @@
         )
 
+    penalty_ug = schema.Float(
+        title = _(u'UG Penalty Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    penalty_pg = schema.Float(
+        title = _(u'PG Penalty Fee'),
+        default = 0.0,
+        required = False,
+        )
+
     def getSessionString():
         """Returns the session string from the vocabulary.

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

@@ -321 +321 @@
         self.assertEqual(error, None)
 
+        # Add penalty fee.
+        self.app['configuration']['2004'].penalty_ug = 99.0
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.amount_auth, 40099.0)
+
         IWorkflowState(self.student).setState('returning')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 20000.0)
+        self.assertEqual(payment.amount_auth, 20099.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -68 +68 @@
         except KeyError:
             return _(u'Session configuration object is not available.'), None
+        # Determine fee.
         if category == 'transfer':
             amount = academic_session.transfer_fee
@@ -107 +108 @@
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None
+        # Add session specific penalty fee.
+        if category == 'schoolfee' and student.is_postgrad:
+            amount += academic_session.penalty_pg
+        elif category == 'schoolfee':
+            amount += academic_session.penalty_ug
+        # Create ticket.
         for key in student['payments'].keys():
             ticket = student['payments'][key]