Changeset 13418 for main/waeup.aaue/trunk

Timestamp:

9 Nov 2015, 11:53:23 (9 years ago)

Author:

Henrik Bettermann

Message:

Fetch hostel maintenance fee from hostel object.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -309 +309 @@
         self.browser.getControl(name="form.password").value = 'spwd'
         self.browser.getControl("Login").click()
+        # Test school fee payments
         self.browser.open(self.student_path + '/payments')
         self.browser.getLink("Add current session payment ticket").click()
@@ -325 +326 @@
         open(path, 'wb').write(self.browser.contents)
         print "Sample PDF payment_slip.pdf written to %s" % path
+        # Test hostel maintenance payments
+        self.browser.open(self.student_path + '/payments')
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['hostel_maintenance']
+        self.browser.getControl("Create ticket").click()
+        self.assertTrue('ticket created' in self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[1]
+        self.browser.getLink(value).click()
+        self.assertTrue('<span>My bed coordinates</span>' in self.browser.contents)
+        self.assertEqual(self.student['payments'][value].amount_auth, 876.0)
         return
 

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

@@ -119 +119 @@
             amount = academic_session.booking_fee
         elif category == 'hostel_maintenance':
-            amount = academic_session.maint_fee
+            amount = 0.0
+            bedticket = student['accommodation'].get(
+                str(student.current_session), None)
+            if bedticket:
+                p_item = bedticket.bed_coordinates
+                if bedticket.bed.__parent__.maint_fee > 0:
+                    amount = bedticket.bed.__parent__.maint_fee
+                else:
+                    # fallback
+                    amount = academic_session.maint_fee
+            else:
+                # Should not happen because this is already checked
+                # in the browser module, but anyway ...
+                portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+                p_item = trans(_('no bed allocated'), portal_language)
         elif category == 'welfare':
             amount = academic_session.welfare_fee