Changeset 2891 for WAeUP_SRP/fceokene


Ignore:
Timestamp:
9 Dec 2007, 11:03:55 (17 years ago)
Author:
Henrik Bettermann
Message:

make maintenance payment work

rename fields target and subject

Location:
WAeUP_SRP/fceokene
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/fceokene/profiles/default/layouts/payment.xml

    r2877 r2891  
    128128  <property name="vocabulary">payment_status</property>
    129129 </widget>
    130  <widget name="subject" meta_type="Select Widget">
    131   <property name="title">Payment Subject</property>
    132   <property name="fields">
    133    <element value="subject"/>
    134   </property>
    135   <property name="is_required">False</property>
    136   <property name="label">Payment Subject</property>
    137   <property name="label_edit">Payment Subject</property>
    138   <property name="readonly_layout_modes"/>
    139   <property name="hidden_layout_modes"/>
    140   <property name="hidden_readonly_layout_modes"/>
    141   <property name="vocabulary">payment_subjects</property>
    142  </widget>
    143  <widget name="target" meta_type="String Widget">
    144   <property name="title">Payment Target</property>
    145   <property name="fields">
    146    <element value="target"/>
    147   </property>
    148   <property name="is_required">False</property>
    149   <property name="label">Payment for</property>
    150   <property name="label_edit">Payment for</property>
     130 <widget name="category" meta_type="Select Widget">
     131  <property name="title">Payment Category</property>
     132  <property name="fields">
     133   <element value="category"/>
     134  </property>
     135  <property name="is_required">False</property>
     136  <property name="label">Payment Category</property>
     137  <property name="label_edit">Payment Category</property>
     138  <property name="readonly_layout_modes"/>
     139  <property name="hidden_layout_modes"/>
     140  <property name="hidden_readonly_layout_modes"/>
     141  <property name="vocabulary">payment_categories</property>
     142 </widget>
     143 <widget name="item" meta_type="String Widget">
     144  <property name="title">Payment Item</property>
     145  <property name="fields">
     146   <element value="item"/>
     147  </property>
     148  <property name="is_required">False</property>
     149  <property name="label">Payment Item</property>
     150  <property name="label_edit">Payment Item</property>
    151151  <property name="readonly_layout_modes"/>
    152152  <property name="hidden_layout_modes"/>
  • WAeUP_SRP/fceokene/profiles/default/payments_catalog.xml

    r2863 r2891  
    1414 <column value="status"/>
    1515 <column value="student_id"/>
    16  <column value="subject"/>
     16 <column value="category"/>
    1717 <column value="surcharge"/>
    1818 <column value="type"/>
    19  <column value="target"/>
     19 <column value="item"/>
    2020 <index name="key" meta_type="FieldIndex">
    2121  <indexed_attr value="key"/>
     
    3535 <index name="resp_desc" meta_type="KeywordIndex">
    3636  <indexed_attr value="resp_desc"/>
    37  </index> 
     37 </index>
    3838 <index name="session_id" meta_type="FieldIndex">
    3939  <indexed_attr value="session_id"/>
     
    4141  <index name="status" meta_type="FieldIndex">
    4242    <indexed_attr value="status"/>
    43  </index> 
     43 </index>
    4444 <index name="student_id" meta_type="FieldIndex">
    4545  <indexed_attr value="student_id"/>
    4646 </index>
    47  <index name="subject" meta_type="KeywordIndex">
    48   <indexed_attr value="subject"/>
     47 <index name="category" meta_type="FieldIndex">
     48  <indexed_attr value="category"/>
    4949 </index>
    50  <index name="target" meta_type="FieldIndex">
    51   <indexed_attr value="target"/>
     50 <index name="item" meta_type="FieldIndex">
     51  <indexed_attr value="item"/>
    5252 </index>
    53  <index name="type" meta_type="KeywordIndex">
     53 <index name="type" meta_type="FieldIndex">
    5454  <indexed_attr value="type"/>
    5555 </index>
  • WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml

    r2877 r2891  
    88  <field name="amount" meta_type="CPS String Field"/>
    99  <field name="surcharge" meta_type="CPS String Field"/>
    10   <field name="subject" meta_type="CPS String Field"/>
     10  <field name="item" meta_type="CPS String Field"/>
    1111  <field name="type" meta_type="CPS String Field"/>
    12   <field name="target" meta_type="CPS String Field"/>
     12  <field name="category" meta_type="CPS String Field"/>
    1313  <field name="status" meta_type="CPS String Field"/>
    1414  <field name="resp_pay_reference" meta_type="CPS String Field"/>
  • WAeUP_SRP/fceokene/profiles/default/vocabularies.xml

    r2813 r2891  
    3131 <object name="payment_types" meta_type="CPS Vocabulary"/>
    3232 <object name="payment_status" meta_type="CPS Vocabulary"/>
    33  <object name="payment_subjects" meta_type="CPS Vocabulary"/>
     33 <object name="payment_categories" meta_type="CPS Vocabulary"/>
    3434 <object name="exam_types" meta_type="CPS Vocabulary"/>
    3535 <object name="pin_prefixes" meta_type="CPS Vocabulary"/>
     
    4949 <object name="screening_types" meta_type="CPS Vocabulary"/>
    5050 <object name="aos" meta_type="CPS Vocabulary"/>
    51  <object name="application_status" meta_type="CPS Vocabulary"/> 
     51 <object name="application_status" meta_type="CPS Vocabulary"/>
    5252 </object>
  • WAeUP_SRP/fceokene/waeup_custom/getInterswitchParams.py

    r2857 r2891  
    1010# $Id$
    1111
    12 test = "simulate"
     12test = ""
    1313d = {}
    14 d['payment_possible'] = True 
     14d['payment_possible'] = True
    1515d['pay_ship_to'] = "Federal College Okene"
    1616
     
    1818d['site_name'] = "fceokene.waeup.org"
    1919d['currency_id'] = '566'
    20 d['type'] = 'online' 
    21 d['status'] = 'started' 
     20d['type'] = 'online'
     21d['status'] = 'started'
    2222d['surcharge'] = '150'
    2323d['payment_params'] = 'switch_college_split'
    2424if test == 'simulate':
    25     d['action'] = "%s/payments/%s/simulate_callback" % (student.absolute_url(),payment_id)
     25    d['action'] = "%s/payments/%s/simulate_callback" % (student.absolute_url(),payment_id) #do not use simulate_callback
    2626elif test == 'test':
    27     d['action'] = "https://webpay.interswitchng.com/testpaydirect/webpay/pay.aspx"
     27    d['action'] = "https://webpay.interswitchng.com/test_paydirect/webpay/pay.aspx"
    2828else:
    2929    d['action'] = "https://webpay.interswitchng.com/paydirect/webpay/pay.aspx"
    3030if paytype in ("HOM",):
    3131    d['callback_function'] = 'interswitch_acco_cb'
    32     d['pay_item_id'] = '8302' 
    33     d['description'] = d['type_description'] = 'Hostel Maintenance Fee'
    34     d['pay_item_name'] = "FCE Okene %(description)s" % d
    35     d['amount'] = '4000' 
    36     d['subject'] = 'hostel_maintenance'
    37     d['target'] = paytype
     32    d['pay_item_id'] = '8302'
     33    d['type_description'] = 'Hostel Maintenance Fee'
     34    d['pay_item_name'] = "FCE Okene %(type_description)s" % d
     35    d['amount'] = '4000'
     36    d['category'] = 'hostel_maintenance'
     37    d['item'] = paytype
    3838
    3939return d
  • WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py

    r2890 r2891  
    4343#student = getattr(students,student_id)
    4444student_record = context.students_catalog.getRecordByKey(student_id)
    45 context['updatePayments']()
     45#context['updatePayments']()
    4646payments = []
    4747
     
    9898                                  hasattr(so_doc, 'order_id') and not so_doc.resp_code) or str(member) in ('admin','gbenga','isouaba'):
    9999            row['is_requeryable'] = True
    100             row['callback_url'] = "%s/payments/%s/interswitch_cb" % (student.absolute_url(),
    101                                                             so.getId)
     100            row['callback_url'] = "%s/interswitch_cb" % (payments_path)
    102101            href = '%(query_url)s' % info
    103102            href += '?transRef=%(trans_ref)s' % row
  • WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py

    r2883 r2891  
    6262info['status'] = 'started'
    6363info['session_id'] = student_record.session
    64 info['target'] = student_record.course
    65 info['subject'] = 'schoolfee'
     64info['item'] = student_record.course
     65info['category'] = 'schoolfee'
    6666info['student_email'] = student_record.email
    6767now = DateTime.DateTime()
Note: See TracChangeset for help on using the changeset viewer.