Changeset 8712

Timestamp:

13 Jun 2012, 14:00:52 (12 years ago)

Author:

Henrik Bettermann

Message:

Payment factory name is waeup.StudentOnlinePayment?, otherwise regular payment objects instead of custom objects are created during import.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• students/payments.py (modified) (2 diffs)
• students/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

@@ -36 +36 @@
     ('Other Certification','oc'),
     ('Higher National Diploma','hnd'),
+    ('Post Graduate Diploma','pgd'),
     ('NCE AL OTH','nce_al_oth'),
     ('National Defence Academy','nda'),

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

@@ -23 +23 @@
 from zope.interface import implementedBy
 from waeup.kofa.students.interfaces import IStudentNavigation
-from waeup.kofa.students.payments import StudentOnlinePayment
+from waeup.kofa.students.payments import (
+    StudentOnlinePayment, StudentOnlinePaymentFactory)
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.aaue.students.interfaces import ICustomStudentOnlinePayment
@@ -47 +48 @@
 CustomStudentOnlinePayment = attrs_to_fields(CustomStudentOnlinePayment)
 
-# Student online payments must be importable. So we might need a factory.
-class CustomStudentOnlinePaymentFactory(grok.GlobalUtility):
+class CustomStudentOnlinePaymentFactory(StudentOnlinePaymentFactory):
     """A factory for student online payments.
     """
-    grok.implements(IFactory)
-    grok.name(u'waeup.CustomStudentOnlinePayment')
-    title = u"Create a new online payment.",
-    description = u"This factory instantiates new online payment instances."
 
     def __call__(self, *args, **kw):

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

@@ -30 +30 @@
     """
     grok.implements(IStudentsUtils)
-
-    paymentfactory = u'waeup.CustomStudentOnlinePayment'
 
     def getReturningData(self, student):
@@ -121 +119 @@
                ticket.p_session == p_session:
                   return _('This type of payment has already been made.'), None
-        payment = createObject(self.paymentfactory)
+        payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = "%d" % int(time()*1000)
         payment.p_id = "p%s" % timestamp