Merge branch 'cart' of git.2li.ch:ibz/web_AI-5 into cart

django/didgeridoo/webshop/templates/webshop/cart.html

@@ -8,6 +8,7 @@
           <th scope="col">ID</th>
           <th scope="col">NAME</th>
           <th scope="col">STOCK</th>
+          <th scope="col">AMOUNT</th>
           <th scope="col">PRICE</th>
         </tr>
         {% for article in articles_list %}
@@ -18,6 +19,7 @@
                 {{ article.article.name }}
               </a></td>
             <td scope="col">{{ article.article.stock }}</td>
+            <td scope="col">{{ article.amount }}</td>
             <td scope="col">{{ article.article.price_in_chf }} {{ currency_name }}</td>
           </tr>
         {% endfor %}

django/didgeridoo/webshop/views.py

@@ -232,6 +232,8 @@ def cart(request):
     article_view = True
     currency_name = "CHF"
     message = ""
+    cart_id = False
+    articles_list = ""
 
     if not 'currency' in request.session:
         request.session['currency'] = None