Changeset 13491 for main/waeup.uniben/trunk/src/waeup/uniben/students

Timestamp:

23 Nov 2015, 16:16:32 (9 years ago)

Author:

Henrik Bettermann

Message:

Enable accommodation booking payment.

File:

• main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py (modified) (2 diffs)

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

@@ -77 +77 @@
                      'match accommodation session.')
         stage = bt.split('_')[2]
-        if stage not in ('fr', 'fi'):
-            return _("Only fresh and final year students are allowed to book accommodation.")
-
         ####################################################################################
-        if stage == 'fi':
-            return _("Accommodation booking for final year students has not yet started.")
+        if stage in ('fi', 're'):
+            return _("Accommodation booking for returning and final year students has not yet started.")
         ####################################################################################
-
-
         if stage != 'fr' and not student['studycourse'].previous_verdict in ('A', 'B'):
             return _("Your are not eligible to book accommodation.")
@@ -193 +188 @@
             stage = self.getAccommodationDetails(student)['bt']
             stage = stage.split('_')[2]
-
-
             #####################################################
-            if stage == 'fi':
-                return _('Payment temporarily disabled.'), None
+            #if stage == 'fi':
+            #    return _('Payment temporarily disabled.'), None
             #####################################################
-
-
             if stage == 'fr':
                 amount += 500.0
-            elif stage == 'fi' and student[
+            elif stage in ('fi', 're') and student[
                 'studycourse'].previous_verdict in ('A', 'B'):
                 amount += 300.0