Changeset 1653 for WAeUP_SRP/branches/uli/skins/waeup_epayment

Timestamp:

28 Mar 2007, 02:35:25 (18 years ago)

Author:

uli

Message:

Incorporated changeset 1593:1652 of trunk into uli-branch.

Location:

WAeUP_SRP/branches/uli/skins/waeup_epayment

Files:

• check_online_payments.py (copied) (copied from WAeUP_SRP/trunk/skins/waeup_epayment/check_online_payments.py)
• check_transactions.py (copied) (copied from WAeUP_SRP/trunk/skins/waeup_epayment/check_transactions.py)
• epayment_cb.py (modified) (4 diffs)
• getPaymentsFolderInfo.py (modified) (1 diff)
• pay_online.py (modified) (1 diff)
• payment_receipt.pt (modified) (2 diffs)
• payments_view.pt (modified) (2 diffs)
• requery_payment.py (copied) (copied from WAeUP_SRP/trunk/skins/waeup_epayment/requery_payment.py)
• requery_payment_form.pt (copied) (copied from WAeUP_SRP/trunk/skins/waeup_epayment/requery_payment_form.pt)

WAeUP_SRP/branches/uli/skins/waeup_epayment/epayment_cb.py

@@ -14 +14 @@
 import logging
 logger = logging.getLogger('Skins.epayment_cb')
+from AccessControl import Unauthorized
 import DateTime
 if context.portal_membership.isAnonymousUser():
@@ -21 +22 @@
 students = context.portal_url.getPortalObject().campus.students
 wftool = context.portal_workflow
+mtool = context.portal_membership
+member = mtool.getAuthenticatedMember()
+member_id = str(member)
 student_id = context.getStudentId()
-if student_id is None:
+if student_id is None or student_id != member_id:
+    logger.info('%s tried to access payment object of %s' % (member_id,student_id))
+    referer = request.get('HTTP_REFERER','none')
+    logger.info('%s:%s illegal access, referer = %s' % (member_id,student_id,referer))
+    real_ip = request.get('HTTP_X_REAL_IP',"none")
+    logger.info('%s:%s illegal access, real_x_ip = %s' % (member_id,student_id,real_ip))
     return context.REQUEST.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
 
@@ -37 +46 @@
 for rc,pdk in resp_codes:
     pd[pdk] = request.get(rc)
-context.getContent().edit(mapping=pd)
+try:
+    context.getContent().edit(mapping=pd)
+except UnAuthorized,E:
+    logger.info('%s ' % student_id)
+
 #resp = pd['resp_desc']
 #if  resp.startswith('Appro') and resp.endswith('essful'):
@@ -44 +57 @@
     wftool.doActionFor(student,'pay_school_fee')
     logger.info('%s received valid callback' % student_id)
+    referer = request.get('HTTP_REFERER','none')
+    logger.info('%s valid callback referer = %s' % (student_id,referer))
+    real_ip = request.get('HTTP_X_REAL_IP',"none")
+    logger.info('%s valid callback real_ip = %s' % (student_id,real_ip))
 
 elif len(resp) < 3:

WAeUP_SRP/branches/uli/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -53 +53 @@
     else:
         row['is_approvable'] = is_so and (review_state == "opened")
-    if (review_state == "closed") and so_object.resp_code in ('SC','00','AP',):
+    if so_object.type_description.startswith('School Fee'):
+        row['is_requeryable'] = (review_state == "opened") and info['review_state'] == 'cleared_and_validated'
+    else:
+        row['is_requeryable'] = is_so and (review_state == "opened")
+    if (review_state == "closed") and so_object.resp_code in ('SC','00','AP','IP',):
         row['confirmed'] = 'active'
     else:

WAeUP_SRP/branches/uli/skins/waeup_epayment/pay_online.py

@@ -91 +91 @@
 info['callback_url'] = "%s/payments/%s/epayment_cb" % (student.absolute_url(),p_id)
 
-logger.info('%(student_id)s initiated online school fee payment' % info)
+logger.info('%(student_id)s initiated online school fee payment with order_id %(order_id)s and callback url %(callback_url)s' % info)
 payment_fields = (('x_SiteID','site_id'),
                   ('x_Redirect_url','callback_url'),

WAeUP_SRP/branches/uli/skins/waeup_epayment/payment_receipt.pt

@@ -8 +8 @@
       <span tal:condition="info">
       
-        <metal:block tal:condition="python:info_doc['doc'].resp_code in ('00','AP',)">            
+        <metal:block tal:condition="python:info_doc['doc'].resp_code in ('00','AP','IP')">            
         <h3>Online Payment Receipt</h3>
         <br />
@@ -106 +106 @@
         </metal:block>
         
-        <metal:block tal:condition="python:info_doc['doc'].resp_code not in ('SC','00','AP','')">            
+        <metal:block tal:condition="python:info_doc['doc'].resp_code not in ('SC','00','AP','IP','')">            
         <h3>Response from Bank: "<span tal:content="python:info_doc['doc'].resp_desc" />"</h3>
         <br />        

WAeUP_SRP/branches/uli/skins/waeup_epayment/payments_view.pt

@@ -34 +34 @@
             </td>
             <td>
-            <a tal:condition="python:row['is_approvable']"
+            <a tal:condition="row/is_approvable"
                tal:attributes="href string:${context/absolute_url}/${row/id}/approve_epayment;
                                onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure? You will not be able to undo the approval.'), );
                                ">
                 [approve payment]
+            </a>             
+            </td>
+            <td tal:condition="nothing">
+            <a tal:condition="row/is_requeryable"
+               tal:attributes="href string:${context/absolute_url}/${row/id}/requery_payment;
+                               onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure? You will not be able to undo the approval.'), );
+                               ">
+                [requery payment]
             </a>             
             </td>
@@ -53 +61 @@
                 value="Initiate School Fee Online Payment" 
                 />
+                
+
+
+                
         </form>