Changeset 16011 for main/waeup.fceokene/trunk/src/waeup

Timestamp:

23 Feb 2020, 20:15:50 (5 years ago)

Author:

Henrik Bettermann

Message:

Only NCE 3 students pay third semester fee.

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

@@ -289 +289 @@
 
         error, payment = utils.setPaymentDetails('third_semester',self.student)
+        self.assertEqual(error, u'Amount could not be determined.')
+        self.student['studycourse'].current_level = 300
+        error, payment = utils.setPaymentDetails('third_semester',self.student)
         self.assertEqual(error, u'Make NCE 3 school fee payment first.')
         payment = createObject('waeup.StudentOnlinePayment')
@@ -299 +302 @@
         payment.p_level = 300
         error, payment = utils.setPaymentDetails('third_semester',self.student)
-        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_level, 300)
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 7938)
@@ -307 +310 @@
         self.certificate.study_mode = u'nce_sw'
         error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
-        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_level, 300)
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 547.5)  # 62.5% * 876
@@ -314 +317 @@
 
         error, payment = utils.setPaymentDetails('bed_allocation',self.student)
-        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_level, 300)
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 150)

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

@@ -126 +126 @@
             if student.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
                 return _(u'Acceptance Fee payments not allowed.'), None
-        elif category == 'third_semester' and student.current_mode == 'nce_ft':
+        elif category == 'third_semester' and student.current_mode == 'nce_ft' \
+            and p_level == 300:
             if not self._nce3PaymentMade(student):
                 return _(u'Make NCE 3 school fee payment first.'), None