Changeset 14765 for main/kofacustom.nigeria/trunk/src/kofacustom

Timestamp:

4 Aug 2017, 05:04:42 (7 years ago)

Author:

Henrik Bettermann

Message:

Rename template which can also be used for applicants.

Define templatedir.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita

Files:

• browser_templates/goto_remita.pt (moved) (moved from main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/browser_templates/student_goto_remita.pt) (2 diffs)
• studentsbrowser.py (modified) (12 diffs)
• tests.py (modified) (4 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/browser_templates/goto_remita.pt

@@ -35 +35 @@
           Customer Name:</td>
         <td>
-          <span tal:replace="view/student/display_fullname">CUSTNAME</span>
+          <span tal:replace="view/customer/display_fullname">CUSTNAME</span>
         </td>
       </tr>
@@ -42 +42 @@
           Email Address:</td>
         <td>
-          <span tal:replace="view/student/email">EMAIL</span>
+          <span tal:replace="view/customer/email">EMAIL</span>
         </td>
       </tr>

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/studentsbrowser.py

@@ -27 +27 @@
 from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.browser import OnlinePaymentDisplayFormPage as OPDPStudent
-from waeup.kofa.applicants.browser import OnlinePaymentDisplayFormPage as OPDPApplicant
 from kofacustom.nigeria.remita.helpers import (
     get_JSON_POST_response, query_remita, write_payments_log)
 from kofacustom.nigeria.payments.interfaces import INigeriaOnlinePayment
 from kofacustom.nigeria.students.interfaces import INigeriaStudentOnlinePayment
-from kofacustom.nigeria.applicants.interfaces import INigeriaApplicantOnlinePayment
 from kofacustom.nigeria.interfaces import MessageFactory as _
+
+grok.templatedir('browser_templates')
 
 def module_activated(session):
@@ -123 +123 @@
             self.flash(_('Remita Retrieval Reference not found.'), type='danger')
             return
-
         # Remita sends a POST request which may contain more information
         # if a payment was not successful.
@@ -130 +129 @@
             self.flash('Transaction status message from Remita: %s'
                 % resp.get('status'), type='warning')
-
         success, msg, log = query_remita(
             self.context,
@@ -139 +137 @@
             self.https,
             False)
-
         student.writeLogMessage(self, log)
         if not success:
@@ -160 +157 @@
     grok.context(INigeriaStudentOnlinePayment)
     grok.name('verify_payment_status')
-    grok.require('waeup.payStudent')
+    grok.require('waeup.manageStudent')
 
     # Here we use Remita test portal data
@@ -180 +177 @@
             self.flash(_('Remita Retrieval Reference not found.'), type='danger')
             return
-
         # Remita sends a POST request which may contain more information
         # if a payment was not successful.
@@ -187 +183 @@
             self.flash('Transaction status message from Remita: %s'
                 % resp.get('status'), type='warning')
-
         success, msg, log = query_remita(
             self.context,
@@ -196 +191 @@
             self.https,
             True)
-
         student.writeLogMessage(self, log)
         if not success:
             self.flash(msg, type='danger')
             return
-        write_payments_log(student.student_id, self.context)
-        flashtype, msg, log = self.context.doAfterStudentPayment()
-        if log is not None:
-            student.writeLogMessage(self, log)
-        self.flash(msg, type=flashtype)
+        self.flash(msg)
         return
 
@@ -220 +210 @@
     grok.context(INigeriaOnlinePayment)
     grok.name('goto_remita')
-    grok.template('student_goto_remita')
+    grok.template('goto_remita')
     grok.require('waeup.payStudent')
     label = _('Pay via Remita')
@@ -255 +245 @@
         if time_delta.days > 7:
             return _("This payment ticket is too old. Please create a new ticket.")
-        student = self.context.student
-        certificate = getattr(student['studycourse'],'certificate',None)
+        certificate = getattr(self.context.student['studycourse'],'certificate',None)
         if certificate is None:
             return _("Study course data are incomplete.")
         kofa_utils = getUtility(IKofaUtils)
         student_utils = getUtility(IStudentsUtils)
-        if student_utils.samePaymentMade(student, self.context.p_category,
+        if student_utils.samePaymentMade(self.context.student, self.context.p_category,
             self.context.p_item, self.context.p_session):
             return _("This type of payment has already been made.")
         self.responseurl = self.url(self.context, 'request_payment_status')
-        self.student = student
         resp = get_JSON_POST_response(
             merchantId=self.merchantId,
@@ -276 +264 @@
             url=self.init_url,
             https=self.https,
-            fullname=self.student.display_fullname,
-            email=self.student.email,
+            fullname=self.context.student.display_fullname,
+            email=self.context.student.email,
             lineitems=self.lineitems)
         if resp.get('error'):
@@ -288 +276 @@
         hashargs =      self.merchantId + self.rrr + self.api_key
         self.hashvalue = hashlib.sha512(hashargs).hexdigest()
+        self.customer = self.context.student
         return
 

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/remita/tests.py

@@ -122 +122 @@
 
     # successful transaction
-    # (hopefully this transaction remain in the Remita database)
+    # (hopefully this transaction remains in the Remita database)
     orderId = '3456346346'
     rrr = u'280007640804'
@@ -185 +185 @@
     @external_test
     def test_remita_form(self):
-        # Manager can access InterswitchForm
+        # Manager can access Remita form
         self.browser.getLink("Pay via Remita").click()
         # The RRR has been retrieved
@@ -197 +197 @@
     @external_test
     def test_requery_verify_payment_status(self):
-        # Manager can access InterswitchForm
+        # Manager can access Remita form
         self.browser.getLink("Requery Remita Payment Status").click()
         self.assertTrue('Remita Retrieval Reference not found.'
@@ -216 +216 @@
         self.assertEqual(self.payment.r_code, '01')
         self.browser.getLink("Verify Remita Payment Status").click()
-        self.assertTrue('Successful payment' in self.browser.contents)
+        self.assertTrue('Successful callback received' in self.browser.contents)
         return