Ignore:
Timestamp:
13 Oct 2019, 13:44:40 (5 years ago)
Author:
Henrik Bettermann
Message:

School fee instalment payment (2nd version)

Location:
main/kofacustom.iuokada/trunk/src/kofacustom/iuokada
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py

    r15661 r15663  
    7979            self.browser.contents)
    8080        self.assertTrue(
    81             'item_name="Tuition Plus Total" item_amt="3985000" bank_id="00" acct_num="00000000"' in
     81            'item_name="Tuition Plus (total amount)" item_amt="3985000" bank_id="00" acct_num="00000000"' in
    8282            self.browser.contents)
    8383
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py

    r15661 r15663  
    8181        # Determine fee.
    8282        if category in ('schoolfee', 'schoolfee40',
    83                         'schoolfee50', 'schoolfee60'):
     83                        'secondinstal'):
    8484            try:
    8585                certificate = student['studycourse'].certificate
     
    121121                            ), None
    122122                    amount = getattr(certificate, 'school_fee_2', 0.0)
     123            if category == 'schoolfee40':
     124                amount *= 0.4
     125            elif category == 'secondinstal':
     126                amount *= 0.6
    123127        elif category == 'clearance':
    124128            try:
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/utils/utils.py

    r15661 r15663  
    2727
    2828    PAYMENT_CATEGORIES = {
    29         'schoolfee40': 'Tuition Plus 40',
    30         'schoolfee50': 'Tuition Plus 50',
    31         'schoolfee60': 'Tuition Plus 60',
    32         'schoolfee': 'Tuition Plus Total',
     29        'schoolfee': 'Tuition Plus (total amount)',
     30        'schoolfee40': 'Tuition Plus (40% - 1st instalment)',
     31        'secondinstal': 'Tuition Plus (60% - 2nd instalment))',
    3332        'clearance': 'Acceptance Fee',
    3433        #'bed_allocation': 'Bed Allocation Fee',
     
    5554
    5655    SELECTABLE_PAYMENT_CATEGORIES = {
     56        'schoolfee': 'Tuition, Accommodation, Adm. Charges (total amount)',
    5757        'schoolfee40': 'Tuition, Accommodation, Adm. Charges (40% - 1st instalment)',
    58         'schoolfee50': 'Tuition, Accommodation, Adm. Charges (50% - 1st instalment)',
    59         'schoolfee60': 'Tuition, Accommodation, Adm. Charges (60% - 1st instalment)',
    60         'schoolfee': 'Tuition, Accommodation, Adm. Charges (total amount)',
     58        'secondinstal': 'Tuition, Accommodation, Adm. Charges (60% - 2nd instalment)',
    6159        #'bed_allocation': 'Bed Allocation Fee',
    6260        #'hostel_maintenance': 'Accommodation',
Note: See TracChangeset for help on using the changeset viewer.