Changeset 17057

Timestamp:

5 Aug 2022, 16:34:49 (2 years ago)

Author:

Henrik Bettermann

Message:

Restructure school fee calculation completely.

Location:

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

Files:

• interswitch/tests.py (modified) (2 diffs)
• 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) (5 diffs)
• students/tests/test_utils.py (modified) (3 diffs)
• students/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py

@@ -208 +208 @@
         self.certificate.study_mode = 'ug_pt'
         self.student['studycourse'].entry_session = 2013
-        self.student['studycourse'].certificate.school_fee_1 = 50200.0
+        self.student['studycourse'].certificate.school_fee_3 = 50200.0
         self.app['configuration']['2004'].union_fee = 1000.0
         self.app['configuration']['2004'].welfare_fee = 500.0
@@ -247 +247 @@
         self.certificate.study_mode = 'ug_ft'
         self.student['studycourse'].entry_session = 2013
-        self.student['studycourse'].certificate.school_fee_1 = 51750.0
+        self.student['studycourse'].certificate.school_fee_3 = 51750.0
         # Manager can access InterswitchForm
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')

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

@@ -135 +135 @@
 #: school_fee_1
 msgid "Initial School Fee"
-msgstr "School Fees New Students"
+msgstr "Current School Fees"
 
 #: school_fee_2
 msgid "Returning School Fee"
-msgstr "School Fees Returning Students (> 2014)"
+msgstr "School Fees 2015-2019"
 
 #: school_fee_3
 msgid "Foreigner Initial School Fee"
-msgstr "School Fees Returning Students"
+msgstr "School Fees till 2015"
 
 #: school_fee_4

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

@@ -179 +179 @@
         cpt_value = ctrl.options[0]
         # School fee payment ticket can be added ...
-        self.student['studycourse'].certificate.school_fee_1 = 6666.0
+        self.student['studycourse'].certificate.school_fee_3 = 6666.0
         self.student.nationality = u'NG'
         self.browser.open(self.payments_path + '/addop')
@@ -233 +233 @@
         self.app['configuration'].addSessionConfiguration(configuration_1)
         self.student['studycourse'].certificate.study_mode = 'ug_pt'
-        self.student['studycourse'].certificate.school_fee_1 = 6666.0
+        self.student['studycourse'].certificate.school_fee_2 = 6666.0
         self.app['configuration']['2015'].union_fee = 1250.0
         self.app['configuration']['2015'].welfare_fee = 750.0
@@ -329 +329 @@
 
     def test_manage_payments_bypass_ac_creation(self):
-        self.student['studycourse'].certificate.school_fee_1 = 6666.0
+        self.student['studycourse'].certificate.school_fee_3 = 6666.0
         self.student.nationality = u'NG'
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -563 +563 @@
 
     def test_payment_disabled(self):
+        self.student['studycourse'].certificate.school_fee_3 = 6666.0
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)
@@ -648 +649 @@
         self.student['studycourse'].current_session = 2018
         self.student['studycourse'].entry_mode = 'ug_ft'
-        self.student['studycourse'].certificate.school_fee_1 = 50200.0
+        self.student['studycourse'].certificate.school_fee_2 = 50200.0
         self.app['configuration']['2018'].union_fee = 1200.0
         self.app['configuration']['2018'].welfare_fee = 700.0

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

@@ -74 +74 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 26666.0)
+        self.assertEqual(payment.amount_auth, 28888.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -84 +84 @@
         self.student.lga = 'edo_afuze'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(payment.amount_auth, 6765.0)
+        self.assertEqual(payment.amount_auth, 8987.0)
         IWorkflowState(self.student).setState('returning')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
@@ -164 +164 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 6666.0)
+        self.assertEqual(payment.amount_auth, 8888.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -400 +400 @@
                     return _("You are not allowed "
                              "to pay by instalments."), None
+            # We determine the base amount first
+            if student.entry_session < 2015:
+                amount = getattr(certificate, 'school_fee_3', 0.0)
+            elif student.entry_session < 2020:
+                amount = getattr(certificate, 'school_fee_2', 0.0)
+            else:
+                amount = getattr(certificate, 'school_fee_1', 0.0)
             if previous_session:
                 # Students can pay for previous sessions in all
                 # workflow states.  Fresh students are excluded by the
                 # update method of the PreviousPaymentAddFormPage.
-                if previous_level == 100:
-                    amount = getattr(certificate, 'school_fee_1', 0.0)
-                else:
-                    if student.entry_session in (2015, 2016):
-                        amount = getattr(certificate, 'school_fee_2', 0.0)
-                    else:
-                        amount = getattr(certificate, 'school_fee_3', 0.0)
-            elif student.state == CLEARED and category != 'schoolfee_2':
-                amount = getattr(certificate, 'school_fee_1', 0.0)
+                pass
+            elif student.state == CLEARED:
                 # Cut school fee by 50%
-                if category == 'schoolfee_1' and amount:
-                    amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
-            elif student.is_fresh and category == 'schoolfee_2':
-                amount = getattr(certificate, 'school_fee_1', 0.0)
-                # Cut school fee by 50%
-                if amount:
+                if category in ('schoolfee_1', 'schoolfee_2') and amount:
                     amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
             elif student.state == RETURNING and category != 'schoolfee_2':
@@ -433 +428 @@
                 except KeyError:
                     return _(u'Session configuration object is not available.'), None
-                if student.entry_session >= 2015:
-                    amount = getattr(certificate, 'school_fee_2', 0.0)
-                else:
-                    amount = getattr(certificate, 'school_fee_3', 0.0)
                 # Cut school fee by 50%
                 if category == 'schoolfee_1' and amount:
                     amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
-            elif category == 'schoolfee_2':
-                amount = getattr(certificate, 'school_fee_2', 0.0)
-                # Cut school fee by 50%
-                if amount:
-                    amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
+            elif category == 'schoolfee_2' and amount:
+                amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
             else:
                 return _('Wrong state.'), None