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

order detail style fix

Browse source
This commit is contained in:
Arvind Tiwari 2018-05-12 02:47:27 +05:30
commit 55889499df
4 changed files with 82 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

16
datacenterlight/static/datacenterlight/css/hosting.css
View file

@ -518,6 +518,22 @@
margin: 15px 0; margin: 15px 0;
} }
.order-detail-container .thin-hr {
margin: 10px 0;
}
.order-detail-container .subtotal-price {
font-size: 16px;
}
.order-detail-container .subtotal-price .text-primary {
font-size: 17px;
}
.order-detail-container .total-price {
font-size: 18px;
}
@media (max-width: 767px) { @media (max-width: 767px) {
.order-detail-container { .order-detail-container {
padding: 15px; padding: 15px;

45
datacenterlight/templates/datacenterlight/order_detail.html
View file

@ -65,32 +65,37 @@
<span>{% trans "Disk space" %}: </span> <span>{% trans "Disk space" %}: </span>
<strong class="pull-right">{{vm.disk_size|intcomma}} GB</strong> <strong class="pull-right">{{vm.disk_size|intcomma}} GB</strong>
</p> </p>
<hr> <hr class="thin-hr">
{% if vm.vat > 0 %} {% if vm.vat > 0 or vm.discount.amount > 0 %}
<p> <div class="subtotal-price">
<strong>{% trans "Subtotal" %}: </strong> {% if vm.vat > 0 %}
<strong class="pull-right">{{vm.price|floatformat:2|intcomma}} CHF</strong> <p>
</p> <strong class="text-lg">{% trans "Subtotal" %} </strong>
<p> <strong class="pull-right">{{vm.price|floatformat:2|intcomma}} CHF</strong>
<span>{% trans "VAT" %} ({{ vm.vat_percent|floatformat:2|intcomma }}%): </span> </p>
<strong class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</strong> <p>
</p> <small>{% trans "VAT" %} ({{ vm.vat_percent|floatformat:2|intcomma }}%) </small>
<strong class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</strong>
</p>
{% endif %}
{% if vm.discount.amount > 0 %}
<p class="text-primary">
{%trans "Discount" as discount_name %}
<strong>{{ vm.discount.name|default:discount_name }} </strong>
<strong class="pull-right">- {{ vm.discount.amount }} CHF</strong>
</p>
{% endif %}
</div>
<hr class="thin-hr">
{% endif %} {% endif %}
{% if vm.discount.amount > 0 %} <p class="total-price">
<p class="text-primary"> <strong>{% trans "Total" %} </strong>
{%trans "Discount" as discount_name %}
<strong>{{ vm.discount.name|default:discount_name }}: </strong>
<strong class="pull-right">- {{ vm.discount.amount }} CHF</strong>
</p>
{% endif %}
<p>
<strong>{% trans "Total" %}</strong>
<strong class="pull-right">{{vm.total_price|floatformat:2|intcomma}} CHF</strong> <strong class="pull-right">{{vm.total_price|floatformat:2|intcomma}} CHF</strong>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<hr> <hr class="thin-hr">
</div> </div>
<form id="virtual_machine_create_form" action="" method="POST"> <form id="virtual_machine_create_form" action="" method="POST">
{% csrf_token %} {% csrf_token %}

16
hosting/static/hosting/css/order.css
View file

@ -63,6 +63,22 @@
margin: 15px 0; margin: 15px 0;
} }
.order-detail-container .thin-hr {
margin: 10px 0;
}
.order-detail-container .subtotal-price {
font-size: 16px;
}
.order-detail-container .subtotal-price .text-primary {
font-size: 17px;
}
.order-detail-container .total-price {
font-size: 18px;
}
@media (max-width: 767px) { @media (max-width: 767px) {
.order-confirm-btn { .order-confirm-btn {
text-align: center; text-align: center;

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

@ -127,32 +127,37 @@
<span>{% trans "Disk space" %}: </span> <span>{% trans "Disk space" %}: </span>
<strong class="pull-right">{{vm.disk_size}} GB</strong> <strong class="pull-right">{{vm.disk_size}} GB</strong>
</p> </p>
<hr> <hr class="thin-hr">
{% if vm.vat > 0 %} {% if vm.vat > 0 or vm.discount.amount > 0 %}
<p> <div class="subtotal-price">
<strong>{% trans "Subtotal" %}: </strong> {% if vm.vat > 0 %}
<strong class="pull-right">{{vm.price|floatformat:2|intcomma}} CHF</strong> <p>
</p> <strong>{% trans "Subtotal" %} </strong>
<p> <strong class="pull-right">{{vm.price|floatformat:2|intcomma}} CHF</strong>
<span>{% trans "VAT" %} ({{ vm.vat_percent|floatformat:2|intcomma }}%): </span> </p>
<strong class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</strong> <p>
</p> <small>{% trans "VAT" %} ({{ vm.vat_percent|floatformat:2|intcomma }}%) </small>
<strong class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</strong>
</p>
{% endif %}
{% if vm.discount.amount > 0 %}
<p class="text-primary">
{%trans "Discount" as discount_name %}
<strong>{{ vm.discount.name|default:discount_name }} </strong>
<strong class="pull-right">- {{ vm.discount.amount }} CHF</strong>
</p>
{% endif %}
</div>
<hr class="thin-hr">
{% endif %} {% endif %}
{% if vm.discount.amount > 0 %} <p class="total-price">
<p class="text-primary"> <strong>{% trans "Total" %} </strong>
{%trans "Discount" as discount_name %}
<strong>{{ vm.discount.name|default:discount_name }}: </strong>
<strong class="pull-right">- {{ vm.discount.amount }} CHF</strong>
</p>
{% endif %}
<p>
<strong>{% trans "Total" %}</strong>
<strong class="pull-right">{% if vm.total_price %}{{vm.total_price|floatformat:2|intcomma}}{% else %}{{vm.price|floatformat:2|intcomma}}{% endif %} CHF</strong> <strong class="pull-right">{% if vm.total_price %}{{vm.total_price|floatformat:2|intcomma}}{% else %}{{vm.price|floatformat:2|intcomma}}{% endif %} CHF</strong>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<hr> <hr class="thin-hr">
</div> </div>
{% if not order %} {% if not order %}
{% block submit_btn %} {% block submit_btn %}