Changeset 8769

Timestamp:

20 Jun 2012, 13:37:27 (13 years ago)

Author:

Henrik Bettermann

Message:

Log IP addresses.

Explain why regular school fee tickets can't be added.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• etranzact/browser.py (modified) (5 diffs)
• students/utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py

@@ -33 +33 @@
 from waeup.aaue.applicants.interfaces import ICustomApplicantOnlinePayment
 
+#ACCEPTED_IP = ('195.219.3.181', '195.219.3.184')
 ACCEPTED_IP = None
+
 
 # Kofa's webservice
@@ -44 +46 @@
     def update(self, PAYEE_ID=None):
         real_ip = self.request.get('HTTP_X_FORWARDED_FOR', None)
+        # We can forego the logging once eTranzact payments run smoothly
+        # and the accepted IP addresses are used.
+        if real_ip:
+            self.context.logger.info('KofaFeeRequest called: %s' % real_ip)
         if real_ip  and ACCEPTED_IP:
-            if real_ip != ACCEPTED_IP:
+            if real_ip not in  ACCEPTED_IP:
                 self.output = '-4'
                 return
@@ -122 +128 @@
         success = f.read()
         success = success.replace('\r\n','')
-        if 'COL1' not in success:
+        if 'COL6' not in success:
             msg = _('Invalid or unsuccessful callback: ${a}',
                 mapping = {'a': success})
@@ -248 +254 @@
         applicant = self.context.__parent__
         success, msg, log = query_etranzact(confirmation_number,self.context)
-        applicant.loggerInfo(ob_class, log)
+        applicant.writeLogMessage(self, log)
         if not success:
             self.flash(msg)
@@ -254 +260 @@
         success, msg, log = self.context.doAfterApplicantPayment()
         if log is not None:
-            applicant.loggerInfo(ob_class, log)
+            applicant.writeLogMessage(self, log)
         self.flash(msg)
         return

main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

@@ -67 +67 @@
             return _(u'Session configuration object is not available.'), None
         # Determine fee.
+        if category == 'schoolfee':
+            return _('School fee has to be paid by two instalments.'), None
         if category == 'transfer':
             amount = academic_session.transfer_fee