Ignore:
Timestamp:
23 Nov 2015, 16:16:32 (9 years ago)
Author:
Henrik Bettermann
Message:

Enable accommodation booking payment.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

    r13487 r13491  
    7777                     'match accommodation session.')
    7878        stage = bt.split('_')[2]
    79         if stage not in ('fr', 'fi'):
    80             return _("Only fresh and final year students are allowed to book accommodation.")
    81 
    8279        ####################################################################################
    83         if stage == 'fi':
    84             return _("Accommodation booking for final year students has not yet started.")
     80        if stage in ('fi', 're'):
     81            return _("Accommodation booking for returning and final year students has not yet started.")
    8582        ####################################################################################
    86 
    87 
    8883        if stage != 'fr' and not student['studycourse'].previous_verdict in ('A', 'B'):
    8984            return _("Your are not eligible to book accommodation.")
     
    193188            stage = self.getAccommodationDetails(student)['bt']
    194189            stage = stage.split('_')[2]
    195 
    196 
    197190            #####################################################
    198             if stage == 'fi':
    199                 return _('Payment temporarily disabled.'), None
     191            #if stage == 'fi':
     192            #    return _('Payment temporarily disabled.'), None
    200193            #####################################################
    201 
    202 
    203194            if stage == 'fr':
    204195                amount += 500.0
    205             elif stage == 'fi' and student[
     196            elif stage in ('fi', 're') and student[
    206197                'studycourse'].previous_verdict in ('A', 'B'):
    207198                amount += 300.0
Note: See TracChangeset for help on using the changeset viewer.