Made payment method form field into ChoiceField for searching orders.

oscar/apps/dashboard/orders/forms.py

@@ -4,6 +4,7 @@ from django.db.models.loading import get_model
 Order = get_model('order', 'Order')
 OrderNote = get_model('order', 'OrderNote')
 ShippingAddress = get_model('order', 'ShippingAddress')
+SourceType = get_model('payment', 'SourceType')
 
 
 class OrderSearchForm(forms.Form):
@@ -20,7 +21,10 @@ class OrderSearchForm(forms.Form):
     date_to = forms.DateField(required=False, label="Date to", input_formats=date_formats)
 
     voucher = forms.CharField(required=False, label="Voucher code")
-    payment_method = forms.CharField(label="Payment method", required=False)
+
+    method_choices = (('', '---------'),) + tuple([(src.code, src.name) for src in SourceType.objects.all()])
+    payment_method = forms.ChoiceField(label="Payment method", required=False,
+                                       choices=method_choices)
 
     format_choices = (('html', 'HTML'),
                       ('csv', 'CSV'),)

oscar/apps/dashboard/orders/tests.py

@@ -1,17 +1,15 @@
 import httplib
-from django_dynamic_fixture import new, get, F
 
 from django.test import TestCase
-from django.test.client import Client
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.template import Template, Context
+from django_dynamic_fixture import get
+
 
 from oscar.test import ClientTestCase
 from oscar.test.helpers import create_order
 from oscar.apps.order.models import Order, OrderNote
-from oscar.apps.dashboard.orders.forms import OrderSearchForm
-from oscar.templatetags.dashboard_tags import get_num_user_orders
 
 
 class OrderSummaryTests(ClientTestCase):
@@ -29,6 +27,8 @@ class OrderListTests(ClientTestCase):
     is_staff = True
 
     def test_searching_for_valid_order_number_redirects_to_order_page(self):
+        # Importing here as the import makes DB queries
+        from oscar.apps.dashboard.orders.forms import OrderSearchForm
         order = create_order()
         fields = OrderSearchForm.base_fields.keys()
         pairs = dict(zip(fields, ['']*len(fields)))
@@ -65,7 +65,7 @@ class OrderDetailTests(ClientTestCase):
     def test_order_status_change_creates_system_note(self):
         params = {'order_action': 'change_order_status',
                   'new_status': 'B'}
-        response = self.client.post(self.url, params)
+        self.client.post(self.url, params)
         notes = self.order.notes.all()
         self.assertEqual(1, len(notes))
         self.assertEqual(OrderNote.SYSTEM, notes[0].note_type)

oscar/apps/dashboard/orders/views.py

@@ -1,4 +1,5 @@
 import csv
+import datetime
 from decimal import Decimal as D, InvalidOperation
 
 from django.contrib import messages
@@ -11,7 +12,6 @@ from django.shortcuts import get_object_or_404
 from django.template.defaultfilters import date as format_date
 from django.utils.datastructures import SortedDict
 from django.views.generic import ListView, DetailView, UpdateView, FormView
-from django.contrib import messages
 
 from oscar.core.loading import get_class
 from oscar.apps.dashboard.orders import forms
@@ -75,7 +75,7 @@ class OrderListView(ListView, BulkEditMixin):
     current_view = 'dashboard:order-list'
 
     def get(self, request, *args, **kwargs):
-        if 'order_number' in request.GET:
+        if 'order_number' in request.GET and request.GET.get('response_format', None) == 'html':
             try:
                 order = Order.objects.get(number=request.GET['order_number'])
             except Order.DoesNotExist:
@@ -384,7 +384,7 @@ class OrderDetailView(DetailView):
         except InvalidOperation:
             messages.error(request, "Please choose a valid amount")
             return self.reload_page_response()
-        return self._create_payment_event(request, order)
+        return self._create_payment_event(request, order, amount)
 
     def _create_payment_event(self, request, order, amount, lines=None,
                               quantities=None):

run_tests.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import sys
-import os
 import logging
 from optparse import OptionParser
 from coverage import coverage

tests/config.py

@@ -14,6 +14,7 @@ if not settings.configured:
             DATABASES={
                 'default': {
                     'ENGINE': 'django.db.backends.sqlite3',
+                    'NAME': ':memory:',
                     }
                 },
             INSTALLED_APPS=[