Changeset 1355 for WAeUP_SRP/trunk

Timestamp:

25 Jan 2007, 20:49:22 (18 years ago)

Author:

Henrik Bettermann

Message:

simulate callback disabled
performance of getReviewInfo improved

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/getReviewInfo.py (modified) (1 diff)
• waeup_epayment/pay_online.py (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_default/getReviewInfo.py

@@ -23 +23 @@
 if context.portal_type != "Student":
     student_id = context.getStudentId()
-    res = context.portal_catalog(id = student_id,portal_type='Student')
-    if res:
-        s_review = res[-1].review_state
-        return "%s / %s" % (s_review,d_review)
+    if student_id:
+        res = context.portal_catalog(id = student_id,portal_type='Student')
+        if res:
+            s_review = res[-1].review_state
+            return "%s / %s" % (s_review,d_review)
 return "%s" % (d_review)
 

WAeUP_SRP/trunk/skins/waeup_epayment/pay_online.py

@@ -21 +21 @@
 
 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)
 sbrain = context.students_catalog(id=student_id)[0]
 amount,description = context.getSchoolFee(sbrain.faculty)
@@ -50 +48 @@
 order_id = info['order_id'] = "%d" % int(now.timeTime()*1000)
 info['order_id'] = "%s%s" % (student_id[1:],order_id)
+p_id = "p%s" % order_id
+
+if student_id is None:
+    return context.REQUEST.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
+    
+if context.portal_url().find('uniben-demo.waeup.org') >-1 or\
+   context.portal_url().find('uniben.waeup.org') >-1:
+    info['action'] = "http://www.wemaonlinepayments.biz/payment.aspx"
+else:
+    return None
+    #info['action'] = "%s/payments/%s/simulate_callback" % (student.absolute_url(),p_id)  
+
+
 if "payments" not in student.objectIds():
     student.invokeFactory('PaymentsFolder','payments')
@@ -62 +73 @@
     return context.wema_form(info=info)
 
-p_id = "p%s" % order_id
+
 payments.invokeFactory('Payment', p_id)
 payment = getattr(payments,p_id)
@@ -73 +84 @@
 #wftool.doActionFor(student,'pay_school_fee')
 info['callback_url'] = "%s/payments/%s/epayment_cb" % (student.absolute_url(),p_id)
-if context.portal_url().find('uniben-demo.waeup.org') >-1 or\
-   context.portal_url().find('uniben.waeup.org') >-1:
-    info['action'] = "http://www.wemaonlinepayments.biz/payment.aspx"
-else:
-    info['action'] = "%s/payments/%s/simulate_callback" % (student.absolute_url(),p_id)
+
 logger.info('"%(student_id)s","%(type_description)s", "%(amount)s N"' % info)
 payment_fields = (('x_SiteID','site_id'),