Verwijder user_notes op diverse locaties

Author: bveldkamp

webapp/finance/views.py

@@ -60,10 +60,6 @@ def post(self, request, *args, **kwargs):
             messages.error(request, "Geen bestelling gevonden")
             return redirect(reverse('view_products'))
 
-        user_notes = request.POST.get('notes')
-        if user_notes:
-            order_to_pay.user_notes = user_notes.strip()
-
         log_event(event="Finalizing order %s" % order_to_pay.id, user=order_to_pay.user)
         order_to_pay.finalized = True  # Freeze order
         order_to_pay.save()

webapp/ordering/admin.py

@@ -83,7 +83,7 @@ def export_orders_for_financial_admin(modeladmin, request, queryset):
 
 class OrderAdmin(DeleteDisabledMixin, admin.ModelAdmin):
     list_display = ["id", "created", "order_round", "user", "finalized",
-                    "paid", "total_price", "user_notes"]
+                    "paid", "total_price"]
     ordering = ("-id", )
     # inlines = [OrderProductInline]  ## causes timeout
     list_filter = ("paid", "finalized", "order_round")

webapp/ordering/admin_views.py

@@ -501,10 +501,6 @@ class ProductAdminMain(GroupRequiredMixin, ListView):
     def get_context_data(self, **kwargs):
         ctx = super(ProductAdminMain, self).get_context_data()
         ctx['current_order_round'] = get_current_order_round()
-        ctx['last_ten_orders_with_notes'] = Order.objects.filter(
-            user_notes__isnull=False).order_by('-id')[:10]
-        ctx['last_ten_orders_with_notes'] = Order.objects.filter(
-            user_notes__isnull=False).order_by('-id')[:10]
         return ctx
 
     def get_queryset(self):

webapp/templates/ordering/admin/suppliers.html

@@ -33,11 +33,4 @@ <h2>Mailings</h2>
         Je kunt geen mailing versturen want de huidige bestelronde is niet open.
     {% endif %}
 
-<h2>Laatste 10 opmerkingen</h2>
-<ol>
-    {% for o in last_ten_orders_with_notes %}
-        <li><strong>{{ o.user.get_full_name }}</strong> op <strong>{{ o.modified.date }}</strong> (ronde {{ o.order_round.id }}): {{ o.user_notes  }}</li>
-    {% endfor %}
-</ol>
-
 {% endblock %}

webapp/templates/ordering/order_finish.html

@@ -84,16 +84,6 @@ <h1>Bestelling plaatsen</h1>
 <form action="{% url 'finance.createtransaction' %}" method="post">{% csrf_token %}
 
     <div class="row">
-        <div class="col-md-6">
-            <div class="panel panel-info">
-                <!-- <div class="panel-heading">Feedback</div> -->
-                    <div class="panel-body">
-                    <p>We willen graag van je horen wat je van de producten en de bestelprocedure van vorige bestelronde vond.
-                        (je mag dit vak ook leeglaten).</p>
-                    <textarea class="form-control" rows="2" name="notes" placeholder="Opmerkingen?"></textarea>
-                </div>
-            </div>
-        </div>
         {% if object.order_round.get_pickup_location %}
             <div class="col-md-6">
                 <div class="panel panel-danger">