Changeset 3761 for WAeUP_SRP/trunk

Timestamp:

13 Nov 2008, 05:47:19 (16 years ago)

Author:

Henrik Bettermann

Message:

more corrections for payment

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_design/WAeUP_Student/render.css.dtml (modified) (1 diff)
• waeup_fceokene/getSchoolFee.py (modified) (3 diffs)
• waeup_fceokene/goto_interswitch_form.pt (modified) (2 diffs)
• waeup_fceoyo/getSchoolFee.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_design/WAeUP_Student/render.css.dtml

@@ -1 +1 @@
 .portalTabTabStyle ul.cpsskinsMenu li a{background:url(waeup_student_tab.png) left top no-repeat}
-.colorBarColor{border-color:#FFCE81;background-color:#FFCE81;color:#000000}
-.colorBarAreaColor{border-color:#FFCE81;background-color:#FFF;color:#000000}
+.colorBarColor{border-color:#EEDD88;background-color:#EEDD88;color:#000000}
+.colorBarAreaColor{border-color:#EEDD88;background-color:#FFF;color:#000000}
 

WAeUP_SRP/trunk/skins/waeup_fceokene/getSchoolFee.py

@@ -28 +28 @@
             d['all'] = 16400
     # all repeaters
-    if brain.verdict == 'C':
+    elif brain.verdict == 'C':
         if brain.department in ARTS:
             d['all'] = 10170
@@ -51 +51 @@
         else:
             d['all'] = 12545
+    # NCE III spillover
+    elif str(brain.level) in ('300','310','320') and brain.verdict == 'B':
+        if brain.department in ARTS:
+            d['all'] = 10170
+        else:
+            d['all'] = 10645            
     else:
         d['all'] = 0   
@@ -90 +96 @@
         else:
             d['all'] = 18900
+    # NCE V spillover
+    elif str(brain.level) in ('500','510','520') and brain.verdict == 'B':
+        if brain.department in ARTS:
+            d['all'] = 16900
+        else:
+            d['all'] = 17400           
     else:
-        d['all'] = 0
+        d['all'] = 0               
+
 
 

WAeUP_SRP/trunk/skins/waeup_fceokene/goto_interswitch_form.pt

@@ -12 +12 @@
           <input type="hidden" tal:attributes="name python:arg[0];value python:arg[1]" />
       </span>          
+      
+      <span tal:replace = "structure info/xml_data" /> 
+      
         <table>
           <tr>
@@ -42 +45 @@
                class="standalone" 
                name="goto_bank" 
-               value="Proceed to Payment Gateway" 
+               value="Proceed to Interswitch Payment Gateway" 
                />
       </form>

WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py

@@ -63 +63 @@
         else:
             d['all'] = 6800
-    # NCE III repeaters
-    elif str(brain.level) in ('300','310') and brain.verdict == 'C':
+    # NCE III repeaters and spillover
+    elif str(brain.level) in ('300','310') and brain.verdict in ('B','C'):
         if brain.department in ARTS:
             d['all'] = 4950
@@ -88 +88 @@
     elif str(brain.level) in ('300','310','320'):
         d['all'] = 9500
+    # NCE IV spillover
+    elif str(brain.level) in ('400','410','420') and brain.verdict == 'B':
+        d['all'] = 9000        
     else:
         d['all'] = 0