Changeset 3241

Timestamp:

26 Feb 2008, 22:56:30 (17 years ago)

Author:

Henrik Bettermann

Message:

more adjustments

File:

• WAeUP_SRP/uniben/waeup_custom/getPaymentsFolderInfo.py (modified) (7 diffs)

WAeUP_SRP/uniben/waeup_custom/getPaymentsFolderInfo.py

@@ -11 +11 @@
 """
 Info for the PaymentsFolder
-try:
-    from Products.zdb import set_trace
-except:
-    def set_trace():
-        pass
 """
-
 from Products.AdvancedQuery import Eq, Between, Le,In
 
@@ -27 +21 @@
 if mtool.isAnonymousUser():
     return None
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 
-#import logging
-#logger = logging.getLogger('Skins.getPaymentsFolderInfo')
 def cmp_id(a,b):
     s1 = "%(id)s" % a
@@ -66 +63 @@
 info['reasons'] = next_info['reasons']
 
+# begin customization
+
 if review_state == 'cleared_and_validated' and session != '07':
     info['payment_method'] = "online_payment"
@@ -73 +72 @@
     info['payment_method'] = "sc_payment"
 info['prod_id'] = '61'
+
+# end customization
 
 info['student_name'] = student_record.name
@@ -92 +93 @@
                                                         payment.date.strftime("%d/%m/%y %H:%M:%S"))
     url = row['url'] = "%s/p%s" % (payments_path,payment.order_id[6:])
-    row['is_requeryable'] = "%s_%s" % (payment.category,payment.session_id) not in paid_fees or str(member) in ('admin',)
-    row['is_approvable'] = is_so and row['is_requeryable']
+    row['is_requeryable'] = "%s_%s" % (payment.category,payment.session_id) not in paid_fees and payment.type == 'online' or str(member) in ('admin',)
+    row['is_approvable'] = is_so and row['is_requeryable'] and payment.category == 'schoolfee' # does not make sense for maitenance
     row['resp_desc'] = payment.resp_desc or 'Payment Process Interrupted'
     row['trans_ref'] = payment.order_id
@@ -99 +100 @@
         row['callback_url'] = "%(url)s/interswitch_cb" % row
 #        if payment.category == 'schoolfee':
-#            row['callback_url'] = "%(url)s/interswitch_cb" % row 
+#            row['callback_url'] = "%(url)s/interswitch_cb" % row
 #        elif payment.category == 'hostel_maintenance':
-#            row['callback_url'] = "%(url)s/interswitch_acco_cb" % row 
+#            row['callback_url'] = "%(url)s/interswitch_acco_cb" % row
 #        else:
         href = '%(query_url)s' % info
@@ -115 +116 @@
     payments.append(row)
 
-
-
 payments.sort(cmp_id)
 info['payments'] = payments
-
-
 return info