Changeset 8294

Timestamp:

27 Apr 2012, 06:32:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Dynamize acceptance fee (clearance fee) payment.

Location:

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

Files:

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

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

@@ -93 +93 @@
 
     clearance_fee = schema.Float(
-        title = _(u'Clearance Fee'),
+        title = _(u'Clearance Fee (ignored)'),
         default = 0.0,
         required = False,
@@ -107 +107 @@
 
     maint_fee = schema.Float(
-        title = _(u'Maintenance Fee'),
+        title = _(u'Maintenance Fee (ignored)'),
         default = 0.0,
         required = False,

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

@@ -138 +138 @@
         self.app['configuration']['2004'].gown_fee = 150.0
         self.app['configuration']['2004'].transfer_fee = 90.0
-        self.app['configuration']['2004'].clearance_fee = 120.0
+        #self.app['configuration']['2004'].clearance_fee = 120.0
+        self.app['configuration']['2004'].booking_fee = 150.0
         self.app['configuration']['2004'].maint_fee = 180.0
 
@@ -181 +182 @@
         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.certificate.study_mode = 'ug_pt'
         self.browser.open(self.payments_path + '/addop')

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

@@ -112 +112 @@
         elif category == 'clearance':
             d['p_item'] = student['studycourse'].certificate.code
-            d['amount'] = academic_session.clearance_fee
+            if d['p_item'] in ('BEDCET', 'BIOEDCET', 'CHMEDCET', 'ISEDCET',
+                'MTHEDCET', 'PHYEDCET', 'ITECET', 'AGREDCET', 'HEEDCET'):
+                d['amount'] = 17250.0
+            else:
+                d['amount'] = 34250.0
         elif category == 'schoolfee':
             d['amount'] = get_school_fee(student)