Changeset 15181

Timestamp:

2 Oct 2018, 15:03:19 (6 years ago)

Author:

Henrik Bettermann

Message:

See ticket #513.

Location:

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

Files:

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

main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

@@ -243 +243 @@
 
     library_fee = schema.Float(
-        title = _(u'Library Development Fee'),
+        title = _(u'Library Development Fee UG'),
+        default = 0.0,
+        required = True,
+        )
+
+    library_fee_pg = schema.Float(
+        title = _(u'Library Development Fee PG'),
         default = 0.0,
         required = True,

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

@@ -244 +244 @@
                 library_amt = gateway_net_amt(
                     academic_session.library_fee)
+                library_amt_pg = gateway_net_amt(
+                    academic_session.library_fee_pg)
                 xmldict['student_union_bank_id'] = '31'
                 xmldict['student_union_acct'] = '0051005007'
@@ -267 +269 @@
                 library_amt = gateway_net_amt(
                     academic_session.library_fee)
+                library_amt_pg = gateway_net_amt(
+                    academic_session.library_fee_pg)
                 xmldict['student_union_bank_id'] = '7'
                 xmldict['student_union_acct'] = '1019763348'
@@ -293 +297 @@
                 xmldict['student_welfare_assurance_amt'] = 100 * student_welfare_assurance_amt
                 xmldict['sports_amt'] = 100 * sports_amt
-                xmldict['library_amt'] = 100 * library_amt
+                if student.is_postgrad:
+                    xmldict['library_amt'] = 100 * library_amt_pg
+                else:
+                    xmldict['library_amt'] = 100 * library_amt
                 xmldict['institution_amt'] = 100 * (
                     gateway_net_amt(self.context.amount_auth)

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

@@ -438 +438 @@
                     amount += gateway_net_amt(academic_session.welfare_fee) + \
                         gateway_net_amt(academic_session.union_fee)
-                gateway_net_amt(academic_session.sports_fee)
-                gateway_net_amt(academic_session.library_fee)
+                amount += gateway_net_amt(academic_session.sports_fee)
+                if student.is_postgrad:
+                    amount += gateway_net_amt(academic_session.library_fee_pg)
+                else:
+                    amount += gateway_net_amt(academic_session.library_fee)
                 if student.entry_session == 2016 \
                     and student.entry_mode == 'ug_ft' \

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

@@ -65 +65 @@
         'fac_dep': 'Faculty and Departmental Dues',
         'restitution': 'Restitution Fee',
-        'sports_develop': 'Sports Development Fee',
-        'library_develop': 'Library Development Fee',
         }