Ignore:
Timestamp:
6 May 2014, 19:00:28 (10 years ago)
Author:
Henrik Bettermann
Message:

Configure new and returning school fee in session configuration objects.

Location:
main/waeup.aaue/trunk/src/waeup/aaue/students
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r11622 r11624  
    134134        self.assertMatches('...Amount could not be determined...',
    135135                           self.browser.contents)
    136         self.app['configuration']['2004'].school_fee = 6666.0
     136        self.app['configuration']['2004'].school_fee_1 = 6666.0
    137137        self.browser.getControl(name="form.p_category").value = ['schoolfee']
    138138        # Accepotance fee must be paid first

  • main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

    r11622 r11624  
    4343        self.app['configuration']['2004'].maint_fee = 180.0
    4444        self.app['configuration']['2004'].clearance_fee = 1234.0
    45         self.app['configuration']['2004'].school_fee = 6666.0
     45        self.app['configuration']['2004'].school_fee_1 = 6666.0
    4646        utils = getUtility(IStudentsUtils)
    4747
    … …  
    4949        configuration.academic_session = 2005
    5050        self.app['configuration'].addSessionConfiguration(configuration)
    51         self.app['configuration']['2005'].school_fee = 7777.0
     51        self.app['configuration']['2005'].school_fee_2 = 7777.0
    5252
    5353        error, payment = utils.setPaymentDetails('schoolfee',self.student)

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

    r11622 r11624  
    164164                    amount = 84000.0
    165165                else:
    166                     amount = academic_session.school_fee
     166                    amount = academic_session.school_fee_1
    167167            elif student.state == RETURNING or\
    168168                (student.is_postgrad and student.state == PAID):
    … …  
    181181                except KeyError:
    182182                    return _(u'Session configuration object is not available.'), None
    183                 amount = academic_session.school_fee
     183                amount = academic_session.school_fee_2
    184184            else:
    185185                return _('Wrong state.'), None
Note: See TracChangeset for help on using the changeset viewer.