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

Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view

Browse source
This commit is contained in:
Levi 2016-05-14 02:12:42 -04:30
commit e8e58066a0
6 changed files with 157 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hosting/templates/hosting/order_detail.html
View file

@ -6,7 +6,7 @@
<div class="row">
<div class="col-xs-8 col-xs-offset-2">
<div class="invoice-title">
<h2>Invoice</h2><h3 class="pull-right">Order # {{object.id}}</h3>
<h2>Invoice</h2><h3 class="pull-right">Order # {{order.id}}</h3>
</div>
<hr>
<div class="row">
@ -14,18 +14,18 @@
<address>
<h3><b>Billed To:</b></h3>
{{user.name}}<br>
{{object.billing_address.street_address}},{{order.billing_address.postal_code}}<br>
{{object.billing_address.city}}, {{object.billing_address.country}}.
{{order.billing_address.street_address}},{{order.billing_address.postal_code}}<br>
{{order.billing_address.city}}, {{order.billing_address.country}}.
</address>
</div>
<div class="col-xs-6 text-right">
<address>
<strong>Order Date:</strong><br>
{{object.created_at}}<br><br>
{{order.created_at}}<br><br>
<strong>Status:</strong><br>
<strong class="{% if object.status == 'Approved' %}text-success
<strong class="{% if order.status == 'Approved' %}text-success
{%else%} text-danger
{% endif %}">{{object.status}}</strong>
{% endif %}">{{order.status}}</strong>
<br><br>
</address>
@ -35,7 +35,7 @@
<div class="col-xs-6">
<address>
<strong>Payment Method:</strong><br>
{{object.cc_brand}} ending **** {{object.last4}}<br>
{{order.cc_brand}} ending **** {{order.last4}}<br>
{{user.email}}
</address>
</div>
@ -48,15 +48,15 @@
<h3><b>Order summary</b></h3>
<hr>
<div class="content">
<p><b>Type</b> <span class="pull-right">{{object.vm_plan.hosting_company_name}}</span></p>
<p><b>Type</b> <span class="pull-right">{{order.vm_plan.hosting_company_name}}</span></p>
<hr>
<p><b>Cores</b> <span class="pull-right">{{object.vm_plan.cores}}</span></p>
<p><b>Cores</b> <span class="pull-right">{{order.vm_plan.cores}}</span></p>
<hr>
<p><b>Memory</b> <span class="pull-right">{{object.vm_plan.memory}} GiB</span></p>
<p><b>Memory</b> <span class="pull-right">{{order.vm_plan.memory}} GiB</span></p>
<hr>
<p><b>Disk space</b> <span class="pull-right">{{object.vm_plan.disk_size}} GiB</span></p>
<p><b>Disk space</b> <span class="pull-right">{{order.vm_plan.disk_size}} GiB</span></p>
<hr>
<h4>Total<p class="pull-right"><b>{{object.vm_plan.price}} CHF</b></p></h4>
<h4>Total<p class="pull-right"><b>{{order.vm_plan.price}} CHF</b></p></h4>
</div>
</div>
</div>