Changeset 11648 for main/waeup.aaua

Timestamp:

14 May 2014, 05:26:13 (10 years ago)

Author:

Henrik Bettermann

Message:

Use init_update and samePaymentMade methods.

Location:

main/waeup.aaua/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/aaua/interswitch/browser.py (modified) (1 diff)
• src/waeup/aaua/students/utils.py (modified) (1 diff)

main/waeup.aaua/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Use init_update and samePaymentMade methods.
 
 * Use base classes InterswitchPageApplicant and InterswitchPageStudent from

main/waeup.aaua/trunk/src/waeup/aaua/interswitch/browser.py

@@ -74 +74 @@
 
     def update(self):
-        student, certificate, xmldict = super(
-            CustomInterswitchPageStudent, self).update()
+        error = self.init_update()
+        if error:
+            self.flash(error, type='danger')
+            self.redirect(self.url(self.context, '@@index'))
+            return
+        student = self.student
+        xmldict = self.xmldict
         # Provider data
         xmldict['detail_ref'] = self.context.p_id

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

@@ -109 +109 @@
         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