Changeset 13756

Timestamp:

1 Mar 2016, 22:21:54 (9 years ago)

Author:

Henrik Bettermann

Message:

Different late payment penalty fees for ug_ft and ug_pt.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

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

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

@@ -82 +82 @@
         )
 
-    penalty_ug = schema.Float(
-        title = _(u'UG Penalty Fee'),
+    penalty_ug_ft = schema.Float(
+        title = _(u'UG Full-Time Penalty Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    penalty_ug_pt = schema.Float(
+        title = _(u'UG Part-Time Penalty Fee'),
         default = 0.0,
         required = False,

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

@@ -506 +506 @@
         # Add penalty fee ...
         # ... for cleared
-        self.app['configuration']['2004'].penalty_ug = 99.0
+        self.app['configuration']['2004'].penalty_ug_ft = 99.0
         # ... for returning
-        self.app['configuration']['2005'].penalty_ug = 88.0
+        self.app['configuration']['2005'].penalty_ug_ft = 88.0
         error, payment = utils.setPaymentDetails('schoolfee',
             self.student, None, None)

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

@@ -333 +333 @@
         if category == 'schoolfee' and student.is_postgrad:
             amount += academic_session.penalty_pg
-        elif category == 'schoolfee':
-            amount += academic_session.penalty_ug
+        elif category == 'schoolfee' and student.current_mode.endswith('ft'):
+            amount += academic_session.penalty_ug_ft
+        elif category == 'schoolfee' and student.current_mode.endswith('pt'):
+            amount += academic_session.penalty_ug_pt
         if category.startswith('tempmaint'):
             p_item = getUtility(IKofaUtils).PAYMENT_CATEGORIES[category]