Changeset 15388

Timestamp:

5 Apr 2019, 12:25:30 (5 years ago)

Author:

Henrik Bettermann

Message:

Restrict study modes ug_dsh and de_dsh from paying some following items.

Location:

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

Files:

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

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

@@ -343 +343 @@
 
     def test_interswitch_form_concessional_fees(self):
-        self.certificate.study_mode = 'ug_pt'
+        self.certificate.study_mode = 'ug_ft'
         self.app['configuration']['2004'].concessional_fee = 1567.0
         # Manager can access InterswitchForm

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -332 +332 @@
         }
 
+    PT_AND_DSH_PAYMENT_CATS =  {
+        'clearance_incl': 'Acceptance Fee Plus',
+        'schoolfee_incl': 'School Fee Plus',
+        'ent_registration_1': 'Registration Fee ENT201',
+        'ent_text_book_1': 'Text Book Fee ENT201',
+        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
+        'gst_registration_2': 'Registration Fee GST222',
+        'gst_text_book_0': 'Text Book Fee GST101 GST102 GST111 GST112',
+        'gst_text_book_1': 'Text Book Fee GST101 GST102',
+        'gst_text_book_2': 'Text Book Fee GST111 GST112',
+        'gst_text_book_3': 'Text Book Fee GST222',
+        }
+
     @property
     def selectable_categories(self):
@@ -339 +352 @@
             'special_pg_ft', 'special_pg_pt', 'found', 'bridge'):
             return self.REDUCED_PAYMENT_CATS.items()
+        if self.context.student.current_mode in (
+            'ug_pt', 'de_pt','dp_pt', 'de_dsh', 'ug_dsh'):
+            return self.PT_AND_DSH_PAYMENT_CATS.items()
         if self.context.student.current_mode == 'ijmbe':
             return sorted(self.IJMBE_PAYMENT_CATS.items())

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

@@ -25 +25 @@
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from datetime import datetime, timedelta, date
-from mechanize import LinkNotFoundError
+from mechanize import LinkNotFoundError, ItemNotFoundError
 from hurry.workflow.interfaces import IWorkflowState
 from zope.event import notify
@@ -231 +231 @@
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
-        self.browser.getControl("Create ticket").click()
-        self.assertTrue(
-            'Part-time students are not allowed' in self.browser.contents)
+        self.assertFalse('schoolfee_1' in self.browser.contents)
+        #self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
+        #self.browser.getControl("Create ticket").click()
+        #self.assertTrue(
+        #    'Part-time students are not allowed' in self.browser.contents)
         self.student['studycourse'].certificate.study_mode = 'ug_ft'
         self.browser.open(self.payments_path + '/addop')
+        self.assertTrue('schoolfee_1' in self.browser.contents)
         self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
         self.browser.getControl("Create ticket").click()