Changeset 5175 for WAeUP_SRP/trunk


Ignore:
Timestamp:
28 Apr 2010, 14:12:39 (15 years ago)
Author:
Henrik Bettermann
Message:

correct split payment method (after testing with Issoufou)

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

Legend:

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

    r5171 r5175  
    6666    else:
    6767        info['payment_method'] = "first_instalment"
    68 elif review_state in ('school_fee_paid','courses_registered','courses_validated',):
     68elif session in ('08','09',) and review_state in ('school_fee_paid','courses_registered','courses_validated',):
    6969    second_instalment_records = aq_payments(Eq('student_id',student_id) & Eq('category','schoolfee2') & Eq('session_id',session) & Eq('status','paid'))
    7070    if not second_instalment_records:
  • WAeUP_SRP/trunk/skins/waeup_aaua/getSchoolFee.py

    r5173 r5175  
    1717
    1818MPA = ('MPAPT','MEMPT','MMPPT')
     19i2_states = ('school_fee_paid','courses_registered','courses_validated',)
    1920
    2021if brain.mode == 'ug_sw':    # ug_sw students payment does not depend on the current session
     
    5354elif brain.session in ('07','08','09',):   
    5455    if brain.mode == 'dp_pt': 
    55         if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('100',):
    56             if instalment == '1':
    57                 d['all'] = 35000
    58             elif instalment == '2':
    59                 d['all'] = 20000
    60         elif brain.review_state == 'returning':
    61             if instalment == '1':
    62                 d['all'] = 25000
    63             elif instalment == '2':
    64                 d['all'] = 10000
     56        if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('100',) and instalment == '1':
     57            d['all'] = 35000
     58        elif brain.review_state in i2_states and str(brain.level) in ('100',) and instalment == '2':
     59            d['all'] = 20000
     60        elif brain.review_state == 'returning' and instalment == '1':
     61            d['all'] = 25000
     62        elif brain.review_state in i2_states and instalment == '2':
     63            d['all'] = 10000
    6564    if brain.mode == 'ug_pt': 
    66         if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('100','200'):
    67             if instalment == '1':
    68                 d['all'] = 40000
    69             elif instalment == '2':
    70                 d['all'] = 30000
    71         elif brain.review_state == 'returning':
    72             if instalment == '1':
    73                 d['all'] = 25000
    74             elif instalment == '2':
    75                 d['all'] = 20000
     65        if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('100','200') and instalment == '1':
     66            d['all'] = 45000
     67        elif brain.review_state in i2_states and instalment == '2':   # 2nd instalment applies to both 200 de fresh and 200 returning
     68            d['all'] = 25000
     69        elif brain.review_state == 'returning' and instalment == '1':
     70            d['all'] = 20000
    7671    if brain.mode == 'pg_pt': 
    77         if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('600',):
    78             if instalment == '1':
    79                 d['all'] = 65000
    80             elif instalment == '2':
    81                 d['all'] = 50000
    82         elif brain.review_state == 'returning':
    83             if instalment == '1':
    84                 d['all'] = 35000
    85             elif instalment == '2':
    86                 d['all'] = 30000
    87         elif brain.review_state == 'cleared_and_validated' and str(brain.level) in ('700',) and brain.course in MPA:                           
    88             if instalment == '1':
    89                 d['all'] = 85000
    90             elif instalment == '2':
    91                 d['all'] = 80000
    92         elif brain.review_state == 'cleared_and_validated' and str(brain.level) in ('700',) :                           
    93             if instalment == '1':
    94                 d['all'] = 95000
    95             elif instalment == '2':
    96                 d['all'] = 85000
     72        # 600 level students (no returning studentsor repeaters)
     73        if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('600',) and instalment == '1':
     74            d['all'] = 65000
     75        elif brain.review_state in i2_states and str(brain.level) in ('600',) and instalment == '2':
     76            d['all'] = 50000
     77        # 700 level students, two different certificate groups, 700 level repeaters and 700 level returning students exist
     78        # MPA students
     79        elif brain.review_state == 'cleared_and_validated' and str(brain.level) in ('700',) and instalment == '1' and brain.course in MPA:                           
     80            d['all'] = 85000
     81        elif brain.review_state in i2_states and str(brain.level) in ('700',) and instalment == '2' and brain.course in MPA:   
     82            d['all'] = 80000
     83        # non-MPA students
     84        elif brain.review_state == 'cleared_and_validated' and str(brain.level) in ('700',) and instalment == '1':                           
     85            d['all'] = 100000
     86        elif brain.review_state in i2_states and str(brain.level) in ('700',) and instalment == '2':
     87            d['all'] = 80000           
     88        # 700 level returning students       
     89        elif brain.review_state == 'returning' and instalment == '1':
     90            d['all'] = 35000
     91        elif brain.review_state in i2_states and instalment == '2':
     92            d['all'] = 30000
     93
    9794
    9895next_info = context.getNextInfo(brain)
Note: See TracChangeset for help on using the changeset viewer.