Changeset 15976

Timestamp:

3 Feb 2020, 14:07:33 (5 years ago)

Author:

Henrik Bettermann

Message:

Change sports and library fee payment setting.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• interswitch/browser.py (modified) (4 diffs)
• students/browser.py (modified) (2 diffs)
• students/utils.py (modified) (1 diff)

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

@@ -368 +368 @@
                 xmldict['student_welfare_assurance_amt'] = 100 * student_welfare_assurance_amt
 
-                if student.entry_session == 2018 and student.is_fresh:
+                if student.entry_session >= 2018 and student.is_fresh:
                     xmldict['sports_amt'] = 100 * sports_amt
                     if student.is_postgrad:
@@ -632 +632 @@
         # Sports Fee
         elif self.context.p_category == 'sports':
-            self.pay_item_id = '000'
+            self.pay_item_id = '105'
             xmldict['institution_amt'] = 100 * (
                 gateway_net_amt(self.context.amount_auth))
@@ -638 +638 @@
         # Library Fee
         elif self.context.p_category == 'library':
-            self.pay_item_id = '000'
+            self.pay_item_id = '105'
             xmldict['institution_amt'] = 100 * (
                 gateway_net_amt(self.context.amount_auth))
@@ -644 +644 @@
         # Library PG Fee
         elif self.context.p_category == 'library_pg':
-            self.pay_item_id = '000'
+            self.pay_item_id = '105'
             xmldict['institution_amt'] = 100 * (
                 gateway_net_amt(self.context.amount_auth))

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -73 +73 @@
     NigeriaStudentClearanceEditFormPage,
     NigeriaAccommodationManageFormPage,
+    NigeriaAccommodationDisplayFormPage,
     NigeriaStudentBaseDisplayFormPage,
     NigeriaStudentBaseManageFormPage,
@@ -925 +926 @@
             self.context.student, studentview, note=self.note,
             omit_fields=self.omit_fields)
+
+class CustomAccommodationDisplayFormPage(NigeriaAccommodationDisplayFormPage):
+    """ Page to view bed tickets.
+    """
+    with_hostel_selection = True
 
 class CustomAccommodationManageFormPage(NigeriaAccommodationManageFormPage):

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

@@ -445 +445 @@
                     amount += gateway_net_amt(academic_session.welfare_fee) + \
                         gateway_net_amt(academic_session.union_fee)
-                if student.entry_session == 2018 and student.is_fresh:
+                if student.entry_session >= 2018 and student.is_fresh:
                     amount += gateway_net_amt(academic_session.sports_fee)
                     if student.is_postgrad: