Changeset 17938 for main

Timestamp:

7 Oct 2024, 00:37:03 (4 weeks ago)

Author:

Henrik Bettermann

Message:

See #74.

Location:

main/kofacustom.unidel/trunk/src/kofacustom/unidel

Files:

• interswitch/browser.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)

main/kofacustom.unidel/trunk/src/kofacustom/unidel/interswitch/browser.py

@@ -106 +106 @@
                 tech_fee = 0.0
         elif self.context.p_category == 'schoolfee':
-            provider_amt = 6650.0
-            tech_fee = 2850.0
+            provider_amt = 7000.0
+            tech_fee = 3000.0
             union_due = 1500.0
-            if student.is_fresh:
-                provider_amt = 7000.0
-                tech_fee = 3000.0
             xmldict['institution_acct'] = '1011739172'
             xmldict['tech_acct'] = '0213065415'

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

@@ -141 +141 @@
                             ), None
                     amount = getattr(certificate, 'school_fee_2', 0.0)
+            # Add surcharges for students in FMED and FBM
+            if student.faccode == 'FMED':
+                fmed_surcharge = 0.0
+                if divmod(p_level,100)[0] == 3:
+                    fmed_surcharge = 296000.0
+                elif divmod(p_level,100)[0] == 4:
+                    fmed_surcharge = 224700.0
+                elif divmod(p_level,100)[0] == 5:
+                    fmed_surcharge = 220700.0
+                elif divmod(p_level,100)[0] == 6:
+                    fmed_surcharge = 244950.0
+                amount += fmed_surcharge
+            if student.faccode == 'FBM':
+                fbm_surcharge = 0.0
+                if divmod(p_level,100)[0] == 3:
+                    fbm_surcharge = 146000.0
+                elif divmod(p_level,100)[0] == 4:
+                    fbm_surcharge = 204700.0
+                elif divmod(p_level,100)[0] == 5:
+                    fbm_surcharge = 229950.0
+                if student.depcode == 'NSG' and divmod(p_level,100)[0] == 3:
+                    fbm_surcharge -= 50000.0
+                amount += fbm_surcharge
             # Add non-local surcharges
             if amount and not local(student):
                 non_local_surcharge = 40000
-                if student.faccode in ('FAG', 'FCP', 'FES',
-                                       'FSS', 'FMS', 'FSC',
-                                       'FAT', 'FED'):
-                    if p_level == 200:
-                        non_local_surcharge = 47000
-                    if p_level == 500:
-                        non_local_surcharge = 50000
-                if student.faccode == 'FET':
-                    if p_level == 500:
-                        non_local_surcharge = 31000
+                #if student.faccode in ('FAG', 'FCP', 'FES',
+                #                       'FSS', 'FMS', 'FSC',
+                #                       'FAT', 'FED'):
+                #    if p_level == 200:
+                #        non_local_surcharge = 47000
+                #    if p_level == 500:
+                #        non_local_surcharge = 50000
+                #if student.faccode == 'FET':
+                #    if p_level == 500:
+                #        non_local_surcharge = 31000
                 amount += non_local_surcharge
         elif category == 'clearance':