Changeset 11641 for main/waeup.kofa/trunk/src/waeup

Timestamp:

13 May 2014, 19:10:58 (10 years ago)

Author:

Henrik Bettermann

Message:

Add samePaymentMade method to StudentsUtils?.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py (modified) (3 diffs)

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

@@ -362 +362 @@
             'sf_all' in academic_session.payment_disabled:
             return True
+        return False
+
+    def samePaymentMade(self, student, category, p_item, p_session):
+        for key in student['payments'].keys():
+            ticket = student['payments'][key]
+            if ticket.p_state == 'paid' and\
+               ticket.p_category == category and \
+               ticket.p_item == p_item and \
+               ticket.p_session == p_session:
+                  return True
         return False
 
@@ -463 +473 @@
         if amount in (0.0, None):
             return _('Amount could not be determined.'), None
-        for key in student['payments'].keys():
-            ticket = student['payments'][key]
-            if ticket.p_state == 'paid' and\
-               ticket.p_category == category and \
-               ticket.p_item == p_item and \
-               ticket.p_session == p_session:
-                  return _('This type of payment has already been made.'), None
+        if self.samePaymentMade(student, category, p_item, p_session):
+            return _('This type of payment has already been made.'), None
         if self._isPaymentDisabled(p_session, category, student):
             return _('Payment temporarily disabled.'), None
@@ -498 +503 @@
         if amount in (0.0, None) or amount < 0:
             return _('Amount must be greater than 0.'), None
-        for key in student['payments'].keys():
-            ticket = student['payments'][key]
-            if ticket.p_state == 'paid' and\
-               ticket.p_category == 'balance' and \
-               ticket.p_item == p_item and \
-               ticket.p_session == p_session:
-                  return _('This type of payment has already been made.'), None
+        if self.samePaymentMade(student, 'balance', p_item, p_session):
+            return _('This type of payment has already been made.'), None
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]