Changeset 13653 for main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students

Timestamp:

7 Feb 2016, 07:32:25 (9 years ago)

Author:

Henrik Bettermann

Message:

Carryover payments must not trigger workflow transitions.

Location:

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

Files:

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

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

@@ -268 +268 @@
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 6000.0)
-        self.assertEqual(payment.p_item, u'1 CarryOver')
-        self.assertEqual(payment.p_category, 'schoolfee')
+        self.assertEqual(payment.p_item, u'One Carry-Over')
+        self.assertEqual(payment.p_category, 'carryover1')
         self.assertEqual(error, None)
 
@@ -276 +276 @@
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 10000.0)
-        self.assertEqual(payment.p_item, u'2 CarryOvers')
-        self.assertEqual(payment.p_category, 'schoolfee')
+        self.assertEqual(payment.p_item, u'Two Carry-Overs')
+        self.assertEqual(payment.p_category, 'carryover2')
         self.assertEqual(error, None)
 
@@ -284 +284 @@
         self.assertEqual(payment.p_session, 2004)
         self.assertEqual(payment.amount_auth, 15000.0)
-        self.assertEqual(payment.p_item, u'3 CarryOvers')
-        self.assertEqual(payment.p_category, 'schoolfee')
+        self.assertEqual(payment.p_item, u'Three Carry-Overs')
+        self.assertEqual(payment.p_category, 'carryover3')
         self.assertEqual(error, None)
 

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

@@ -262 +262 @@
             p_item = unicode(p_item)
             # Now we change the category to reduce the number of categories.
-            category = 'schoolfee'
+            # Disabled on 2016/02/04
+            #category = 'schoolfee'
         if self._isPaymentDisabled(p_session, category, student):
             return _('Payment temporarily disabled.'), None