Changeset 14229

Timestamp:

27 Oct 2016, 07:13:07 (8 years ago)

Author:

Henrik Bettermann

Message:

Change school fees algorithm. Do no longer distinguish between local and foreigner students.

Location:

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

Files:

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

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

@@ -141 +141 @@
 msgstr ""
 "Course ${a} cannot be registered. You have to pay for the 2nd semester first."
+
+#: school_fee_1
+msgid "Initial School Fee"
+msgstr "School Fees New Students"
+
+#: school_fee_2
+msgid "Returning School Fee"
+msgstr "School Fees Returning Students (2015)"
+
+#: school_fee_3
+msgid "Foreigner Initial School Fee"
+msgstr "School Fees Returning Students (<2015)"
+
+#: school_fee_4
+msgid "Foreigner Returning School Fee"
+msgstr "School Fees 4 (not used):"

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -54 +54 @@
         self.student['studycourse'].certificate.school_fee_1 = 6666.0
         self.student['studycourse'].certificate.school_fee_2 = 7777.0
+        self.student['studycourse'].certificate.school_fee_3 = 8888.0
         self.student['studycourse'].certificate.study_mode = 'special_pg_ft'
         self.student.nationality = u'NG'
@@ -92 +93 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 7865.0)
+        self.assertEqual(payment.amount_auth, 8976.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -267 +267 @@
                              "are allowed to pay by instalments."), None
             if student.state == CLEARED or category == 'schoolfee_2':
-                if student.is_foreigner:
-                    amount = getattr(certificate, 'school_fee_3', 0.0)
-                else:
-                    amount = getattr(certificate, 'school_fee_1', 0.0)
+                amount = getattr(certificate, 'school_fee_1', 0.0)
                 # Cut school fee by 50%
                 if category in ('schoolfee_1', 'schoolfee_2'):
@@ -287 +284 @@
                 except KeyError:
                     return _(u'Session configuration object is not available.'), None
-                if student.is_foreigner:
-                    amount = getattr(certificate, 'school_fee_4', 0.0)
+                if student.entry_session == 2015:
+                    amount = getattr(certificate, 'school_fee_2', 0.0)
                 else:
-                    amount = getattr(certificate, 'school_fee_2', 0.0)
+                    amount = getattr(certificate, 'school_fee_3', 0.0)
             else:
                 return _('Wrong state.'), None