diff --git a/apps/kassa/views.py b/apps/kassa/views.py index 973eb49..1c58c9c 100644 --- a/apps/kassa/views.py +++ b/apps/kassa/views.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from itertools import groupby import json +from datetime import date from apps.kassa.models import KassaEvent from django.conf import settings @@ -147,7 +148,8 @@ def register_card_and_membership(request): def stats_card_sales(request): sale_events = [KassaEvent.ADD_OR_RENEW, KassaEvent.NEW_CARD_MEMBERSHIP] # TODO filter by start HTTP param - events = KassaEvent.objects.filter(event__in=sale_events).values_list('created') + start_date = date(year=2015, month=8, day=1) + events = KassaEvent.objects.filter(event__in=sale_events, created__gt=start_date).values_list('created') grouped = [] for key, values in groupby(events, key=lambda row: row[0].date()): grouped.append({'date': key.isoformat(), 'sales': len(list(values))}) diff --git a/kassasite/settings.py b/kassasite/settings.py index b444709..82bb6c3 100644 --- a/kassasite/settings.py +++ b/kassasite/settings.py @@ -37,7 +37,8 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'bootstrapform', - 'django_extensions' + 'django_extensions', + 'corsheaders', ) @@ -47,6 +48,7 @@ INSTALLED_APPS += LOCAL_APPS MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', @@ -122,6 +124,8 @@ INSIDE_API_URL = 'https://inside.studentersamfundet.no/api/' TEKSTMELDING_API_KEY = '' TEKSTMELDING_API_URL = 'https://tekstmelding.neuf.no/' +CORS_ORIGIN_ALLOW_ALL = True + # Local settings try: from local_settings import * diff --git a/requirements.txt b/requirements.txt index 3a339a1..664b054 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ Django>=1.8,<1.9 django-auth-ldap==1.2.6 django-bootstrap-form==3.2 +django-cors-headers==1.1.0 django-extensions==1.5.5 django-phonenumber-field==0.7.2 gunicorn==17.5