Changeset 16338


Ignore:
Timestamp:
1 Dec 2020, 07:16:35 (4 years ago)
Author:
Henrik Bettermann
Message:

Reanble GNS pack payment requirements.

Location:
main/kofacustom.dspg/trunk/src/kofacustom/dspg
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.dspg/trunk/src/kofacustom/dspg/interswitch/tests.py

    r16319 r16338  
    6767        self.browser.getControl(name="form.p_category").value = ['schoolfee']
    6868        self.browser.getControl("Create ticket").click()
    69         self.assertTrue('You have to pay NADESU/SA/SUG Dues first'
     69        self.assertTrue('You have to pay NADESU/SA/SUG and GNS Dues first'
    7070            in self.browser.contents)
    7171        payment = createObject('waeup.StudentOnlinePayment')
  • main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_utils.py

    r16319 r16338  
    9090        # Students can pay school fee if dep_sug and gns dues have been paid first.
    9191        error, payment = utils.setPaymentDetails('schoolfee',self.student)
    92         self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
     92        self.assertEqual(error, u'You have to pay NADESU/SA/SUG and GNS Dues first.')
    9393        error, payment = utils.setPaymentDetails('dep_sug',self.student)
    9494        self.student['payments']['any_key'] = payment
    9595        error, payment = utils.setPaymentDetails('schoolfee',self.student)
    96         self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
     96        self.assertEqual(error, u'You have to pay NADESU/SA/SUG and GNS Dues first.')
    9797
    9898        configuration.gns_1_fee = 1150.0
  • main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/utils.py

    r16319 r16338  
    5353                    ticket.p_session == session:
    5454                    gns = True
    55                 if dep_sug: # and gns: deactivated on 13/11/20
     55                if dep_sug and gns:
    5656                    return True
    5757        return False
     
    174174                if student.faccode != 'SPAT' and not self._dep_sug_gns_paymentMade(
    175175                    student, student.current_session):
    176                     #return _('You have to pay NADESU/SA/SUG and GNS Dues first.'), None
    177                     return _('You have to pay NADESU/SA/SUG Dues first.'), None
     176                    return _('You have to pay NADESU/SA/SUG and GNS Dues first.'), None
    178177                penalty = getattr(academic_session, 'lsfp_penalty_fee')
    179178                if  penalty and not self._lsfp_penalty_paymentMade(
Note: See TracChangeset for help on using the changeset viewer.