Changeset 9785 for main/waeup.futminna/trunk/src/waeup/futminna/interswitch/browser.py

Timestamp:

7 Dec 2012, 08:59:30 (12 years ago)

Author:

Henrik Bettermann

Message:

Changes according to r9775.

Use classes defined in kofacustom.nigeria.

File:

• main/waeup.futminna/trunk/src/waeup/futminna/interswitch/browser.py (modified) (7 diffs)

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

@@ -19 +19 @@
 import grok
 from zope.component import getUtility
-from kofacustom.nigeria.interswitch.helpers import query_interswitch
-from waeup.kofa.browser.layout import KofaPage, UtilityView
+from kofacustom.nigeria.interswitch.browser import (
+    InterswitchPaymentRequestWebservicePageStudent
+    )
+from waeup.kofa.browser.layout import KofaPage
 from waeup.kofa.interfaces import RETURNING, CLEARED, IKofaUtils
 from waeup.kofa.utils.helpers import to_timezone
-from waeup.kofa.students.viewlets import ApprovePaymentActionButton as APABStudent
 from waeup.futminna.students.interfaces import ICustomStudentOnlinePayment
 from waeup.futminna.interfaces import MessageFactory as _
@@ -34 +35 @@
 INSTITUTION_NAME = 'FUTMinna'
 CURRENCY = '566'
+GATEWAY_AMT = 300.0
 #QUERY_URL = 'https://webpay.interswitchng.com/paydirect/services/TransactionQueryURL.aspx'
 #QUERY_URL = 'https://testwebpay.interswitchng.com/test_paydirect/services/TransactionQueryURL.aspx'
@@ -44 +46 @@
 #URL = '/test_paydirect/services/TransactionQueryWs.asmx'
 httplib.HTTPConnection.debuglevel = 0
-
-class InterswitchActionButtonStudent(APABStudent):
-    grok.order(1)
-    grok.context(ICustomStudentOnlinePayment)
-    grok.require('waeup.payStudent')
-    icon = 'actionicon_pay.png'
-    text = _('CollegePAY')
-    target = 'goto_interswitch'
-
-    @property
-    def target_url(self):
-        if self.context.p_state != 'unpaid':
-            return ''
-        return self.view.url(self.view.context, self.target)
-
-class InterswitchRequestWebserviceActionButtonStudent(APABStudent):
-    grok.order(2)
-    grok.context(ICustomStudentOnlinePayment)
-    grok.require('waeup.payStudent')
-    icon = 'actionicon_call.png'
-    text = _('Requery CollegePAY')
-    target = 'request_webservice'
 
 class InterswitchPageStudent(KofaPage):
@@ -111 +91 @@
         xmldict['provider_bank_id'] = PROVIDER_BANK_ID
         xmldict['provider_item_name'] = PROVIDER_ITEM_NAME
-        provider_amt = 1500
+        provider_amt = 1500.0
         xmldict['provider_amt'] = 100 * provider_amt
 
@@ -124 +104 @@
         if self.context.p_category == 'schoolfee':
             xmldict['institution_amt'] = 100 * (
-                self.context.amount_auth - provider_amt - 300)
+                self.context.amount_auth - provider_amt - GATEWAY_AMT)
             if self.context.student.current_mode in ('pg_ft'):
                 self.pay_item_id = "11703"
@@ -183 +163 @@
         elif self.context.p_category == 'clearance':
             xmldict['institution_amt'] = 100 * (
-                self.context.amount_auth - 300)
+                self.context.amount_auth - GATEWAY_AMT)
             xmldict['institution_acct'] = "1750005063"
             xmldict['institution_bank_id'] = '120'
             self.pay_item_id = "11706"
+            provider_amt = 0.0
 
         elif 'maintenance' in self.context.p_category:
             xmldict['institution_amt'] = 100 * (
-                self.context.amount_auth - 300)
+                self.context.amount_auth - GATEWAY_AMT)
             xmldict['institution_acct'] = "2018856637"
             xmldict['institution_bank_id'] = '8'
             self.pay_item_id = "11705"
+            provider_amt = 0.0
 
         # Interswitch amount is not part of the xml data
@@ -220 +202 @@
 
         self.xml_data = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
+        self.context.provider_amt = provider_amt
+        self.context.gateway_amt = GATEWAY_AMT
         return
 
-class InterswitchPaymentRequestWebservicePageStudent(UtilityView, grok.View):
+class InterswitchPaymentRequestWebservicePageStudent(
+    InterswitchPaymentRequestWebservicePageStudent):
     """ Request webservice view for the CollegePAY gateway
     """
     grok.context(ICustomStudentOnlinePayment)
-    grok.name('request_webservice')
-    grok.require('waeup.payStudent')
-
-    def update(self):
-        if self.context.p_state == 'paid':
-            self.flash(_('This ticket has already been paid.'))
-            return
-        student = self.context.student
-        success, msg, log = query_interswitch(
-            self.context, PRODUCT_ID, HOST, URL)
-        student.writeLogMessage(self, log)
-        if not success:
-            self.flash(msg)
-            return
-        success, msg, log = self.context.doAfterStudentPayment()
-        if log is not None:
-            student.writeLogMessage(self, log)
-        self.flash(msg)
-        return
-
-    def render(self):
-        self.redirect(self.url(self.context, '@@index'))
-        return
+    product_id = PRODUCT_ID
+    gateway_host = HOST
+    gateway_url = URL