Added new checkout gateway page similar to Amazon's.

oscar/apps/checkout/forms.py

@@ -1,5 +1,6 @@
 from django import forms
 from django.db.models import get_model
+from django.contrib.auth.forms import AuthenticationForm
 
 
 class ShippingAddressForm(forms.ModelForm):
@@ -16,4 +17,25 @@ class ShippingAddressForm(forms.ModelForm):
         exclude = ('user', 'search_text')
 
 
+class GatewayForm(AuthenticationForm):
+    username = forms.EmailField(label="My email address is")
+    NEW, EXISTING = 'new', 'existing'
+    CHOICES = ((NEW, 'No, I am a new customer'),
+               (EXISTING, 'Yes, I have a password'))
+    options = forms.ChoiceField(widget=forms.widgets.RadioSelect,
+                                choices=CHOICES)
+
+    def clean(self):
+        cleaned_data = self.cleaned_data
+        if self.is_guest_checkout():
+            del self.errors['password']
+        else:
+            return super(GatewayForm, self).clean()
+        return cleaned_data
+
+    def is_guest_checkout(self):
+        return self.cleaned_data.get('options', None) == self.NEW
+
+
+
 # The BillingAddress form is in oscar.apps.payment.forms

oscar/apps/checkout/views.py

@@ -10,6 +10,7 @@ from django.forms import ModelForm
 from django.contrib import messages
 from django.core.urlresolvers import resolve
 from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth import login
 from django.utils.translation import ugettext as _
 from django.template.response import TemplateResponse
 from django.core.mail import EmailMessage
@@ -18,7 +19,7 @@ from django.views.generic import DetailView, TemplateView, FormView, \
 
 from oscar.apps.shipping.methods import Free
 from oscar.core.loading import import_module
-import_module('checkout.forms', ['ShippingAddressForm'], locals())
+import_module('checkout.forms', ['ShippingAddressForm', 'GatewayForm'], locals())
 import_module('checkout.calculators', ['OrderTotalCalculator'], locals())
 import_module('checkout.utils', ['CheckoutSessionData'], locals())
 import_module('checkout.signals', ['pre_payment', 'post_payment'], locals())
@@ -40,15 +41,31 @@ import_module('basket.models', ['Basket'], locals())
 logger = logging.getLogger('oscar.checkout')
 
 
-class IndexView(AccountAuthView):
+class IndexView(FormView):
     """
-    First page of the checkout.  If the user is signed in then we forward
-    straight onto the next step.  Otherwise, we provide options to login, register and
-    (if the option is enabled) proceed anonymously.
+    First page of the checkout.  We prompt user to either sign in, or
+    to proceed as a guest (where we still collect their email address).
     """
     template_name = 'checkout/gateway.html'
-    
-    def get_logged_in_redirect(self):
+    form_class = GatewayForm
+
+    def get(self, request, *args, **kwargs):
+        if request.user.is_authenticated():
+            return self.get_success_response()
+        return super(IndexView, self).get(request, *args, **kwargs)
+
+    def form_valid(self, form):
+        if form.is_guest_checkout():
+            email = form.cleaned_data['username']
+        else:
+            user = form.get_user()
+            login(self.request, user)
+        return self.get_success_response()
+
+    def get_success_response(self):
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self):
         return reverse('checkout:shipping-address')
 
 

oscar/core/validators.py

@@ -8,7 +8,6 @@ from django.utils.translation import ugettext_lazy as _
 
 from django.db.models import get_model
 
-
 class ExtendedURLValidator(validators.URLValidator):
     def __call__(self, value):
         try:
@@ -29,7 +28,8 @@ class ExtendedURLValidator(validators.URLValidator):
                 resolve(value)
             self.is_local_url = True
         except Http404:
-            # FlatPages is None if not installed
+            # We load flatpages here as it causes a circular reference problem
+            # sometimes.  FlatPages is None if not installed
             FlatPage = get_model('flatpages', 'FlatPage')
             if FlatPage is not None:
                 for page in FlatPage.objects.all().only(('url')):

oscar/static/oscar/js/oscar/checkout.js

@@ -0,0 +1,21 @@
+var oscar = oscar || {};
+oscar.checkout = {
+    gateway: {
+        init: function() {
+            var radioWidgets = $('form input[name=options]');
+            oscar.checkout.gateway.handleRadioSelection(radioWidgets.val());
+            radioWidgets.change(oscar.checkout.gateway.handleRadioChange);
+        },
+        handleRadioChange: function() {
+            oscar.checkout.gateway.handleRadioSelection($(this).val());
+        },
+        handleRadioSelection: function(value) {
+            var pwInput = $('#id_password');
+            if (value == 'new') {
+                pwInput.attr('disabled', 'disabled');
+            } else {
+                pwInput.removeAttr('disabled');
+            }
+        }
+    }
+};

oscar/templates/checkout/gateway.html

@@ -1,43 +1,42 @@
 {% extends "checkout/layout.html" %}
-
 {% load currency_filters %}
 
+{% block title %}
+Checkout gateway | {{ block.super }}
+{% endblock %}
+
 {% block header %}
 <div class="page-header">
-    <h1>Checkout / Gateway</h1>
+    <h1>Checkout gateway</h1>
 </div>
 {% endblock header %}
 
-
 {% block content %}
 
-<div class="row-fluid">
-    <div class="span6 login_form">
-        <form action="{{ request.get_full_path }}" method="post" class="form-stacked" />
-            <h2>Log In</h2>
-            {% csrf_token %}
-            {% include "partials/form_fields.html" with form=login_form %}
-            <input name="login_submit" type="submit" value="Log In" class="btn" />
-        </form>
-    </div>
-    <div class="span6 register_form">
-        <form action="{{ request.get_full_path }}" method="post" class="form-stacked" />
-            <h2>Register Here</h2>
-            {% csrf_token %}
-            {% include "partials/form_fields.html" with form=registration_form %}
-            <input name="registration_submit" type="submit" value="Register" class="btn" />
-        </form>
-    </div>
-</div>
+<form action="." method="post">
+	{% csrf_token %}
+	{{ form.non_field_errors }}
+	<div>
+		<h4>What is your email address?</h4>
+		<label for="id_username">My email address is:</label>
+		{{ form.username }}
+		{{ form.username.errors }}
+	</div>
+	<div>
+		<h4>Do you have an account already?</h4>
+		{{ form.options.errors }}
+		<label><input type="radio" id="id_options_0" name="options" value="new" {% if not form.password.errors %}checked="checked"{% endif %} /> No, I want to use guest checkout</label><br/>
+		<label><input type="radio" id="id_options_1" name="options" value="existing" {% if form.password.errors %}checked="checked"{% endif %}e> Yes, I have a password</label>
+		{{ form.password }}
+		{{ form.password.errors }}
+	</div>
+	<div>
+		<button type="submit" class="btn">Go!</button>
+	</div>
+</form>
 
-{% if anon_checkout_allowed %}
-<div class="sub-header">
-    <h2>Checkout Anonymously</h2>
-</div>
-<p>You can checkout without signing in.  You will be given the opportunity to register when checkout is complete.</p>
-<div class="form-actions">
-    <a href="{% url checkout:shipping-address %}" class="btn">Checkout anonymously</a>
-</div>
-{% endif %}
+{% endblock content %}
 
-{% endblock content %}
+{% block onbodyload %}
+oscar.checkout.gateway.init();
+{% endblock %}

oscar/templates/checkout/layout.html

@@ -90,4 +90,5 @@
 
 {# Block for additional scripts #}
 {% block extrascripts %}
+    <script src="{{ STATIC_URL }}oscar/js/oscar/checkout.js" type="text/javascript" charset="utf-8"></script>
 {% endblock %}