Changeset 8276

Timestamp:

25 Apr 2012, 11:37:11 (12 years ago)

Author:

Henrik Bettermann

Message:

Next try.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/interswitch

Files:

• browser.py (modified) (4 diffs)
• browser_templates/applicant_goto_interswitch.pt (modified) (1 diff)
• browser_templates/student_goto_interswitch.pt (modified) (1 diff)
• tests.py (modified) (2 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser.py

@@ -228 +228 @@
         student = self.student = self.context.getStudent()
         certificate = getattr(self.student['studycourse'],'certificate',None)
+        self.amount_auth = 100 * self.context.amount_auth
         xmldict = {}
         if certificate is not None:
@@ -235 +236 @@
             xmldict['department'] = None
             xmldict['faculty'] = None
-        self.amount_special = 100 * (self.context.amount_auth - 150)
         self.category = payment_categories.getTermByToken(
             self.context.p_category).title
@@ -285 +285 @@
                 xmldict['institution_acct'] = '0122012109'
                 xmldict['institution_bank_id'] = '16'
-        xmldict['institution_amt'] = self.amount_special - 100 * provider_amt
+        xmldict['institution_amt'] = 100 * (self.amount_auth - provider_amt - 150)
         xmldict['institution_item_name'] = self.context.p_category
         xmldict['institution_name'] = INSTITUTION_NAME
@@ -320 +320 @@
             return
         self.applicant = self.context.__parent__
+        self.amount_auth = 100 * self.context.amount_auth
         xmldict = {}
         self.category = payment_categories.getTermByToken(
             self.context.p_category).title
-        # substract invisible Interswitch surcharge
-        self.amount_special = 100 * (self.context.amount_auth - 150)
         self.local_date_time = str(self.context.creation_date)
         self.site_redirect_url = self.url(self.context, 'request_webservice')

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/applicant_goto_interswitch.pt

@@ -62 +62 @@
   <input type="hidden" name="site_name" tal:attributes="value view/site_name" />
   <input type="hidden" name="local_date_time" tal:attributes="value view/local_date_time" />
-  <input type="hidden" name="amount" tal:attributes="value view/amount_special" />
+  <input type="hidden" name="amount" tal:attributes="value view/amount_auth" />
   <input type="hidden" name="txn_ref" tal:attributes="value view/context/p_id" />
   <input type="hidden" name="pay_item_name" tal:attributes="value view/context/p_item" />

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/student_goto_interswitch.pt

@@ -62 +62 @@
   <input type="hidden" name="site_name" tal:attributes="value view/site_name" />
   <input type="hidden" name="local_date_time" tal:attributes="value view/local_date_time" />
-  <input type="hidden" name="amount" tal:attributes="value view/amount_special" />
+  <input type="hidden" name="amount" tal:attributes="value view/amount_auth" />
   <input type="hidden" name="txn_ref" tal:attributes="value view/context/p_id" />
   <input type="hidden" name="pay_item_name" tal:attributes="value view/context/p_item" />

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/tests.py

@@ -84 +84 @@
         # has been reduced by the Interswitch fee of 150 Nairas
         self.assertMatches(
-            '...<input type="hidden" name="amount" value="3985000.0" />...',
+            '...<input type="hidden" name="amount" value="4000000.0" />...',
             self.browser.contents)
 
@@ -160 +160 @@
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
-        # The total amount to be processed by Interswitch
-        # has been reduced by the Interswitch fee of 150 Nairas
         self.assertMatches(
-            '...<input type="hidden" name="amount" value="85000.0" />...',
+            '...<input type="hidden" name="amount" value="100000.0" />...',
             self.browser.contents)