Changeset 9528

Timestamp:

4 Nov 2012, 21:15:05 (12 years ago)

Author:

Henrik Bettermann

Message:

New fees.

Location:

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

Files:

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

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py

@@ -87 +87 @@
                            self.browser.contents)
         self.assertMatches(
-            '...<span>37100.0</span>...',
+            '...<span>36600.0</span>...',
             self.browser.contents)
         self.payment_url = self.browser.url

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

@@ -227 +227 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 44630.0)
+        self.assertEqual(payment.amount_auth, 52100.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
@@ -240 +240 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 44590.0)
+        self.assertEqual(payment.amount_auth, 31090.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -39 +39 @@
         (
           (
-            (34400.0, 37100.0, 43000.0, 29300.0, 0.0, 37900.0, 29700.0, 29900.0, 0.0, 47550.0), # science
-            (32900.0, 35600.0, 28000.0, 27800.0, 0.0, 36400.0, 28200.0, 28400.0, 0.0, 47550.0)  # arts
+            (34400.0, 36600.0, 29500.0, 28800.0, 0.0, 38700.0, 30700.0, 29900.0, 0.0, 47250.0), # science
+            (32900.0, 35100.0, 28000.0, 27300.0, 0.0, 37200.0, 29200.0, 28400.0, 0.0, 47250.0)  # arts
           ), # local
           (
-            (41930.0, 44630.0, 44590.0, 36400.0, 0.0, 46330.0, 32900.0, 38100.0, 0.0, 60980.0), # science
-            (40430.0, 43130.0, 29590.0, 34900.0, 0.0, 44830.0, 31400.0, 36600.0, 0.0, 60980.0)  # arts
+            (49500.0, 52100.0, 31090.0, 35900.0, 0.0, 55600.0, 33900.0, 38600.0, 0.0, 71880.0), # science
+            (48000.0, 50600.0, 29590.0, 34400.0, 0.0, 54100.0, 32400.0, 37100.0, 0.0, 71880.0)  # arts
           ), # non-local
         ), # ft
         (
           (
-            (0.0, 38400.0, 30900.0, 0.0, 30900.0, 39000.0, 31550.0, 0.0, 31550.0, 0.0), # science
-            (0.0, 36900.0, 29400.0, 0.0, 29400.0, 37500.0, 30050.0, 0.0, 30050.0, 0.0)  # arts
+            (0.0, 39400.0, 30900.0, 0.0, 30900.0, 38900.0, 31050.0, 0.0, 31050.0, 0.0), # science
+            (0.0, 37900.0, 29400.0, 0.0, 29400.0, 37400.0, 29550.0, 0.0, 29550.0, 0.0)  # arts
           ), # local
           (
-            (0.0, 45600.0, 32350.0, 0.0, 32350.0, 47200.0, 35750.0, 0.0, 35750.0, 0.0), # science
-            (0.0, 44100.0, 30850.0, 0.0, 30850.0, 45700.0, 34250.0, 0.0, 34250.0, 0.0)  # arts
+            (0.0, 54600.0, 32350.0, 0.0, 32350.0, 57100.0, 42350.0, 0.0, 42350.0, 0.0), # science
+            (0.0, 53100.0, 30850.0, 0.0, 30850.0, 55600.0, 40850.0, 0.0, 40850.0, 0.0)  # arts
           ), # non-local
         ), # pt