Changeset 2907

Timestamp:

10 Dec 2007, 14:18:55 (17 years ago)

Author:

joachim

Message:

fix

Location:

WAeUP_SRP/base

Files:

• Payment.py (modified) (2 diffs)
• WAeUPTables.py (modified) (1 diff)

WAeUP_SRP/base/Payment.py

@@ -90 +90 @@
                 p_type = "sc"
                 p_status = "paid"
+                if type(doc.order_id) != type(''):
+                    d['order_id'] = str(doc.order_id)
                 break
             if doc.resp_code in ("00","IP","AP"):
@@ -108 +110 @@
         d['item'] = getattr(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['resp_code'] = doc.resp_code
-        d['resp_card_num'] = doc.resp_card_num
-        d['date'] = getattr(doc,'date',None)
+        # 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['resp_code'] = doc.resp_code
+        # d['resp_card_num'] = doc.resp_card_num
+        # d['date'] = getattr(doc,'date',None)
 
         review_state = wftool.getInfoFor(self.aq_parent,'review_state',None)

WAeUP_SRP/base/WAeUPTables.py

@@ -1470 +1470 @@
         student_id = rpl[-4]
         data['student_id'] = student_id
+        modified = False
         try:
             self.modifyRecord(**data)
+            modified = True
         except KeyError:
-            self.addRecord(**data)
-        except:
             logger = logging.getLogger('WAeUPTables.PaymentsCatalog.%s' % self.__name__)
-            logger.info("could not add or modify entry for %(order_id)s" % data)
-    ###)
+            logger.info("could not modify entry for %(student_id)s with %(order_id)s" % data)
+        if not modified:
+            try:
+                self.addRecord(**data)
+            except:
+                logger = logging.getLogger('WAeUPTables.PaymentsCatalog.%s' % self.__name__)
+                logger.info("could not add or modify entry for %(student_id)s with %(order_id)s" % data)
+        ###)