Changeset 1944

Timestamp:

22 Jun 2007, 07:44:54 (17 years ago)

Author:

joachim

Message:

add searching for groups in member_search, interswitch payment updates

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/members_search.xml (modified) (1 diff)
• profiles/default/schemas.xml (modified) (1 diff)
• profiles/default/schemas/members_search.xml (added)
• profiles/default/vocabularies.xml (modified) (1 diff)
• profiles/default/vocabularies/groups_voc.xml (added)
• skins/waeup_directory/getGroups.py (added)
• skins/waeup_epayment/getPaymentsFolderInfo.py (modified) (2 diffs)
• skins/waeup_epayment/interswitch_cb.py (modified) (2 diffs)
• skins/waeup_epayment/pay_interswitch.py (modified) (1 diff)
• skins/waeup_epayment/payments_view.pt (modified) (3 diffs)

WAeUP_SRP/trunk/profiles/default/layouts/members_search.xml

@@ -44 +44 @@
   <property name="is_i18n">True</property>
  </widget>
- <table>
+  <widget name="groups" meta_type="MultiSelect Widget">
+    <property name="title">Groups</property>
+    <property name="fields">
+      <element value="groups"/>
+    </property>
+    <property name="label">Groups</property>
+    <property name="label_edit">Groups</property>
+    <property name="readonly_layout_modes"/>
+    <property name="hidden_layout_modes"/>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="vocabulary">groups_voc</property>
+  </widget>
+  <table>
   <row>
    <cell name="id" ncols="2"/>

WAeUP_SRP/trunk/profiles/default/schemas.xml

@@ -13 +13 @@
  <object name="faculty" meta_type="CPS Schema"/>
  <object name="members" meta_type="CPS Schema"/>
+ <object name="members_search" meta_type="CPS Schema"/>
  <object name="payment" meta_type="CPS Schema"/>
  <object name="student" meta_type="CPS Schema"/>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -15 +15 @@
  <object name="get_departments_voc" meta_type="CPS Method Vocabulary"/>
  <object name="get_faculties_voc" meta_type="CPS Method Vocabulary"/>
+ <object name="groups_voc" meta_type="CPS Method Vocabulary"/>
  <object name="waeup_bed_letters" meta_type="CPS Vocabulary"/>
  <object name="waeup_block_letters" meta_type="CPS Vocabulary"/>

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -48 +48 @@
 info = {}
 is_so = info['is_so'] = context.isSectionOfficer()
-info['query_url'] = "https://webpay.interswitchng.com/TransactionQuery.aspx"
+info['query_url'] = "https://webpay.interswitchng.com/test_paydirect/services/TransactionQueryURL.aspx"
 info['prod_id'] = '61'
 #res = context.portal_catalog(portal_type='Student',id = student_id)
@@ -66 +66 @@
     row['title'] = so.Title
     url = row['url'] = "%s/%s" % (payments_path,so.getId)
-    so_object = context.restrictedTraverse(url,default=None).getContent()
+    so_doc = 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'):
+    if so_doc.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")
     row['is_requeryable'] = False
-    if so_object.type_description.startswith('School Fee'):
-        if (review_state == "opened") and\
-           info['review_state'] == 'cleared_and_validated' and\
-           not hasattr(so,'resp_code') and hasattr(so, 'order_id'):
+    #set_trace()
+    row['resp_desc'] = getattr(so_doc,'resp_desc','no response')
+    row['trans_ref'] = getattr(so_doc,'order_id','')
+    if so_doc.type_description.startswith('School Fee'):
+        if review_state == 'opened' and hasattr(so_doc, 'order_id') and not so_doc.resp_code:
             row['is_requeryable'] = True
-            row['trans_ref'] = getattr(so,'order_id')
-            row['callback_url'] = "%s/payments/p%s/interswitch_cb?echo=p%s" % (student.absolute_url(),
-                                                                  so.order_id,
-                                                                  so.order_id)
-    if (review_state == "closed") and so_object.resp_code in ('SC','00','AP','IP',):
+            row['callback_url'] = "%s/payments/%s/interswitch_cb" % (student.absolute_url(),
+                                                            so.getId)
+            href = '%(query_url)s' % info
+            href += '?transRef=%(trans_ref)s' % row
+            href += '&prodID=%(prod_id)s' % info
+            href += '&redirectURL=%(callback_url)s' % row
+            row['href'] = href
+    if (review_state == "closed") and so_doc.resp_code in ('SC','00','AP','IP',):
         row['confirmed'] = 'active'
     else:

WAeUP_SRP/trunk/skins/waeup_epayment/interswitch_cb.py

@@ -40 +40 @@
 
 student = getattr(students,student_id)
-
 resp_codes = (("desc","resp_desc"),
               ("resp","resp_code"),
-              ("txnref","pay_reference"),
-              ("payRet","resp_pay_reference"),
+              ("txnRef","pay_reference"),
+              ("payRef","resp_pay_reference"),
               ("retRef","retRef"),
-              ("CardNum","resp_card_num"),
+              ("cardNum","resp_card_num"),
               ("apprAmt","resp_approved_amount"),
               )
 pd = {}
-#from Products.zdb import set_trace;set_trace()
 for rc,pdk in resp_codes:
     pd[pdk] = request.get(rc,'')
@@ -57 +55 @@
 else:
     pd['resp_approved_amount'] = '0'
-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'):
+    
+review_state = wftool.getInfoFor(context,'review_state',None)
+if pd['resp_code'] == '' and review_state == 'opened':
+    logger.info('%s requeried payment %s and got empty response' % (student_id,context.getId()))
+    wftool.doActionFor(context,'close')
+    return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())
+context.getContent().edit(mapping = pd)
 resp = pd['resp_code']
 if  resp == '00':

WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py

@@ -134 +134 @@
 args['pay_item_id'] = "6100"
 args['pay_item_name'] = "UNIBEN Tuition Payments"
-args['payment_params'] = 'college_split'
-args['xml_data'] = xmltext % info
+args['payment_params'] = 'switch_college_split'
+#args['xml_data'] = xmltext % info
+args['xml_data'] = ''
 info['args'] = args
 return context.goto_interswitch_form(info=info)
-url = info['action'] + "?" + urlencode(args)
-request.RESPONSE.redirect(url)

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -31 +31 @@
           <tr tal:repeat="row rows"
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            
             <td tal:attributes="class string:${row/confirmed}">
               <a target="slip" href="" tal:attributes="href string:${context/absolute_url}/${row/id}/payment_receipt"
@@ -37 +36 @@
                 <strong tal:content="row/title" /></a> 
             </td>
+          <td tal:content="row/resp_desc" />
+          <td tal:content="row/trans_ref" />
             <td>
             <a tal:condition="row/is_approvable"
@@ -45 +46 @@
             </a>             
             </td>
-            <td tal:condition="python:1">
-            <a tal:condition="row/is_requeryable"
-               tal:attributes="href string:${info/query_url}?transRef=${row/trans_ref}&prodID=${info/prod_id}&${row/callback_url};
-                               onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure? You will not be able to undo the approval.'), );
+            <td tal:condition="row/is_requeryable">
+            <a tal:condition="python:1"
+               tal:attributes="href row/href;
+                               onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure?'), );
                                ">
                 [requery payment]