Changeset 2877


Ignore:
Timestamp:
7 Dec 2007, 22:20:37 (17 years ago)
Author:
Henrik Bettermann
Message:

remove redundent payment fields

Location:
WAeUP_SRP
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

    r2859 r2877  
    7878                                                             review_state))
    7979    return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())
    80    
     80
    8181resp = pd['resp_code']
    8282

  • WAeUP_SRP/base/skins/waeup_epayment/pay_by_sc.py

    r2859 r2877  
    101101    info['amount'] = cost
    102102    pin = info['order_id'] = "%s" % pin
    103     info['type_code'] = "%s" % pin  #type_code is redundant and will be removed soon
     103    #info['type_code'] = "%s" % pin  #type_code is redundant and will be removed soon
    104104    info['type_description'] = 'School Fee for Session %s' % next_session_str
    105     info['type'] = 'SC'
     105    info['type'] = 'sc'
    106106    info['status'] = 'paid'
    107107    info['target'] = s_brain.course

  • WAeUP_SRP/base/skins/waeup_epayment/pay_interswitch_acco.py

    r2857 r2877  
    6363    if fulltime:
    6464        pay_item_id = "6100"
    65         info['type_code'] = student_record.faculty   #type_code is redundant and will be removed soon
     65        #info['type_code'] = student_record.faculty   #type_code is redundant and will be removed soon
    6666        info['bank'] = ''
    6767    else:
    6868        pay_item_id = "6101"
    69         info['type_code'] = student_record.course  #type_code is redundant and will be removed soon
     69        #info['type_code'] = student_record.course  #type_code is redundant and will be removed soon
    7070        info['bank'] = ''
    7171    info['payment_possible'] = True

  • WAeUP_SRP/base/skins/waeup_epayment/payment_receipt.pt

    r2066 r2877  
    4040              />
    4141        </metal:block>
     42       
     43       
     44       
     45       
    4246        <metal:block tal:condition="info/is_scratchcard_pmt">           
    4347        <h3>Scratch Card Payment Receipt</h3>
    … …  
    7680        <tr>
    7781          <td width="220px">Access Code:</td>
    78           <td><span tal:content="pm/type_code" /></td>
     82          <td><span tal:content="pm/order_id" /></td>
    7983        </tr>     
    8084        <tr>

  • WAeUP_SRP/base/skins/waeup_student/request_transfer.py

    r2661 r2877  
    101101info['amount'] = "n/a"
    102102pin = info['order_id'] = ds.get('pin')
    103 info['type_code'] = "%s" % pin
     103#info['type_code'] = "%s" % pin
    104104info['type_description'] = 'Transfer Form'
    105105info['resp_code'] = "SC"

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

    r2857 r2877  
    115115 <property name="hidden_readonly_layout_modes"/>
    116116</widget>
    117   <widget name="type_code" meta_type="String Widget">
    118   <property name="title">Payment Code</property>
    119   <property name="fields">
    120    <element value="type_code"/>
    121   </property>
    122   <property name="label">Payment Code</property>
    123   <property name="label_edit">Payment Code</property>
    124   <property name="readonly_layout_modes">
    125    <element value="edit"/>
    126   </property>
    127   <property name="hidden_layout_modes"/>
    128   <property name="hidden_readonly_layout_modes"/>
    129  </widget>
    130117 <widget name="status" meta_type="Select Widget">
    131   <property name="title">Payment status</property>
     118  <property name="title">Payment Status</property>
    132119  <property name="fields">
    133120   <element value="status"/>
    … …  
    200187  <property name="label_edit">Payment Description</property>
    201188  <property name="display_width">40</property>
    202   <property name="size_max">40</property> 
     189  <property name="size_max">40</property>
    203190  <property name="readonly_layout_modes"/>
    204191  <property name="hidden_layout_modes"/>
    … …  
    207194  <table>
    208195  <row>
    209    <cell name="type_code"/>
    210   </row>
    211   <row>
    212196   <cell name="type_description"/>
    213197  </row>

  • WAeUP_SRP/fceokene/profiles/default/schemas/payment.xml

    r2857 r2877  
    22<?xml-stylesheet type="text/xsl" href="schema.xsl"?>
    33<object name="payment" meta_type="CPS Schema">
    4   <field name="key" meta_type="CPS String Field"/>
    54  <field name="date" meta_type="CPS DateTime Field"/>
    6   <field name="type_code" meta_type="CPS String Field"/>
    75  <field name="type_description" meta_type="CPS String Field" >
    86    <property name="is_searchabletext">True</property>
    9   </field> 
     7  </field>
    108  <field name="amount" meta_type="CPS String Field"/>
    119  <field name="surcharge" meta_type="CPS String Field"/>
    12   <field name="description" meta_type="CPS String Field"/>
    1310  <field name="subject" meta_type="CPS String Field"/>
    1411  <field name="type" meta_type="CPS String Field"/>
    … …  
    1815  <field name="resp_desc" meta_type="CPS String Field">
    1916    <property name="is_searchabletext">True</property>
    20   </field> 
     17  </field>
    2118  <field name="order_id" meta_type="CPS String Field"/>
    2219  <field name="session_id" meta_type="CPS String Field"/>
    2320  <field name="resp_code" meta_type="CPS String Field"/>
    2421  <field name="resp_card_num" meta_type="CPS String Field"/>
    25   <field name="resp_date" meta_type="CPS DateTime Field"/>
    2622  <field name="resp_approved_amount" meta_type="CPS String Field"/>
    2723</object>

  • WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_status.xml

    r2854 r2877  
    77    <property name="acl_write_roles">Manager</property>
    88
    9     <item key="" msgid="">None</item>
     9    <item key="" msgid=""></item>
    1010    <item key="paid" msgid="">Paid</item>
    1111    <item key="started" msgid="">Started</item>

  • WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_subjects.xml

    r2857 r2877  
    77    <property name="acl_write_roles">Manager</property>
    88
    9     <item key="" msgid="">None</item>
     9    <item key="" msgid=""></item>
    1010    <item key="hostel_maintenance" msgid="">Hostel Maintainance</item>
    1111    <item key="schoolfee" msgid="">School Fee</item>

  • WAeUP_SRP/fceokene/profiles/default/vocabularies/payment_types.xml

    r2854 r2877  
    77    <property name="acl_write_roles">Manager</property>
    88
    9     <item key="" msgid="">None</item>
     9    <item key="" msgid=""></item>
    1010    <item key="sc" msgid="">Scratch Card</item>
    1111    <item key="online" msgid="">Online</item>

  • WAeUP_SRP/fceokene/waeup_custom/pay_interswitch.py

    r2836 r2877  
    5252
    5353pay_item_id = "8302"
    54 info['type_code'] = sbrain.course  #type_code is redundant and will be removed soon
     54#info['type_code'] = sbrain.course  #type_code is redundant and will be removed soon
    5555info['bank'] = ''
    5656info['payment_possible'] = True
Note: See TracChangeset for help on using the changeset viewer.