Updated checkout to have order placement with payment details

examples/datacash/shop/checkout/views.py

@@ -4,7 +4,6 @@ from oscar.checkout.views import (ShippingMethodView as CoreShippingMethodView,
                                   PaymentMethodView as CorePaymentMethodView, 
                                   PaymentDetailsView as CorePaymentDetailsView,
                                   OrderPreviewView as CoreOrderPreviewView,
-                                  SubmitView as CoreSubmitView,
                                   prev_steps_must_be_complete)
 from oscar.payment.forms import BankcardForm, BillingAddressForm
 from oscar.services import import_module
@@ -46,25 +45,16 @@ class PaymentDetailsView(CorePaymentMethodView):
     template_file = 'checkout/payment_details.html'
     
     def handle_GET(self):
-        
-        # Need a billing address form and a bankcard form
         self.context['bankcard_form'] = BankcardForm()
         self.context['billing_address_form'] = BillingAddressForm()
-        
         return render(self.request, self.template_file, self.context)
     
     def handle_POST(self):
-        assert False
-        
-
-class SubmitView(CoreSubmitView):
-    
-    def _handle_payment(self, basket):
-        u"""Handle any payment processing"""
+        bankcard_form = BankcardForm(self.request.POST)
+        billing_addr_form = BillingAddressForm(self.request.POST)
+        if bankcard_form.is_valid() and billing_addr_form.is_valid():
+            return self._submit()
+        self.context['bankcard_form'] = bankcard_form
+        self.context['billing_address_form'] = billing_addr_form
+        return render(self.request, self.template_file, self.context)
         
-        bankcard_form = BankcardForm(request.POST)
-        if not bankcard_form.is_valid():
-            # Put form into the session and redirect back 
-            self.request.session['bankcard_form'] = bankcard_form
-            
-        assert False

oscar/checkout/urls.py

@@ -3,7 +3,7 @@ from django.conf.urls.defaults import *
 from oscar.views import class_based_view
 from oscar.services import import_module
 
-checkout_views = import_module('checkout.views', ['IndexView', 'ShippingAddressView', 'SubmitView',
+checkout_views = import_module('checkout.views', ['IndexView', 'ShippingAddressView',
                                                   'ShippingMethodView', 'PaymentMethodView', 'OrderPreviewView',
                                                   'PaymentDetailsView', 'ThankYouView'])
 
@@ -14,7 +14,6 @@ urlpatterns = patterns('oscar.checkout.views',
     url(r'payment-method/$', class_based_view(checkout_views.PaymentMethodView), name='oscar-checkout-payment-method'),
     url(r'preview/$', class_based_view(checkout_views.OrderPreviewView), name='oscar-checkout-preview'),
     url(r'payment-details/$', class_based_view(checkout_views.PaymentDetailsView), name='oscar-checkout-payment-details'),
-    url(r'submit/$', class_based_view(checkout_views.SubmitView), name='oscar-checkout-submit'),
     url(r'thank-you/$', class_based_view(checkout_views.ThankYouView), name='oscar-checkout-thank-you'),
 )
 

oscar/checkout/utils.py

@@ -16,8 +16,7 @@ class ProgressChecker(object):
                       'oscar-checkout-shipping-method',
                       'oscar-checkout-payment-method',
                       'oscar-checkout-preview',
-                      'oscar-checkout-payment-details',
-                      'oscar-checkout-submit',]
+                      'oscar-checkout-payment-details']
     
     def are_previous_steps_complete(self, request):
         u"""

oscar/checkout/views.py

@@ -246,32 +246,23 @@ class OrderPreviewView(CheckoutView):
 
 class PaymentDetailsView(CheckoutView):
     u"""
-    For taking the details of payment.
-    
-    This has to be the final step before submit as we don't want to store
-    payment details in the session.
-    """
-    pass
-
-
-class SubmitView(CheckoutView):
-    u"""
-    Class for submitting an order.
+    For taking the details of payment and creating the order
     
     The class is deliberately split into fine-grained method, responsible for only one
     thing.  This is to make it easier to subclass and override just one component of
     functionality.
-    
-    Note that the order models support shipping to multiple addresses but the default
-    implementation assumes only one.  To change this, override the _get_shipping_address_for_line
-    method.
     """
-    
     def handle_GET(self):
         return self.handle_POST()
     
     def handle_POST(self):
-        
+        """
+        This method is designed to be overridden by subclasses which will
+        validate the forms from the payment details page.  If the forms are valid
+        then the method can call _submit()."""
+        return self._submit()
+    
+    def _submit(self):
         checkout_signals.pre_payment.send_robust(sender=self, view=self)
         self._handle_payment(self.basket)
         checkout_signals.post_payment.send_robust(sender=self, view=self)

oscar/templates/checkout/preview.html

@@ -3,6 +3,9 @@
 {% block place_order %}
 <hr/>
 <h3>Place your order</h3>
-<a href="{% url oscar-checkout-payment-details %}">Place order</a>
+<form method="post" action="{% url oscar-checkout-payment-details %}">
+{% csrf_token %}
+<input type="submit" value="Place order" />
+</form>
 {% endblock place_order %}