Changeset 8263 for main/waeup.uniben/trunk/src/waeup/uniben/applicants

Timestamp:

24 Apr 2012, 15:37:51 (13 years ago)

Author:

Henrik Bettermann

Message:

Remove surcharge configuration completely.

Implement application fee and school fee payments via Interswitch (part 3)

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• browser.py (modified) (4 diffs)
• payment.py (modified) (1 diff)

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

@@ -29 +29 @@
     ApplicantManageFormPage, ApplicantEditFormPage,
     ApplicantRegistrationPage, ApplicantAddFormPage,
-    OnlinePaymentDisplayFormPage, AcceptanceFeePaymentAddPage,
+    OnlinePaymentDisplayFormPage, ApplicationFeePaymentAddPage,
     OnlinePaymentBreadcrumb, ExportPDFPaymentSlipPage,
     ApplicantBaseDisplayFormPage)
@@ -127 +127 @@
     """
     grok.context(ICustomApplicantOnlinePayment)
-    form_fields = grok.AutoFields(ICustomApplicantOnlinePayment).omit(
-        'surcharge_1', 'surcharge_2', 'surcharge_3', 'ac')
+    form_fields = grok.AutoFields(ICustomApplicantOnlinePayment).omit('ac')
     form_fields[
         'creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
@@ -140 +139 @@
         return tcode[len(tcode)-8:len(tcode)]
 
-class CustomAcceptanceFeePaymentAddPage(AcceptanceFeePaymentAddPage):
+class CustomApplicationFeePaymentAddPage(ApplicationFeePaymentAddPage):
     """ Page to add an online payment ticket
     """
@@ -146 +145 @@
 
     def _fillCustomFields(self, payment, session_config):
-        payment.surcharge_1 = session_config.surcharge_1
-        payment.surcharge_2 = session_config.surcharge_2
-        payment.surcharge_3 = session_config.surcharge_3
+        # No custom fields at the moment
         return payment
 

main/waeup.uniben/trunk/src/waeup/uniben/applicants/payment.py

@@ -17 +17 @@
 ##
 """
-Acceptance fee payment.
+Application fee payment.
 """
 import grok