Changeset 13523

Timestamp:

2 Dec 2015, 12:01:00 (9 years ago)

Author:

Henrik Bettermann

Message:

Disable removal of payment tickets by students.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests/test_browser.py (modified) (5 diffs)

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

@@ -19 +19 @@
 from zope.i18n import translate
 from zope.component import getUtility
+from zope.security import checkPermission
 from zope.formlib.textwidgets import BytesDisplayWidget
 from waeup.kofa.browser.layout import UtilityView
@@ -34 +35 @@
     BedTicketAddPage,
     StudentFilesUploadPage,
+    PaymentsManageFormPage,
     )
 from kofacustom.nigeria.students.browser import (
@@ -126 +128 @@
     form_fields = grok.AutoFields(ICustomStudentOnlinePayment).select(
         'p_category')
+
+class CustomPaymentsManageFormPage(PaymentsManageFormPage):
+    """ Page to manage the student payments.
+
+    This manage form page is for both students and students officers.
+    """
+    @property
+    def manage_payments_allowed(self):
+        return checkPermission('waeup.manageStudent', self.context)
 
 class CustomExportPDFPaymentSlip(NigeriaExportPDFPaymentSlip):

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

@@ -305 +305 @@
         self.browser.getControl("Create ticket").click()
         self.assertTrue('ticket created' in self.browser.contents)
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[0]
+        value = self.student['payments'].keys()[0]
         self.browser.getLink(value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
@@ -322 +321 @@
         self.browser.getControl("Create ticket").click()
         self.assertTrue('ticket created' in self.browser.contents)
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[1]
+        value = self.student['payments'].keys()[1]
         self.browser.getLink(value).click()
         self.assertTrue('<span>My bed coordinates</span>' in self.browser.contents)
@@ -348 +346 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
-        self.browser.open(self.payments_path)
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[0]
         self.browser.getLink("Study Course").click()
         self.browser.getLink("Add course list").click()
@@ -360 +355 @@
         self.browser.getControl("Register course list").click()
         self.assertTrue('Course registration has ended. Please pay' in self.browser.contents)
-        self.student['payments'][value].approve()
+        self.student['payments'].values()[0].approve()
         self.browser.getControl("Register course list").click()
         self.assertTrue('Course list has been registered' in self.browser.contents)
@@ -367 +362 @@
         # register courses.
         self.student['studycourse'].entry_session = 2004
-        del self.student['payments'][value]
+        del self.student['payments'][self.student['payments'].keys()[0]]
         IWorkflowState(self.student).setState('school fee paid')
         self.browser.open(self.studycourse_path + '/100/edit')