Changeset 13786 for main/waeup.aaue/trunk/src/waeup

Timestamp:

22 Mar 2016, 06:20:49 (9 years ago)

Author:

Henrik Bettermann

Message:

School fee payments must not be paid twice.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -324 +324 @@
         open(path, 'wb').write(self.browser.contents)
         print "Sample PDF payment_slip.pdf written to %s" % path
+        # Another school fee payment cannot be added
+        self.student['payments'][value].approve()
+        self.browser.open(self.student_path + '/payments')
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertTrue(
+            'Another school fee payment for this session has already been made'
+            in self.browser.contents)
         # Test hostel maintenance payments
         self.browser.open(self.student_path + '/payments')

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

@@ -263 +263 @@
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None
-
         # Create ticket.
         for key in student['payments'].keys():
@@ -272 +271 @@
                ticket.p_session == p_session:
                   return _('This type of payment has already been made.'), None
+            # Additional condition in AAUE
+            if category in ('schoolfee', 'schoolfee_incl', 'schoolfee_1'):
+                if ticket.p_state == 'paid' and \
+                   ticket.p_category in ('schoolfee',
+                                         'schoolfee_incl',
+                                         'schoolfee_1') and \
+                   ticket.p_item == p_item and \
+                   ticket.p_session == p_session:
+                      return _(
+                          'Another school fee payment for this '
+                          'session has already been made.'), None
+
         if self._isPaymentDisabled(p_session, category, student):
             return _('Payment temporarily disabled.'), None