Changeset 15360 for main/kofacustom.dspg

Timestamp:

22 Mar 2019, 07:05:00 (6 years ago)

Author:

Henrik Bettermann

Message:

Configure dep_sug payment requirement properly.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students

Files:

• tests/test_utils.py (modified) (1 diff)
• utils.py (modified) (3 diffs)

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_utils.py

@@ -66 +66 @@
         self.assertEqual(msg, None)
         return
+
+    def test_set_payment_details(self):
+        self.student['studycourse'].certificate.school_fee_1 = 6666.0
+        self.student['studycourse'].certificate.school_fee_2 = 7777.0
+        self.student['studycourse'].certificate.school_fee_3 = 8888.0
+        self.student['studycourse'].certificate.school_fee_4 = 9999.0
+        self.student['studycourse'].certificate.study_mode = 'hnd_ft'
+        self.student.nationality = u'NG'
+        self.student.lga = 'ebonyi_ukaba'
+        utils = getUtility(IStudentsUtils)
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+        error, payment = utils.setPaymentDetails('dep_sug',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        IWorkflowState(self.student).setState('returning')
+        # Returning students are paying for next session
+        error, payment = utils.setPaymentDetails('dep_sug',self.student)
+        self.assertEqual(payment.p_level, 200)
+        self.assertEqual(payment.p_session, 2005)
+        self.assertEqual(payment.amount_auth, 3150.0)
+        # Students can pay school fee if dep_sug has been paid first.
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
+        error, payment = utils.setPaymentDetails('dep_sug',self.student)
+        self.student['payments']['any_key'] = payment
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
+        self.student['payments']['any_key'].p_state = 'paid'
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(error, None)
+        self.assertEqual(payment.p_level, 200)
+        self.assertEqual(payment.p_session, 2005)
+        self.assertEqual(payment.amount_auth, 9999.0)
+

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/utils.py

@@ -39 +39 @@
 
     def _dep_sug_paymentMade(self, student, session):
+        if student.state == RETURNING:
+            session += 1
         if len(student['payments']):
             for ticket in student['payments'].values():
@@ -99 +101 @@
 
     def setPaymentDetails(self, category, student,
-            previous_session, previous_level):
+            previous_session=None, previous_level=None):
         """Create a payment ticket and set the payment data of a
         student for the payment category specified.
@@ -224 +226 @@
             #    amount = 1650.0 # includes GATEWAY_AMT
                 amount = 0.0
+            if student.state == RETURNING and not previous_session:
+                p_session, p_level = self.getReturningData(student)
         else:
             fee_name = category + '_fee'