Changeset 9298 for main


Ignore:
Timestamp:
5 Oct 2012, 11:26:26 (12 years ago)
Author:
Henrik Bettermann
Message:

Set payment ticket attributes properly.

Location:
main/waeup.futminna/trunk/src/waeup/futminna/students
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.futminna/trunk/src/waeup/futminna/students/tests/test_browser.py

    r9244 r9298  
    108108        IWorkflowState(self.student).setState('returning')
    109109        error, payment = utils.setPaymentDetails('schoolfee',self.student)
    110         self.assertEqual(payment.p_level, 100)
    111         self.assertEqual(payment.p_session, 2004)
     110        self.assertEqual(payment.p_level, 200)
     111        self.assertEqual(payment.p_session, 2005)
    112112        self.assertEqual(payment.amount_auth, 37000.0)
    113113        self.assertEqual(payment.p_item, u'CERT1')

  • main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py

    r9244 r9298  
    7979                    else:
    8080                        amount = 74200.0
    81 
    8281                # fresh
    8382                elif student.state == CLEARED:
    … …  
    9897                else:
    9998                    amount = 0.0
     99            if student.state == RETURNING:
     100                p_session, p_level = self.getReturningData(student)
    100101        elif category == 'clearance':
    101102            try:
Note: See TracChangeset for help on using the changeset viewer.