Changeset 17151

Timestamp:

30 Oct 2022, 21:46:11 (23 months ago)

Author:

Henrik Bettermann

Message:

The year of discount is different for pg and ug students.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (2 diffs)
• students/utils.py (modified) (6 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -6 +6 @@
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
 "Language-Team: \n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 3.2\n"
 
 #: waeup/kofa/applicants/viewlets.py:137
@@ -46 +46 @@
 
 msgid "Custom Float 1 (not used)"
-msgstr "New Students Discount (entry session < 2020)"
+msgstr "New Students Discount"
 
 msgid "Custom Float 2 (not used)"
-msgstr "Returning Students Discount (entry session < 2020)"
+msgstr "Returning Students Discount"
 
 msgid ""

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

@@ -338 +338 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
+            discount_year = 2017
+            if student.is_postgrad:
+                discount_year = 2020
             if previous_session:
                 # Students can pay for previous sessions in all workflow states.
@@ -348 +351 @@
                         amount = getattr(certificate, 'school_fee_1', 0.0)
                         # Old new students get a discount.
-                        if student.entry_session < 2020 \
+                        if student.entry_session < discount_year \
                             and certificate.custom_float_1:
                             amount -= certificate.custom_float_1                        
@@ -357 +360 @@
                         amount = getattr(certificate, 'school_fee_2', 0.0)
                         # Old returning students get a discount.
-                        if student.entry_session < 2020 \
+                        if student.entry_session < discount_year \
                             and certificate.custom_float_2:
                             amount -= certificate.custom_float_2
@@ -367 +370 @@
                         amount = getattr(certificate, 'school_fee_1', 0.0)
                         # Old new students get a discount.
-                        if student.entry_session < 2020 \
+                        if student.entry_session < discount_year \
                             and certificate.custom_float_1:
                             amount -= certificate.custom_float_1                             
@@ -389 +392 @@
                     else:
                         amount = getattr(certificate, 'school_fee_2', 0.0)
+                        # Old returning students might get a discount.
+                        if student.entry_session < discount_year \
+                            and certificate.custom_float_2:
+                            amount -= certificate.custom_float_2
                 elif student.state == RETURNING:
                     # In case of returning school fee payment the payment session
@@ -412 +419 @@
                         amount = getattr(certificate, 'school_fee_2', 0.0)
                         # Old returning students might get a discount.
-                        if student.entry_session < 2020 \
+                        if student.entry_session < discount_year \
                             and certificate.custom_float_2:
                             amount -= certificate.custom_float_2