Changeset 5621 for WAeUP_SRP/trunk/skins/waeup_accommodation
- Timestamp:
- 28 Dec 2010, 08:53:23 (14 years ago)
- Location:
- WAeUP_SRP/trunk/skins/waeup_accommodation
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
WAeUP_SRP/trunk/skins/waeup_accommodation/accommodations.pt
r5616 r5621 36 36 tal:content="python:context.getFormattedBed(row['bed'])" /> 37 37 38 <td tal:condition="not:row/paid">39 <a 40 tal:attributes="href string:${row/url}/pay_accommodation ?session=${row/session}">38 <td> 39 <a tal:condition="row/current_unpaid" 40 tal:attributes="href string:${row/url}/pay_accommodation"> 41 41 [pay maintenance fee] 42 </a> 42 </a> 43 43 </td> 44 44 … … 50 50 </a> 51 51 </td> 52 <td tal:condition="row/cancellation_allowed">53 <a href=""52 <td> 53 <a tal:condition="row/cancellation_allowed" href="" 54 54 tal:attributes="href string:${row/url}/cancel_allocation?session=${row/session}"> 55 55 [cancel booking] 56 </a> 56 </a> 57 57 </td> 58 <td tal:condition="row/relocation_allowed">59 <a href=""58 <td> 59 <a tal:condition="row/relocation_allowed" href="" 60 60 tal:attributes="href string:${row/url}/relocate?session=${row/session}"> 61 61 [relocate] 62 </a> 62 </a> 63 63 </td> 64 64 </tr> -
WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationRecords.py
r5616 r5621 51 51 for ar in accommodation_records: 52 52 row = {} 53 row['sort_param'] = ar.session[-2:] # in 2006 we used the session attribute was 2006 and not 06 53 54 row['session'] = ar.session 54 55 row['bed'] = ar.bed 55 56 row['reservation_status'] = ar.reservation_status 56 57 row['paid'] = ar.reservation_status == 'maintenance_fee_paid' 58 row['current_unpaid'] = not row['paid'] and ar.session == portal_session 57 59 row['url'] = student_path 58 60 row['cancellation_allowed'] = info['is_so'] and ar.session == portal_session 59 61 row['relocation_allowed'] = info['is_so'] and ar.session == portal_session 60 62 accommodations.append(row) 63 64 accommodations.sort(cmp=lambda x,y: cmp(x['sort_param'],y['sort_param'])) 61 65 62 66 info['accommodations'] = accommodations -
WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationStatus.py
r5616 r5621 173 173 info['acco_res_sc_pin'] = accommodation_record.acco_res_sc_pin 174 174 info['acco_maint_fee'] = accommodation_record.acco_maint_fee 175 info['acco_maint_code'] = accommodation_record.acco_maint_code 175 176 info['student_status'] = accommodation_record.student_status 176 177 info['bed'] = accommodation_record.bed -
WAeUP_SRP/trunk/skins/waeup_accommodation/pay_accommodation.py
r5616 r5621 54 54 if psm == 'invalid': 55 55 member_id = str(context.portal_membership.getAuthenticatedMember()) 56 #logger.info('%s, %s' % (member_id,info['error'] ))57 56 logger.info('%s entered invalid data' % (member_id)) 58 57 psm = "Please correct your input." … … 77 76 data['reservation_status'] = 'maintenance_fee_paid' 78 77 79 #set_trace()80 78 context.accommodation_catalog.modifyRecord(**data) 79 80 logger.info('%s paid accommodation in session %s' % (student_id,session)) 81 81 82 82 return context.REQUEST.RESPONSE.redirect("%s/accommodations" % student.absolute_url()) -
WAeUP_SRP/trunk/skins/waeup_accommodation/pay_accommodation_form.pt
r5616 r5621 22 22 <ul tal:condition="not: maintenance_online"> 23 23 <li>Buy a Hostel Maintenance Scratch Card 24 (Code: <span tal:replace=" python: 'acco_maint_code'" />) for25 <span tal:replace=" python: 'acco_maint_fee'" /> Nairas</li>24 (Code: <span tal:replace="info/acco_maint_code" />) for 25 <span tal:replace="info/acco_maint_fee" /> Nairas</li> 26 26 <li>Enter the PIN above and press 'Submit'.</li> 27 27 <li>Print your Hostel Maintenance Receipt.</li>
Note: See TracChangeset for help on using the changeset viewer.