Changeset 11932 for main

Timestamp:

3 Nov 2014, 12:19:35 (10 years ago)

Author:

Henrik Bettermann

Message:

Third semester fee applies to nce_ft and not nce_sw.
Increase fees.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

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

main/waeup.fceokene/trunk/src/waeup/fceokene/interswitch/tests.py

@@ -107 +107 @@
 
         # Third semester payment
-        self.certificate.study_mode = 'nce_sw'
         self.app['configuration']['2004'].third_semester_fee = 10000.0
         self.browser.open(self.payments_path)
@@ -119 +118 @@
         self.browser.getLink("CollegePAY", index=0).click()
         self.assertTrue(
-            '<input type="hidden" name="amount" value="691300" />'
-            in self.browser.contents)
-        self.assertTrue(
-            'item_name="NCE Third Semester Fee" item_amt="376300" bank_id="117" acct_num="1012044194"'
+            '<input type="hidden" name="amount" value="791300" />'
+            in self.browser.contents)
+        self.assertTrue(
+            'item_name="NCE Third Semester Fee" item_amt="476300" bank_id="117" acct_num="1012044015"'
             in self.browser.contents)
         self.assertTrue(

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

@@ -128 +128 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.certificate.study_mode = 'nce_sw'
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['third_semester']
@@ -133 +134 @@
         self.assertMatches('...could not be determined...',
                            self.browser.contents)
-        self.certificate.study_mode = 'nce_sw'
+        self.certificate.study_mode = 'nce_ft'
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['third_semester']
@@ -284 +285 @@
         self.assertEqual(error, None)
 
-        self.certificate.study_mode = 'nce_sw'
         error, payment = utils.setPaymentDetails('third_semester',self.student)
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 6913.0)
+        self.assertEqual(payment.amount_auth, 7913.0)
         self.assertEqual(payment.p_item, u'')
         self.assertEqual(error, None)

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

@@ -147 +147 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-        elif category == 'third_semester' and student.current_mode == 'nce_sw':
+        elif category == 'third_semester' and student.current_mode == 'nce_ft':
             if student.depcode in ARTS:
-                amount = 5835
+                amount = 6835
             else:
-                amount = 6763
+                amount = 7763
         elif category == 'schoolfee':
             try: