Commit 72257f80 authored by ljf's avatar ljf

[enh] Rename MEMBER_DEFAULT_COTISATION

parent 0659ffdf
......@@ -343,7 +343,7 @@ List of available settings in your `settings_local.py` file.
- `REGISTRATION_OPEN` : Allow visitor to join the association by register on COIN
- `ACCOUNT_ACTIVATION_DAYS` : All account with unvalidated email will be deleted after X days
- `MEMBERSHIP_REFERENCE` : Template string to display the label the member should indicates for the bank transfer, default: "ADH-{{ user.pk }}"
- `MEMBER_DEFAULT_COTISATION` : Default membership fee, if you have a more complex membership fees policy, you could overwrite templates
- `DEFAULT_MEMBERSHIP_FEE` : Default membership fee, if you have a more complex membership fees policy, you could overwrite templates
- `PAYMENT_DELAY`: Payment delay in days for issued invoices ( default is 30 days which is the default in french law)
- `MEMBER_CAN_EDIT_PROFILE`: Allow members to edit their profiles
- `HANDLE_BALANCE`: Allows to handle money balances for members (False default)
......
......@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='membershipfee',
name='amount',
field=models.IntegerField(default=settings.MEMBER_DEFAULT_COTISATION, help_text='en \u20ac', verbose_name='montant'),
field=models.IntegerField(default=settings.DEFAULT_MEMBERSHIP_FEE, help_text='en \u20ac', verbose_name='montant'),
),
migrations.AlterField(
model_name='membershipfee',
......
......@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='membershipfee',
name='amount',
field=models.DecimalField(default=settings.MEMBER_DEFAULT_COTISATION, help_text='en \u20ac', verbose_name='montant', max_digits=5, decimal_places=2),
field=models.DecimalField(default=settings.DEFAULT_MEMBERSHIP_FEE, help_text='en \u20ac', verbose_name='montant', max_digits=5, decimal_places=2),
),
]
......@@ -430,7 +430,7 @@ class MembershipFee(models.Model):
member = models.ForeignKey('Member', related_name='membership_fees',
verbose_name='membre')
amount = models.DecimalField(null=False, max_digits=5, decimal_places=2,
default=settings.MEMBER_DEFAULT_COTISATION,
default=settings.DEFAULT_MEMBERSHIP_FEE,
verbose_name='montant', help_text='en €')
start_date = models.DateField(
null=False,
......
......@@ -57,9 +57,9 @@ def invoices(request):
payments = request.user.payments.filter().order_by('-date')
return render_to_response('members/invoices.html',
{'balance' : balance,
'handle_balance' : settings.HANDLE_BALANCE,
'invoices': invoices,
{'balance' : balance,
'handle_balance' : settings.HANDLE_BALANCE,
'invoices': invoices,
'payments': payments},
context_instance=RequestContext(request))
......@@ -74,7 +74,7 @@ def activation_completed(request):
label_template = settings.MEMBERSHIP_REFERENCE.format(user=request.user)
context = {
'bank_transfer_label': label_template,
'dues': settings.MEMBER_DEFAULT_COTISATION
'dues': settings.DEFAULT_MEMBERSHIP_FEE
}
return render(request, 'members/registration/activation_complete.html',
......
......@@ -246,7 +246,7 @@ VPN_CONF_BASE_DN = None
# Membership configuration
# Default cotisation in €, per year
MEMBER_DEFAULT_COTISATION = 20
DEFAULT_MEMBERSHIP_FEE = 20
# Link to a page with information on how to become a member or pay the
# membership fee
......
......@@ -27,7 +27,7 @@ STATIC_ROOT = '{{ www_static_assets_directory }}'
#EMAIL_USE_TLS = True
#EMAIL_HOST = "localhost"
MEMBER_DEFAULT_COTISATION = 16
DEFAULT_MEMBERSHIP_FEE = 16
FEEDS = (
#('isp', 'https://faimaison.net/feeds/all.atom.xml', 3),
......
Markdown is supported
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