Changeset 15022 for main/kofacustom.dspg/trunk/src/kofacustom

Timestamp:

24 May 2018, 09:57:39 (6 years ago)

Author:

Henrik Bettermann

Message:

Add further payment categories.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg

Files:

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

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

@@ -314 +314 @@
         )
 
-    eed_fee = schema.Float(
-        title = _(u'EED Fee'),
-        default = 0.0,
-        required = True,
-        )
-
-    olevel_results_fee = schema.Float(
-        title = _(u'O\' Level Results Verification'),
+    eed_1_fee = schema.Float(
+        title = _(u'EED 1 Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    eed_2_fee = schema.Float(
+        title = _(u'EED 2 Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    olevel_results_1_fee = schema.Float(
+        title = _(u'O\' Level Results Verification 1'),
+        default = 0.0,
+        required = True,
+        )
+
+    olevel_results_2_fee = schema.Float(
+        title = _(u'O\' Level Results Verification 2'),
         default = 0.0,
         required = True,

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

@@ -165 +165 @@
             xmldict['institution_acct'] = '1001174679'
             xmldict['institution_bank_id'] = '123'
-        elif self.context.p_category == 'eed':
+        elif self.context.p_category == 'eed_1':
             self.pay_item_id = '112'
             xmldict['institution_acct'] = '0039782431'
             xmldict['institution_bank_id'] = '11'
-        elif self.context.p_category == 'olevel_results':
+        elif self.context.p_category == 'eed_2':
+            self.pay_item_id = '116'
+            xmldict['institution_acct'] = '0039782431'
+            xmldict['institution_bank_id'] = '11'
+        elif self.context.p_category == 'olevel_results_1':
             self.pay_item_id = '113'
+            xmldict['institution_acct'] = '2015327204'
+            xmldict['institution_bank_id'] = '8'
+        elif self.context.p_category == 'olevel_results_2':
+            self.pay_item_id = '115'
             xmldict['institution_acct'] = '2015327204'
             xmldict['institution_bank_id'] = '8'

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

@@ -108 +108 @@
         'sports': 'Sports Clearance Levy',
         'siwes': 'SIWES Fee',
-        'eed': 'EED Fee',
-        'olevel_results': 'O\' Level Results Verification',
+        'eed_1': 'EED 1 Fee',
+        'eed_2': 'EED 2 Fee',
+        'olevel_results_1': 'O\' Level Results Verification 1',
+        'olevel_results_2': 'O\' Level Results Verification 2',
         }