Changeset 10388


Ignore:
Timestamp:
27 Jun 2013, 07:33:45 (12 years ago)
Author:
Henrik Bettermann
Message:

Add Interswitch surcharge to all student fees.

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

    r9998 r10388  
    6464                           self.browser.contents)
    6565        self.assertTrue(
    66             '<span>12495.0</span>' in self.browser.contents)
     66            '<span>12645.0</span>' in self.browser.contents)
    6767        self.payment_url = self.browser.url
    6868
    … …  
    9393                           self.browser.contents)
    9494        self.assertTrue(
    95             '<input type="hidden" name="amount" value="1249500.0" />'
    96             in self.browser.contents)
    97         self.assertTrue(
    98             'item_name="School Fee" item_amt="934500" bank_id="117" acct_num="1012044015"'
     95            '<input type="hidden" name="amount" value="1264500.0" />'
     96            in self.browser.contents)
     97        self.assertTrue(
     98            'item_name="School Fee" item_amt="949500" bank_id="117" acct_num="1012044015"'
    9999            in self.browser.contents)
    100100        self.assertTrue(
    … …  
    140140                           self.browser.contents)
    141141        self.assertTrue(
    142             '<span>4150.0</span>' in self.browser.contents)
     142            '<span>4300.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="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"'
     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"'
    167167            in self.browser.contents)
    168168        # BT does nor charge a fee for maintenance fee
    … …  
    196196                           self.browser.contents)
    197197        self.assertTrue(
    198             '<span>3456.0</span>' in self.browser.contents)
     198            '<span>3606.0</span>' in self.browser.contents)
    199199        self.payment_url = self.browser.url
    200200        self.assertEqual(self.student['payments'][value].provider_amt, 0.0)
    … …  
    212212                           self.browser.contents)
    213213        self.assertTrue(
    214             '<input type="hidden" name="amount" value="345600.0" />' in
     214            '<input type="hidden" name="amount" value="360600.0" />' in
    215215            self.browser.contents)
    216216        self.assertTrue(
    217             'item_name="Acceptance Fee" item_amt="330600" bank_id="8" acct_num="2003670143"'
     217            'item_name="Acceptance Fee" item_amt="345600" bank_id="8" acct_num="2003670143"'
    218218            in self.browser.contents)
    219219        # BT does nor charge a fee for maintenance fee

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

    r10201 r10388  
    230230        self.assertEqual(payment.p_level, 100)
    231231        self.assertEqual(payment.p_session, 2004)
    232         self.assertEqual(payment.amount_auth, 12495.0)
     232        self.assertEqual(payment.amount_auth, 12645.0)
    233233        self.assertEqual(payment.p_item, u'CERT1')
    234234        self.assertEqual(error, None)
    … …  
    243243        self.assertEqual(payment.p_level, 200)
    244244        self.assertEqual(payment.p_session, 2005)
    245         self.assertEqual(payment.amount_auth, 11545.0)
     245        self.assertEqual(payment.amount_auth, 11695.0)
    246246        self.assertEqual(payment.p_item, u'CERT1')
    247247        self.assertEqual(error, None)
    248248
    249         # UG students pay 65150
     249        # UG students pay 65800
    250250        self.certificate.study_mode = 'ug_ft'
    251251        error, payment = utils.setPaymentDetails('schoolfee',self.student)
    252         self.assertEqual(payment.amount_auth, 65650.0)
     252        self.assertEqual(payment.amount_auth, 65800.0)
    253253        self.assertEqual(error, None)
    254254
    … …  
    265265        self.assertEqual(payment.p_level, 100)
    266266        self.assertEqual(payment.p_session, 2004)
    267         self.assertEqual(payment.amount_auth, 120.0)
     267        self.assertEqual(payment.amount_auth, 270.0)
    268268        self.assertEqual(payment.p_item, u'CERT1')
    269269        self.assertEqual(error, None)
    … …  
    272272        self.assertEqual(payment.p_level, 100)
    273273        self.assertEqual(payment.p_session, 2004)
    274         self.assertEqual(payment.amount_auth, 150.0)
     274        self.assertEqual(payment.amount_auth, 300.0)
    275275        self.assertEqual(payment.p_item, u'')
    276276        self.assertEqual(error, None)
    … …  
    285285        self.assertEqual(payment.p_level, 100)
    286286        self.assertEqual(payment.p_session, 2004)
    287         self.assertEqual(payment.amount_auth, 4150.0)
     287        self.assertEqual(payment.amount_auth, 4300.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, 2650.0)
     295        self.assertEqual(payment.amount_auth, 2800.0)
    296296        self.assertEqual(payment.p_item, u'My bed coordinates')
    297297        self.assertEqual(error, None)
    … …  
    300300        self.assertEqual(payment.p_level, 100)
    301301        self.assertEqual(payment.p_session, 2004)
    302         self.assertEqual(payment.amount_auth, 150.0)
     302        self.assertEqual(payment.amount_auth, 300.0)
    303303        self.assertEqual(payment.p_item, u'')
    304304        self.assertEqual(error, None)
    … …  
    307307        self.assertEqual(payment.p_level, 100)
    308308        self.assertEqual(payment.p_session, 2004)
    309         self.assertEqual(payment.amount_auth, 90.0)
     309        self.assertEqual(payment.amount_auth, 240.0)
    310310        self.assertEqual(payment.p_item, u'')
    311311        self.assertEqual(error, None)

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

    r10026 r10388  
    2727from waeup.kofa.browser.interfaces import IPDFCreator
    2828from waeup.kofa.students.utils import trans
     29from waeup.fceokene.interswitch.browser import GATEWAY_AMT
    2930
    3031class CustomStudentsUtils(NigeriaStudentsUtils):
    … …  
    253254        payment.p_level = p_level
    254255        payment.p_current = p_current
    255         payment.amount_auth = float(amount)
     256        # On June 26, 2013 FCEOkene realized that the Interswitch fee
     257        # is deducted from their amount. Therefore, we add this fee here.
     258        payment.amount_auth = float(amount) + GATEWAY_AMT
    256259        return None, payment
    257260
Note: See TracChangeset for help on using the changeset viewer.