Index: /WAeUP_SRP/base/Payment.py
===================================================================
--- /WAeUP_SRP/base/Payment.py	(revision 2915)
+++ /WAeUP_SRP/base/Payment.py	(revision 2916)
@@ -93,4 +93,12 @@
                     d['order_id'] = str(doc.order_id)
                 break
+
+            if self.order_id.startswith('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:])
+
             if doc.resp_code in ("00","IP","AP"):
                 p_type = "online"
@@ -100,10 +108,5 @@
             p_status = "started"
             # don't set order_id it is already correct
-            if self.order_id.startswith('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
