moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolve conflicts

Browse source
This commit is contained in:
Tomislav R 2016-05-20 14:22:51 +02:00
commit 2a7603778a
60 changed files with 677 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hosting/templates/hosting/orders.html
View file

@ -23,7 +23,7 @@
<tr>
<td scope="row">{{ order.id }}</td>
<td>{{ order.created_at }}</td>
<td>{{ order.VMPlan.price }} CHF</td>
<td>{{ order.vm_plan.price }} CHF</td>
<td>{% if order.approved %}
<span class="text-success strong">Approved</span>
{% else %}
@ -55,7 +55,8 @@
Your
order?</h4>
<form method="post" action="{% url 'hosting:delete_order' order.id %}">
<form method="post"
action="{% url 'hosting:delete_order' order.id %}">
{% csrf_token %}
<div class="modal-footer">
<button type="button" class="btn btn-default"