Changeset 1294 for WAeUP_SRP/trunk

Timestamp:

15 Jan 2007, 09:02:01 (18 years ago)

Author:

Henrik Bettermann

Message:

payments view shows correct button

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_epayment/payments_view.pt (modified) (6 diffs)
• waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getPaymentsFolderInfo;
-             is_student context/isStudent;
-             rows info/payments"
-             >
-  <span tal:condition="not: info">
-    <span tal:content="here/illegal_view" />
-  </span>
-  <metal:block tal:condition="info">                         
-    <metal:body use-macro="here/waeup_content_master/macros/master">
-      <metal:block fill-slot="header">
+<metal:body use-macro="here/waeup_content_master/macros/master">
+      <metal:block fill-slot="header"
+                   tal:define="is_student context/isStudent;
+                               s_name context/getStudentNameInContext;">
         <a href=""
            tal:attributes="href string:${context/aq_parent/absolute_url}">
@@ -16 +10 @@
         <h3> 
           <span tal:condition="not:is_student">
-            <span tal:content="info/student_name" />:
+            <span tal:content="s_name" />:
           </span>
           <span tal:condition="is_student">
@@ -25 +19 @@
         <br />
       </metal:block>
-      <metal:main fill-slot="main">
+      <metal:main fill-slot="main"
+                  tal:define="info context/getPaymentsFolderInfo;
+                              rows info/payments;
+                              review_state context/getStudentReviewState">
 
         <table class="contentListing" width="100%">
@@ -31 +28 @@
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td>
-              <a href="view" tal:attributes="href string:${context/absolute_url}/${row/id}/waeup_document_view">
+              <a href="view" tal:attributes="href string:${context/absolute_url}/${row/id}">
                 <strong tal:content="row/title" /></a> 
             </td>
@@ -39 +36 @@
         <div>
         
-        <form tal:attributes="action string: ${context/absolute_url}/pay_online" method="post" class="group">
+        <form tal:condition="python:review_state == 'cleared_and_validated'" 
+              tal:attributes="action string: ${context/absolute_url}/pay_online" method="post" class="group">
          <input type="submit" name="epayment" 
                 class="context" 
@@ -46 +44 @@
         </form>  
 
-        </div>        
+        <form tal:condition="python:review_state == 'returning'" 
+              tal:attributes="action string: ${context/absolute_url}/pay_by_sc" method="post" class="group">
+         <input type="submit" name="epayment" 
+                class="context" 
+                value="Pay School Fee by Scratch Card" 
+                />
+        </form>          
         
         
+        </div>        
       </metal:main>
-    </metal:body>
-  </metal:block>
-</metal:html>    
+</metal:body>

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -34 +34 @@
     if context.portal_type == 'PaymentsFolder':
         return context.payments_view()
+    if context.portal_type == 'Payment':
+        return context.waeup_document_view()        
     students_url = "%s/campus/students" % (context.portal_url())
     id = str(member)