Changeset 4294 for WAeUP_SRP


Ignore:
Timestamp:
15 Jun 2009, 15:49:24 (15 years ago)
Author:
Henrik Bettermann
Message:

resolve #623

Location:
WAeUP_SRP/trunk/skins
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/skins/waeup_design/default.css.dtml

    r2340 r4294  
    825825.group {
    826826  margin: 0em;
    827   padding:10px 0px 20px 0px;
     827  padding:5px 0px 5px 0px;
    828828}
    829829
  • WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

    r4198 r4294  
    5656# begin customization
    5757
    58 if review_state == 'cleared_and_validated' and session not in ('07','08'):
    59     info['payment_method'] = "sc_payment"
     58if review_state == 'cleared_and_validated' and session == '06':
     59    info['payment_method'] = "both_payments"
    6060elif review_state == 'cleared_and_validated' and session in ('07','08'):
    6161    info['payment_method'] = "sc_payment"
  • WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

    r3736 r4294  
    6767        <br />
    6868        <div>
    69           <form tal:condition="python: info.get('payment_method') == 'online_payment'"
     69          <form tal:condition="python: info.get('payment_method') in ('online_payment','both_payments')"
    7070                tal:attributes="action string: ${context/absolute_url}/pay_interswitch" method="post" class="group">
    7171            <input type="submit" name="epayment"
    7272                   class="context"
    73                    value="Initiate School Fee Online Payment"
     73                   value="Pay"
     74                   tal:attributes="value string:Initiate ${info/next_session_str} School Fee Payment by Cash Card"
    7475                   />
    7576          </form> 
    76           <form tal:condition="python: info.get('payment_method') == 'sc_payment'"
     77          <form tal:condition="python: info.get('payment_method') in ('sc_payment','both_payments')"
    7778                tal:attributes="action string: ${context/absolute_url}/pay_by_sc" method="post" class="group">
    7879            <input type="hidden" name="paid_session"
     
    8182            <input type="submit" name="epayment"
    8283                   class="context"
    83                    value="Pay School Fee by Scratch Card"
    84                    tal:attributes="value string:Pay ${info/next_session_str} School Fee by Scratch Card"
     84                   value="Pay"
     85                   tal:attributes="value string:Initiate ${info/next_session_str} School Fee Payment by Scratch Card"
    8586                   />
    8687          </form>   
Note: See TracChangeset for help on using the changeset viewer.