Ignore:
Timestamp:
25 Jan 2022, 08:25:36 (3 years ago)
Author:
Henrik Bettermann
Message:

Implement ENT211 payments.

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

    r16749 r16754  
    206206        )
    207207
     208    ent_text_book_0_fee = schema.Float(
     209        title = _(u'Text Book Fee ENT201, ENT211'),
     210        default = 0.0,
     211        required = True,
     212        )
     213
    208214    ent_text_book_1_fee = schema.Float(
    209215        title = _(u'Text Book Fee ENT201'),
     
    226232    gst_registration_2_fee = schema.Float(
    227233        title = _(u'Registration Fee GST222'),
     234        default = 0.0,
     235        required = True,
     236        )
     237
     238    ent_registration_0_fee = schema.Float(
     239        title = _(u'Registration Fee ENT201, ENT211'),
    228240        default = 0.0,
    229241        required = True,
  • main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

    r16749 r16754  
    295295                not 'gst_registration_2' in paid_cats:
    296296                return False
    297             if course.code in ('ENT211',) and \
    298                 not 'ent_registration_2' in paid_cats:
    299                 return False
    300297            if course.code in ('GST101', 'GST102') and \
    301298                not 'gst_text_book_1' in paid_cats and \
     
    309306                not 'gst_text_book_3' in paid_cats:
    310307                return False
     308            if course.code in ('ENT201',) and \
     309                not 'ent_registration_1' in paid_cats and \
     310                not 'ent_registration_0' in paid_cats:
     311                return False
    311312            if course.code in ('ENT211',) and \
    312                 not 'ent_text_book_2' in paid_cats:
     313                not 'ent_registration_2' in paid_cats and \
     314                not 'ent_registration_0' in paid_cats:
     315                return False
     316            if course.code in ('ENT201',) and \
     317                not 'ent_text_book_1' in paid_cats and \
     318                not 'ent_text_book_0' in paid_cats:
     319                return False
     320            if course.code in ('ENT211',) and \
     321                not 'ent_text_book_2' in paid_cats and \
     322                not 'ent_text_book_0' in paid_cats:
    313323                return False
    314324            return True
  • main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

    r16749 r16754  
    6262        'gst_text_book_2': 'Text Book Fee GST111 GST112',
    6363        'gst_text_book_3': 'Text Book Fee GST222',
     64        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
     65        'gst_registration_2': 'Registration Fee GST222',
    6466        'ent_text_book_1': 'Text Book Fee ENT201',
    6567        'ent_text_book_2': 'Text Book Fee ENT211',
    66         'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    67         'gst_registration_2': 'Registration Fee GST222',
     68        'ent_text_book_0': 'Text Book Fee for ENT201 and ENT211',
    6869        'ent_registration_1': 'Registration Fee ENT201',
    6970        'ent_registration_2': 'Registration Fee ENT211',
     71        'ent_registration_0': 'Registration Fee for ENT201 and ENT211',
    7072        'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
    7173        'ict': 'ICT/Affidavit Dues',
     
    104106        'gst_text_book_2': 'Text Book Fee GST111 GST112',
    105107        'gst_text_book_3': 'Text Book Fee GST222',
     108        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
     109        'gst_registration_2': 'Registration Fee GST222',
    106110        'ent_text_book_1': 'Text Book Fee ENT201',
    107111        'ent_text_book_2': 'Text Book Fee ENT211',
    108         'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    109         'gst_registration_2': 'Registration Fee GST222',
     112        'ent_text_book_0': 'Text Book Fee for ENT201 and ENT211',
    110113        'ent_registration_1': 'Registration Fee ENT201',
    111114        'ent_registration_2': 'Registration Fee ENT211',
     115        'ent_registration_0': 'Registration Fee for ENT201 and ENT211',
    112116        #'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
    113117        'ict': 'ICT/Affidavit Dues',
     
    151155        'clearance_incl': 'Acceptance Fee Plus',
    152156        'schoolfee_incl': 'School Fee Plus',
     157        'ent_text_book_1': 'Text Book Fee ENT201',
     158        'ent_text_book_2': 'Text Book Fee ENT211',
     159        'ent_text_book_0': 'Text Book Fee for ENT201 and ENT211',
    153160        'ent_registration_1': 'Registration Fee ENT201',
    154         'ent_text_book_1': 'Text Book Fee ENT201',
    155161        'ent_registration_2': 'Registration Fee ENT211',
    156         'ent_text_book_2': 'Text Book Fee ENT211',
     162        'ent_registration_0': 'Registration Fee for ENT201 and ENT211',
    157163        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    158164        'gst_registration_2': 'Registration Fee GST222',
     
    206212        'gst_text_book_2': 'Text Book Fee GST111 GST112',
    207213        'gst_text_book_3': 'Text Book Fee GST222',
     214        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
     215        'gst_registration_2': 'Registration Fee GST222',
    208216        'ent_text_book_1': 'Text Book Fee ENT201',
    209217        'ent_text_book_2': 'Text Book Fee ENT211',
    210         'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    211         'gst_registration_2': 'Registration Fee GST222',
     218        'ent_text_book_0': 'Text Book Fee for ENT201 and ENT211',
    212219        'ent_registration_1': 'Registration Fee ENT201',
    213220        'ent_registration_2': 'Registration Fee ENT211',
     221        'ent_registration_0': 'Registration Fee for ENT201 and ENT211',
    214222        #'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
    215223        'ict': 'ICT/Affidavit Dues',
Note: See TracChangeset for help on using the changeset viewer.