Changeset 15792

Timestamp:

10 Nov 2019, 20:11:40 (5 years ago)

Author:

Henrik Bettermann

Message:

Add payment status scholarship.

Location:

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

Files:

• payments/interfaces.py (modified) (1 diff)
• students/export.py (modified) (5 diffs)

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

@@ -28 +28 @@
     (_('Failed'),'failed'),
     (_('Fees waived'),'waived'),
+    (_('Scholarship'),'scholarship'),
     )
 

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

@@ -481 +481 @@
     two seperate export files. The exporter is primarily used by bursary
     officers who have exclusively access to this exporter. The exporter
-    exports ``paid`` and ``waived`` payment tickets.
+    exports ``paid``, ``waived`` and ``scholarship`` payment tickets.
     """
     grok.name('bursary')
 
     def filter_func(self, x, **kw):
-        return get_payments(x, p_states=('paid', 'waived'), **kw)
+        return get_payments(x, p_states=('paid', 'waived', 'scholarship'), **kw)
 
     fields = tuple(
@@ -517 +517 @@
 class AccommodationPaymentsExporter(DataForBursaryExporter):
     """The Accommodation Payments Exporter works like the Data for Bursary
-    Exporter above. The exporter exports ``paid`` and ``waived`` payment
-    tickets with category ``bed_allocation`` or ``hostel_maintenance``.
+    Exporter above. The exporter exports ``paid``, ``waived`` and ``scholarship``
+    payment tickets with category ``bed_allocation`` or ``hostel_maintenance``.
     The exporter is primarily used by accommodation officers who have
     exclusively access to this exporter.
@@ -526 +526 @@
     def filter_func(self, x, **kw):
         kw['paycat'] = 'bed_allocation'
-        payments = get_payments(x, p_states=('paid', 'waived'), **kw)
+        payments = get_payments(x, p_states=(
+          'paid', 'waived', 'scholarship'), **kw)
         kw['paycat'] = 'hostel_maintenance'
-        payments += get_payments(x, p_states=('paid', 'waived'), **kw)
+        payments += get_payments(x, p_states=(
+          'paid', 'waived', 'scholarship'), **kw)
         return payments
 
@@ -589 +591 @@
         iterates over all paid school fee payment tickets and
         adds together the amounts paid in a year. Waived payments
-        are marked ``waived``.
+        are marked ``waived`` and scholarship payments marked `scholarship`.
         """
         if name in self.year_range_tuple and context is not None:
@@ -598 +600 @@
                     if ticket.p_state == 'waived':
                         value = 'waived'
+                        break
+                    if ticket.p_state == 'scholarship':
+                        value = 'scholarship'
                         break
                     if ticket.p_state == 'paid':