Changeset 15056 for main

Timestamp:

18 Jun 2018, 08:05:20 (6 years ago)

Author:

Henrik Bettermann

Message:

Break up school fee into 4 items. 'ict_entre', 'logbook_combo' and 'siwess_combo' fees must be paid before 'schoolfee'.

Location:

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly

Files:

• interswitch/tests.py (modified) (2 diffs)
• students/utils.py (modified) (2 diffs)

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/interswitch/tests.py

@@ -61 +61 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
+        self.assertTrue(
+            'Pay SIWES, Logbook and ICT fees first.' in self.browser.contents)
+
+        # Add required payments first.
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_state = 'paid'
+        payment.p_category = 'ict_entre'
+        payment.p_id = '123'
+        payment.p_session = 2004
+        self.student['payments']['123'] = payment
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_state = 'paid'
+        payment.p_category = 'logbook_combo'
+        payment.p_id = '123'
+        payment.p_session = 2004
+        self.student['payments']['234'] = payment
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_state = 'paid'
+        payment.p_category = 'siwess_combo'
+        payment.p_id = '123'
+        payment.p_session = 2004
+        self.student['payments']['345'] = payment
+
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
                            self.browser.contents)
         ctrl = self.browser.getControl(name='val_id')
-        self.value = ctrl.options[0]
+        self.value = ctrl.options[3]
         self.browser.getLink(self.value).click()
         self.assertMatches('...Amount Authorized...',
@@ -88 +114 @@
                            self.browser.contents)
         ctrl = self.browser.getControl(name='val_id')
-        self.value = ctrl.options[1]
+        self.value = ctrl.options[4]
         self.browser.getLink(self.value).click()
         self.assertTrue(

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

@@ -87 +87 @@
         return 'N/A'
 
+    def _requiredPaymentsMade(self, student, session):
+        if len(student['payments']):
+            num = 0
+            for ticket in student['payments'].values():
+                if ticket.p_state == 'paid' and \
+                    ticket.p_category in (
+                        'ict_entre', 'logbook_combo', 'siwess_combo') and \
+                    ticket.p_session == session:
+                    num += 1
+            if num == 3:
+                return True
+        return False
+
     def setPaymentDetails(self, category, student,
             previous_session, previous_level):
@@ -116 +129 @@
             return _(u'Session configuration object is not available.'), None
         # Determine fee.
+        # The following three fees are part of the school fee which must be
+        # paid before tuition fee.
+        if category in ('ict_entre', 'logbook_combo', 'siwess_combo') and \
+            student.state == RETURNING:
+            p_session, p_level = self.getReturningData(student)
         if category == 'schoolfee':
+            if not self._requiredPaymentsMade(student, p_session):
+                return _('Pay SIWES, Logbook and ICT fees first.'), None
             try:
                 certificate = student['studycourse'].certificate