Changeset 2459

Timestamp:

28 Oct 2007, 13:56:01 (17 years ago)

Author:

Henrik Bettermann

Message:

show payment button only if verdict, session and level are not empty
pay_by_sc.py: open study_course to fill new level and session after payment

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_epayment/pay_by_sc.py (modified) (2 diffs)
• waeup_student/getNextInfo.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -62 +62 @@
 #    sc_payment = True
 
-if review_state == 'cleared_and_validated':
-    online_payment = True
-elif review_state == 'returning':
-    sc_payment = True
-
 info['online_payment'] = online_payment
 info['sc_payment'] = sc_payment
@@ -74 +69 @@
 info['next_session'] = next_info['next_session_id']
 info['next_session_str'] = next_info['next_session_str']
+
+if review_state == 'cleared_and_validated':
+    online_payment = True
+elif review_state == 'returning' and info['next_session'] != session:
+    sc_payment = True
 
 info['student_name'] = s_brain.name

WAeUP_SRP/base/skins/waeup_epayment/pay_by_sc.py

@@ -112 +112 @@
 
     study_course = getattr(student,'study_course')
+    try:
+        wftool.doActionFor(study_course,'open')
+    except:
+        pass    
     study_course.getContent().edit(mapping= {'current_level': next_level_id,
                                              'current_session': next_session_id,})
     if next_transition:
-        wftool.doActionFor(student,next_transition)    
-    
+        wftool.doActionFor(student,next_transition)
+
     #if next_session == context.getSessionId()[-2:]:
     #    wftool.doActionFor(student,'pay_school_fee')
@@ -126 +130 @@
     #    study_course_doc.edit(mapping= {'current_level': next_level,
     #                                    'current_session': next_session,})
-    
+
     logger.info('%s paid school fee by scratch card' % student_id)
 else:

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -25 +25 @@
 if review_state == 'cleared_and_validated':
     info['next_transition'] = "pay_school_fee"
-elif review_state == 'returning':
-    if level_id:
-        info['next_level_id'] = "%s" % (int(level_id) + 100)
-    if session_id:
-        info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
-        if int(session_id) > int(context.getSessionId()[0]) -2:
-            info['next_transition'] = "pay_school_fee"
-            if verdict not in ('A','B',):
-                info['next_level_id'] = level_id
+elif review_state == 'returning' and verdict and level_id and session:
+    info['next_level_id'] = "%s" % (int(level_id) + 100)
+    info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
+    if int(session_id) > int(context.getSessionId()[0]) -2:
+        info['next_transition'] = "pay_school_fee"
+        if verdict not in ('A','B',):
+            info['next_level_id'] = level_id
 
 info['next_session_str'] = context.sessions_voc(next_session_id)