Changeset 15978 for main

Timestamp:

4 Feb 2020, 09:50:05 (5 years ago)

Author:

Henrik Bettermann

Message:

Combine sports and library fees.

Location:

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

Files:

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

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

@@ -260 +260 @@
         )
 
+    sports_library_fee = schema.Float(
+        title = _(u'Sports Development and UG Library Fee'),
+        default = 0.0,
+        required = True,
+        )
+
     ict_fee = schema.Float(
         title = _(u'ICT Fee'),

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

@@ -631 +631 @@
 
         # Sports Fee
-        elif self.context.p_category == 'sports':
+        #elif self.context.p_category == 'sports':
+        #    self.pay_item_id = '105'
+        #    xmldict['institution_amt'] = 100 * (
+        #        gateway_net_amt(self.context.amount_auth))
+
+        # Library Fee
+        #elif self.context.p_category == 'library':
+        #    self.pay_item_id = '105'
+        #    xmldict['institution_amt'] = 100 * (
+        #        gateway_net_amt(self.context.amount_auth))
+
+        # Library PG Fee
+        #elif self.context.p_category == 'library_pg':
+        #    self.pay_item_id = '105'
+        #    xmldict['institution_amt'] = 100 * (
+        #        gateway_net_amt(self.context.amount_auth))
+
+        # Sports & Library Fee
+        elif self.context.p_category == 'sports_library':
             self.pay_item_id = '105'
             xmldict['institution_amt'] = 100 * (
                 gateway_net_amt(self.context.amount_auth))
 
-        # Library Fee
-        elif self.context.p_category == 'library':
-            self.pay_item_id = '105'
-            xmldict['institution_amt'] = 100 * (
-                gateway_net_amt(self.context.amount_auth))
-
-        # Library PG Fee
-        elif self.context.p_category == 'library_pg':
-            self.pay_item_id = '105'
-            xmldict['institution_amt'] = 100 * (
-                gateway_net_amt(self.context.amount_auth))
 
         # Late Registration Fee

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

@@ -71 +71 @@
         'library': 'Library Fee UG',
         'library_pg': 'Library Fee PG',
+        'sports_library': 'Sports Development and UG Library Fee',
         }
 
@@ -103 +104 @@
         'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
         'restitution': 'Restitution Fee',
-        'sports': 'Sports Fee',
-        'library': 'Library Fee UG',
-        'library_pg': 'Library Fee PG',
+        #'sports': 'Sports Fee',
+        #'library': 'Library Fee UG',
+        #'library_pg': 'Library Fee PG',
+        'sports_library': 'Sports Development and UG Library Fee',
         }
 
@@ -117 +119 @@
         'schoolfee': 'School Fee',
         'late_registration': 'Late Course Registration Fee',
-        'library_pg': 'Library Fee PG',
+        #'library_pg': 'Library Fee PG',
+        'sports_library': 'Sports Development and UG Library Fee',
         }
 
@@ -125 +128 @@
         'schoolfee_1': 'School Fee (1st instalment)',
         'schoolfee_2': 'School Fee (2nd instalment)',
-        'sports': 'Sports Fee',
-        'library': 'Library Fee UG',
+        #'sports': 'Sports Fee',
+        #'library': 'Library Fee UG',
+        'sports_library': 'Sports Development and UG Library Fee',
         }
 
@@ -141 +145 @@
         'gst_text_book_3': 'Text Book Fee GST222',
         'late_registration': 'Late Course Registration Fee',
-        'sports': 'Sports Fee',
-        'library': 'Library Fee UG',
+        #'sports': 'Sports Fee',
+        #'library': 'Library Fee UG',
+        'sports_library': 'Sports Development and UG Library Fee',
         }