Changeset 16820 for main/kofacustom.edopoly/trunk/src

Timestamp:

21 Feb 2022, 11:58:38 (3 years ago)

Author:

Henrik Bettermann

Message:

Add payment categories.

Location:

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly

Files:

• interfaces.py (modified) (1 diff)
• interswitch/browser.py (modified) (1 diff)
• students/tests/test_export.py (modified) (1 diff)
• utils/utils.py (modified) (2 diffs)

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/interfaces.py

@@ -165 +165 @@
         )
 
+    cyber_fee = schema.Float(
+        title = _(u'Cyber Security Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    ispon_fee = schema.Float(
+        title = _(u'ISPON Safety Fee'),
+        default = 0.0,
+        required = False,
+        )
+
     def getSessionString():
         """Returns the session string from the vocabulary.

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

@@ -98 +98 @@
         if self.context.p_category == 'nhis':
             xmldict['institution_acct'] = '0075379404'
+        if self.context.p_category == 'cyber':
+            xmldict['institution_acct'] = '1220055070'
+            xmldict['institution_bank_id'] = '117'
+        if self.context.p_category == 'ispon':
+            xmldict['institution_acct'] = '1220055104'
+            xmldict['institution_bank_id'] = '117'
         xmldict['institution_amt'] = '0.0'
         self.pay_item_id = '101' # must be provided by Interswitch

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/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.edopoly/trunk/src/kofacustom/edopoly/utils/utils.py

@@ -67 +67 @@
         'project_bind': 'Project Binding Fee',
         'maintenance':'Maintenance and Utility Fees',
+        'cyber': 'Cyber Security',
+        'ispon': 'ISPON Safety',
         }
 
@@ -93 +95 @@
         'project_bind': 'Project Binding Fee',
         'maintenance':'Maintenance and Utility Fees',
+        'cyber': 'Cyber Security',
+        'ispon': 'ISPON Safety',
         }