Changeset 16409 for main

Timestamp:

6 Mar 2021, 21:29:49 (4 years ago)

Author:

Henrik Bettermann

Message:

Jite: Acceptance fee of 200k is a part of schoolfees.

Adjust flash message.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students

Files:

• browser.py (modified) (2 diffs)
• student.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser.py

@@ -132 +132 @@
         #    self.redirect(self.url(self.context))
         #    return
-        minamount = 200000
-        if not self.context.minimumStudentPayments(minamount):
-            self.flash('Please make required payments first '
-                       '(at least in the amount of %s Naira).' % minamount,
+        if not self.context.minimumStudentPayments():
+            self.flash('Please make 40% of your tution fee payments first.',
                        type="warning")
             self.redirect(self.url(self.context, 'view_personal'))
@@ -144 +142 @@
 
 class CustomStudentPersonalManageFormPage(NigeriaStudentPersonalManageFormPage):
-    """ Page to edit personal data
+    """ Page to manage personal data
     """
     form_fields = grok.AutoFields(ICustomStudentPersonal)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/student.py

@@ -67 +67 @@
         return False
 
-    def minimumStudentPayments(self, minamount):
+    def minimumStudentPayments(self):
         """Need to access edit_personal. Only in iuokada package.
         """
@@ -80 +80 @@
             if ticket.p_state == 'paid' \
                 and ticket.p_session >= self.current_session \
-                and ticket.p_category in ('schoolfee', 'schoolfee40', 'secondinstal'):
+                and ticket.p_category in ('schoolfee', 'schoolfee40',
+                                          'secondinstal', 'clearance',
+                                          'jupeb_acc'):
                 total_amount += ticket.amount_auth
         if self.is_fresh:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/tests/test_browser.py

@@ -149 +149 @@
         self.browser.getLink("Bio Data").click()
         self.browser.getLink("Edit registration bio data").click()
-        self.assertTrue("Please make required payments first" in self.browser.contents)
+        self.assertTrue("Please make 40% of your tution fee payments first." in self.browser.contents)
         self.assertEqual(self.browser.url, self.personal_path)