Changeset 18150 for main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Timestamp:

7 Aug 2025, 06:29:43 (8 hours ago)

Author:

Henrik Bettermann

Message:

Fix CustomCredoPageStudent?.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Files:

• etranzact/browser.py (modified) (2 diffs)
• students/student.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/etranzact/browser.py

@@ -217 +217 @@
         if not payoutlet_module_activated(
             self.context.student.current_session, self.context):
-            self.flash(_('Forbidden'), type='danger')
+            self.flash('Forbidden', type='danger')
             self.redirect(self.url(self.context, '@@index'))
             return
@@ -346 +346 @@
             elif student.is_fresh:
                 return '001279Y0KW1N'
-            elif student.faccode == 'PHM' and self._is_payment_for_final(student):
+            elif student.faccode == 'PHM' and student.is_final:
                 return '001279JT6F1H'
             elif student.faccode == 'PHM':
                 return '001279YACWJB'
-            elif self._is_payment_for_final(student):
+            elif student.is_final:
                 return '001279LDOKZJ'
             else:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/student.py

@@ -37 +37 @@
         ICustomStudentPersonalEdit)
     grok.provides(ICustomStudent)
+
+    @property
+    def is_final(self):
+        studycourse = self['studycourse']
+        certificate = getattr(studycourse,'certificate',None)
+        current_level = studycourse.current_level
+        if None in (current_level, certificate):
+            return False
+        end_level = certificate.end_level
+        if current_level >= end_level-100:
+            return True
+        return False
 
     @property

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py

@@ -149 +149 @@
         return
 
-    def _is_payment_for_final(self, student):
-        studycourse = student['studycourse']
-        certificate = getattr(studycourse,'certificate',None)
-        current_level = studycourse.current_level
-        if None in (current_level, certificate):
-            return False
-        end_level = certificate.end_level
-        if current_level >= end_level-100:
-            return True
-        return False
-
     def _collect_required_payment_items(self, student):
         if student.is_postgrad:
@@ -167 +156 @@
         elif student.is_fresh:
             rp = self.REQUIRED_PAYMENTS_FRESH_NON_SCIENCE
-        elif student.faccode == 'PHM' and self._is_payment_for_final(student):
+        elif student.faccode == 'PHM' and student.is_final:
             rp = self.REQUIRED_PAYMENTS_FINAL_PHARMACY
         elif student.faccode == 'PHM':
             rp = self.REQUIRED_PAYMENTS_RETURNING_PHARMACY
-        elif self._is_payment_for_final(student):
+        elif student.is_final:
             rp = self.REQUIRED_PAYMENTS_FINAL
         else: