Changeset 13653 for main/waeup.kwarapoly


Ignore:
Timestamp:
7 Feb 2016, 07:32:25 (9 years ago)
Author:
Henrik Bettermann
Message:

Carryover payments must not trigger workflow transitions.

Location:
main/waeup.kwarapoly/trunk/src/waeup/kwarapoly
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py

    r13591 r13653  
    125125        xmldict['institution_acct'] = "0106259811"
    126126        xmldict['institution_bank_id'] = "10"
    127         if self.context.p_category == 'schoolfee':
     127        if self.context.p_category == 'schoolfee' \
     128            or self.context.p_category.startswith('carryover'):
    128129            self.pay_item_id = '101'
    129130            dalash_amt = 1800.0
  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py

    r13461 r13653  
    248248            self.browser.contents)
    249249        self.assertTrue(
    250             'item_name="School Fee" item_amt="270000" bank_id="10" acct_num="0106259811"' in
     250            'item_name="One Carry-Over" item_amt="270000" bank_id="10" acct_num="0106259811"' in
    251251            self.browser.contents)
    252252        self.assertTrue(
  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py

    r13535 r13653  
    268268        self.assertEqual(payment.p_session, 2004)
    269269        self.assertEqual(payment.amount_auth, 6000.0)
    270         self.assertEqual(payment.p_item, u'1 CarryOver')
    271         self.assertEqual(payment.p_category, 'schoolfee')
     270        self.assertEqual(payment.p_item, u'One Carry-Over')
     271        self.assertEqual(payment.p_category, 'carryover1')
    272272        self.assertEqual(error, None)
    273273
     
    276276        self.assertEqual(payment.p_session, 2004)
    277277        self.assertEqual(payment.amount_auth, 10000.0)
    278         self.assertEqual(payment.p_item, u'2 CarryOvers')
    279         self.assertEqual(payment.p_category, 'schoolfee')
     278        self.assertEqual(payment.p_item, u'Two Carry-Overs')
     279        self.assertEqual(payment.p_category, 'carryover2')
    280280        self.assertEqual(error, None)
    281281
     
    284284        self.assertEqual(payment.p_session, 2004)
    285285        self.assertEqual(payment.amount_auth, 15000.0)
    286         self.assertEqual(payment.p_item, u'3 CarryOvers')
    287         self.assertEqual(payment.p_category, 'schoolfee')
     286        self.assertEqual(payment.p_item, u'Three Carry-Overs')
     287        self.assertEqual(payment.p_category, 'carryover3')
    288288        self.assertEqual(error, None)
    289289
  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py

    r13536 r13653  
    262262            p_item = unicode(p_item)
    263263            # Now we change the category to reduce the number of categories.
    264             category = 'schoolfee'
     264            # Disabled on 2016/02/04
     265            #category = 'schoolfee'
    265266        if self._isPaymentDisabled(p_session, category, student):
    266267            return _('Payment temporarily disabled.'), None
  • main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/utils/utils.py

    r13278 r13653  
    6161    PAYMENT_CATEGORIES = {
    6262        'schoolfee': 'School Fee',
    63         'carryover1': '1 CarryOver',
    64         'carryover2': '2 CarryOvers',
    65         'carryover3': '3 CarryOvers',
     63        'carryover1': 'One Carry-Over',
     64        'carryover2': 'Two Carry-Overs',
     65        'carryover3': 'Three Carry-Overs',
    6666        'clearance': 'Acceptance',
    6767        'bed_allocation': 'Bed Allocation',
     
    105105    SELECTABLE_PAYMENT_CATEGORIES = {
    106106        'schoolfee': 'School Fee',
    107         'carryover1': 'One CarryOver',
    108         'carryover2': 'Two CarryOvers',
    109         'carryover3': 'Three CarryOvers',
     107        'carryover1': 'One Carry-Over',
     108        'carryover2': 'Two Carry-Overs',
     109        'carryover3': 'Three Carry-Overs',
    110110        'hostel_maintenance': 'Hostel Maintenance',
    111111        'certificate': 'ND Certificate',
Note: See TracChangeset for help on using the changeset viewer.