Added estimated shipping charge to basket summary page.

Looks up all shipping methods for a basket and picks the first one to
form the estimate.

oscar/apps/basket/tests.py

@@ -1,4 +1,5 @@
 from decimal import Decimal as D
+import httplib
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
@@ -35,12 +36,6 @@ class BasketModelTest(TestCase):
 
 class BasketViewsTest(TestCase):
 
-    def test_empty_basket_view(self):
-        url = reverse('basket:summary')
-        response = self.client.get(url)
-        self.assertEquals(200, response.status_code)
-        self.assertEquals(0, response.context['basket'].num_lines)
-
     def test_anonymous_add_to_basket_creates_cookie(self):
         dummy_product = create_product(price=D('10.00'))
         url = reverse('basket:add')
@@ -51,6 +46,33 @@ class BasketViewsTest(TestCase):
         self.assertTrue('oscar_open_basket' in response.cookies)
 
 
+class BasketSummaryViewTests(TestCase):
+
+    def setUp(self):
+        url = reverse('basket:summary')
+        self.response = self.client.get(url)
+
+    def test_shipping_method_in_context(self):
+        self.assertTrue('shipping_method' in self.response.context)
+
+    def test_shipping_charge_in_context(self):
+        self.assertTrue('shipping_charge_incl_tax' in self.response.context)
+
+    def test_order_total_in_context(self):
+        self.assertTrue('order_total_incl_tax' in self.response.context)
+
+    def test_view_does_not_error(self):
+        self.assertEquals(httplib.OK, self.response.status_code)
+
+    def test_basket_in_context(self):
+        self.assertTrue('basket' in self.response.context)
+
+    def test_basket_is_empty(self):
+        basket = self.response.context['basket']
+        self.assertEquals(0, basket.num_lines)
+
+
+
 class BasketThresholdTest(TestCase):
 
     def setUp(self):

oscar/apps/basket/views.py

@@ -16,6 +16,7 @@ BasketLineForm, AddToBasketForm, BasketVoucherForm, \
             'basket.forms', ('BasketLineForm', 'AddToBasketForm',
                              'BasketVoucherForm', 'SavedLineForm',
                              'ProductSelectionForm'))
+Repository = get_class('shipping.repository', ('Repository'))
 
 
 class BasketView(ModelFormSetView):
@@ -29,9 +30,16 @@ class BasketView(ModelFormSetView):
     def get_queryset(self):
         return self.request.basket.lines.all()
 
+    def get_default_shipping_method(self, basket):
+        return Repository().get_default_shipping_method(self.request.user, self.request.basket)
+
     def get_context_data(self, **kwargs):
         context = super(BasketView, self).get_context_data(**kwargs)
         context['voucher_form'] = BasketVoucherForm()
+        method = self.get_default_shipping_method(self.request.basket)
+        context['shipping_method'] = method
+        context['shipping_charge_incl_tax'] = method.basket_charge_incl_tax()
+        context['order_total_incl_tax'] = self.request.basket.total_incl_tax + method.basket_charge_incl_tax()
 
         if self.request.user.is_authenticated():
             try:

oscar/apps/shipping/repository.py

@@ -19,6 +19,9 @@ class Repository(object):
         methods = [Free()]
         return self.add_basket_to_methods(basket, methods)
 
+    def get_default_shipping_method(self, user, basket, shipping_addr=None, **kwargs):
+        return self.get_shipping_methods(user, basket, shipping_addr, **kwargs)[0]
+
     def add_basket_to_methods(self, basket, methods):
         for method in methods:
             method.set_basket(basket)

oscar/templates/basket/basket.html

@@ -49,7 +49,7 @@ Basket | {{ block.super }}
             <th>Availability</th>
             <th>Quantity</th>
             <th>Unit price</th>
-            <th>Line price</th>
+            <th>Subtotal</th>
 			{% if request.user.is_authenticated %}
             <th>Save for later&hellip;</th>
 			{% endif %}
@@ -82,10 +82,18 @@ Basket | {{ block.super }}
         </tr>
         {% endfor %}
         <tr>
-            <th colspan="4">Subtotal</th>
-            <td>{{ request.basket.total_excl_tax|currency }}</td>
+            <th colspan="5">Basket total</th>
             <td>{{ basket.total_incl_tax|currency }}</td>
 			<td></td>
+        </tr>
+        <tr>
+			<th colspan="5">Estimated shipping ({{ shipping_method.name }})</th>
+            <td>{{ shipping_charge_incl_tax|currency }}</td>
+			<td></td>
+        </tr>
+        <tr>
+            <th colspan="5">Order total</th>
+            <td>{{ order_total_incl_tax|currency }}</td>
 			<td></td>
         </tr>
         </tbody>
@@ -155,7 +163,7 @@ Basket | {{ block.super }}
 
     <div class="form-actions">
         Made changes? <input type="submit" value="Update basket" class="btn"/>
-        <a href="{% url checkout:index %}" class="pull-right btn btn-primary">Proceed to Checkout</a>
+        <a href="{% url checkout:index %}" class="pull-right btn btn-large btn-primary">Proceed to checkout</a>
     </div>
 
 </form>

run_tests.py

@@ -12,8 +12,8 @@ from django.test.simple import DjangoTestSuiteRunner
 logging.disable(logging.CRITICAL)
 
 
-def run_tests(*test_args):
-    test_runner = DjangoTestSuiteRunner(verbosity=1)
+def run_tests(verbosity, *test_args):
+    test_runner = DjangoTestSuiteRunner(verbosity=verbosity)
     if not test_args:
         test_args = ['oscar']
     num_failures = test_runner.run_tests(test_args)
@@ -24,16 +24,18 @@ if __name__ == '__main__':
     parser = OptionParser()
     parser.add_option('-c', '--coverage', dest='use_coverage', default=False,
                       action='store_true', help="Generate coverage report")
+    parser.add_option('-v', '--verbosity', dest='verbosity', default=1,
+                      type='int', help="Verbosity of output")
     (options, args) = parser.parse_args()
 
     if options.use_coverage:
         print 'Running tests with coverage'
         c = coverage(source=['oscar'])
         c.start()
-        run_tests(*args)
+        run_tests(options.verbosity, *args)
         c.stop()
         print 'Generate HTML reports'
         c.html_report()
     else:
         print 'Running tests'
-        run_tests(*args)
+        run_tests(options.verbosity, *args)