Changeset 12982

Timestamp:

22 May 2015, 07:19:27 (10 years ago)

Author:

Henrik Bettermann

Message:

Fix exporter and test if the ticket-expire mechanism works, for both applicant and student payments.

Location:

main/kofacustom.wdu/trunk/src/kofacustom/wdu

Files:

• applicants/export.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (3 diffs)
• interswitch/browser.py (modified) (2 diffs)
• interswitch/tests.py (modified) (2 diffs)

main/kofacustom.wdu/trunk/src/kofacustom/wdu/applicants/export.py

@@ -33 +33 @@
         ICustomUGApplicant.names() +
         ICustomPGApplicant.names() +
-        INigeriaUGApplicant.names() +
+        #INigeriaUGApplicant.names() +
         INigeriaPGApplicant.names() +
         IApplicantBaseData.names()

main/kofacustom.wdu/trunk/src/kofacustom/wdu/applicants/tests/test_browser.py

@@ -79 +79 @@
         self.assertMatches(result,
             'aggregate,applicant_id,application_date,application_number,'
-            'course1,course2,course_admitted,date_of_birth,display_fullname,'
-            'email,emp2_end,emp2_position,emp2_reason,emp2_start,emp_end,'
-            'emp_position,emp_reason,emp_start,employer,employer2,'
-            'firstname,history,hq_degree,hq_disc,hq_matric_no,hq_school,'
-            'hq_session,hq_type,jamb_age,jamb_reg_number,jamb_score,'
-            'jamb_subjects,lastname,lga,locked,marit_stat,middlename,'
-            'nationality,next_kin_address,notice,nysc_lga,nysc_year,'
-            'olevel_exam_date,olevel_exam_date2,olevel_exam_number,'
-            'olevel_exam_number2,olevel_results,olevel_results2,'
-            'olevel_school,olevel_school2,olevel_type,olevel_type2,'
-            'password,phone,pp_school,presently_inst,reg_number,'
-            'religion,result_uploaded,screening_date,screening_score,'
-            'screening_venue,sex,special_application,state,student_id,'
-            'suspended,container_code\r\n'
-            ',dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
+            'body_responsible_address,course1,course2,course_admitted,'
+            'date_of_birth,display_fullname,email,emp2_end,emp2_position,'
+            'emp2_reason,emp2_start,emp_end,emp_position,emp_reason,'
+            'emp_start,employer,employer2,firstname,history,hq_degree,'
+            'hq_disc,hq_matric_no,hq_school,hq_session,hq_type,'
+            'jamb_reg_number,jamb_score,jamb_subjects,lastname,lga,'
+            'locked,marit_stat,middlename,nationality,next_kin_address,'
+            'notice,nysc_lga,nysc_year,olevel_exam_date,olevel_exam_date2,'
+            'olevel_exam_number,olevel_exam_number2,olevel_results,'
+            'olevel_results2,olevel_school,olevel_school2,olevel_type,'
+            'olevel_type2,password,phone,pp_school,presently_inst,'
+            'reg_number,religion,result_uploaded,screening_date,'
+            'screening_score,screening_venue,sex,special_application,'
+            'state,student_id,suspended,container_code\r\n'
+            ',dp2011_654321,,654321,,CERT1,CERT1,CERT1,1981-02-04#,'
             'Anna M. Tester,anna@sample.com,,,,,,,,,,,Anna,'
-            '[u\'2015-04-26 13:44:05 WAT - Application initialized by system\']'
-            ',,,,,,,,,,,Tester,,0,,M.,NG,,"Some notice\nin lines.",,,,,,,,,,,,,'
+            '[u\'2015-05-22 05:35:35 WAT - Application initialized by system\']'
+            ',,,,,,,,,,Tester,,0,,M.,NG,,"Some notice\nin lines.",,,,,,,,,,,,,'
             'any password,+234-123-12345#,,,123456,,,'
-            '"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,'
-            'f,,initialized,,0,dp2011\r\n')
+            '"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,,'
+            'initialized,,0,dp2011\r\n')
         # We can import the same file if we ignore some columns.
         # Since the applicants_catalog hasn't been notified, the same
@@ -107 +107 @@
             self.outfile,
             ['aggreagate','ignore_applicant_id','application_date',
-            'ignore_application_number','course1','course2',
-            'course_admitted','date_of_birth','ignore3','email','emp2_end',
-            'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
-            'emp_reason','emp_start','employer','employer2','firstname','ignore4',
-            'hq_degree','hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
-            'jamb_age','jamb_score','jamb_subjects','lastname','lga','locked','middlename',
-            'nationality','notice','nysc_lga',
-            'nysc_year','password','phone','pp_school','presently_inst',
-            'reg_number','result_uploaded',
-            'screening_date','screening_score','screening_venue','sex',
-            'special_application',
+            'ignore_application_number',
+            'body_responsible_address','course1','course2','course_admitted',
+            'date_of_birth','display_fullname','email','emp2_end','emp2_position',
+            'emp2_reason','emp2_start','emp_end','emp_position','emp_reason',
+            'emp_start','employer','employer2','firstname','history','hq_degree',
+            'hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
+            'jamb_reg_number','jamb_score','jamb_subjects','lastname','lga',
+            'locked','marit_stat','middlename','nationality','next_kin_address',
+            'notice','nysc_lga','nysc_year','olevel_exam_date','olevel_exam_date2',
+            'olevel_exam_number','olevel_exam_number2','olevel_results',
+            'olevel_results2','olevel_school','olevel_school2','olevel_type',
+            'olevel_type2','password','phone','pp_school','presently_inst',
+            'reg_number','religion','result_uploaded','screening_date',
+            'screening_score','screening_venue','sex','special_application',
             'state','student_id','suspended','container_code'],
             mode='create')
         num_succ, num_fail, finished_path, failed_path = result
-        #content = open(failed_path).read()
         self.assertEqual(num_succ,1)
         self.assertEqual(num_fail,0)
@@ -132 +134 @@
         result = processor.doImport(
             self.outfile,
-            ['aggregate','ignore_applicant_id','application_date',
-            'ignore_application_number','course1','course2',
-            'course_admitted','date_of_birth','ignore3','email','emp2_end',
-            'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
-            'emp_reason','emp_start','employer','employer2','firstname','ignore4',
-            'hq_degree','hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
-            'jamb_age','jamb_score','jamb_subjects','lastname','lga','locked','middlename',
-            'nationality','notice','nysc_lga',
-            'nysc_year','password','phone','pp_school','presently_inst',
-            'reg_number','result_uploaded','screening_date','screening_score',
-            'screening_venue','sex','special_application',
+            ['aggreagate','ignore_applicant_id','application_date',
+            'ignore_application_number',
+            'body_responsible_address','course1','course2','course_admitted',
+            'date_of_birth','display_fullname','email','emp2_end','emp2_position',
+            'emp2_reason','emp2_start','emp_end','emp_position','emp_reason',
+            'emp_start','employer','employer2','firstname','history','hq_degree',
+            'hq_disc','hq_matric_no','hq_school','hq_session','hq_type',
+            'jamb_reg_number','jamb_score','jamb_subjects','lastname','lga',
+            'locked','marit_stat','middlename','nationality','next_kin_address',
+            'notice','nysc_lga','nysc_year','olevel_exam_date','olevel_exam_date2',
+            'olevel_exam_number','olevel_exam_number2','olevel_results',
+            'olevel_results2','olevel_school','olevel_school2','olevel_type',
+            'olevel_type2','password','phone','pp_school','presently_inst',
+            'reg_number','religion','result_uploaded','screening_date',
+            'screening_score','screening_venue','sex','special_application',
             'state','student_id','suspended','ignore_container_code'],
             mode='update')

main/kofacustom.wdu/trunk/src/kofacustom/wdu/interswitch/browser.py

@@ -62 +62 @@
 
     def update(self):
-        super(CustomInterswitchPageStudent, self).update()
+        error = self.init_update()
+        if error:
+            self.flash(error, type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
         student = self.student
         xmldict = self.xmldict
@@ -125 +129 @@
 
     def update(self):
-        super(CustomInterswitchPageApplicant, self).update()
+        error = self.init_update()
+        if error:
+            self.flash(error, type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
         xmldict = {}
         provider_amt = 500.0

main/kofacustom.wdu/trunk/src/kofacustom/wdu/interswitch/tests.py

@@ -85 +85 @@
             '...item_name="School Fees" item_amt="23000000" bank_id="47" acct_num="4742014159"...',
             self.browser.contents)
+
+    def test_interswitch_form_ticket_expired(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        acc_payment = createObject('waeup.StudentOnlinePayment')
+        acc_payment.p_state = 'unpaid'
+        acc_payment.p_category = 'schoolfee'
+        acc_payment.p_id = 'xyz'
+        acc_payment.pay_item_id = '123'
+        acc_payment.amount_auth = 876.0
+        self.student['payments']['xyz'] = acc_payment
+        self.browser.open(self.payments_path + '/xyz')
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertMatches('...<input type="hidden" name="pay_item_id" value="101" />...',
+                           self.browser.contents)
+        self.assertMatches('...Total Amount Authorized:...',
+                           self.browser.contents)
+        self.assertEqual(self.student.current_mode, 'ug_ft')
+        self.assertMatches(
+            '...<input type="hidden" name="amount" value="87600" />...',
+            self.browser.contents)
+        delta = timedelta(minutes=61)
+        acc_payment.creation_date -= delta
+        self.browser.open(self.payments_path + '/xyz')
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertMatches(
+            '...This payment ticket is too old. Please create a new ticket...',
+            self.browser.contents)
+        delta = timedelta(minutes=2)
+        acc_payment.creation_date += delta
+        self.browser.open(self.payments_path + '/xyz')
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertMatches('...Total Amount Authorized:...',
+                           self.browser.contents)
+
 
     @external_test
@@ -208 +242 @@
             '...<input type="hidden" name="amount" value="100000" />...',
             self.browser.contents)
+        delta = timedelta(minutes=61)
+        self.applicant.values()[0].creation_date -= delta
+        self.browser.open(self.payment_url)
+        self.browser.getLink("CollegePAY", index=0).click()
+        self.assertMatches(
+            '...This payment ticket is too old. Please create a new ticket...',
+            self.browser.contents)
 
     @external_test