Added order detail page with line batch actions

oscar/apps/dashboard/app.py

@@ -10,12 +10,14 @@ class DashboardApplication(Application):
     name = 'dashboard'
     
     index_view = views.IndexView
-    orders_view = views.OrderListView
+    order_list_view = views.OrderListView
+    order_detail_view = views.OrderDetailView
 
     def get_urls(self):
         urlpatterns = patterns('',
             url(r'^$', self.index_view.as_view(), name='index'),
-            url(r'^orders/$', self.orders_view.as_view(), name='orders'),
+            url(r'^orders/$', self.order_list_view.as_view(), name='orders'),
+            url(r'^orders/(?P<number>[-\w]+)/$', self.order_detail_view.as_view(), name='order'),
         )
         return self.post_process_urls(urlpatterns)
 

oscar/apps/dashboard/tests.py

@@ -5,6 +5,9 @@ from django.test.client import Client
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 
+from oscar.test.helpers import create_order
+from oscar.apps.dashboard.forms import OrderSearchForm
+
 
 class ViewTests(TestCase):
 
@@ -42,6 +45,21 @@ class DashboardViewTests(StaffViewTests):
 class OrderListTests(StaffViewTests):
 
     def test_searching_for_valid_order_number_redirects_to_order_page(self):
-        pass
-
+        order = create_order()
+        fields = OrderSearchForm.base_fields.keys()
+        pairs = dict(zip(fields, ['']*len(fields)))
+        pairs['order_number'] = order.number
+        pairs['response_format'] = 'html'
+        url = '%s?%s' % (reverse('dashboard:orders'), '&'.join(['%s=%s' % (k,v) for k,v in pairs.items()]))
+        response = self.client.get(url)
+        self.assertEqual(httplib.FOUND, response.status_code)
+
+
+class OrderDetailTests(StaffViewTests):
+
+    def test_order_detail_page_contains_order(self):
+        order = create_order()
+        url = reverse('dashboard:order', kwargs={'number': order.number})
+        response = self.client.get(url)
+        self.assertTrue('order' in response.context)
 

oscar/apps/dashboard/views.py

@@ -1,16 +1,18 @@
 import csv
 
-from django.views.generic import TemplateView, ListView
 from django.contrib import messages
-from django.utils.datastructures import SortedDict
-from django.template.defaultfilters import date as format_date
+from django.core.urlresolvers import reverse
 from django.db.models.loading import get_model
 from django.http import HttpResponse, HttpResponseRedirect
-from django.core.urlresolvers import reverse
+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 TemplateView, ListView, DetailView
 
 from oscar.apps.dashboard.forms import OrderSearchForm
 
 Order = get_model('order', 'Order')
+Line = get_model('order', 'Line')
 
 
 class IndexView(TemplateView):
@@ -27,6 +29,16 @@ class OrderListView(ListView):
     description = ''
     actions = ('download_selected_orders',)
 
+    def get(self, request, *args, **kwargs):
+        if 'order_number' in request.GET:
+            try:
+                order = Order.objects.get(number=request.GET['order_number'])
+            except Order.DoesNotExist:
+                pass
+            else:
+                return HttpResponseRedirect(reverse('dashboard:order', kwargs={'number': order.number}))
+        return super(OrderListView, self).get(request, *args, **kwargs)
+
     def get_queryset(self):
         """
         Build the queryset for this list and also update the title that 
@@ -164,3 +176,52 @@ class OrderListView(ListView):
             encoded_values = [unicode(value).encode('utf8') for value in row.values()]
             writer.writerow(encoded_values)
         return response
+
+
+class OrderDetailView(DetailView):
+    model = Order
+    context_object_name = 'order'
+    template_name = 'dashboard/orders/order_detail.html'
+    order_actions = ()
+    line_actions = ('change_line_statuses',)
+
+    def get_object(self):
+        return get_object_or_404(self.model, number=self.kwargs['number'])
+
+    def post(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        order = self.object
+
+        # Look for line-level action
+        line_action = request.POST.get('line-action', '').lower()
+        if line_action:
+            if line_action not in self.line_actions:
+                messages.error(self.request, "Invalid action")
+                return self.reload_page_response()
+            else:
+                line_ids = request.POST.getlist('selected_line')
+                lines = order.lines.filter(id__in=line_ids)
+                if lines.count() == 0:
+                    messages.error(self.request, "You must select some lines to act on")
+                    return self.reload_page_response()
+                return getattr(self, line_action)(request, order, lines)
+
+        messages.error(request, "No valid action submitted")
+        return self.reload_page_response()
+
+    def reload_page_response(self):
+        return HttpResponseRedirect(reverse('dashboard:order', kwargs={'number': self.object.number}))
+
+    def change_line_statuses(self, request, order, lines):
+        new_status = request.POST['new_status'].strip()
+        if not new_status:
+            messages.error(request, "The new status '%s' is not valid" % new_status)
+            return self.reload_page_response()
+        for line in lines:
+            messages.info(request, "Line %d changed from '%s' to '%s'" % (
+                line.id, line.status, new_status))
+            line.status = new_status
+            line.save()
+        return self.reload_page_response()
+
+

oscar/apps/order/abstract_models.py

@@ -103,7 +103,7 @@ class AbstractOrder(models.Model):
     
     @property
     def num_items(self):
-        u"""
+        """
         Returns the number of items in this order.
         """
         num_items = 0

oscar/templates/dashboard/index.html

@@ -3,5 +3,9 @@
 {% block content %}
 
 <h1>Dashboard</h1>
+<p>What do you want to do?</p>
+<ul>
+    <li><a href="{% url dashboard:orders %}">Manage orders</a></li>
+</ul>
 
 {% endblock %}

oscar/templates/dashboard/orders/order_detail.html

@@ -0,0 +1,173 @@
+{% extends "layout.html" %}
+{% load currency_filters %}
+
+{% block title %}
+Order {{ order.number }}
+{% endblock %}
+
+{% block header %}
+    <h2>Order {{ order.number }}</h2>
+{% endblock header %}
+
+{% block content %}
+
+<h2>Order information</h2>
+<table>
+    <tr>
+        <th>Date of purchase</th>
+        <th>Time of purchase</th>
+        <th>Status</th>
+    </tr>
+    <tr>
+        <td>{{ order.date_placed|date:"d/m/y" }}</td>
+        <td>{{ order.date_placed|date:"H:s" }}</td>
+        <td>{{ order.status|default:"N/A" }}</td>
+    </tr>
+</table>
+
+<h2>Customer</h2>
+{% if order.user %}
+<table>
+    <tr>
+        <th>Username</th>
+        <td>{{ order.user.username }}</td>
+    </tr>
+    <tr>
+        <th>Name</th>
+        <td>{{ order.user.get_full_name|default:"-" }}</td>
+    </tr>
+    <tr>
+        <th>Email address</th>
+        <td>{{ order.user.email|default:"-" }}</td>
+    </tr>
+</table>
+{% else %}
+<p>Customer checked out anonymously.</p>
+{% endif %}
+
+<h2>Payment</h2>
+{% with sources=order.sources.all %}
+{% if sources %}
+<table>     
+    <thead>  
+        <tr>
+            <th>Source</th>
+            <th>Allocation</th>
+            <th>Amount debited</th>
+            <th>Amount refunded</th>
+        </tr>  
+    </thead>	
+    <tbody> 
+        {% for source in sources %}
+        <tr>
+            <td>{{ source.source_type }}</td>
+            <td>{{ source.amount_allocated|currency }}</td>
+            <td>{{ source.amount_debited|currency }}</td>
+            <td>{{ source.amount_refunded|currency }}</td>
+        </tr>
+        {% endfor %}
+    </tbody>	
+</table>
+{% else %}
+<p>No payment sources</p>
+{% endif %}
+{% endwith %}
+
+{% if order.billing_address %}
+<h3>Billing address</h3>
+<p>
+{% for field in order.billing_address.active_address_fields %}
+{{ field }}<br/>
+{% endfor %}
+</p>
+{% endif %}
+
+{% if order.shipping_address %}
+<h2>Shipping</h2>
+<p>
+{% for field in order.shipping_address.active_address_fields %}
+{{ field }}<br/>
+{% endfor %}
+</p>
+{% endif %}
+
+<h2>Discounts</h2>
+{% with discounts=order.discounts.all %}
+{% if discounts %}
+<table>
+    <tr>
+        <th>Voucher code</th>
+        <th>Offer name</th>
+        <th>Amount</th>
+    </tr>
+    {% for discount in discounts %}
+    <tr>
+        <td>{{ discount.voucher_code }}</td>
+        <td>{{ discount.offer.name }}</td>
+        <td>{{ discount.amount|currency}}</td>
+    </tr>
+    {% endfor %}
+{% else %}
+<p>No discounts were applied in this order.</p>
+{% endif %}
+{% endwith %}
+
+<h2>Items ordered</h2>
+<form action="." method="post">
+{% csrf_token %}
+<table>
+    <tr>
+        <th>Select</th>
+        <th>Product</th>
+        <th>Status</th>
+        <th>Supplier</th>
+        <th>Supplier SKU</th>
+        <th>Est. delivery date</th>
+        <th>Price (after discounts)</th>
+        <th>Price (before discounts)</th>
+        <th>Actions</th>
+    </tr>
+    {% for line in order.lines.all %}
+    <tr>
+        <td><input type="checkbox" name="selected_line" value="{{ line.id }}" /></td>
+        <td>{{ line.title }}</td>
+        <td>{{ line.status|default:"-" }}</td>
+        <td>{{ line.partner_name }}</td>
+        <td>{{ line.partner_sku }}</td>
+        <td>{{ line.est_dispatch_date }}</td>
+        <td>{{ line.line_price_before_discounts_incl_tax|currency }}</td>
+        <td>{{ line.line_price_incl_tax|currency }}</td>
+        <td>
+            <a href="">Edit</a>
+        </td>
+    </tr>
+    {% endfor %}
+    <tr>
+        <td colspan="6"></td>
+        <td>Discount</td>
+        <td>{{ order.total_discount_incl_tax|currency }}</td>
+    </tr>
+    <tr>
+        <td colspan="6"></td>
+        <td>Shipping charge</td>
+        <td>{{ order.shipping_incl_tax|currency }}</td>
+    </tr>
+    <tr>
+        <td colspan="6"></td>
+        <td>Total</td>
+        <td>{{ order.total_incl_tax|currency }}</td>
+    </tr>
+</table>
+
+<p>With selected lines:</p>
+<ul>
+    <li><label><input type="radio" name="line-action" value="change_line_statuses" /> Change status to</label>
+    <input type="text" name="new_status" /> 
+    </li>
+</ul>
+<input type="submit" value="Go!" />
+</form>
+
+<h2>Notes</h2>
+
+{% endblock content %}

oscar/templates/dashboard/orders/order_list.html

@@ -49,7 +49,7 @@
         <td>{{ order.shipping_address }}</td>
         <td>{{ order.billing_address }}</td>
         <td>
-            <a href="">View</a>
+            <a href="{% url dashboard:order order.number %}">View</a>
         </td>
     </tr>
     {% endfor %}