Changeset 17437 for main/waeup.aaue/trunk/src/waeup/aaue/interswitch

Timestamp:

19 Jun 2023, 06:51:53 (20 months ago)

Author:

Henrik Bettermann

Message:

Rename Fees.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests.py (modified) (5 diffs)

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

@@ -56 +56 @@
 
 BANK_ACCOUNTS = {
-    'edohis':   ('1222577132', '117', 'Edo State Health Insurance'),
-    'union':    ('1019763348', '7', 'Student Union'),
-    'sport':    ('1021941220', '7', 'Sport Development'),
-    'access':   ('1012688013', '123', 'Access Card'),
-    'notebook': ('4011210501', '51', 'Branded Notebook'),
-    'library':  ('2000122995', '8', 'Library Development'),
-    'fac1':     ('1022438743', '7', 'Faculty Fee'),
-    'fac2':     ('2000249757', '8', 'Faculty Fee'),
-    'fac3':     ('1012678566', '123', 'Faculty Fee'),
-    'acceptance': ('2000249757', '8', 'Acceptance Fee'),
-    'matricgown': ('2000249757', '8', 'Matriculation Gown Fee'),
-    'lapel':      ('2000249757', '8', 'Lapel Fee'),
+    'edohis':   ('1222577132', '117'),
+    'union':    ('1019763348', '7'),
+    'sport':    ('1021941220', '7'),
+    'access':   ('1012688013', '123'),
+    'notebook': ('4011210501', '51'),
+    'library':  ('2000122995', '8'),
+    'fac1':     ('1022438743', '7'),
+    'fac2':     ('2000249757', '8'),
+    'fac3':     ('1012678566', '123'),
+    'acceptance': ('2000249757', '8'),
+    'matricgown': ('2000249757', '8'),
+    'lapel':      ('2000249757', '8'),
+    }
+
+FEE_NAMES = {
+    'edohis':     'Edo State Health Insurance Scheme',
+    'union':      'Student Union Dues',
+    'sport':      'Sport Development Fee',
+    'access':     'Access Card Fee',
+    'notebook':   'Branded Notebook',
+    'library':    'Library Development Fee',
+    'tuition':    'Tuition',
+    'acceptance': 'Acceptance Fee',
+    'matricgown': 'Matriculation Gown Fee',
+    'lapel':      'File-Lapel Fee',
+    'lmsplus':    'LMS Plus Fee',
+    'nuga':       'NUGA Fee',
     }
 
@@ -263 +278 @@
                         acct_num = bank[0]
                         bank_id = bank[1]
-                        item_name = "%s (%s)" % (bank[2], item[0])
+                        item_name = FEE_NAMES[item[0]]
                         xmltext += """
 <item_detail item_id="%s" item_name="%s" item_amt="%d" bank_id="%s" acct_num="%s" />""" % (item_id, item_name, item_amt, bank_id, acct_num)
@@ -300 +315 @@
                         acct_num = bank[0]
                         bank_id = bank[1]
-                        item_name = "%s (%s)" % (bank[2], item[0])
+                        item_name = FEE_NAMES[item[0]]
                         xmltext += """
 <item_detail item_id="%s" item_name="%s" item_amt="%d" bank_id="%s" acct_num="%s" />""" % (item_id, item_name, item_amt, bank_id, acct_num)

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

@@ -268 +268 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Faculty Fee (tuition)" item_amt="18400000" bank_id="7" '
+            'item_name="Tuition" item_amt="18400000" bank_id="7" '
             'acct_num="1022438743"' in self.browser.contents)
 
@@ -291 +291 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee (2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
+            'item_name="Tuition (2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
 
         self.browser.open(self.payments_path + '/addop')
@@ -305 +305 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Faculty Fee (lmsplus)" item_amt="2000000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
-        self.assertTrue(
-            'item_name="Faculty Fee (tuition)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
+            'item_name="LMS Plus Fee" item_amt="2000000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
+        self.assertTrue(
+            'item_name="Tuition" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
 
         self.browser.open(self.payments_path + '/addop')
@@ -321 +321 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee (2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
+            'item_name="Tuition (2nd instalment)" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
 
     def disabled_test_interswitch_form_pt_acceptance_fees(self):
@@ -372 +372 @@
         self.assertTrue(self.student['payments'].values()[0].net_amt == 16800)
         self.assertTrue(
-            'item_name="Acceptance Fee (acceptance)" item_amt="1400000" bank_id="8" '
+            'item_name="Acceptance Fee" item_amt="1400000" bank_id="8" '
             'acct_num="2000249757"' in self.browser.contents)