Changeset 15433

Timestamp:

29 May 2019, 12:05:52 (5 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• students/browser.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

@@ -348 +348 @@
     def selectable_categories(self):
         if 'alumni' in self.application_url():
-            return self.ALUMNI_PAYMENT_CATS.items()
+            return sorted(
+                self.ALUMNI_PAYMENT_CATS.items(), key=lambda value: value[1])
         if self.context.student.current_mode in (
             'special_pg_ft', 'special_pg_pt', 'found', 'bridge'):
-            return self.REDUCED_PAYMENT_CATS.items()
+            return sorted(
+                self.REDUCED_PAYMENT_CATS.items(), key=lambda value: value[1])
         if self.context.student.current_mode in (
             'ug_pt', 'de_pt','dp_pt', 'de_dsh', 'ug_dsh'):
-            return self.PT_AND_DSH_PAYMENT_CATS.items()
+            return sorted(
+                self.PT_AND_DSH_PAYMENT_CATS.items(),
+                key=lambda value: value[1])
         if self.context.student.current_mode == 'ijmbe':
-            return sorted(self.IJMBE_PAYMENT_CATS.items())
-        categories = getUtility(IKofaUtils).SELECTABLE_PAYMENT_CATEGORIES
-        return sorted(categories.items())
+            return sorted(
+                self.IJMBE_PAYMENT_CATS.items(), key=lambda value: value[1])
+        student = self.context.__parent__
+        categories = getUtility(
+            IKofaUtils).selectable_payment_categories(student)
+        return sorted(categories.items(), key=lambda value: value[1])
 
 class CustomPaymentsManageFormPage(PaymentsManageFormPage):

main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

@@ -98 +98 @@
         'restitution': 'Restitution Fee',
         }
+
+    def selectable_payment_categories(self, student):
+        return self.SELECTABLE_PAYMENT_CATEGORIES
 
     REPORTABLE_PAYMENT_CATEGORIES = {