Changeset 13625

Timestamp:

17 Jan 2016, 08:46:31 (9 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• payments.py (modified) (2 diffs)
• tests/test_export.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/payments.py

@@ -25 +25 @@
 from hurry.workflow.interfaces import IWorkflowInfo
 from waeup.kofa.students.interfaces import IStudentNavigation
-from waeup.kofa.students.payments import (
-    StudentOnlinePayment, StudentOnlinePaymentFactory)
 from waeup.kofa.students.workflow import CLEARED, RETURNING, PAID
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.kofa.accesscodes import create_accesscode
+from kofacustom.nigeria.students.payments import (
+    NigeriaStudentOnlinePayment, NigeriaStudentOnlinePaymentFactory)
 from waeup.aaue.students.interfaces import ICustomStudentOnlinePayment
 
-class CustomStudentOnlinePayment(StudentOnlinePayment):
+class CustomStudentOnlinePayment(NigeriaStudentOnlinePayment):
     """This is a custom online payment for students.
 
@@ -93 +93 @@
     CustomStudentOnlinePayment, omit=['display_item'])
 
-class CustomStudentOnlinePaymentFactory(StudentOnlinePaymentFactory):
+class CustomStudentOnlinePaymentFactory(NigeriaStudentOnlinePaymentFactory):
     """A factory for student online payments.
     """

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_export.py

@@ -52 +52 @@
             'emp2_reason,emp2_start,emp_end,emp_position,emp_reason,'
             'emp_start,employer,employer2,father_address,father_name,'
-            'father_phone,father_work,firstname,former_matric,fst_sit_date,'
+            'father_phone,father_work,'
+            'financial_clearance_date,financially_cleared_by,'
+            'firstname,former_matric,fst_sit_date,'
             'fst_sit_fname,fst_sit_no,fst_sit_results,fst_sit_type,hq2_degree,'
             'hq2_disc,hq2_matric_no,hq2_school,hq2_session,hq2_type,'
@@ -67 +69 @@
             '\r\n'
             'my adm code,,,,"[(\'printing_craft_practice\', \'A1\')]",'
-            'my clr code,1981-02-04#,,,anna@sample.com,,,,,,,,,,,,,,,Anna,,,,,'
+            'my clr code,1981-02-04#,,,anna@sample.com,,,,,,,,,,,,,,,,,Anna,,,,,'
             '"[(\'printing_craft_practice\', \'A1\')]",,,,,,,,,,,,,,,,Tester,,,'
             '234,M.,,,,,NG,,,,,,,,,"Studentroad 21\nLagos 123456\n",,'