Changeset 5594

Timestamp:

24 Nov 2010, 10:57:04 (14 years ago)

Author:

Henrik Bettermann

Message:

Make hostel fee payments approvable.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_aaua/getPaymentsFolderInfo.py (modified) (1 diff)
• waeup_epayment/approve_epayment.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_aaua/getPaymentsFolderInfo.py

@@ -106 +106 @@
     url = row['url'] = "%s/p%s" % (payments_path,oid[start_pos:])
     row['is_requeryable'] = "%s_%s" % (payment.category,payment.session_id) not in paid_fees and not payment.resp_desc and payment.type == 'online' or str(member) in ('admin',)  # customized too
-    row['is_approvable'] = is_so and row['is_requeryable'] and payment.category == 'schoolfee' # does not make sense for maintenance
+    #row['is_approvable'] = is_so and row['is_requeryable'] and payment.category == 'schoolfee' # does not make sense for maintenance
+    row['is_approvable'] = is_so and row['is_requeryable']
     row['resp_desc'] = payment.resp_desc or 'Payment Process Interrupted'
     row['trans_ref'] = payment.order_id

WAeUP_SRP/trunk/skins/waeup_epayment/approve_epayment.py

@@ -33 +33 @@
 session = s_brain.session
 
-next_info = context.getNextInfo(s_brain)
-next_session_id = next_info['next_session_id']
-next_session_str = next_info['next_session_str']
-next_level_id = next_info['next_level_id']
-next_transition = next_info['next_transition']
-next_verdict = next_info['next_verdict']
-
 pd = {}
 doc = context.getContent()
@@ -48 +41 @@
 
 if doc.category == 'schoolfee':
+    next_info = context.getNextInfo(s_brain)
+    next_session_id = next_info['next_session_id']
+    next_session_str = next_info['next_session_str']
+    next_level_id = next_info['next_level_id']
+    next_transition = next_info['next_transition']
+    next_verdict = next_info['next_verdict']    
     study_course = getattr(student,'study_course')
     try: