Reworked the newly split out mixins

oscar/apps/checkout/mixins.py

@@ -6,108 +6,23 @@ from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import get_model
 
-from oscar.apps.shipping.methods import Free
-from oscar.core.loading import get_class, get_classes
-ShippingAddressForm, GatewayForm = get_classes('checkout.forms', ['ShippingAddressForm', 'GatewayForm'])
-OrderTotalCalculator = get_class('checkout.calculators', 'OrderTotalCalculator')
-CheckoutSessionData = get_class('checkout.utils', 'CheckoutSessionData')
-pre_payment, post_payment = get_classes('checkout.signals', ['pre_payment', 'post_payment'])
-OrderNumberGenerator, OrderCreator = get_classes('order.utils', ['OrderNumberGenerator', 'OrderCreator'])
-UserAddressForm = get_class('address.forms', 'UserAddressForm')
-Repository = get_class('shipping.repository', 'Repository')
-AccountAuthView = get_class('customer.views', 'AccountAuthView')
+from oscar.core.loading import get_class
+OrderCreator = get_class('order.utils', 'OrderCreator')
 Dispatcher = get_class('customer.utils', 'Dispatcher')
-RedirectRequired, UnableToTakePayment, PaymentError = get_classes(
-    'payment.exceptions', ['RedirectRequired', 'UnableToTakePayment', 'PaymentError'])
-UnableToPlaceOrder = get_class('order.exceptions', 'UnableToPlaceOrder')
+CheckoutSessionMixin = get_class('checkout.session', 'CheckoutSessionMixin')
 
-Order = get_model('order', 'Order')
 ShippingAddress = get_model('order', 'ShippingAddress')
 CommunicationEvent = get_model('order', 'CommunicationEvent')
 PaymentEventType = get_model('order', 'PaymentEventType')
 PaymentEvent = get_model('order', 'PaymentEvent')
 UserAddress = get_model('address', 'UserAddress')
 Basket = get_model('basket', 'Basket')
-Email = get_model('customer', 'Email')
 CommunicationEventType = get_model('customer', 'CommunicationEventType')
 
 # Standard logger for checkout events
 logger = logging.getLogger('oscar.checkout')
 
 
-class CheckoutSessionMixin(object):
-    """
-    Mixin to provide common functionality shared between checkout views.
-    """
-
-    def dispatch(self, request, *args, **kwargs):
-        self.checkout_session = CheckoutSessionData(request)
-        return super(CheckoutSessionMixin, self).dispatch(request, *args, **kwargs)
-
-    def get_shipping_address(self):
-        """
-        Return the current shipping address for this checkout session.
-
-        This could either be a ShippingAddress model which has been
-        pre-populated (not saved), or a UserAddress model which will
-        need converting into a ShippingAddress model at submission
-        """
-        addr_data = self.checkout_session.new_shipping_address_fields()
-        if addr_data:
-            # Load address data into a blank address model
-            return ShippingAddress(**addr_data)
-        addr_id = self.checkout_session.user_address_id()
-        if addr_id:
-            try:
-                return UserAddress._default_manager.get(pk=addr_id)
-            except UserAddress.DoesNotExist:
-                # This can happen if you reset all your tables and you still have
-                # session data that refers to addresses that no longer exist
-                pass
-        return None
-
-    def get_shipping_method(self, basket=None):
-        method = self.checkout_session.shipping_method()
-        if method:
-            if not basket:
-                basket = self.request.basket
-            method.set_basket(basket)
-        else:
-            # We default to using free shipping
-            method = Free()
-        return method
-
-    def get_order_totals(self, basket=None, shipping_method=None, **kwargs):
-        """
-        Returns the total for the order with and without tax (as a tuple)
-        """
-        calc = OrderTotalCalculator(self.request)
-        if not basket:
-            basket = self.request.basket
-        if not shipping_method:
-            shipping_method = self.get_shipping_method(basket)
-        total_incl_tax = calc.order_total_incl_tax(basket, shipping_method, **kwargs)
-        total_excl_tax = calc.order_total_excl_tax(basket, shipping_method, **kwargs)
-        return total_incl_tax, total_excl_tax
-
-    def get_context_data(self, **kwargs):
-        """
-        Assign common template variables to the context.
-        """
-        ctx = super(CheckoutSessionMixin, self).get_context_data(**kwargs)
-        ctx['shipping_address'] = self.get_shipping_address()
-
-        method = self.get_shipping_method()
-        if method:
-            ctx['shipping_method'] = method
-            ctx['shipping_total_excl_tax'] = method.basket_charge_excl_tax()
-            ctx['shipping_total_incl_tax'] = method.basket_charge_incl_tax()
-
-        ctx['order_total_incl_tax'], ctx['order_total_excl_tax'] = self.get_order_totals()
-
-        return ctx
-
-
 class OrderPlacementMixin(CheckoutSessionMixin):
     """
     Mixin which provides functionality for placing orders.

oscar/apps/checkout/session.py

@@ -0,0 +1,87 @@
+import logging
+
+from django.db.models import get_model
+
+from oscar.apps.shipping.methods import Free
+from oscar.core.loading import get_class
+OrderTotalCalculator = get_class('checkout.calculators', 'OrderTotalCalculator')
+CheckoutSessionData = get_class('checkout.utils', 'CheckoutSessionData')
+
+ShippingAddress = get_model('order', 'ShippingAddress')
+UserAddress = get_model('address', 'UserAddress')
+
+# Standard logger for checkout events
+logger = logging.getLogger('oscar.checkout')
+
+
+class CheckoutSessionMixin(object):
+    """
+    Mixin to provide common functionality shared between checkout views.
+    """
+
+    def dispatch(self, request, *args, **kwargs):
+        self.checkout_session = CheckoutSessionData(request)
+        return super(CheckoutSessionMixin, self).dispatch(request, *args, **kwargs)
+
+    def get_shipping_address(self):
+        """
+        Return the current shipping address for this checkout session.
+
+        This could either be a ShippingAddress model which has been
+        pre-populated (not saved), or a UserAddress model which will
+        need converting into a ShippingAddress model at submission
+        """
+        addr_data = self.checkout_session.new_shipping_address_fields()
+        if addr_data:
+            # Load address data into a blank address model
+            return ShippingAddress(**addr_data)
+        addr_id = self.checkout_session.user_address_id()
+        if addr_id:
+            try:
+                return UserAddress._default_manager.get(pk=addr_id)
+            except UserAddress.DoesNotExist:
+                # This can happen if you reset all your tables and you still have
+                # session data that refers to addresses that no longer exist
+                pass
+        return None
+
+    def get_shipping_method(self, basket=None):
+        method = self.checkout_session.shipping_method()
+        if method:
+            if not basket:
+                basket = self.request.basket
+            method.set_basket(basket)
+        else:
+            # We default to using free shipping
+            method = Free()
+        return method
+
+    def get_order_totals(self, basket=None, shipping_method=None, **kwargs):
+        """
+        Returns the total for the order with and without tax (as a tuple)
+        """
+        calc = OrderTotalCalculator(self.request)
+        if not basket:
+            basket = self.request.basket
+        if not shipping_method:
+            shipping_method = self.get_shipping_method(basket)
+        total_incl_tax = calc.order_total_incl_tax(basket, shipping_method, **kwargs)
+        total_excl_tax = calc.order_total_excl_tax(basket, shipping_method, **kwargs)
+        return total_incl_tax, total_excl_tax
+
+    def get_context_data(self, **kwargs):
+        """
+        Assign common template variables to the context.
+        """
+        ctx = super(CheckoutSessionMixin, self).get_context_data(**kwargs)
+        ctx['shipping_address'] = self.get_shipping_address()
+
+        method = self.get_shipping_method()
+        if method:
+            ctx['shipping_method'] = method
+            ctx['shipping_total_excl_tax'] = method.basket_charge_excl_tax()
+            ctx['shipping_total_incl_tax'] = method.basket_charge_incl_tax()
+
+        ctx['order_total_incl_tax'], ctx['order_total_excl_tax'] = self.get_order_totals()
+
+        return ctx

oscar/apps/checkout/views.py

@@ -23,8 +23,8 @@ Dispatcher = get_class('customer.utils', 'Dispatcher')
 RedirectRequired, UnableToTakePayment, PaymentError = get_classes(
     'payment.exceptions', ['RedirectRequired', 'UnableToTakePayment', 'PaymentError'])
 UnableToPlaceOrder = get_class('order.exceptions', 'UnableToPlaceOrder')
-CheckoutSessionMixin, OrderPlacementMixin = get_classes('checkout.mixins',
-    ('CheckoutSessionMixin', 'OrderPlacementMixin'))
+OrderPlacementMixin = get_class('checkout.mixins', 'OrderPlacementMixin')
+CheckoutSessionMixin = get_class('checkout.session', 'CheckoutSessionMixin')
 
 Order = get_model('order', 'Order')
 ShippingAddress = get_model('order', 'ShippingAddress')