Changeset 14857 for main/waeup.uniben/trunk

Timestamp:

2 Oct 2017, 05:38:09 (7 years ago)

Author:

Henrik Bettermann

Message:

According to med's advice in ticket #1108: "Paying for the next session should only be done at the state returning"

Location:

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

Files:

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

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

@@ -600 +600 @@
         # In Uniben students can pay school fee in all states no matter
         # if they are ug or pg students.
-        IWorkflowState(self.student).setState('school fee paid')
-        self.student.is_staff = False
-        self.student.nationality = u'NG'
-        self.certificate.school_fee_2 = 10000.0
-        error, payment = utils.setPaymentDetails(
-            'schoolfee', self.student, None, None)
-        self.assertEqual(payment.p_level, None)
-        self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 10088.0)
-        self.assertEqual(payment.p_item, u'CERT1')
-        self.assertEqual(error, None)
-        IWorkflowState(self.student).setState('courses registered')
-        self.certificate.study_mode = 'special_pg_pt'
-        error, payment = utils.setPaymentDetails(
-            'schoolfee', self.student, None, None)
-        self.assertEqual(payment.p_level, None)
-        self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 10000.0)
-        self.assertEqual(payment.p_item, u'CERT1')
-        self.assertEqual(error, None)
-        IWorkflowState(self.student).setState('courses validated')
-        error, payment = utils.setPaymentDetails(
-            'schoolfee', self.student, None, None)
-        self.assertEqual(payment.p_level, None)
-        self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 10000.0)
-        self.assertEqual(payment.p_item, u'CERT1')
-        self.assertEqual(error, None)
+        # diabled on 02/10/2017, see ticket 1108
+        #IWorkflowState(self.student).setState('school fee paid')
+        #self.student.is_staff = False
+        #self.student.nationality = u'NG'
+        #self.certificate.school_fee_2 = 10000.0
+        #error, payment = utils.setPaymentDetails(
+        #    'schoolfee', self.student, None, None)
+        #self.assertEqual(payment.p_level, None)
+        #self.assertEqual(payment.p_session, 2005)
+        #self.assertEqual(payment.amount_auth, 10088.0)
+        #self.assertEqual(payment.p_item, u'CERT1')
+        #self.assertEqual(error, None)
+        #IWorkflowState(self.student).setState('courses registered')
+        #self.certificate.study_mode = 'special_pg_pt'
+        #error, payment = utils.setPaymentDetails(
+        #    'schoolfee', self.student, None, None)
+        #self.assertEqual(payment.p_level, None)
+        #self.assertEqual(payment.p_session, 2005)
+        #self.assertEqual(payment.amount_auth, 10000.0)
+        #self.assertEqual(payment.p_item, u'CERT1')
+        #self.assertEqual(error, None)
+        #IWorkflowState(self.student).setState('courses validated')
+        #error, payment = utils.setPaymentDetails(
+        #    'schoolfee', self.student, None, None)
+        #self.assertEqual(payment.p_level, None)
+        #self.assertEqual(payment.p_session, 2005)
+        #self.assertEqual(payment.amount_auth, 10000.0)
+        #self.assertEqual(payment.p_item, u'CERT1')
+        #self.assertEqual(error, None)
 
         error, payment = utils.setPaymentDetails('clearance',

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

@@ -310 +310 @@
                     else:
                         amount = getattr(certificate, 'school_fee_1', 0.0)
-                elif student.state in (PAID, REGISTERED, VALIDATED):
+                elif False:
+                # diabled on 02/10/2017, see ticket 1108
+                #elif student.state in (PAID, REGISTERED, VALIDATED):
                     p_session += 1
                     # We don't know which level the student is paying for.