Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/tests/test_export.py

    r14407 r15670  
    5959            'marit_stat,matric_number,middlename,nationality,'
    6060            'next_kin_address,next_kin_name,next_kin_phone,next_kin_relation,'
    61             'nysc_lga,nysc_location,nysc_year,officer_comment,'
     61            'nysc_lga,nysc_location,nysc_year,officer_comment,parents_email,'
    6262            'perm_address,personal_updated,phone,'
    6363            'physical_clearance_date,provisionally_cleared,reg_number,'
     
    6868            '"[(\'printing_craft_practice\', \'A1\')]",my clr code,1981-02-04#,,,'
    6969            'anna@sample.com,,,,,,,,,,,,,Anna,,,,,,"[(\'printing_craft_practice\', \'A1\')]"'
    70             ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'
     70            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,,'
    7171            '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,,,123,,,,,'
    7272            '"[(\'printing_craft_practice\', \'A1\')]",,f,A111111,0,,,created,'
     
    103103        result = open(self.outfile, 'rb').read()
    104104        self.assertMatches(
    105             'ac,amount_auth,creation_date,gateway_amt,p_category,p_current,'
     105            'ac,amount_auth,creation_date,gateway_amt,p_category,p_combi,p_current,'
    106106            'p_id,p_item,p_level,p_session,p_state,payment_date,provider_amt,'
    107107            'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
    108108            'r_pay_reference,thirdparty_amt,student_id,state,'
    109109            'current_session\r\n'
    110             '666,12.12,%s-04-01 13:12:01#,,schoolfee,1,my-id,p-item,'
     110            '666,12.12,%s-04-01 13:12:01#,,schoolfee,[],1,my-id,p-item,'
    111111            '100,%s,paid,%s-04-01 14:12:01#,,12.12,'
    112112            '789,r-code,interswatch,,,,A111111,created,2012\r\n'
  • main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/utils.py

    r15493 r15670  
    9191
    9292    def setPaymentDetails(self, category, student,
    93             previous_session=None, previous_level=None):
     93            previous_session=None, previous_level=None, p_combi=[]):
    9494        """Create a payment ticket and set the payment data of a
    9595        student for the payment category specified.
Note: See TracChangeset for help on using the changeset viewer.