Changeset 2904 for WAeUP_SRP

Timestamp:

10 Dec 2007, 11:15:53 (17 years ago)

Author:

joachim

Message:

fixes for order_id (don't use yet)

Location:

WAeUP_SRP/base

Files:

• Payment.py (modified) (5 diffs)
• WAeUPTables.py (modified) (2 diffs)

WAeUP_SRP/base/Payment.py

@@ -33 +33 @@
 
     security.declareProtected(View,"updatePayments")
-    def updatePayments(self):
+    def updatePayments(self,force = None):
         """upgrade all payments in folder"""
         logger = logging.getLogger('PaymentsFolder.updatePayments')
@@ -39 +39 @@
         for payment in self.aq_parent.objectValues():
             student_record = self.students_catalog.getRecordByKey(self.getStudentId())
-            payment['updatePayment'](student_record)
+            payment['updatePayment'](student_record,force=force)
 
 InitializeClass(PaymentsFolder)
@@ -72 +72 @@
 
     security.declareProtected(View,"updatePayment")
-    def updatePayment(self,student_record):
+    def updatePayment(self,student_record,force=None):
         doc = self.getContent()
-        if getattr(doc,'status',None):
+        if getattr(doc,'status',None) and not force:
             return
         wftool = self.portal_workflow
@@ -97 +97 @@
             p_type = "online"
             p_status = "started"
+            # don't set order_id it is already correct
+            if self.order_id.starts_with('p'):
+                try:
+                    self.payments_catalog.deleteRecord(self.order_id)
+                except:
+                    pass
+                d['order_id'] = "%s%s" % (student_record.id[1:],self.aq_parent.getId()[1:])
             break
         d['type'] = p_type  # scratch card
@@ -104 +111 @@
         d['resp_pay_reference'] = doc.resp_pay_reference
         d['resp_desc'] = doc.resp_desc
-        d['order_id'] = self.aq_parent.getId()
         d['resp_code'] = doc.resp_code
         d['resp_card_num'] = doc.resp_card_num

WAeUP_SRP/base/WAeUPTables.py

@@ -1449 +1449 @@
         mt = getattr(object,'meta_type',None)
         data = {}
-        if pt == 'Payment' and mt == 'CPS Proxy Folder':
-            order_id = object.id
+        if pt != 'Payment':
+            return
+        if mt == 'CPS Proxy Folder':
             if event_type == "sys_add_object":
-                try:
-                    self.addRecord(order_id = order_id)
-                except ValueError:
-                    pass
-                return
+                return # is handled in modify since we don't have order_id yet
+                # try:
+                #     self.addRecord(order_id = order_id)
+                # except ValueError:
+                #     pass
+                # return
             elif event_type == 'sys_del_object':
                 self.deleteRecord(order_id)
-        if pt != 'Payment' or mt == 'CPS Proxy Folder':
             return
         if event_type not in ('sys_modify_object'):
@@ -1466 +1467 @@
             data[field] = getattr(object,field,'')
         rpl = infos['rpath'].split('/')
-        student_id = rpl[-3]
+        #import pdb;pdb.set_trace()
+        student_id = rpl[-4]
         data['student_id'] = student_id
         try: