Changeset 5231


Ignore:
Timestamp:
24 Jun 2010, 11:58:58 (15 years ago)
Author:
Henrik Bettermann
Message:

resolve #36

File:
1 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/skins/waeup_aaua/getPaymentsFolderInfo.py

    r5193 r5231  
    4545parttime = student_record.mode and student_record.mode.endswith('_pt')
    4646fulltime = student_record.mode and student_record.mode.endswith('_ft')
     47sandwich = student_record.mode and student_record.mode.endswith('_sw')
    4748
    4849
     
    5758
    5859if review_state in ('returning',) and info['next_session'] != session:
    59     if session in ('06',):
     60    if session in ('06',) or sandwich:
    6061        info['payment_method'] = "online_payment"
    6162    else:
    6263        info['payment_method'] = "first_instalment"
    6364elif review_state in ('cleared_and_validated',):
    64     if session in ('06','07',):
     65    if session in ('06','07',) or sandwich:
    6566        info['payment_method'] = "online_payment"
    6667    else:
    6768        info['payment_method'] = "first_instalment"
    68 elif session in ('08','09',) and review_state in ('school_fee_paid','courses_registered','courses_validated',):
     69elif session in ('08','09',) and review_state in ('school_fee_paid','courses_registered','courses_validated',) and not sandwich:
    6970    second_instalment_records = aq_payments(Eq('student_id',student_id) & Eq('category','schoolfee2') & Eq('session_id',session) & Eq('status','paid'))
    7071    if not second_instalment_records:
Note: See TracChangeset for help on using the changeset viewer.