Changeset 1427

Timestamp:

16 Feb 2007, 12:39:56 (18 years ago)

Author:

Henrik Bettermann

Message:

approve payment modified
payments_view changed to show links

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actions.xml (modified) (1 diff)
• skins/waeup_epayment/approve_epayment.py (added)
• skins/waeup_epayment/aprove_epayment.py (deleted)
• skins/waeup_epayment/callback.pt (deleted)
• skins/waeup_epayment/callback.pt_not_used (added)
• skins/waeup_epayment/getPaymentsFolderInfo.py (modified) (2 diffs)
• skins/waeup_epayment/payment_receipt.pt (modified) (2 diffs)
• skins/waeup_epayment/payments_view.pt (modified) (1 diff)
• skins/waeup_epayment/simulate_callback.py (modified) (1 diff)
• skins/waeup_student/getStudentWorkflowInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -200 +200 @@
      url_expr="string:${portal_url}/register_courses" visible="False"/>
   <action title="Request Transfer" action_id="request_transfer" category="student"
-     condition_expr="python: here.isStudent() and here.getStudentWorkflowInfo()['cr']" url_expr="string:${portal_url}/request_transfer"
-     visible="True"/>     
+     condition_expr="python: here.isStudent() and here.getStudentWorkflowInfo()['tr']" url_expr="string:${portal_url}/request_transfer"
+     visible="True"/>
 
  </action-provider>

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -13 +13 @@
 """
 import logging
-logger = logging.getLogger('EPayment.')
+logger = logging.getLogger('EPayment.Info')
 import DateTime
 request = context.REQUEST
@@ -23 +23 @@
 #student = getattr(students,student_id)
 s_brain = context.students_catalog(id = student_id)[0]
+
 payments = []
 #from Products.zdb import set_trace;set_trace()
-for o_id in context.objectIds():
-    d = {}
-    d['id'] = o_id
-    res = context.portal_catalog(id=o_id)
-    if res:
-        title = res[0].Title
-        d['title'] = title or o_id
-    else:
-        d['title'] = "no Title"
-    payments.append(d)
+
 info = {}
 is_so = info['is_so'] = context.isSectionOfficer()
+
+res = context.portal_catalog(portal_type='Student',id = student_id)
+if res:
+    info['review_state'] = res[0].review_state
+
 info['student_name'] = s_brain.name
+payments_path = "%s/campus/students/%s/payments" % (context.portal_url.getPortalPath(),student_id)
+sos = context.portal_catalog(container_path=payments_path)
+info['is_so'] = is_so
+
+for so in sos:
+
+    row = {}
+    row['id'] = so.getId
+    row['title'] = so.Title
+    url = row['url'] = "%s/%s" % (payments_path,so.getId)
+    so_object = context.restrictedTraverse(url,default=None).getContent()
+    row['type'] = so.portal_type
+    review_state = row['review_state'] = so.review_state
+    if so_object.type_description.startswith('School Fee'):
+        row['is_approvable'] = is_so and (review_state == "opened") and info['review_state'] == 'cleared_and_validated'
+    else:
+        row['is_approvable'] = is_so and (review_state == "opened")
+    if (review_state == "closed") and so_object.resp_code in ('SC','00','AP',):
+        row['confirmed'] = 'active'
+    else:
+        row['confirmed'] = ''
+    payments.append(row)
+    
+
 info['payments'] = payments
 return info

WAeUP_SRP/trunk/skins/waeup_epayment/payment_receipt.pt

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

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -24 +24 @@
                               review_state context/getStudentReviewState">
 
-        <table class="contentListing" width="100%">
+        <table class="registration" width="100%">
           <tr tal:repeat="row rows"
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td>
+            
+            <td tal:attributes="class string:${row/confirmed}">
               <a target="slip" href="" tal:attributes="href string:${context/absolute_url}/${row/id}/payment_receipt"
                  onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
                 <strong tal:content="row/title" /></a> 
             </td>
+            <td tal:attributes="class string:${row/confirmed}">
+            <a tal:condition="python: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>
+                        
           </tr>
         </table>

WAeUP_SRP/trunk/skins/waeup_epayment/simulate_callback.py

@@ -8 +8 @@
 current = DateTime.DateTime()
 pr = context.portal_registration
-logger = logging.getLogger('Returning')
+logger = logging.getLogger('EPayment.Simulate')
 validate = REQUEST.has_key("cpsdocument_edit_button")
 

WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py

@@ -33 +33 @@
                                            'courses_validated',
                                            )
-
+info['tr'] = review_state in  ('returning',)
 return info