Ignore:
Timestamp:
21 Aug 2024, 08:09:35 (4 months ago)
Author:
Henrik Bettermann
Message:

Add registration payment categories.

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

Legend:

Unmodified
Added
Removed
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/etranzact/browser.py

    r17792 r17900  
    298298        'IUO_CLEARANCE_FEE': ('grad_clearance',),
    299299        'IUO_ID_CARD_FEE': ('id_card',),
    300         'IUO_REGISTRATION_FEE': ('registration',),
     300        'IUO_REGISTRATION_FEE': ('registration', 'registration_fresh',
     301                                 'registration_return',),
    301302        'IUO_DEVELOPMENT_FEE': ('develop',),
    302303        'IUO_MUNICIPAL_FEE': ('municipal_fresh','municipal_returning'),
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/etranzact/servicecodes.csv

    r17792 r17900  
    5555pharmlab,001279XBU4AW
    5656registration,001279GTQ3SN
     57registration_fresh,001279GTQ3SN
     58registration_return,001279GTQ3SN
    5759required_combi,
    5860resit1,0012798VI0I4
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interfaces.py

    r17838 r17900  
    4949        )
    5050
    51     late_registration_fee = schema.Float(
    52         title = _(u'Late Course Reg. Fee'),
    53         default = 0.0,
    54         required = False,
    55         )
     51    #late_registration_fee = schema.Float(
     52    #    title = _(u'Late Course Reg. Fee'),
     53    #    default = 0.0,
     54    #    required = False,
     55    #    )
    5656
    5757    transcript_local_fee = schema.Float(
     
    106106        )
    107107
    108     registration_fee = schema.Float(
    109         title = _(u'Registration Fee'),
     108    #registration_fee = schema.Float(
     109    #    title = _(u'Registration Fee'),
     110    #    default = 0.0,
     111    #    required = False,
     112    #    )
     113
     114    registration_fresh_fee = schema.Float(
     115        title = _(u'Registration Fee (Fresh)'),
     116        default = 0.0,
     117        required = False,
     118        )
     119
     120    registration_return_fee = schema.Float(
     121        title = _(u'Registration Fee (Returning)'),
    110122        default = 0.0,
    111123        required = False,
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/browser.py

    r17672 r17900  
    108108            self.pay_item_id = '102'
    109109        if self.context.p_category in (
    110             'registration', 'required_combi', 'pg_other', 'jupeb_reg'):
     110            'registration', 'registration_fresh', 'registration_return',
     111            'required_combi', 'pg_other', 'jupeb_reg'):
    111112            provider_amt = 5000.0
    112113        if self.context.p_category in (
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py

    r16434 r17900  
    5353
    5454    def test_interswitch_form(self):
    55         self.app['configuration']['2004'].registration_fee = 7000.0
     55        self.app['configuration']['2004'].registration_fresh_fee = 7000.0
    5656        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
    5757        self.browser.open(self.payments_path)
     
    5959        self.student.nationality = u'NG'
    6060        self.browser.open(self.payments_path + '/addop')
    61         self.browser.getControl(name="form.p_category").value = ['registration']
     61        self.browser.getControl(name="form.p_category").value = ['registration_fresh']
    6262        self.browser.getControl(name="form.p_option").value = ['first']
    6363        self.browser.getControl("Create payment").click()
     
    8383        # WAeAC charge have been substracted
    8484        self.assertTrue(
    85             'item_name="Registration Fee" item_amt="200000" bank_id="8" acct_num="2021420049"' in
     85            'item_name="Registration Fee (Fresh)" item_amt="200000" bank_id="8" acct_num="2021420049"' in
    8686            self.browser.contents)
    8787        self.assertTrue(
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py

    r17889 r17900  
    5050
    5151    REQUIRED_PAYMENTS_FRESH = {
    52         'registration': 'Registration Fee',
     52        'registration_fresh': 'Registration Fee (Fresh)',
    5353        'book': 'Book Deposit',
    5454        'develop': 'Development Fee',
     
    5858
    5959    REQUIRED_PAYMENTS_RETURNING = {
    60         'registration': 'Registration Fee',
     60        'registration_return': 'Registration Fee (Returning)',
    6161        'book': 'Book Deposit',
    6262        'develop': 'Development Fee',
  • main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/utils/utils.py

    r17899 r17900  
    3434        'grad_clearance': 'Clearance Fee',
    3535        'registration': 'Registration Fee',
     36        'registration_fresh': 'Registration Fee (Fresh)',
     37        'registration_return': 'Registration Fee (Returning)',
    3638        #'bed_allocation': 'Bed Allocation Fee',
    3739        #'hostel_maintenance': 'Accommodation',
     
    113115        'schoolfee40': 'Tuition Plus (40% - 1st instalment)',
    114116        'secondinstal': 'Tuition Plus (60% - 2nd instalment)',
    115         'registration': 'Registration Fee',
     117        #'registration': 'Registration Fee',
     118        'registration_fresh': 'Registration Fee (Fresh)',
     119        'registration_return': 'Registration Fee (Returning)',
    116120        'clearance': 'Acceptance Fee',
    117121        'grad_clearance': 'Clearance Fee',
     
    209213    PREVIOUS_PAYMENT_CATEGORIES = {
    210214        'schoolfee': 'Tuition, Accommodation, Adm. Charges',
    211         'registration': 'Registration Fee',
     215        #'registration': 'Registration Fee',
     216        'registration_fresh': 'Registration Fee (Fresh)',
     217        'registration_return': 'Registration Fee (Returning)',
    212218        'clearance': 'Acceptance Fee',
    213219        'grad_clearance': 'Clearance Fee',
     
    279285
    280286    _COMBI_PAYMENT_CATEGORIES = {
    281         'registration': 'Registration Fee',
     287        #'registration': 'Registration Fee',
     288        'registration_fresh': 'Registration Fee (Fresh)',
     289        'registration_return': 'Registration Fee (Returning)',
    282290        'grad_clearance': 'Clearance Fee',
    283291        'late_registration': 'Late Registration Fee',
Note: See TracChangeset for help on using the changeset viewer.