Changeset 9731 for main/waeup.uniben/trunk/src/waeup

Timestamp:

27 Nov 2012, 15:02:34 (12 years ago)

Author:

Henrik Bettermann

Message:

Setup SELECTABLE_PAYMENT_CATEGORIES dictionary. Uniben students must not see the regular maintenance fee button.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• interswitch/tests.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (5 diffs)
• utils/utils.py (modified) (2 diffs)

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

@@ -209 +209 @@
             self.browser.contents)
         self.assertMatches(
-            '...<item_detail item_id="1" item_name="Hostel Maint. Fee" item_amt="800000" bank_id="129" acct_num="0014414547" />...',
+            '...<item_detail item_id="1" item_name="Hostel Maintenance Fee" item_amt="800000" bank_id="129" acct_num="0014414547" />...',
             self.browser.contents)
         self.assertFalse(

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py

@@ -221 +221 @@
         self.student.nationality = u'NG'
         self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -237 +238 @@
         ticket.p_state = 'paid'
         self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...This type of payment has already been made...',
@@ -245 +247 @@
             del self.student['payments'][payment]
         self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -255 +258 @@
                            self.browser.contents)
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['transfer']
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...ticket created...',
-                           self.browser.contents)
-        self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(
-            name="form.p_category").value = ['bed_allocation']
+            name="form.p_category").value = ['tempmaint_1']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -267 +265 @@
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(
-            name="form.p_category").value = ['hostel_maintenance']
+            name="form.p_category").value = ['tempmaint_2']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(
+            name="form.p_category").value = ['tempmaint_3']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',

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

@@ -50 +50 @@
         'clearance': 'Acceptance Fee',
         'bed_allocation': 'Bed Allocation Fee',
-        'hostel_maintenance': 'Hostel Maint. Fee',
+        'hostel_maintenance': 'Hostel Maintenance Fee',
         'tempmaint_1': 'Hall 1-4 M/F Ekehuan',
         'tempmaint_2': 'Hall 5 M/F',
@@ -58 +58 @@
         'application': 'Application Fee'
         }
+
+    SELECTABLE_PAYMENT_CATEGORIES = {
+        'schoolfee': 'School Fee',
+        'clearance': 'Acceptance Fee',
+        'tempmaint_1': 'Hall 1-4 M/F Ekehuan Maintenance Fee',
+        'tempmaint_2': 'Hall 5 M/F Maintenance Fee',
+        'tempmaint_3': 'Clinical Hostel Maintenance Fee',
+        'gown': 'Gown Hire Fee',
+        'application': 'Application Fee'
+        }