Shop module was refactored(orders block)

nnmware · Jan 9, 2013 · 55469dd · 55469dd
1 parent 5464b0f
commit 55469dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/apps/shop/utils.py b/apps/shop/utils.py
@@ -11,7 +11,7 @@ def get_basket(request):
     return Basket.objects.filter(user=request.user)
 
 def make_order_from_basket(order, basket):
-    if 1>0: #try:
+    try:
         for item in basket:
             if settings.SHOP_CHECK_QUANTITY:
                 if item.quantity > item.product.quantity:
@@ -31,7 +31,7 @@ def make_order_from_basket(order, basket):
                 item.product.save()
         basket.delete()
         return True
-#    except ShopError:
-#        return False
-#    except:
-#        return False
+    except ShopError:
+        return False
+    except:
+        return False
diff --git a/apps/shop/views.py b/apps/shop/views.py
@@ -348,6 +348,7 @@ def form_valid(self, form):
         self.object.user_agent = self.request.META['HTTP_USER_AGENT']
         self.object.status = STATUS_WAIT
         self.object.lite = True
+        self.object.session_key = get_session_from_request(self.request)
         self.object.save()
         success_add_items = make_order_from_basket(self.object, basket)
         if success_add_items is not True: