Changeset 5171


Ignore:
Timestamp:
27 Apr 2010, 09:57:56 (15 years ago)
Author:
Henrik Bettermann
Message:

separate fresh and returning students, payment must be split for all 2008/2009 payments (not yet tested)

Location:
WAeUP_SRP/trunk/skins/waeup_aaua
Files:
3 edited

Legend:

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

    r5164 r5171  
    5656# begin customization
    5757
    58 if review_state in ('cleared_and_validated','returning',):
    59     if session in ('07','06',):
     58if review_state in ('returning',):
     59    if session in ('06',):
    6060        info['payment_method'] = "online_payment"
    6161    else:
    6262        info['payment_method'] = "first_instalment"
    63 else:
     63elif review_state in ('cleared_and_validated',):
     64    if session in ('06','07',):
     65        info['payment_method'] = "online_payment"
     66    else:
     67        info['payment_method'] = "first_instalment"
     68elif review_state in ('school_fee_paid','courses_registered','courses_validated',):
    6469    second_instalment_records = aq_payments(Eq('student_id',student_id) & Eq('category','schoolfee2') & Eq('session_id',session) & Eq('status','paid'))
    6570    if not second_instalment_records:
  • WAeUP_SRP/trunk/skins/waeup_aaua/getSchoolFee.py

    r5164 r5171  
    2727     else:   
    2828        d['all'] = 80000
    29 elif brain.session in ('06','07',):
     29elif brain.session in ('06','07',) and brain.review_state == 'cleared_and_validated':
     30    if brain.mode == 'dp_pt' and str(brain.level) in ('100',): 
     31        d['all'] = 40000
     32    elif brain.mode == 'ug_pt' and str(brain.level) in ('100','200',): 
     33        d['all'] = 50000
     34    elif brain.mode == 'pg_pt': 
     35        if str(brain.level) == '600':    # only 600 fresh
     36            d['all'] = 60000
     37        elif str(brain.level) == '700':  # only 700 fresh
     38            d['all'] = 75000 
     39        else:
     40            d['all'] = 0   
     41    else:
     42        d['all'] = 0
     43elif brain.session in ('06',) and brain.review_state == 'returning':
    3044    if brain.mode == 'dp_pt': 
    31         if str(brain.level) in ('100',) and brain.review_state == 'cleared_and_validated':    # only 100 fresh
    32             d['all'] = 40000
    33         else:
    34             d['all'] = 35000
     45        d['all'] = 35000
    3546    elif brain.mode == 'ug_pt': 
    36         if str(brain.level) in ('100','200',) and brain.review_state == 'cleared_and_validated':    # only 100 or 200 fresh
    37             d['all'] = 50000
    38         else:
    39             d['all'] = 45000
     47        d['all'] = 45000
    4048    elif brain.mode == 'pg_pt': 
    41         if str(brain.level) == '600' and brain.review_state == 'cleared_and_validated':    # only 600 fresh
    42             d['all'] = 60000
    43         elif str(brain.level) == '600' and brain.verdict == 'C':                           # 600 repeaters
     49        if str(brain.level) == '600' and brain.verdict == 'C':      # 600 repeaters
    4450            d['all'] = 55000
    45         elif str(brain.level) == '700' and brain.review_state == 'cleared_and_validated':  # only 700 fresh
    46             d['all'] = 75000     
    47         elif str(brain.level) == '600':                                                    # going to register for 700
     51        elif str(brain.level) == '600':                             # going to register for 700
    4852            d['all'] = 75000       
    4953        else:
     
    5155    else:
    5256        d['all'] = 0
    53 elif brain.session in ('08',):
     57       
     58elif brain.session in ('07','08','09',):       # 07 returning students, and all students registering for 08 upwards
    5459    if instalment == '1':
    5560        d['all'] = 8888888      # for testing
  • WAeUP_SRP/trunk/skins/waeup_aaua/pay_interswitch.py

    r5164 r5171  
    4242info['type_description'] = ''
    4343info['pay_bill_to'] = ''
    44 fee_dict = context.getSchoolFee(student_record)
     44fee_dict = context.getSchoolFee(student_record,'1')
    4545fulltime = student_record.mode.endswith('_ft')
    4646
Note: See TracChangeset for help on using the changeset viewer.