Changeset 15667

Timestamp:

13 Oct 2019, 20:46:07 (5 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

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

Files:

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

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

@@ -111 +111 @@
         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_split_data,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/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

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