Changeset 1764 for WAeUP_SRP

Timestamp:

10 May 2007, 04:41:04 (18 years ago)

Author:

Henrik Bettermann

Message:

at the moment getSessionId returns the year not the Id so that getNextSessionId and pay_by_sc did not work properly

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/getNextSessionId.py (modified) (1 diff)
• waeup_default/getSessionId.py (modified) (1 diff)
• waeup_default/getSessionString.py (modified) (2 diffs)
• waeup_epayment/callback.pt_not_used (deleted)
• waeup_epayment/pay_by_sc.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py

@@ -10 +10 @@
 # $Id$
 """
-return the next Session Id 
+return the next Session Id
 """
-if session != context.getSessionId():
+
+if session != context.getSessionId()[2:]:
     ns = int(session) + 1
 else:

WAeUP_SRP/trunk/skins/waeup_default/getSessionId.py

@@ -10 +10 @@
 # $Id$
 """
-return the Session Id 
+return the Session Id
 """
+
+# must be changed in 2007/2008; should return only the last two digits
+
 import DateTime
 now = DateTime.DateTime()

WAeUP_SRP/trunk/skins/waeup_default/getSessionString.py

@@ -1 @@
-## Script (Python) "getSessionId"
+## Script (Python) "getSessionString"
 ##bind container=container
 ##bind context=context
@@ -10 +10 @@
 # $Id$
 """
-return the Session string 
+return the Session string
 """
 import DateTime

WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py

@@ -92 +92 @@
     payment.getContent().edit(mapping=info)
     wftool.doActionFor(payment,'close')
-    if next_session == context.getSessionId(): 
+    if next_session == context.getSessionId()[2:]:
         wftool.doActionFor(student,'pay_school_fee')
     else:
         study_course = getattr(student,'study_course')
-        wftool.doActionFor(study_course,'open')
+        #wftool.doActionFor(study_course,'open')
         study_course_doc = study_course.getContent()
         next_level = "%s" % (int(s_brain.level) + 100)