Changeset 6955 for WAeUP_SRP/trunk/skins

Timestamp:

26 Oct 2011, 08:04:39 (13 years ago)

Author:

Henrik Bettermann

Message:

Fiddle with Interswitch surcharge which is, in contrast to school fee payment, not included in the FUTMinna amount.

Location:

WAeUP_SRP/trunk/skins/waeup_futminna

Files:

• goto_interswitch_form_accept.pt (added)
• interswitch_form_accept.pt (modified) (1 diff)
• pay_interswitch_accept.py (modified) (5 diffs)

WAeUP_SRP/trunk/skins/waeup_futminna/interswitch_form_accept.pt

@@ -35 +35 @@
           <tr>
             <td >
-            Total Amount:
+            Amount:
             </td>
             <td> Naira <span tal:content="info/amount" /></td>
+          </tr>
+          <tr>
+            <td >
+            Surcharge:
+            </td>
+            <td> Naira <span tal:content="info/surcharge" /></td>
           </tr>
         </table>

WAeUP_SRP/trunk/skins/waeup_futminna/pay_interswitch_accept.py

@@ -70 +70 @@
 info['surcharge'] = 300
 info['acceptance_fee'] = 20000
-info['amount'] = amount = info['acceptance_fee'] + info['surcharge']
-total_amount = 100*int(amount)
+info['amount'] = amount = info['acceptance_fee']
+total_amount = 100*(int(amount) + info['surcharge'])
 
 if student_id is None:
@@ -80 +80 @@
 
 info['action'] = "https://webpay.interswitchng.com/paydirect/webpay/pay.aspx"
+info['action'] = "https://testwebpay.interswitchng.com/test_paydirect/webpay/pay.aspx"
 
 if "payments" not in student.objectIds():
@@ -120 +121 @@
 
 
-interswitch_amount = 300
-fut_amount = amount - interswitch_amount
-
 xmldict = {}
 xmldict['detail_ref'] = args['txn_ref']
@@ -128 +126 @@
 xmldict['level'] = student_record.level
 xmldict['faculty'] = student_record.faculty
-xmldict['fut_amount'] = "%d" % int(100*fut_amount)
+xmldict['fut_amount'] = 100*amount
 
 
@@ -149 +147 @@
 info['args'] = args
 
-return context.goto_interswitch_form(info=info)
+return context.goto_interswitch_form_accept(info=info)