Changeset 16080 for main

Timestamp:

4 May 2020, 06:42:28 (5 years ago)

Author:

Henrik Bettermann

Message:

Change payment categories.

Location:

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

Files:

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

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

@@ -272 +272 @@
         )
 
-    fab_lab_fee = schema.Float(
+    lab_1_fee = schema.Float(
         title = _(u'Faculty Laboratory Due (CHM102/PHY103/CSC101)'),
+        default = 0.0,
+        required = True,
+        )
+
+    lab_2_fee = schema.Float(
+        title = _(u'Laboratory Due (BIO101/BIO111)'),
         default = 0.0,
         required = True,

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

@@ -631 +631 @@
 
         # Faculty Laboratory Due
-        elif self.context.p_category == 'fab_lab':
+        elif self.context.p_category in ('lab_1', 'lab_2'):
             xmldict['institution_acct'] = '1016425386'
             xmldict['institution_bank_id'] = '117'

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

@@ -72 +72 @@
         'library_pg': 'Library Fee PG',
         'sports_library': 'Sports Development and UG Library Fee',
-        'fab_lab': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
+        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
+        'lab_2': 'Laboratory Due (BIO101/BIO111)',
         }
 
@@ -109 +110 @@
         #'library_pg': 'Library Fee PG',
         'sports_library': 'Sports Development and UG Library Fee',
-        'fab_lab': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
+        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
+        'lab_2': 'Laboratory Due (BIO101/BIO111)',
         }
 
@@ -150 +152 @@
         #'library': 'Library Fee UG',
         'sports_library': 'Sports Development and UG Library Fee',
-        'fab_lab': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
+        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
+        'lab_2': 'Laboratory Due (BIO101/BIO111)',
         }