Changeset 5795 for WAeUP_SRP/trunk


Ignore:
Timestamp:
5 Mar 2011, 12:34:09 (14 years ago)
Author:
Henrik Bettermann
Message:

Implementation of a Late Registration Fee (FUTMinna only). This was more work and customization than expected. We urgently need a new consistent payment module.

Location:
WAeUP_SRP/trunk/skins
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationRecords.py

    r5621 r5795  
    5656    row['reservation_status'] = ar.reservation_status
    5757    row['paid'] = ar.reservation_status == 'maintenance_fee_paid'
    58     row['current_unpaid'] = not row['paid'] and ar.session == portal_session
     58    row['current_unpaid'] = not row['paid'] and ar.session == portal_session and \
     59                                                student_record.review_state in ('cleared_and_validated',
     60                                                                                'school_fee_paid',
     61                                                                                'courses_registered',
     62                                                                                'courses_validated',)
    5963    row['url'] = student_path
    6064    row['cancellation_allowed'] = info['is_so'] and ar.session == portal_session

  • WAeUP_SRP/trunk/skins/waeup_futminna/getInterswitchParams.py

    r5631 r5795  
    2121d['type'] = 'online'
    2222d['status'] = 'started'
    23 d['surcharge'] = '300'
     23d['surcharge'] = 300
    2424if test == 'simulate':
    2525    d['action'] = "%s/payments/%s/simulate_callback" % (student.absolute_url(),payment_id) #do not use simulate_callback
    … …  
    3636    d['pay_item_name'] = "FUT Minna %(type_description)s" % d
    3737    if paytype == 'HOMH':
    38         d['amount'] = 15000
     38        d['fee'] = 15000
    3939    elif student_record.level  in ('100','200','300','400','500') and student_record.faculty in ('EET','SET','AAT','ICT','EMT'):
    40         d['amount'] = 9000
     40        d['fee'] = 9000
    4141    else:
    42         d['amount'] = 7000
     42        d['fee'] = 7000
     43    d['amount'] = d['fee'] + d['surcharge']
    4344    d['category'] = 'hostel_maintenance'
    4445    d['item'] = paytype
    … …  
    5051    xmldict['department'] = student_record.department
    5152    xmldict['faculty'] = student_record.faculty
    52     xmldict['fut_amount'] = "%d" % int(100*d['amount'])
     53    xmldict['fut_amount'] = "%d" % int(100*d['fee'])
    5354   
    5455    xmltext = """<payment_item_detail>

  • WAeUP_SRP/trunk/skins/waeup_futminna/getSchoolFee.py

    r5683 r5795  
    2121    if str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
    2222        if brain.entry_mode == 'rmd_ft':
    23             d['all'] = 80200
     23            d['lrf'] = late_registration_fee
     24            d['all'] = 80200
    2425        else:
    25             d['all'] = 74200
     26            d['lrf'] = late_registration_fee
     27            d['all'] = 74200
    2628           
    2729    # fresh
    2830    elif brain.review_state == 'cleared_and_validated':
    2931        if brain.mode == 'jm_ft':
    30             d['all'] = 72700   
     32            d['lrf'] = late_registration_fee
     33            d['all'] = 72700
    3134        elif brain.lga == 'foreigner':
    32             d['all'] = 131500
     35            d['lrf'] = late_registration_fee
     36            d['all'] = 131500
    3337        else:
    34             d['all'] = 41500
     38            d['lrf'] = late_registration_fee
     39            d['all'] = 41500
    3540    # returning
    3641    elif brain.review_state == 'returning':
    3742        if brain.mode == 'jm_ft':
    38             d['all'] = 32500 + late_registration_fee
     43            d['lrf'] = late_registration_fee
     44            d['all'] = 32500
    3945        elif brain.lga == 'foreigner':
    40             d['all'] = 109500 + late_registration_fee
     46            d['lrf'] = late_registration_fee
     47            d['all'] = 109500
    4148        else:
    42             d['all'] = 19500 + late_registration_fee
     49            d['lrf'] = late_registration_fee
     50            d['all'] = 19500
    4351    else:
    4452        d['all'] = 0

  • WAeUP_SRP/trunk/skins/waeup_futminna/goto_interswitch_form.pt

    r5601 r5795  
    2727            <td tal:content="info/pay_bill_to" />
    2828          </tr>
    29           <tr>
    30             <td >
    31             Amount:
     29                         
     30          <tr tal:condition="info/fee|nothing">
     31            <td>
     32            Fee:
    3233            </td>
    33             <td> Naira <span tal:content="info/amount" /></td>
    34           </tr>
    35           <tr>
     34            <td> Naira <span tal:content="info/fee" /></td>
     35          </tr>         
     36          <tr tal:condition="info/surcharge|nothing">
    3637            <td >
    3738            Surcharge:
    3839            </td>
    3940            <td> Naira <span tal:content="info/surcharge" /></td>
    40           </tr>         
     41          </tr>             
     42          <tr tal:condition="info/lrf|nothing">
     43            <td width="200px">
     44            Late Registration Fee:
     45            </td>
     46            <td> Naira <span tal:content="info/lrf" /></td>
     47          </tr>
     48          <tr>
     49            <td >
     50            Total Amount:
     51            </td>
     52            <td> Naira <span tal:content="info/amount" /></td>
     53          </tr>
     54         
    4155     
    4256        </table>

  • WAeUP_SRP/trunk/skins/waeup_futminna/interswitch_form.pt

    r5794 r5795  
    2020            </td>
    2121            <td tal:content="info/pay_bill_to" />
     22          </tr>             
     23          <tr tal:condition="info/fee|nothing">
     24            <td>
     25            Fee:
     26            </td>
     27            <td> Naira <span tal:content="info/fee" /></td>
     28          </tr>           
     29          <tr tal:condition="info/lrf|nothing">
     30            <td width="200px">
     31            Late Registration Fee:
     32            </td>
     33            <td> Naira <span tal:content="info/lrf" /></td>
    2234          </tr>
    2335          <tr>
    2436            <td >
    25             Amount:
     37            Total Amount:
    2638            </td>
    2739            <td> Naira <span tal:content="info/amount" /></td>

  • WAeUP_SRP/trunk/skins/waeup_futminna/pay_interswitch.py

    r5600 r5795  
    9090
    9191
    92 info['surcharge'] = 0  # students don't have to pay the surcharge, FUT is paying for them
    93 interswitch_amount = 300
    94 info['amount'] = amount = fee_dict['all']
     92# students don't have to pay the Interswitch surcharge, FUT is paying for them
     93info['lrf'] = fee_dict['lrf']
     94info['fee'] = fee_dict['all']
     95info['amount'] = amount = info['fee'] + info['lrf']
    9596total_amount = 100*int(amount)
    9697
    … …  
    145146
    146147bt_amount = 1500
     148interswitch_amount = 300
    147149#fut_split = 0000 #not appicable
    148150fut_amount = amount - bt_amount - interswitch_amount

  • WAeUP_SRP/trunk/skins/waeup_futminna/pay_interswitch_acco.py

    r5628 r5795  
    6464else:
    6565    payments = getattr(student,'payments')
    66 if request.has_key('epayment'):
    67     return context.interswitch_form(info=info)
    6866
    6967
    … …  
    10098    args[arg] = info[field]
    10199interswitch_amount = int(info['surcharge'])*100
    102 uni_amount = int(info['amount'])*100
     100uni_amount = int(info['fee'])*100
    103101total_amount = interswitch_amount + uni_amount
    104102args['Amount'] = "%d" % (total_amount)
Note: See TracChangeset for help on using the changeset viewer.