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

Timestamp:

7 Feb 2015, 11:26:19 (10 years ago)

Author:

Henrik Bettermann

Message:

Add new payment state 'waived'. This state can only be set by import
and is only used for the payments overview exporter to
mark sessions with waived fees.

Location:

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

Files:

• payments/interfaces.py (modified) (1 diff)
• students/export.py (modified) (1 diff)
• students/tests/test_export.py (modified) (3 diffs)

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

@@ -27 +27 @@
     (_('Paid'),'paid'),
     (_('Failed'),'failed'),
+    (_('Fees waived'),'waived'),
     )
 

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

@@ -475 +475 @@
             value = 0
             for ticket in context['payments'].values():
-                if ticket.p_state == 'paid' and \
-                    ticket.p_category == 'schoolfee' and \
+                if ticket.p_category == 'schoolfee' and \
                     ticket.p_session == int(name):
-                    try:
-                        value += ticket.amount_auth
-                    except TypeError:
-                        pass
+                    if ticket.p_state == 'waived':
+                        value = 'waived'
+                        break
+                    if ticket.p_state == 'paid':
+                        try:
+                            value += ticket.amount_auth
+                        except TypeError:
+                            pass
             if value == 0:
                 value = ''

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

@@ -1078 +1078 @@
         payment_2.p_session = curr_year - 5
         payment_2.amount_auth = 13.13
-        payment_2.p_state = u'paid'
+        payment_2.p_state = 'paid'
         payment_2.p_category = u'schoolfee'
         self.student['payments']['my-2ndpayment'] = payment_2
@@ -1087 +1087 @@
         payment_3.p_session = curr_year - 5
         payment_3.amount_auth = 1.01
-        payment_3.p_state = u'paid'
+        payment_3.p_state = 'paid'
         payment_3.p_category = u'schoolfee'
         self.student['payments']['my-3rdpayment'] = payment_3
+        # One session school fee has been waived
+        payment_4 = StudentOnlinePayment()
+        payment_4.p_id = 'my-id_2'
+        payment_4.p_session = curr_year - 4
+        payment_4.amount_auth = 1.01
+        payment_4.p_state = 'waived'
+        payment_4.p_category = u'schoolfee'
+        self.student['payments']['my-4thpayment'] = payment_4
         exporter = StudentPaymentsOverviewExporter()
         exporter.export_all(self.app, self.outfile)
@@ -1098 +1106 @@
             'current_level,current_session,current_mode,'
             '%s\r\nA111111,234,Anna M. Tester,created,CERT1,NA,NA,0,'
-            '200,2012,ug_ft,,,,,14.14,,12.12,,,\r\n'
+            '200,2012,ug_ft,,,,,14.14,waived,12.12,,,\r\n'
             % year_range_str in result
             )