Changeset 6929 for main/waeup.sirp/trunk/src/waeup

Timestamp:

23 Oct 2011, 19:41:47 (13 years ago)

Author:

Henrik Bettermann

Message:

Add clearance payment category.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

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

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

@@ -244 +244 @@
         )
 
+    surcharge_1 = schema.Int(
+        title = u'Surcharge 1',
+        default = 0,
+        )
+
+    surcharge_2 = schema.Int(
+        title = u'Surcharge 2',
+        default = 0,
+        )
+
+    surcharge_3 = schema.Int(
+        title = u'Surcharge 3',
+        default = 0,
+        )
+
     fee_2 = schema.Int(
-        title = u'Surcharge',
+        title = u'Clearance Fee',
         default = 0,
         )

main/waeup.sirp/trunk/src/waeup/sirp/payments/vocabularies.py

@@ -10 +10 @@
 payment_categories = SimpleWAeUPVocabulary(
     ('School Fee','schoolfee'),
+    ('Clearance','clearance'),
     ('Hostel Maintenance','hostel_maintenance'),
     ('Transfer','transfer'),

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

@@ -661 +661 @@
         self.app['configuration'].addSessionConfiguration(configuration)
 
-        # Managers can add and remove online payment tickets
+        # Managers can add and remove online school fee payment tickets
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_student_path)
         self.browser.getLink("Manage").click()
         self.browser.getControl("Add online payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -683 +684 @@
         self.browser.getControl("Remove selected", index=0).click()
         self.assertTrue('Successfully removed' in self.browser.contents)
+
+        # Managers can add online clearance payment tickets
+        self.browser.open(self.payments_student_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['clearance']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)

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

@@ -38 +38 @@
     if category == 'schoolfee':
         amount = academic_session.fee_1
-        surcharge_1 = academic_session.fee_2
+        surcharge_1 = academic_session.surcharge_1
+        surcharge_2 = academic_session.surcharge_2
+        surcharge_3 = academic_session.surcharge_3
         p_item = student['studycourse'].certificate.code
+    elif category == 'clearance':
+        p_item = student['studycourse'].certificate.code
+        amount = academic_session.fee_2
     return (amount, p_item, p_session,
         surcharge_1, surcharge_2, surcharge_3, error)