Changeset 16191

Timestamp:

7 Aug 2020, 12:52:51 (4 years ago)

Author:

Henrik Bettermann

Message:

Also include failed payments when querying unpaid payments.

Location:

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

Files:

• tests/test_webservices.py (modified) (6 diffs)
• webservices.py (modified) (1 diff)

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

@@ -812 +812 @@
         payment1.p_session = 2012
         payment1.amount_auth = 12.12
-        payment1.p_state = u'unpaid'
+        payment1.p_state = u'failed'
         payment1.p_category = u'schoolfee'
         payment1.r_company = u'xyz'
@@ -838 +838 @@
                 'p_category': 'schoolfee',
                 'amount_auth': 12.12, 'p_session': 2012,
-                'p_state': 'unpaid',
+                'p_state': 'failed',
                 'r_company': 'xyz'}
                 ])
@@ -845 +845 @@
             results,[
                 {'display_item': None,
-                  'p_id': '%s' % p_id_1,
-                  'p_category': 'schoolfee',
-                  'amount_auth': 12.12,
-                  'p_session': 2012,
-                  'p_state': 'unpaid',
-                  'r_company': 'xyz'},
-                {'display_item': None,
                   'p_id': '%s' % p_id_3,
                   'p_category': 'schoolfee',
@@ -857 +850 @@
                   'p_session': 2012,
                   'p_state': 'unpaid',
-                  'r_company': None}
+                  'r_company': None},
+                {'display_item': None,
+                  'p_id': '%s' % p_id_1,
+                  'p_category': 'schoolfee',
+                  'amount_auth': 12.12,
+                  'p_session': 2012,
+                  'p_state': 'failed',
+                  'r_company': 'xyz'}
                 ])
         results = server.get_unpaid_payments(4,'xyz')
@@ -867 +867 @@
                   'amount_auth': 12.12,
                   'p_session': 2012,
-                  'p_state': 'unpaid',
+                  'p_state': 'failed',
                   'r_company': 'xyz'},
                 ])
@@ -913 +913 @@
 <member>
 <name>p_state</name>
-<value><string>unpaid</string></value>
+<value><string>failed</string></value>
 </member>
 </struct></value>

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

@@ -432 +432 @@
             cat.searchResults(p_id=(p_id_minus_days, p_id_now),
                               p_state=('unpaid', 'unpaid')))
+        payments += list(
+            cat.searchResults(p_id=(p_id_minus_days, p_id_now),
+                              p_state=('failed', 'failed')))
         hitlist = []
         if company: