Reworked the order history search view and templates

oscar/apps/customer/app.py

@@ -31,15 +31,23 @@ class CustomerApplication(Application):
             url(r'^$', login_required(self.summary_view.as_view()), name='summary'),
             url(r'^login/$', self.login_view.as_view(), name='login'),
             url(r'^orders/$', login_required(self.order_history_view.as_view()), name='order-list'),
-            url(r'^order-status/(?P<order_number>[\w-]*)/(?P<hash>\w+)/$', self.anon_order_detail_view.as_view(), name='anon-order'),
-            url(r'^orders/(?P<order_number>[\w-]*)/$', login_required(self.order_detail_view.as_view()), name='order'),
-            url(r'^orders/(?P<order_number>[\w-]*)/(?P<line_id>\d+)$', login_required(self.order_line_view.as_view()), name='order-line'),
-            url(r'^addresses/$', login_required(self.address_list_view.as_view()), name='address-list'),
-            url(r'^addresses/add/$', login_required(self.address_create_view.as_view()), name='address-create'),
-            url(r'^addresses/(?P<pk>\d+)/$', login_required(self.address_update_view.as_view()), name='address-detail'),
-            url(r'^addresses/(?P<pk>\d+)/delete/$', login_required(self.address_delete_view.as_view()), name='address-delete'),
+            url(r'^order-status/(?P<order_number>[\w-]*)/(?P<hash>\w+)/$', 
+                self.anon_order_detail_view.as_view(), name='anon-order'),
+            url(r'^orders/(?P<order_number>[\w-]*)/$', login_required(self.order_detail_view.as_view()),
+                name='order'),
+            url(r'^orders/(?P<order_number>[\w-]*)/(?P<line_id>\d+)$', 
+                login_required(self.order_line_view.as_view()), name='order-line'),
+            url(r'^addresses/$', login_required(self.address_list_view.as_view()),
+                name='address-list'),
+            url(r'^addresses/add/$', login_required(self.address_create_view.as_view()),
+                name='address-create'),
+            url(r'^addresses/(?P<pk>\d+)/$', login_required(self.address_update_view.as_view()),
+                name='address-detail'),
+            url(r'^addresses/(?P<pk>\d+)/delete/$', login_required(self.address_delete_view.as_view()),
+                name='address-delete'),
             url(r'^emails/$', login_required(self.email_list_view.as_view()), name='email-list'),
-            url(r'^emails/(?P<email_id>\d+)/$', login_required(self.email_detail_view.as_view()), name='email-detail'),
+            url(r'^emails/(?P<email_id>\d+)/$', login_required(self.email_detail_view.as_view()),
+                name='email-detail'),
             )
         return self.post_process_urls(urlpatterns)
 

oscar/apps/customer/forms.py

@@ -6,6 +6,7 @@ from django.utils.translation import ugettext_lazy as _
 from django import forms
 from django.contrib.auth.models import User
 
+
 def generate_username():
     uname = ''.join([random.choice(string.letters + string.digits + '_') for i in range(30)])
 
@@ -65,12 +66,22 @@ class SearchByDateRangeForm(forms.Form):
     date_to = forms.DateField(required=False, label="To")
 
     def clean(self):
-
         if self.is_valid() and not self.cleaned_data['date_from'] and not self.cleaned_data['date_to']:
             raise forms.ValidationError(_("At least one date field is required."))
-
         return super(SearchByDateRangeForm, self).clean()
 
+    def description(self):
+        if not self.is_bound:
+            return 'All orders'
+        date_from = self.cleaned_data['date_from']
+        date_to = self.cleaned_data['date_to']
+        if date_from and date_to:
+            return 'Orders placed between %s and %s' % (date_from, date_to)
+        elif date_from and not date_to:
+            return 'Orders placed since %s' % date_from
+        elif not date_from and date_to:
+            return 'Orders placed until %s' % date_to
+
     def get_filters(self):
         date_from = self.cleaned_data['date_from']
         date_to = self.cleaned_data['date_to']

oscar/apps/customer/views.py

@@ -145,7 +145,9 @@ class EmailDetailView(DetailView):
 
 
 class OrderHistoryView(ListView):
-    """Customer order history"""
+    """
+    Customer order history
+    """
     context_object_name = "orders"
     template_name = 'customer/order-history.html'
     paginate_by = 20
@@ -153,20 +155,24 @@ class OrderHistoryView(ListView):
     form_class = SearchByDateRangeForm
 
     def get(self, request, *args, **kwargs):
-        self.filter_form = SearchByDateRangeForm(self.request.GET)
+        if 'date_from' in request.GET:
+            self.form = SearchByDateRangeForm(self.request.GET)
+            if not self.form.is_valid():
+                ctx = self.get_context_data()
+                return self.render_to_response(ctx)
+        else:
+            self.form = SearchByDateRangeForm()
         return super(OrderHistoryView, self).get(request, *args, **kwargs)
 
     def get_queryset(self):
-        """Return a customer's orders"""
-        return self.model._default_manager.filter(user=self.request.user)
+        qs = self.model._default_manager.filter(user=self.request.user)
+        if self.form.is_bound:
+            qs = qs.filter(**self.form.get_filters())
+        return qs
 
     def get_context_data(self, *args, **kwargs):
         ctx = super(OrderHistoryView, self).get_context_data(*args, **kwargs)
-        ctx['search_date_form'] = self.filter_form
-        if self.filter_form.is_valid():
-            # Return filtered data from date_from to date_to
-            ctx['orders'] = self.model._default_manager.filter(user=self.request.user, **self.filter_form.get_filters())
-            return ctx
+        ctx['form'] = self.form
         return ctx
 
 

oscar/templates/customer/order-history.html

@@ -14,21 +14,15 @@ Order history | {{ block.super }}
 
 {% block content %}
 
-<div class="sub-header">
-    <h3>Order history</h3>
-</div>
-
-<h2>Search in orders</h2>
+<h3>Search in orders</h3>
 <form action="." method="get">
-    <table>
-        {{ search_date_form.as_table }}
-        <tr>
-            <td>
-                <button type="submit" class="btn btn-primary">Filter results</button>
-            </td>
-    </table>
+	{% include "partials/form_fields.html" with form=form %}
+	<button type="submit" class="btn btn-primary">Filter results</button>
+	<a href="{% url customer:order-list %}" class="btn">Reset</a>
 </form>
 
+<h3>{{ form.description }}</h3>
+{% if orders %}
 <table class="table table-striped table-bordered">
     <tr>
         <th>Order number</th>
@@ -42,12 +36,14 @@ Order history | {{ block.super }}
         <td>{{ order.total_incl_tax|currency }}</td>
         <td>{{ order.date_placed }}</td>
         <td>
-            <a href="{% url customer:order order.number %}">View order details</a>
+            <a class="btn btn-info" href="{% url customer:order order.number %}">View</a>
         </td>
     </tr>
     {% endfor %}
-
 </table>
+{% else %}
+<p>No orders found</p>
+{% endif %}
 
 {% if page_obj %}
 {% include "catalogue/partials/pagination.html" %}