Changeset 10520 for main

Timestamp:

21 Aug 2013, 16:43:41 (11 years ago)

Author:

Henrik Bettermann

Message:

Reduce maintenance 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

@@ -140 +140 @@
                            self.browser.contents)
         self.assertTrue(
-            '<span>4300.0</span>' in self.browser.contents)
+            '<span>4150.0</span>' in self.browser.contents)
         # p_item is not unveiled
         self.assertFalse('Hall 1, Block A, Room 101, Bed A'
@@ -161 +161 @@
                            self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="430000.0" />'
-            in self.browser.contents)
-        self.assertTrue(
-            'item_name="Hostel Maintenance Fee" item_amt="415000" bank_id="117" acct_num="1012044132"'
+            '<input type="hidden" name="amount" value="415000.0" />'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="Hostel Maintenance Fee" item_amt="400000" bank_id="117" acct_num="1012044132"'
             in self.browser.contents)
         # BT does nor charge a fee for maintenance fee

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

@@ -285 +285 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 4300.0)
+        self.assertEqual(payment.amount_auth, 4150.0)
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)
@@ -293 +293 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 2800.0)
+        self.assertEqual(payment.amount_auth, 2650.0)
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)

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

@@ -98 +98 @@
                 return _(u'Current session does not match accommodation session.'), None
             if student.current_mode.endswith('_sw') or student.current_mode == 'pd_ft':
-                amount = 2650.0
+                amount = 2500.0 #removed interswitch fee
             else:
-                amount = 4150.0
+                amount = 4000.0 #removed interswitch fee
         elif category == 'clearance':
             amount = academic_session.clearance_fee