Changeset 9943

Timestamp:

13 Feb 2013, 10:17:01 (12 years ago)

Author:

Henrik Bettermann

Message:

Rename study mode.

Location:

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

Files:

• applicants/tests/test_browser.py (modified) (1 diff)
• interswitch/browser.py (modified) (1 diff)
• interswitch/tests.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)

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

@@ -74 +74 @@
         self.certificate.start_level = 100
         self.certificate.end_level = 500
-        self.certificate.study_mode = u'ug_ft'
+        self.certificate.study_mode = u'nce_ft'
         self.app['faculties']['fac1'] = Faculty()
         self.app['faculties']['fac1']['dep1'] = Department()

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

@@ -101 +101 @@
         if self.context.p_category == 'schoolfee':
             self.pay_item_id = '8302'
-            if student.current_mode in ('ug_sw','prence',):
+            if student.current_mode in ('nce_sw','prence',):
                 xmldict['institution_acct'] = "6216801025"
                 xmldict['institution_bank_id'] = '117'
-            elif student.current_mode in ('ug_ft',) and \
+            elif student.current_mode in ('nce_ft',) and \
                 student['studycourse'].current_verdict == 'O':
                 xmldict['institution_acct'] = "6216801025"
                 xmldict['institution_bank_id'] = '117'
-            elif student.current_mode in ('ug_ft',):
+            elif student.current_mode in ('nce_ft',):
                 xmldict['institution_acct'] = "6216801033"
                 xmldict['institution_bank_id'] = '117'

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

@@ -49 +49 @@
     def setUp(self):
         super(InterswitchTestsStudents, self).setUp()
+        self.certificate.study_mode = 'nce_ft'
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)

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

@@ -273 +273 @@
         self.assertEqual(error, None)
 
-        self.certificate.study_mode = u'ug_sw'
+        self.certificate.study_mode = u'nce_sw'
         error, payment = utils.setPaymentDetails('hostel_maintenance',self.student)
         self.assertEqual(payment.p_level, 100)