From 27e5fcc40747ecd942e78d060a20577d7575eef7 Mon Sep 17 00:00:00 2001
From: Thomas Steen Rasmussen <tykling@bornhack.org>
Date: Fri, 24 Mar 2017 03:01:28 +0100
Subject: [PATCH] a few more changes to order_detail.html template, and import
 fixed py3 version of coinify api

---
 src/shop/templates/order_detail.html | 16 +++++++++-------
 src/vendor/coinify                   |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/shop/templates/order_detail.html b/src/shop/templates/order_detail.html
index b894065a..e1d90d72 100644
--- a/src/shop/templates/order_detail.html
+++ b/src/shop/templates/order_detail.html
@@ -13,7 +13,7 @@
             <form method="POST" class="form-inline">
               {% csrf_token %}
             {% endif %}
-            <table class="table table-bordered table-hover">
+            <table class="table table-bordered {% if not order.open == None %}table-hover{% endif %}">
 
               <thead>
                 <tr>
@@ -66,18 +66,20 @@
 
             </table>
 
-            {% if order.open == None and order.customer_comment or order.open %}
-            <h4>Comment:</h4>
-            <input type="text" class="form-control" name="customer_comment" style="width: 100%;" placeholder="Please enter any comments here..." value="{{ order.customer_comment }}" {% if order.open == None %}readonly{% endif %}></p>
-            {% endif %}
-
             {% if not order.open == None %}
-                {% bootstrap_button "Update order" button_type="submit" button_class="btn-primary" name="update_order" %}
+              <h4>Comment:</h4>
+              <input type="text" class="form-control" name="customer_comment" style="width: 100%;" placeholder="Please enter any comments here..." value="{{ order.customer_comment }}"></p>
+            {% elif order.open == None and order.comment %}
+              <div class="alert alert-info">{{ order.comment }}</div>
             {% endif %}
 
+            {% if order.open %}
+              {% bootstrap_button "Update order" button_type="submit" button_class="btn-primary" name="update_order" %}
+            {% endif %}
             {% if not order.paid %}
               {% bootstrap_button "Cancel order" button_type="submit" button_class="btn-danger" name="cancel_order" %}
             {% endif %}
+
         </div>
         {% if order.paid %}
         <div class="panel panel-footer">
diff --git a/src/vendor/coinify b/src/vendor/coinify
index abc76101..d2582a98 160000
--- a/src/vendor/coinify
+++ b/src/vendor/coinify
@@ -1 +1 @@
-Subproject commit abc76101756a95e59abc8dd13e50a45d26855ccb
+Subproject commit d2582a98a3c7522505e07559fc5bd58c07b6ae86