Changeset 15670 for main/kofacustom.coewarri/trunk/src/kofacustom/coewarri

Timestamp:

13 Oct 2019, 20:54:52 (5 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students

Files:

• tests/test_export.py (modified) (3 diffs)
• utils.py (modified) (1 diff)

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/tests/test_export.py

@@ -59 +59 @@
             'marit_stat,matric_number,middlename,nationality,'
             'next_kin_address,next_kin_name,next_kin_phone,next_kin_relation,'
-            'nysc_lga,nysc_location,nysc_year,officer_comment,'
+            'nysc_lga,nysc_location,nysc_year,officer_comment,parents_email,'
             'perm_address,personal_updated,phone,'
             'physical_clearance_date,provisionally_cleared,reg_number,'
@@ -68 +68 @@
             '"[(\'printing_craft_practice\', \'A1\')]",my clr code,1981-02-04#,,,'
             'anna@sample.com,,,,,,,,,,,,,Anna,,,,,,"[(\'printing_craft_practice\', \'A1\')]"'
-            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'
+            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,,'
             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,,,123,,,,,'
             '"[(\'printing_craft_practice\', \'A1\')]",,f,A111111,0,,,created,'
@@ -103 +103 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'ac,amount_auth,creation_date,gateway_amt,p_category,p_current,'
+            'ac,amount_auth,creation_date,gateway_amt,p_category,p_combi,p_current,'
             'p_id,p_item,p_level,p_session,p_state,payment_date,provider_amt,'
             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
             'r_pay_reference,thirdparty_amt,student_id,state,'
             'current_session\r\n'
-            '666,12.12,%s-04-01 13:12:01#,,schoolfee,1,my-id,p-item,'
+            '666,12.12,%s-04-01 13:12:01#,,schoolfee,[],1,my-id,p-item,'
             '100,%s,paid,%s-04-01 14:12:01#,,12.12,'
             '789,r-code,interswatch,,,,A111111,created,2012\r\n'

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/utils.py

@@ -91 +91 @@
 
     def setPaymentDetails(self, category, student,
-            previous_session=None, previous_level=None):
+            previous_session=None, previous_level=None, p_combi=[]):
         """Create a payment ticket and set the payment data of a
         student for the payment category specified.