Changeset 6877

Timestamp:

13 Oct 2011, 06:06:11 (13 years ago)

Author:

Henrik Bettermann

Message:

In Student Online Payments we have to store the item session. Thus we need StudentOnlinePayment? must get its own interface which includes a session attribute.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (6 diffs)
• interfaces.py (modified) (2 diffs)
• payments.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

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

@@ -37 +37 @@
     IStudentPersonal, IStudentBase, IStudentStudyCourse,
     IStudentAccommodation, IStudentClearanceEdit, IStudentStudyLevel,
-    ICourseTicket, ICourseTicketAdd, IStudentPaymentsContainer
+    ICourseTicket, ICourseTicketAdd, IStudentPaymentsContainer,
+    IStudentOnlinePayment
     )
 from waeup.sirp.students.catalog import search
@@ -45 +46 @@
 from waeup.sirp.students.utils import getPaymentDetails
 from waeup.sirp.browser.resources import toggleall
-from waeup.sirp.payments.interfaces import IOnlinePayment
 
 # Save function used for save methods in manager pages
@@ -107 +107 @@
     """A breadcrumb for course lists.
     """
-    grok.context(IOnlinePayment)
+    grok.context(IStudentOnlinePayment)
 
     @property
@@ -857 +857 @@
     grok.name('addop')
     grok.require('waeup.handleStudent')
-    form_fields = grok.AutoFields(IOnlinePayment).select(
+    form_fields = grok.AutoFields(IStudentOnlinePayment).select(
         'p_category')
     #grok.template('addpaymentpage')
@@ -872 +872 @@
         payment.p_id = "p%s" % timestamp
         (payment.amount_auth,
-            payment.p_item,
+            payment.p_item, payment.p_session,
             payment.surcharge_1,
             payment.surcharge_2,
@@ -889 +889 @@
     """ Page to view an online payment ticket
     """
-    grok.context(IOnlinePayment)
+    grok.context(IStudentOnlinePayment)
     grok.name('index')
     grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(IOnlinePayment)
+    form_fields = grok.AutoFields(IStudentOnlinePayment)
     form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -11 +11 @@
   contextual_reg_num_source, contextual_mat_num_source,
   )
-from waeup.sirp.payments.interfaces import IPaymentsContainer
+from waeup.sirp.payments.interfaces import IPaymentsContainer, IOnlinePayment
 
 class IStudentsContainer(IWAeUPObject):
@@ -320 +320 @@
     """
 
+class IStudentOnlinePayment(IOnlinePayment):
+    """A student payment via payment gateways.
+
+    """
+
+    p_session = schema.Choice(
+        title = u'Payment Session',
+        source = academic_sessions_vocab,
+        required = False,
+        )
+
+IStudentOnlinePayment['p_session'].order = IStudentOnlinePayment[
+    'p_item'].order
+
 # Interfaces for students only
 

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

@@ -21 +21 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
-from waeup.sirp.students.interfaces import IStudentPaymentsContainer, IStudentNavigation
+from waeup.sirp.students.interfaces import (
+    IStudentPaymentsContainer, IStudentNavigation, IStudentOnlinePayment)
 from waeup.sirp.payments import PaymentsContainer, OnlinePayment
-from waeup.sirp.payments.interfaces import IOnlinePayment
 from waeup.sirp.utils.helpers import attrs_to_fields
 
@@ -44 +44 @@
     """This is an online payment.
     """
-    grok.implements(IOnlinePayment, IStudentNavigation)
-    grok.provides(IOnlinePayment)
+    grok.implements(IStudentOnlinePayment, IStudentNavigation)
+    grok.provides(IStudentOnlinePayment)
 
     def __init__(self):

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

@@ -22 +22 @@
 
 def getPaymentDetails(category, student):
-    #import pdb; pdb.set_trace()
-    session_string = academic_sessions_vocab.by_value[
-        student['studycourse'].current_session].title
+    p_session = student['studycourse'].current_session
     surcharge_1 = surcharge_2 = surcharge_3 = 0
+    p_item = u''
     if category == 'transfer':
         amount = 500
-        item = u'Session %s' % session_string
     elif category == 'gown':
         amount = 500
-        item = u'Session %s' % session_string
     elif category == 'hostel_maintenance':
         amount = 300
-        item = u'Session %s' % session_string
     elif category == 'schoolfee':
         surcharge_1 = 1500 # BT amount
         surcharge_2 = 300 # Interswitch amount
         amount = getSchoolFee(student, surcharge_1 + surcharge_2)
-        item = u'Session %s' % session_string
-    return amount, item, surcharge_1, surcharge_2, surcharge_3
+        code = student['studycourse'].certificate.code
+        #session_string = academic_sessions_vocab.by_value[p_session + 1].title
+        p_item = code
+        p_session += 1
+    return amount, p_item, p_session, surcharge_1, surcharge_2, surcharge_3
 
 # To be moved to the FUTMinna customization package