Changeset 3312

Timestamp:

10 Mar 2008, 14:50:20 (17 years ago)

Author:

Henrik Bettermann

Message:

updated

File:

• WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py (modified) (1 diff)

WAeUP_SRP/fceokene/waeup_custom/getPaymentsFolderInfo.py

@@ -90 +90 @@
     if payment.status == 'invalid':
         row['title'] = "Invalid Payment, Naira %s, %s" % (payment.amount,
-                                                          payment.date.strftime("%d/%m/%y %H:%M:%S"))   
-    else:                                                          
+                                                          payment.date.strftime("%d/%m/%y %H:%M:%S"))
+    else:
         row['title'] = "%s for Session %s, Naira %s, %s" % (vocabularies.payment_categories.get(payment.category),
                                                             vocabularies.sessions.get(payment.session_id),
                                                             payment.amount,
                                                             payment.date.strftime("%d/%m/%y %H:%M:%S"))
-    url = row['url'] = "%s/p%s" % (payments_path,payment.order_id[6:])
+    oid = payment.order_id
+    onr = oid.rfind('-')+1
+    if onr > 0:
+        start_pos = onr
+    else:
+        start_pos = 6
+    url = row['url'] = "%s/p%s" % (payments_path,oid[start_pos:])
     row['is_requeryable'] = "%s_%s" % (payment.category,payment.session_id) not in paid_fees and payment.type == 'online' or str(member) in ('admin',)
     row['is_approvable'] = is_so and row['is_requeryable'] and payment.category == 'schoolfee' # does not make sense for maitenance