Changeset 1758 for WAeUP_SRP

Timestamp:

8 May 2007, 20:43:37 (17 years ago)

Author:

joachim

Message:

previous sessions students can now pay their previous sessions schoolfees,
please test if "normal" returning students can still pay.

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (1 diff)
• skins/waeup_default/getNextSessionId.py (added)
• skins/waeup_default/sessions_voc.py (modified) (1 diff)
• skins/waeup_epayment/getPaymentsFolderInfo.py (modified) (1 diff)
• skins/waeup_epayment/pay_by_sc.py (modified) (6 diffs)
• skins/waeup_epayment/pay_by_sc_form.pt (modified) (1 diff)
• skins/waeup_epayment/payments_view.pt (modified) (1 diff)
• skins/waeup_student/getSchoolFeePrefix.py (modified) (2 diffs)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -740 +740 @@
                 d['sex'] = dict.get('sex') == 'F'
             sub_doc.edit(mapping = d)
-            self.portal_workflow.doActionFor(sub_obj,f2t[pt]['wf_state'],dest_container=sub_obj)
+            new_state = f2t[pt]['wf_state']
+            if new_state != "remain":
+                self.portal_workflow.doActionFor(sub_obj,new_state,dest_container=sub_obj)
         wfaction = 'return'
         self.portal_workflow.doActionFor(student_obj,wfaction)

WAeUP_SRP/trunk/skins/waeup_default/sessions_voc.py

@@ -15 +15 @@
 except:
     return 'unknown'
-##if len(key) != 2:
-##    return 'unknown'
 if y < 90:
     cent = 2000

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -39 +39 @@
 is_so = info['is_so'] = context.isSectionOfficer()
 
-res = context.portal_catalog(portal_type='Student',id = student_id)
-if res:
-    info['review_state'] = res[0].review_state
+#res = context.portal_catalog(portal_type='Student',id = student_id)
+#res = context.students_catalog(id = student_id)
+info['review_state'] = s_brain.review_state
+session = s_brain.session
+info['next_session'], info['next_session_str'] = context.getNextSessionId(session)
 
 info['student_name'] = s_brain.name

WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py

@@ -16 +16 @@
 logger = logging.getLogger('Skins.pay_by_sc')
 import DateTime
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 
 if context.portal_membership.isAnonymousUser():
@@ -28 +33 @@
 
 student = getattr(students,student_id)
-sbrain = context.students_catalog(id=student_id)[0]
-amount,description = context.getSchoolFee(sbrain.faculty)
-
+s_brain = context.students_catalog(id=student_id)[0]
+session = s_brain.session
+next_session, next_session_str = context.getNextSessionId(session)
+amount,description = context.getSchoolFee(s_brain.faculty)
 validate = request.has_key("cpsdocument_create_button")
 res,psm,ds = lt.renderLayout(layout_id= 'student_schoolfee',
@@ -46 +52 @@
                                  psm = psm,
                                  mode = 'edit',
+                                 next_session_str = next_session_str,
                                  ds = ds,
                                  )
@@ -52 +59 @@
                                  psm = None,
                                  mode = 'edit',
+                                 next_session_str = next_session_str,
                                  ds = ds,
                                  )
@@ -73 +81 @@
     info['date'] = now
     info['amount'] = "n/a"
-    pin = info['order_id'] = ds.get('pin')
+    pin = info['order_id'] = "%s__%s" % (ds.get('pin'),next_session)
     info['type_code'] = "%s" % pin
-    info['type_description'] = 'School Fee for Session 2006/2007'
+    info['type_description'] = 'School Fee for Session %s' % next_session_str
     info['resp_code'] = "SC"
     info['resp_desc'] = "SC Payment Successful"
@@ -84 +92 @@
     payment.getContent().edit(mapping=info)
     wftool.doActionFor(payment,'close')
-    wftool.doActionFor(student,'pay_school_fee')
+    if next_session == context.getSessionId(): 
+        wftool.doActionFor(student,'pay_school_fee')
+    else:
+        study_course = getattr(student,'study_course')
+        wftool.doActionFor(study_course,'open')
+        study_course_doc = study_course.getContent()
+        next_level = "%s" % (int(s_brain.level) + 100)
+        study_course_doc.edit(mapping= {'current_level': next_level,
+                                        'current_session': next_session,})
     logger.info('%s paid school fee by scratch card' % student_id)
 else:

WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc_form.pt

@@ -13 +13 @@
       </metal:block>
       <metal:block fill-slot="main">
-        <h3>Pay Your 2006/2007 School Fee by Scratch Card!</h3>
+        <h3>Pay Your <span tal:replace="options/next_session_str" /> School Fee by Scratch Card!</h3>
         <br />
         <div tal:replace="structure rendered_main" />

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -69 +69 @@
         <form tal:condition="python:review_state == 'returning'" 
               tal:attributes="action string: ${context/absolute_url}/pay_by_sc" method="post" class="group">
+         <input type="hidden" name="paid_session" 
+                tal:attributes="value info/next_session"
+                />
+
          <input type="submit" name="epayment" 
                 class="context" 
-                value="Pay School Fee by Scratch Card" 
+                value="Pay School Fee by Scratch Card"
+                tal:attributes="value string:Pay ${info/next_session_str} School Fee by Scratch Card"
                 />
         </form>          

WAeUP_SRP/trunk/skins/waeup_student/getSchoolFeePrefix.py

@@ -16 +16 @@
     return None
 
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 import logging
 logger = logging.getLogger('Skins.getSchoolFeePrefix')
@@ -23 +28 @@
 res = context.portal_catalog(portal_type="Certificate",
                                      id = sbrain.course)
+#set_trace()
 if not res:
     logger.info('%s, certificate %s not found' % (student_id,course))