Changeset 2461 for WAeUP_SRP/base

Timestamp:

28 Oct 2007, 16:47:34 (17 years ago)

Author:

joachim

Message:

include reasons if payment is not possible

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_epayment/payments_view.pt (modified) (4 diffs)
• waeup_student/getNextInfo.py (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -54 +54 @@
 parttime = s_brain.mode.endswith('_pt')
 fulltime = s_brain.mode.endswith('_ft')
-online_payment = False
-sc_payment = False
 
 #if review_state == 'cleared_and_validated' or (parttime and review_state == 'returning'):
@@ -62 +60 @@
 #    sc_payment = True
 
-info['online_payment'] = online_payment
-info['sc_payment'] = sc_payment
-info['prod_id'] = '61'
 session = s_brain.session
 next_info = context.getNextInfo(s_brain)
 info['next_session'] = next_info['next_session_id']
 info['next_session_str'] = next_info['next_session_str']
+info['payment_method'] = "done"
+if next_info['next_transition'] is None and next_info['reasons']:
+    info['payment_method'] = "not_possible"
+    info['reasons'] = next_info['reasons']
+elif review_state == 'cleared_and_validated':
+    info['payment_method'] = "online_payment"
+elif review_state == 'returning' and info['next_session'] != session:
+    info['payment_method'] = "sc_payment"
 
-if review_state == 'cleared_and_validated':
-    online_payment = True
-elif review_state == 'returning' and info['next_session'] != session:
-    sc_payment = True
+info['prod_id'] = '61'
+
 
 info['student_name'] = s_brain.name

WAeUP_SRP/base/skins/waeup_epayment/payments_view.pt

@@ -57 +57 @@
         <br />
         <div>
-          <form tal:condition="info/online_payment" 
+          <form tal:condition="python: info.get('payment_method') == 'online_payment'" 
                 tal:attributes="action string: ${context/absolute_url}/pay_interswitch" method="post" class="group">
             <input type="submit" name="epayment" 
@@ -64 +64 @@
                    />
           </form>  
-          <form tal:condition="info/sc_payment" 
+          <form tal:condition="python: info.get('payment_method') == 'sc_payment'" 
                 tal:attributes="action string: ${context/absolute_url}/pay_by_sc" method="post" class="group">
             <input type="hidden" name="paid_session" 
@@ -75 +75 @@
                    />
           </form>          
+          <div tal:condition="python: info.get('payment_method') == 'not_possible'">
+            You are not able to pay your schoolfee because: <br />
+            <ul>
+              <li tal:repeat="reason info/reasons" />
+            </ul>
+          </div>
         </div>        
       </span>
@@ -80 +86 @@
   </metal:main>
 </metal:body>
-  

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -18 +18 @@
 level_id = student_brain.level
 review_state = student_brain.review_state
-verdict = student_brain.verdict
+info['verdict'] = student_brain.verdict
 info['next_transition'] = None
 info['next_session_id'] = next_session_id = session_id
 info['next_level_id'] = next_level_id = level_id
-
+reasons = []
+verdicts_voc = context.portal_vocabularies.verdicts
 if review_state == 'cleared_and_validated':
     info['next_transition'] = "pay_school_fee"
@@ -32 +33 @@
         if verdict not in ('A','B',):
             info['next_level_id'] = level_id
-
+            if not verdict:
+                reasons += "There is no verdict."
+            else:
+                reasons += "Your are not a %s" % verdicts_voc.get('A') 
+                reasons += "or not a %s" % verdicts_voc.get('B') 
+        else:
+            info['next_transition'] = "pay_school_fee"
+info['reasons'] = reasons
 info['next_session_str'] = context.sessions_voc(next_session_id)