Index: WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml	(revision 2890)
+++ WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml	(revision 2891)
@@ -128,25 +128,25 @@
   <property name="vocabulary">payment_status</property>
  </widget>
- <widget name="subject" meta_type="Select Widget">
-  <property name="title">Payment Subject</property>
-  <property name="fields">
-   <element value="subject"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">Payment Subject</property>
-  <property name="label_edit">Payment Subject</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">payment_subjects</property>
- </widget>
- <widget name="target" meta_type="String Widget">
-  <property name="title">Payment Target</property>
-  <property name="fields">
-   <element value="target"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">Payment for</property>
-  <property name="label_edit">Payment for</property>
+ <widget name="category" meta_type="Select Widget">
+  <property name="title">Payment Category</property>
+  <property name="fields">
+   <element value="category"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Payment Category</property>
+  <property name="label_edit">Payment Category</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">payment_categories</property>
+ </widget>
+ <widget name="item" meta_type="String Widget">
+  <property name="title">Payment Item</property>
+  <property name="fields">
+   <element value="item"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">Payment Item</property>
+  <property name="label_edit">Payment Item</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
Index: WAeUP_SRP/fceokene/profiles/default/payments_catalog.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/payments_catalog.xml	(revision 2890)
+++ WAeUP_SRP/fceokene/profiles/default/payments_catalog.xml	(revision 2891)
@@ -14,8 +14,8 @@
  <column value="status"/>
  <column value="student_id"/>
- <column value="subject"/>
+ <column value="category"/>
  <column value="surcharge"/>
  <column value="type"/>
- <column value="target"/>
+ <column value="item"/>
  <index name="key" meta_type="FieldIndex">
   <indexed_attr value="key"/>
@@ -35,5 +35,5 @@
  <index name="resp_desc" meta_type="KeywordIndex">
   <indexed_attr value="resp_desc"/>
- </index>  
+ </index>
  <index name="session_id" meta_type="FieldIndex">
   <indexed_attr value="session_id"/>
@@ -41,15 +41,15 @@
   <index name="status" meta_type="FieldIndex">
     <indexed_attr value="status"/>
- </index> 
+ </index>
  <index name="student_id" meta_type="FieldIndex">
   <indexed_attr value="student_id"/>
  </index>
- <index name="subject" meta_type="KeywordIndex">
-  <indexed_attr value="subject"/>
+ <index name="category" meta_type="FieldIndex">
+  <indexed_attr value="category"/>
  </index>
- <index name="target" meta_type="FieldIndex">
-  <indexed_attr value="target"/>
+ <index name="item" meta_type="FieldIndex">
+  <indexed_attr value="item"/>
  </index>
- <index name="type" meta_type="KeywordIndex">
+ <index name="type" meta_type="FieldIndex">
   <indexed_attr value="type"/>
  </index>
Index: WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml	(revision 2890)
+++ WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml	(revision 2891)
@@ -8,7 +8,7 @@
   <field name="amount" meta_type="CPS String Field"/>
   <field name="surcharge" meta_type="CPS String Field"/>
-  <field name="subject" meta_type="CPS String Field"/>
+  <field name="item" meta_type="CPS String Field"/>
   <field name="type" meta_type="CPS String Field"/>
-  <field name="target" meta_type="CPS String Field"/>
+  <field name="category" meta_type="CPS String Field"/>
   <field name="status" meta_type="CPS String Field"/>
   <field name="resp_pay_reference" meta_type="CPS String Field"/>
Index: WAeUP_SRP/fceokene/profiles/default/vocabularies.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/vocabularies.xml	(revision 2890)
+++ WAeUP_SRP/fceokene/profiles/default/vocabularies.xml	(revision 2891)
@@ -31,5 +31,5 @@
  <object name="payment_types" meta_type="CPS Vocabulary"/>
  <object name="payment_status" meta_type="CPS Vocabulary"/>
- <object name="payment_subjects" meta_type="CPS Vocabulary"/>
+ <object name="payment_categories" meta_type="CPS Vocabulary"/>
  <object name="exam_types" meta_type="CPS Vocabulary"/>
  <object name="pin_prefixes" meta_type="CPS Vocabulary"/>
@@ -49,4 +49,4 @@
  <object name="screening_types" meta_type="CPS Vocabulary"/>
  <object name="aos" meta_type="CPS Vocabulary"/>
- <object name="application_status" meta_type="CPS Vocabulary"/> 
+ <object name="application_status" meta_type="CPS Vocabulary"/>
  </object>
Index: WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_categories.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_categories.xml	(revision 2891)
+++ WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_categories.xml	(revision 2891)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="vocabulary.xsl"?>
+<object name="payment_categories" meta_type="CPS Vocabulary">
+    <property name="title"></property>
+    <property name="title_msgid"></property>
+    <property name="description"></property>
+    <property name="acl_write_roles">Manager</property>
+
+    <item key="" msgid=""></item>
+    <item key="hostel_maintenance" msgid="">Hostel Maintenance</item>
+    <item key="schoolfee" msgid="">School Fee</item>
+    <item key="transfer" msgid="">Transfer</item>
+</object>
Index: WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_subjects.xml
===================================================================
--- WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_subjects.xml	(revision 2890)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="vocabulary.xsl"?>
-<object name="payment_subjects" meta_type="CPS Vocabulary">
-    <property name="title"></property>
-    <property name="title_msgid"></property>
-    <property name="description"></property>
-    <property name="acl_write_roles">Manager</property>
-
-    <item key="" msgid=""></item>
-    <item key="hostel_maintenance" msgid="">Hostel Maintainance</item>
-    <item key="schoolfee" msgid="">School Fee</item>
-    <item key="transfer" msgid="">Transfer</item>
-</object>
Index: WAeUP_SRP/fceokene/waeup_custom/getInterswitchParams.py
===================================================================
--- WAeUP_SRP/fceokene/waeup_custom/getInterswitchParams.py	(revision 2890)
+++ WAeUP_SRP/fceokene/waeup_custom/getInterswitchParams.py	(revision 2891)
@@ -10,7 +10,7 @@
 # $Id$
 
-test = "simulate"
+test = ""
 d = {}
-d['payment_possible'] = True 
+d['payment_possible'] = True
 d['pay_ship_to'] = "Federal College Okene"
 
@@ -18,22 +18,22 @@
 d['site_name'] = "fceokene.waeup.org"
 d['currency_id'] = '566'
-d['type'] = 'online' 
-d['status'] = 'started' 
+d['type'] = 'online'
+d['status'] = 'started'
 d['surcharge'] = '150'
 d['payment_params'] = 'switch_college_split'
 if test == 'simulate':
-    d['action'] = "%s/payments/%s/simulate_callback" % (student.absolute_url(),payment_id)
+    d['action'] = "%s/payments/%s/simulate_callback" % (student.absolute_url(),payment_id) #do not use simulate_callback
 elif test == 'test':
-    d['action'] = "https://webpay.interswitchng.com/testpaydirect/webpay/pay.aspx"
+    d['action'] = "https://webpay.interswitchng.com/test_paydirect/webpay/pay.aspx"
 else:
     d['action'] = "https://webpay.interswitchng.com/paydirect/webpay/pay.aspx"
 if paytype in ("HOM",):
     d['callback_function'] = 'interswitch_acco_cb'
-    d['pay_item_id'] = '8302' 
-    d['description'] = d['type_description'] = 'Hostel Maintenance Fee'
-    d['pay_item_name'] = "FCE Okene %(description)s" % d
-    d['amount'] = '4000' 
-    d['subject'] = 'hostel_maintenance' 
-    d['target'] = paytype 
+    d['pay_item_id'] = '8302'
+    d['type_description'] = 'Hostel Maintenance Fee'
+    d['pay_item_name'] = "FCE Okene %(type_description)s" % d
+    d['amount'] = '4000'
+    d['category'] = 'hostel_maintenance'
+    d['item'] = paytype
 
 return d
Index: WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py
===================================================================
--- WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py	(revision 2890)
+++ WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py	(revision 2891)
@@ -43,5 +43,5 @@
 #student = getattr(students,student_id)
 student_record = context.students_catalog.getRecordByKey(student_id)
-context['updatePayments']()
+#context['updatePayments']()
 payments = []
 
@@ -98,6 +98,5 @@
                                   hasattr(so_doc, 'order_id') and not so_doc.resp_code) or str(member) in ('admin','gbenga','isouaba'):
             row['is_requeryable'] = True
-            row['callback_url'] = "%s/payments/%s/interswitch_cb" % (student.absolute_url(),
-                                                            so.getId)
+            row['callback_url'] = "%s/interswitch_cb" % (payments_path)
             href = '%(query_url)s' % info
             href += '?transRef=%(trans_ref)s' % row
Index: WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py
===================================================================
--- WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py	(revision 2890)
+++ WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py	(revision 2891)
@@ -62,6 +62,6 @@
 info['status'] = 'started'
 info['session_id'] = student_record.session
-info['target'] = student_record.course
-info['subject'] = 'schoolfee'
+info['item'] = student_record.course
+info['category'] = 'schoolfee'
 info['student_email'] = student_record.email
 now = DateTime.DateTime()
