Changeset 16474 for main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students

Timestamp:

23 Apr 2021, 07:22:53 (4 years ago)

Author:

Henrik Bettermann

Message:

Change school fees.

Location:

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students

Files:

• tests/test_browser.py (modified) (1 diff)
• tests/test_export.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/tests/test_browser.py

@@ -106 +106 @@
         self.assertEqual(self.student.current_session, 2005)
         # 79700 / 2 + 250
-        self.assertEqual(self.student['payments'].values()[2].amount_auth, 40100.0)
-        self.assertEqual(self.student['payments'].values()[3].amount_auth, 40100.0)
+        self.assertEqual(self.student['payments'].values()[2].amount_auth, 37600.0)
+        self.assertEqual(self.student['payments'].values()[3].amount_auth, 37600.0)
         # The last two payments belong to the same session and level.
         self.assertEqual(self.student['payments'].values()[2].p_session, 2005)

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/tests/test_export.py

@@ -104 +104 @@
         self.assertMatches(
             'ac,amount_auth,creation_date,gateway_amt,net_amt,p_category,p_combi,p_current,'
-            'p_id,p_item,p_level,p_session,p_state,payment_date,provider_amt,'
+            'p_id,p_item,p_level,p_option,p_session,p_state,payment_date,provider_amt,'
             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
             'r_pay_reference,thirdparty_amt,student_id,state,'
             'current_session\r\n'
             '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
-            '100,%s,paid,%s-04-01 14:12:01#,,12.12,'
+            '100,,%s,paid,%s-04-01 14:12:01#,,12.12,'
             '789,r-code,interswatch,,,,A111111,created,2012\r\n'
             % (curr_year-6, curr_year-6, curr_year-6), result

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

@@ -43 +43 @@
 FEES_VALUES = (
      ( # 100      110      200      210      300      310      400      410     500  999
-       (43200.0, 43200.0, 46200.0, 46200.0, 40200.0, 40200.0, 0.0, 0.0, 0.0, 0.0), # nce_ft
+       (43200.0, 43200.0, 43200.0, 43200.0, 37200.0, 37200.0, 0.0, 0.0, 0.0, 0.0), # nce_ft
        (55200.0, 55200.0, 49200.0, 49200.0, 53200.0, 53200.0, 49200.0, 49200.0, 0.0, 0.0), # nce_pt
-       (75700.0, 75700.0, 69700.0, 69700.0, 73700.0, 73700.0, 67700.0, 67700.0, 0.0, 0.0), # ug_ft
+       (75700.0, 75700.0, 64700.0, 64700.0, 68700.0, 68700.0, 62700.0, 62700.0, 0.0, 0.0), # ug_ft
        (33200.0, 33200.0, 28000.0, 28000.0, 32000.0, 32000.0, 28000.0, 28000.0, 0.0, 0.0), # nce_we_pt
      ), # local
      ( #
-       (55800.0, 55800.0, 58700.0, 58700.0, 52700.0, 52700.0, 0.0, 0.0, 0.0, 0.0), # nce_ft
+       (55800.0, 55800.0, 55700.0, 55700.0, 49700.0, 49700.0, 0.0, 0.0, 0.0, 0.0), # nce_ft
        (55200.0, 55200.0, 49200.0, 49200.0, 53200.0, 53200.0, 49200.0, 49200.0, 0.0, 0.0), # nce_pt
-       (85700.0, 85700.0, 79700.0, 79700.0, 83700.0, 83700.0, 77700.0, 77700.0, 0.0, 0.0), # ug_ft
+       (85700.0, 85700.0, 74700.0, 74700.0, 78700.0, 78700.0, 72700.0, 72700.0, 0.0, 0.0), # ug_ft
        (33200.0, 33200.0, 28000.0, 28000.0, 32000.0, 32000.0, 28000.0, 28000.0, 0.0, 0.0), # nce_we_pt
      ), # non-local