Changeset 17935 for main

Timestamp:

4 Oct 2024, 08:59:10 (5 weeks ago)

Author:

Henrik Bettermann

Message:

Union Due ist part of school fee.

Location:

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

Files:

• interswitch/browser.py (modified) (4 diffs)
• interswitch/tests.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -87 +87 @@
         provider_amt = 0.0
         tech_fee = 0.0
+        union_due = 0.0
         if self.context.p_category == 'clearance':
             provider_amt = 2000.0
@@ -107 +108 @@
             provider_amt = 6650.0
             tech_fee = 2850.0
+            union_due = 1500.0
             if student.is_fresh:
                 provider_amt = 7000.0
@@ -113 +115 @@
             xmldict['tech_acct'] = '0213065415'
             xmldict['tech_bank_id'] = '47'
+            xmldict['union_acct'] = '1011438901'
+            xmldict['union_bank_id'] = '117'
             if student.current_mode.startswith('dp'):
                 xmldict['institution_acct'] = '2001627961'
@@ -165 +169 @@
             self.context.amount_auth += provider_amt
             self.context.amount_auth += tech_fee
+            self.context.amount_auth += union_due
         xmldict['provider_amt'] = 100 * provider_amt
         xmldict['tech_fee'] = 100 * tech_fee
+        xmldict['union_due'] = 100 * union_due
         xmldict['institution_item_name'] = self.context.category
         xmldict['institution_name'] = INSTITUTION_NAME
         xmldict['institution_amt'] = 100 * self.context.net_amt
-        if provider_amt == 0:
-            xmltext = """<payment_item_detail>
+        xmldict['item_id'] = 1
+        xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
-<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
-</item_details>
-</payment_item_detail>""" % xmldict
-        elif tech_fee == 0:
-            xmltext = """<payment_item_detail>
-<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
-<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
-<item_detail item_id="2" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
-</item_details>
-</payment_item_detail>""" % xmldict
-        else:
-            xmltext = """<payment_item_detail>
-<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
-<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
-<item_detail item_id="2" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
-<item_detail item_id="3" item_name="Technology Fee" item_amt="%(tech_fee)d" bank_id="%(tech_bank_id)s" acct_num="%(tech_acct)s"/>
+<item_detail item_id="%(item_id)s" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
+""" % xmldict
+        if provider_amt:
+            xmldict['item_id'] += 1
+            xmltext += """
+<item_detail item_id="%(item_id)s" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
+""" % xmldict
+        if tech_fee:
+            xmldict['item_id'] += 1
+            xmltext += """<item_detail item_id="%(item_id)s" item_name="Technology Fee" item_amt="%(tech_fee)d" bank_id="%(tech_bank_id)s" acct_num="%(tech_acct)s"/>
+""" % xmldict
+        if union_due:
+            xmldict['item_id'] += 1
+            xmltext += """<item_detail item_id="%(item_id)s" item_name="Student Union Due" item_amt="%(union_due)d" bank_id="%(union_bank_id)s" acct_num="%(union_acct)s"/>
 </item_details>
 </payment_item_detail>""" % xmldict

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

@@ -78 +78 @@
         self.assertEqual(self.student.current_mode, 'ug_ft')
         self.assertTrue(
-            '<input type="hidden" name="amount" value="9025000" />' in
+            '<input type="hidden" name="amount" value="9175000" />' in
             self.browser.contents)
         self.assertTrue(
             'item_name="School Fee" item_amt="8000000" bank_id="117" acct_num="1011739172"' in
+            self.browser.contents)
+        self.assertTrue(
+            '<item_detail item_id="4" item_name="Student Union Due" item_amt="150000" bank_id="117" acct_num="1011438901"/>' in
             self.browser.contents)
 

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

@@ -58 +58 @@
         'transcript_local': 'Transcript Fee Local Copy',
         'transcript_inter': 'Transcript Fee International Copy',
-        'union': 'Student Union Due',
+        #'union': 'Student Union Due',
         }