Changeset 3240

Timestamp:

26 Feb 2008, 22:40:31 (17 years ago)

Author:

Henrik Bettermann

Message:

merge callback scripts and more

Location:

WAeUP_SRP

Files:

• base/skins/waeup_epayment/approve_epayment.py (modified) (2 diffs)
• base/skins/waeup_epayment/interswitch_acco_cb.py (deleted)
• base/skins/waeup_epayment/interswitch_cb.py (modified) (2 diffs)
• fceokene/waeup_custom/getInterswitchParams.py (modified) (1 diff)
• fceokene/waeup_custom/getPaymentsFolderInfo.py (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_epayment/approve_epayment.py

@@ -41 +41 @@
 
 pd = {}
-#from Products.zdb import set_trace;set_trace()
 doc = context.getContent()
-review_state = wftool.getInfoFor(context,'review_state',None)
-if review_state != "opened":
-    return "not opened %s" % review_state
 pd['resp_code'] = 'AP'
 pd['resp_desc'] = 'Payment approved by %s, %s' % (member,DateTime.DateTime())
@@ -51 +47 @@
 doc.edit(mapping=pd)
 
-if doc.type_description.startswith('School Fee'):
-    study_course = getattr(student,'study_course')
-    try:
-        wftool.doActionFor(study_course,'open')
-    except:
-        pass
-    verdict = s_brain.verdict
-    if verdict == 'N/A':
-        verdict = ''
-    study_course.getContent().edit(mapping= {'current_level': next_level_id,
-                                             'current_session': next_session_id,
-                                             'current_verdict': next_verdict,
-                                             'previous_verdict': verdict,
-                                             })
-    if next_transition:
-        wftool.doActionFor(student,next_transition)
+#if doc.type_description.startswith('School Fee'):
+#    study_course = getattr(student,'study_course')
+#    try:
+#        wftool.doActionFor(study_course,'open')
+#    except:
+#        pass
+#    verdict = s_brain.verdict
+#    if verdict == 'N/A':
+#        verdict = ''
+#    study_course.getContent().edit(mapping= {'current_level': next_level_id,
+#                                             'current_session': next_session_id,
+#                                             'current_verdict': next_verdict,
+#                                             'previous_verdict': verdict,
+#                                             })
+#    if next_transition:
+#        wftool.doActionFor(student,next_transition)
 
 logger.info('%s approves epayment for %s' % (member,student_id))
-wftool.doActionFor(context,'close')
+review_state = wftool.getInfoFor(context,'review_state',None)
+if review_state == 'opened':
+    wftool.doActionFor(context,'close')
 return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())

WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

@@ -21 +21 @@
 from AccessControl import Unauthorized
 import DateTime
-
 
 if context.portal_membership.isAnonymousUser():
@@ -92 +91 @@
 
 if  resp == '00':
-    if context.getStudentReviewState() == "school_fee_paid":
-        logger.info('%s paid school_fee in state school_fee_paid' % (student_id))
-    else:
-        study_course = getattr(student,'study_course')
+
+    if pay_doc.category == 'schoolfee':  
+        if context.getStudentReviewState() == "school_fee_paid":
+            logger.info('%s paid school_fee in state school_fee_paid' % (student_id))
+        else:
+            study_course = getattr(student,'study_course')
+            try:
+                wftool.doActionFor(study_course,'open')
+            except:
+                pass
+            verdict = s_brain.verdict
+            if next_previous_verdict == 'N/A':
+                next_previous_verdict = ''
+            study_course.getContent().edit(mapping= {'current_level': next_level_id,
+                                                     'current_session': next_session_id,
+                                                     'current_verdict': next_verdict,
+                                                     'previous_verdict': next_previous_verdict,
+                                                     })
+            if next_transition:
+                wftool.doActionFor(student,next_transition)
+
+
+    elif pay_doc.category == 'hostel_maintenance':
+        acco_info = context.getAccommodationInfo()
+        d = {}
+        d['acco_maint_date'] = pay_doc.date
+        d['acco_maint_fee'] = pay_doc.amount
+        d['acco_maint_pay_id'] = context.getId()
         try:
-            wftool.doActionFor(study_course,'open')
+            acco_info['acco_doc'].edit(mapping=d)
         except:
-            pass
-        verdict = s_brain.verdict
-        if next_previous_verdict == 'N/A':
-            next_previous_verdict = ''
-        study_course.getContent().edit(mapping= {'current_level': next_level_id,
-                                                 'current_session': next_session_id,
-                                                 'current_verdict': next_verdict,
-                                                 'previous_verdict': next_previous_verdict,
-                                                 })
-        if next_transition:
-            wftool.doActionFor(student,next_transition)
+            logger.info('%s requeried payment though maintenance already paid' % student_id)
+
+        try:
+            wftool.doActionFor(acco_info['acco'],'pay_maintenance_fee',dest_container=acco_info['acco'])
+        except:
+            logger.info('%s no workflow action pay_maintenance_fee' % student_id)
+            
+
 
     logger.info('%s received valid callback' % student_id)
-    referer = request.get('HTTP_REFERER','none')
-    logger.info('%s valid callback referer = %s' % (student_id,referer))
-    real_ip = request.get('HTTP_X_REAL_IP',"none")
-    logger.info('%s valid callback real_ip = %s' % (student_id,real_ip))
+    #referer = request.get('HTTP_REFERER','none')
+    #logger.info('%s valid callback referer = %s' % (student_id,referer))
+    #real_ip = request.get('HTTP_X_REAL_IP',"none")
+    #logger.info('%s valid callback real_ip = %s' % (student_id,real_ip))
 
 else:
     logger.info('%s received unsuccessfull callback: %s' % (student_id,pd['resp_desc']))
 
-wftool.doActionFor(context,'close')
+review_state = wftool.getInfoFor(context,'review_state',None)
+if review_state == 'opened':
+    wftool.doActionFor(context,'close')
 
 return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())

WAeUP_SRP/fceokene/waeup_custom/getInterswitchParams.py

@@ -28 +28 @@
     d['action'] = "https://webpay.interswitchng.com/paydirect/webpay/pay.aspx"
 if paytype in ("HOM",):
-    d['callback_function'] = 'interswitch_acco_cb'
+    d['callback_function'] = 'interswitch_cb'
     d['pay_item_id'] = '8300'
     d['type_description'] = 'Hostel Maintenance Fee'

WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py

@@ -47 +47 @@
 #student = getattr(students,student_id)
 student_record = context.students_catalog.getRecordByKey(student_id)
-#context['updatePayments']()
+
 
 info = {}
@@ -93 +93 @@
     url = row['url'] = "%s/p%s" % (payments_path,payment.order_id[6:])
     row['is_requeryable'] = "%s_%s" % (payment.category,payment.session_id) not in paid_fees or str(member) in ('admin',)
-    row['is_approvable'] = is_so and row['is_requeryable']
+    row['is_approvable'] = is_so and row['is_requeryable'] and payment.category == 'schoolfee' # does not make sense for maitenance
     row['resp_desc'] = payment.resp_desc or 'Payment Process Interrupted'
     row['trans_ref'] = payment.order_id
     if row['is_requeryable']:
-        if payment.category == 'schoolfee':
-            row['callback_url'] = "%(url)s/interswitch_cb" % row 
-        elif payment.category == 'hostel_maintenance':
-            row['callback_url'] = "%(url)s/interswitch_acco_cb" % row 
-        else:
-            row['callback_url'] = ''
+        row['callback_url'] = "%(url)s/interswitch_cb" % row
+#        if payment.category == 'schoolfee':
+#            row['callback_url'] = "%(url)s/interswitch_cb" % row
+#        elif payment.category == 'hostel_maintenance':
+#            row['callback_url'] = "%(url)s/interswitch_acco_cb" % row
+#        else:
         href = '%(query_url)s' % info
         href += '?transRef=%(trans_ref)s' % row