Changeset 11920

Timestamp:

31 Oct 2014, 06:45:52 (10 years ago)

Author:

Henrik Bettermann

Message:

Third semester fee applies to nce_sw and not nce_ft.

Location:

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

Files:

• interswitch/tests.py (modified) (3 diffs)
• students/tests/test_browser.py (modified) (2 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)
@@ -117 +118 @@
         self.browser.getLink(value).click()
         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="1012044015"'
+            'item_name="NCE Third Semester Fee" item_amt="376300" bank_id="117" acct_num="1012044194"'
             in self.browser.contents)
         self.assertTrue(
@@ -132 +132 @@
 
         # Maintenance fee payment
-
+        self.certificate.study_mode = 'nce_ft'
         self.browser.open(self.payments_path)
         self.browser.open(self.payments_path + '/addop')

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

@@ -133 +133 @@
         self.assertMatches('...could not be determined...',
                            self.browser.contents)
-        self.certificate.study_mode = 'nce_ft'
+        self.certificate.study_mode = 'nce_sw'
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['third_semester']
@@ -284 +284 @@
         self.assertEqual(error, None)
 
+        self.certificate.study_mode = 'nce_sw'
         error, payment = utils.setPaymentDetails('third_semester',self.student)
         self.assertEqual(payment.p_level, 100)

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_ft':
+        elif category == 'third_semester' and student.current_mode == 'nce_sw':
             if student.depcode in ARTS:
                 amount = 5835