Merge pull request #2014 from mattdrayer/mattdrayer/issue/2013/orderc…

…reator_site_override mattdrayer/issue/2013: Allow site override in OrderCreator
django-oscar · Jul 13, 2016 · e40ccab · e40ccab
2 parents bd4c264 + 5ed47f1
commit e40ccab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/oscar/apps/order/utils.py b/src/oscar/apps/order/utils.py
@@ -101,7 +101,6 @@ def create_order_model(self, user, basket, shipping_address,
         """
         order_data = {'basket': basket,
                       'number': order_number,
-                      'site': Site._default_manager.get_current(),
                       'currency': total.currency,
                       'total_incl_tax': total.incl_tax,
                       'total_excl_tax': total.excl_tax,
@@ -119,6 +118,8 @@ def create_order_model(self, user, basket, shipping_address,
             order_data['status'] = status
         if extra_order_fields:
             order_data.update(extra_order_fields)
+        if 'site' not in order_data:
+            order_data['site'] = Site._default_manager.get_current()
         order = Order(**order_data)
         order.save()
         return order