Changeset 1992

Timestamp:

5 Jul 2007, 20:50:28 (17 years ago)

Author:

Henrik Bettermann

Message:

enable online payment for previous sessions

Location:

WAeUP_SRP/trunk

Files:

• LICENSE.txt (modified) (1 diff)
• skins/waeup_epayment/epayment_cb.py (deleted)
• skins/waeup_epayment/epayment_cb.py_not_used (added)
• skins/waeup_epayment/getSchoolFee.py (modified) (2 diffs)
• skins/waeup_epayment/interswitch_cb.py (modified) (2 diffs)
• skins/waeup_epayment/pay_interswitch.py (modified) (3 diffs)
• skins/waeup_epayment/pay_online.py (deleted)
• skins/waeup_epayment/pay_online.py_not_used (added)
• skins/waeup_epayment/requery_payment.py (deleted)
• skins/waeup_epayment/requery_payment_form.pt (deleted)

WAeUP_SRP/trunk/LICENSE.txt

@@ -1 @@
- 
-  SACustom
   Copyright 2005 WAeUP Group
 

WAeUP_SRP/trunk/skins/waeup_epayment/getSchoolFee.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=faculty=None
+##parameters=faculty=None, session=None
 ##title=
 ##
@@ -18 +18 @@
         "EDU",
         )
-fee_1_data = ("22200","School Fee for Session 2006/2007")
-fee_2_data = ("23700","School Fee for Session 2006/2007")
+        
+sessionstring = "School Fee for Session %s" % context.portal_vocabularies.sessions.get(session)
+fee_1_data = ("22200",sessionstring)
+fee_2_data = ("23700",sessionstring)
 
 if faculty in fee1:

WAeUP_SRP/trunk/skins/waeup_epayment/interswitch_cb.py

@@ -51 +51 @@
 for rc,pdk in resp_codes:
     pd[pdk] = request.get(rc,'')
+
+# for testing purposes
+#pd['resp_desc'] = 'Simulated Callback'
+#pd['resp_pay_reference'] = 'XXXX'
+#pd['resp_code'] = '00'
+#pd['resp_card_num'] = '0000'
+#pd['resp_approved_amount'] = '10000'
+
 if pd['resp_code'] == '00' and len(pd['resp_approved_amount']) > 4:
     pd['resp_approved_amount'] = pd['resp_approved_amount'][:-2]
@@ -63 +71 @@
 context.getContent().edit(mapping = pd)
 resp = pd['resp_code']
+
+s_brain = context.students_catalog(id=student_id)[0]
+session = s_brain.session
+next_session, next_session_str = context.getNextSessionId(session)
+
 if  resp == '00':
     if context.getStudentReviewState() == "school_fee_paid":
         logger.info('%s paid school_fee in state school_fee_paid' % (student_id))
     else:
-        wftool.doActionFor(student,'pay_school_fee')
+        if next_session == context.getSessionId()[-2:]:
+            wftool.doActionFor(student,'pay_school_fee')
+        else:
+            study_course = getattr(student,'study_course')
+            try:
+                wftool.doActionFor(study_course,'open')
+            except:
+                pass
+            study_course_doc = study_course.getContent()
+            next_level = "%s" % (int(s_brain.level) + 100)
+            study_course_doc.edit(mapping= {'current_level': next_level,
+                                            'current_session': next_session,})
     logger.info('%s received valid callback' % student_id)
     referer = request.get('HTTP_REFERER','none')

WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py

@@ -34 +34 @@
 
 sbrain = context.students_catalog(id=student_id)[0]
-amount,description = context.getSchoolFee(sbrain.faculty)
+amount,description = context.getSchoolFee(sbrain.faculty,sbrain.session)
 info = {}
 info['site_id'] = '61'
@@ -111 +111 @@
 uniben_amount = itotal - interswitch_amount
 xmldict = {}
-xmldict['detail_ref'] = args['txn_ref'] 
-xmldict['department'] = sbrain.department 
+xmldict['detail_ref'] = args['txn_ref']
+xmldict['department'] = sbrain.department
 xmldict['faculty'] = sbrain.faculty
 #xmldict['wema_amt'] = "%d" % wema_amount
-#xmldict['provider_amt'] = "%d" % provider_amount 
+#xmldict['provider_amt'] = "%d" % provider_amount
 xmldict['uniben_amt'] = "%d" % uniben_amount
 ##<item_detail item_id="2" item_name="WEMA" item_amt="%(wema_amt)s" bank_id="16" acct_num="48398023902" />
@@ -121 +121 @@
 xmltext = """
 <payment_item_detail>
-<item_details detail_ref="%(detail_ref)s" college="UNIBEN" department="%(department)s" 
+<item_details detail_ref="%(detail_ref)s" college="UNIBEN" department="%(department)s"
 faculty="%(faculty)s">
-<item_detail item_id="1" item_name="UNIBEN" item_amt="%(uniben_amt)s" bank_id="16" acct_num="384950902390" /> 
+<item_detail item_id="1" item_name="UNIBEN" item_amt="%(uniben_amt)s" bank_id="16" acct_num="384950902390" />
 </item_details>
 </payment_item_detail>