Changeset 9888

Timestamp:

15 Jan 2013, 14:45:32 (12 years ago)

Author:

Henrik Bettermann

Message:

pg school fees are set in certificates (in contrast to ug fees). If a penalty fee is set 9999 school fee payment is disabled for the respective mode.

Location:

main/waeup.futminna/trunk/src/waeup/futminna/students

Files:

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

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

@@ -145 +145 @@
         self.assertEqual(error, None)
 
+        self.certificate2.study_mode = 'pg_ft'
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(error, u'Amount could not be determined.')
+        self.certificate2.school_fee_1 = 876.55
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.amount_auth, 876.55)
+
         self.certificate2.study_mode = 'jm_ft'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)

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

@@ -78 +78 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-            if student.current_mode.endswith('_ft'):
+            if student.is_postgrad:
+                if student.state == CLEARED:
+                    if student.is_foreigner:
+                        amount = getattr(certificate, 'school_fee_3', 0.0)
+                    else:
+                        amount = getattr(certificate, 'school_fee_1', 0.0)
+                elif student.state == RETURNING:
+                    if student.is_foreigner:
+                        amount = getattr(certificate, 'school_fee_4', 0.0)
+                    else:
+                        amount = getattr(certificate, 'school_fee_2', 0.0)
+            elif student.current_mode.endswith('_ft'):
                 # fresh remedial
                 if student.current_level == 10 and student.state == CLEARED:
@@ -149 +160 @@
         # Add session specific penalty fee.
         if category == 'schoolfee' and student.is_postgrad:
-            amount += academic_session.penalty_pg
+            if academic_session.penalty_pg == 9999.0:
+                amount = 0.0
+            else:
+                amount += academic_session.penalty_pg
         elif category == 'schoolfee':
-            amount += academic_session.penalty_ug
+            if academic_session.penalty_ug == 9999.0:
+                amount = 0.0
+            else:
+                amount += academic_session.penalty_ug
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]