Changeset 16008 for main/waeup.fceokene/trunk

Timestamp:

20 Feb 2020, 13:06:08 (5 years ago)

Author:

Henrik Bettermann

Message:

Make the Third Semester fee ticket only active to those who have paid School fees for NCE 3.

Do not deduct WAEAC charge from third semester payments.

Location:

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

Files:

• interswitch/browser.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (3 diffs)

main/waeup.fceokene/trunk/src/waeup/fceokene/interswitch/browser.py

@@ -93 +93 @@
             provider_amt = 0.0
             self.pay_item_id = '8304'
-        if self.context.p_item == 'Balance':
+        if self.context.p_item == 'Balance' or self.context.p_category == 'third_semester':
             provider_amt = 0.0
         xmldict['institution_amt'] = 100 * (

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'Make NCE 3 school fee payment first.')
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_category = u'schoolfee'
+        payment.p_session = self.student.current_session
+        payment.p_item = u'My Certificate'
+        payment.p_id = u'anyid'
+        self.student['payments']['anykey'] = payment
+        payment.p_state = 'paid'
+        payment.p_level = 300
+        error, payment = utils.setPaymentDetails('third_semester',self.student)
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)

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

@@ -71 +71 @@
             new_session = student['studycourse'].current_session + 1
         return new_session, new_level
+
+    def _nce3PaymentMade(self, student):
+        if len(student['payments']):
+            for ticket in student['payments'].values():
+                if ticket.p_state == 'paid' and \
+                    ticket.p_level in (300, 310, 320) and \
+                    ticket.p_category == 'schoolfee':
+                    return True
+        return False
 
     def setPaymentDetails(self, category, student,
@@ -118 +127 @@
                 return _(u'Acceptance Fee payments not allowed.'), None
         elif category == 'third_semester' and student.current_mode == 'nce_ft':
+            if not self._nce3PaymentMade(student):
+                return _(u'Make NCE 3 school fee payment first.'), None
             if student.depcode in ARTS:
                 amount = 7688
@@ -126 +137 @@
             if not p_item:
                 return _('Study course data are incomplete.'), None
-
             if student.state not in (CLEARED, RETURNING):
                 return _('Wrong state.'), None
-
             # PDE repeater
             if student.current_verdict == 'OPDE':