Changeset 9570 for main

Timestamp:

7 Nov 2012, 17:22:50 (12 years ago)

Author:

Henrik Bettermann

Message:

Disable condition: "Students are only allowed to pay for the next session if current session payment"

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

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

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

@@ -108 +108 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        # Next session payment can't be made ...
-        self.assertMatches(
-            '...You have not yet paid your current/active session...',
-            self.browser.contents)
-        # current session payment must be approved first.
-        self.student['payments'][current_payment_key].approve()
-        self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
-        self.browser.getControl("Create ticket").click()
+
+        ## Next session payment can't be made ...
+        #self.assertMatches(
+        #    '...You have not yet paid your current/active session...',
+        #    self.browser.contents)
+        ## current session payment must be approved first.
+        #self.student['payments'][current_payment_key].approve()
+        #self.browser.open(self.payments_path + '/addop')
+        #self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        #self.browser.getControl("Create ticket").click()
+
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[1]

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

@@ -296 +296 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...You have not yet paid your current/active session...',
-                           self.browser.contents)
-        # Ok, let's pay the first schoolfee ticket.
-        schoolfee_ticket.approve()
-        self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
-        self.browser.getControl("Create ticket").click()
+
+
+        #self.assertMatches('...You have not yet paid your current/active session...',
+        #                   self.browser.contents)
+        ## Ok, let's pay the first schoolfee ticket.
+        #schoolfee_ticket.approve()
+        #self.browser.open(self.payments_path + '/addop')
+        #self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        #self.browser.getControl("Create ticket").click()
+
+
         self.assertMatches('...ticket created...',
                            self.browser.contents)
@@ -430 +434 @@
 
         IWorkflowState(self.student).setState('returning')
-        error, payment = utils.setPaymentDetails('schoolfee',
-            self.student, None, None)
-        self.assertTrue(
-            u'You have not yet paid your current/active session.' in error)
-        # Ok, that means we have to add paid payment ticket first.
-        payment = createObject('waeup.StudentOnlinePayment')
-        payment.p_category = u'schoolfee'
-        payment.p_session = self.student.current_session
-        payment.p_item = u'My Certificate'
-        payment.p_id = u'anyid'
-        payment.p_state = u'paid'
-        self.student['payments']['anykey'] = payment
+
+
+        #error, payment = utils.setPaymentDetails('schoolfee',
+        #    self.student, None, None)
+        #self.assertTrue(
+        #    u'You have not yet paid your current/active session.' in error)
+        ## Ok, that means we have to add paid payment ticket first.
+        #payment = createObject('waeup.StudentOnlinePayment')
+        #payment.p_category = u'schoolfee'
+        #payment.p_session = self.student.current_session
+        #payment.p_item = u'My Certificate'
+        #payment.p_id = u'anyid'
+        #payment.p_state = u'paid'
+        #self.student['payments']['anykey'] = payment
+
+
         error, payment = utils.setPaymentDetails('schoolfee',
             self.student, None, None)

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

@@ -146 +146 @@
                     if academic_session == None:
                         return _(u'Session configuration object is not available.'), None
+
                     # Students are only allowed to pay for the next session
                     # if current session payment
                     # has really been made, i.e. payment object exists.
-                    if not self._paymentMade(
-                        student, student.current_session):
-                        return _('You have not yet paid your current/active' +
-                                 ' session. Please use the previous session' +
-                                 ' payment form first.'), None
+                    #if not self._paymentMade(
+                    #    student, student.current_session):
+                    #    return _('You have not yet paid your current/active' +
+                    #             ' session. Please use the previous session' +
+                    #             ' payment form first.'), None
+
                     if student.is_foreigner:
                         amount = getattr(certificate, 'school_fee_4', 0.0)
@@ -166 +168 @@
                     if academic_session == None:
                         return _(u'Session configuration object is not available.'), None
+
                     # Students are only allowed to pay for the next session
                     # if current session payment has really been made,
                     # i.e. payment object exists and is paid.
-                    if not self._paymentMade(
-                        student, student.current_session):
-                        return _('You have not yet paid your current/active' +
-                                 ' session. Please use the previous session' +
-                                 ' payment form first.'), None
+                    #if not self._paymentMade(
+                    #    student, student.current_session):
+                    #    return _('You have not yet paid your current/active' +
+                    #             ' session. Please use the previous session' +
+                    #             ' payment form first.'), None
+
                     if student.is_foreigner:
                         amount = getattr(certificate, 'school_fee_4', 0.0)