Merge pull request #112 from django-oscar/feature/no-shipping-required

Since shipping_address is not required in the serializer it is unwise to assume it is present in validated_data
django-oscar · Dec 15, 2017 · 6975179 · 6975179
2 parents 0e08ba7 + 8c75c9d
commit 6975179
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -1,6 +1,14 @@
 =========
 Changelog
 =========
+1.2.1 (2017-12-15)
+-------------------
+Fixes:
+  * Shipping address is not required during checkout
+
+Features:
+  * Tested with Oscar 1.5.1, updated dependencies
+
 1.2.0 (2017-11-06)
 -------------------
 Features:

diff --git a/oscarapi/serializers/checkout.py b/oscarapi/serializers/checkout.py
@@ -273,8 +273,11 @@ def create(self, validated_data):
             order_number = self.generate_order_number(basket)
             request = self.context['request']
 
-            shipping_address = ShippingAddress(
-                **validated_data['shipping_address'])
+            if 'shipping_address' in validated_data:
+                shipping_address = ShippingAddress(
+                    **validated_data['shipping_address'])
+            else:
+                shipping_address = None
 
             if 'billing_address' in validated_data:
                 billing_address = BillingAddress(

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-__version__ = "1.2.0"
+__version__ = "1.2.1"
 
 
 setup(