Add new feature Surcharges.

docs/source/howto/how_to_configure_surcharges.rst

@@ -0,0 +1,103 @@
+=========================
+How to configure surcharges
+=========================
+
+A surcharge, also known as checkout fee, is an extra fee charged by a merchant when receiving a payment by cheque, credit card, charge card or debit card (but not cash) which at least covers the cost to the merchant of accepting that means of payment, such as the merchant service fee imposed by a credit card company.
+
+
+Surcharges in Oscar
+~~~~~~~~~~~~~~~~~
+
+Configuring surcharges requires overriding Oscar's core 'checkout' app
+and providing your own ``SurchargeApplicator`` class (see :doc:`/topics/customisation`) that
+returns your chosen surcharge instances.
+
+The primary responsibility of the
+``SurchargeApplicator`` class is to provide the available surcharge methods for a
+particular scenario. This is done via the
+:func:`~oscar.apps.checkout.applicator.SurchargeApplicator.get_applicable_surcharges` method,
+which returns the surcharges available to the customer.
+
+This method is called in several places:
+
+* To look up the "default" surcharges so that sample surcharges can be
+  shown on the basket detail page.
+
+* To give the applicable surcharges to the order total calculator so wo can show the correct price breakdown.
+
+The ``get_applicable_surcharges`` method takes the basket and any other kwargs. 
+These kwargs can later be determined when setting up your own surcharges.
+
+Note that you can also implement surcharges as models just like shipping methods.
+
+Custom applicators
+-------------------
+
+If the available surcharges are the same for all customers and payment 
+methods, then override the ``get_surcharges`` method of the repository:
+
+.. code-block:: python
+
+   from decimal import Decimal as D
+   from oscar.apps.checkout import applicator
+   from . import surcharges
+
+   class SurchargeApplicator(applicator.SurchargeApplicator):
+       def get_surcharges(self, basket, **kwargs):
+           return (
+               surcharges.PercentageCharge(percentage=D("2.00")),
+           )
+
+For more complex logic, override the ``is_applicable`` method:
+
+.. code-block:: python
+
+   from oscar.apps.checkout import applicator
+
+   class SurchargeApplicator(applicator.SurchargeApplicator):
+
+       def is_applicable(self, surcharge, basket, **kwargs):
+           payment_method_code = kwargs.get("payment_method_code", None)
+           if payment_method is not None and payment_method_code == "paypal":
+               return True
+           else:
+               return False
+               
+
+Surcharges
+----------------
+
+Surcharges need to implement a certain API. They need to have the
+following properties which define the metadata about the surcharge:
+
+* ``name`` - The name of the surcharges. This will be visible to the
+  customer during checkout and is translatable
+  
+* ``code`` - The code of the surcharge. This could be the slugified name or anything else. 
+  The code is used as a non-translatable identifier for a charge.
+
+Further, each surcharge must implement a ``calculate`` method which accepts the
+basket instance as a parameter and returns a ``Price`` instance.  Most surcharges
+subclass
+:class:`~oscar.apps.checkout.surcharges.BaseSurcharge`, which stubs this API.
+
+
+Core surcharges
+~~~~~~~~~~~~~~~~~~~~~
+
+Oscar ships with several re-usable surcharges which can be used as-is, or
+subclassed and customised:
+
+* :class:`~oscar.apps.checkout.surcharges.PercentageCharge` - percentage based charge
+
+* :class:`~oscar.apps.checkout.surcharges.FlatCharge` - flat surcharge
+  
+  Example usage:
+
+.. code-block:: python
+
+   from decimal import Decimal as D
+   from oscar.apps.checkout import surcharges
+
+   percentage_charge = surcharges.PercentageCharge(percentage=D("2.00"))
+   flat_charge = surcharges.FlatCharge(excl_tax=D("10.00"), incl_tax=D("12.10"))

docs/source/howto/index.rst

@@ -61,6 +61,16 @@ Shipping
     :maxdepth: 1
 
     how_to_configure_shipping
+    
+    
+Surcharges
+----------
+
+.. toctree::
+    :maxdepth: 1
+    
+    how_to_configure_surcharges
+
 
 Order processing
 ----------------

src/oscar/apps/basket/views.py

@@ -27,6 +27,7 @@ Repository = get_class('shipping.repository', 'Repository')
 OrderTotalCalculator = get_class(
     'checkout.calculators', 'OrderTotalCalculator')
 BasketMessageGenerator = get_class('basket.utils', 'BasketMessageGenerator')
+SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
 
 
 class BasketView(ModelFormSetView):
@@ -115,9 +116,6 @@ class BasketView(ModelFormSetView):
         if method.is_discounted:
             excl_discount = method.calculate_excl_discount(self.request.basket)
             context['shipping_charge_excl_discount'] = excl_discount
-
-        context['order_total'] = OrderTotalCalculator().calculate(
-            self.request.basket, shipping_charge)
         context['basket_warnings'] = self.get_basket_warnings(
             self.request.basket)
         context['upsell_messages'] = self.get_upsell_messages(
@@ -138,6 +136,11 @@ class BasketView(ModelFormSetView):
                                                queryset=saved_queryset,
                                                prefix='saved')
                     context['saved_formset'] = formset
+
+        surcharges = SurchargeApplicator(self.request, context).get_applicable_surcharges(self.request.basket)
+        context['surcharges'] = surcharges
+        context['order_total'] = OrderTotalCalculator().calculate(
+            self.request.basket, shipping_charge, surcharges=surcharges)
         return context
 
     def get_success_url(self):

src/oscar/apps/checkout/applicator.py

@@ -0,0 +1,55 @@
+class SurchargeList(list):
+    @property
+    def total(self):
+        return sum([surcharge.price for surcharge in self])
+
+
+class SurchargePrice():
+    surcharge = None
+    price = None
+
+    def __init__(self, surcharge, price):
+        self.surcharge = surcharge
+        self.price = price
+
+
+class SurchargeApplicator():
+
+    def __init__(self, request=None, context=None):
+        self.context = context
+        self.request = request
+
+    def get_surcharges(self, basket, **kwargs):
+        """
+        For example::
+            return (
+                PercentageCharge(percentage=D("2.00")),
+                FlatCharge(excl_tax=D("20.0"), incl_tax=D("20.0")),
+            )
+
+        Surcharges must implement the minimal API in ``oscar.apps.checkout.surcharges.BaseSurcharge``.
+        Note that you can also make it a model if you want, just like shipping methods.
+        """
+
+        return ()
+
+    def get_applicable_surcharges(self, basket, **kwargs):
+        methods = [
+            SurchargePrice(
+                surcharge,
+                surcharge.calculate(basket=basket, **kwargs)
+            )
+            for surcharge in self.get_surcharges(basket=basket, **kwargs)
+            if self.is_applicable(surcharge=surcharge, basket=basket, **kwargs)
+        ]
+
+        if methods:
+            return SurchargeList(methods)
+        else:
+            return None
+
+    def is_applicable(self, surcharge, basket, **kwargs):
+        """
+        Checks if surcharge is applicable to certain conditions
+        """
+        return True

src/oscar/apps/checkout/calculators.py

@@ -13,12 +13,18 @@ class OrderTotalCalculator(object):
         # always changes the order total.
         self.request = request
 
-    def calculate(self, basket, shipping_charge, **kwargs):
+    def calculate(self, basket, shipping_charge, surcharges=None, **kwargs):
         excl_tax = basket.total_excl_tax + shipping_charge.excl_tax
         if basket.is_tax_known and shipping_charge.is_tax_known:
             incl_tax = basket.total_incl_tax + shipping_charge.incl_tax
         else:
             incl_tax = None
+
+        if surcharges is not None:
+            excl_tax += surcharges.total.excl_tax
+            if incl_tax is not None:
+                incl_tax += surcharges.total.incl_tax
+
         return prices.Price(
             currency=basket.currency,
             excl_tax=excl_tax, incl_tax=incl_tax)

src/oscar/apps/checkout/mixins.py

@@ -93,7 +93,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
     def handle_order_placement(self, order_number, user, basket,
                                shipping_address, shipping_method,
                                shipping_charge, billing_address, order_total,
-                               **kwargs):
+                               surcharges=None, **kwargs):
         """
         Write out the order models and return the appropriate HTTP response
 
@@ -105,13 +105,13 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             order_number=order_number, user=user, basket=basket,
             shipping_address=shipping_address, shipping_method=shipping_method,
             shipping_charge=shipping_charge, order_total=order_total,
-            billing_address=billing_address, **kwargs)
+            billing_address=billing_address, surcharges=surcharges, **kwargs)
         basket.submit()
         return self.handle_successful_order(order)
 
     def place_order(self, order_number, user, basket, shipping_address,
                     shipping_method, shipping_charge, order_total,
-                    billing_address=None, **kwargs):
+                    billing_address=None, surcharges=None, **kwargs):
         """
         Writes the order out to the DB including the payment models
         """
@@ -145,6 +145,7 @@ class OrderPlacementMixin(CheckoutSessionMixin):
             billing_address=billing_address,
             status=status,
             request=request,
+            surcharges=surcharges,
             **kwargs)
         self.save_payment_details(order)
         return order

src/oscar/apps/checkout/session.py

@@ -12,6 +12,7 @@ from oscar.core.loading import get_class, get_model
 from . import exceptions
 
 Repository = get_class('shipping.repository', 'Repository')
+SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
 OrderTotalCalculator = get_class(
     'checkout.calculators', 'OrderTotalCalculator')
 CheckoutSessionData = get_class(
@@ -228,6 +229,7 @@ class CheckoutSessionMixin(object):
         shipping_address = self.get_shipping_address(request.basket)
         shipping_method = self.get_shipping_method(
             request.basket, shipping_address)
+        surcharges = SurchargeApplicator(request).get_applicable_surcharges(basket=request.basket)
         if shipping_method:
             shipping_charge = shipping_method.calculate(request.basket)
         else:
@@ -238,7 +240,7 @@ class CheckoutSessionMixin(object):
                 currency=request.basket.currency, excl_tax=D('0.00'),
                 tax=D('0.00')
             )
-        total = self.get_order_totals(request.basket, shipping_charge)
+        total = self.get_order_totals(request.basket, shipping_charge, surcharges)
         if total.excl_tax == D('0.00'):
             raise exceptions.PassedSkipCondition(
                 url=reverse('checkout:preview')
@@ -270,22 +272,27 @@ class CheckoutSessionMixin(object):
         shipping_method = self.get_shipping_method(
             basket, shipping_address)
         billing_address = self.get_billing_address(shipping_address)
-        if not shipping_method:
-            total = shipping_charge = None
-        else:
-            shipping_charge = shipping_method.calculate(basket)
-            total = self.get_order_totals(
-                basket, shipping_charge=shipping_charge, **kwargs)
         submission = {
             'user': self.request.user,
             'basket': basket,
             'shipping_address': shipping_address,
             'shipping_method': shipping_method,
-            'shipping_charge': shipping_charge,
             'billing_address': billing_address,
-            'order_total': total,
             'order_kwargs': {},
-            'payment_kwargs': {}}
+            'payment_kwargs': {}
+        }
+
+        surcharges = SurchargeApplicator(self.request, submission).get_applicable_surcharges(self.request.basket)
+        if not shipping_method:
+            total = shipping_charge = None
+        else:
+            shipping_charge = shipping_method.calculate(basket)
+            total = self.get_order_totals(
+                basket, shipping_charge=shipping_charge, surcharges=surcharges, **kwargs)
+
+        submission["shipping_charge"] = shipping_charge
+        submission["order_total"] = total
+        submission['surcharges'] = surcharges
 
         # If there is a billing address, add it to the payment kwargs as calls
         # to payment gateways generally require the billing address. Note, that
@@ -408,9 +415,9 @@ class CheckoutSessionMixin(object):
                 user_address.populate_alternative_model(billing_address)
                 return billing_address
 
-    def get_order_totals(self, basket, shipping_charge, **kwargs):
+    def get_order_totals(self, basket, shipping_charge, surcharges=None, **kwargs):
         """
         Returns the total for the order with and without tax
         """
         return OrderTotalCalculator(self.request).calculate(
-            basket, shipping_charge, **kwargs)
+            basket, shipping_charge, surcharges, **kwargs)

src/oscar/apps/checkout/surcharges.py

@@ -0,0 +1,56 @@
+from decimal import Decimal as D
+
+from django.utils.translation import gettext_lazy as _
+
+from oscar.core import prices
+
+
+class BaseSurcharge:
+    """
+    Surcharge interface class
+
+    This is the superclass to the classes in surcharges.py. This allows using all
+    surcharges interchangeably (aka polymorphism).
+
+    The interface is all properties.
+    """
+
+    def calculate(self, basket, **kwargs):
+        raise NotImplementedError
+
+
+class PercentageCharge(BaseSurcharge):
+    name = _("Percentage surcharge")
+    code = "percentage-surcharge"
+
+    def __init__(self, percentage):
+        self.percentage = percentage
+
+    def calculate(self, basket, **kwargs):
+        if basket.total_excl_tax:
+            return prices.Price(
+                currency=basket.currency,
+                excl_tax=basket.total_excl_tax * self.percentage / 100,
+                incl_tax=basket.total_incl_tax * self.percentage / 100
+            )
+        else:
+            return prices.Price(
+                currency=basket.currency,
+                excl_tax=D('0.0'),
+                incl_tax=D('0.0')
+            )
+
+
+class FlatCharge(BaseSurcharge):
+    name = _("Flat surcharge")
+    code = "flat-surcharge"
+
+    def __init__(self, excl_tax=None, incl_tax=None):
+        self.excl_tax = excl_tax
+        self.incl_tax = incl_tax
+
+    def calculate(self, basket, **kwargs):
+        return prices.Price(
+            currency=basket.currency,
+            excl_tax=self.excl_tax,
+            incl_tax=self.incl_tax)

src/oscar/apps/checkout/views.py

@@ -512,7 +512,7 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
 
     def submit(self, user, basket, shipping_address, shipping_method,  # noqa (too complex (10))
                shipping_charge, billing_address, order_total,
-               payment_kwargs=None, order_kwargs=None):
+               payment_kwargs=None, order_kwargs=None, surcharges=None):
         """
         Submit a basket for order placement.
 
@@ -623,7 +623,7 @@ class PaymentDetailsView(OrderPlacementMixin, generic.TemplateView):
         try:
             return self.handle_order_placement(
                 order_number, user, basket, shipping_address, shipping_method,
-                shipping_charge, billing_address, order_total, **order_kwargs)
+                shipping_charge, billing_address, order_total, surcharges=surcharges, **order_kwargs)
         except UnableToPlaceOrder as e:
             # It's possible that something will go wrong while trying to
             # actually place an order.  Not a good situation to be in as a

src/oscar/apps/order/abstract_models.py

@@ -186,14 +186,14 @@ class AbstractOrder(models.Model):
         """
         Return basket total including tax
         """
-        return self.total_incl_tax - self.shipping_incl_tax
+        return self.total_incl_tax - self.shipping_incl_tax - self.surcharge_incl_tax
 
     @property
     def basket_total_excl_tax(self):
         """
         Return basket total excluding tax
         """
-        return self.total_excl_tax - self.shipping_excl_tax
+        return self.total_excl_tax - self.shipping_excl_tax - self.surcharge_excl_tax
 
     @property
     def total_before_discounts_incl_tax(self):
@@ -226,6 +226,14 @@ class AbstractOrder(models.Model):
     def total_tax(self):
         return self.total_incl_tax - self.total_excl_tax
 
+    @property
+    def surcharge_excl_tax(self):
+        return sum(charge.excl_tax for charge in self.surcharges.all())
+
+    @property
+    def surcharge_incl_tax(self):
+        return sum(charge.incl_tax for charge in self.surcharges.all())
+
     @property
     def num_lines(self):
         return self.lines.count()
@@ -1169,3 +1177,36 @@ class AbstractOrderDiscount(models.Model):
         if self.voucher_code:
             return self.voucher_code
         return self.offer_name or ""
+
+
+class AbstractSurcharge(models.Model):
+    order = models.ForeignKey(
+        'order.Order',
+        on_delete=models.CASCADE,
+        related_name="surcharges",
+        verbose_name=_("Surcharges"))
+
+    name = models.CharField(
+        _("Surcharge"), max_length=128
+    )
+
+    code = models.CharField(
+        _("Surcharge code"), max_length=128
+    )
+
+    incl_tax = models.DecimalField(
+        _("Surcharge (inc. tax)"), decimal_places=2, max_digits=12,
+        default=0)
+
+    excl_tax = models.DecimalField(
+        _("Surcharge (excl. tax)"), decimal_places=2, max_digits=12,
+        default=0)
+
+    @property
+    def tax(self):
+        return self.incl_tax - self.excl_tax
+
+    class Meta:
+        abstract = True
+        app_label = 'order'
+        ordering = ['pk']

src/oscar/apps/order/admin.py

@@ -17,6 +17,7 @@ PaymentEventType = get_model('order', 'PaymentEventType')
 PaymentEventQuantity = get_model('order', 'PaymentEventQuantity')
 LineAttribute = get_model('order', 'LineAttribute')
 OrderDiscount = get_model('order', 'OrderDiscount')
+Surcharge = get_model('order', 'Surcharge')
 
 
 class LineInline(admin.TabularInline):
@@ -67,6 +68,10 @@ class OrderDiscountAdmin(admin.ModelAdmin):
                     'voucher_code', 'amount')
 
 
+class SurchargeAdmin(admin.ModelAdmin):
+    raw_id_fields = ("order",)
+
+
 admin.site.register(Order, OrderAdmin)
 admin.site.register(OrderNote)
 admin.site.register(OrderStatusChange)
@@ -81,3 +86,4 @@ admin.site.register(LineAttribute)
 admin.site.register(OrderDiscount, OrderDiscountAdmin)
 admin.site.register(CommunicationEvent)
 admin.site.register(BillingAddress)
+admin.site.register(Surcharge, SurchargeAdmin)

src/oscar/apps/order/migrations/0009_surcharge.py

@@ -0,0 +1,33 @@
+# Generated by Django 2.2.6 on 2020-02-19 09:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0008_auto_20190301_1035'),
+    ]
+    
+    replaces=[
+        ("order", "0008_surcharge"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Surcharge',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128, verbose_name='Surcharge')),
+                ('code', models.CharField(max_length=128, verbose_name='Surcharge code')),
+                ('incl_tax', models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='Surcharge (inc. tax)')),
+                ('excl_tax', models.DecimalField(decimal_places=2, default=0, max_digits=12, verbose_name='Surcharge (excl. tax)')),
+                ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='surcharges', to='order.Order', verbose_name='Surcharges')),
+            ],
+            options={
+                'abstract': False,
+                'ordering': ['pk']
+            },
+        ),
+    ]

src/oscar/apps/order/models.py

@@ -102,3 +102,9 @@ if not is_model_registered('order', 'OrderDiscount'):
         pass
 
     __all__.append('OrderDiscount')
+
+if not is_model_registered('order', 'Surcharge'):
+    class Surcharge(AbstractSurcharge):
+        pass
+
+    __all__.append('Surcharge')

src/oscar/apps/order/utils.py

@@ -16,6 +16,7 @@ OrderDiscount = get_model('order', 'OrderDiscount')
 CommunicationEvent = get_model('order', 'CommunicationEvent')
 CommunicationEventType = get_model('communication', 'CommunicationEventType')
 Dispatcher = get_class('communication.utils', 'Dispatcher')
+Surcharge = get_model('order', 'Surcharge')
 
 
 class OrderNumberGenerator(object):
@@ -41,7 +42,7 @@ class OrderCreator(object):
     def place_order(self, basket, total,  # noqa (too complex (12))
                     shipping_method, shipping_charge, user=None,
                     shipping_address=None, billing_address=None,
-                    order_number=None, status=None, request=None, **kwargs):
+                    order_number=None, status=None, request=None, surcharges=None, **kwargs):
         """
         Placing an order involves creating all the relevant models based on the
         basket and session data.
@@ -60,6 +61,7 @@ class OrderCreator(object):
 
         with transaction.atomic():
 
+            kwargs['surcharges'] = surcharges
             # Ok - everything seems to be in order, let's place the order
             order = self.create_order_model(
                 user, basket, shipping_address, shipping_method, shipping_charge,
@@ -106,7 +108,7 @@ class OrderCreator(object):
 
     def create_order_model(self, user, basket, shipping_address,
                            shipping_method, shipping_charge, billing_address,
-                           total, order_number, status, request=None, **extra_order_fields):
+                           total, order_number, status, request=None, surcharges=None, **extra_order_fields):
         """Create an order model."""
         order_data = {'basket': basket,
                       'number': order_number,
@@ -131,6 +133,15 @@ class OrderCreator(object):
             order_data['site'] = Site._default_manager.get_current(request)
         order = Order(**order_data)
         order.save()
+        if surcharges is not None:
+            for charge in surcharges:
+                Surcharge.objects.create(
+                    order=order,
+                    name=charge.surcharge.name,
+                    code=charge.surcharge.code,
+                    excl_tax=charge.price.excl_tax,
+                    incl_tax=charge.price.incl_tax
+                )
         return order
 
     def create_line_models(self, order, basket_line, extra_line_fields=None):

src/oscar/core/prices.py

@@ -54,3 +54,19 @@ class Price(object):
         return (self.currency == other.currency
                 and self.excl_tax == other.excl_tax
                 and self.incl_tax == other.incl_tax)
+
+    def __add__(self, other):
+        if self.currency != other.currency:
+            raise ValueError("Cannot add prices with different currencies.")
+
+        return Price(
+            currency=self.currency,
+            incl_tax=self.incl_tax + other.incl_tax,
+            excl_tax=self.excl_tax + other.excl_tax
+        )
+
+    def __radd__(self, other):
+        if other == 0:
+            return self
+        else:
+            return self.__add__(other)

src/oscar/templates/oscar/basket/partials/basket_totals.html

@@ -149,6 +149,36 @@
                 {% endif %}
             {% endblock %}
 
+            {% block surcharges %}
+                {% if surcharges %}
+                    <tr>
+                        <th>&nbsp;</th>
+                        <td></td>
+                    </tr>
+
+                    <tr>
+                        <th colspan="2">
+                            <h3>{% trans "Surcharges" %}</h3>
+                        </th>
+                    </tr>
+                    {% for surcharge in surcharges %}
+                        <tr> 
+                            <th class="total"> 
+                                {{ surcharge.surcharge.name }}
+                            </th>
+                            <th class="total align-right">
+                                {% if not show_tax_separately and surcharge.price.is_tax_known %}
+                                    {{ surcharge.price.incl_tax|currency:basket.currency }}
+                                {% else %}
+                                    {{ surcharge.price.excl_tax|currency:basket.currency }}
+                                {% endif %}
+                            </th>
+                        </tr>
+                    {% endfor %}
+                {% endif %}
+            {% endblock %}
+
+
             {% block tax_totals %}
                 {% if show_tax_separately %}
                     <tr>

src/oscar/templates/oscar/dashboard/orders/order_detail.html

@@ -237,6 +237,20 @@
                                     </tr>
                                 {% endif %}
 
+                                {% with surcharges=order.surcharges.all %}
+                                {% if surcharges %}
+                                    {% for charge in surcharges %}
+                                        <tr>
+                                            <td colspan="9"></td>
+                                            <th>{% blocktrans with name=charge.name %}Surcharge (name){% endblocktrans %}</th>
+                                            <th class="text-right">{{ charge.excl_tax|currency:order.currency }}</th>
+                                            <th class="text-right">{{ charge.incl_tax|currency:order.currency }}</th>
+                                            <td></td>
+                                        </tr>
+                                    {% endfor %}
+                                {% endif %}
+                                {% endwith %}
+
                                 <tr>
                                     <td colspan="9"></td>
                                     <th>{% trans "Order total" %}</th>

src/oscar/templates/oscar/order/partials/basket_totals.html

@@ -84,6 +84,32 @@
             {% endif %}
         {% endblock shipping_total %}
 
+        {% block surcharges %}
+            {% with surcharges=order.surcharges.all %}
+            {% if surcharges %}
+                <tr>
+                    <th>&nbsp;</th>
+                    <td></td>
+                </tr>
+                <tr>
+                    <th colspan="2"><h3>{% trans "Surcharges" %}</h3></th>
+                </tr>
+                {% for charge in surcharges %}
+                <tr>
+                        <th class="total">{{ charge.name }}</th>
+                        <th class="total align-right"> 
+                            {% if show_tax_separately %}
+                                {{ charge.excl_tax|currency:order.currency }}
+                            {% else %}
+                                {{ charge.incl_tax|currency:order.currency }}
+                            {% endif %}
+                        </th>
+                </tr>
+                {% endfor %}
+            {% endif %}
+            {% endwith %}
+        {% endblock %}
+
         {% if show_tax_separately %}
             <tr>
                 <th colspan="2">&nbsp;</th>

src/oscar/test/factories/__init__.py

@@ -26,6 +26,7 @@ Voucher = get_model('voucher', 'Voucher')
 OrderCreator = get_class('order.utils', 'OrderCreator')
 OrderTotalCalculator = get_class('checkout.calculators',
                                  'OrderTotalCalculator')
+SurchargeApplicator = get_class('checkout.applicator', 'SurchargeApplicator')
 Partner = get_model('partner', 'Partner')
 StockRecord = get_model('partner', 'StockRecord')
 PurchaseInfo = get_class('partner.strategy', 'PurchaseInfo')
@@ -164,8 +165,10 @@ def create_order(number=None, basket=None, user=None, shipping_address=None,
     if shipping_method is None:
         shipping_method = Free()
     shipping_charge = shipping_method.calculate(basket)
+    surcharges = SurchargeApplicator().get_applicable_surcharges(basket)
     if total is None:
-        total = OrderTotalCalculator().calculate(basket, shipping_charge)
+        total = OrderTotalCalculator().calculate(basket, shipping_charge, surcharges)
+    kwargs['surcharges'] = surcharges
     order = OrderCreator().place_order(
         order_number=number,
         user=user,

tests/_site/apps/checkout/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'tests._site.apps.checkout.apps.CheckoutConfig'

tests/_site/apps/checkout/applicator.py

@@ -0,0 +1,22 @@
+from decimal import Decimal as D
+
+from oscar.apps.checkout.applicator import (
+    SurchargeApplicator as BaseSurchargeApplicator)
+from oscar.apps.checkout.surcharges import FlatCharge
+
+
+class SurchargeApplicator(BaseSurchargeApplicator):
+    def get_surcharges(self, basket, **kwargs):
+        return (
+            FlatCharge(excl_tax=D("10.0"), incl_tax=D("10.0")),
+            FlatCharge(excl_tax=D("10.0"), incl_tax=D("12.0")),
+        )
+
+    def is_applicable(self, surcharge, basket, **kwargs):
+        if surcharge.incl_tax > surcharge.excl_tax:
+            if basket.is_tax_known:
+                return True
+        else:
+            return True
+
+        return False

tests/_site/apps/checkout/apps.py

@@ -0,0 +1,5 @@
+from oscar.apps.checkout import apps
+
+
+class CheckoutConfig(apps.CheckoutConfig):
+    name = 'tests._site.apps.checkout'

tests/functional/dashboard/test_dashboard.py

@@ -146,7 +146,7 @@ class TestDashboardIndexStatsForNonStaffUser(WebTestCase):
         context = response.context
         self.assertEqual(context['total_orders_last_day'], 1)
         self.assertEqual(context['total_lines_last_day'], 1)
-        self.assertEqual(context['total_revenue_last_day'], D(5))
+        self.assertEqual(context['total_revenue_last_day'], D(27))
         self.assertEqual(context['total_customers_last_day'], 1)
         self.assertEqual(context['total_open_baskets_last_day'], 1)
         self.assertEqual(context['total_products'], 1)
@@ -156,7 +156,7 @@ class TestDashboardIndexStatsForNonStaffUser(WebTestCase):
         self.assertEqual(context['total_open_baskets'], 1)
         self.assertEqual(context['total_orders'], 1)
         self.assertEqual(context['total_lines'], 1)
-        self.assertEqual(context['total_revenue'], D(5))
+        self.assertEqual(context['total_revenue'], D(27))
 
     def test_partner2(self):
         user = self.create_user(username='user', email='testuser@example.com')
@@ -166,7 +166,7 @@ class TestDashboardIndexStatsForNonStaffUser(WebTestCase):
         context = response.context
         self.assertEqual(context['total_orders_last_day'], 9)
         self.assertEqual(context['total_lines_last_day'], 9)
-        self.assertEqual(context['total_revenue_last_day'], D(90))
+        self.assertEqual(context['total_revenue_last_day'], D(288))
         self.assertEqual(context['total_customers_last_day'], 1)
         self.assertEqual(context['total_open_baskets_last_day'], 0)
         self.assertEqual(context['total_products'], 2)
@@ -176,4 +176,4 @@ class TestDashboardIndexStatsForNonStaffUser(WebTestCase):
         self.assertEqual(context['total_open_baskets'], 0)
         self.assertEqual(context['total_orders'], 9)
         self.assertEqual(context['total_lines'], 9)
-        self.assertEqual(context['total_revenue'], D(90))
+        self.assertEqual(context['total_revenue'], D(288))

tests/integration/checkout/test_calculator.py

@@ -5,6 +5,9 @@ from django.test import TestCase
 
 from oscar.apps.checkout import calculators
 from oscar.core import prices
+from oscar.core.loading import get_class
+
+SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
 
 
 class TestOrderTotalCalculator(TestCase):
@@ -20,10 +23,13 @@ class TestOrderTotalCalculator(TestCase):
         shipping_charge = prices.Price(
             currency=basket.currency, excl_tax=D('5.00'))
 
-        total = self.calculator.calculate(basket, shipping_charge)
+        applicator = SurchargeApplicator()
+        surcharges = applicator.get_applicable_surcharges(basket)
+
+        total = self.calculator.calculate(basket, shipping_charge, surcharges)
 
         self.assertIsInstance(total, prices.Price)
-        self.assertEqual(D('10.00') + D('5.00'), total.excl_tax)
+        self.assertEqual(D('10.00') + D('5.00') + D('10.0'), total.excl_tax)
         self.assertFalse(total.is_tax_known)
 
     def test_returns_correct_totals_when_tax_is_known(self):
@@ -36,10 +42,13 @@ class TestOrderTotalCalculator(TestCase):
             currency=basket.currency, excl_tax=D('5.00'),
             tax=D('0.50'))
 
-        total = self.calculator.calculate(basket, shipping_charge)
+        applicator = SurchargeApplicator()
+        surcharges = applicator.get_applicable_surcharges(basket)
+
+        total = self.calculator.calculate(basket, shipping_charge, surcharges)
 
         self.assertIsInstance(total, prices.Price)
-        self.assertEqual(D('10.00') + D('5.00'), total.excl_tax)
+        self.assertEqual(D('10.00') + D('5.00') + D('20.0'), total.excl_tax)
         self.assertTrue(total.is_tax_known)
-        self.assertEqual(D('12.00') + D('5.50'), total.incl_tax)
-        self.assertEqual(D('2.00') + D('0.50'), total.tax)
+        self.assertEqual(D('12.00') + D('5.50') + D('22.00'), total.incl_tax)
+        self.assertEqual(D('2.00') + D('0.50') + D('2.00'), total.tax)

tests/integration/checkout/test_mixins.py

@@ -10,12 +10,15 @@ from oscar.apps.checkout.exceptions import FailedPreCondition
 from oscar.apps.checkout.mixins import (
     CheckoutSessionMixin, OrderPlacementMixin)
 from oscar.apps.shipping.methods import FixedPrice, Free
-from oscar.core.loading import get_model
+from oscar.core.loading import get_class, get_model
 from oscar.test import factories
 from oscar.test.basket import add_product
 from oscar.test.utils import RequestFactory
 
 Order = get_model('order', 'Order')
+Surcharge = get_model('order', 'Surcharge')
+
+SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
 
 
 class TestOrderPlacementMixin(TestCase):
@@ -39,7 +42,9 @@ class TestOrderPlacementMixin(TestCase):
                                                             line2='159',
                                                             line4='London')
         shipping_charge = shipping_method.calculate(basket)
-        order_total = OrderTotalCalculator().calculate(basket, shipping_charge)
+        applicator = SurchargeApplicator()
+        surcharges = applicator.get_applicable_surcharges(basket)
+        order_total = OrderTotalCalculator().calculate(basket, shipping_charge, surcharges)
 
         order_submission_data = {'user': user,
                                  'order_number': '12345',
@@ -99,7 +104,9 @@ class TestOrderPlacementMixin(TestCase):
         add_product(basket, D('12.00'))
         shipping_method = Free()
         shipping_charge = shipping_method.calculate(basket)
-        order_total = OrderTotalCalculator().calculate(basket, shipping_charge)
+        applicator = SurchargeApplicator()
+        surcharges = applicator.get_applicable_surcharges(basket)
+        order_total = OrderTotalCalculator().calculate(basket, shipping_charge, surcharges)
 
         billing_address = factories.BillingAddressFactory()
         shipping_address = factories.ShippingAddressFactory()
@@ -114,6 +121,13 @@ class TestOrderPlacementMixin(TestCase):
                                  'request': request}
         OrderPlacementMixin().place_order(**order_submission_data)
         order1 = Order.objects.get(number='12345')
+        for charge in surcharges:
+            Surcharge.objects.create(
+                order=order1,
+                name=charge.surcharge.name,
+                code=charge.surcharge.code,
+                excl_tax=charge.price.excl_tax,
+                incl_tax=charge.price.incl_tax)
         self.assertEqual(order1.site, site1)
 
         add_product(basket, D('12.00'))
@@ -133,7 +147,9 @@ class TestOrderPlacementMixin(TestCase):
         order_placement.add_payment_event('Credit Card Payment', D('90'))
         shipping_method = Free()
         shipping_charge = shipping_method.calculate(basket)
-        order_total = OrderTotalCalculator().calculate(basket, shipping_charge)
+        applicator = SurchargeApplicator()
+        surcharges = applicator.get_applicable_surcharges(basket)
+        order_total = OrderTotalCalculator().calculate(basket, shipping_charge, surcharges)
 
         billing_address = factories.BillingAddressFactory()
         shipping_address = factories.ShippingAddressFactory()
@@ -147,6 +163,13 @@ class TestOrderPlacementMixin(TestCase):
                                  'shipping_address': shipping_address}
         order_placement.place_order(**order_submission_data)
         order1 = Order.objects.get(number='12345')
+        for charge in surcharges:
+            Surcharge.objects.create(
+                order=order1,
+                name=charge.surcharge.name,
+                code=charge.surcharge.code,
+                excl_tax=charge.price.excl_tax,
+                incl_tax=charge.price.incl_tax)
         self.assertEqual(order1.payment_events.count(), 2)
         event1 = order1.payment_events.all()[0]
         event2 = order1.payment_events.all()[1]

tests/integration/checkout/test_surcharges.py

@@ -0,0 +1,48 @@
+from decimal import Decimal as D
+
+from django.test import TestCase
+
+from oscar.core.loading import get_class
+from oscar.test import factories
+from oscar.test.basket import add_product
+
+SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
+PercentageCharge = get_class("checkout.surcharges", "PercentageCharge")
+FlatCharge = get_class("checkout.surcharges", "FlatCharge")
+
+
+class TestSurcharges(TestCase):
+    def setUp(self):
+        self.applicator = SurchargeApplicator()
+        self.basket = factories.create_basket(empty=True)
+
+    def test_stock_surcharges(self):
+        add_product(self.basket, D('12.00'))
+        surcharges = self.applicator.get_applicable_surcharges(self.basket)
+
+        self.assertEqual(surcharges.total.excl_tax, D('20.0'))
+        self.assertEqual(surcharges.total.incl_tax, D('22.0'))
+
+    def test_percentage_surcharge(self):
+        percentage_surcharge = PercentageCharge(percentage=D(10))
+        add_product(self.basket, D(12))
+        price = percentage_surcharge.calculate(self.basket)
+
+        self.assertEqual(self.basket.total_incl_tax, D(12))
+        self.assertEqual(price.incl_tax, D("1.20"))
+
+    def test_percentage_empty_basket(self):
+        percentage_surcharge = PercentageCharge(percentage=D(10))
+        price = percentage_surcharge.calculate(self.basket)
+
+        self.assertEqual(self.basket.total_incl_tax, D(0))
+        self.assertEqual(price.incl_tax, D(0))
+
+    def test_flat_surcharge(self):
+        flat_surcharge = FlatCharge(excl_tax=D(1), incl_tax=D("1.21"))
+        add_product(self.basket, D(12))
+        price = flat_surcharge.calculate(self.basket)
+
+        self.assertEqual(self.basket.total_incl_tax, D(12))
+        self.assertEqual(price.incl_tax, D("1.21"))
+        self.assertEqual(price.excl_tax, D(1))

tests/integration/order/test_creator.py

@@ -26,6 +26,8 @@ from oscar.test.utils import run_concurrently
 Range = get_class('offer.models', 'Range')
 Benefit = get_class('offer.models', 'Benefit')
 
+SurchargeApplicator = get_class("checkout.applicator", "SurchargeApplicator")
+
 
 def place_order(creator, **kwargs):
     """
@@ -35,8 +37,9 @@ def place_order(creator, **kwargs):
         kwargs['shipping_method'] = Free()
 
     shipping_charge = kwargs['shipping_method'].calculate(kwargs['basket'])
+
     kwargs['total'] = calculators.OrderTotalCalculator().calculate(
-        basket=kwargs['basket'], shipping_charge=shipping_charge)
+        basket=kwargs['basket'], shipping_charge=shipping_charge, surcharges=kwargs['surcharges'])
     kwargs['shipping_charge'] = shipping_charge
 
     return creator.place_order(**kwargs)
@@ -47,16 +50,17 @@ class TestOrderCreatorErrorCases(TestCase):
     def setUp(self):
         self.creator = OrderCreator()
         self.basket = factories.create_basket(empty=True)
+        self.surcharges = SurchargeApplicator().get_applicable_surcharges(self.basket)
 
     def test_raises_exception_when_empty_basket_passed(self):
         with self.assertRaises(ValueError):
-            place_order(self.creator, basket=self.basket)
+            place_order(self.creator, surcharges=self.surcharges, basket=self.basket)
 
     def test_raises_exception_if_duplicate_order_number_passed(self):
         add_product(self.basket, D('12.00'))
-        place_order(self.creator, basket=self.basket, order_number='1234')
+        place_order(self.creator, surcharges=self.surcharges, basket=self.basket, order_number='1234')
         with self.assertRaises(ValueError):
-            place_order(self.creator, basket=self.basket, order_number='1234')
+            place_order(self.creator, surcharges=self.surcharges, basket=self.basket, order_number='1234')
 
 
 class TestSuccessfulOrderCreation(TestCase):
@@ -64,46 +68,47 @@ class TestSuccessfulOrderCreation(TestCase):
     def setUp(self):
         self.creator = OrderCreator()
         self.basket = factories.create_basket(empty=True)
+        self.surcharges = SurchargeApplicator().get_applicable_surcharges(self.basket)
 
     def test_saves_shipping_code(self):
         add_product(self.basket, D('12.00'))
         free_method = Free()
-        order = place_order(self.creator, basket=self.basket,
+        order = place_order(self.creator, surcharges=self.surcharges, basket=self.basket,
                             order_number='1234', shipping_method=free_method)
         self.assertEqual(order.shipping_code, free_method.code)
 
     def test_creates_order_and_line_models(self):
         add_product(self.basket, D('12.00'))
-        place_order(self.creator, basket=self.basket, order_number='1234')
+        place_order(self.creator, surcharges=self.surcharges, basket=self.basket, order_number='1234')
         order = Order.objects.get(number='1234')
         lines = order.lines.all()
         self.assertEqual(1, len(lines))
 
     def test_sets_correct_order_status(self):
         add_product(self.basket, D('12.00'))
-        place_order(self.creator, basket=self.basket,
+        place_order(self.creator, surcharges=self.surcharges, basket=self.basket,
                     order_number='1234', status='Active')
         order = Order.objects.get(number='1234')
         self.assertEqual('Active', order.status)
 
     def test_defaults_to_using_free_shipping(self):
         add_product(self.basket, D('12.00'))
-        place_order(self.creator, basket=self.basket, order_number='1234')
+        place_order(self.creator, surcharges=self.surcharges, basket=self.basket, order_number='1234')
         order = Order.objects.get(number='1234')
-        self.assertEqual(order.total_incl_tax, self.basket.total_incl_tax)
-        self.assertEqual(order.total_excl_tax, self.basket.total_excl_tax)
+        self.assertEqual(order.total_incl_tax, self.basket.total_incl_tax + self.surcharges.total.incl_tax)
+        self.assertEqual(order.total_excl_tax, self.basket.total_excl_tax + self.surcharges.total.excl_tax)
 
     def test_uses_default_order_status_from_settings(self):
         add_product(self.basket, D('12.00'))
         with override_settings(OSCAR_INITIAL_ORDER_STATUS='A'):
-            place_order(self.creator, basket=self.basket, order_number='1234')
+            place_order(self.creator, surcharges=self.surcharges, basket=self.basket, order_number='1234')
         order = Order.objects.get(number='1234')
         self.assertEqual('A', order.status)
 
     def test_uses_default_line_status_from_settings(self):
         add_product(self.basket, D('12.00'))
         with override_settings(OSCAR_INITIAL_LINE_STATUS='A'):
-            place_order(self.creator, basket=self.basket, order_number='1234')
+            place_order(self.creator, surcharges=self.surcharges, basket=self.basket, order_number='1234')
         order = Order.objects.get(number='1234')
         line = order.lines.all()[0]
         self.assertEqual('A', line.status)
@@ -114,7 +119,7 @@ class TestSuccessfulOrderCreation(TestCase):
             product = factories.create_product(partner_name=partner_name)
             add_product(self.basket, D('12.00'), product=product)
             place_order(
-                self.creator, basket=self.basket, order_number=order_number)
+                self.creator, surcharges=self.surcharges, basket=self.basket, order_number=order_number)
             line = Order.objects.get(number=order_number).lines.all()[0]
             partner = product.stockrecords.all()[0].partner
             self.assertTrue(partner_name == line.partner_name == partner.name)
@@ -125,6 +130,7 @@ class TestPlacingOrderForDigitalGoods(TestCase):
     def setUp(self):
         self.creator = OrderCreator()
         self.basket = factories.create_basket(empty=True)
+        self.surcharges = SurchargeApplicator().get_applicable_surcharges(self.basket)
 
     def test_does_not_allocate_stock(self):
         ProductClass.objects.create(
@@ -134,7 +140,7 @@ class TestPlacingOrderForDigitalGoods(TestCase):
         self.assertTrue(record.num_allocated is None)
 
         add_product(self.basket, D('12.00'), product=product)
-        place_order(self.creator, basket=self.basket, order_number='1234')
+        place_order(self.creator, surcharges=self.surcharges, basket=self.basket, order_number='1234')
 
         product = Product.objects.get(id=product.id)
         stockrecord = product.stockrecords.all()[0]
@@ -147,6 +153,7 @@ class TestShippingOfferForOrder(TestCase):
     def setUp(self):
         self.creator = OrderCreator()
         self.basket = factories.create_basket(empty=True)
+        self.surcharges = SurchargeApplicator().get_applicable_surcharges(self.basket)
 
     def apply_20percent_shipping_offer(self):
         """Shipping offer 20% off"""
@@ -167,6 +174,7 @@ class TestShippingOfferForOrder(TestCase):
             self.basket, shipping, offer)
 
         place_order(self.creator,
+                    surcharges=self.surcharges,
                     basket=self.basket,
                     order_number='1234',
                     shipping_method=shipping)
@@ -174,7 +182,7 @@ class TestShippingOfferForOrder(TestCase):
 
         self.assertEqual(1, len(order.shipping_discounts))
         self.assertEqual(D('4.00'), order.shipping_incl_tax)
-        self.assertEqual(D('16.00'), order.total_incl_tax)
+        self.assertEqual(D('38.00'), order.total_incl_tax)
 
     def test_zero_shipping_discount_is_not_created(self):
         add_product(self.basket, D('12.00'))
@@ -185,6 +193,7 @@ class TestShippingOfferForOrder(TestCase):
             self.basket, shipping, offer)
 
         place_order(self.creator,
+                    surcharges=self.surcharges,
                     basket=self.basket,
                     order_number='1234',
                     shipping_method=shipping)
@@ -193,7 +202,7 @@ class TestShippingOfferForOrder(TestCase):
         # No shipping discount
         self.assertEqual(0, len(order.shipping_discounts))
         self.assertEqual(D('0.00'), order.shipping_incl_tax)
-        self.assertEqual(D('12.00'), order.total_incl_tax)
+        self.assertEqual(D('34.00'), order.total_incl_tax)
 
 
 class TestMultiSiteOrderCreation(TestCase):
@@ -203,10 +212,12 @@ class TestMultiSiteOrderCreation(TestCase):
         self.basket = factories.create_basket(empty=True)
         self.site1 = factories.SiteFactory()
         self.site2 = factories.SiteFactory()
+        self.surcharges = SurchargeApplicator().get_applicable_surcharges(self.basket)
 
     def test_default_site(self):
         add_product(self.basket, D('12.00'))
         place_order(self.creator,
+                    surcharges=self.surcharges,
                     basket=self.basket,
                     order_number='1234')
         order = Order.objects.get(number='1234')
@@ -215,6 +226,7 @@ class TestMultiSiteOrderCreation(TestCase):
     def test_multi_sites(self):
         add_product(self.basket, D('12.00'))
         place_order(self.creator,
+                    surcharges=self.surcharges,
                     basket=self.basket,
                     order_number='12345',
                     site=self.site1)
@@ -222,6 +234,7 @@ class TestMultiSiteOrderCreation(TestCase):
         self.assertEqual(order1.site, self.site1)
         add_product(self.basket, D('12.00'))
         place_order(self.creator,
+                    surcharges=self.surcharges,
                     basket=self.basket,
                     order_number='12346',
                     site=self.site2)
@@ -235,6 +248,7 @@ class TestMultiSiteOrderCreation(TestCase):
         request.META['SERVER_NAME'] = self.site1.domain
         add_product(self.basket, D('12.00'))
         place_order(self.creator,
+                    surcharges=self.surcharges,
                     basket=self.basket,
                     order_number='12345',
                     request=request)
@@ -243,6 +257,7 @@ class TestMultiSiteOrderCreation(TestCase):
         add_product(self.basket, D('12.00'))
         request.META['SERVER_NAME'] = self.site2.domain
         place_order(self.creator,
+                    surcharges=self.surcharges,
                     basket=self.basket,
                     order_number='12346',
                     request=request)
@@ -261,12 +276,14 @@ class TestPlaceOrderWithVoucher(TestCase):
         voucher.offers.add(factories.create_offer(offer_type='Voucher'))
         basket.vouchers.add(voucher)
 
-        place_order(creator, basket=basket, order_number='12346', user=user)
+        surcharges = SurchargeApplicator().get_applicable_surcharges(basket)
+
+        place_order(creator, surcharges=surcharges, basket=basket, order_number='12346', user=user)
         assert voucher.applications.count() == 1
 
         # Make sure the voucher usage is rechecked
         with pytest.raises(ValueError):
-            place_order(creator, basket=basket, order_number='12347', user=user)
+            place_order(creator, surcharges=surcharges, basket=basket, order_number='12347', user=user)
 
     def test_expired_voucher(self):
         user = AnonymousUser()
@@ -278,7 +295,8 @@ class TestPlaceOrderWithVoucher(TestCase):
         basket.vouchers.add(voucher)
         voucher.end_datetime = timezone.now() - datetime.timedelta(days=100)
         voucher.save()
-        place_order(creator, basket=basket, order_number='12346', user=user)
+        surcharges = SurchargeApplicator().get_applicable_surcharges(basket)
+        place_order(creator, surcharges=surcharges, basket=basket, order_number='12346', user=user)
         assert voucher.applications.count() == 0
 
 
@@ -304,8 +322,10 @@ class TestConcurrentOrderPlacement(TransactionTestCase):
 
             basket = factories.BasketFactory()
             basket.add_product(product)
+            surcharges = SurchargeApplicator().get_applicable_surcharges(basket)
+
             place_order(
-                creator, basket=basket, order_number=order_number, user=user)
+                creator, surcharges=surcharges, basket=basket, order_number=order_number, user=user)
 
         exceptions = run_concurrently(worker, num_threads=5)
 
@@ -346,8 +366,10 @@ class TestConcurrentOrderPlacement(TransactionTestCase):
             basket = factories.BasketFactory()
             basket.add_product(product)
             basket.vouchers.add(voucher)
+
+            surcharges = SurchargeApplicator().get_applicable_surcharges(basket)
             place_order(
-                creator, basket=basket, order_number=order_number, user=user)
+                creator, surcharges=surcharges, basket=basket, order_number=order_number, user=user)
 
         exceptions = run_concurrently(worker, num_threads=5)
 

tests/settings.py

@@ -81,6 +81,8 @@ catalogue_app_idx = INSTALLED_APPS.index('oscar.apps.catalogue.apps.CatalogueCon
 INSTALLED_APPS[catalogue_app_idx] = 'tests._site.apps.catalogue.apps.CatalogueConfig'
 dashboard_app_idx = INSTALLED_APPS.index('oscar.apps.dashboard.apps.DashboardConfig')
 INSTALLED_APPS[dashboard_app_idx] = 'tests._site.apps.dashboard.apps.DashboardConfig'
+checkout_app_idx = INSTALLED_APPS.index('oscar.apps.checkout.apps.CheckoutConfig')
+INSTALLED_APPS[checkout_app_idx] = 'tests._site.apps.checkout.apps.CheckoutConfig'
 
 AUTH_USER_MODEL = 'myauth.User'