This makes the Cart's empty() method use delete instead of simply emp…

…tying the content, so that a signal is fired by django (handy). Fixes awesto#38
althalus · Apr 20, 2011 · e142ca7 · e142ca7
1 parent f141c01
commit e142ca7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/shop/models/cartmodel.py b/shop/models/cartmodel.py
@@ -102,6 +102,7 @@ def empty(self):
         Remove all cart items
         """
         self.items.all().delete()
+        self.delete()
 
     @property
     def total_quantity(self):

diff --git a/shop/util/cart.py b/shop/util/cart.py
@@ -22,8 +22,11 @@ def get_or_create_cart(request):
             # There is a session
             cart_id = session.get('cart_id')
             if cart_id:
-                cart = Cart.objects.get(pk=cart_id)
-            else:
+                try:
+                    cart = Cart.objects.get(pk=cart_id)
+                except Cart.DoesNotExist:
+                    cart = None
+            if not cart:
                 cart = Cart.objects.create()
                 session['cart_id'] = cart.id
     return cart