From 187b8955d32bd02c64b55b94dded211f06514093 Mon Sep 17 00:00:00 2001
From: Christian Dresen <c.dresen@fh-muenster.de>
Date: Tue, 11 Oct 2016 21:19:38 +0200
Subject: [PATCH] [Warpfood] Remove deleting food orders if sheet is ordered

---
 www/web/warpfood/templates/warpfood/view.html | 8 ++++++--
 www/web/warpfood/views.py                     | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/web/warpfood/templates/warpfood/view.html b/www/web/warpfood/templates/warpfood/view.html
index 3f9c929..a7eaae6 100644
--- a/www/web/warpfood/templates/warpfood/view.html
+++ b/www/web/warpfood/templates/warpfood/view.html
@@ -77,7 +77,9 @@
     <table class="table table-striped table-hover">
         <thead>
             <tr>
-                <th>&nbsp;&nbsp;<span class="glyphicon glyphicon-trash"></span></th>
+                {% if not sheet.order_time %} 
+                    <th>&nbsp;&nbsp;<span class="glyphicon glyphicon-trash"></span></th>
+                {% endif %}
                 <th>{% trans "username" %}</th>
                 <th>{% trans "article" %}</th>
                 <th>{% trans "size" %}</th>
@@ -89,7 +91,9 @@
         <tbody>
             {% for order in orders %}
                 <tr>
-                    <td>&nbsp;&nbsp;<a href="#" data-order-id="{{order.id}}" class="confirm_order_delete"><span class="glyphicon glyphicon-minus text-danger"></span></a></td>
+                    {% if not sheet.order_time %} 
+                        <td>&nbsp;&nbsp;<a href="#" data-order-id="{{order.id}}" class="confirm_order_delete"><span class="glyphicon glyphicon-minus text-danger"></span></a></td>
+                    {% endif %}
                     <td>{{ order.user }}</td>
                     <td>{{ order.article }}</td>
                     <td>{{ order.size }}</td>
diff --git a/www/web/warpfood/views.py b/www/web/warpfood/views.py
index 1530b70..890692d 100644
--- a/www/web/warpfood/views.py
+++ b/www/web/warpfood/views.py
@@ -134,7 +134,9 @@ def delete_order(request, order_id=0):
         try:
             order = FoodOrder.objects.get(id=order_id)
             sheet_id = order.sheet_id
-            order.delete()
+            if not order.sheet.order_time:
+                order.delete()
+            
             return redirect("/pizza/view/%s" % sheet_id)
         except:
             pass
-- 
GitLab