Changeset 15180


Ignore:
Timestamp:
2 Oct 2018, 12:39:06 (6 years ago)
Author:
Henrik Bettermann
Message:

See AAUE ticket #513.

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

Legend:

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

    r14954 r15180  
    236236        )
    237237
     238    sports_fee = schema.Float(
     239        title = _(u'Sports Development Fee'),
     240        default = 0.0,
     241        required = True,
     242        )
     243
     244    library_fee = schema.Float(
     245        title = _(u'Library Development Fee'),
     246        default = 0.0,
     247        required = True,
     248        )
     249
    238250    coursereg_deadline = schema.Datetime(
    239251        title = _(u'FT Course Reg. Deadline'),
  • main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

    r15168 r15180  
    240240                student_welfare_assurance_amt = gateway_net_amt(
    241241                    academic_session.welfare_fee)
     242                sports_amt = gateway_net_amt(
     243                    academic_session.sports_fee)
     244                library_amt = gateway_net_amt(
     245                    academic_session.library_fee)
    242246                xmldict['student_union_bank_id'] = '31'
    243247                xmldict['student_union_acct'] = '0051005007'
     
    259263                student_welfare_assurance_amt = gateway_net_amt(
    260264                    academic_session.welfare_fee)
     265                sports_amt = gateway_net_amt(
     266                    academic_session.sports_fee)
     267                library_amt = gateway_net_amt(
     268                    academic_session.library_fee)
    261269                xmldict['student_union_bank_id'] = '7'
    262270                xmldict['student_union_acct'] = '1019763348'
     
    284292                xmldict['student_union_due_amt'] = 100 * student_union_due_amt
    285293                xmldict['student_welfare_assurance_amt'] = 100 * student_welfare_assurance_amt
     294                xmldict['sports_amt'] = 100 * sports_amt
     295                xmldict['library_amt'] = 100 * library_amt
    286296                xmldict['institution_amt'] = 100 * (
    287297                    gateway_net_amt(self.context.amount_auth)
     
    290300                    - aaue_share_amt
    291301                    - student_union_due_amt
    292                     - student_welfare_assurance_amt)
     302                    - student_welfare_assurance_amt
     303                    - sports_amt
     304                    - library_amt)
    293305                xmltext = """<payment_item_detail>
    294306<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
     
    299311<item_detail item_id="5" item_name="Student Union" item_amt="%(student_union_due_amt)d" bank_id="%(student_union_bank_id)s" acct_num="%(student_union_acct)s" />
    300312<item_detail item_id="6" item_name="Student Welfare Assurance" item_amt="%(student_welfare_assurance_amt)d" bank_id="123" acct_num="1006407792" />
     313<item_detail item_id="7" item_name="Sports Development Fee" item_amt="%(sports_amt)d" bank_id="123" acct_num="1005407792" />
     314<item_detail item_id="8" item_name="Library Development Fee" item_amt="%(library_amt)d" bank_id="8" acct_num="2000122995" />
    301315</item_details>
    302316</payment_item_detail>""" % xmldict
  • main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

    r15178 r15180  
    432432            if amount in (0.0, None):
    433433                return _(u'Amount could not be determined.'), None
    434             # Add Student Union Fee , Student Id Card Fee and Welfare Assurance
    435             if category in ('schoolfee_incl', 'schoolfee_1') and \
    436                 student.current_mode != 'ijmbe':
    437                 amount += gateway_net_amt(academic_session.welfare_fee) + \
    438                     gateway_net_amt(academic_session.union_fee)
     434            # Add Student Union Fee, Student Id Card Fee, Sports Dev. Fee,
     435            # Library Dev. Fee and Welfare Assurance
     436            if category in ('schoolfee_incl', 'schoolfee_1'):
     437                if student.current_mode != 'ijmbe':
     438                    amount += gateway_net_amt(academic_session.welfare_fee) + \
     439                        gateway_net_amt(academic_session.union_fee)
     440                gateway_net_amt(academic_session.sports_fee)
     441                gateway_net_amt(academic_session.library_fee)
    439442                if student.entry_session == 2016 \
    440443                    and student.entry_mode == 'ug_ft' \
  • main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

    r14700 r15180  
    6565        'fac_dep': 'Faculty and Departmental Dues',
    6666        'restitution': 'Restitution Fee',
     67        'sports_develop': 'Sports Development Fee',
     68        'library_develop': 'Library Development Fee',
    6769        }
    6870
Note: See TracChangeset for help on using the changeset viewer.