Changeset 16882 for main/kofacustom.unidel/trunk

Timestamp:

15 Mar 2022, 08:51:02 (3 years ago)

Author:

Henrik Bettermann

Message:

Let's use bed allocation payment tickets for pre-reservation.

Location:

main/kofacustom.unidel/trunk/src/kofacustom/unidel

Files:

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

main/kofacustom.unidel/trunk/src/kofacustom/unidel/interswitch/browser.py

@@ -96 +96 @@
             xmldict['institution_acct'] = '1011739172'
             xmldict['institution_bank_id'] = '117'
-        if self.context.p_category == 'bed_allocation':
+        if self.context.p_category == 'hostel_maintenance':
             xmldict['institution_acct'] = '1012551384'
             xmldict['institution_bank_id'] = '117'

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

@@ -118 +118 @@
         elif category == 'bed_allocation':
             p_item = self.getAccommodationDetails(student)['bt']
-            amount = academic_session.booking_fee
+            amount = 0.0
         elif category == 'hostel_maintenance':
             amount = 0.0
@@ -145 +145 @@
             fee_name = category + '_fee'
             amount = getattr(academic_session, fee_name, 0.0)
-        if amount in (0.0, None):
+        if category != 'bed_allocation' and amount in (0.0, None):
             return _('Amount could not be determined.'), None
         if self.samePaymentMade(student, category, p_item, p_session):

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

@@ -28 +28 @@
         'schoolfee': 'School Fee',
         'clearance': 'Acceptance Fee',
-        'bed_allocation': 'Bed Allocation Fee',
-        #'hostel_maintenance': 'Hostel Maintenance Fee',
+        'bed_allocation': 'Bed Reservation',
+        'hostel_maintenance': 'Accommodation Fee',
         #'transfer': 'Transfer Fee',
         #'gown': 'Gown Hire Fee',
@@ -42 +42 @@
         'schoolfee': 'School Fee',
         'clearance': 'Acceptance Fee',
-        'bed_allocation': 'Bed Allocation Fee',
+        'bed_allocation': 'Bed Reservation (free of charge)',
+        'hostel_maintenance': 'Accommodation Fee',
         }