summaryrefslogtreecommitdiff
path: root/postgresqleu/settings.py
diff options
context:
space:
mode:
authorMagnus Hagander2019-01-19 12:29:44 +0000
committerMagnus Hagander2019-01-19 12:42:05 +0000
commit001b6416ad380f5c1702e4fc12dd941569d4cb94 (patch)
tree2e8728c162c3c8e3889fc90adc988ab9e56a46c4 /postgresqleu/settings.py
parent1715efd3de47362ae2ed8ae8cba47b08c5fcfe74 (diff)
Move membership configuration to the database
Out of settings.py and into the database, and while at it make it possible to select which invoice methods can be used for membership invoices.
Diffstat (limited to 'postgresqleu/settings.py')
-rw-r--r--postgresqleu/settings.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/postgresqleu/settings.py b/postgresqleu/settings.py
index 8f8408f7..b8666f3d 100644
--- a/postgresqleu/settings.py
+++ b/postgresqleu/settings.py
@@ -107,11 +107,11 @@ INSTALLED_APPS = [
'postgresqleu.util',
'postgresqleu.trustlypayment',
'postgresqleu.braintreepayment',
+ 'postgresqleu.membership',
]
# Emails
INVOICE_SENDER_EMAIL = DEFAULT_EMAIL
-MEMBERSHIP_SENDER_EMAIL = DEFAULT_EMAIL
# Currency parameter
@@ -126,15 +126,6 @@ EU_VAT_HOME_COUNTRY = "FR"
# On-line validate EU vat numbers
EU_VAT_VALIDATE = False
-# Membership module
-# -----------------
-# Years of membership per payment
-MEMBERSHIP_LENGTH = 2
-# Cost for membership
-MEMBERSHIP_COST = 10
-# Function called to valide that country is acceptable for membership
-MEMBERSHIP_COUNTRY_VALIDATOR = None
-
# Invoice module
# --------------
INVOICE_PDF_BUILDER = 'postgresqleu.util.misc.baseinvoice.BaseInvoice'
@@ -244,7 +235,6 @@ if ENABLE_ELECTIONS and not ENABLE_MEMBERSHIP:
raise Exception("Elections module requires membership module!")
if ENABLE_MEMBERSHIP:
- INSTALLED_APPS.append('postgresqleu.membership')
TEMPLATES[0]['OPTIONS']['context_processors'].append('postgresqleu.util.context_processors.member_context')
if ENABLE_ELECTIONS: