Changeset 16192 for main/waeup.kofa/trunk/src/waeup

Timestamp:

11 Aug 2020, 08:38:20 (4 years ago)

Author:

Henrik Bettermann

Message:

Show more payer data.

Location:

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

Files:

• tests/test_webservices.py (modified) (7 diffs)
• webservices.py (modified) (3 diffs)

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

@@ -839 +839 @@
                 'amount_auth': 12.12, 'p_session': 2012,
                 'p_state': 'failed',
-                'r_company': 'xyz'}
+                'r_company': 'xyz',
+                'fullname': 'Anna Tester',
+                'id': 'K1000000',
+                'matric_number': '234'}
                 ])
         results = server.get_unpaid_payments(4)
@@ -850 +853 @@
                   'p_session': 2012,
                   'p_state': 'unpaid',
-                  'r_company': None},
+                  'r_company': None,
+                  'fullname': 'Anna Tester',
+                  'id': 'K1000000',
+                  'matric_number': '234'},
                 {'display_item': None,
                   'p_id': '%s' % p_id_1,
@@ -857 +863 @@
                   'p_session': 2012,
                   'p_state': 'failed',
-                  'r_company': 'xyz'}
+                  'r_company': 'xyz',
+                  'fullname': 'Anna Tester',
+                  'id': 'K1000000',
+                  'matric_number': '234'},
                 ])
         results = server.get_unpaid_payments(4,'xyz')
@@ -868 +877 @@
                   'p_session': 2012,
                   'p_state': 'failed',
-                  'r_company': 'xyz'},
+                  'r_company': 'xyz',
+                  'fullname': 'Anna Tester',
+                  'id': 'K1000000',
+                  'matric_number': '234'},
                 ])
 
@@ -892 +904 @@
 <value><nil/></value></member>
 <member>
+<name>amount_auth</name>
+<value><double>12.12</double></value>
+</member>
+<member>
 <name>p_id</name>
 <value><string>%s</string></value>
@@ -900 +916 @@
 </member>
 <member>
+<name>matric_number</name>
+<value><string>234</string></value>
+</member>
+<member>
 <name>p_category</name>
 <value><string>schoolfee</string></value>
 </member>
 <member>
-<name>amount_auth</name>
-<value><double>12.12</double></value>
+<name>fullname</name>
+<value><string>Anna Tester</string></value>
+</member>
+<member>
+<name>p_state</name>
+<value><string>failed</string></value>
 </member>
 <member>
@@ -912 +936 @@
 </member>
 <member>
-<name>p_state</name>
-<value><string>failed</string></value>
+<name>id</name>
+<value><string>K1000000</string></value>
 </member>
 </struct></value>

main/waeup.kofa/trunk/src/waeup/kofa/students/webservices.py

@@ -26 +26 @@
     IUniversity, IExtFileStore, IFileStoreNameChooser, IKofaUtils,
     GRADUATED, TRANSREL)
+from waeup.kofa.payments.interfaces import IPayer
 from waeup.kofa.utils.helpers import get_fileformat, to_timezone
 from waeup.kofa.students.catalog import StudentsQuery
@@ -446 +447 @@
                         p_session=payment.p_session,
                         p_state=payment.p_state,
-                        r_company=getattr(payment, 'r_company', None)
+                        r_company=getattr(payment, 'r_company', None),
+                        id = IPayer(payment).id,
+                        matric_number = IPayer(payment).matric_number,
+                        fullname = IPayer(payment).display_fullname,
                         )
                       )
@@ -458 +462 @@
                 p_session=payment.p_session,
                 p_state=payment.p_state,
-                r_company=getattr(payment, 'r_company', None)
+                r_company=getattr(payment, 'r_company', None),
+                id = IPayer(payment).id,
+                matric_number = IPayer(payment).matric_number,
+                fullname = IPayer(payment).display_fullname,
                 )
               )