From dd4754ec0dd285ead9108b60aa3ba223ab4d54ea Mon Sep 17 00:00:00 2001
From: Feliciaan De Palmenaer <feliciaan@de-palmenaer.eu>
Date: Tue, 9 Jun 2015 13:46:37 +0200
Subject: [PATCH] Updated forms and orders

---
 app/forms.py             |  1 -
 app/templates/order.html | 18 ++++++++++++------
 app/views/order.py       |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index 73ff3ae..48ee503 100644
--- a/app/forms.py
+++ b/app/forms.py
@@ -44,7 +44,6 @@ class AnonOrderItemForm(OrderItemForm):
         if self.name.data is None:
             self.name.data = session.get('anon_name', None)
 
-
     def validate(self):
         rv = OrderForm.validate(self)
         if not rv:
diff --git a/app/templates/order.html b/app/templates/order.html
index 2effb54..ca7f1dc 100644
--- a/app/templates/order.html
+++ b/app/templates/order.html
@@ -9,11 +9,13 @@
 <div class="row">
     <div class="col-md-push-1 col-md-10 darker" id="info"><!-- Shitty html-->
         <h3 id="order-title">Order {{ order.id }}
+        <div class="pull-right">
             {% if order.can_close(current_user.id) -%}
-                <a class="btn btn-danger pull-right" href="{{ url_for('.close_order', id=order.id) }}">Close</a><br/>
+                <a class="btn btn-danger" href="{{ url_for('.close_order', id=order.id) }}">Close</a>
             {% endif %}{% if courier_or_admin %}
-                <a class="btn btn-warning pull-right" href="{{ url_for('.order_edit', id=order.id) }}">Edit</a>
-        {%- endif %}</h3>
+                <a class="btn btn-warning" href="{{ url_for('.order_edit', id=order.id) }}">Edit</a>
+        {%- endif %}
+        </div></h3>
         courier: {{ order.courrier.username }}
         {% if order.courrier == None and not current_user.is_anonymous() %}
             <a href="{{ url_for('.volunteer', id=order.id) }}" class="btn btn-primary btn-sm">Volunteer</a>
@@ -101,14 +103,18 @@
 
 {% block styles %}
     {{ super() }}
-    <link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/css/select2.min.css" rel="stylesheet" />
+    <link href="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/css/select2.min.css" rel="stylesheet" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/select2-bootstrap.min.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/print.css') }}">
 {% endblock %}
 {% block scripts %}
     {{ super() }}
-    <script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0-rc.2/js/select2.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/select2/4.0.0/js/select2.min.js"></script>
     <script type="text/javascript">
-        $('.select').select2();
+        $('.select').select2({
+            'sorter': function(results) {
+                return results.sort();
+            }
+        });
     </script>
 {% endblock %}
diff --git a/app/views/order.py b/app/views/order.py
index 2187953..56e8138 100644
--- a/app/views/order.py
+++ b/app/views/order.py
@@ -106,7 +106,7 @@ def item_paid(order_id, item_id):
     if item.order.courrier_id == id or current_user.admin:
         item.paid = True
         db.session.commit()
-        flash('Paid %s by %s' % (item.product.name, item.user.username), 'success')
+        flash('Paid %s by %s' % (item.product.name, item.get_name()), 'success')
         return redirect(url_for('.order', id=order_id))
     abort(404)