Changeset 3759 for WAeUP_SRP/trunk

Timestamp:

12 Nov 2008, 13:19:51 (16 years ago)

Author:

Henrik Bettermann

Message:

new school fee logig for Oyo and Okene

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_fceokene/pay_interswitch.py (modified) (3 diffs)
• waeup_fceokene/pay_interswitch_old.py (added)
• waeup_fceoyo/getSchoolFee.py (modified) (3 diffs)
• waeup_fceoyo/pay_interswitch.py (modified) (3 diffs)
• waeup_upload/uploads_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_fceokene/pay_interswitch.py

@@ -50 +50 @@
 info['site_id'] = '83'
 info['currency_id'] = '566'
+pay_item_id = "8302"
 
-pay_item_id = "8302"
 #info['type_code'] = sbrain.course  #type_code is redundant and will be removed soon
 info['bank'] = ''
@@ -128 +128 @@
     args[arg] = info[field]
 
+bt_amount = 1600
+fceokene_split = 1400
+fceokene_amount = amount - bt_amount - fceokene_split
+
+xmldict = {}
+xmldict['detail_ref'] = args['txn_ref']
+xmldict['department'] = student_record.department
+xmldict['faculty'] = student_record.faculty
+xmldict['fceokene_amount'] = "%d" % int(100*fceokene_amount)
+xmldict['bt_amount'] = "%d" % int(100*bt_amount)
+xmldict['fceokene_split'] = "%d" % int(100*fceokene_split)
+
+if student_record.mode in ('ug_sw','prence',):
+    xmldict['fceokene_acct'] = "04470040000032"
+    xmldict['bank_id'] = '7'
+elif student_record.mode in ('ug_ft',):
+    xmldict['fceokene_acct'] = "2822010008611"
+    xmldict['bank_id'] = '8'
+else:
+    xmldict['fceokene_acct'] = "0000000000000"
+    xmldict['bank_id'] = '0'
+
+
+xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="FCE Okene" department="%(department)s" faculty="%(faculty)s">
+<item_detail item_id="1" item_name="FCEOkene School Fee" item_amt="%(fceokene_amount)s" bank_id="%(bank_id)s" acct_num="%(fceokene_acct)s" />
+<item_detail item_id="2" item_name="FCEOkene Split" item_amt="%(fceokene_split)s" bank_id="8" acct_num="2822040000037" />
+<item_detail item_id="3" item_name="BT" item_amt="%(bt_amount)s" bank_id="89" acct_num="0061001000021095" />
+</item_details>
+</payment_item_detail>""" % xmldict
+
+info['xml_data'] = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
+
 args['Amount'] = "%d" % (total_amount)
 args['site_name'] = "fceokene.waeup.org"
@@ -133 +166 @@
 args['pay_item_id'] = pay_item_id
 args['pay_item_name'] = "FCEOKENE Tuition Payments"
-args['payment_params'] = 'switch_college_split'
-args['xml_data'] = ''
+args['payment_params'] = 'college_split'
+#args['xml_data'] = ''
+#args['xml_data'] = xmltext   # info['xml_data']can be used instead
 info['args'] = args
+
 return context.goto_interswitch_form(info=info)
+

WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py

@@ -23 +23 @@
     if str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
         if brain.department in ARTS:
-            d['all'] = 16950
+            d['all'] = 14770
         else:
-            d['all'] = 17550
+            d['all'] = 15370
     elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
         if brain.department in ARTS:
@@ -31 +31 @@
         else:
             d['all'] = 10420
+  # new addition for prence to nce-i students whose fees are different from other nce-i students
+    elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated' and brain.entry_mode == 'prence':
+        if brain.department in ARTS:
+            d['all'] = 13320
+        else:
+            d['all'] = 14420
     elif str(brain.level) == '100' and brain.review_state == 'returning':
         if brain.department in ARTS:
-            d['all'] = 7820
+            d['all'] = 8320
         else:
-            d['all'] = 8420
+            d['all'] = 8920
     elif str(brain.level) in ('200','210','220'):
         if brain.department in ARTS:
@@ -51 +57 @@
             d['all'] = 4950
         else:
-            d['all'] = 6800            
+            d['all'] = 5550            
     else:
         d['all'] = 0

WAeUP_SRP/trunk/skins/waeup_fceoyo/pay_interswitch.py

@@ -127 +127 @@
     args[arg] = info[field]
 
-bt_amount = 1750
-fceoyo_split = 750
+bt_amount = 2000
+fceoyo_split = 500
 
-#getSchoolFee provides pure school fee, the fees have to be added
+#getSchoolFee provides pure school fee, the other fees have to be added
 total_amount = 100* (amount + interswitch_amount + bt_amount + fceoyo_split)        
 
@@ -142 +142 @@
 
 if student_record.mode in ('ug_sw','prence',):
-    xmldict['fceoyo_acct'] = "0285001000000899"
+    xmldict['fceoyo_acct'] = "0061001000021076"
     xmldict['bank_id'] = '89'
 elif student_record.mode in ('ug_ft',):
-    xmldict['fceoyo_acct'] = "1681001000137"
+    xmldict['fceoyo_acct'] = "3030010073"
     xmldict['bank_id'] = '125'
 else:
@@ -157 +157 @@
 <item_details detail_ref="%(detail_ref)s" college="fceoyo" department="%(department)s" faculty="%(faculty)s" >
 <item_detail item_id="1" item_name="FCEOyo School Fee" item_amt="%(amount)s" bank_id="%(bank_id)s" acct_num="%(fceoyo_acct)s" />
-<item_detail item_id="2" item_name="FCEOyo Split" item_amt="%(fceoyo_split)s" bank_id="125" acct_num="1681001000119" />
-<item_detail item_id="3" item_name="BT" item_amt="%(bt_amount)s" bank_id="89" acct_num="0061001000021095" />
+<item_detail item_id="2" item_name="FCEOyo Split" item_amt="%(fceoyo_split)s" bank_id="125" acct_num="3030010076" />
+<item_detail item_id="3" item_name="BT" item_amt="%(bt_amount)s" bank_id="89" acct_num="0061001000021096" />
 </item_details>
 </payment_item_detail>""" % xmldict

WAeUP_SRP/trunk/skins/waeup_upload/uploads_form.pt

@@ -200 +200 @@
             <tr tal:repeat="row python:info['imported'][:10]"
                 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td nowrap tal:condition="python:len(row['id']) > 30" tal:content="python:row['id'][:15] + '[...].done'" ></td>
-              <td tal:condition="python:len(row['id']) <= 30" tal:content="python:row['id'] + '.done'" ></td>
+              <td nowrap tal:condition="python:len(row['id']) > 8" tal:content="python:row['id'][:8] + '[...].done'" ></td>
+              <td tal:condition="python:len(row['id']) <= 8" tal:content="python:row['id'] + '.done'" ></td>
               <td tal:content="row/import_layout"></td>
               <td tal:content="row/uploaded_by" ></td>