Changeset 13274 for main/waeup.fceokene/trunk/src

Timestamp:

19 Sep 2015, 16:36:12 (9 years ago)

Author:

Henrik Bettermann

Message:

Change fee.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

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

main/waeup.fceokene/trunk/src/waeup/fceokene/interswitch/tests.py

@@ -65 +65 @@
                            self.browser.contents)
         self.assertTrue(
-            '<span>35450.0</span>' in self.browser.contents)
+            '<span>70450.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.payment = self.student['payments'][self.value]
@@ -95 +95 @@
                            self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="3545000" />'
-            in self.browser.contents)
-        self.assertTrue(
-            'item_name="School Fee" item_amt="3230000" bank_id="117" acct_num="1013780934"'
+            '<input type="hidden" name="amount" value="7045000" />'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="School Fee" item_amt="6730000" bank_id="117" acct_num="1013780934"'
             in self.browser.contents)
         self.assertTrue(

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

@@ -228 +228 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 35450.0)
+        self.assertEqual(payment.amount_auth, 70450.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -241 +241 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 35450.0)
+        self.assertEqual(payment.amount_auth, 30450.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -132 +132 @@
             if student.current_verdict == 'OPDE':
                 amount = 23000
+            # PDE new
+            elif student.current_mode == 'pd_ft' and student.state == CLEARED:
+                amount = 70300
             # PDE
             elif student.current_mode == 'pd_ft':
-                amount = 35300
+                amount = 30300
 
             #Short Duration ICT Programs