Changeset 10520


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.fceokene/trunk/src/waeup/fceokene/interswitch/tests.py

    r10388 r10520  
    140140                           self.browser.contents)
    141141        self.assertTrue(
    142             '<span>4300.0</span>' in self.browser.contents)
     142            '<span>4150.0</span>' in self.browser.contents)
    143143        # p_item is not unveiled
    144144        self.assertFalse('Hall 1, Block A, Room 101, Bed A'
     
    161161                           self.browser.contents)
    162162        self.assertTrue(
    163             '<input type="hidden" name="amount" value="430000.0" />'
    164             in self.browser.contents)
    165         self.assertTrue(
    166             'item_name="Hostel Maintenance Fee" item_amt="415000" bank_id="117" acct_num="1012044132"'
     163            '<input type="hidden" name="amount" value="415000.0" />'
     164            in self.browser.contents)
     165        self.assertTrue(
     166            'item_name="Hostel Maintenance Fee" item_amt="400000" bank_id="117" acct_num="1012044132"'
    167167            in self.browser.contents)
    168168        # BT does nor charge a fee for maintenance fee
  • main/waeup.fceokene/trunk/src/waeup/fceokene/students/tests/test_browser.py

    r10388 r10520  
    285285        self.assertEqual(payment.p_level, 100)
    286286        self.assertEqual(payment.p_session, 2004)
    287         self.assertEqual(payment.amount_auth, 4300.0)
     287        self.assertEqual(payment.amount_auth, 4150.0)
    288288        self.assertEqual(payment.p_item, u'My bed coordinates')
    289289        self.assertEqual(error, None)
     
    293293        self.assertEqual(payment.p_level, 100)
    294294        self.assertEqual(payment.p_session, 2004)
    295         self.assertEqual(payment.amount_auth, 2800.0)
     295        self.assertEqual(payment.amount_auth, 2650.0)
    296296        self.assertEqual(payment.p_item, u'My bed coordinates')
    297297        self.assertEqual(error, None)
  • main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py

    r10388 r10520  
    9898                return _(u'Current session does not match accommodation session.'), None
    9999            if student.current_mode.endswith('_sw') or student.current_mode == 'pd_ft':
    100                 amount = 2650.0
     100                amount = 2500.0 #removed interswitch fee
    101101            else:
    102                 amount = 4150.0
     102                amount = 4000.0 #removed interswitch fee
    103103        elif category == 'clearance':
    104104            amount = academic_session.clearance_fee
Note: See TracChangeset for help on using the changeset viewer.