Changeset 11635 for main

Timestamp:

13 May 2014, 10:20:30 (10 years ago)

Author:

Henrik Bettermann

Message:

Use base classes InterswitchPageApplicant? and InterswitchPageStudent? from kofacustom.nigeria.

Location:

main/waeup.fceokene/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/fceokene/interswitch/browser.py (modified) (7 diffs)
• src/waeup/fceokene/interswitch/browser_templates/applicant_goto_interswitch.pt (deleted)
• src/waeup/fceokene/interswitch/browser_templates/student_goto_interswitch.pt (deleted)
• src/waeup/fceokene/interswitch/tests.py (modified) (2 diffs)

main/waeup.fceokene/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Use base classes InterswitchPageApplicant and InterswitchPageStudent from
+  kofacustom.nigeria.
 
 * File input fields brought into shape with Bootstrap 3.

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

@@ -18 +18 @@
 import httplib
 import grok
-from zope.component import getUtility
 from kofacustom.nigeria.interswitch.browser import (
     InterswitchPaymentRequestWebservicePageApplicant,
-    InterswitchPaymentRequestWebservicePageStudent
+    InterswitchPaymentRequestWebservicePageStudent,
+    InterswitchPageStudent, InterswitchPageApplicant,
     )
-from waeup.kofa.browser.layout import KofaPage
-from waeup.kofa.interfaces import IKofaUtils
-from waeup.kofa.utils.helpers import to_timezone
 from waeup.fceokene.students.interfaces import ICustomStudentOnlinePayment
 from waeup.fceokene.applicants.interfaces import ICustomApplicantOnlinePayment
@@ -49 +46 @@
 httplib.HTTPConnection.debuglevel = 0
 
-class InterswitchPageStudent(KofaPage):
+class CustomInterswitchPageStudent(InterswitchPageStudent):
     """ View which sends a POST request to the Interswitch
     CollegePAY payment gateway.
     """
     grok.context(ICustomStudentOnlinePayment)
-    grok.name('goto_interswitch')
-    grok.template('student_goto_interswitch')
-    grok.require('waeup.payStudent')
-    label = _('Submit data to CollegePAY (Interswitch Payment Gateway)')
-    submit_button = _('Submit')
     action = POST_ACTION
     site_name = SITE_NAME
@@ -66 +58 @@
 
     def update(self):
-        if self.context.p_state == 'paid':
-            self.flash(_("Payment ticket can't be re-send to CollegePAY."))
-            self.redirect(self.url(self.context, '@@index'))
-            return
-
-        student = self.student = self.context.student
-        certificate = getattr(student['studycourse'],'certificate',None)
-        self.amount_auth = 100 * self.context.amount_auth
-        xmldict = {}
-        if certificate is not None:
-            xmldict['department'] = certificate.__parent__.__parent__.code
-            xmldict['faculty'] = certificate.__parent__.__parent__.__parent__.code
-        else:
-            xmldict['department'] = None
-            xmldict['faculty'] = None
-        self.category = getUtility(IKofaUtils).PAYMENT_CATEGORIES[self.context.p_category]
-        tz = getUtility(IKofaUtils).tzinfo
-        self.local_date_time = to_timezone(
-            self.context.creation_date, tz).strftime("%Y-%m-%d %H:%M:%S %Z")
-        self.site_redirect_url = self.url(self.context, 'request_webservice')
+        student, certificate, xmldict = super(
+            CustomInterswitchPageStudent, self).update()
         # Provider data
         provider_amt = 1600.0
@@ -162 +136 @@
         return
 
-class InterswitchPageApplicant(KofaPage):
+class CustomInterswitchPageApplicant(InterswitchPageApplicant):
     """ View which sends a POST request to the Interswitch
     CollegePAY payment gateway.
     """
     grok.context(ICustomApplicantOnlinePayment)
-    grok.require('waeup.payApplicant')
-    grok.template('applicant_goto_interswitch')
-    grok.name('goto_interswitch')
-    label = _('Submit data to CollegePAY (Interswitch Payment Gateway)')
-    submit_button = _('Submit')
     action = POST_ACTION
     site_name = SITE_NAME
@@ -179 +148 @@
 
     def update(self):
-        if self.context.p_state != 'unpaid':
-            self.flash(_("Payment ticket can't be re-send to CollegePAY."))
-            self.redirect(self.url(self.context, '@@index'))
-            return
-        if self.context.__parent__.__parent__.expired \
-            and self.context.__parent__.__parent__.strict_deadline:
-            self.flash(_("Payment ticket can't be send to CollegePAY. "
-                         "Application period has expired."))
-            self.redirect(self.url(self.context, '@@index'))
-            return
-        self.applicant = self.context.__parent__
-        self.amount_auth = 100 * self.context.amount_auth
+        super(CustomInterswitchPageApplicant, self).update()
         xmldict = {}
-        self.category = getUtility(IKofaUtils).PAYMENT_CATEGORIES[self.context.p_category]
-        tz = getUtility(IKofaUtils).tzinfo
-        self.local_date_time = to_timezone(
-            self.context.creation_date, tz).strftime("%Y-%m-%d %H:%M:%S %Z")
-        self.site_redirect_url = self.url(self.context, 'request_webservice')
-        xmldict['detail_ref'] = self.context.p_id
         # Provider data
         provider_amt = 500.0
+        xmldict['detail_ref'] = self.context.p_id
         xmldict['provider_amt'] = 100 * provider_amt
         xmldict['provider_acct'] = PROVIDER_ACCT
@@ -229 +182 @@
 
 
-class InterswitchPaymentRequestWebservicePageStudent(
+class CustomInterswitchPaymentRequestWebservicePageStudent(
     InterswitchPaymentRequestWebservicePageStudent):
     """ Request webservice view for the CollegePAY gateway
@@ -238 +191 @@
     gateway_url = URL
 
-class InterswitchPaymentRequestWebservicePageApplicant(
+class CustomInterswitchPaymentRequestWebservicePageApplicant(
     InterswitchPaymentRequestWebservicePageApplicant):
     """ Request webservice view for the CollegePAY gateway

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

@@ -297 +297 @@
         self.assertTrue(
             'zope.mgr - '
-            'waeup.fceokene.interswitch.browser.InterswitchPaymentRequestWebservicePageStudent - '
+            'waeup.fceokene.interswitch.browser.CustomInterswitchPaymentRequestWebservicePageStudent - '
             'K1000000 - successful schoolfee payment: p3536651296379\n'
             in logcontent)
@@ -416 +416 @@
         self.assertTrue(
             'zope.mgr - '
-            'waeup.fceokene.interswitch.browser.InterswitchPaymentRequestWebservicePageApplicant - '
+            'waeup.fceokene.interswitch.browser.CustomInterswitchPaymentRequestWebservicePageApplicant - '
             '%s - successful payment: p3536651296379\n'
             % self.applicant.applicant_id in logcontent)