Changeset 4294 for WAeUP_SRP/trunk/skins/waeup_epayment

Timestamp:

15 Jun 2009, 15:49:24 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve #623

Location:

WAeUP_SRP/trunk/skins/waeup_epayment

Files:

• getPaymentsFolderInfo.py (modified) (1 diff)
• payments_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -56 +56 @@
 # begin customization
 
-if review_state == 'cleared_and_validated' and session not in ('07','08'):
-    info['payment_method'] = "sc_payment"
+if review_state == 'cleared_and_validated' and session == '06':
+    info['payment_method'] = "both_payments"
 elif review_state == 'cleared_and_validated' and session in ('07','08'):
     info['payment_method'] = "sc_payment"

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -67 +67 @@
         <br />
         <div>
-          <form tal:condition="python: info.get('payment_method') == 'online_payment'" 
+          <form tal:condition="python: info.get('payment_method') in ('online_payment','both_payments')" 
                 tal:attributes="action string: ${context/absolute_url}/pay_interswitch" method="post" class="group">
             <input type="submit" name="epayment" 
                    class="context" 
-                   value="Initiate School Fee Online Payment" 
+                   value="Pay"
+                   tal:attributes="value string:Initiate ${info/next_session_str} School Fee Payment by Cash Card"
                    />
           </form>  
-          <form tal:condition="python: info.get('payment_method') == 'sc_payment'" 
+          <form tal:condition="python: info.get('payment_method') in ('sc_payment','both_payments')" 
                 tal:attributes="action string: ${context/absolute_url}/pay_by_sc" method="post" class="group">
             <input type="hidden" name="paid_session" 
@@ -81 +82 @@
             <input type="submit" name="epayment" 
                    class="context" 
-                   value="Pay School Fee by Scratch Card"
-                   tal:attributes="value string:Pay ${info/next_session_str} School Fee by Scratch Card"
+                   value="Pay"
+                   tal:attributes="value string:Initiate ${info/next_session_str} School Fee Payment by Scratch Card"
                    />
           </form>