Changeset 1949

Timestamp:

23 Jun 2007, 04:25:10 (17 years ago)

Author:

Henrik Bettermann

Message:

• logging messages changed

• First check if student review state is correct

File:

• WAeUP_SRP/trunk/skins/waeup_epayment/check_transactions.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_epayment/check_transactions.py

@@ -72 +72 @@
     if response_code == "00":
         pd = {}
+        review_state = context.getStudentReviewState(student_id)
+        if review_state != "cleared_and_validated":
+            logger.info('%s review_state = %s' % (student_id,review_state))
+            continue       
         review_state = wftool.getInfoFor(payment_obj,'review_state',None)
         if payment_doc.resp_code == "":
             if review_state != "opened":
-                logger.info('payment object of %s closed' % (student_id))
+                logger.info("Payment object of %s is closed and won't be reopend" % (student_id))
                 continue
+            logger.info('%s approves epayment for %s by import' % (member,student_id)))    
         else:
-            logger.info('payment object of %s old resp_code: %s' % (student_id,
-                                                                  payment_doc.resp_code,
-                                                                 ))
             if review_state == "closed":
-                logger.info('payment object of %s closed will be reopened' % (student_id))
+                logger.info('%s approves epayment for %s by import. Payment object was already closed, old resp_code: %s' % (member,student_id,payment_doc.resp_code))
                 wftool.doActionFor(payment_obj,'open')
-        review_state = context.getStudentReviewState(student_id)
-        if review_state != "cleared_and_validated":
-            logger.info('%s review_state = %s' % (student_id,review_state))
-            continue
+            # cannot happen but anyway ...    
+            else:
+                logger.info('%s approves epayment for %s by import. Payment object is overwritten, old resp_code: %s' % (member,student_id,payment_doc.resp_code))
         pd['resp_code'] = 'IP'
         pd['resp_desc'] = 'Payment approved by import, %s' % (DateTime.DateTime())
@@ -93 +94 @@
         if payment_doc.type_description.startswith('School Fee'):
             wftool.doActionFor(student_obj,'pay_school_fee')
-        logger.info('%s approves epayment for %s by import' % (member,student_id))
         wftool.doActionFor(payment_obj,'close')
         approved += 1