Changeset 17979 for main

Timestamp:

31 Dec 2024, 13:53:46 (5 days ago)

Author:

Henrik Bettermann

Message:

NUGA LEVY TO BE ADDED TO SCHOOL CHARGES (#1387)

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (1 diff)
• students/tests/test_browser.py (modified) (3 diffs)
• students/utils.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -55 +55 @@
 #: waeup/kofa/university/interfaces.py:298
 msgid "Foreigner Initial School Fee"
-msgstr "School Fee 3 (not used)"
+msgstr "Additional Initial School Fee"
 
 #: waeup/kofa/university/interfaces.py:304
 msgid "Foreigner Returning School Fee"
-msgstr "School Fee 4 (not used)"
+msgstr "Additional Returning School Fee"
 
 msgid ""

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py

@@ -605 +605 @@
         self.assertTrue(payment.p_current)
 
+        # Add additional fee
+        self.certificate.school_fee_3 = 1000.0
+        error, payment = utils.setPaymentDetails('schoolfee',
+            self.student, None, None, None)
+        self.assertEqual(payment.amount_auth, 64000.0)
+        self.assertEqual(error, None)
+        self.assertTrue(payment.p_current)
+
         # Add penalty fee ...
         # ... for cleared
@@ -612 +620 @@
         error, payment = utils.setPaymentDetails('schoolfee',
             self.student, None, None, None)
-        self.assertEqual(payment.amount_auth, 63099.0)
+        self.assertEqual(payment.amount_auth, 64099.0)
 
         IWorkflowState(self.student).setState('returning')
@@ -662 +670 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 300099.0)
+        self.assertEqual(payment.amount_auth, 301099.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

@@ -592 +592 @@
             if student.is_staff:
                 amount /= 2
+            # Add additional school fees
+            if student.state == CLEARED and getattr(certificate, 'school_fee_3'):
+                amount += getattr(certificate, 'school_fee_3')
+            elif student.state == PAID and student.is_postgrad and getattr(
+                                                    certificate, 'school_fee_4'):
+                amount += getattr(certificate, 'school_fee_4')
+            elif student.state == RETURNING and getattr(
+                                                    certificate, 'school_fee_4'):
+                amount += getattr(certificate, 'school_fee_4')
         else:
             fee_name = category + '_fee'