Changeset 14556 for main/waeup.fceokene

Timestamp:

17 Feb 2017, 16:27:53 (8 years ago)

Author:

Henrik Bettermann

Message:

NCE repeaters don't have to pay penalty fee.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

• tests/test_utils.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/waeup.fceokene/trunk/src/waeup/fceokene/students/tests/test_utils.py

@@ -2 +2 @@
 import grok
 from waeup.kofa.testing import FunctionalTestCase
-from zope.component import getUtility
+from hurry.workflow.interfaces import IWorkflowState
+from zope.component import getUtility, createObject
 from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
@@ -41 +42 @@
         max_credits = students_utils.maxCreditsExceeded(studylevel, course)
         self.assertEqual(max_credits, 58)
+        return
+
+    def test_set_payment_details(self):
+        self.certificate.end_level = 300
+        self.student['studycourse'].current_verdict = 'B'
+        self.student['studycourse'].current_level = 300
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.app['configuration']['2005'].penalty_nce_ft = 99.0
+        self.student['studycourse'].certificate.study_mode = 'nce_ft'
+        utils = getUtility(IStudentsUtils)
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        IWorkflowState(self.student).setState('returning')
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.amount_auth, 12224.0) # 11975 + 150 + 99
+        self.student['studycourse'].previous_verdict = 'O'
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.amount_auth, 12125.0) # 11975 + 150
+        return

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

@@ -282 +282 @@
             amount += academic_session.penalty_ug_ft
         elif category == 'schoolfee' and student.current_mode in (
-            'nce_ft',):
+            'nce_ft',) and student['studycourse'].previous_verdict != 'O':
             amount += academic_session.penalty_nce_ft
         elif category == 'schoolfee' and student.current_mode in (