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

Timestamp:

31 Oct 2016, 07:02:58 (8 years ago)

Author:

Henrik Bettermann

Message:

Add student id card fee to first school fee payment.

Attention: The payment slip does not contain any information whether the fee was added or not. We can only draw conclusions from from the student's entry session whether the fee had been included.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (3 diffs)
• utils.py (modified) (2 diffs)

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

@@ -229 +229 @@
             welfare_fee = gateway_net_amt(academic_session.welfare_fee)
             union_fee = gateway_net_amt(academic_session.union_fee)
-            text += ('School Fee, '
-                     '%s Naira Student Union Dues, '
-                     '%s Naira Student Welfare Assurance Fee and '
-                     % (union_fee, welfare_fee))
+            if self.context.student.entry_session == 2016 \
+                and self.context.student.entry_mode == 'ug_ft' \
+                and self.context.p_session == 2016:
+                # Add student id card fee to first school fee payment.
+                # Attention: The payment slip does not contain any information
+                # whether the fee was added or not.
+                # We can only draw conclusions from from the student's entry
+                # session whether the fee had been included.
+                id_card_fee = gateway_net_amt(academic_session.id_card_fee)
+                text += ('School Fee, '
+                         '%s Naira Student ID Card Fee, '
+                         '%s Naira Student Union Dues, '
+                         '%s Naira Student Welfare Assurance Fee and '
+                         % (id_card_fee, union_fee, welfare_fee))
+            else:
+                text += ('School Fee, '
+                         '%s Naira Student Union Dues, '
+                         '%s Naira Student Welfare Assurance Fee and '
+                         % (union_fee, welfare_fee))
         elif self.context.p_category in (
             'clearance_incl', 'clearance_medical_incl') and academic_session:

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -453 +453 @@
         self.student['accommodation'].addBedTicket(bedticket)
 
-    def test_student_payments(self):
+    def test_maintenance_fee_payment(self):
         self.certificate.study_mode = 'ug_ft'
         self.student['studycourse'].entry_session = 2013
+        self.student.nationality = u'NG'
+        IWorkflowState(self.student).setState('cleared')
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.browser.open(self.student_path + '/payments')
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['hostel_maintenance']
+        self.browser.getControl("Create ticket").click()
+        self.assertTrue('ticket created' in self.browser.contents)
+        value = self.student['payments'].keys()[0]
+        self.browser.getLink(value).click()
+        self.assertTrue('<span>My bed coordinates</span>' in self.browser.contents)
+        self.assertEqual(self.student['payments'][value].amount_auth, 876.0)
+        return
+
+    def test_student_schoolfee_payments(self):
+        configuration_1 = createObject('waeup.SessionConfiguration')
+        configuration_1.academic_session = 2016
+        self.app['configuration'].addSessionConfiguration(configuration_1)
+        self.certificate.study_mode = 'ug_ft'
+        self.student['studycourse'].entry_session = 2016
+        self.student['studycourse'].current_session = 2016
+        self.student['studycourse'].entry_mode = 'ug_ft'
         self.student['studycourse'].certificate.school_fee_1 = 50250.0
-        self.app['configuration']['2004'].union_fee = 1250.0
-        self.app['configuration']['2004'].welfare_fee = 750.0
+        self.app['configuration']['2016'].union_fee = 1250.0
+        self.app['configuration']['2016'].welfare_fee = 750.0
+        self.app['configuration']['2016'].id_card_fee = 350.0
         self.student.nationality = u'NG'
         # Login
@@ -475 +501 @@
         self.browser.getLink(value).click()
         self.assertTrue('Amount Authorized' in self.browser.contents)
-        self.assertEqual(self.student['payments'][value].amount_auth, 51750.0)
+        # 50250 + 1000 + 500 + 100 = 51850
+        self.assertEqual(self.student['payments'][value].amount_auth, 51850.0)
         self.browser.open(self.browser.url + '/payment_slip.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
@@ -489 +516 @@
         self.browser.getControl("Create ticket").click()
         self.assertTrue(
-            'You must chose a payment which includes additional fees'
-            in self.browser.contents)
-        #self.assertTrue(
-        #    'Another school fee payment for this session has already been made'
-        #    in self.browser.contents)
-        # Test hostel maintenance payments
-        self.browser.open(self.student_path + '/payments')
-        self.browser.getLink("Add current session payment ticket").click()
-        self.browser.getControl(name="form.p_category").value = ['hostel_maintenance']
-        self.browser.getControl("Create ticket").click()
-        self.assertTrue('ticket created' in self.browser.contents)
-        value = self.student['payments'].keys()[1]
-        self.browser.getLink(value).click()
-        self.assertTrue('<span>My bed coordinates</span>' in self.browser.contents)
-        self.assertEqual(self.student['payments'][value].amount_auth, 876.0)
+            'You must choose a payment which includes additional fees'
+            in self.browser.contents)
         return
 

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

@@ -256 +256 @@
                 and not category in (
                 'schoolfee_incl', 'schoolfee_1', 'schoolfee_2'):
-                    return _("You must chose a payment which includes "
+                    return _("You must choose a payment which includes "
                              "additional fees."), None
             if category in ('schoolfee_1', 'schoolfee_2'):
@@ -303 +303 @@
             if amount in (0.0, None):
                 return _(u'Amount could not be determined.'), None
-            # Add Student Union Fee and Welfare Assurance
+            # Add Student Union Fee , Student Id Card Fee and Welfare Assurance
             if category in ('schoolfee_incl', 'schoolfee_1'):
                 amount += gateway_net_amt(academic_session.welfare_fee) + \
                     gateway_net_amt(academic_session.union_fee)
+                if student.entry_session == 2016 \
+                    and student.entry_mode == 'ug_ft' \
+                    and student.state == CLEARED:
+                    amount += gateway_net_amt(academic_session.id_card_fee)
             # Add non-indigenous fee and session specific penalty fees
             if student.is_postgrad: