Changeset 5792 for WAeUP_SRP

Timestamp:

3 Mar 2011, 13:54:24 (14 years ago)

Author:

Henrik Bettermann

Message:

Don't show bed coordinates in Okene if bed not paid.

Location:

WAeUP_SRP/trunk/skins/waeup_fceokene

Files:

• accommodation_record_slip.pt (modified) (2 diffs)
• book_accommodation.py (modified) (2 diffs)
• getAccommodationRecords.py (added)

WAeUP_SRP/trunk/skins/waeup_fceokene/accommodation_record_slip.pt

@@ -33 +33 @@
               <span class="dlabel">Bed</span>:
              </td>
-             <td> 
+             <td tal:condition="python:info_acco['Booking Status']=='maintenance_fee_paid'"> 
                 <span tal:content="python:context.getFormattedBed(info_acco['Bed'])"></span>
+             </td>
+             <td tal:condition="python:info_acco['Booking Status']!='maintenance_fee_paid'"> 
+                <em>visible after payment</em>
              </td>
          </tr>
@@ -70 +73 @@
              </td>
          </tr>                     
-      
+
          <tr>
              <td width="180px" valign="top">

WAeUP_SRP/trunk/skins/waeup_fceokene/book_accommodation.py

@@ -70 +70 @@
                                  )
 elif psm == 'valid':
-    pin = str(ds.get('acco_res_sc_pin'))
     code,bed = context.portal_accommodation.searchAndReserveBed(student_id,
                                                                 "%s" % (info['student_status']),
@@ -95 +94 @@
 hall_info = context.waeup_tool.getHallInfo(bed)
 data={}
-data['acco_res_sc_pin'] = ds['acco_res_sc_pin']
+data['acco_res_sc_pin'] = str(ds.get('acco_res_sc_pin',''))
 data['acco_maint_code'] = hall_info.get('maintenance_code')
 data['acco_maint_fee'] = hall_info.get('maintenance_fee')