Changeset 3274 for WAeUP_SRP

Timestamp:

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

Author:

Henrik Bettermann

Message:

new title for payment objects

File:

• WAeUP_SRP/base/Payment.py (modified) (2 diffs)

WAeUP_SRP/base/Payment.py

@@ -57 +57 @@
     security = ClassSecurityInfo()
 
-    security.declareProtected(View,"Title") ###(
+#    security.declareProtected(View,"Title")
+#    def Title(self):
+#        """compose title"""
+#        content = self.getContent()
+#        description = getattr(content,'type_description','')
+#        d = getattr(content,'date','')
+#        #pay_date = "%s/%s/%s %s:%s:%s" %(d[:2],d[2:4],d[4:6],d[6:8],d[8:10],d[10:])
+#        pay_date = d.strftime("%d/%m/%y %H:%M:%S")
+#        amount = getattr(content,'amount','')
+#        if not (description or pay_date or amount):
+#            return self.getId()
+#        return "%(description)s, Naira %(amount)s, %(pay_date)s" % vars()
+
+    security.declareProtected(View,"Title")
     def Title(self):
         """compose title"""
-        content = self.getContent()
-        description = getattr(content,'type_description','')
-        d = getattr(content,'date','')
-        #pay_date = "%s/%s/%s %s:%s:%s" %(d[:2],d[2:4],d[4:6],d[6:8],d[8:10],d[10:])
-        pay_date = d.strftime("%d/%m/%y %H:%M:%S")
-        amount = getattr(content,'amount','')
-        if not (description or pay_date or amount):
-            return self.getId()
-        return "%(description)s, Naira %(amount)s, %(pay_date)s" % vars()
-    ###)
+        payment = self.getContent()
+        vocabularies = self.portal_vocabularies
+        
+        if payment.status == 'invalid':
+            return "Invalid Payment, Naira %s, %s" % (payment.amount,
+                                                      payment.date.strftime("%d/%m/%y %H:%M:%S"))             
+        
+        return "%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"))        
+
 
     # update Payment is no longer necessary
@@ -81 +96 @@
         ## should not be done online for all started objects (too many conflict errors)
         if status and status != 'started' and not type_description.startswith('Transfer') and not force:
-        #if status and not force: 
+        #if status and not force:
             return
         wftool = self.portal_workflow