diff --git a/registrasion/forms.py b/registrasion/forms.py index 2b5ef97bb9388f134cdff5bc2c142a44528dfafe..d6e7878eb7be957ddf064141151711827a6caf4d 100644 --- a/registrasion/forms.py +++ b/registrasion/forms.py @@ -347,16 +347,3 @@ class VoucherForm(forms.Form): help_text="If you have a voucher code, enter it here", required=False, ) - - -# Staff-facing forms. - -class ProductAndCategoryForm(forms.Form): - product = forms.ModelMultipleChoiceField( - queryset=inventory.Product.objects.all(), - required=False, - ) - category = forms.ModelMultipleChoiceField( - queryset=inventory.Category.objects.all(), - required=False, - ) diff --git a/registrasion/reporting/forms.py b/registrasion/reporting/forms.py new file mode 100644 index 0000000000000000000000000000000000000000..b741e51b89279d7ac9c55a28ed4ae89024f96d19 --- /dev/null +++ b/registrasion/reporting/forms.py @@ -0,0 +1,15 @@ +from registrasion.models import inventory + +from django import forms + +# Staff-facing forms. + +class ProductAndCategoryForm(forms.Form): + product = forms.ModelMultipleChoiceField( + queryset=inventory.Product.objects.all(), + required=False, + ) + category = forms.ModelMultipleChoiceField( + queryset=inventory.Category.objects.all(), + required=False, + ) diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py index d44de51487347674120b9cc14951c1b4269e8a3f..d6b6261c157a1d16d7244fe0ccf6b103517fa976 100644 --- a/registrasion/reporting/views.py +++ b/registrasion/reporting/views.py @@ -1,3 +1,5 @@ +import forms + from django.contrib.auth.decorators import user_passes_test from django.core.urlresolvers import reverse from django.db import models @@ -6,7 +8,6 @@ from django.db.models import Sum from django.db.models import Case, When, Value from django.shortcuts import render -from registrasion import forms from registrasion.models import commerce from registrasion import views