Updated the checkout to handle different payment methods

examples/datacash/import.py

@@ -35,7 +35,7 @@ django_cursor.execute("TRUNCATE TABLE product_itemattributevalue")
 django_cursor.execute("TRUNCATE TABLE stock_partner")
 django_cursor.execute("TRUNCATE TABLE stock_stockrecord")
 
-cursor.execute("SELECT * FROM Brd_ProductsCanonical WHERE Partner = 'Prolog' LIMIT 120")
+cursor.execute("SELECT * FROM Brd_ProductsCanonical WHERE Partner = 'Prolog' LIMIT 20")
 for row in cursor.fetchall():
     print "Creating canonical product %s" % (row['ProductCode'],)
     pclass,_ = ItemClass.objects.get_or_create(name=row['MediaType'])

examples/datacash/settings.py

@@ -81,10 +81,14 @@ INTERNAL_IPS = ('127.0.0.1',)
 
 ROOT_URLCONF = 'urls'
 
+import os
+PROJECT_DIR = os.path.dirname(__file__)
+
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+    os.path.join(PROJECT_DIR, "templates"),
 )
 
 INSTALLED_APPS = (
@@ -115,6 +119,7 @@ INSTALLED_APPS = (
 
 LOGIN_REDIRECT_URL = '/shop/accounts/profile/'
 APPEND_SLASH = True
+DEFAULT_CURRENCY = 'GBP'
 
 # Local overrides
 try:

examples/datacash/shop/checkout/views.py

@@ -1,7 +1,9 @@
 from django.shortcuts import render
 
 from oscar.checkout.views import (ShippingMethodView as CoreShippingMethodView, 
-                                  PaymentView as CorePaymentView, prev_steps_must_be_complete)
+                                  PaymentMethodView as CorePaymentMethodView, 
+                                  PaymentDetailsView as CorePaymentDetailsView,
+                                  prev_steps_must_be_complete)
 from oscar.payment.forms import BankcardForm
 from oscar.services import import_module
 
@@ -10,30 +12,35 @@ shipping_models = import_module('shipping.models', ['Method'])
     
 class ShippingMethodView(CoreShippingMethodView):
     
-    def get_shipping_methods_for_basket(self, basket):
+    def get_available_shipping_methods(self):
         codes = ['royal-mail-first-class']
         # Only allow parcel force if dropship products are include
-        for line in basket.lines.all():
+        for line in self.basket.lines.all():
             if line.product.stockrecord.partner_id == 2:
                 codes.append('parcel-force')
         return shipping_models.Method.objects.filter(code__in=codes)
 
     
-class PaymentView(CorePaymentView):
+class PaymentMethodView(CorePaymentMethodView):
+    template_file = 'checkout/payment_method.html'
+    
+    def handle_GET(self):
+        return render(self.request, self.template_file, self.context)
+    
+    def handle_POST(self):
+        method = self.request.POST['method_code']
+        self.co_data.pay_by(method)
+        return self.get_success_response()
     
-    @prev_steps_must_be_complete
-    def __call__(self, request):
-        
-        assert False
-        
-        # Display credit card form
-        form = BankcardForm()
-        
-        return render(request, 'checkout/payment.html', locals())
         
-    def success(self):
+class PaymentDetailsView(CorePaymentMethodView):
+    template_file = 'checkout/datacash.html'
+    
+    def handle_GET(self):
+        # Need a billing address form and a bankcard form
         
-        mark_step_as_complete(request)
-        return HttpResponseRedirect(reverse(get_next_step(request)))
         
-
+        return render(self.request, self.template_file, self.context)
+    
+    def handle_POST(self):
+        assert False

examples/datacash/templates/checkout/datacash.html

@@ -0,0 +1,111 @@
+{% extends "layout.html" %}
+
+{% load currency_filters %}
+
+{% block header %}
+<h2>Checkout / Payment details</h2>
+{% endblock header %}
+
+
+{% block content %}
+
+<h3>Shipping address</h3>
+<hr />
+<table>
+    <tr>
+        <th>Address</th>
+        <td>
+            {% for field in shipping_addr.active_address_fields %}
+            {{ field }}<br/>
+            {% endfor %}
+        </td>
+    </tr>
+    {% if shipping_addr.phone_number %}
+    <tr>
+        <th>Contact number</th>
+        <td>shipping_addr.phone_number</td>
+    </tr>
+    {% endif %}
+    {% if shipping_addr.notes %}
+    <tr>
+        <th>Shipping notes</th>
+        <td>shipping_addr.notes</td>
+    </tr>
+    {% endif %} 
+</table>
+<a href="{% url oscar-checkout-shipping-address %}">Change shipping address</a>
+
+<h3>Shipping method</h3>
+<hr />
+<table>
+    <thead>
+        <tr>
+            <th>Method</th>
+            <th>Cost</th>
+            <th>Description</th>
+            <th></th>
+        </tr>
+    <thead>
+    <tbody>
+        <tr>
+            <td>{{ method.name }}</td>
+            <td>{{ method.basket_charge_incl_tax|currency }}</td>
+            <td>{{ method.description }}</td>
+            <td></td>
+        </tr>
+    </tbody>
+</table>
+
+<h3>Payment</h3>
+<hr />
+{% if payment_method %}
+<p>{{ payment_method }}</p>
+{% endif %}
+
+<h3>Your order</h3>
+<hr />
+
+<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|currency }}</td>
+        <td>{{ line.unit_tax|currency }}</td>
+        <td>{{ line.line_price_excl_tax|currency }}</td>
+        <td>{{ line.line_price_incl_tax|currency }}</td>
+    </tr>
+    {% endfor %}
+    <tr>
+        <td colspan="5">Total</td>
+        <td>{{ basket.total_excl_tax|currency }}</td>
+        <td>{{ basket.total_incl_tax|currency }}</td>
+    </tr>
+    <tr>
+        <td colspan="5">Shipping charge</td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td colspan="6">Order total</td>
+        <td>{{ order_total|currency }}</td>
+    </tr>
+</table>
+
+<h3>Payment details</h3>
+
+asdfjaklsdjfkl;
+
+
+{% endblock content %}
+

examples/datacash/templates/checkout/payment_method.html

@@ -0,0 +1,133 @@
+{% extends "layout.html" %}
+
+{% load currency_filters %}
+
+{% block header %}
+<h2>Checkout / Payment Methods</h2>
+{% endblock header %}
+
+
+{% block content %}
+
+<h3>Shipping address</h3>
+<hr />
+<table>
+    <tr>
+        <th>Address</th>
+        <td>
+            {% for field in shipping_addr.active_address_fields %}
+            {{ field }}<br/>
+            {% endfor %}
+        </td>
+    </tr>
+    {% if shipping_addr.phone_number %}
+    <tr>
+        <th>Contact number</th>
+        <td>shipping_addr.phone_number</td>
+    </tr>
+    {% endif %}
+    {% if shipping_addr.notes %}
+    <tr>
+        <th>Shipping notes</th>
+        <td>shipping_addr.notes</td>
+    </tr>
+    {% endif %} 
+</table>
+<a href="{% url oscar-checkout-shipping-address %}">Change shipping address</a>
+
+<h3>Shipping method</h3>
+<hr />
+<table>
+    <thead>
+        <tr>
+            <th>Method</th>
+            <th>Cost</th>
+            <th>Description</th>
+            <th></th>
+        </tr>
+    <thead>
+    <tbody>
+        <tr>
+            <td>{{ method.name }}</td>
+            <td>{{ method.basket_charge_incl_tax|currency }}</td>
+            <td>{{ method.description }}</td>
+            <td></td>
+        </tr>
+    </tbody>
+</table>
+
+<h3>Payment</h3>
+<hr />
+<table>
+    <thead>
+        <tr>
+            <th>Method</th>
+            <th></th>
+        </tr>
+    <thead>
+    <tbody>
+        <tr>
+            <td>Cheque</td>
+            <td>
+                <form method="post" action="{% url oscar-checkout-payment-method %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="method_code" value="cheque" />
+                    <input type="submit" value="Pay by cheque" />
+                </form>
+            </td>
+        </tr>
+        <tr>
+            <td>Bankcard</td>
+            <td>
+                <form method="post" action="{% url oscar-checkout-payment-method %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="method_code" value="bankcard" />
+                    <input type="submit" value="Pay by bankcard" />
+                </form>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<h3>Your order</h3>
+<hr />
+
+<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|currency }}</td>
+        <td>{{ line.unit_tax|currency }}</td>
+        <td>{{ line.line_price_excl_tax|currency }}</td>
+        <td>{{ line.line_price_incl_tax|currency }}</td>
+    </tr>
+    {% endfor %}
+    <tr>
+        <td colspan="5">Total</td>
+        <td>{{ basket.total_excl_tax|currency }}</td>
+        <td>{{ basket.total_incl_tax|currency }}</td>
+    </tr>
+    <tr>
+        <td colspan="5">Shipping charge</td>
+        <td></td>
+        <td></td>
+    </tr>
+    <tr>
+        <td colspan="6">Order total</td>
+        <td>{{ order_total|currency }}</td>
+    </tr>
+</table>
+
+{% endblock content %}
+

oscar/checkout/utils.py

@@ -143,3 +143,12 @@ class CheckoutSessionData(object):
             return None
         repo = shipping_methods.Repository()
         return repo.find_by_code(code)
+    
+    # Payment methods
+    
+    def pay_by(self, method):
+        self._set('payment', 'method', method)
+        
+    def payment_method(self):
+        return self._get('payment', 'method')
+        

oscar/checkout/views.py

@@ -81,10 +81,13 @@ class CheckoutView(object):
         self.request = request
         self.co_data = checkout_utils.CheckoutSessionData(request)
         self.basket = basket_factory.BasketFactory().get_open_basket(self.request)
+        
+        # Set up template context that is available to every view
         self.context = {'basket': self.basket,
                         'order_total': self.get_order_total(),
                         'shipping_addr': self.get_shipping_address()}
         self.set_shipping_context()
+        self.set_payment_context()
         
         if request.method == 'POST':
             response = self.handle_POST()
@@ -101,6 +104,11 @@ class CheckoutView(object):
             self.context['method'] = method
             self.context['shipping_total_excl_tax'] = method.basket_charge_excl_tax()
             self.context['shipping_total_incl_tax'] = method.basket_charge_incl_tax()
+            
+    def set_payment_context(self):
+        method = self.co_data.payment_method()
+        if method:
+            self.context['payment_method'] = method
     
     def handle_GET(self):
         u"""
@@ -212,8 +220,7 @@ class ShippingMethodView(CheckoutView):
     def handle_POST(self):
         method_code = self.request.POST['method_code']
         self.co_data.use_shipping_method(method_code)
-        mark_step_as_complete(self.request)
-        return HttpResponseRedirect(reverse(get_next_step(self.request)))
+        return self.get_success_response()
         
 
 class PaymentMethodView(CheckoutView):
@@ -232,7 +239,6 @@ class OrderPreviewView(CheckoutView):
     template_file = 'checkout/preview.html'
     
     def handle_GET(self):
-        
         mark_step_as_complete(self.request)
         return render(self.request, self.template_file, self.context)
 

oscar/templates/checkout/preview.html

@@ -57,6 +57,9 @@
 
 <h3>Payment</h3>
 <hr />
+{% if payment_method %}
+<p>{{ payment_method }}</p>
+{% endif %}
 
 <h3>Your order</h3>
 <hr />

oscar/templates/checkout/shipping_methods.html

@@ -59,6 +59,7 @@
                     <input type="submit" value="Use this shipping method" />
                 </form>
             </td>
+        </tr>
         {% endfor %}
     </tbody>
 </table>