Changeset 13022 for main/waeup.fceokene/trunk/src/waeup/fceokene/students

Timestamp:

29 May 2015, 06:03:24 (10 years ago)

Author:

Henrik Bettermann

Message:

Temporarily disable NCE I payment.

Unfortunately, many tests are based on nce_ft level 100 students. They all failed and had to be changed.

School fee configuration in FCEOkene is too complex and error-prone. WAeUP Germany recommends to slim down and optimize administrative processes.

Location:

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

Files:

• tests/test_browser.py (modified) (4 diffs)
• utils.py (modified) (1 diff)

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

@@ -138 +138 @@
         self.browser.getControl(name="form.p_category").value = ['third_semester']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...ticket created...',
-                           self.browser.contents)
+        self.assertMatches('...ticket created...', self.browser.contents)
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(
@@ -157 +156 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.certificate.study_mode = 'pd_ft'
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
@@ -224 +224 @@
 
         IWorkflowState(self.student).setState('cleared')
-        self.certificate.study_mode = 'nce_ft'
-        error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.p_level, 100)
-        self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 14975.0)
+        self.certificate.study_mode = 'pd_ft'
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 35450.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -241 +241 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 14025.0)
+        self.assertEqual(payment.amount_auth, 35450.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -203 +203 @@
                     else:
                         amount = 14825
+                    ################################
+                    # Payment disabled on 29/05/15 #
+                    ################################
+                    amount = 0.0
                 # NCE II
                 elif student.current_level in (100, 110, 120) and \