Changeset 8842 for main

Timestamp:

27 Jun 2012, 12:47:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Merged with waeup.uniben 8838:8839.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• . (modified) (1 prop)
• applicants/browser.py (modified) (3 diffs)
• applicants/browser_templates/payment_view.pt (deleted)
• students/browser.py (modified) (3 diffs)
• students/browser_templates/payment_view.pt (deleted)

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py

@@ -44 +44 @@
     UG_OMIT_RESULT_SLIP_FIELDS)
 from waeup.fceokene.interfaces import MessageFactory as _
-
-#class RequestCallbackActionButton(RequestCallbackActionButton):
-#    """ Display the base package callback button in custom pages.
-#    """
-#    grok.context(ICustomApplicantOnlinePayment)
-
-#class CustomOnlinePaymentCallbackPage(OnlinePaymentCallbackPage):
-#    """ Activate callback simulation view
-#    """
-#    grok.context(ICustomApplicantOnlinePayment)
 
 class CustomOnlinePaymentBreadcrumb(OnlinePaymentBreadcrumb):
@@ -174 +164 @@
     form_fields[
         'payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-    grok.template('payment_view')
-
-    @property
-    def transaction_code(self):
-        tcode = self.context.p_id
-        return tcode[len(tcode)-8:len(tcode)]
 
 class CustomApplicationFeePaymentAddPage(ApplicationFeePaymentAddPage):
@@ -194 +178 @@
     form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
 
-    @property
-    def note(self):
-        if self.context.p_state == 'paid':
-            return None
-        tcode = self.context.p_id
-        tcode = tcode[len(tcode)-8:len(tcode)]
-        amount = self.context.amount_auth
-        note = translate(_(
-            u"""<br /><br /><br />
-The tranzaction code is <strong>${a}</strong>.""",
-            mapping = {'a':tcode}))
-        return note
+class CustomApplicantRegistrationPage(ApplicantRegistrationPage):
+    """Captcha'd registration page for applicants.
+    """
+
+    #def _redirect(self, email, password, applicant_id):
+    #    # Forward email and credentials to landing page.
+    #    self.redirect(self.url(self.context, 'registration_complete',
+    #        data = dict(email=email, password=password,
+    #        applicant_id=applicant_id)))
+    #    return

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

@@ -42 +42 @@
 from waeup.kofa.students.workflow import ADMITTED
 
-#class RequestCallbackActionButton(RequestCallbackActionButton):
-#    """ Display the base package callback button in custom pages.
-#    """
-#    grok.context(ICustomStudentOnlinePayment)
-
-#class CustomOnlinePaymentCallbackPage(OnlinePaymentCallbackPage):
-#    """ Activate callback simulation view
-#    """
-#    grok.context(ICustomStudentOnlinePayment)
-
 class CustomOnlinePaymentBreadcrumb(OnlinePaymentBreadcrumb):
     """A breadcrumb for payments.
@@ -168 +158 @@
     form_fields[
         'payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-    #grok.template('payment_view')
-
-    #@property
-    #def transaction_code(self):
-    #    tcode = self.context.p_id
-    #    return tcode[len(tcode)-8:len(tcode)]
 
 class CustomOnlinePaymentAddFormPage(OnlinePaymentAddFormPage):
@@ -201 +185 @@
     form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-
-#    @property
-#    def note(self):
-#        tcode = self.context.p_id
-#        tcode = tcode[len(tcode)-8:len(tcode)]
-#        amount = self.context.amount_auth
-#        note = translate(_(
-#            u"""<br /><br /><br />
-#The tranzaction code is <strong>${a}</strong>.""",
-#            mapping = {'a':tcode}))
-#        return note
 
 class StudentPassportActionButton(StudentPassportActionButton):