Changeset 16338

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:

• interswitch/tests.py (modified) (1 diff)
• students/tests/test_utils.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)

main/kofacustom.dspg/trunk/src/kofacustom/dspg/interswitch/tests.py

@@ -67 +67 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertTrue('You have to pay NADESU/SA/SUG Dues first'
+        self.assertTrue('You have to pay NADESU/SA/SUG and GNS Dues first'
             in self.browser.contents)
         payment = createObject('waeup.StudentOnlinePayment')

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_utils.py

@@ -90 +90 @@
         # Students can pay school fee if dep_sug and gns dues have been paid first.
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
+        self.assertEqual(error, u'You have to pay NADESU/SA/SUG and GNS Dues first.')
         error, payment = utils.setPaymentDetails('dep_sug',self.student)
         self.student['payments']['any_key'] = payment
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(error, u'You have to pay NADESU/SA/SUG Dues first.')
+        self.assertEqual(error, u'You have to pay NADESU/SA/SUG and GNS Dues first.')
 
         configuration.gns_1_fee = 1150.0

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/utils.py

@@ -53 +53 @@
                     ticket.p_session == session:
                     gns = True
-                if dep_sug: # and gns: deactivated on 13/11/20
+                if dep_sug and gns:
                     return True
         return False
@@ -174 +174 @@
                 if student.faccode != 'SPAT' and not self._dep_sug_gns_paymentMade(
                     student, student.current_session):
-                    #return _('You have to pay NADESU/SA/SUG and GNS Dues first.'), None
-                    return _('You have to pay NADESU/SA/SUG Dues first.'), None
+                    return _('You have to pay NADESU/SA/SUG and GNS Dues first.'), None
                 penalty = getattr(academic_session, 'lsfp_penalty_fee')
                 if  penalty and not self._lsfp_penalty_paymentMade(