Changeset 13402

Timestamp:

7 Nov 2015, 05:24:45 (9 years ago)

Author:

Henrik Bettermann

Message:

Change fee titles.

Location:

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

Files:

• interswitch/tests.py (modified) (3 diffs)
• utils/utils.py (modified) (4 diffs)

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

@@ -139 +139 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="School Fee plus Student Union Dues and Welfare Ass." '
+            'item_name="School Fee plus Students\' Union and Welfare Assurance Fees" '
             'item_amt="4600000" bank_id="7" '
             'acct_num="1014847058"' in self.browser.contents)
@@ -213 +213 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="Acceptance Fee plus Matric Gown Fee and Lapel Fee" '
+            'item_name="Acceptance Fee plus Matric Gown and Lapel/File Fees" '
             'item_amt="4000000" bank_id="117" '
             'acct_num="1014066976"' in self.browser.contents)
@@ -274 +274 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="AAU Student Welfare Assurance Fee" item_amt="131700" '
+            'item_name="Student Welfare Assurance Fee" item_amt="131700" '
             'bank_id="123" acct_num="1006407792"'
             in self.browser.contents)

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

@@ -31 +31 @@
         'schoolfee_1': 'School Fee 1st instalment',
         'schoolfee_2': 'School Fee 2nd instalment',
-        'schoolfee_incl': 'School Fee plus Student Union Dues and Welfare Ass.',
+        'schoolfee_incl': 'School Fee plus Students\' Union and Welfare Assurance Fees',
         'clearance': 'Acceptance Fee',
-        'clearance_incl': 'Acceptance Fee plus Matric Gown Fee and Lapel Fee',
+        'clearance_incl': 'Acceptance Fee plus Matric Gown and Lapel/File Fees',
         'hostel_maintenance': 'Hostel Maintenance Fee',
         'application': 'Application Fee',
@@ -41 +41 @@
         'transcript': 'Transcript Fee',
         'late_registration': 'Late Course Registration Fee',
-        'welfare': 'AAU Student Welfare Assurance Fee',
-        'union': 'Students\' Union Due',
-        'lapel': 'AAU Lapel/File Fee',
+        'welfare': 'Student Welfare Assurance Fee',
+        'union': 'Students\' Union Dues',
+        'lapel': 'Lapel/File Fee',
         'matric_gown': 'Matriculation Gown Fee',
         'concessional': 'Concessional Fee',
@@ -53 +53 @@
         #'schoolfee_1': 'School Fee 1st instalment',
         #'schoolfee_2': 'School Fee 2nd instalment',
-        'schoolfee_incl': 'School Fee plus Students Union Due and Welfare Ass.',
+        'schoolfee_incl': 'School Fee plus Students\' Union and Welfare Assurance Fees',
         'clearance': 'Acceptance Fee',
-        'clearance_incl': 'Acceptance Fee plus Matric Gown Fee and Lapel Fee',
+        'clearance_incl': 'Acceptance Fee plus Matric Gown and Lapel/File Fees',
         'hostel_maintenance': 'Hostel Maintenance Fee',
         'application': 'Application Fee',
@@ -63 +63 @@
         'transcript': 'Transcript Fee',
         'late_registration': 'Late Course Registration Fee',
-        'welfare': 'AAU Student Welfare Assurance Fee',
-        'union': 'Students\' Union Due',
-        'lapel': 'AAU Lapel/File Fee',
+        'welfare': 'Student Welfare Assurance Fee',
+        'union': 'Students\' Union Dues',
+        'lapel': 'Lapel/File Fee',
         'matric_gown': 'Matriculation Gown Fee',
         'concessional': 'Concessional Fee',