Changeset 3863 for WAeUP_SRP/trunk/skins

Timestamp:

20 Jan 2009, 08:22:52 (16 years ago)

Author:

Henrik Bettermann

Message:

getPaymentsFolderInfo.py: resolve #600
getAccommodationInfo.py: implement disable switch
WAeUPImport.py: export student password

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_accommodation/getAccommodationInfo.py (modified) (3 diffs)
• waeup_epayment/getPaymentsFolderInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationInfo.py

@@ -15 +15 @@
 logger = logging.getLogger('Skins.getAccommodationInfo')
 import DateTime
+
+booking_disabled = False
 
 request = context.REQUEST
@@ -121 +123 @@
     info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
+elif booking_disabled:
+    info['booking_allowed'] = False
 
 d = {}
@@ -147 +151 @@
 info['student_status'] = student_status
 return info
-

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -73 +73 @@
 info['prod_id'] = '61'
 
+gown_records = aq_payments(Eq('student_id',student_id)  & Eq('category','gown'))
 try:
     level = int(student_record.level)
     end_level = int(student_record.end_level)
-    if level >= end_level:
+    if level >= end_level and not gown_records:
         info['gown'] = True
 except: