Changeset 15661

Timestamp:

11 Oct 2019, 11:31:38 (5 years ago)

Author:

Henrik Bettermann

Message:

Start configuration of school fee payments.

Location:

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

Files:

• browser/pages.py (modified) (1 diff)
• interswitch/tests.py (modified) (1 diff)
• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (3 diffs)

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

@@ -34 +34 @@
     form_fields = grok.AutoFields(ICustomSessionConfiguration)
 
+class CustomCertificatePage(CertificatePage):
+    """Index page for certificates.
+    """
+    form_fields = grok.AutoFields(ICertificate).omit(
+        'ratio', 'school_fee_3', 'school_fee_4',
+        'custom_textline_1', 'custom_textline_2',
+        'custom_float_1','custom_float_2')
+
+class CustomCertificateManageFormPage(CertificateManageFormPage):
+    """Manage the properties of a `Certificate` instance.
+    """
+    form_fields = grok.AutoFields(ICertificate).omit(
+        'ratio', 'school_fee_3', 'school_fee_4',
+        'custom_textline_1', 'custom_textline_2',
+        'custom_float_1','custom_float_2', 'code')
+

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

@@ -79 +79 @@
             self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee" item_amt="3985000" bank_id="00" acct_num="00000000"' in
+            'item_name="Tuition Plus Total" item_amt="3985000" bank_id="00" acct_num="00000000"' in
             self.browser.contents)
 

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -59 +59 @@
 msgid "Sex"
 msgstr "Gender"
+
+#: school_fee_1
+msgid "Initial School Fee"
+msgstr "Tuition, Accommodation, Adm. Charges (1)"
+
+#: school_fee_2
+msgid "Returning School Fee"
+msgstr "Tuition, Accommodation, Adm. Charges (2)"
+
+#: school_fee_3
+msgid "Foreigner Initial School Fee"
+msgstr "Tuition, Accommodation, Adm. Charges (not used)"
+
+#: school_fee_4
+msgid "Foreigner Returning School Fee"
+msgstr "Tuition, Accommodation, Adm. Charges (not used)"

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

@@ -80 +80 @@
             return _(u'Session configuration object is not available.'), None
         # Determine fee.
-        if category == 'schoolfee':
+        if category in ('schoolfee', 'schoolfee40',
+                        'schoolfee50', 'schoolfee60'):
             try:
                 certificate = student['studycourse'].certificate
@@ -126 +127 @@
                 return _('Study course data are incomplete.'), None
             amount = academic_session.clearance_fee
-        elif category == 'bed_allocation':
-            p_item = self.getAccommodationDetails(student)['bt']
-            amount = academic_session.booking_fee
-        elif category == 'hostel_maintenance':
-            amount = 0.0
-            bedticket = student['accommodation'].get(
-                str(student.current_session), None)
-            if bedticket is not None and bedticket.bed is not None:
-                p_item = bedticket.bed_coordinates
-                if bedticket.bed.__parent__.maint_fee > 0:
-                    amount = bedticket.bed.__parent__.maint_fee
-                else:
-                    # fallback
-                    amount = academic_session.maint_fee
-            else:
-                return _(u'No bed allocated.'), None
+        #elif category == 'bed_allocation':
+        #    p_item = self.getAccommodationDetails(student)['bt']
+        #    amount = academic_session.booking_fee
+        #elif category == 'hostel_maintenance':
+        #    amount = 0.0
+        #    bedticket = student['accommodation'].get(
+        #        str(student.current_session), None)
+        #    if bedticket is not None and bedticket.bed is not None:
+        #        p_item = bedticket.bed_coordinates
+        #        if bedticket.bed.__parent__.maint_fee > 0:
+        #            amount = bedticket.bed.__parent__.maint_fee
+        #        else:
+        #            # fallback
+        #            amount = academic_session.maint_fee
+        #    else:
+        #        return _(u'No bed allocated.'), None
         else:
             fee_name = category + '_fee'

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/utils/utils.py

@@ -27 +27 @@
 
     PAYMENT_CATEGORIES = {
-        'schoolfee': 'School Fee',
+        'schoolfee40': 'Tuition Plus 40',
+        'schoolfee50': 'Tuition Plus 50',
+        'schoolfee60': 'Tuition Plus 60',
+        'schoolfee': 'Tuition Plus Total',
         'clearance': 'Acceptance Fee',
-        'bed_allocation': 'Bed Allocation Fee',
-        'hostel_maintenance': 'Accommodation',
+        #'bed_allocation': 'Bed Allocation Fee',
+        #'hostel_maintenance': 'Accommodation',
         #'transfer': 'Transfer Fee',
         #'gown': 'Gown Hire Fee',
@@ -52 +55 @@
 
     SELECTABLE_PAYMENT_CATEGORIES = {
-        'schoolfee': 'School Fee',
-        'clearance': 'Acceptance Fee',
+        'schoolfee40': 'Tuition, Accommodation, Adm. Charges (40% - 1st instalment)',
+        'schoolfee50': 'Tuition, Accommodation, Adm. Charges (50% - 1st instalment)',
+        'schoolfee60': 'Tuition, Accommodation, Adm. Charges (60% - 1st instalment)',
+        'schoolfee': 'Tuition, Accommodation, Adm. Charges (total amount)',
         #'bed_allocation': 'Bed Allocation Fee',
-        'hostel_maintenance': 'Accommodation',
+        #'hostel_maintenance': 'Accommodation',
         #'transfer': 'Transfer Fee',
         #'gown': 'Gown Hire Fee',
@@ -76 +81 @@
         }
 
-    PREVIOUS_PAYMENT_CATEGORIES = deepcopy(SELECTABLE_PAYMENT_CATEGORIES)
+    PREVIOUS_PAYMENT_CATEGORIES = {
+        'schoolfee': 'Tuition, Accommodation, Adm. Charges (total amount)',
+        'application': 'Application Fee',
+        'late_registration': 'Late Registration Fee',
+        'science': 'Science Bench Fee',
+        'clinical': 'Clinical Fee (Medical Students)',
+        'develop': 'Development Fee',
+        'municipal': 'Municipal Fee',
+        'alumni': 'Alumni Fee',
+        'conv': 'Convocation Fee',
+        'matric': 'Matriculation Fee',
+        'waecneco': 'WAEC & NECO Verification',
+        'jambver': 'JAMB Verification',
+        'book': 'Book Deposit',
+        'parentsconsult': 'Parents Consultative Forum (PCF) Fee',
+        'pharmlab': 'Pharmacy Lab Support Fee',
+        }