Changeset 5231

Timestamp:

24 Jun 2010, 11:58:58 (14 years ago)

Author:

Henrik Bettermann

Message:

resolve #36

File:

• WAeUP_SRP/trunk/skins/waeup_aaua/getPaymentsFolderInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_aaua/getPaymentsFolderInfo.py

@@ -45 +45 @@
 parttime = student_record.mode and student_record.mode.endswith('_pt')
 fulltime = student_record.mode and student_record.mode.endswith('_ft')
+sandwich = student_record.mode and student_record.mode.endswith('_sw')
 
 
@@ -57 +58 @@
 
 if review_state in ('returning',) and info['next_session'] != session:
-    if session in ('06',):
+    if session in ('06',) or sandwich:
         info['payment_method'] = "online_payment"
     else:
         info['payment_method'] = "first_instalment"
 elif review_state in ('cleared_and_validated',):
-    if session in ('06','07',):
+    if session in ('06','07',) or sandwich:
         info['payment_method'] = "online_payment"
     else:
         info['payment_method'] = "first_instalment"
-elif session in ('08','09',) and review_state in ('school_fee_paid','courses_registered','courses_validated',):
+elif session in ('08','09',) and review_state in ('school_fee_paid','courses_registered','courses_validated',) and not sandwich:
     second_instalment_records = aq_payments(Eq('student_id',student_id) & Eq('category','schoolfee2') & Eq('session_id',session) & Eq('status','paid'))
     if not second_instalment_records: