Changeset 2836

Timestamp:

1 Dec 2007, 10:41:15 (17 years ago)

Author:

Henrik Bettermann

Message:

to save the day ...

pay_interswitch.py is not yet tested. The rest is already in custom.

Location:

WAeUP_SRP/fceokene

Files:

• profiles/default/layouts/payment.xml (modified) (2 diffs)
• waeup_custom/getSchoolFee.py (modified) (1 diff)
• waeup_custom/getStudyLevelInfo.py (added)
• waeup_custom/pay_interswitch.py (modified) (5 diffs)

WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml

@@ -9 +9 @@
  <property name="validate_values_expr"></property>
  <widget name="amount" meta_type="String Widget">
-  <property name="title">Amount Authorized</property>
+  <property name="title">Fee Authorized</property>
   <property name="fields">
    <element value="amount"/>
   </property>
-  <property name="label">Amount Authorized</property>
-  <property name="label_edit">Amount Authorized</property>
+  <property name="label">Fee Authorized</property>
+  <property name="label_edit">Fee Authorized</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -123 +123 @@
   <property name="label_edit">Payment Description</property>
   <property name="display_width">40</property>
-  <property name="size_max">40</property>  
+  <property name="size_max">40</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>

WAeUP_SRP/fceokene/waeup_custom/getSchoolFee.py

@@ -19 +19 @@
 
 d = {}
-if str(brain.level) == '100':
+if str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
     if brain.department in ARTS:
         d['all'] = 11520
     else:
         d['all'] = 11995
-elif str(brain.level) == '200':
+elif str(brain.level) == '100' and brain.review_state == 'returning':
     if brain.department in ARTS:
         d['all'] = 10570
     else:
         d['all'] = 11045
-elif str(brain.level) == '300':
+elif str(brain.level) in ('200','300'):
     if brain.department in ARTS:
         d['all'] = 10570

WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py

@@ -45 +45 @@
 fulltime = sbrain.mode.endswith('_ft')
 
-# begin customization
-
 if not fee_dict:
     return context.interswitch_form(info=info)
-amount = info['amount'] = fee_dict['all']
-info['pay_ship_to'] = "Federal College of Education Okene"
-
-# end customization
-
 
 info['site_id'] = '83'
@@ -66 +59 @@
 info['student_id'] = student_id
 info['student_name'] = sbrain.name
-info['type'] = 'ONL' 
+info['type'] = 'ONL'
 info['status'] = 'started'
 info['target'] = sbrain.course
@@ -73 +66 @@
 now = DateTime.DateTime()
 info['date'] = now
+info['pay_ship_to'] = "Federal College of Education Okene"
 timestamp = "%d" % int(now.timeTime()*1000)
 info['order_id'] = "%s%s" % (student_id[1:],timestamp)
 p_id = "p%s" % timestamp
 
-interswitch_amount = 15000
-info['surcharge'] = interswitch_amount/100
+
+info['surcharge'] = interswitch_amount = '150'
+info['amount'] = amount = fee_dict['all']
+total_amount = 100*int(amount) + 100*int(interswitch_amount)
+
 
 if student_id is None:
@@ -110 +107 @@
 d.update(info)
 payment.getContent().edit(mapping=d)
+
+
 info['callback_url'] = "%s/payments/%s/interswitch_cb?echo=%s" % (student.absolute_url(),
                                                                   p_id,
@@ -127 +126 @@
 for arg,field in payment_fields:
     args[arg] = info[field]
-itotal = int(amount)*100
-total_amount = itotal + interswitch_amount
 
 args['Amount'] = "%d" % (total_amount)