change orders to order and delete unused

django/didgeridoo/webshop/templates/webshop/checkout.html

@@ -60,7 +60,7 @@
           </td>
         </tr>
       </table>
-      <form id="checkout_form" action="orders" method="post">
+      <form id="checkout_form" action="order/" method="post">
         {% csrf_token %}
         {{ checkout_form.as_p }}
         <input type="submit" value="Order" class="btn btn-success" role="button"/>

django/didgeridoo/webshop/templates/webshop/nav.html

@@ -13,9 +13,6 @@
         {% else %}
         <li><a href="{% url 'login' %}">LOGIN</a></li>
         {% endif %}
-        {% if checkout %}
-        <!-- bewusst leer um dropdown in checkout auszublenden -->
-        {% else %}
         <li class="dropdown">
             {% if article_view %}
           <form id="currency" action="" method="POST" novalidate>
@@ -24,7 +21,6 @@
           {% csrf_token %}
           </form>
         {% endif %}
-        {% endif %}
         </li>
       </ul>
     </div>

django/didgeridoo/webshop/templates/webshop/order.html

@@ -1,7 +1,6 @@
 {% extends "webshop/base.html" %}
 {% load customfilters %}
 {% block section_title %}Order{% endblock %}
-
 {% block content %}
   <h1> Your order was submitted. </h1>
   <h3> Thank you for Purchase. </h3>

django/didgeridoo/webshop/urls.py

@@ -23,7 +23,7 @@ urlpatterns = [
     url(r'^cart/checkout/$',
         views.checkout,
         name='checkout'),
-    url(r'^orders$',
+    url(r'^order/$',
-        views.orders,
+        views.order,
-        name='orders'),
+        name='order'),
 ]

django/didgeridoo/webshop/views.py

@@ -313,7 +313,7 @@ def checkout(request):
     currencies_form = CurrenciesForm
     amount_form = CartForm
     rate = ExchangeRate
-    article_view = True
+    article_view = False
     message = ""
     cart_position_list = []
     totalprice_list = []
@@ -394,7 +394,7 @@ def checkout(request):
                    })
 
 
-def orders(request):
+def order(request):
     return render(request, 'webshop/orders.html',
                   {