Added views to checkout.

You can now go through the entire checkout process although
the delivery method and payment options are simple redirects.
The order doesn't actually get placed either.  That's next on
the to-do list.

examples/defaultshop/selenium/save-delivery-address

@@ -51,56 +51,6 @@
 	<td>//input[@value='Save delivery address']</td>
 	<td></td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>//div[@id='frame-140490395410768']/pre</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>//div[@id='frame-35413392']/pre[1]/img[2]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//input[@type='text']</td>
-	<td>dump()</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>//input[@type='text']</td>
-	<td>dump(addr)</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=buy something</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Tetley's Fleece</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>id_product_id</td>
-	<td>label=Tetley's Fleece (CanBePersonalised: N, Gender: L, Size: 18) - £8.50</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id_quantity</td>
-	<td>10</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>//input[@value='Add to basket']</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Checkout</td>
-	<td></td>
-</tr>
 
 </tbody></table>
 </body>

oscar/address/abstract_models.py

@@ -38,6 +38,14 @@ class AbstractAddress(models.Model):
     class Meta:
         abstract = True
         
+    def active_address_fields(self):
+        """
+        Returns the non-empty components of the adddress, but merging the
+        title, first_name and last_name into a single line.
+        """
+        return filter(lambda x: x, [self.get_salutation(), self.line1, self.line2, self.line3,
+                                    self.line4, self.postcode, self.country])
+        
     def get_salutation(self):
         """
         Returns the salutation

oscar/checkout/forms.py

@@ -6,5 +6,7 @@ order_models = import_module('order.models', ['DeliveryAddress'])
 
 
 class DeliveryAddressForm(ModelForm):
+    
     class Meta:
         model = order_models.DeliveryAddress
+        exclude = ('user',)

oscar/checkout/templates/checkout/preview.html

@@ -7,7 +7,67 @@
 
 {% block content %}
 
-Preview here
+<h3>Order contents</h3>
+<table>
+    <tr>
+        <th>Product</th>
+        <th>Availability</th>
+        <th>Quantity</th>
+        <th>Unit price excl tax</th>
+        <th>Unit price tax</th>
+        <th>Line price excl tax</th>
+        <th>Line price incl tax</th>
+    </tr>
+    {% for line in basket.lines.all %}
+    <tr>
+        <td><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></td>
+        <td>{{ line.product.stockrecord.availability }}</td>
+        <td>{{ line.quantity }}</td>
+        <td>{{ line.unit_price_excl_tax|floatformat:2 }}</td>
+        <td>{{ line.unit_tax|floatformat:2 }}</td>
+        <td>{{ line.line_price_excl_tax|floatformat:2 }}</td>
+        <td>{{ line.line_price_incl_tax|floatformat:2 }}</td>
+    </tr>
+    {% endfor %}
+    <tr>
+        <td colspan="5">Total</td>
+        <td>{{ basket.total_excl_tax|floatformat:2 }}</td>
+        <td>{{ basket.total_incl_tax|floatformat:2 }}</td>
+    </tr>
+</table>
+
+<h3>Delivery</h3>
+<table>
+    <tr>
+        <th>Address</th>
+        <td>
+            {% for field in delivery_addr.active_address_fields %}
+            {{ field }}<br/>
+            {% endfor %}
+        </td>
+    </tr>
+    {% if delivery_addr.phone_number %}
+    <tr>
+        <th>Concact number</th>
+        <td>delivery_addr.phone_number</td>
+    </tr>
+    {% endif %}
+    {% if delivery_addr.notes %}
+    <tr>
+        <th>Delivery notes</th>
+        <td>delivery_addr.notes</td>
+    </tr>
+    {% endif %} 
+</table>
+
+<h3>Order total</h3>
+&pound;{{ order_total }}
+
+<form method="post" action="{% url oscar-checkout-submit %}" />
+    {% csrf_token %}
+    <input type="submit" value="Place order!" />
+</form>
+
 
 {% endblock content %}
 

oscar/checkout/templates/checkout/thank_you.html

@@ -0,0 +1,15 @@
+{% extends "layout.html" %}
+
+{% block header %}
+<h2>Checkout / Thank you</h2>
+{% endblock header %}
+
+
+{% block content %}
+
+<h3>Thank you </h3>
+<p>Your order has been placed</p>
+
+
+{% endblock content %}
+

oscar/checkout/urls.py

@@ -6,5 +6,7 @@ urlpatterns = patterns('oscar.checkout.views',
     url(r'delivery_method/$', 'delivery_method', name='oscar-checkout-delivery-method'),
     url(r'payment/$', 'payment', name='oscar-checkout-payment'),
     url(r'preview/$', 'preview', name='oscar-checkout-preview'),
+    url(r'submit/$', 'submit', name='oscar-checkout-submit'),
+    url(r'thank_you/$', 'thank_you', name='oscar-checkout-thank-you'),
 )
 

oscar/checkout/views.py

@@ -7,8 +7,25 @@ from django.forms import ModelForm
 
 from oscar.services import import_module
 
-# Using dynamic app loading
+basket_factory = import_module('basket.factory', ['get_or_create_open_basket', 'get_open_basket', 
+                                                  'get_or_create_saved_basket', 'get_saved_basket'])
 checkout_forms = import_module('checkout.forms', ['DeliveryAddressForm'])
+order_models = import_module('order.models', ['DeliveryAddress'])
+
+class OrderTotalCalculator(object):
+    
+    def __init__(self, request):
+        # We store a reference to the request as the total may 
+        # depend on the user or the other checkout data in the session.
+        # Further, it is very likely that it will as delivery method
+        # always changes the order total.
+        self.request = request
+    
+    def order_total(self, basket):
+        # Default to returning the total including tax - use
+        # the request.user object if you want to not charge tax
+        # to particular customers.
+        return basket.total_incl_tax
 
 
 def index(request):
@@ -35,12 +52,44 @@ def delivery_address(request):
     
     
 def delivery_method(request):
+    """
+    Delivery methods are domain-specific and so need implementing in a 
+    subclass of this class.
+    """
     return HttpResponseRedirect(reverse('oscar-checkout-payment'))
 
 
 def payment(request):
+    """
+    Payment methods are domain-specific and so need implementing in a s
+    subclass of this class.
+    """
     return HttpResponseRedirect(reverse('oscar-checkout-preview'))
 
 
 def preview(request):
-    return render(request, 'checkout/preview.html', locals())
+    """
+    Show a preview of the order
+    """
+    basket = basket_factory.get_open_basket(request)
+    
+    # Load address data into a blank address model
+    addr_data = request.session.get('delivery_address')
+    delivery_addr = order_models.DeliveryAddress(**addr_data)
+    
+    # Calculate order total
+    calc = OrderTotalCalculator(request)
+    order_total = calc.order_total(basket)
+    
+    return render(request, 'checkout/preview.html', locals())
+
+
+def submit(request):
+    """
+    Do several things then redirect to the thank-you page
+    """
+    return HttpResponseRedirect(reverse('oscar-checkout-thank-you'))
+
+
+def thank_you(request):
+    return render(request, 'checkout/thank_you.html', locals())

oscar/product/views.py

@@ -70,4 +70,5 @@ class ProductListView(ListView):
             context['summary'] = 'All products'
         else:
             context['summary'] = "Products matching '%s'" % q
+            context['search_term'] = q
         return context

oscar/templates/layout.html

@@ -4,6 +4,11 @@
     <div id="container">
         <div id="header">
             <h1>Oscar // Flexible e-commerce for Django</h1>
+            <form method="get" action="{% url oscar-products %}">
+                <label id="search_input">Search all products:</label>
+                <input type="text" name="q" id="search_input" value="{{ search_term }}"/>
+                <input type="submit" value="Go!" /> 
+            </form>
             {% block header %}
             {% endblock %}
         </div>