Wider usage of the settings framework (#17)

This commit is contained in:
Raphael Michel
2015-04-01 11:54:56 +02:00
parent 42b4189703
commit cd0e1cb520
9 changed files with 198 additions and 101 deletions

View File

@@ -33,7 +33,7 @@
{% trans "Login" %}</a>
{% endif %}
</div>
<h1>{{ event.name }} <small>{{ event.date_from|date }}{% if event.show_date_to %} {{ event.date_to|date }}{% endif %}</small></h1>
<h1>{{ event.name }} <small>{{ event.date_from|date }}{% if event.settings.show_date_to %} {{ event.date_to|date }}{% endif %}</small></h1>
</div>
{% if messages %}
{% for message in messages %}

View File

@@ -1,4 +1,4 @@
from datetime import timedelta
from datetime import timedelta, datetime
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.db import transaction
@@ -394,9 +394,9 @@ class OrderConfirm(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, Ch
total = sum([c.price for c in cartpos])
payment_fee = self.payment_provider.calculate_fee(total)
total += payment_fee
expires = [dt + timedelta(days=self.request.event.payment_term_days)]
if self.request.event.payment_term_last:
expires.append(self.request.event.payment_term_last)
expires = [dt + timedelta(days=self.request.event.settings.get('payment_term_days', as_type=int))]
if self.request.event.settings.get('payment_term_last'):
expires.append(self.request.event.settings.get('payment_term_last', as_type=datetime))
order = Order.objects.create(
status=Order.STATUS_PENDING,
event=self.request.event,