Changeset 11621 for main/waeup.aaue/trunk/src/waeup

Timestamp:

5 May 2014, 17:14:11 (11 years ago)

Author:

Henrik Bettermann

Message:

Remove some unused payment options with tests.

Location:

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

Files:

• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_utils.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -157 +157 @@
                            self.browser.contents)
         self.browser.open(self.payments_path + '/addop')
-        # Also the other payments can be made
-        self.browser.getControl(name="form.p_category").value = ['gown']
-        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 = ['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']
-        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 = ['hostel_maintenance']
-        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 = ['clearance']
-        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 = ['late_registration']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -85 +85 @@
         self.assertEqual(error, None)
 
-        error, payment = utils.setPaymentDetails('gown',self.student)
-        self.assertEqual(payment.p_level, 100)
-        self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 150.0)
-        self.assertEqual(payment.p_item, u'')
-        self.assertEqual(error, None)
-
-        error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
-        self.assertEqual(payment.p_level, 100)
-        self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 180.0)
-        self.assertEqual(payment.p_item, u'')
-        self.assertEqual(error, None)
-
-        error, payment = utils.setPaymentDetails('bed_allocation',self.student)
-        self.assertEqual(payment.p_level, 100)
-        self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 150.0)
-        self.assertEqual(payment.p_item, u'')
-        self.assertEqual(error, None)
-
-        error, payment = utils.setPaymentDetails('transfer',self.student)
-        self.assertEqual(payment.p_level, 100)
-        self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 90.0)
-        self.assertEqual(payment.p_item, u'')
-        self.assertEqual(error, None)
-
         error, payment = utils.setPaymentDetails('schoolfee',self.student, 2004, 100)
         self.assertEqual(error, u'Previous session payment not yet implemented.')

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

@@ -46 +46 @@
         #'schoolfee_2': 'School Fee 2nd instalment',
         'clearance': 'Acceptance Fee',
-        'hostel_maintenance': 'Hostel Maintenance Fee',
+        #'hostel_maintenance': 'Hostel Maintenance Fee',
         'application': 'Application Fee',
-        'gown': 'Gown Hire Fee',
-        'bed_allocation': 'Bed Allocation Fee',
-        'transfer': 'Transfer Fee',
+        #'gown': 'Gown Hire Fee',
+        #'bed_allocation': 'Bed Allocation Fee',
+        #'transfer': 'Transfer Fee',
         'transcript': 'Transcript Fee',
-        'late_registration': 'Late Registration Fee',
+        #'late_registration': 'Late Registration Fee',
         }