Changeset 2859

Timestamp:

4 Dec 2007, 19:24:23 (17 years ago)

Author:

joachim

Message:

implementing the payments_catalog

Location:

WAeUP_SRP

Files:

• base/Payment.py (modified) (2 diffs)
• base/WAeUPTables.py (modified) (3 diffs)
• base/skins/waeup_epayment/interswitch_cb.py (modified) (1 diff)
• base/skins/waeup_epayment/pay_by_sc.py (modified) (1 diff)
• base/skins/waeup_epayment/upgradePayments.py (added)
• uniben/profiles/default/payments_catalog.xml (modified) (1 diff)
• uniben/waeup_custom/getPaymentsFolderInfo.py (modified) (6 diffs)

WAeUP_SRP/base/Payment.py

@@ -13 +13 @@
 import Globals
 import DateTime
+import logging
 import re
 p_home = Globals.package_home(globals())
@@ -29 +30 @@
         """compose title"""
         return "Payments"
+
+    security.declareProtected(View,"updatePayments")
+    def updatePayments(self):
+        """upgrade all payments in folder"""
+        logger = logging.getLogger('PaymentsFolder.updatePayments')
+        #import pdb;pdb.set_trace()
+        for payment in self.aq_parent.objectValues():
+            d = {}
+            student_record = self.students_catalog.getRecordByKey(self.getStudentId())
+            doc = payment.getContent()
+            d['key'] = payment.getId()
+            d['amount'] = doc.amount
+            d['description'] = d['type_description'] = doc.type_description
+            subject = ''
+            if doc.type_description.startswith('School'):
+                subject = 'schoolfee'
+            sp = doc.type_description.rfind('/')
+            d['session_id'] = doc.type_description[sp-2:sp]
+            d['subject'] = subject # zb. schoolfee
+            while True:
+                if doc.resp_code == "SC":
+                    p_type = "sc"
+                    p_status = "paid"
+                    break
+                if doc.resp_code in ("00","IP"):
+                    p_type = "online"
+                    p_status = "paid"
+                    break
+                p_type = "online"
+                p_status = "open"
+                break
+            d['key'] = payment.getId()
+            d['type'] = p_type  # scratch card
+            d['target'] = student_record.course
+            d['status'] = p_status
+            d['resp_approved_amount'] = getattr(doc,'resp_approved_amount',None)
+            d['resp_pay_reference'] = doc.resp_pay_reference
+            d['resp_desc'] = doc.resp_desc
+            d['order_id'] = doc.order_id
+            d['resp_code'] = doc.resp_code
+            d['resp_card_num'] = doc.resp_card_num
+            d['date'] = getattr(doc,'date',None)
+            d['resp_date'] = getattr(doc,'resp_date',None)
+            # msg = " ".join(["%s: %s" % (key,value) for key,value in d.items()])
+            # logger.info(msg)
+            doc.edit(mapping = d)
 
 InitializeClass(PaymentsFolder)

WAeUP_SRP/base/WAeUPTables.py

@@ -516 +516 @@
     name = "portal_pins"
     key = 'pin'
+
     def __init__(self,name=None):
         if name ==  None:
@@ -1435 +1436 @@
         WAeUPTable.__init__(self, name)
 
+
     security.declarePrivate('notify_event_listener') ###(
     def notify_event_listener(self,event_type,object,infos):
@@ -1458 +1460 @@
             return
         for field in self.schema():
-            data[field] = getattr(object,field)
+            data[field] = getattr(object,field,'')
         rpl = infos['rpath'].split('/')
         student_id = rpl[-3]
         data['student_id'] = student_id
-        self.modifyRecord(**data)
+        try:
+            self.modifyRecord(**data)
+        except KeyError:
+            self.addRecord(**data)
+        except:
+            logger = logging.getLogger('WAeUPTables.PaymentsCatalog.%s' % self.__name__)
+            logger.info("could not add or modify entry for %(key)s" % data)
     ###)
 

WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

@@ -61 +61 @@
 if pd['resp_code'] == '00' and len(pd['resp_approved_amount']) > 4:
     pd['resp_approved_amount'] = pd['resp_approved_amount'][:-2]
+    pd['status'] = 'paid'
 else:
     pd['resp_approved_amount'] = '0'
+    pd['status'] = 'failed'
 
 review_state = wftool.getInfoFor(context,'review_state',None)

WAeUP_SRP/base/skins/waeup_epayment/pay_by_sc.py

@@ -103 +103 @@
     info['type_code'] = "%s" % pin  #type_code is redundant and will be removed soon
     info['type_description'] = 'School Fee for Session %s' % next_session_str
+    info['type'] = 'SC' 
+    info['status'] = 'paid'
+    info['target'] = s_brain.course
+    info['subject'] = 'schoolfee'
     info['resp_code'] = "SC"
     info['resp_desc'] = "SC Payment Successful"

WAeUP_SRP/uniben/profiles/default/payments_catalog.xml

@@ -15 +15 @@
  <column value="student_id"/>
  <column value="subject"/>
+ <column value="surcharge"/>
  <column value="type"/>
  <column value="target"/>

WAeUP_SRP/uniben/waeup_custom/getPaymentsFolderInfo.py

@@ -11 +11 @@
 """
 Info for the PaymentsFolder
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 """
 
@@ -16 +21 @@
 if mtool.isAnonymousUser():
     return None
-try:
-    from Products.zdb import set_trace
-except:
-    def set_trace():
-        pass
-
 
 #import logging
@@ -36 +35 @@
 import DateTime
 request = context.REQUEST
-students = context.portal_url.getPortalObject().campus.students
+#students = context.portal_url.getPortalObject().campus.students
 student_id = context.getStudentId()
 if student_id is None:
     return context.REQUEST.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
-student = getattr(students,student_id)
-s_brain = context.students_catalog(id = student_id)[0]
-
+#student = getattr(students,student_id)
+student_record = context.students_catalog.getRecordByKey(student_id)
+context['updatePayments']()
 payments = []
-#from Products.zdb import set_trace;set_trace()
 
 info = {}
 is_so = info['is_so'] = context.isSectionOfficer()
 is_student = info['is_student'] = context.isStudent()
-info['student_name'] = s_brain.name
+info['student_name'] = student_record.name
 info['query_url'] = "https://webpay.interswitchng.com/paydirect/services/TransactionQueryURL.aspx"
-review_state = info['review_state'] = s_brain.review_state
-parttime = s_brain.mode and s_brain.mode.endswith('_pt')
-fulltime = s_brain.mode and s_brain.mode.endswith('_ft')
+review_state = info['review_state'] = student_record.review_state
+parttime = student_record.mode and student_record.mode.endswith('_pt')
+fulltime = student_record.mode and student_record.mode.endswith('_ft')
 
 #if review_state == 'cleared_and_validated' or (parttime and review_state == 'returning'):
@@ -60 +58 @@
 #    sc_payment = True
 
-session = s_brain.session
-next_info = context.getNextInfo(s_brain)
+session = student_record.session
+next_info = context.getNextInfo(student_record)
 info['next_session'] = next_info['next_session_id']
 info['next_session_str'] = next_info['next_session_str']
@@ -73 +71 @@
 info['prod_id'] = '61'
 
-info['student_name'] = s_brain.name
+info['student_name'] = student_record.name
 payments_path = "%s/campus/students/%s/payments" % (context.portal_url.getPortalPath(),student_id)
 sos = context.portal_catalog(container_path=payments_path)
@@ -97 +95 @@
         if review_state == 'opened' and info['review_state'] == 'cleared_and_validated' and hasattr(so_doc, 'order_id') and not so_doc.resp_code:
             row['is_requeryable'] = True
-            row['callback_url'] = "%s/payments/%s/interswitch_cb" % (student.absolute_url(),
-                                                            so.getId)
+            row['callback_url'] = "%s/interswitch_cb" % (payments_path)
             href = '%(query_url)s' % info
             href += '?transRef=%(trans_ref)s' % row