Changeset 4818

Timestamp:

15 Jan 2010, 17:56:09 (15 years ago)

Author:

Henrik Bettermann

Message:

enable online payment for returning students (the fee structure of returning full-time students is still missing)

Location:

WAeUP_SRP/trunk/skins/waeup_epayment

Files:

• getPaymentsFolderInfo.py (modified) (1 diff)
• getSchoolFee.py (modified) (2 diffs)
• pay_interswitch.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -56 +56 @@
 # begin customization
 
-if review_state == 'cleared_and_validated' and session not in ('07','08'):
+# special handling of 06 payments for testing purposes 
+if review_state == 'cleared_and_validated' and session in ('06'):
+    info['payment_method'] = "online_payment"
+elif review_state == 'returning' and info['next_session'] == '06':
+    info['payment_method'] = "both_payments"
+elif review_state == 'cleared_and_validated' and session not in ('07','08'):
     info['payment_method'] = "both_payments"
 elif review_state == 'cleared_and_validated' and session in ('07','08'):

WAeUP_SRP/trunk/skins/waeup_epayment/getSchoolFee.py

@@ -121 +121 @@
          }
 
-d = {}
+
+
+next_info = context.getNextInfo(brain)
+next_session_str = next_info['next_session_str']
+description = "School Fee for Session %s" % next_session_str 
+
+d = {} 
+
 if brain.mode.endswith('_ft'):
     f = 1
@@ -128 +135 @@
     d['new'] = session_fees[brain.session][f]
     d['returning'] = 'not set'
-    d['description'] = "School Fee for Session %s" % context.getSessionsVoc(key=brain.session)
+    d['description'] =description 
 if pt_fees.has_key(brain.course):
     d = pt_fees[brain.course]
-    d['description'] = "School Fee for Session %s, %s" % (context.getSessionsVoc(key=brain.session),
-                                                         d['description'])
+    d['description'] = "%s (%s)" % (description,d['description'])
+    
+d['next_session_id'] = next_info['next_session_id']
+                                                    
 return d
 

WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py

@@ -70 +70 @@
 info['student_name'] = student_record.name
 info['student_email'] = student_record.email
-info['session_id'] = student_record.session   # this holds only for new students und must be replaced when also previous session students will pay online !!!!!!
+#info['session_id'] = student_record.session   # this holds only for new students und must be replaced when also previous session students will pay online !!!!!!
+info['session_id'] = fee_dict['next_session_id']
 info['type'] = 'online'
 info['status'] = 'started'