Changeset 10876

Timestamp:

7 Jan 2014, 07:46:32 (11 years ago)

Author:

Henrik Bettermann

Message:

Configure ug_ft school fee.

Location:

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

Files:

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

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests/test_browser.py

@@ -30 +30 @@
 from waeup.fceokene.testing import FunctionalLayer
 
-session = datetime.now().year - 2
+session = datetime.datetime.now().year - 2
 
 class ApplicantUITest(FunctionalTestCase):

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

@@ -247 +247 @@
         self.assertEqual(error, None)
 
-        # UG students pay 65800
+        # UG returning students pay 56150
         self.certificate.study_mode = 'ug_ft'
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.amount_auth, 56300.0)
+        self.assertEqual(error, None)
+        # UG cleared students pay 65650
+        IWorkflowState(self.student).setState('cleared')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.amount_auth, 65800.0)

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

@@ -165 +165 @@
             # UG
             elif student.current_mode == 'ug_ft':
-                amount = 65650
+            # Introducing returning students fee for 'ug_ft' for 1st time
+            # on 07/01/2014
+                if student.state == CLEARED:
+                    amount = 65650
+                else:
+                    amount = 56150
             # NCE
             elif not student.current_mode.endswith('_sw'):