Changeset 3625 for WAeUP_SRP

Timestamp:

17 Aug 2008, 07:47:00 (16 years ago)

Author:

Henrik Bettermann

Message:

sw students pay less maint. fee

Location:

WAeUP_SRP

Files:

• base/skins/waeup_epayment/pay_interswitch_acco.py (modified) (1 diff)
• fceokene/profiles/default/actionicons.xml (modified) (2 diffs)
• fceokene/waeup_custom/getInterswitchParams.py (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_epayment/pay_interswitch_acco.py

@@ -41 +41 @@
 hostel = paytype == "HOM"
 if hostel:
-    info = context.getInterswitchParams(paytype,student,payment_id)
+    info = context.getInterswitchParams(paytype,student,payment_id,student_record)
     info['student'] = student_record
-
-#else:
-#    info = {}
-#    info['student'] = student_record
-#    info['payment_possible'] = False
-#    info['amount'] = '0'
-#    info['bank'] = ''
-#    info['type_description'] = ''
-#    info['pay_bill_to'] = ''
-#    fee_dict = context.getSchoolFee(student_record)
-#    fulltime = student_record.mode.endswith('_ft')
-#    new = student_record.review_state == 'cleared_and_validated'
-#    returning = student_record.review_state == 'returning'
-#    if not fee_dict or (not new and fulltime) or not (new or returning):
-#        return context.interswitch_form(info=info)
-#    if new:
-#        amount = info['amount'] = fee_dict['new']
-#    elif returning:
-#        amount = info['amount'] = fee_dict['returning']
-#    if fulltime:
-#        pay_item_id = "6100"
-#        #info['type_code'] = student_record.faculty   #type_code is redundant and will be removed soon
-#        info['bank'] = ''
-#    else:
-#        pay_item_id = "6101"
-#        #info['type_code'] = student_record.course  #type_code is redundant and will be removed soon
-#        info['bank'] = ''
-#    info['payment_possible'] = True
-#    info['type_description'] = fee_dict['description']
-#    info['pay_ship_to'] = "University of Benin"
 
 info['pay_bill_to'] = student_record.name

WAeUP_SRP/fceokene/profiles/default/actionicons.xml

@@ -131 +131 @@
               title="Import Data" priority="7"
               icon_expr="actionicon_submit.png"/>
+ <action-icon category="global" action_id="send_email_form"
+              title="Send Email" priority="8"
+              icon_expr="actionicon_email.png"/>              
 
  <action-icon category="global_header" action_id="print"
@@ -194 +197 @@
  <action-icon category="navigation"
               action_id="view_uploads" title="Uploads"
-              priority="6" icon_expr="blank.gif"/>              
+              priority="6" icon_expr="blank.gif"/>
  <action-icon category="navigation" action_id="contact_admin"
               title="Contact" priority="7"

WAeUP_SRP/fceokene/waeup_custom/getInterswitchParams.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=paytype,student,payment_id
+##parameters=paytype,student,payment_id,student_record
 ##title=
 ##
 # $Id$
+
 
 test = ""
@@ -32 +33 @@
     d['type_description'] = 'Hostel Maintenance Fee'
     d['pay_item_name'] = "FCE Okene %(type_description)s" % d
-    d['amount'] = '2500'
+    if student_record.mode.endswith('_sw'):
+        d['amount'] = '2500'
+    else:
+        d['amount'] = '4000'
     d['category'] = 'hostel_maintenance'
     d['item'] = paytype