Changeset 2857 for WAeUP_SRP/fceokene


Ignore:
Timestamp:
4 Dec 2007, 16:28:13 (17 years ago)
Author:
joachim
Message:
 
Location:
WAeUP_SRP/fceokene
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

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

    r2845 r2857  
    2121  <property name="hidden_readonly_layout_modes"/>
    2222 </widget>
    23  <widget name="date" meta_type="DateTime Widget">
     23 <widget name="surcharge" meta_type="String Widget">
     24  <property name="title">Surcharge</property>
     25  <property name="fields">
     26   <element value="surcharge"/>
     27  </property>
     28  <property name="label">Surcharge</property>
     29  <property name="label_edit">Surcharge</property>
     30  <property name="readonly_layout_modes">
     31   <element value="edit"/>
     32  </property>
     33  <property name="hidden_layout_modes"/>
     34  <property name="hidden_readonly_layout_modes"/>
     35 </widget>
     36  <widget name="date" meta_type="DateTime Widget">
    2437  <property name="title">Transaction Date</property>
    2538  <property name="fields">

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

    r1571 r2857  
    6868  <property name="hidden_readonly_layout_modes"/>
    6969  <property name="prefix">HMU</property>
     70 </widget>
     71 <widget name="acco_maint_pay_id" meta_type="String Widget">
     72  <property name="title">Online Payment Id</property>
     73  <property name="fields">
     74   <element value="acco_maint_pay_id"/>
     75  </property>
     76  <property name="label">Online Payment Id</property>
     77  <property name="label_edit">Online Payment Id</property>
     78  <property name="readonly_layout_modes">
     79   <element value="create"/>
     80   <element value="edit"/>
     81  </property>
     82  <property name="hidden_layout_modes">
     83   <element value="create"/>
     84  </property>
     85  <property name="hidden_readonly_layout_modes"/>
    7086 </widget>
    7187 <widget name="acco_res_date" meta_type="DateTime Widget">

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

    r2829 r2857  
    3434  </property>
    3535  <property name="hidden_readonly_layout_modes"/>
    36   <property name="prefix">@getMaintenancePrefix</property>
     36  <property name="prefix">HOM</property>
     37 </widget>
     38 <widget name="acco_maint_pay_id" meta_type="String Widget">
     39  <property name="title">Online Payment Id</property>
     40  <property name="fields">
     41   <element value="acco_maint_pay_id"/>
     42  </property>
     43  <property name="label">Online Payment Id</property>
     44  <property name="label_edit">Online Payment Id</property>
     45  <property name="readonly_layout_modes">
     46   <element value="create"/>
     47   <element value="edit"/>
     48  </property>
     49  <property name="hidden_layout_modes">
     50   <element value="create"/>
     51  </property>
     52  <property name="hidden_readonly_layout_modes"/>
    3753 </widget>
    3854 <widget name="acco_res_date" meta_type="DateTime Widget">
    … …  
    5167  <property name="hidden_readonly_layout_modes"/>
    5268 </widget>
    53 
    5469 <widget name="bed" meta_type="Method Widget">
    5570  <property name="title">Bed</property>
    … …  
    106121  </row>
    107122  <row>
    108    <cell name="acco_maint_sc_pin"/>
     123   <cell name="acco_maint_pay_id"/>
    109124  </row>
    110125  <row>

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

    r2852 r2857  
    99  </field>
    1010  <field name="amount" meta_type="CPS String Field"/>
     11  <field name="surcharge" meta_type="CPS String Field"/>
    1112  <field name="description" meta_type="CPS String Field"/>
    1213  <field name="subject" meta_type="CPS String Field"/>

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

    r1399 r2857  
    66 <field name="acco_maint_fee" meta_type="CPS String Field"/>
    77 <field name="acco_maint_sc_pin" meta_type="CPS String Field"/>
     8 <field name="acco_maint_pay_id" meta_type="CPS String Field"/>
    89 <field name="acco_res_date" meta_type="CPS DateTime Field"/>
    910 <field name="acco_res_sc_pin" meta_type="CPS String Field"/>

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

    r2854 r2857  
    88
    99    <item key="" msgid="">None</item>
     10    <item key="hostel_maintenance" msgid="">Hostel Maintainance</item>
    1011    <item key="schoolfee" msgid="">School Fee</item>
    1112    <item key="transfer" msgid="">Transfer</item>

  • WAeUP_SRP/fceokene/waeup_custom/getAccommodationInfo.py

    r2829 r2857  
    5656students_object = context.portal_url.getPortalObject().campus.students
    5757student = getattr(students_object, student_id)
    58 info['id'] = student_id
     58info['student_id'] = student_id
    5959info['student'] = student
    6060
    … …  
    7070
    7171info['booking_allowed'] = booking_allowed
     72info['online_payment'] = True  # for Okene
    7273if not booking_allowed:
    7374    info['acco'] = None
    … …  
    7980
    8081bt = 're'
     82info['maintenance_paid'] = False
    8183if acco is not None:
    8284    info['acco_doc'] = acco.getContent()
    8385    info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
     86    info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
    8487d = {}
    8588if review_state == "cleared_and_validated":

  • WAeUP_SRP/fceokene/waeup_custom/layout_student_acco_view_slip.pt

    r2829 r2857  
    66              widgets python:context.getRenderedWidgets(layout);
    77              fields python:('bed',
    8 
    9                                  'acco_res_date',
    10                                  'acco_maint_sc_pin',
     8                              'acco_res_date',
     9                                 'acco_maint_pay_id',
    1110                                 'acco_maint_date',
    1211                                 )"
Note: See TracChangeset for help on using the changeset viewer.