Changeset 10735

Timestamp:

10 Nov 2013, 07:35:27 (11 years ago)

Author:

Henrik Bettermann

Message:

Adjust setPaymentDetails.

Location:

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

Files:

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

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

@@ -86 +86 @@
         self.student['accommodation'].addBedTicket(bedticket)
 
-    def test_manage_payments(self):
-        # Add missing configuration data
         self.app['configuration']['2004'].gown_fee = 150.0
         self.app['configuration']['2004'].transfer_fee = 90.0
@@ -93 +91 @@
         self.app['configuration']['2004'].booking_fee = 150.0
         self.app['configuration']['2004'].maint_fee = 180.0
-
+        self.app['configuration']['2004'].certificate_fee = 444.0
+
+    def test_manage_payments(self):
         # Managers can add online payment tickets
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -177 +177 @@
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Amount could not be determined...',
+                           self.browser.contents)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['certificate']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
                            self.browser.contents)
 
@@ -204 +209 @@
 
     def test_set_payment_details(self):
-        self.app['configuration']['2004'].gown_fee = 150.0
-        self.app['configuration']['2004'].transfer_fee = 90.0
-        self.app['configuration']['2004'].booking_fee = 150.0
-        self.app['configuration']['2004'].maint_fee = 180.0
-        self.app['configuration']['2004'].clearance_fee = 120.0
         utils = getUtility(IStudentsUtils)
 
@@ -301 +301 @@
         self.assertEqual(payment.amount_auth, 150.0)
         self.assertEqual(payment.p_item, u'')
+        self.assertEqual(error, None)
+
+        error, payment = utils.setPaymentDetails('certificate',self.student)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 444.0)
+        self.assertEqual(payment.p_item, u'')
+        self.assertEqual(payment.p_category, 'certificate')
         self.assertEqual(error, None)
 

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

@@ -233 +233 @@
         elif category == 'carryover3':
             amount = 8000.0
+
+        else:
+            fee_name = category + '_fee'
+            amount = getattr(academic_session, fee_name, 0.0)
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None