Changeset 12148 for main

Timestamp:

5 Dec 2014, 10:01:59 (10 years ago)

Author:

Henrik Bettermann

Message:

Maint payment checking disabled on Dec 5th, 2014.

Location:

main/waeup.kwarapoly/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kwarapoly/interswitch/tests.py (modified) (1 diff)
• src/waeup/kwarapoly/students/tests/test_browser.py (modified) (2 diffs)
• src/waeup/kwarapoly/students/utils.py (modified) (1 diff)

main/waeup.kwarapoly/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Maint payment checking disabled on Dec 5th, 2014.
 
 * Nationality and sex must be edited by pre-admission applicants.

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py

@@ -80 +80 @@
         notify(grok.ObjectModifiedEvent(self.student))
 
-
-    def test_schoolfee_ticket_creation(self):
+    # Maint payment checking disabled on 5th Dec 2014
+    def xx_test_schoolfee_ticket_creation(self):
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py

@@ -104 +104 @@
         IWorkflowState(self.student).setState('cleared')
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Book and pay for accommodation first...',
-                           self.browser.contents)
-
-        # In KwaraPoly only returning students can create school fee payment
-        # without having paid accommodation fee
+
+        # Maint payment checking disabled on 5th Dec 2014
+        #self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        #self.browser.getControl("Create ticket").click()
+        #self.assertMatches('...Book and pay for accommodation first...',
+        #                   self.browser.contents)
+        ## In KwaraPoly only returning students can create school fee payment
+        ## without having paid accommodation fee
+
         IWorkflowState(self.student).setState('returning')
         configuration = createObject('waeup.SessionConfiguration')
@@ -220 +222 @@
         self.assertEqual(pt_ft(self.student), 'ft')
 
-        error, payment = utils.setPaymentDetails('schoolfee',self.student)
-        self.assertEqual(error,
-            'Book and pay for accommodation first before making'
-            ' school fee payments.')
-        # We add a fake maint. payment ticket to meet the condition
-        maint_payment = createObject('waeup.StudentOnlinePayment')
-        self.student['payments']['any_key'] = maint_payment
-        maint_payment.p_category = 'hostel_maintenance'
-        maint_payment.p_state = 'paid'
-        maint_payment.p_session = 2004
+        # Maint payment checking disabled on 5th Dec 2014
+        #error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        #self.assertEqual(error,
+        #    'Book and pay for accommodation first before making'
+        #    ' school fee payments.')
+        ## We add a fake maint. payment ticket to meet the condition
+        #maint_payment = createObject('waeup.StudentOnlinePayment')
+        #self.student['payments']['any_key'] = maint_payment
+        #maint_payment.p_category = 'hostel_maintenance'
+        #maint_payment.p_state = 'paid'
+        #maint_payment.p_session = 2004
+
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 100)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py

@@ -131 +131 @@
 
     def _maintPaymentMade(self, student, session):
-        if len(student['payments']):
-            for ticket in student['payments'].values():
-                if ticket.p_category == 'hostel_maintenance' and \
-                    ticket.p_session == session and ticket.p_state == 'paid':
-                        return True
-        return False
+
+        # Maint payment checking disabled on 5th Dec 2014
+        return True
+
+        #if len(student['payments']):
+        #    for ticket in student['payments'].values():
+        #        if ticket.p_category == 'hostel_maintenance' and \
+        #            ticket.p_session == session and ticket.p_state == 'paid':
+        #                return True
+        #return False
 
     def _bedAvailable(self, student):