Changeset 13720

Timestamp:

22 Feb 2016, 08:20:08 (9 years ago)

Author:

Henrik Bettermann

Message:

Instalment payment: students must pay the full gateway amount twice.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -220 +220 @@
         self.assertEqual(self.student['payments'].values()[0].p_category, 'schoolfee_1')
         self.assertEqual(self.student['payments'].values()[1].p_category, 'schoolfee_2')
-        # 6666/2 + 1250 + 750 - 500
-        self.assertEqual(self.student['payments'].values()[0].amount_auth, 4833.0)
-        # 6666/2
-        self.assertEqual(self.student['payments'].values()[1].amount_auth, 3333.0)
+        # (6666-250)/2 + 1250 + 750 - 500 + 250
+        self.assertEqual(self.student['payments'].values()[0].amount_auth, 4958.0)
+        # (6666-250)/2 + 250
+        self.assertEqual(self.student['payments'].values()[1].amount_auth, 3458.0)
         return
 

main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

@@ -25 +25 @@
 from waeup.kofa.accesscodes import create_accesscode
 from waeup.kofa.students.utils import trans
-from waeup.aaue.interswitch.browser import gateway_net_amt
+from waeup.aaue.interswitch.browser import gateway_net_amt, GATEWAY_AMT
 from waeup.aaue.interfaces import MessageFactory as _
 
@@ -208 +208 @@
                 # Cut school fee by 50%
                 if category in ('schoolfee_1', 'schoolfee_2'):
-                    amount = amount / 2
+                    if amount:
+                        amount = gateway_net_amt(amount) / 2 + GATEWAY_AMT
             elif category == 'schoolfee_1':
                 return _("Wrong state. Only students in state 'cleared' "