reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

a few more changes to order_detail.html template, and import fixed py3 version of coinify api

Browse source
This commit is contained in:
Thomas Steen Rasmussen 2017-03-24 03:01:28 +01:00
parent ce7d34e8ab
commit 27e5fcc407
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/shop/templates/order_detail.html
View file

@ -13,7 +13,7 @@
<form method="POST" class="form-inline"> <form method="POST" class="form-inline">
{% csrf_token %} {% csrf_token %}
{% endif %} {% endif %}
<table class="table table-bordered table-hover"> <table class="table table-bordered {% if not order.open == None %}table-hover{% endif %}">
<thead> <thead>
<tr> <tr>
@ -66,18 +66,20 @@
</table> </table>
{% if order.open == None and order.customer_comment or order.open %} {% if not order.open == None %}
<h4>Comment:</h4> <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> <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 %} {% endif %}
{% if not order.open == None %} {% if order.open %}
{% bootstrap_button "Update order" button_type="submit" button_class="btn-primary" name="update_order" %} {% bootstrap_button "Update order" button_type="submit" button_class="btn-primary" name="update_order" %}
{% endif %} {% endif %}
{% if not order.paid %} {% if not order.paid %}
{% bootstrap_button "Cancel order" button_type="submit" button_class="btn-danger" name="cancel_order" %} {% bootstrap_button "Cancel order" button_type="submit" button_class="btn-danger" name="cancel_order" %}
{% endif %} {% endif %}
</div> </div>
{% if order.paid %} {% if order.paid %}
<div class="panel panel-footer"> <div class="panel panel-footer">

2
src/vendor/coinify vendored

@ -1 +1 @@
Subproject commit abc76101756a95e59abc8dd13e50a45d26855ccb Subproject commit d2582a98a3c7522505e07559fc5bd58c07b6ae86