Changeset 5781

Timestamp:

28 Feb 2011, 10:53:12 (14 years ago)

Author:

Henrik Bettermann

Message:

Implement online maintenance fee payment at FUTMinna.

Enable random order booking at FCEOkene.

Location:

WAeUP_SRP/trunk

Files:

• profiles/futminna/actions.xml (modified) (1 diff)
• skins/waeup_accommodation/ReadMe.txt (modified) (2 diffs)
• skins/waeup_accommodation/getAccommodationStatus.py (modified) (1 diff)
• skins/waeup_accommodation/pay_accommodation_form.pt (modified) (1 diff)
• skins/waeup_epayment/interswitch_cb.py (modified) (4 diffs)
• skins/waeup_fceokene/book_accommodation.py (added)
• skins/waeup_futminna/accommodation_record_slip.pt (added)
• skins/waeup_futminna/getAccommodationStatus.py (added)

WAeUP_SRP/trunk/profiles/futminna/actions.xml

@@ -8 +8 @@
   </action>
  </action-provider>
+ <action-provider name="portal_actions">
+  <action title="My Accommodation" action_id="reserve_accommodation"
+     category="student_navigation" condition_expr="member"
+     url_expr="string:${portal_url}/campus/students/${member}/accommodations" visible="True"/>
+ </action-provider> 
 </object>

WAeUP_SRP/trunk/skins/waeup_accommodation/ReadMe.txt

@@ -35 +35 @@
 Profile importieren (Achtung: vorher Portalbasisdaten sichern)
 initialize_accommodation_catalog
-getStudentFolderInfo Zeile 84,58 aktivieren
+getStudentFolderInfo Zeile 84,85 aktivieren
 student_view.pt: in Zeile 63 condition entfernen
 random Order für Okene customisieren
@@ -44 +44 @@
 Beim Löschen von Studenten accommodation-Tabelle exportieren
 Online Payment auf FUTMinna implementieren
+Accommodation.AccoFolder.importReservedBeds anpassen

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationStatus.py

@@ -177 +177 @@
 info['bed'] = accommodation_record.bed
 info['session'] = accommodation_record.session
+info['maintenance_paid'] = accommodation_record.reservation_status == 'maintenance_fee_paid'
 
 return info

WAeUP_SRP/trunk/skins/waeup_accommodation/pay_accommodation_form.pt

@@ -18 +18 @@
         <div tal:replace="structure rendered_main" />
         
-        <p>Instructions :</p>
+        <p tal:condition="not: maintenance_online">Instructions :</p>
         
         <ul tal:condition="not: maintenance_online">

WAeUP_SRP/trunk/skins/waeup_epayment/interswitch_cb.py

@@ -46 +46 @@
 logger.info('%s, callback referer = %s, IP = %s' % (student_id,referer,real_ip))
 
-if not 'webpay.interswitchng.com' in referer and not 'waeup.org' in referer:
+ontest = False
+
+if not ontest and not 'webpay.interswitchng.com' in referer and not 'waeup.org' in referer:
     logger.info('%s, wrong callback referer %s, callback rejected, IP = %s' % (student_id,referer,real_ip))
     return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())
@@ -63 +65 @@
     pd[pdk] = request.get(rc,'')
 
-## for testing purposes
-#pd['resp_desc'] = 'Simulated Callback'
-#pd['resp_pay_reference'] = 'XXXX'
-#pd['resp_code'] = '00'
-#pd['resp_card_num'] = '0000'
-#pd['resp_approved_amount'] = '4680000'
+if ontest:
+    pd['resp_desc'] = 'Simulated Callback'
+    pd['resp_pay_reference'] = 'XXXX'
+    pd['resp_code'] = '00'
+    pd['resp_card_num'] = '0000'
+    pd['resp_approved_amount'] = '4680000'
 
 if pd['resp_code'] == '00' and len(pd['resp_approved_amount']) > 4:
@@ -92 +94 @@
         resp_approved_amount = int(pd['resp_approved_amount'])
         #set_trace()
-        if amount + surcharge != resp_approved_amount:
+        if not ontest and amount + surcharge != resp_approved_amount:
             logger.info('Warning: %s, approved amount %s and authorized amount %s are different for payment %s of %s' % (member,resp_approved_amount,amount+surcharge,context.getId(),student_id))
             pd['status'] = 'failed'
@@ -140 +142 @@
 
     elif pay_doc.category == 'hostel_maintenance':
-        acco_info = context.getAccommodationInfo()
-        d = {}
-        d['acco_maint_date'] = pay_doc.date
-        d['acco_maint_fee'] = pay_doc.amount
-        d['acco_maint_pay_id'] = context.getId()
-        try:
-            acco_info['acco_doc'].edit(mapping=d)
-        except:
-            logger.info('%s requeried payment though maintenance already paid' % student_id)
-
-        try:
-            wftool.doActionFor(acco_info['acco'],'pay_maintenance_fee',dest_container=acco_info['acco'])
-        except:
-            logger.info('%s no workflow action pay_maintenance_fee' % student_id)
+        
+        ## callback function for accommodation_catalog method
+        data={}
+        data['acco_maint_date'] = pay_doc.date
+        data['catkey'] =student_id + '|' + session
+        data['acco_maint_fee'] = pay_doc.amount
+        data['acco_maint_pay_id'] = context.getId()
+        data['reservation_status'] = 'maintenance_fee_paid'
+        context.accommodation_catalog.modifyRecord(**data)        
+        
+        ## callback function for accommodation object method (deactivated since March 2011)
+        #acco_info = context.getAccommodationInfo()
+        #d = {}
+        #d['acco_maint_date'] = pay_doc.date
+        #d['acco_maint_fee'] = pay_doc.amount
+        #d['acco_maint_pay_id'] = context.getId()
+        #try:
+        #    acco_info['acco_doc'].edit(mapping=d)
+        #except:
+        #    logger.info('%s requeried payment though maintenance already paid' % student_id)
+        #try:
+        #    wftool.doActionFor(acco_info['acco'],'pay_maintenance_fee',dest_container=acco_info['acco'])
+        #except:
+        #    logger.info('%s no workflow action pay_maintenance_fee' % student_id)