Changeset 17629 for main

Timestamp:

30 Oct 2023, 09:07:07 (14 months ago)

Author:

Henrik Bettermann

Message:

Revert maintenance fee modification.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

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

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

@@ -286 +286 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 6100)
+        self.assertEqual(payment.amount_auth, 876.0)
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)
@@ -314 +314 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        self.assertEqual(payment.amount_auth, 3812.5)  # 62.5% * 876
+        self.assertEqual(payment.amount_auth, 547.5)  # 62.5% * 876
         self.assertEqual(payment.p_item, u'My bed coordinates')
         self.assertEqual(error, None)

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

@@ -116 +116 @@
                 p_session = booking_session
                 p_item = bedticket.bed_coordinates
-                #if bedticket.bed.__parent__.maint_fee > 0:
-                #    amount = bedticket.bed.__parent__.maint_fee
-                if student['studycourse'].current_session < 2022:
-                    amount = 6100.0
-                else:
-                    amount = 10090.0
+                if bedticket.bed.__parent__.maint_fee > 0:
+                    amount = bedticket.bed.__parent__.maint_fee
+                #if student['studycourse'].current_session < 2022:
+                #    amount = 6100.0
+                #else:
+                #    amount = 10090.0
             else:
                 return _(u'No bed space allocated.'), None