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

Timestamp:

31 Jan 2022, 09:01:03 (3 years ago)

Author:

Henrik Bettermann

Message:

Change dep_sug fee.

Location:

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

Files:

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

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

@@ -332 +332 @@
             # amount_auth is being ignored. However, the sum of all split payments
             # must coincide with the amount_auth configured in students/utils.py
-            xmldict['amt1'] = 100 * 1000
-            xmldict['amt2'] = 100 * 500
+            xmldict['amt1'] = 100 * 2000
+            xmldict['amt2'] = 100 * 1000
             xmldict['amt3'] = 100 * 900
-            xmldict['amt4'] = 100 * 500
+            xmldict['amt4'] = 100 * 1000
 
             xmltext = """<payment_item_detail>

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

@@ -227 +227 @@
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...', self.browser.contents)
-        self.assertTrue('<span>3150.0</span>'  in self.browser.contents)
-        self.payment_url = self.browser.url
-        self.browser.getLink("Pay via Interswitch", index=0).click()
-        self.assertTrue('<item_detail item_id="1" item_name="SUG" item_amt="100000" bank_id="11" acct_num="0038079930" />'
-            in self.browser.contents)
-        self.assertTrue('<item_detail item_id="2" item_name="Students Welfare" item_amt="50000" bank_id="11" acct_num="0037892949" />'
+        self.assertTrue('<span>5150.0</span>'  in self.browser.contents)
+        self.payment_url = self.browser.url
+        self.browser.getLink("Pay via Interswitch", index=0).click()
+        self.assertTrue('<item_detail item_id="1" item_name="SUG" item_amt="200000" bank_id="11" acct_num="0038079930" />'
+            in self.browser.contents)
+        self.assertTrue('<item_detail item_id="2" item_name="Students Welfare" item_amt="100000" bank_id="11" acct_num="0037892949" />'
             in self.browser.contents)
         self.assertTrue('<item_detail item_id="3" item_name="Anti-Cult Book" item_amt="90000" bank_id="11" acct_num="0037892949" />'
             in self.browser.contents)
-        self.assertTrue('<item_detail item_id="4" item_name="NADESSTU" item_amt="50000" bank_id="11" acct_num="0036375968" />'
+        self.assertTrue('<item_detail item_id="4" item_name="NADESSTU" item_amt="100000" bank_id="11" acct_num="0036375968" />'
             in self.browser.contents)
 

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_utils.py

@@ -87 +87 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 3150.0)
+        self.assertEqual(payment.amount_auth, 5150.0)
         # Students can pay school fee if dep_sug and gns dues have been paid first.
         error, payment = utils.setPaymentDetails('schoolfee',self.student)

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

@@ -281 +281 @@
                 return _(u'No bed allocated.'), None
         elif category == 'dep_sug':
-            amount = 3150.0 # includes GATEWAY_AMT
+            amount = 5150.0 # includes GATEWAY_AMT
             #if student.faccode == 'SPAT':
             #    amount = 1650.0 # includes GATEWAY_AMT