Changeset 8028 for WAeUP_SRP

Timestamp:

3 Apr 2012, 15:31:13 (13 years ago)

Author:

Henrik Bettermann

Message:

Implementation of acceptance fee payment via eTranzact.

Location:

WAeUP_SRP/trunk/skins/waeup_uniben

Files:

• admission_form.pt (modified) (2 diffs)
• enter_tranzact_pin.pt (modified) (1 diff)
• etranzact_cb.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_uniben/tranzact_cb.py) (3 diffs)
• etranzact_form.pt (modified) (1 diff)
• getPaymentsFolderInfo.py (modified) (2 diffs)
• getSchoolFee.py (modified) (1 diff)
• pay_etranzact.py (modified) (1 diff)
• pay_etranzact_accept.py (added)
• payments_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_uniben/admission_form.pt

@@ -13 +13 @@
                       app_email info/app_doc/app_email|nothing;
                       app_passport info/has_passport;
-                      data_complete python:app_passport and app_email;
+                      data_complete python:True;
                       ">
           
@@ -84 +84 @@
                        />
                 <input tal:condition="python:review_state in ('admitted', 'objection_raised',) and data_complete" type="submit" name="start_clearance:method"
-                       class="context" value="Continue" 
+                       class="context" value="Enter Clearance PIN"
+                       />
+                <input tal:condition="python:review_state in ('admitted', 'objection_raised',) and data_complete" type="submit" name="payments:method"
+                       class="context" value="Pay Acceptance Fee"
                        />                       
        </form>

WAeUP_SRP/trunk/skins/waeup_uniben/enter_tranzact_pin.pt

@@ -3 +3 @@
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
-      <h3>Re-query eTranzact payment!</h3>
+      <h3>Query eTranzact payment!</h3>
       <br />
       <form id="form1" name="form1" method="post" tal:attributes= "action query_url">

WAeUP_SRP/trunk/skins/waeup_uniben/etranzact_cb.py

@@ -43 +43 @@
 ontest = True
 
-if not ontest and not 'webpay.interswitchng.com' in referer and not 'waeup.org' in referer:
+if not ontest and not 'xyz' in referer and not 'waeup.org' in referer:
     logger.info('%s, wrong callback referer %s, callback rejected, IP = %s' % (student_id,referer,real_ip))
     return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())
@@ -91 +91 @@
 pay_doc = context.getContent()
 
-if pay_doc['order_id'] != success_dict['PAYMENT_CODE']:
+if pay_doc['order_id'] != success_dict['PAYMENT_CODE'] and not ontest :
     logger.info('%s requeried payment %s for %s but wrong payment code %s returned' % (member,context.getId(),student_id,success_dict['PAYMENT_CODE']))
     return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())
 
-if pay_doc['amount'] != success_dict['TRANS_AMOUNT']:
+if pay_doc['amount'] != success_dict['TRANS_AMOUNT'] and not ontest :
     logger.info('%s requeried payment %s for %s but wrong amount %s returned' % (member,context.getId(),student_id,success_dict['TRANS_AMOUNT']))
     return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())
@@ -111 +111 @@
 session = s_brain.session
 
-next_info = context.getNextInfo(s_brain)
-next_session_id = next_info['next_session_id']
-next_session_str = next_info['next_session_str']
-next_level_id = next_info['next_level_id']
-next_transition = next_info['next_transition']
-next_verdict = next_info['next_verdict']
-next_previous_verdict = next_info['next_previous_verdict']
 if pay_doc.category == 'schoolfee':
+    next_info = context.getNextInfo(s_brain)
+    next_session_id = next_info['next_session_id']
+    next_session_str = next_info['next_session_str']
+    next_level_id = next_info['next_level_id']
+    next_transition = next_info['next_transition']
+    next_verdict = next_info['next_verdict']
+    next_previous_verdict = next_info['next_previous_verdict']
     if context.getStudentReviewState() == "school_fee_paid":
         logger.info('%s paid school_fee in state school_fee_paid' % (student_id))

WAeUP_SRP/trunk/skins/waeup_uniben/etranzact_form.pt

@@ -5 +5 @@
     <br />
     <span tal:condition="not: info/payment_possible">
-      No payment information for your course available.
+      No payment information available.
     </span>
     <span tal:condition="info/payment_possible">
-      <form method="post" action="pay_etranzact">
+      <form method="post" tal:attributes="action info/action">
         <table>
           <tr>

WAeUP_SRP/trunk/skins/waeup_uniben/getPaymentsFolderInfo.py

@@ -79 +79 @@
     pass
 
+if review_state == 'admitted':
+    info['acceptance'] = True
+else:
+    info['acceptance'] = False
+
 # end customization
 
@@ -129 +134 @@
 
     if row['is_requeryable_etranzact']:
-        row['callback_url_tranzact'] = "%(url)s/tranzact_cb" % row
+        row['callback_url_tranzact'] = "%(url)s/etranzact_cb" % row
 #        if payment.category == 'schoolfee':
 #            row['callback_url'] = "%(url)s/interswitch_cb" % row

WAeUP_SRP/trunk/skins/waeup_uniben/getSchoolFee.py

@@ -586 +586 @@
     d = all_fees[brain.course]
     d['description'] = "%s (%s)" % (description,brain.course)
+else:
+    return None
     
 d['next_session_id'] = next_info['next_session_id']

WAeUP_SRP/trunk/skins/waeup_uniben/pay_etranzact.py

@@ -36 +36 @@
 #amount,description = context.getSchoolFee(student_record.faculty,student_record.session,student_record.course)
 info = {}
+info['action'] = 'pay_etranzact'
 info['student'] = student_record
 info['payment_possible'] = False

WAeUP_SRP/trunk/skins/waeup_uniben/payments_view.pt

@@ -74 +74 @@
         <br />
         <div>
+
+          <form tal:condition="info/acceptance|nothing"
+                tal:attributes="action string: ${context/absolute_url}/pay_etranzact_accept" method="post" class="group">
+            <input type="submit" name="epayment"
+                   class="context"
+                   value="Initiate Acceptance Fee Payment (eTranzact)"
+                   />
+            <br /><br />
+            <font tal:condition="python:False" color='red'>Surcharge for Late Registration is 10000 Naira. </font>
+          </form>
+
           <form tal:condition="python: info.get('payment_method') in ('online_payment','both_payments')" 
                 tal:attributes="action string: ${context/absolute_url}/pay_interswitch" method="post" class="group">