Ignore:
Timestamp:
26 Dec 2022, 09:49:13 (21 months ago)
Author:
Henrik Bettermann
Message:

Merge with uli-paypal branch r17241.

Location:
main/kofacustom.nigeria/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.nigeria/trunk

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

    r16483 r17242  
    126126            'p_id,p_item,p_level,p_option,p_session,p_split_data,p_state,payment_date,provider_amt,'
    127127            'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
    128             'r_pay_reference,thirdparty_amt,student_id,state,'
     128            'r_pay_reference,r_payment_link,thirdparty_amt,student_id,state,'
    129129            'current_session\r\n'
    130130            '666,12.12,2012-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
    131131            '100,,%s,,paid,2012-04-01 14:12:01#,,12.12,'
    132             '789,r-code,interswitch,,,,A111111,created,2012\r\n' % (curr_year-6),
     132            '789,r-code,interswitch,,,,,A111111,created,2012\r\n' % (curr_year-6),
    133133            result
    134134            )
     
    191191            'p_category,p_combi,p_current,p_id,p_item,p_level,p_option,p_session,p_split_data,p_state,'
    192192            'payment_date,provider_amt,r_amount_approved,r_card_num,r_code,'
    193             'r_company,r_desc,r_pay_reference,thirdparty_amt,student_id,'
     193            'r_company,r_desc,r_pay_reference,r_payment_link,thirdparty_amt,student_id,'
    194194            'matric_number,reg_number,firstname,middlename,lastname,sex,state,'
    195195            'current_session,entry_session,entry_mode,faccode,depcode,certcode,lga\r\n'
    196196
    197197            '666,12.12,%s-04-01 13:12:01#,,,,schoolfee,[],1,my-id,p-item,'
    198             '100,,%s,,paid,%s-04-01 14:12:01#,,12.12,,r-code,,,,,A111111,'
     198            '100,,%s,,paid,%s-04-01 14:12:01#,,12.12,,r-code,,,,,,A111111,'
    199199            '234,123,Anna,M.,Tester,f,created,2012,2010,ug_ft,NA,NA,CERT1,\r\n'
    200200            % (curr_year-6, curr_year-6, curr_year-6)
Note: See TracChangeset for help on using the changeset viewer.