Changeset 1669 for WAeUP_SRP/branches/joachim-event-branch/skins/waeup_epayment

Timestamp:

4 Apr 2007, 06:31:52 (18 years ago)

Author:

joachim

Message:

merged up to 1664

Location:

WAeUP_SRP/branches/joachim-event-branch/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)
• 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/joachim-event-branch/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/joachim-event-branch/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>