diff --git a/batiskaf/templates/jinja2/base.jinja b/batiskaf/templates/jinja2/base.jinja index 482461d..98684ad 100644 --- a/batiskaf/templates/jinja2/base.jinja +++ b/batiskaf/templates/jinja2/base.jinja @@ -30,42 +30,7 @@ - - - - +
@@ -131,8 +96,8 @@
-

+



Карта сайта  |  Поисковые запросы  |  RSS


-

- Карта сайта Поисковые запросы Advanced Search Contact Us RSS -




+
-

+

+
+

Все права защищены 2015 © компанией Батискаф-Казахстан
+ Сделано в SitIO

+
+
+ +Яндекс.Метрика + + + + + + +
+
+
diff --git a/batiskaf/templates/jinja2/product.jinja b/batiskaf/templates/jinja2/product.jinja index eba61fd..f6f92d6 100644 --- a/batiskaf/templates/jinja2/product.jinja +++ b/batiskaf/templates/jinja2/product.jinja @@ -68,7 +68,7 @@
- Подобрать размер → + Подобрать размер →
{% endif %} diff --git a/static/img/HabraPack 0.2.psd b/static/img/HabraPack 0.2.psd new file mode 100644 index 0000000..59efe55 Binary files /dev/null and b/static/img/HabraPack 0.2.psd differ diff --git a/static/img/icon-fb.png b/static/img/icon-fb.png new file mode 100644 index 0000000..e6df46e Binary files /dev/null and b/static/img/icon-fb.png differ diff --git a/static/img/icon-ok.png b/static/img/icon-ok.png new file mode 100644 index 0000000..cb38ef6 Binary files /dev/null and b/static/img/icon-ok.png differ diff --git a/static/img/icon-vk.png b/static/img/icon-vk.png new file mode 100644 index 0000000..3579f65 Binary files /dev/null and b/static/img/icon-vk.png differ diff --git a/static/img/icon-yt.png b/static/img/icon-yt.png new file mode 100644 index 0000000..8e11f5c Binary files /dev/null and b/static/img/icon-yt.png differ diff --git a/store/cart.py b/store/cart.py index 673054f..63d812c 100644 --- a/store/cart.py +++ b/store/cart.py @@ -41,13 +41,18 @@ class Cart(object): def deserialize_items(self): for j in self.json_items['items']: - variation = ProductVariation.objects.get( - pk=j['product']) - item = CartItem( - variation, j['count'], j['id']) - self.items.append(item) - self.total += int(item.subtotal) - self.weight += variation.weight + variation = None + try: + variation = ProductVariation.objects.get( + pk=j['product']) + except ProductVariation.DoesNotExist: + pass + if variation: + item = CartItem( + variation, j['count'], j['id']) + self.items.append(item) + self.total += int(item.subtotal) + self.weight += variation.weight return self def serialize_items(self): diff --git a/store/views.py b/store/views.py index 7b7bd49..61445a7 100644 --- a/store/views.py +++ b/store/views.py @@ -155,8 +155,11 @@ class CartAddView(RedirectView): def dispatch(self, request, *args, **kwargs): retval = super(CartAddView, self).dispatch(request, args, kwargs) cart = Cart(self.request) - item_variant = ProductVariation.objects.get( - pk=self.request.GET.get('pk')) + try: + item_variant = ProductVariation.objects.get( + pk=self.request.GET.get('pk')) + except ProductVariation.DoesNotExist: + return redirect('/') count = self.request.GET.get('count') # messages.success( # self.request, """Товар успешно добавлен в корзину!