Changeset 3993

Timestamp:

2 Mar 2009, 14:59:51 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve FUTMinna #44

Location:

WAeUP_SRP/trunk/skins/waeup_futminna

Files:

• getSchoolFee.py (modified) (3 diffs)
• pay_interswitch.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_futminna/getSchoolFee.py

@@ -19 +19 @@
     # fresh remedial
     if str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
-        if brain.entry_mode in ('rm_ft'):
+        if brain.mode == 'rm_ft':
             d['all'] = 74200
         else:
@@ -25 +25 @@
     # fresh
     elif brain.review_state == 'cleared_and_validated':
-        if brain.lga == 'foreigner':
+        if brain.mode == 'jm_ft':
+            d['all'] = 70000    
+        elif brain.lga == 'foreigner':
             d['all'] = 131500 + 5000
         else:
@@ -31 +33 @@
     # returning
     elif brain.review_state == 'returning':
-        if brain.lga == 'foreigner':
+        if brain.mode == 'jm_ft':
+            d['all'] = 35200
+        elif brain.lga == 'foreigner':
             d['all'] = 109500
         else:

WAeUP_SRP/trunk/skins/waeup_futminna/pay_interswitch.py

@@ -140 +140 @@
 #students at all levels pay their school fees to different banks
 if student_record.review_state == 'cleared_and_validated' and student_record.level in ('100'):
-    xmldict['fut_acct'] = "0510031193719"
-    xmldict['bank_id'] = '75' 
+    if brain.mode == 'jm_ft':
+        xmldict['fut_acct'] = "0030001000016190"
+        xmldict['bank_id'] = '89'
+    else:
+        xmldict['fut_acct'] = "0510031193719"
+        xmldict['bank_id'] = '75' 
 elif student_record.review_state == 'returning' and student_record.level in ('100'):    
-    xmldict['fut_acct'] = "0030001000017110"
-    xmldict['bank_id'] = '89' 
+    if brain.mode == 'jm_ft':
+        xmldict['fut_acct'] = "0030001000016190"
+        xmldict['bank_id'] = '89'        
+    else:
+        xmldict['fut_acct'] = "0030001000017110"
+        xmldict['bank_id'] = '89' 
 elif student_record.level in ('200'):
     xmldict['fut_acct'] = "2522040000134"
@@ -157 +165 @@
 elif student_record.level in ('000'):
     xmldict['fut_acct'] = "6013803183"
-    xmldict['bank_id'] = '117'           
+    xmldict['bank_id'] = '117'     
 else:
     xmldict['fut_acct'] = "0000000000000"