Changeset 3276 for WAeUP_SRP/uniben

Timestamp:

7 Mar 2008, 07:28:18 (17 years ago)

Author:

Henrik Bettermann

Message:

 

Location:

WAeUP_SRP/uniben

Files:

• profiles/default/layouts/payment.xml (modified) (1 diff)
• profiles/default/vocabularies/payment_status.xml (modified) (1 diff)
• waeup_custom/getPaymentsFolderInfo.py (modified) (2 diffs)

WAeUP_SRP/uniben/profiles/default/layouts/payment.xml

@@ -207 +207 @@
      <property name="hidden_readonly_layout_modes"/>
     </widget>
-  
-  
+
+
   <table>
   <row>
-   <cell name="type_description"/>
-  </row>
-  <row>
    <cell name="status"/>
-  </row>  
+  </row>
   <row>
    <cell name="order_id"/>

WAeUP_SRP/uniben/profiles/default/vocabularies/payment_status.xml

@@ -10 +10 @@
     <item key="paid" msgid="">Paid</item>
     <item key="started" msgid="">Started</item>
-    <item key="due" msgid="">Due</item>
     <item key="failed" msgid="">Unsuccessfull</item>
+    <item key="invalid" msgid="">Invalid</item>
 </object>

WAeUP_SRP/uniben/waeup_custom/getPaymentsFolderInfo.py

@@ -78 +78 @@
 payments_path = "%s/campus/students/%s/payments" % (context.portal_url(),student_id)
 payments = []
-payment_records = aq_payments(Eq('student_id',student_id))      # & Eq('session_id',student_record.session))
+payment_records = aq_payments(Eq('student_id',student_id)) # & Eq('session_id',student_record.session))
 vocabularies = context.portal_vocabularies
 paid_fees = []
@@ -88 +88 @@
     row = {}
     row['id'] = payment.key
-    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"))
+    if payment.status == 'invalid':
+        row['title'] = "Invalid Payment, Naira %s, %s" % (payment.amount,
+                                                          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:])
     row['is_requeryable'] = "%s_%s" % (payment.category,payment.session_id) not in paid_fees and payment.type == 'online' or str(member) in ('admin',)