Changeset 8429

Timestamp:

12 May 2012, 08:36:08 (13 years ago)

Author:

Henrik Bettermann

Message:

Add response description payment which displays the user id of the person who approved a payment.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• payments/interfaces.py (modified) (1 diff)
• payments/payment.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_export.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/payments/interfaces.py

@@ -131 +131 @@
         )
 
+    r_desc = schema.TextLine(
+        title = _(u'Response Description'),
+        default = None,
+        required = False,
+        readonly = False,
+        )
+
     def approve():
         "Approve an online payment and set to paid."

main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

@@ -23 +23 @@
 from grok import index
 from zope.component import getUtility
+from zope.i18n import translate
 from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
@@ -81 +82 @@
         self.r_code = u'AP'
         self.p_state = 'paid'
-        #user = get_current_principal()
+        user = get_current_principal()
+        r_desc = _('Payment approved by ${a}', mapping = {'a': user.id})
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        self.r_desc = translate(r_desc, 'waeup.kofa',
+            target_language=portal_language)
         self.payment_date = datetime.utcnow()
         return

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1399 +1399 @@
         self.assertEqual(payment.r_amount_approved, 3456.0)
         self.assertEqual(payment.r_code, 'AP')
+        self.assertEqual(payment.r_desc, u'Payment approved by K1000000')
         # The new CLR-0 pin has been created
         self.assertEqual(len(self.app['accesscodes']['CLR-0']),1)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -370 +370 @@
             'ac,amount_auth,creation_date,matric_number,p_category,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,reg_number\r\n'
-
-            ',0.0,2012-04-01 13:12:01,,schoolfee,,,,,unpaid,,0.0,,\r\n'
+            'r_code,r_desc,reg_number\r\n'
+
+            ',0.0,2012-04-01 13:12:01,,schoolfee,,,,,unpaid,,0.0,,,\r\n'
             )
         return
@@ -388 +388 @@
             'ac,amount_auth,creation_date,matric_number,p_category,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,reg_number\r\n'
+            'r_code,r_desc,reg_number\r\n'
 
             '666,0.0,2012-04-01 13:12:01,M123456,schoolfee,my-id,'
             'p-item,100,2012,unpaid,2012-04-01 14:12:01,12.12,'
-            'r-code,123456\r\n'
+            'r-code,,123456\r\n'
             )
         return
@@ -407 +407 @@
             'ac,amount_auth,creation_date,matric_number,p_category,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,reg_number\r\n'
+            'r_code,r_desc,reg_number\r\n'
 
             '666,0.0,2012-04-01 13:12:01,M123456,schoolfee,my-id,'
             'p-item,100,2012,unpaid,2012-04-01 14:12:01,12.12,'
-            'r-code,123456\r\n'
+            'r-code,,123456\r\n'
             )
         return
@@ -426 +426 @@
             'ac,amount_auth,creation_date,matric_number,p_category,p_id,'
             'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
-            'r_code,reg_number\r\n'
+            'r_code,r_desc,reg_number\r\n'
 
             '666,0.0,2012-04-01 13:12:01,M123456,schoolfee,my-id,'
             'p-item,100,2012,unpaid,2012-04-01 14:12:01,12.12,'
-            'r-code,123456\r\n'
-            )
-        return
+            'r-code,,123456\r\n'
+            )
+        return