Changeset 3228

Timestamp:

25 Feb 2008, 22:53:10 (17 years ago)

Author:

Henrik Bettermann

Message:

fix WAeUPLevelWidget

adjust getPaymentsFolderInfo.py to Okene version

Location:

WAeUP_SRP

Files:

• base/Widgets.py (modified) (1 diff)
• uniben/waeup_custom/getPaymentsFolderInfo.py (modified) (6 diffs)

WAeUP_SRP/base/Widgets.py

@@ -438 +438 @@
 
         if not value:
-            v = value = ''
+            v = value = '100'
         #import pdb;pdb.set_trace()
         levels = self._getLevels()

WAeUP_SRP/uniben/waeup_custom/getPaymentsFolderInfo.py

@@ -18 +18 @@
 """
 
+from Products.AdvancedQuery import Eq, Between, Le,In
+
 mtool = context.portal_membership
 wftool = context.portal_workflow
 member = mtool.getAuthenticatedMember()
+payments_catalog = context.payments_catalog
+aq_payments = payments_catalog.evalAdvancedQuery
 if mtool.isAnonymousUser():
     return None
@@ -37 +41 @@
 import DateTime
 request = context.REQUEST
-students = context.portal_url.getPortalObject().campus.students
+#students = context.portal_url.getPortalObject().campus.students
 student_id = context.getStudentId()
 if student_id is None:
     return context.REQUEST.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
-student = getattr(students,student_id)
+#student = getattr(students,student_id)
 student_record = context.students_catalog.getRecordByKey(student_id)
-#context['updatePayments']()
-payments = []
+
 
 info = {}
@@ -55 +58 @@
 fulltime = student_record.mode and student_record.mode.endswith('_ft')
 
-#if review_state == 'cleared_and_validated' or (parttime and review_state == 'returning'):
-#    online_payment = True
-#elif fulltime and review_state == 'returning':
-#    sc_payment = True
 
 session = student_record.session
@@ -70 +69 @@
     info['payment_method'] = "online_payment"
 #elif review_state == 'cleared_and_validated' and session == '07':
-#    info['payment_method'] = "sc_payment"    
+#    info['payment_method'] = "sc_payment"
 elif review_state == 'returning' and info['next_session'] != session:
     info['payment_method'] = "sc_payment"
@@ -76 +75 @@
 
 info['student_name'] = student_record.name
-info['is_so'] = is_so
-
-for payment_id,payment in context.objectItems():
+payments_path = "%s/campus/students/%s/payments" % (context.portal_url(),student_id)
+payments = []
+payment_records = aq_payments(Eq('student_id',student_id) & Eq('session_id',student_record.session))
+vocabularies = context.portal_vocabularies
+paid_fees = []
+for payment in payment_records:
+    if payment.status == "paid":
+        paid_fees += "%s_%s" % (payment.type,payment.session_id),
+for payment in payment_records:
     row = {}
-    row['id'] = payment_id
-    row['title'] = payment.Title()
-    url = row['url'] = payment.absolute_url()
-    payment_doc = payment.getContent()
-    row['type'] = payment_doc.portal_type
-    review_state = row['review_state'] = wftool.getInfoFor(payment,'review_state',None)
-    if payment_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
-    #set_trace()
-    row['resp_desc'] = getattr(payment_doc,'resp_desc','no response')
-    row['trans_ref'] = getattr(payment_doc,'order_id','')
-    if payment_doc.type_description.startswith('School Fee'):
-        if (review_state == 'opened' and info['review_state'] in ('cleared_and_validated',) and \
-                                  hasattr(payment_doc, 'order_id') and not payment_doc.resp_code) or str(member) in ('admin',):
-            row['is_requeryable'] = True
-            row['callback_url'] = "%(url)s/interswitch_cb" % row
-            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 payment_doc.resp_code in ('SC','00','AP','IP',):
+    row['id'] = payment.key
+    row['title'] = "%s for Session %s, Naira %s, %s" % (vocabularies.payment_categories.get(payment.category),
+                                                        vocabularies.sessions.get(payment.session_id),
+                                                        payment.amount,
+                                                        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.type,payment.session_id) not in paid_fees or str(member) in ('admin',)
+    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
+    if row['is_requeryable']:
+        row['callback_url'] = "%(url)s/interswitch_cb" % row
+        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 payment.status == 'paid':
         row['confirmed'] = 'active'
     else:
@@ -111 +109 @@
     payments.append(row)
 
+
+
 payments.sort(cmp_id)
 info['payments'] = payments
+
+
 return info