Changeset 7928 for main/waeup.custom/trunk/src/waeup/custom/students

Timestamp:

20 Mar 2012, 14:37:35 (13 years ago)

Author:

Henrik Bettermann

Message:

All fees must be float not int.

Location:

main/waeup.custom/trunk/src/waeup/custom/students

Files:

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

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

@@ -96 +96 @@
     def test_manage_payments(self):
         # Add missing configuration data
-        self.app['configuration']['2004'].gown_fee = 150
-        self.app['configuration']['2004'].transfer_fee = 90
-        self.app['configuration']['2004'].clearance_fee = 120
-        self.app['configuration']['2004'].maint_fee = 180
+        self.app['configuration']['2004'].gown_fee = 150.0
+        self.app['configuration']['2004'].transfer_fee = 90.0
+        self.app['configuration']['2004'].clearance_fee = 120.0
+        self.app['configuration']['2004'].maint_fee = 180.0
 
         # Managers can add online payment tickets

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

@@ -33 +33 @@
         # fresh
         if state == CLEARED:
-            return 40000 - surcharge
+            return 40000.0 - surcharge
         # returning
         elif state == RETURNING:
-            return 20000 - surcharge
+            return 20000.0 - surcharge
         else:
-            return 0
+            return 0.0
     else:
-        return 0
+        return 0.0
 
 class StudentsUtils(StudentsUtils):
@@ -59 +59 @@
     def getPaymentDetails(self, category, student):
         d = {}
-        d['surcharge_1'] = d['surcharge_2'] = d['surcharge_3'] = 0
+        d['surcharge_1'] = d['surcharge_2'] = d['surcharge_3'] = 0.0
         d['p_item'] = u''
-        d['amount'] = 0
+        d['amount'] = 0.0
         d['error'] = u''
         d['p_session'] = student['studycourse'].current_session
@@ -88 +88 @@
             d['p_item'] = code
             d['p_session'] += 1
-        if d['amount'] == 0:
+        if d['amount'] == 0.0:
             d['error'] = _(u'Amount could not be determined.')
         return d