Changeset 15192 for main/waeup.aaue/trunk/src/waeup

Timestamp:

17 Oct 2018, 04:23:51 (6 years ago)

Author:

Henrik Bettermann

Message:

"only students with entry session equal to 2018 should pay the new items (LIBRARY DEVELOPMENT LEVY and SPORTS DEVELOPMENT FEE (NUGA & WAGU)) ... Returning students should be excluded" (see #513)

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• interswitch/browser.py (modified) (2 diffs)
• students/utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

@@ -296 +296 @@
                 xmldict['student_union_due_amt'] = 100 * student_union_due_amt
                 xmldict['student_welfare_assurance_amt'] = 100 * student_welfare_assurance_amt
-                xmldict['sports_amt'] = 100 * sports_amt
-                if student.is_postgrad:
-                    xmldict['library_amt'] = 100 * library_amt_pg
-                else:
-                    xmldict['library_amt'] = 100 * library_amt
-                xmldict['institution_amt'] = 100 * (
-                    gateway_net_amt(self.context.amount_auth)
-                    - provider_amt
-                    - joint_venture_amt
-                    - aaue_share_amt
-                    - student_union_due_amt
-                    - student_welfare_assurance_amt
-                    - sports_amt
-                    - library_amt)
-                xmltext = """<payment_item_detail>
+
+                if student.entry_session == 2018 and student.is_fresh:
+                    xmldict['sports_amt'] = 100 * sports_amt
+                    if student.is_postgrad:
+                        xmldict['library_amt'] = 100 * library_amt_pg
+                    else:
+                        xmldict['library_amt'] = 100 * library_amt
+                    xmldict['institution_amt'] = 100 * (
+                        gateway_net_amt(self.context.amount_auth)
+                        - provider_amt
+                        - joint_venture_amt
+                        - aaue_share_amt
+                        - student_union_due_amt
+                        - student_welfare_assurance_amt
+                        - sports_amt
+                        - library_amt)
+                    xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
 <item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
@@ -320 +322 @@
 <item_detail item_id="7" item_name="Sports Development Fee" item_amt="%(sports_amt)d" bank_id="123" acct_num="1005407792" />
 <item_detail item_id="8" item_name="Library Development Fee" item_amt="%(library_amt)d" bank_id="8" acct_num="2000122995" />
+</item_details>
+</payment_item_detail>""" % xmldict
+                else:
+                    xmldict['institution_amt'] = 100 * (
+                        gateway_net_amt(self.context.amount_auth)
+                        - provider_amt
+                        - joint_venture_amt
+                        - aaue_share_amt
+                        - student_union_due_amt
+                        - student_welfare_assurance_amt)
+                    xmltext = """<payment_item_detail>
+<item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">
+<item_detail item_id="1" item_name="%(institution_item_name)s" item_amt="%(institution_amt)d" bank_id="%(institution_bank_id)s" acct_num="%(institution_acct)s" />
+<item_detail item_id="2" item_name="%(provider_item_name)s" item_amt="%(provider_amt)d" bank_id="%(provider_bank_id)s" acct_num="%(provider_acct)s" />
+<item_detail item_id="3" item_name="Joint Venture" item_amt="%(joint_venture_amt)d" bank_id="%(joint_venture_bank_id)s" acct_num="%(joint_venture_acct)s" />
+<item_detail item_id="4" item_name="AAUE Share" item_amt="%(aaue_share_amt)d" bank_id="%(aaue_share_bank_id)s" acct_num="%(aaue_share_acct)s" />
+<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" />
+<item_detail item_id="6" item_name="Student Welfare Assurance" item_amt="%(student_welfare_assurance_amt)d" bank_id="123" acct_num="1006407792" />
 </item_details>
 </payment_item_detail>""" % xmldict

main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

@@ -438 +438 @@
                     amount += gateway_net_amt(academic_session.welfare_fee) + \
                         gateway_net_amt(academic_session.union_fee)
-                amount += gateway_net_amt(academic_session.sports_fee)
-                if student.is_postgrad:
-                    amount += gateway_net_amt(academic_session.library_fee_pg)
-                else:
-                    amount += gateway_net_amt(academic_session.library_fee)
+                if student.entry_session == 2018 and student.is_fresh:
+                    amount += gateway_net_amt(academic_session.sports_fee)
+                    if student.is_postgrad:
+                        amount += gateway_net_amt(academic_session.library_fee_pg)
+                    else:
+                        amount += gateway_net_amt(academic_session.library_fee)
                 if student.entry_session == 2016 \
                     and student.entry_mode == 'ug_ft' \