Commit fef4734c authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch...

Merge branch '739-change-dropdown-menu-in-front-end-for-user-registration-enrollment-with-amount' into 'master'

Change dropdown menu in front-end for user registration/enrollment with amount

Closes #739

See merge request !1061
parents 444c6f82 e27ada03
# Generated by Django 2.0.8 on 2018-11-14 20:04
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('registrations', '0012_auto_20181024_2004_squashed_0013_auto_20181031_1911'),
]
operations = [
migrations.AlterField(
model_name='entry',
name='length',
field=models.CharField(choices=[('year', 'One year -- €7.50'), ('study', 'Until graduation -- €30.00')], max_length=20, verbose_name='membership length'),
),
]
......@@ -6,6 +6,7 @@ from django.contrib.auth import get_user_model
from django.core import validators
from django.core.exceptions import ValidationError
from django.db import models
from django.template.defaultfilters import floatformat
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
......@@ -45,8 +46,10 @@ class Entry(models.Model):
MEMBERSHIP_STUDY = 'study'
MEMBERSHIP_LENGTHS = (
(MEMBERSHIP_YEAR, _('One year')),
(MEMBERSHIP_STUDY, _('Until graduation')),
(MEMBERSHIP_YEAR, _('One year') +
f" -- €{floatformat(settings.MEMBERSHIP_PRICES['year'], 2)}"),
(MEMBERSHIP_STUDY, _('Until graduation') +
f" -- €{floatformat(settings.MEMBERSHIP_PRICES['study'], 2)}"),
)
length = models.CharField(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment