Changeset 9862

Timestamp:

11 Jan 2013, 09:03:19 (12 years ago)

Author:

Henrik Bettermann

Message:

Derive PreviousPaymentAddFormPage? from KofaAddFormPage? and simplify createTicket. A similar view will be used for balance payments.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• students/browser.py (modified) (3 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -1474 +1474 @@
         self.redirect(self.url(self.context))
 
-class PreviousPaymentAddFormPage(OnlinePaymentAddFormPage):
+class PreviousPaymentAddFormPage(KofaAddFormPage):
     """ Page to add an online payment ticket for previous sessions
     """
@@ -1486 +1486 @@
     pnav = 4
 
+    @property
+    def selectable_categories(self):
+        categories = getUtility(
+            IKofaUtils).SELECTABLE_PREVIOUS_PAYMENT_CATEGORIES
+        return sorted(categories.items())
+
     def update(self):
         if self.context.student.before_payment:
@@ -1492 +1498 @@
         super(PreviousPaymentAddFormPage, self).update()
         return
+
+    @action(_('Create ticket'), style='primary')
+    def createTicket(self, **data):
+        p_category = data['p_category']
+        previous_session = data.get('p_session', None)
+        previous_level = data.get('p_level', None)
+        student = self.context.__parent__
+        students_utils = getUtility(IStudentsUtils)
+        error, payment = students_utils.setPaymentDetails(
+            p_category, student, previous_session, previous_level)
+        if error is not None:
+            self.flash(error)
+            return
+        self.context[payment.p_id] = payment
+        self.flash(_('Payment ticket created.'))
+        self.redirect(self.url(self.context))
+        return
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
 
 class OnlinePaymentDisplayFormPage(KofaDisplayFormPage):

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

@@ -162 +162 @@
 
     SELECTABLE_PAYMENT_CATEGORIES = PAYMENT_CATEGORIES
+
+    SELECTABLE_PREVIOUS_PAYMENT_CATEGORIES = SELECTABLE_PAYMENT_CATEGORIES
 
     MODE_GROUPS = {